ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Search for user32 window classes before searching for system classes

Browse Source 
- Register the user32 base address with win32k. Technically this is not really neccessary because user32's base address is fixed

svn path=/trunk/; revision=27935
This commit is contained in:
Thomas Bluemel
2007-07-27 19:23:22 +00:00
parent fb76bb0053
commit 2a672fc18c
5 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/user32/include/user32p.h
+3
View File
@@ -76,6 +76,9 @@
#define NtUserSetCaretBlinkTime(uMSeconds) \
(BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME)
#define NtUserRegisterUserModule(hInstance) \
(BOOL)NtUserCallOneParam((DWORD)hInstance, ONEPARAM_ROUTINE_REGISTERUSERMODULE)
/*
#define NtUserEnumClipboardFormats(format) \
(UINT)NtUserCallOneParam(format, ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS)
reactos/dll/win32/user32/misc/dllmain.c
+3
View File
@@ -93,6 +93,9 @@ DllMain(
{
case DLL_PROCESS_ATTACH:
User32Instance = hInstanceDll;
if (!NtUserRegisterUserModule(hInstanceDll))
return FALSE;
hProcessHeap = RtlGetProcessHeap();
if (!Init())
return FALSE;
reactos/include/reactos/win32k/ntuser.h
+3 -1
View File
@@ -60,6 +60,7 @@ typedef struct _WINDOWCLASS
typedef struct _W32PROCESSINFO
{
PVOID UserHandleTable;
HINSTANCE hModUser;
PWINDOWCLASS LocalClassList;
PWINDOWCLASS GlobalClassList;
PWINDOWCLASS SystemClassList;
@@ -458,7 +459,8 @@ NtUserCallNoParam(
#define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27
#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28
#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29
#define ONEPARAM_ROUTINE_SHOWCURSOR 0x30
#define ONEPARAM_ROUTINE_SHOWCURSOR 0x30
#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0x31
DWORD
NTAPI
NtUserCallOneParam(
reactos/subsystems/win32/win32k/ntuser/class.c
+39 -9
View File
@@ -592,7 +592,7 @@ IntDereferenceClass(IN OUT PWINDOWCLASS Class,
while (*PrevLink != BaseClass)
{
ASSERT(BaseClass != NULL);
ASSERT(*PrevLink != NULL);
PrevLink = &BaseClass->Next;
}
@@ -1112,7 +1112,27 @@ IntGetClassAtom(IN PUNICODE_STRING ClassName,
goto FoundClass;
}
/* Step 3: try to find a system class */
/* Step 3: try to find any local class registered by user32 */
Class = IntFindClass(Atom,
pi->hModUser,
&pi->LocalClassList,
Link);
if (Class != NULL)
{
goto FoundClass;
}
/* Step 4: try to find any global class registered by user32 */
Class = IntFindClass(Atom,
pi->hModUser,
&pi->GlobalClassList,
Link);
if (Class != NULL)
{
goto FoundClass;
}
/* Step 5: try to find a system class */
Class = IntFindClass(Atom,
NULL,
&pi->SystemClassList,
@@ -1771,10 +1791,13 @@ UserGetClassInfo(IN PWINDOWCLASS Class,
IN BOOL Ansi,
HINSTANCE hInstance)
{
PW32PROCESSINFO pi;
lpwcx->style = Class->Style;
pi = GetW32ProcessInfo();
lpwcx->lpfnWndProc = IntGetClassWndProc(Class,
GetW32ProcessInfo(),
pi,
Ansi,
FALSE);
@@ -1789,9 +1812,7 @@ UserGetClassInfo(IN PWINDOWCLASS Class,
else
lpwcx->lpszMenuName = Class->MenuName;
if (hInstance)
lpwcx->hInstance = hInstance;
else if (Class->Global)
if (Class->hInstance == pi->hModUser)
lpwcx->hInstance = NULL;
else
lpwcx->hInstance = Class->hInstance;
@@ -2119,7 +2140,7 @@ NtUserGetClassInfo(
/* probe the paramters */
CapturedClassName = ProbeForReadUnicodeString(ClassName);
if (IS_ATOM(CapturedClassName.Buffer))
if (CapturedClassName.Length == 0)
TRACE("hInst %p atom %04X lpWndClassEx %p Ansi %d\n", hInstance, CapturedClassName.Buffer, lpWndClassEx, Ansi);
else
TRACE("hInst %p class %wZ lpWndClassEx %p Ansi %d\n", hInstance, &CapturedClassName, lpWndClassEx, Ansi);
@@ -2162,6 +2183,9 @@ InvalidParameter:
NULL);
if (ClassAtom != (RTL_ATOM)0)
{
if (hInstance == NULL)
hInstance = pi->hModUser;
Ret = UserGetClassInfo(Class,
lpWndClassEx,
Ansi,
@@ -2186,7 +2210,10 @@ InvalidParameter:
if (!(Class->Global || Class->System) && hInstance == NULL)
{
WARN("Tried to get information of a non-existing class\n");
if (CapturedClassName.Length == 0)
WARN("Tried to get information of a non-existing class atom 0x%p\n", CapturedClassName.Buffer);
else
WARN("Tried to get information of a non-existing class \"%wZ\"\n", &CapturedClassName);
SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST);
Ret = FALSE;
}
@@ -2194,7 +2221,10 @@ InvalidParameter:
}
else
{
WARN("Tried to get information of a non-existing class\n");
if (CapturedClassName.Length == 0)
WARN("Tried to get information of a non-existing class atom 0x%p\n", CapturedClassName.Buffer);
else
WARN("Tried to get information of a non-existing class \"%wZ\"\n", &CapturedClassName);
SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST);
}
}
reactos/subsystems/win32/win32k/ntuser/misc.c
+20
View File
@@ -407,6 +407,26 @@ NtUserCallOneParam(
case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT:
RETURN( (DWORD)UserGetKeyboardLayout(Param));
case ONEPARAM_ROUTINE_REGISTERUSERMODULE:
{
PW32THREADINFO ti;
ti = GetW32ThreadInfo();
if (ti == NULL)
{
DPRINT1("Cannot register user32 module instance!\n");
SetLastWin32Error(ERROR_INVALID_PARAMETER);
RETURN(FALSE);
}
if (InterlockedCompareExchangePointer(&ti->kpi->hModUser,
(HINSTANCE)Param,
NULL) == NULL)
{
RETURN(TRUE);
}
}
}
DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n",
Routine, Param);