[gadamopoulos] 73773: [USER32] -class.c: Try to use 4 space indentation. Convert tabs to spaces.
11 Feb
2017
11 Feb
'17
12:18 p.m.
Author: gadamopoulos
Date: Sat Feb 11 12:18:06 2017
New Revision: 73773
URL: http://svn.reactos.org/svn/reactos?rev=73773&view=rev
Log:
[USER32] -class.c: Try to use 4 space indentation. Convert tabs to spaces.
Modified:
trunk/reactos/win32ss/user/user32/windows/class.c
Modified: trunk/reactos/win32ss/user/user32/windows/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Sat Feb 11 12:18:06
2017
@@ -37,80 +37,80 @@
HANDLE *pContext,
BOOL bAnsi)
{
- NTSTATUS Status;
- UNICODE_STRING SectionName;
- WCHAR SeactionNameBuf[MAX_PATH] = {0};
- ACTCTX_SECTION_KEYED_DATA KeyedData = { sizeof(KeyedData) };
-
- if (IS_ATOM(lpszClass))
- {
- SectionName.Buffer = (LPWSTR)&SeactionNameBuf;
- SectionName.MaximumLength = sizeof(SeactionNameBuf);
- if(!NtUserGetAtomName(LOWORD((DWORD_PTR)lpszClass), &SectionName))
- {
- return NULL;
- }
- }
- else
- {
- if (bAnsi)
- {
- RtlCreateUnicodeStringFromAsciiz(&SectionName, (LPSTR)lpszClass);
- }
- else
- {
- RtlInitUnicodeString(&SectionName, lpszClass);
- }
- }
- Status = RtlFindActivationContextSectionString(
FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX,
- NULL,
-
ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION,
- &SectionName,
- &KeyedData );
-
- if (NT_SUCCESS(Status) && KeyedData.ulDataFormatVersion == 1)
- {
- struct dll_redirect *dll = KeyedData.lpSectionBase;
-
- if (plpLibFileName) *plpLibFileName = dll->name;
-
- if (lpszMenuName)
- {
- WCHAR * mnubuf;
- LPWSTR mnuNameW;
- LPSTR mnuNameA;
- int len = 0;
- struct entity *entity = KeyedData.lpData;
-
- FIXME("actctx: Needs to support menu name from redirected class!");
-
- if (entity->clsid)
- {
- mnubuf = entity->clsid;
- if (bAnsi)
+ NTSTATUS Status;
+ UNICODE_STRING SectionName;
+ WCHAR SeactionNameBuf[MAX_PATH] = {0};
+ ACTCTX_SECTION_KEYED_DATA KeyedData = { sizeof(KeyedData) };
+
+ if (IS_ATOM(lpszClass))
+ {
+ SectionName.Buffer = (LPWSTR)&SeactionNameBuf;
+ SectionName.MaximumLength = sizeof(SeactionNameBuf);
+ if(!NtUserGetAtomName(LOWORD((DWORD_PTR)lpszClass), &SectionName))
+ {
+ return NULL;
+ }
+ }
+ else
+ {
+ if (bAnsi)
+ {
+ RtlCreateUnicodeStringFromAsciiz(&SectionName, (LPSTR)lpszClass);
+ }
+ else
+ {
+ RtlInitUnicodeString(&SectionName, lpszClass);
+ }
+ }
+ Status = RtlFindActivationContextSectionString(
FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX,
+ NULL,
+
ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION,
+ &SectionName,
+ &KeyedData );
+
+ if (NT_SUCCESS(Status) && KeyedData.ulDataFormatVersion == 1)
+ {
+ struct dll_redirect *dll = KeyedData.lpSectionBase;
+
+ if (plpLibFileName) *plpLibFileName = dll->name;
+
+ if (lpszMenuName)
+ {
+ WCHAR * mnubuf;
+ LPWSTR mnuNameW;
+ LPSTR mnuNameA;
+ int len = 0;
+ struct entity *entity = KeyedData.lpData;
+
+ FIXME("actctx: Needs to support menu name from redirected
class!");
+
+ if (entity->clsid)
{
- mnuNameA = (LPSTR)lpszMenuName;
- RtlUnicodeToMultiByteN( mnuNameA, 255, (PULONG)&len, mnubuf,
strlenW(mnubuf) * sizeof(WCHAR) );
- mnuNameA[len] = 0;
+ mnubuf = entity->clsid;
+ if (bAnsi)
+ {
+ mnuNameA = (LPSTR)lpszMenuName;
+ RtlUnicodeToMultiByteN( mnuNameA, 255, (PULONG)&len, mnubuf,
strlenW(mnubuf) * sizeof(WCHAR) );
+ mnuNameA[len] = 0;
+ }
+ else
+ {
+ mnuNameW = (LPWSTR)lpszMenuName;
+ len = strlenW(mnubuf) * sizeof(WCHAR);
+ RtlCopyMemory((void *)mnuNameW, mnubuf, len);
+ mnuNameW[len] = 0;
+ }
}
- else
- {
- mnuNameW = (LPWSTR)lpszMenuName;
- len = strlenW(mnubuf) * sizeof(WCHAR);
- RtlCopyMemory((void *)mnuNameW, mnubuf, len);
- mnuNameW[len] = 0;
- }
- }
- }
- if (pContext) *pContext = KeyedData.hActCtx;
- }
-
- if (!IS_ATOM(lpszClass) && bAnsi)
- RtlFreeUnicodeString(&SectionName);
- if (KeyedData.hActCtx)
- RtlReleaseActivationContext(KeyedData.hActCtx);
-
- return lpszClass;
+ }
+ if (pContext) *pContext = KeyedData.hActCtx;
+ }
+
+ if (!IS_ATOM(lpszClass) && bAnsi)
+ RtlFreeUnicodeString(&SectionName);
+ if (KeyedData.hActCtx)
+ RtlReleaseActivationContext(KeyedData.hActCtx);
+
+ return lpszClass;
}
//
@@ -124,57 +124,57 @@
HANDLE Contex,
HMODULE * phLibModule)
{
- BOOL Ret;
- HMODULE hLibModule;
- PREGISTERCLASSNAMEW pRegisterClassNameW;
- UNICODE_STRING ClassName;
- WCHAR ClassNameBuf[MAX_PATH] = {0};
- RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame = { sizeof(Frame),
1 };
-
- RtlActivateActivationContextUnsafeFast(&Frame, Contex);
-
- Ret = FALSE;
- hLibModule = NULL;
-
- _SEH2_TRY
- {
- hLibModule = LoadLibraryW(lpLibFileName);
- if ( hLibModule )
- {
- if ((pRegisterClassNameW = (void*) GetProcAddress(hLibModule,
"RegisterClassNameW")))
- {
- if (IS_ATOM(pszClass))
+ BOOL Ret;
+ HMODULE hLibModule;
+ PREGISTERCLASSNAMEW pRegisterClassNameW;
+ UNICODE_STRING ClassName;
+ WCHAR ClassNameBuf[MAX_PATH] = {0};
+ RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED Frame = { sizeof(Frame),
1 };
+
+ RtlActivateActivationContextUnsafeFast(&Frame, Contex);
+
+ Ret = FALSE;
+ hLibModule = NULL;
+
+ _SEH2_TRY
+ {
+ hLibModule = LoadLibraryW(lpLibFileName);
+ if ( hLibModule )
+ {
+ if ((pRegisterClassNameW = (void*) GetProcAddress(hLibModule,
"RegisterClassNameW")))
{
- ClassName.Buffer = (LPWSTR)&ClassNameBuf;
- ClassName.MaximumLength = sizeof(ClassNameBuf);
- if (!NtUserGetAtomName(LOWORD((DWORD_PTR)pszClass), &ClassName))
- {
- _SEH2_YIELD(goto Error_Exit);
- }
- pszClass = (PCWSTR)&ClassNameBuf;
+ if (IS_ATOM(pszClass))
+ {
+ ClassName.Buffer = (LPWSTR)&ClassNameBuf;
+ ClassName.MaximumLength = sizeof(ClassNameBuf);
+ if (!NtUserGetAtomName(LOWORD((DWORD_PTR)pszClass), &ClassName))
+ {
+ _SEH2_YIELD(goto Error_Exit);
+ }
+ pszClass = (PCWSTR)&ClassNameBuf;
+ }
+ Ret = pRegisterClassNameW(pszClass);
}
- Ret = pRegisterClassNameW(pszClass);
- }
- }
- }
- _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
- {
- }
- _SEH2_END
+ }
+ }
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ }
+ _SEH2_END
Error_Exit:
- if ( Ret || !hLibModule )
- {
- if ( phLibModule ) *phLibModule = hLibModule;
- }
- else
- {
- DWORD save_error = GetLastError();
- FreeLibrary(hLibModule);
- SetLastError(save_error);
- }
-
- return Ret;
+ if ( Ret || !hLibModule )
+ {
+ if ( phLibModule ) *phLibModule = hLibModule;
+ }
+ else
+ {
+ DWORD save_error = GetLastError();
+ FreeLibrary(hLibModule);
+ SetLastError(save_error);
+ }
+
+ return Ret;
}
//
@@ -228,60 +228,60 @@
HANDLE Contex,
HMODULE * phLibModule)
{
- // Should be lpLibFileName.....
- static const WCHAR comctl32W[] =
{'c','o','m','c','t','l','3','2','.','d','l','l',0};
- //
- PREGISTERCLASSNAMEW pRegisterClassNameW;
- UNICODE_STRING ClassName;
- WCHAR ClassNameBuf[MAX_PATH] = {0};
- BOOL Ret = FALSE;
- HMODULE hLibModule = NULL;
-
- if (!IS_ATOM(pszClass) && is_comctl32_class( pszClass ))
- {
- _SEH2_TRY
- {
- hLibModule = LoadLibraryW(comctl32W);
- if ( hLibModule )
- {
- if ((pRegisterClassNameW = (void*) GetProcAddress(hLibModule,
"RegisterClassNameW")))
- {
- if (IS_ATOM(pszClass))
+ // Should be lpLibFileName.....
+ static const WCHAR comctl32W[] =
{'c','o','m','c','t','l','3','2','.','d','l','l',0};
+ //
+ PREGISTERCLASSNAMEW pRegisterClassNameW;
+ UNICODE_STRING ClassName;
+ WCHAR ClassNameBuf[MAX_PATH] = {0};
+ BOOL Ret = FALSE;
+ HMODULE hLibModule = NULL;
+
+ if (!IS_ATOM(pszClass) && is_comctl32_class( pszClass ))
+ {
+ _SEH2_TRY
+ {
+ hLibModule = LoadLibraryW(comctl32W);
+ if ( hLibModule )
{
- ClassName.Buffer = (LPWSTR)&ClassNameBuf;
- ClassName.MaximumLength = sizeof(ClassNameBuf);
- if (!NtUserGetAtomName(LOWORD((DWORD_PTR)pszClass), &ClassName))
- {
- ERR("Error while verifying ATOM\n");
- _SEH2_YIELD(goto Error_Exit);
- }
- pszClass = (PCWSTR)&ClassNameBuf;
+ if ((pRegisterClassNameW = (void*) GetProcAddress(hLibModule,
"RegisterClassNameW")))
+ {
+ if (IS_ATOM(pszClass))
+ {
+ ClassName.Buffer = (LPWSTR)&ClassNameBuf;
+ ClassName.MaximumLength = sizeof(ClassNameBuf);
+ if (!NtUserGetAtomName(LOWORD((DWORD_PTR)pszClass),
&ClassName))
+ {
+ ERR("Error while verifying ATOM\n");
+ _SEH2_YIELD(goto Error_Exit);
+ }
+ pszClass = (PCWSTR)&ClassNameBuf;
+ }
+ Ret = pRegisterClassNameW(pszClass);
+ }
}
- Ret = pRegisterClassNameW(pszClass);
- }
- }
- }
- _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
- {
- }
- _SEH2_END
+ }
+ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+ {
+ }
+ _SEH2_END
Error_Exit:
- if ( Ret || !hLibModule )
- {
- if ( phLibModule ) *phLibModule = hLibModule;
- }
- else
- {
- DWORD save_error = GetLastError();
- FreeLibrary(hLibModule);
- SetLastError(save_error);
- }
- TRACE( "%s retrying after loading comctl32\n", debugstr_w(pszClass) );
- return Ret;
- }
- TRACE("NO ComCtl32 Class %S!\n",pszClass);
- return FALSE;
+ if ( Ret || !hLibModule )
+ {
+ if ( phLibModule ) *phLibModule = hLibModule;
+ }
+ else
+ {
+ DWORD save_error = GetLastError();
+ FreeLibrary(hLibModule);
+ SetLastError(save_error);
+ }
+ TRACE( "%s retrying after loading comctl32\n", debugstr_w(pszClass) );
+ return Ret;
+ }
+ TRACE("NO ComCtl32 Class %S!\n",pszClass);
+ return FALSE;
}
//
//
@@ -310,8 +310,8 @@
if (!lpwcx)
{
- SetLastError( ERROR_NOACCESS );
- return FALSE;
+ SetLastError( ERROR_NOACCESS );
+ return FALSE;
}
if (hInstance == User32Instance)
@@ -347,35 +347,35 @@
for(;;)
{
- Ret = NtUserGetClassInfo( hInstance,
- &ClassName,
- (LPWNDCLASSEXW)lpwcx,
- (LPWSTR *)&pszMenuName,
+ Ret = NtUserGetClassInfo( hInstance,
+ &ClassName,
+ (LPWNDCLASSEXW)lpwcx,
+ (LPWSTR *)&pszMenuName,
TRUE);
- if (Ret) break;
- if (!ClassFound)
- {
- save_error = GetLastError();
- if ( save_error == ERROR_CANNOT_FIND_WND_CLASS ||
- save_error == ERROR_CLASS_DOES_NOT_EXIST )
- {
- ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL,
&hLibModule);
- if (ClassFound) continue;
- }
- }
- if (hLibModule)
- {
- save_error = GetLastError();
- FreeLibrary(hLibModule);
- SetLastError(save_error);
- hLibModule = 0;
- }
- break;
+ if (Ret) break;
+ if (!ClassFound)
+ {
+ save_error = GetLastError();
+ if ( save_error == ERROR_CANNOT_FIND_WND_CLASS ||
+ save_error == ERROR_CLASS_DOES_NOT_EXIST )
+ {
+ ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL,
&hLibModule);
+ if (ClassFound) continue;
+ }
+ }
+ if (hLibModule)
+ {
+ save_error = GetLastError();
+ FreeLibrary(hLibModule);
+ SetLastError(save_error);
+ hLibModule = 0;
+ }
+ break;
}
if (Ret)
{
- lpwcx->lpszClassName = lpszClass;
+ lpwcx->lpszClassName = lpszClass;
// lpwcx->lpszMenuName = pszMenuName;
}
@@ -447,35 +447,35 @@
for(;;)
{
- Ret = NtUserGetClassInfo( hInstance,
- &ClassName,
- lpwcx,
- &pszMenuName,
- FALSE);
- if (Ret) break;
- if (!ClassFound)
- {
- save_error = GetLastError();
- if ( save_error == ERROR_CANNOT_FIND_WND_CLASS ||
- save_error == ERROR_CLASS_DOES_NOT_EXIST )
- {
- ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL,
&hLibModule);
- if (ClassFound) continue;
- }
- }
- if (hLibModule)
- {
- save_error = GetLastError();
- FreeLibrary(hLibModule);
- SetLastError(save_error);
- hLibModule = 0;
- }
- break;
+ Ret = NtUserGetClassInfo( hInstance,
+ &ClassName,
+ lpwcx,
+ &pszMenuName,
+ FALSE);
+ if (Ret) break;
+ if (!ClassFound)
+ {
+ save_error = GetLastError();
+ if ( save_error == ERROR_CANNOT_FIND_WND_CLASS ||
+ save_error == ERROR_CLASS_DOES_NOT_EXIST )
+ {
+ ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL,
&hLibModule);
+ if (ClassFound) continue;
+ }
+ }
+ if (hLibModule)
+ {
+ save_error = GetLastError();
+ FreeLibrary(hLibModule);
+ SetLastError(save_error);
+ hLibModule = 0;
+ }
+ break;
}
if (Ret)
{
- lpwcx->lpszClassName = lpszClass;
+ lpwcx->lpszClassName = lpszClass;
// lpwcx->lpszMenuName = pszMenuName;
}
return Ret;
@@ -549,51 +549,51 @@
ULONG_PTR FASTCALL
IntGetClsWndProc(PWND pWnd, PCLS Class, BOOL Ansi)
{
- INT i;
- ULONG_PTR gcpd, Ret = 0;
+ INT i;
+ ULONG_PTR gcpd, Ret = 0;
// If server side, sweep through proc list and return the client side proc.
- if (Class->CSF_flags & CSF_SERVERSIDEPROC)
- { // Always scan through the list due to wine class "deftest".
- for ( i = FNID_FIRST; i <= FNID_SWITCH; i++)
- {
- if (GETPFNSERVER(i) == Class->lpfnWndProc)
- {
- if (Ansi)
- Ret = (ULONG_PTR)GETPFNCLIENTA(i);
- else
- Ret = (ULONG_PTR)GETPFNCLIENTW(i);
- }
- }
- return Ret;
- }
- // Set return proc.
- Ret = (ULONG_PTR)Class->lpfnWndProc;
- // Return the proc if one of the FnId default class type.
- if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON)
- {
- if (Ansi)
- { // If match return the right proc by type.
- if (GETPFNCLIENTW(Class->fnid) == Class->lpfnWndProc)
- Ret = (ULONG_PTR)GETPFNCLIENTA(Class->fnid);
- }
- else
- {
- if (GETPFNCLIENTA(Class->fnid) == Class->lpfnWndProc)
- Ret = (ULONG_PTR)GETPFNCLIENTW(Class->fnid);
- }
- }
- // Return on change or Ansi/Unicode proc equal.
- if ( Ret != (ULONG_PTR)Class->lpfnWndProc ||
- Ansi == !!(Class->CSF_flags & CSF_ANSIPROC) )
- return Ret;
-
- /* We have an Ansi and Unicode swap! If Ansi create Unicode proc handle.
- This will force CallWindowProc to deal with it. */
- gcpd = NtUserGetCPD( UserHMGetHandle(pWnd),
- (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWndtoCls,
- Ret);
-
- return (gcpd ? gcpd : Ret);
+ if (Class->CSF_flags & CSF_SERVERSIDEPROC)
+ { // Always scan through the list due to wine class "deftest".
+ for ( i = FNID_FIRST; i <= FNID_SWITCH; i++)
+ {
+ if (GETPFNSERVER(i) == Class->lpfnWndProc)
+ {
+ if (Ansi)
+ Ret = (ULONG_PTR)GETPFNCLIENTA(i);
+ else
+ Ret = (ULONG_PTR)GETPFNCLIENTW(i);
+ }
+ }
+ return Ret;
+ }
+ // Set return proc.
+ Ret = (ULONG_PTR)Class->lpfnWndProc;
+ // Return the proc if one of the FnId default class type.
+ if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON)
+ {
+ if (Ansi)
+ { // If match return the right proc by type.
+ if (GETPFNCLIENTW(Class->fnid) == Class->lpfnWndProc)
+ Ret = (ULONG_PTR)GETPFNCLIENTA(Class->fnid);
+ }
+ else
+ {
+ if (GETPFNCLIENTA(Class->fnid) == Class->lpfnWndProc)
+ Ret = (ULONG_PTR)GETPFNCLIENTW(Class->fnid);
+ }
+ }
+ // Return on change or Ansi/Unicode proc equal.
+ if ( Ret != (ULONG_PTR)Class->lpfnWndProc ||
+ Ansi == !!(Class->CSF_flags & CSF_ANSIPROC) )
+ return Ret;
+
+ /* We have an Ansi and Unicode swap! If Ansi create Unicode proc handle.
+ This will force CallWindowProc to deal with it. */
+ gcpd = NtUserGetCPD( UserHMGetHandle(pWnd),
+ (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWndtoCls,
+ Ret);
+
+ return (gcpd ? gcpd : Ret);
}
//
@@ -602,71 +602,71 @@
WNDPROC FASTCALL
IntGetWndProc(PWND pWnd, BOOL Ansi)
{
- INT i;
- WNDPROC gcpd, Ret = 0;
- PCLS Class = DesktopPtrToUser(pWnd->pcls);
-
- if (!Class) return Ret;
-
- if (pWnd->state & WNDS_SERVERSIDEWINDOWPROC)
- {
- for ( i = FNID_FIRST; i <= FNID_SWITCH; i++)
- {
- if (GETPFNSERVER(i) == pWnd->lpfnWndProc)
- {
+ INT i;
+ WNDPROC gcpd, Ret = 0;
+ PCLS Class = DesktopPtrToUser(pWnd->pcls);
+
+ if (!Class) return Ret;
+
+ if (pWnd->state & WNDS_SERVERSIDEWINDOWPROC)
+ {
+ for ( i = FNID_FIRST; i <= FNID_SWITCH; i++)
+ {
+ if (GETPFNSERVER(i) == pWnd->lpfnWndProc)
+ {
+ if (Ansi)
+ Ret = GETPFNCLIENTA(i);
+ else
+ Ret = GETPFNCLIENTW(i);
+ }
+ }
+ return Ret;
+ }
+ // Wine Class tests:
+ /* Edit controls are special - they return a wndproc handle when
+ GetWindowLongPtr is called with a different A/W.
+ On the other hand there is no W->A->W conversion so this control
+ is treated specially.
+ */
+ if (Class->fnid == FNID_EDIT)
+ Ret = pWnd->lpfnWndProc;
+ else
+ {
+ // Set return proc.
+ Ret = pWnd->lpfnWndProc;
+
+ if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON)
+ {
if (Ansi)
- Ret = GETPFNCLIENTA(i);
+ {
+ if (GETPFNCLIENTW(Class->fnid) == pWnd->lpfnWndProc)
+ Ret = GETPFNCLIENTA(Class->fnid);
+ }
else
- Ret = GETPFNCLIENTW(i);
- }
- }
- return Ret;
- }
- // Wine Class tests:
- /* Edit controls are special - they return a wndproc handle when
- GetWindowLongPtr is called with a different A/W.
- On the other hand there is no W->A->W conversion so this control
- is treated specially.
- */
- if (Class->fnid == FNID_EDIT)
- Ret = pWnd->lpfnWndProc;
- else
- {
- // Set return proc.
- Ret = pWnd->lpfnWndProc;
-
- if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON)
- {
- if (Ansi)
- {
- if (GETPFNCLIENTW(Class->fnid) == pWnd->lpfnWndProc)
- Ret = GETPFNCLIENTA(Class->fnid);
- }
- else
- {
- if (GETPFNCLIENTA(Class->fnid) == pWnd->lpfnWndProc)
- Ret = GETPFNCLIENTW(Class->fnid);
- }
- }
- // Return on the change.
- if ( Ret != pWnd->lpfnWndProc)
+ {
+ if (GETPFNCLIENTA(Class->fnid) == pWnd->lpfnWndProc)
+ Ret = GETPFNCLIENTW(Class->fnid);
+ }
+ }
+ // Return on the change.
+ if ( Ret != pWnd->lpfnWndProc)
+ return Ret;
+ }
+
+ if ( Ansi == !!(pWnd->state & WNDS_ANSIWINDOWPROC) )
return Ret;
- }
-
- if ( Ansi == !!(pWnd->state & WNDS_ANSIWINDOWPROC) )
- return Ret;
-
- gcpd = (WNDPROC)NtUserGetCPD( UserHMGetHandle(pWnd),
- (Ansi ? UserGetCPDA2U : UserGetCPDU2A
)|UserGetCPDWindow,
- (ULONG_PTR)Ret);
-
- return (gcpd ? gcpd : Ret);
+
+ gcpd = (WNDPROC)NtUserGetCPD( UserHMGetHandle(pWnd),
+ (Ansi ? UserGetCPDA2U : UserGetCPDU2A
)|UserGetCPDWindow,
+ (ULONG_PTR)Ret);
+
+ return (gcpd ? gcpd : Ret);
}
static ULONG_PTR FASTCALL
IntGetClassLongA(PWND Wnd, PCLS Class, int nIndex)
{
- ULONG_PTR Ret = 0;
+ ULONG_PTR Ret = 0;
if (nIndex >= 0)
{
@@ -735,13 +735,13 @@
}
}
- return Ret;
+ return Ret;
}
static ULONG_PTR FASTCALL
IntGetClassLongW (PWND Wnd, PCLS Class, int nIndex)
{
- ULONG_PTR Ret = 0;
+ ULONG_PTR Ret = 0;
if (nIndex >= 0)
{
@@ -809,7 +809,7 @@
}
}
- return Ret;
+ return Ret;
}
/*
@@ -834,24 +834,24 @@
if (Class != NULL)
{
#ifdef _WIN64
- switch (nIndex)
- {
- case GCLP_HBRBACKGROUND:
- case GCLP_HCURSOR:
- case GCLP_HICON:
- case GCLP_HICONSM:
- case GCLP_HMODULE:
- case GCLP_MENUNAME:
- case GCLP_WNDPROC:
- SetLastError(ERROR_INVALID_INDEX);
- break;
-
- default:
- Ret = IntGetClassLongA(Wnd, Class, nIndex);
- break;
- }
+ switch (nIndex)
+ {
+ case GCLP_HBRBACKGROUND:
+ case GCLP_HCURSOR:
+ case GCLP_HICON:
+ case GCLP_HICONSM:
+ case GCLP_HMODULE:
+ case GCLP_MENUNAME:
+ case GCLP_WNDPROC:
+ SetLastError(ERROR_INVALID_INDEX);
+ break;
+
+ default:
+ Ret = IntGetClassLongA(Wnd, Class, nIndex);
+ break;
+ }
#else
- Ret = IntGetClassLongA(Wnd, Class, nIndex);
+ Ret = IntGetClassLongA(Wnd, Class, nIndex);
#endif
}
else
@@ -890,24 +890,24 @@
if (Class != NULL)
{
#ifdef _WIN64
- switch (nIndex)
- {
- case GCLP_HBRBACKGROUND:
- case GCLP_HCURSOR:
- case GCLP_HICON:
- case GCLP_HICONSM:
- case GCLP_HMODULE:
- case GCLP_MENUNAME:
- case GCLP_WNDPROC:
- SetLastError(ERROR_INVALID_INDEX);
- break;
-
- default:
- Ret = IntGetClassLongW(Wnd, Class, nIndex);
- break;
- }
+ switch (nIndex)
+ {
+ case GCLP_HBRBACKGROUND:
+ case GCLP_HCURSOR:
+ case GCLP_HICON:
+ case GCLP_HICONSM:
+ case GCLP_HMODULE:
+ case GCLP_MENUNAME:
+ case GCLP_WNDPROC:
+ SetLastError(ERROR_INVALID_INDEX);
+ break;
+
+ default:
+ Ret = IntGetClassLongW(Wnd, Class, nIndex);
+ break;
+ }
#else
- Ret = IntGetClassLongW(Wnd, Class, nIndex);
+ Ret = IntGetClassLongW(Wnd, Class, nIndex);
#endif
}
else
@@ -948,7 +948,7 @@
Class = DesktopPtrToUser(Wnd->pcls);
if (Class != NULL)
{
- Ret = IntGetClassLongA(Wnd, Class, nIndex);
+ Ret = IntGetClassLongA(Wnd, Class, nIndex);
}
else
{
@@ -987,7 +987,7 @@
Class = DesktopPtrToUser(Wnd->pcls);
if (Class != NULL)
{
- Ret = IntGetClassLongW(Wnd, Class, nIndex);
+ Ret = IntGetClassLongW(Wnd, Class, nIndex);
}
else
{
@@ -1133,15 +1133,15 @@
case GWLP_ID: retvalue = wndPtr->IDMenu; break;
case GWLP_HINSTANCE: retvalue = (ULONG_PTR)wndPtr->hModule; break;
case GWLP_WNDPROC:
- {
- if (!TestWindowProcess(wndPtr))
- {
- SetLastError(ERROR_ACCESS_DENIED);
- retvalue = 0;
- }
- retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, !unicode);
+ {
+ if (!TestWindowProcess(wndPtr))
+ {
+ SetLastError(ERROR_ACCESS_DENIED);
+ retvalue = 0;
+ }
+ retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, !unicode);
break;
- }
+ }
default:
WARN("Unknown offset %d\n", offset );
SetLastError( ERROR_INVALID_INDEX );
@@ -1265,147 +1265,147 @@
static HICON
CreateSmallIcon(HICON StdIcon)
{
- HICON SmallIcon = NULL;
- ICONINFO StdInfo;
- int SmallIconWidth;
- int SmallIconHeight;
- BITMAP StdBitmapInfo;
- HDC hSourceDc = NULL;
- HDC hDestDc = NULL;
- ICONINFO SmallInfo;
- HBITMAP OldSourceBitmap = NULL;
- HBITMAP OldDestBitmap = NULL;
-
- SmallInfo.hbmColor = NULL;
- SmallInfo.hbmMask = NULL;
-
- /* We need something to work with... */
- if (NULL == StdIcon)
- {
- goto cleanup;
- }
-
- SmallIconWidth = GetSystemMetrics(SM_CXSMICON);
- SmallIconHeight = GetSystemMetrics(SM_CYSMICON);
- if (! GetIconInfo(StdIcon, &StdInfo))
- {
- ERR("Failed to get icon info for icon 0x%x\n", StdIcon);
- goto cleanup;
- }
+ HICON SmallIcon = NULL;
+ ICONINFO StdInfo;
+ int SmallIconWidth;
+ int SmallIconHeight;
+ BITMAP StdBitmapInfo;
+ HDC hSourceDc = NULL;
+ HDC hDestDc = NULL;
+ ICONINFO SmallInfo;
+ HBITMAP OldSourceBitmap = NULL;
+ HBITMAP OldDestBitmap = NULL;
+
+ SmallInfo.hbmColor = NULL;
+ SmallInfo.hbmMask = NULL;
+
+ /* We need something to work with... */
+ if (NULL == StdIcon)
+ {
+ goto cleanup;
+ }
+
+ SmallIconWidth = GetSystemMetrics(SM_CXSMICON);
+ SmallIconHeight = GetSystemMetrics(SM_CYSMICON);
+ if (! GetIconInfo(StdIcon, &StdInfo))
+ {
+ ERR("Failed to get icon info for icon 0x%x\n", StdIcon);
+ goto cleanup;
+ }
if (! GetObjectW(StdInfo.hbmMask, sizeof(BITMAP), &StdBitmapInfo))
- {
- ERR("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
- StdIcon, StdInfo.hbmColor);
- goto cleanup;
- }
- if (StdBitmapInfo.bmWidth == SmallIconWidth &&
- StdBitmapInfo.bmHeight == SmallIconHeight)
- {
- /* Icon already has the correct dimensions */
- return StdIcon;
- }
-
- hSourceDc = CreateCompatibleDC(NULL);
- if (NULL == hSourceDc)
- {
- ERR("Failed to create source DC\n");
- goto cleanup;
- }
- hDestDc = CreateCompatibleDC(NULL);
- if (NULL == hDestDc)
- {
- ERR("Failed to create dest DC\n");
- goto cleanup;
- }
-
- OldSourceBitmap = SelectObject(hSourceDc, StdInfo.hbmColor);
- if (NULL == OldSourceBitmap)
- {
- ERR("Failed to select source color bitmap\n");
- goto cleanup;
- }
- SmallInfo.hbmColor = CreateCompatibleBitmap(hSourceDc, SmallIconWidth,
- SmallIconHeight);
- if (NULL == SmallInfo.hbmColor)
- {
- ERR("Failed to create color bitmap\n");
- goto cleanup;
- }
- OldDestBitmap = SelectObject(hDestDc, SmallInfo.hbmColor);
- if (NULL == OldDestBitmap)
- {
- ERR("Failed to select dest color bitmap\n");
- goto cleanup;
- }
- if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
- hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
- StdBitmapInfo.bmHeight, SRCCOPY))
- {
- ERR("Failed to stretch color bitmap\n");
- goto cleanup;
- }
-
- if (NULL == SelectObject(hSourceDc, StdInfo.hbmMask))
- {
- ERR("Failed to select source mask bitmap\n");
- goto cleanup;
- }
- SmallInfo.hbmMask = CreateCompatibleBitmap(hSourceDc, SmallIconWidth,
SmallIconHeight);
- if (NULL == SmallInfo.hbmMask)
- {
- ERR("Failed to create mask bitmap\n");
- goto cleanup;
- }
- if (NULL == SelectObject(hDestDc, SmallInfo.hbmMask))
- {
- ERR("Failed to select dest mask bitmap\n");
- goto cleanup;
- }
- if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
- hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
- StdBitmapInfo.bmHeight, SRCCOPY))
- {
- ERR("Failed to stretch mask bitmap\n");
- goto cleanup;
- }
-
- SmallInfo.fIcon = TRUE;
- SmallInfo.xHotspot = SmallIconWidth / 2;
- SmallInfo.yHotspot = SmallIconHeight / 2;
- SmallIcon = CreateIconIndirect(&SmallInfo);
- if (NULL == SmallIcon)
- {
- ERR("Failed to create icon\n");
- goto cleanup;
- }
+ {
+ ERR("Failed to get bitmap info for icon 0x%x bitmap 0x%x\n",
+ StdIcon, StdInfo.hbmColor);
+ goto cleanup;
+ }
+ if (StdBitmapInfo.bmWidth == SmallIconWidth &&
+ StdBitmapInfo.bmHeight == SmallIconHeight)
+ {
+ /* Icon already has the correct dimensions */
+ return StdIcon;
+ }
+
+ hSourceDc = CreateCompatibleDC(NULL);
+ if (NULL == hSourceDc)
+ {
+ ERR("Failed to create source DC\n");
+ goto cleanup;
+ }
+ hDestDc = CreateCompatibleDC(NULL);
+ if (NULL == hDestDc)
+ {
+ ERR("Failed to create dest DC\n");
+ goto cleanup;
+ }
+
+ OldSourceBitmap = SelectObject(hSourceDc, StdInfo.hbmColor);
+ if (NULL == OldSourceBitmap)
+ {
+ ERR("Failed to select source color bitmap\n");
+ goto cleanup;
+ }
+ SmallInfo.hbmColor = CreateCompatibleBitmap(hSourceDc, SmallIconWidth,
+ SmallIconHeight);
+ if (NULL == SmallInfo.hbmColor)
+ {
+ ERR("Failed to create color bitmap\n");
+ goto cleanup;
+ }
+ OldDestBitmap = SelectObject(hDestDc, SmallInfo.hbmColor);
+ if (NULL == OldDestBitmap)
+ {
+ ERR("Failed to select dest color bitmap\n");
+ goto cleanup;
+ }
+ if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
+ hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
+ StdBitmapInfo.bmHeight, SRCCOPY))
+ {
+ ERR("Failed to stretch color bitmap\n");
+ goto cleanup;
+ }
+
+ if (NULL == SelectObject(hSourceDc, StdInfo.hbmMask))
+ {
+ ERR("Failed to select source mask bitmap\n");
+ goto cleanup;
+ }
+ SmallInfo.hbmMask = CreateCompatibleBitmap(hSourceDc, SmallIconWidth,
SmallIconHeight);
+ if (NULL == SmallInfo.hbmMask)
+ {
+ ERR("Failed to create mask bitmap\n");
+ goto cleanup;
+ }
+ if (NULL == SelectObject(hDestDc, SmallInfo.hbmMask))
+ {
+ ERR("Failed to select dest mask bitmap\n");
+ goto cleanup;
+ }
+ if (! StretchBlt(hDestDc, 0, 0, SmallIconWidth, SmallIconHeight,
+ hSourceDc, 0, 0, StdBitmapInfo.bmWidth,
+ StdBitmapInfo.bmHeight, SRCCOPY))
+ {
+ ERR("Failed to stretch mask bitmap\n");
+ goto cleanup;
+ }
+
+ SmallInfo.fIcon = TRUE;
+ SmallInfo.xHotspot = SmallIconWidth / 2;
+ SmallInfo.yHotspot = SmallIconHeight / 2;
+ SmallIcon = CreateIconIndirect(&SmallInfo);
+ if (NULL == SmallIcon)
+ {
+ ERR("Failed to create icon\n");
+ goto cleanup;
+ }
cleanup:
- if (NULL != SmallInfo.hbmMask)
- {
- DeleteObject(SmallInfo.hbmMask);
- }
- if (NULL != OldDestBitmap)
- {
- SelectObject(hDestDc, OldDestBitmap);
- }
- if (NULL != SmallInfo.hbmColor)
- {
- DeleteObject(SmallInfo.hbmColor);
- }
- if (NULL != hDestDc)
- {
- DeleteDC(hDestDc);
- }
- if (NULL != OldSourceBitmap)
- {
- SelectObject(hSourceDc, OldSourceBitmap);
- }
- if (NULL != hSourceDc)
- {
- DeleteDC(hSourceDc);
- }
-
- return SmallIcon;
+ if (NULL != SmallInfo.hbmMask)
+ {
+ DeleteObject(SmallInfo.hbmMask);
+ }
+ if (NULL != OldDestBitmap)
+ {
+ SelectObject(hDestDc, OldDestBitmap);
+ }
+ if (NULL != SmallInfo.hbmColor)
+ {
+ DeleteObject(SmallInfo.hbmColor);
+ }
+ if (NULL != hDestDc)
+ {
+ DeleteDC(hDestDc);
+ }
+ if (NULL != OldSourceBitmap)
+ {
+ SelectObject(hSourceDc, OldSourceBitmap);
+ }
+ if (NULL != hSourceDc)
+ {
+ DeleteDC(hSourceDc);
+ }
+
+ return SmallIcon;
}
#endif
@@ -1416,125 +1416,125 @@
DWORD dwFlags,
BOOL ChkRegCls)
{
- ATOM Atom;
- WNDCLASSEXW WndClass;
- UNICODE_STRING ClassName;
- UNICODE_STRING MenuName = {0};
- CLSMENUNAME clsMenuName;
- ANSI_STRING AnsiMenuName;
- HMODULE hLibModule = NULL;
- DWORD save_error;
- BOOL ClassFound = FALSE;
-
- if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) ||
- lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 ||
- lpwcx->lpszClassName == NULL)
- {
- TRACE("RegisterClassExWOWW Invalid Parameter Error!\n");
- SetLastError(ERROR_INVALID_PARAMETER);
- return 0;
- }
-
- if (ChkRegCls)
- {
- if (!RegisterDefaultClasses) RegisterSystemControls();
- }
- /*
- * On real Windows this looks more like:
- * if (lpwcx->hInstance == User32Instance &&
- * *(PULONG)((ULONG_PTR)NtCurrentTeb() + 0x6D4) & 0x400)
- * But since I have no idea what the magic field in the
- * TEB structure means, I rather decided to omit that.
- * -- Filip Navara
-
- GetWin32ClientInfo()->dwExpWinVer & (WINVER == 0x400)
- */
- if (lpwcx->hInstance == User32Instance)
- {
- TRACE("RegisterClassExWOWW User32Instance!\n");
- SetLastError(ERROR_INVALID_PARAMETER);
- return 0;
- }
- /* Yes, this is correct. We should modify the passed structure. */
- if (lpwcx->hInstance == NULL)
- ((WNDCLASSEXW*)lpwcx)->hInstance = GetModuleHandleW(NULL);
-
- RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW));
-/*
- if (NULL == WndClass.hIconSm)
- {
- WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon);
- }
+ ATOM Atom;
+ WNDCLASSEXW WndClass;
+ UNICODE_STRING ClassName;
+ UNICODE_STRING MenuName = {0};
+ CLSMENUNAME clsMenuName;
+ ANSI_STRING AnsiMenuName;
+ HMODULE hLibModule = NULL;
+ DWORD save_error;
+ BOOL ClassFound = FALSE;
+
+ if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) ||
+ lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 ||
+ lpwcx->lpszClassName == NULL)
+ {
+ TRACE("RegisterClassExWOWW Invalid Parameter Error!\n");
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return 0;
+ }
+
+ if (ChkRegCls)
+ {
+ if (!RegisterDefaultClasses) RegisterSystemControls();
+ }
+ /*
+ * On real Windows this looks more like:
+ * if (lpwcx->hInstance == User32Instance &&
+ * *(PULONG)((ULONG_PTR)NtCurrentTeb() + 0x6D4) & 0x400)
+ * But since I have no idea what the magic field in the
+ * TEB structure means, I rather decided to omit that.
+ * -- Filip Navara
+
+ GetWin32ClientInfo()->dwExpWinVer & (WINVER == 0x400)
+ */
+ if (lpwcx->hInstance == User32Instance)
+ {
+ TRACE("RegisterClassExWOWW User32Instance!\n");
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return 0;
+ }
+ /* Yes, this is correct. We should modify the passed structure. */
+ if (lpwcx->hInstance == NULL)
+ ((WNDCLASSEXW*)lpwcx)->hInstance = GetModuleHandleW(NULL);
+
+ RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW));
+/*
+ if (NULL == WndClass.hIconSm)
+ {
+ WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon);
+ }
*/
- RtlInitEmptyAnsiString(&AnsiMenuName, NULL, 0);
- if (WndClass.lpszMenuName != NULL)
- {
- if (!IS_INTRESOURCE(WndClass.lpszMenuName))
- {
- if (WndClass.lpszMenuName[0])
- {
- RtlInitUnicodeString(&MenuName, WndClass.lpszMenuName);
- RtlUnicodeStringToAnsiString( &AnsiMenuName, &MenuName, TRUE);
- }
- }
- else
- {
- MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName;
- AnsiMenuName.Buffer = (PCHAR)WndClass.lpszMenuName;
- }
- }
-
- if (IS_ATOM(WndClass.lpszClassName))
- {
- ClassName.Length =
- ClassName.MaximumLength = 0;
- ClassName.Buffer = (LPWSTR)WndClass.lpszClassName;
- }
- else
- {
- RtlInitUnicodeString(&ClassName, WndClass.lpszClassName);
- }
-
- clsMenuName.pszClientAnsiMenuName = AnsiMenuName.Buffer;
- clsMenuName.pwszClientUnicodeMenuName = MenuName.Buffer;
- clsMenuName.pusMenuName = &MenuName;
-
- for(;;)
- {
- Atom = NtUserRegisterClassExWOW( &WndClass,
- &ClassName,
- &ClassName, //PUNICODE_STRING ClsNVersion,
- &clsMenuName,
+ RtlInitEmptyAnsiString(&AnsiMenuName, NULL, 0);
+ if (WndClass.lpszMenuName != NULL)
+ {
+ if (!IS_INTRESOURCE(WndClass.lpszMenuName))
+ {
+ if (WndClass.lpszMenuName[0])
+ {
+ RtlInitUnicodeString(&MenuName, WndClass.lpszMenuName);
+ RtlUnicodeStringToAnsiString( &AnsiMenuName, &MenuName, TRUE);
+ }
+ }
+ else
+ {
+ MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName;
+ AnsiMenuName.Buffer = (PCHAR)WndClass.lpszMenuName;
+ }
+ }
+
+ if (IS_ATOM(WndClass.lpszClassName))
+ {
+ ClassName.Length =
+ ClassName.MaximumLength = 0;
+ ClassName.Buffer = (LPWSTR)WndClass.lpszClassName;
+ }
+ else
+ {
+ RtlInitUnicodeString(&ClassName, WndClass.lpszClassName);
+ }
+
+ clsMenuName.pszClientAnsiMenuName = AnsiMenuName.Buffer;
+ clsMenuName.pwszClientUnicodeMenuName = MenuName.Buffer;
+ clsMenuName.pusMenuName = &MenuName;
+
+ for(;;)
+ {
+ Atom = NtUserRegisterClassExWOW( &WndClass,
+ &ClassName,
+ &ClassName, //PUNICODE_STRING ClsNVersion,
+ &clsMenuName,
fnID,
dwFlags,
pdwWowData);
- if (Atom) break;
- if (!ClassFound)
- {
- save_error = GetLastError();
- if ( save_error == ERROR_CANNOT_FIND_WND_CLASS ||
- save_error == ERROR_CLASS_DOES_NOT_EXIST )
- {
- ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL,
&hLibModule);
- if (ClassFound) continue;
- }
- }
- if (hLibModule)
- {
- save_error = GetLastError();
- FreeLibrary(hLibModule);
- SetLastError(save_error);
- hLibModule = 0;
- }
- break;
- }
-
- TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d
class=%p\n",
- Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground,
- lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass);
-
- return Atom;
+ if (Atom) break;
+ if (!ClassFound)
+ {
+ save_error = GetLastError();
+ if ( save_error == ERROR_CANNOT_FIND_WND_CLASS ||
+ save_error == ERROR_CLASS_DOES_NOT_EXIST )
+ {
+ ClassFound = VersionRegisterClass(ClassName.Buffer, NULL, NULL,
&hLibModule);
+ if (ClassFound) continue;
+ }
+ }
+ if (hLibModule)
+ {
+ save_error = GetLastError();
+ FreeLibrary(hLibModule);
+ SetLastError(save_error);
+ hLibModule = 0;
+ }
+ break;
+ }
+
+ TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d
class=%p\n",
+ Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground,
+ lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass);
+
+ return Atom;
}
/*
@@ -1543,44 +1543,44 @@
ATOM WINAPI
RegisterClassExA(CONST WNDCLASSEXA *lpwcx)
{
- RTL_ATOM Atom;
- WNDCLASSEXW WndClass;
- WCHAR mname[MAX_BUFFER_LEN];
- WCHAR cname[MAX_BUFFER_LEN];
-
- RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXA));
-
- if (WndClass.lpszMenuName != NULL)
- {
- if (!IS_INTRESOURCE(WndClass.lpszMenuName))
- {
- if (WndClass.lpszMenuName[0])
- {
- if (!MultiByteToWideChar( CP_ACP, 0, lpwcx->lpszMenuName, -1, mname,
MAX_ATOM_LEN + 1 )) return 0;
-
- WndClass.lpszMenuName = mname;
- }
- }
- }
-
- if (!IS_ATOM(WndClass.lpszClassName))
- {
- if (!MultiByteToWideChar( CP_ACP, 0, lpwcx->lpszClassName, -1, cname,
MAX_ATOM_LEN + 1 )) return 0;
-
- WndClass.lpszClassName = cname;
- }
-
- Atom = RegisterClassExWOWW( &WndClass,
+ RTL_ATOM Atom;
+ WNDCLASSEXW WndClass;
+ WCHAR mname[MAX_BUFFER_LEN];
+ WCHAR cname[MAX_BUFFER_LEN];
+
+ RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXA));
+
+ if (WndClass.lpszMenuName != NULL)
+ {
+ if (!IS_INTRESOURCE(WndClass.lpszMenuName))
+ {
+ if (WndClass.lpszMenuName[0])
+ {
+ if (!MultiByteToWideChar( CP_ACP, 0, lpwcx->lpszMenuName, -1, mname,
MAX_ATOM_LEN + 1 )) return 0;
+
+ WndClass.lpszMenuName = mname;
+ }
+ }
+ }
+
+ if (!IS_ATOM(WndClass.lpszClassName))
+ {
+ if (!MultiByteToWideChar( CP_ACP, 0, lpwcx->lpszClassName, -1, cname,
MAX_ATOM_LEN + 1 )) return 0;
+
+ WndClass.lpszClassName = cname;
+ }
+
+ Atom = RegisterClassExWOWW( &WndClass,
0,
0,
CSF_ANSIPROC,
TRUE);
- TRACE("A atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d
class=%p\n",
- Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground,
- lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass);
-
- return (ATOM)Atom;
+ TRACE("A atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d
class=%p\n",
+ Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground,
+ lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass);
+
+ return (ATOM)Atom;
}
/*
@@ -1589,15 +1589,15 @@
ATOM WINAPI
RegisterClassExW(CONST WNDCLASSEXW *lpwcx)
{
- ATOM Atom;
-
- Atom = RegisterClassExWOWW( (WNDCLASSEXW *)lpwcx, 0, 0, 0, TRUE);
-
- TRACE("W atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d
winExt=%d\n",
+ ATOM Atom;
+
+ Atom = RegisterClassExWOWW( (WNDCLASSEXW *)lpwcx, 0, 0, 0, TRUE);
+
+ TRACE("W atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d
winExt=%d\n",
Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground,
lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra);
- return Atom;
+ return Atom;
}
/*
@@ -1606,16 +1606,16 @@
ATOM WINAPI
RegisterClassA(CONST WNDCLASSA *lpWndClass)
{
- WNDCLASSEXA Class;
-
- if (lpWndClass == NULL)
- return 0;
-
- RtlCopyMemory(&Class.style, lpWndClass, sizeof(WNDCLASSA));
- Class.cbSize = sizeof(WNDCLASSEXA);
- Class.hIconSm = NULL;
-
- return RegisterClassExA(&Class);
+ WNDCLASSEXA Class;
+
+ if (lpWndClass == NULL)
+ return 0;
+
+ RtlCopyMemory(&Class.style, lpWndClass, sizeof(WNDCLASSA));
+ Class.cbSize = sizeof(WNDCLASSEXA);
+ Class.hIconSm = NULL;
+
+ return RegisterClassExA(&Class);
}
/*
@@ -1624,16 +1624,16 @@
ATOM WINAPI
RegisterClassW(CONST WNDCLASSW *lpWndClass)
{
- WNDCLASSEXW Class;
-
- if (lpWndClass == NULL)
- return 0;
-
- RtlCopyMemory(&Class.style, lpWndClass, sizeof(WNDCLASSW));
- Class.cbSize = sizeof(WNDCLASSEXW);
- Class.hIconSm = NULL;
-
- return RegisterClassExW(&Class);
+ WNDCLASSEXW Class;
+
+ if (lpWndClass == NULL)
+ return 0;
+
+ RtlCopyMemory(&Class.style, lpWndClass, sizeof(WNDCLASSW));
+ Class.cbSize = sizeof(WNDCLASSEXW);
+ Class.hIconSm = NULL;
+
+ return RegisterClassExW(&Class);
}
/*
@@ -1833,7 +1833,7 @@
int nIndex,
LONG dwNewLong)
{
- return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, TRUE);
+ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, TRUE);
}
/*
@@ -1846,7 +1846,7 @@
int nIndex,
LONG dwNewLong)
{
- return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE);
+ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE);
}
#ifdef _WIN64
@@ -1859,7 +1859,7 @@
INT nIndex,
LONG_PTR dwNewLong)
{
- return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE);
+ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE);
}
/*
@@ -1871,7 +1871,7 @@
INT nIndex,
LONG_PTR dwNewLong)
{
- return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE);
+ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE);
}
#endif
2834
days inactive
2834
days old
0 comments
1 participants
participants (1)
-
gadamopoulos＠svn.reactos.org