Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[User32]

Browse source 
- Fix a condition that fails the dialog test_GetDlgItemText after running the msg test then run dialog again.

svn path=/trunk/; revision=60820
This commit is contained in:
James Tabor 2013-11-01 06:43:56 +00:00
parent 15743f2521
commit c9372b80da
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/win32ss/user/user32/windows/dialog.c
View file

@ -2126,9 +2126,12 @@ GetDlgItem(
int nIDDlgItem) int nIDDlgItem)
{ {
int i; int i;
HWND *list = WIN_ListChildren(hDlg); HWND *list;
HWND ret = 0; HWND ret = 0;
if (!hDlg) return 0;
list = WIN_ListChildren(hDlg);
if (!list) return 0; if (!list) return 0;
for (i = 0; list[i]; i++) if (GetWindowLongPtrW(list[i], GWLP_ID) == nIDDlgItem) break; for (i = 0; list[i]; i++) if (GetWindowLongPtrW(list[i], GWLP_ID) == nIDDlgItem) break;
@ -2190,7 +2193,7 @@ GetDlgItemTextA(
{ {
HWND hWnd = GetDlgItem(hDlg, nIDDlgItem); HWND hWnd = GetDlgItem(hDlg, nIDDlgItem);
if ( hWnd ) return GetWindowTextA(hWnd, lpString, nMaxCount); if ( hWnd ) return GetWindowTextA(hWnd, lpString, nMaxCount);
if ( nMaxCount ) *lpString = 0; if ( nMaxCount ) lpString[0] = '\0';
return 0; return 0;
} }
@ -2208,7 +2211,7 @@ GetDlgItemTextW(
{ {
HWND hWnd = GetDlgItem(hDlg, nIDDlgItem); HWND hWnd = GetDlgItem(hDlg, nIDDlgItem);
if ( hWnd ) return GetWindowTextW(hWnd, lpString, nMaxCount); if ( hWnd ) return GetWindowTextW(hWnd, lpString, nMaxCount);
if ( nMaxCount ) *lpString = 0; if ( nMaxCount ) lpString[0] = '\0';
return 0; return 0;
} }