Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-25 04:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PSDK|User32]

Browse source 
- Fix error return for future wine Win.c test_map_points tests.
- Add missing error code.

svn path=/trunk/; revision=57716
This commit is contained in:
James Tabor 2012-11-16 23:23:49 +00:00
parent f6f71e3fd1
commit edee22de36
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/include/psdk/winerror.h
View file

@ -838,6 +838,7 @@
#define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION 1459 #define ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION 1459
#define ERROR_TIMEOUT 1460 #define ERROR_TIMEOUT 1460
#define ERROR_INVALID_MONITOR_HANDLE 1461 #define ERROR_INVALID_MONITOR_HANDLE 1461
#define ERROR_INCORRECT_SIZE 1462
#define ERROR_EVENTLOG_FILE_CORRUPT 1500 #define ERROR_EVENTLOG_FILE_CORRUPT 1500
#define ERROR_EVENTLOG_CANT_START 1501 #define ERROR_EVENTLOG_CANT_START 1501
#define ERROR_LOG_FILE_FULL 1502 #define ERROR_LOG_FILE_FULL 1502

13
reactos/win32ss/user/user32/misc/misc.c
View file

@ -282,6 +282,8 @@ GetUser32Handle(HANDLE handle)
INT Index; INT Index;
USHORT generation; USHORT generation;
if (!handle) return NULL;
Index = (((UINT_PTR)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; Index = (((UINT_PTR)handle & 0xffff) - FIRST_USER_HANDLE) >> 1;
if (Index < 0 || Index >= gHandleTable->nb_handles) if (Index < 0 || Index >= gHandleTable->nb_handles)
@ -435,21 +437,14 @@ PWND
FASTCALL FASTCALL
ValidateHwnd(HWND hwnd) ValidateHwnd(HWND hwnd)
{ {
PWND Wnd;
PCLIENTINFO ClientInfo = GetWin32ClientInfo(); PCLIENTINFO ClientInfo = GetWin32ClientInfo();
ASSERT(ClientInfo != NULL); ASSERT(ClientInfo != NULL);
/* See if the window is cached */ /* See if the window is cached */
if (hwnd == ClientInfo->CallbackWnd.hWnd) if (hwnd && hwnd == ClientInfo->CallbackWnd.hWnd)
return ClientInfo->CallbackWnd.pWnd; return ClientInfo->CallbackWnd.pWnd;
Wnd = ValidateHandle((HANDLE)hwnd, otWindow); return ValidateHandle((HANDLE)hwnd, otWindow);
if (Wnd != NULL)
{
return Wnd;
}
return NULL;
} }
// //