From: James Tabor <james.tabor@reactos.org>
Date: Fri, 16 Nov 2012 23:23:49 +0000 (+0000)
Subject: [PSDK|User32]
X-Git-Tag: backups/ros-csrss@60644~120^2~18
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=edee22de3619fc82b8994d9e818e94509eb61942

[PSDK|User32]
- Fix error return for future wine Win.c test_map_points tests.
- Add missing error code.

svn path=/trunk/; revision=57716
---

diff --git a/reactos/include/psdk/winerror.h b/reactos/include/psdk/winerror.h
index e83050d1f18..e6b397818bb 100644
--- a/reactos/include/psdk/winerror.h
+++ b/reactos/include/psdk/winerror.h
@@ -838,6 +838,7 @@
 #define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION           1459
 #define ERROR_TIMEOUT                                      1460
 #define ERROR_INVALID_MONITOR_HANDLE                       1461
+#define ERROR_INCORRECT_SIZE                               1462
 #define ERROR_EVENTLOG_FILE_CORRUPT                        1500
 #define ERROR_EVENTLOG_CANT_START                          1501
 #define ERROR_LOG_FILE_FULL                                1502
diff --git a/reactos/win32ss/user/user32/misc/misc.c b/reactos/win32ss/user/user32/misc/misc.c
index 8059f4cef3c..6763a613340 100644
--- a/reactos/win32ss/user/user32/misc/misc.c
+++ b/reactos/win32ss/user/user32/misc/misc.c
@@ -282,6 +282,8 @@ GetUser32Handle(HANDLE handle)
     INT Index;
     USHORT generation;
 
+    if (!handle) return NULL;
+
     Index = (((UINT_PTR)handle & 0xffff) - FIRST_USER_HANDLE) >> 1;
 
     if (Index < 0 || Index >= gHandleTable->nb_handles)
@@ -435,21 +437,14 @@ PWND
 FASTCALL
 ValidateHwnd(HWND hwnd)
 {
-    PWND Wnd;
     PCLIENTINFO ClientInfo = GetWin32ClientInfo();
     ASSERT(ClientInfo != NULL);
 
     /* See if the window is cached */
-    if (hwnd == ClientInfo->CallbackWnd.hWnd)
+    if (hwnd && hwnd == ClientInfo->CallbackWnd.hWnd)
         return ClientInfo->CallbackWnd.pWnd;
 
-    Wnd = ValidateHandle((HANDLE)hwnd, otWindow);
-    if (Wnd != NULL)
-    {
-        return Wnd;
-    }
-
-    return NULL;
+    return ValidateHandle((HANDLE)hwnd, otWindow);
 }
 
 //