Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32]: Fix formatting in User32CreateWindowEx, no code changes.

Browse source 
svn path=/trunk/; revision=74017
This commit is contained in:
Hermès Bélusca-Maïto 2017-03-01 19:23:27 +00:00
parent b6a16efc88
commit 0366c75f60
1 changed files with 52 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
reactos/win32ss/user/user32/windows/window.c
View file

@ -172,7 +172,7 @@ User32CreateWindowEx(DWORD dwExStyle,
WNDCLASSEXA wceA;
WNDCLASSEXW wceW;
HMODULE hLibModule = NULL;
DWORD save_error;
DWORD dwLastError;
BOOL Unicode, ClassFound = FALSE;
HWND Handle = NULL;
LPCWSTR lpszClsVersion;
@ -185,8 +185,8 @@ User32CreateWindowEx(DWORD dwExStyle,
if (!RegisterDefaultClasses)
{
TRACE("RegisterSystemControls\n");
RegisterSystemControls();
TRACE("RegisterSystemControls\n");
RegisterSystemControls();
}
Unicode = !(dwFlags & NUCWE_ANSI);
@ -197,14 +197,16 @@ User32CreateWindowEx(DWORD dwExStyle,
}
else
{
if(Unicode)
if (Unicode)
{
RtlInitUnicodeString(&ClassName, (PCWSTR)lpClassName);
}
else
{
if (!RtlCreateUnicodeStringFromAsciiz(&ClassName, (PCSZ)lpClassName))
{
SetLastError(ERROR_OUTOFMEMORY);
return (HWND)0;
return NULL;
}
}
@ -247,20 +249,20 @@ User32CreateWindowEx(DWORD dwExStyle,
}
}
if(!hMenu && (dwStyle & (WS_OVERLAPPEDWINDOW | WS_POPUP)))
if (!hMenu && (dwStyle & (WS_OVERLAPPEDWINDOW | WS_POPUP)))
{
if(Unicode)
if (Unicode)
{
wceW.cbSize = sizeof(WNDCLASSEXW);
if(GetClassInfoExW(hInstance, (LPCWSTR)lpClassName, &wceW) && wceW.lpszMenuName)
wceW.cbSize = sizeof(wceW);
if (GetClassInfoExW(hInstance, (LPCWSTR)lpClassName, &wceW) && wceW.lpszMenuName)
{
hMenu = LoadMenuW(hInstance, wceW.lpszMenuName);
}
}
else
{
wceA.cbSize = sizeof(WNDCLASSEXA);
if(GetClassInfoExA(hInstance, lpClassName, &wceA) && wceA.lpszMenuName)
wceA.cbSize = sizeof(wceA);
if (GetClassInfoExA(hInstance, lpClassName, &wceA) && wceA.lpszMenuName)
{
hMenu = LoadMenuA(hInstance, wceA.lpszMenuName);
}
@ -283,54 +285,53 @@ User32CreateWindowEx(DWORD dwExStyle,
plstrClassVersion = &lstrClassVersion;
}
for(;;)
for (;;)
{
Handle = NtUserCreateWindowEx(dwExStyle,
plstrClassName,
plstrClassVersion,
&WindowName,
dwStyle,
x,
y,
nWidth,
nHeight,
hWndParent,
hMenu,
hInstance,
lpParam,
dwFlags,
NULL);
if (Handle) break;
if (!lpLibFileName) break;
if (!ClassFound)
{
save_error = GetLastError();
if ( save_error == ERROR_CANNOT_FIND_WND_CLASS )
{
ClassFound = VersionRegisterClass(ClassName.Buffer, lpLibFileName, pCtx, &hLibModule);
if (ClassFound) continue;
}
}
if (hLibModule)
{
save_error = GetLastError();
FreeLibrary(hLibModule);
SetLastError(save_error);
hLibModule = 0;
}
break;
Handle = NtUserCreateWindowEx(dwExStyle,
plstrClassName,
plstrClassVersion,
&WindowName,
dwStyle,
x,
y,
nWidth,
nHeight,
hWndParent,
hMenu,
hInstance,
lpParam,
dwFlags,
NULL);
if (Handle) break;
if (!lpLibFileName) break;
if (!ClassFound)
{
dwLastError = GetLastError();
if (dwLastError == ERROR_CANNOT_FIND_WND_CLASS)
{
ClassFound = VersionRegisterClass(ClassName.Buffer, lpLibFileName, pCtx, &hLibModule);
if (ClassFound) continue;
}
}
if (hLibModule)
{
dwLastError = GetLastError();
FreeLibrary(hLibModule);
SetLastError(dwLastError);
hLibModule = NULL;
}
break;
}
#if 0
DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle);
#endif
cleanup:
if(!Unicode)
if (!Unicode)
{
if (!IS_ATOM(lpClassName))
{
RtlFreeUnicodeString(&ClassName);
}
RtlFreeLargeString(&WindowName);
}
@ -573,8 +574,8 @@ CreateWindowExW(DWORD dwExStyle,
}
hwnd = User32CreateWindowEx(dwExStyle,
(LPCSTR) lpClassName,
(LPCSTR) lpWindowName,
(LPCSTR)lpClassName,
(LPCSTR)lpWindowName,
dwStyle,
x,
y,