Index: H:/trunk/reactos_tests/dll/win32/uxtheme/themehooks.c =================================================================== --- H:/trunk/reactos_tests/dll/win32/uxtheme/themehooks.c (révision 64133) +++ H:/trunk/reactos_tests/dll/win32/uxtheme/themehooks.c (copie de travail) @@ -184,37 +184,93 @@ static LRESULT CALLBACK ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsAppThemed()) + // if(!IsAppThemed()) + // { + + if (Msg == WM_GETTEXT) { + ERR("In ThemeDefWindowProcW, non-themed mode, WM_GETTEXT detected\n"); + } + else if (Msg == WM_SETTEXT) + { + ERR("\n" + "In ThemeDefWindowProcW, non-themed mode, setting text:\n" + "Unicode: '%S'\n" + "Ansi: '%s'\n", + (LPWSTR)lParam, (LPSTR)lParam); + // __debugbreak(); + } + return user32ApiHook.DefWindowProcW(hWnd, Msg, wParam, lParam); - } + // } - return ThemeWndProc(hWnd, - Msg, - wParam, - lParam, - user32ApiHook.DefWindowProcW); + // if (Msg == WM_GETTEXT) + // { + // ERR("In ThemeDefWindowProcW, WM_GETTEXT detected\n"); + // } + // else if (Msg == WM_SETTEXT) + // { + // ERR("\n" + // "In ThemeDefWindowProcW, setting text:\n" + // "Unicode: '%S'\n" + // "Ansi: '%s'\n", + // (LPWSTR)lParam, (LPSTR)lParam); + // } + + // return ThemeWndProc(hWnd, + // Msg, + // wParam, + // lParam, + // user32ApiHook.DefWindowProcW); } static LRESULT CALLBACK ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { - if(!IsAppThemed()) + // if(!IsAppThemed()) + // { + + if (Msg == WM_GETTEXT) { + ERR("In ThemeDefWindowProcA, non-themed mode, WM_GETTEXT detected\n"); + } + else if (Msg == WM_SETTEXT) + { + ERR("\n" + "In ThemeDefWindowProcA, non-themed mode, setting text:\n" + "Unicode: '%S'\n" + "Ansi: '%s'\n", + (LPWSTR)lParam, (LPSTR)lParam); + // __debugbreak(); + } + return user32ApiHook.DefWindowProcA(hWnd, Msg, wParam, lParam); - } + // } - return ThemeWndProc(hWnd, - Msg, - wParam, - lParam, - user32ApiHook.DefWindowProcA); + // if (Msg == WM_GETTEXT) + // { + // ERR("In ThemeDefWindowProcA, WM_GETTEXT detected\n"); + // } + // else if (Msg == WM_SETTEXT) + // { + // ERR("\n" + // "In ThemeDefWindowProcA, setting text:\n" + // "Unicode: '%S'\n" + // "Ansi: '%s'\n", + // (LPWSTR)lParam, (LPSTR)lParam); + // } + + // return ThemeWndProc(hWnd, + // Msg, + // wParam, + // lParam, + // user32ApiHook.DefWindowProcA); } static LRESULT CALLBACK