Commit d69340cd authored by Rein Klazes's avatar Rein Klazes Committed by Alexandre Julliard

user32: Do not handle WM_ENDSESSION in DefWindowProc() with test.

parent 66255772
...@@ -662,11 +662,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa ...@@ -662,11 +662,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
case WM_QUERYENDSESSION: case WM_QUERYENDSESSION:
return 1; return 1;
case WM_ENDSESSION:
if (wParam)
PostQuitMessage(0);
return 0;
case WM_SETICON: case WM_SETICON:
{ {
HICON ret; HICON ret;
......
...@@ -11351,6 +11351,22 @@ static void test_paintingloop(void) ...@@ -11351,6 +11351,22 @@ static void test_paintingloop(void)
DestroyWindow(hwnd); DestroyWindow(hwnd);
} }
static void test_defwinproc(void)
{
HWND hwnd;
MSG msg;
int gotwmquit = FALSE;
hwnd = CreateWindowExA(0, "static", "test_defwndproc", WS_POPUP, 0,0,0,0,0,0,0, NULL);
assert(hwnd);
DefWindowProcA( hwnd, WM_ENDSESSION, 1, 0);
while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) {
if( msg.message == WM_QUIT) gotwmquit = TRUE;
DispatchMessageA( &msg );
}
ok( gotwmquit == FALSE, "Unexpected WM_QUIT message!\n");
DestroyWindow( hwnd);
}
START_TEST(msg) START_TEST(msg)
{ {
BOOL ret; BOOL ret;
...@@ -11432,6 +11448,7 @@ START_TEST(msg) ...@@ -11432,6 +11448,7 @@ START_TEST(msg)
test_dbcs_wm_char(); test_dbcs_wm_char();
test_menu_messages(); test_menu_messages();
test_paintingloop(); test_paintingloop();
test_defwinproc();
/* keep it the last test, under Windows it tends to break the tests /* keep it the last test, under Windows it tends to break the tests
* which rely on active/foreground windows being correct. * which rely on active/foreground windows being correct.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment