diff --git a/dll/win32/uxtheme/themehooks.c b/dll/win32/uxtheme/themehooks.c index 95f53f383c6..caba3df1aaf 100644 --- a/dll/win32/uxtheme/themehooks.c +++ b/dll/win32/uxtheme/themehooks.c @@ -30,22 +30,22 @@ static LRESULT CALLBACK ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return ThemeDefWindowProcAW(hWnd, - Msg, - wParam, - lParam, - user32ApiHook.DefWindowProcW, - FALSE); + Msg, + wParam, + lParam, + user32ApiHook.DefWindowProcW, + FALSE); } static LRESULT CALLBACK ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return ThemeDefWindowProcAW(hWnd, - Msg, - wParam, - lParam, - user32ApiHook.DefWindowProcA, - TRUE); + Msg, + wParam, + lParam, + user32ApiHook.DefWindowProcA, + TRUE); } BOOL CALLBACK @@ -53,29 +53,29 @@ ThemeInitApiHook(UAPIHK State, PUSERAPIHOOK puah) { /* Sanity checks for the caller */ if (!puah || State != uahLoadInit) - { - return TRUE; - } + { + return TRUE; + } + + /* Store the original functions from user32 */ + user32ApiHook = *puah; - /* Store the original functions from user32 */ - user32ApiHook = *puah; - - puah->DefWindowProcA = ThemeDefWindowProcA; - puah->DefWindowProcW = ThemeDefWindowProcW; + puah->DefWindowProcA = ThemeDefWindowProcA; + puah->DefWindowProcW = ThemeDefWindowProcW; puah->DefWndProcArray.MsgBitArray = gabDWPmessages; puah->DefWndProcArray.Size = UAHOWP_MAX_SIZE; - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_CREATE); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_DESTROY); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_CREATE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_DESTROY); UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_THEMECHANGED); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCMOUSEMOVE); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_MOUSEMOVE); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCMOUSELEAVE); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCHITTEST); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCLBUTTONDOWN); - UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCLBUTTONDBLCLK); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCMOUSEMOVE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_MOUSEMOVE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCMOUSELEAVE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCHITTEST); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCLBUTTONDOWN); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCLBUTTONDBLCLK); return TRUE; } @@ -86,42 +86,42 @@ typedef BOOL (WINAPI * PREGISTER_UUAH_WIN2003)(PUSERAPIHOOKINFO puah); BOOL WINAPI ThemeHooksInstall() { - PVOID lpFunc; - OSVERSIONINFO osvi; - - lpFunc = GetProcAddress(GetModuleHandle("user32.dll"), "RegisterUserApiHook"); - + PVOID lpFunc; + OSVERSIONINFO osvi; + + lpFunc = GetProcAddress(GetModuleHandle("user32.dll"), "RegisterUserApiHook"); + ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&osvi); - - if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) - { - PREGISTER_UAH_WINXP lpfuncxp = (PREGISTER_UAH_WINXP)lpFunc; - return lpfuncxp(hDllInst, ThemeInitApiHook); - } - else if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) - { - PREGISTER_UUAH_WIN2003 lpfunc2003 = (PREGISTER_UUAH_WIN2003)lpFunc; - USERAPIHOOKINFO uah; - - uah.m_size = sizeof(uah); - uah.m_dllname1 = L"uxtheme.dll"; - uah.m_funname1 = L"ThemeInitApiHook"; - uah.m_dllname2 = NULL; - uah.m_funname2 = NULL; - - return lpfunc2003(&uah); - } - else - { - UNIMPLEMENTED; - return FALSE; - } + GetVersionEx(&osvi); + + if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) + { + PREGISTER_UAH_WINXP lpfuncxp = (PREGISTER_UAH_WINXP)lpFunc; + return lpfuncxp(hDllInst, ThemeInitApiHook); + } + else if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) + { + PREGISTER_UUAH_WIN2003 lpfunc2003 = (PREGISTER_UUAH_WIN2003)lpFunc; + USERAPIHOOKINFO uah; + + uah.m_size = sizeof(uah); + uah.m_dllname1 = L"uxtheme.dll"; + uah.m_funname1 = L"ThemeInitApiHook"; + uah.m_dllname2 = NULL; + uah.m_funname2 = NULL; + + return lpfunc2003(&uah); + } + else + { + UNIMPLEMENTED; + return FALSE; + } } BOOL WINAPI ThemeHooksRemove() { - return UnregisterUserApiHook(); + return UnregisterUserApiHook(); }