[User32]

[reactos.git] / reactos / win32ss / user / user32 / windows / dialog.c

diff --git a/reactos/win32ss/user/user32/windows/dialog.c b/reactos/win32ss/user/user32/windows/dialog.c
index 0df3dd3..c232a38 100644 (file)
--- a/reactos/win32ss/user/user32/windows/dialog.c
+++ b/reactos/win32ss/user/user32/windows/dialog.c
@@ -285,7 +285,7 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info,
         info->windowName = HeapAlloc( GetProcessHeap(), 0, sizeof(L"#65535") );
         if (info->windowName != NULL)
         {
-            wsprintf((LPWSTR)info->windowName, L"#%d", GET_WORD(p + 1));
+            wsprintf((LPWSTR)info->windowName, L"#%u", GET_WORD(p + 1));
             info->windowNameFree = TRUE;
         }
         else
@@ -2126,9 +2126,12 @@ GetDlgItem(
   int nIDDlgItem)
 {
     int i;
-    HWND *list = WIN_ListChildren(hDlg);
+    HWND *list;
     HWND ret = 0;
 
+    if (!hDlg) return 0; 
+
+    list = WIN_ListChildren(hDlg);
     if (!list) return 0;
 
     for (i = 0; list[i]; i++) if (GetWindowLongPtrW(list[i], GWLP_ID) == nIDDlgItem) break;
@@ -2190,7 +2193,7 @@ GetDlgItemTextA(
 {
   HWND hWnd = GetDlgItem(hDlg, nIDDlgItem);
   if ( hWnd ) return GetWindowTextA(hWnd, lpString, nMaxCount);
-  if ( nMaxCount ) *lpString = 0;
+  if ( nMaxCount ) lpString[0] = '\0';
   return 0;
 }
 
@@ -2208,7 +2211,7 @@ GetDlgItemTextW(
 {
   HWND hWnd = GetDlgItem(hDlg, nIDDlgItem);
   if ( hWnd ) return GetWindowTextW(hWnd, lpString, nMaxCount);
-  if ( nMaxCount ) *lpString = 0;
+  if ( nMaxCount ) lpString[0] = '\0';
   return 0;
 }