December 2009 - Wine-Commits

Huw Davies : gdiplus: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: b18cc9f680e522c9e7f7321d07688a77c3ab127f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18cc9f680e522c9e7f7321d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:28:12 2009 +0000 gdiplus: Fix a memory leak in the tests. Found by Valgrind. --- dlls/gdiplus/tests/graphics.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 2a03aad..45bd9f7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1338,6 +1338,7 @@ static void test_Get_Release_DC(void) GdipDeletePen(pen); GdipDeleteGraphics(graphics); + GdipDeleteRegion(clip); GdipDeletePath(path); GdipDeleteBrush((GpBrush*)brush); GdipDeleteRegion(region);

1 0

Huw Davies : gdiplus: Fix a memory leak in the tests.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 70742d5e5a252e7d14fd4e1d6c8369ea0ddc1393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70742d5e5a252e7d14fd4e1d6… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:32:58 2009 +0000 gdiplus: Fix a memory leak in the tests. Found by Valgrind. --- dlls/gdiplus/tests/font.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 3134ffc..7b95d4c 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -193,6 +193,7 @@ todo_wine { stat = GdipCreateFontFamilyFromName (MSSansSerif, NULL, &family); expect (FontFamilyNotFound, stat); + if(stat == Ok) GdipDeleteFontFamily(family); } stat = GdipCreateFontFamilyFromName (arial, NULL, &family);

1 0

Huw Davies : riched20: Initialise the style flags.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: d4383b4498af9617c632abe6cb39af0e31e4f139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4383b4498af9617c632abe6c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 15 11:52:02 2009 +0000 riched20: Initialise the style flags. Found by Valgrind. --- dlls/riched20/editor.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6790a6a..3dc1133 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2648,6 +2648,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->hwndParent = NULL; ed->texthost = texthost; ed->bEmulateVersion10 = bEmulateVersion10; + ed->styleFlags = 0; ITextHost_TxGetPropertyBits(texthost, (TXTBIT_RICHTEXT|TXTBIT_MULTILINE| TXTBIT_READONLY|TXTBIT_USEPASSWORD|

1 0

Marcus Meissner : dbghelp: Check for NULL return from process_find_by_handle (Coverity).
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 6feb525bc7742e0767d56a1026f08c9b1a787207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6feb525bc7742e0767d56a102… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Dec 15 11:14:48 2009 +0100 dbghelp: Check for NULL return from process_find_by_handle (Coverity). --- dlls/dbghelp/dbghelp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index ae26518..1fe829a 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -466,6 +466,7 @@ static BOOL CALLBACK reg_cb64to32(HANDLE hProcess, ULONG action, ULONG64 data, U IMAGEHLP_DEFERRED_SYMBOL_LOAD64* idsl64; IMAGEHLP_DEFERRED_SYMBOL_LOAD idsl; + if (!pcs) return FALSE; switch (action) { case CBA_DEBUG_INFO:

1 0

Eric Pouech : dbghelp: Move the core of some line related functions to 64bit interface.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 9500df82f1d64cb413527b182b8805b8f990c60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9500df82f1d64cb413527b182… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:17 2009 +0100 dbghelp: Move the core of some line related functions to 64bit interface. --- dlls/dbghelp/dbghelp_private.h | 4 +- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 134 +++++++++++++++++++--------------------- 3 files changed, 67 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9500df82f1d64cb413527…

1 0

Eric Pouech : winedbg: Implement breakpoint management for x86_64 targets.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 4195c2f3bb646a14d1730f83797a6b7646979a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4195c2f3bb646a14d1730f837… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:00 2009 +0100 winedbg: Implement breakpoint management for x86_64 targets. --- programs/winedbg/be_x86_64.c | 135 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 128 insertions(+), 7 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index ed5cdf2..2f58c88 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -2,6 +2,7 @@ * Debugger x86_64 specific functions * * Copyright 2004 Vincent Béron + * Copyright 2009 Eric Pouech * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,6 +20,9 @@ */ #include "debugger.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winedbg); #if defined(__x86_64__) @@ -187,31 +191,148 @@ static void be_x86_64_disasm_one_insn(ADDRESS64* addr, int display) dbg_printf("Disasm NIY\n"); } +#define DR7_CONTROL_SHIFT 16 +#define DR7_CONTROL_SIZE 4 + +#define DR7_RW_EXECUTE (0x0) +#define DR7_RW_WRITE (0x1) +#define DR7_RW_READ (0x3) + +#define DR7_LEN_1 (0x0) +#define DR7_LEN_2 (0x4) +#define DR7_LEN_4 (0xC) + +#define DR7_LOCAL_ENABLE_SHIFT 0 +#define DR7_GLOBAL_ENABLE_SHIFT 1 +#define DR7_ENABLE_SIZE 2 + +#define DR7_LOCAL_ENABLE_MASK (0x55) +#define DR7_GLOBAL_ENABLE_MASK (0xAA) + +#define DR7_CONTROL_RESERVED (0xFC00) +#define DR7_LOCAL_SLOWDOWN (0x100) +#define DR7_GLOBAL_SLOWDOWN (0x200) + +#define DR7_ENABLE_MASK(dr) (1<<(DR7_LOCAL_ENABLE_SHIFT+DR7_ENABLE_SIZE*(dr))) +#define IS_DR7_SET(ctrl,dr) ((ctrl)&DR7_ENABLE_MASK(dr)) + +static inline int be_x86_64_get_unused_DR(CONTEXT* ctx, DWORD64** r) +{ + if (!IS_DR7_SET(ctx->Dr7, 0)) + { + *r = &ctx->Dr0; + return 0; + } + if (!IS_DR7_SET(ctx->Dr7, 1)) + { + *r = &ctx->Dr1; + return 1; + } + if (!IS_DR7_SET(ctx->Dr7, 2)) + { + *r = &ctx->Dr2; + return 2; + } + if (!IS_DR7_SET(ctx->Dr7, 3)) + { + *r = &ctx->Dr3; + return 3; + } + dbg_printf("All hardware registers have been used\n"); + + return -1; +} + static unsigned be_x86_64_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long* val, unsigned size) { - dbg_printf("not done insert_Xpoint\n"); - return 0; + unsigned char ch; + SIZE_T sz; + DWORD64 *pr; + int reg; + unsigned long bits; + + switch (type) + { + case be_xpoint_break: + if (size != 0) return 0; + if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + *val = ch; + ch = 0xcc; + if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + break; + case be_xpoint_watch_exec: + bits = DR7_RW_EXECUTE; + goto hw_bp; + case be_xpoint_watch_read: + bits = DR7_RW_READ; + goto hw_bp; + case be_xpoint_watch_write: + bits = DR7_RW_WRITE; + hw_bp: + if ((reg = be_x86_64_get_unused_DR(ctx, &pr)) == -1) return 0; + *pr = (DWORD64)addr; + if (type != be_xpoint_watch_exec) switch (size) + { + case 4: bits |= DR7_LEN_4; break; + case 2: bits |= DR7_LEN_2; break; + case 1: bits |= DR7_LEN_1; break; + default: return 0; + } + *val = reg; + /* clear old values */ + ctx->Dr7 &= ~(0x0F << (DR7_CONTROL_SHIFT + DR7_CONTROL_SIZE * reg)); + /* set the correct ones */ + ctx->Dr7 |= bits << (DR7_CONTROL_SHIFT + DR7_CONTROL_SIZE * reg); + ctx->Dr7 |= DR7_ENABLE_MASK(reg) | DR7_LOCAL_SLOWDOWN; + break; + default: + dbg_printf("Unknown bp type %c\n", type); + return 0; + } + return 1; } static unsigned be_x86_64_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, CONTEXT* ctx, enum be_xpoint_type type, void* addr, unsigned long val, unsigned size) { - dbg_printf("not done remove_Xpoint\n"); - return FALSE; + SIZE_T sz; + unsigned char ch; + + switch (type) + { + case be_xpoint_break: + if (size != 0) return 0; + if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + if (ch != (unsigned char)0xCC) + WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", + ch, (unsigned long)addr); + ch = (unsigned char)val; + if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return 0; + break; + case be_xpoint_watch_exec: + case be_xpoint_watch_read: + case be_xpoint_watch_write: + /* simply disable the entry */ + ctx->Dr7 &= ~DR7_ENABLE_MASK(val); + break; + default: + dbg_printf("Unknown bp type %c\n", type); + return 0; + } + return 1; } static unsigned be_x86_64_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) { - dbg_printf("not done is_watchpoint_set\n"); - return FALSE; + return ctx->Dr6 & (1 << idx); } static void be_x86_64_clear_watchpoint(CONTEXT* ctx, unsigned idx) { - dbg_printf("not done clear_watchpoint\n"); + ctx->Dr6 &= ~(1 << idx); } static int be_x86_64_adjust_pc_for_break(CONTEXT* ctx, BOOL way)

1 0

Eric Pouech : dbghelp: Rewrite the symt* <=> index wrappers to that they work on 64bit platforms.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 7b83b70b06ce6453cf3dc1d81d2af5264ea66a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b83b70b06ce6453cf3dc1d81… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:54 2009 +0100 dbghelp: Rewrite the symt* <=> index wrappers to that they work on 64bit platforms. --- dlls/dbghelp/dbghelp_private.h | 13 +++---------- dlls/dbghelp/module.c | 2 ++ dlls/dbghelp/symbol.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index bb5b990..a0b40a1 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -335,6 +335,7 @@ struct module struct pool pool; /* symbols & symbol tables */ + struct vector vsymt; int sortlist_valid; unsigned num_sorttab; /* number of symbols with addresses */ unsigned num_symbols; @@ -418,16 +419,6 @@ struct pdb_lookup } u; }; -static inline DWORD symt_ptr2index(struct module* module, const struct symt* sym) -{ - return (DWORD)sym; -} - -static inline struct symt* symt_index2ptr(struct module* module, DWORD id) -{ - return (struct symt*)id; -} - /* dbghelp.c */ extern struct process* process_find_by_handle(HANDLE hProcess); extern HANDLE hMsvcrt; @@ -614,6 +605,8 @@ extern struct symt_hierarchy_point* symt_new_label(struct module* module, struct symt_compiland* compiland, const char* name, unsigned long address); +extern struct symt* symt_index2ptr(struct module* module, DWORD id); +extern DWORD symt_ptr2index(struct module* module, const struct symt* sym); /* type.c */ extern void symt_init_basic(struct module* module); diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 55eca44..53f56c2 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -173,6 +173,8 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->addr_sorttab = NULL; module->num_sorttab = 0; module->num_symbols = 0; + + vector_init(&module->vsymt, sizeof(struct symt*), 128); /* FIXME: this seems a bit too high (on a per module basis) * need some statistics about this */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 17fd6c7..ede588c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -69,6 +69,37 @@ int symt_cmp_addr(const void* p1, const void* p2) return cmp_addr(a1, a2); } +DWORD symt_ptr2index(struct module* module, const struct symt* sym) +{ +#ifdef _WIN64 + const struct symt** c; + int len = vector_length(&module->vsymt), i; + + /* FIXME: this is inefficient */ + for (i = 0; i < len; i++) + { + if (*(struct symt**)vector_at(&module->vsymt, i) == sym) + return i + 1; + } + /* not found */ + c = vector_add(&module->vsymt, &module->pool); + if (c) *c = sym; + return len + 1; +#else + return (DWORD)sym; +#endif +} + +struct symt* symt_index2ptr(struct module* module, DWORD id) +{ +#ifdef _WIN64 + if (!id-- || id >= vector_length(&module->vsymt)) return NULL; + return *(struct symt**)vector_at(&module->vsymt, id); +#else + return (struct symt*)id; +#endif +} + static BOOL symt_grow_sorttab(struct module* module, unsigned sz) { struct symt_ht** new;

1 0

Eric Pouech : dbghelp: Wrap the symt* <=> index transformations.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 92b9b0940dc3ecd02b00b6fbbac3e24d3d8a0115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b9b0940dc3ecd02b00b6fbb… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:05:46 2009 +0100 dbghelp: Wrap the symt* <=> index transformations. --- dlls/dbghelp/coff.c | 5 ++- dlls/dbghelp/dbghelp_private.h | 13 +++++++- dlls/dbghelp/dwarf.c | 3 +- dlls/dbghelp/elf_module.c | 8 ++-- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 67 ++++++++++++++++++++++------------------ dlls/dbghelp/type.c | 58 +++++++++++++++++----------------- 8 files changed, 89 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92b9b0940dc3ecd02b00b…

1 0

Eric Pouech : dbghelp: Fix symt_find_nearest so that it searches for 64bit addresses on 64bit platforms .
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: 776e75e43cfab6654dbf7d47e454f9b5c23fd628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776e75e43cfab6654dbf7d47e… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Dec 14 22:06:06 2009 +0100 dbghelp: Fix symt_find_nearest so that it searches for 64bit addresses on 64bit platforms. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a0b40a1..fd5ec0d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -538,7 +538,7 @@ extern struct module* symt_cmp_addr_module; extern int symt_cmp_addr(const void* p1, const void* p2); extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si); extern struct symt_ht* - symt_find_nearest(struct module* module, DWORD addr); + symt_find_nearest(struct module* module, DWORD_PTR addr); extern struct symt_compiland* symt_new_compiland(struct module* module, unsigned long address, unsigned src_idx); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ede588c..d686b4a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -900,7 +900,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON } /* assume addr is in module */ -struct symt_ht* symt_find_nearest(struct module* module, DWORD addr) +struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) { int mid, high, low; ULONG64 ref_addr, ref_size;

1 0

Alexandre Julliard : user32/tests: Add a number of tests for WaitForInputIdle.
by Alexandre Julliard Dec. 15, 2009

Dec. 15, 2009

Module: wine Branch: master Commit: d6dfcf94b09afd63a18cef2746536e4460d1c478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6dfcf94b09afd63a18cef274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 15 13:10:53 2009 +0100 user32/tests: Add a number of tests for WaitForInputIdle. With help from Dmitry Timoshkov. --- dlls/user32/tests/msg.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 239 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bfc81dc..c67aa13 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12014,11 +12014,249 @@ static void test_PostMessage(void) flush_events(); } +static const struct +{ + DWORD exp, broken; + BOOL todo; +} wait_idle_expect[] = +{ +/* 0 */ { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, TRUE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, +/* 5 */ { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, 0, FALSE }, + { WAIT_TIMEOUT, WAIT_TIMEOUT, FALSE }, + { 0, 0, FALSE }, + { 0, 0, FALSE }, +/* 10 */ { 0, 0, FALSE }, + { 0, 0, FALSE }, + { 0, WAIT_FAILED, FALSE }, +}; + +static void do_wait_idle_child( int arg ) +{ + WNDCLASS cls; + MSG msg; + HWND hwnd = 0; + HANDLE start_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_start" ); + HANDLE end_event = OpenEventA( EVENT_ALL_ACCESS, FALSE, "test_WaitForInputIdle_end" ); + + memset( &cls, 0, sizeof(cls) ); + cls.lpfnWndProc = DefWindowProc; + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.lpszClassName = "TestClass"; + RegisterClass( &cls ); + + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); /* create the msg queue */ + + ok( start_event != 0, "failed to create start event, error %u\n", GetLastError() ); + ok( end_event != 0, "failed to create end event, error %u\n", GetLastError() ); + + switch (arg) + { + case 0: + SetEvent( start_event ); + break; + case 1: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, 0, 0, 0, PM_REMOVE ); + break; + case 2: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + PostThreadMessage( GetCurrentThreadId(), WM_COMMAND, 0x1234, 0xabcd ); + PeekMessage( &msg, 0, 0, 0, PM_REMOVE ); + break; + case 3: + SetEvent( start_event ); + Sleep( 200 ); + SendMessage( HWND_BROADCAST, WM_WININICHANGE, 0, 0 ); + break; + case 4: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE|PM_NOYIELD )) DispatchMessage( &msg ); + break; + case 5: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + break; + case 6: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE )) + { + GetMessage( &msg, 0, 0, 0 ); + DispatchMessage( &msg ); + } + break; + case 7: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + SetTimer( hwnd, 3, 1, NULL ); + Sleep( 1000 ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE|PM_NOYIELD )) DispatchMessage( &msg ); + break; + case 8: + SetEvent( start_event ); + Sleep( 200 ); + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + break; + case 9: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + for (;;) GetMessage( &msg, 0, 0, 0 ); + break; + case 10: + SetEvent( start_event ); + Sleep( 200 ); + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 10, 10, 0, 0, 0, NULL); + SetTimer( hwnd, 3, 1, NULL ); + Sleep( 200 ); + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + break; + case 11: + SetEvent( start_event ); + Sleep( 200 ); + return; /* exiting the process makes WaitForInputIdle return success too */ + case 12: + PeekMessage( &msg, 0, 0, 0, PM_NOREMOVE ); + Sleep( 200 ); + MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ); + SetEvent( start_event ); + break; + } + WaitForSingleObject( end_event, 2000 ); + CloseHandle( start_event ); + CloseHandle( end_event ); + if (hwnd) DestroyWindow( hwnd ); +} + +static LRESULT CALLBACK wait_idle_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + if (msg == WM_WININICHANGE) Sleep( 200 ); /* make sure the child waits */ + return DefWindowProcA( hwnd, msg, wp, lp ); +} + +static DWORD CALLBACK wait_idle_thread( void *arg ) +{ + WNDCLASS cls; + MSG msg; + HWND hwnd; + + memset( &cls, 0, sizeof(cls) ); + cls.lpfnWndProc = wait_idle_proc; + cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + cls.hCursor = LoadCursor(0, IDC_ARROW); + cls.lpszClassName = "TestClass"; + RegisterClass( &cls ); + + hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL); + while (GetMessage( &msg, 0, 0, 0 )) DispatchMessage( &msg ); + return 0; +} + +static void test_WaitForInputIdle( char *argv0 ) +{ + char path[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA startup; + BOOL ret; + HANDLE start_event, end_event, thread; + unsigned int i; + DWORD id; + const IMAGE_DOS_HEADER *dos = (const IMAGE_DOS_HEADER *)GetModuleHandleA(0); + const IMAGE_NT_HEADERS *nt = (const IMAGE_NT_HEADERS *)((const char *)dos + dos->e_lfanew); + BOOL console_app = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_GUI); + + if (console_app) /* build the test with -mwindows for better coverage */ + trace( "not built as a GUI app, WaitForInputIdle may not be fully tested\n" ); + + start_event = CreateEventA(NULL, 0, 0, "test_WaitForInputIdle_start"); + end_event = CreateEventA(NULL, 0, 0, "test_WaitForInputIdle_end"); + ok(start_event != 0, "failed to create start event, error %u\n", GetLastError()); + ok(end_event != 0, "failed to create end event, error %u\n", GetLastError()); + + memset( &startup, 0, sizeof(startup) ); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + thread = CreateThread( NULL, 0, wait_idle_thread, NULL, 0, &id ); + + for (i = 0; i < sizeof(wait_idle_expect)/sizeof(wait_idle_expect[0]); i++) + { + sprintf( path, "%s msg %u", argv0, i ); + ret = CreateProcessA( NULL, path, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &pi ); + ok( ret, "CreateProcess '%s' failed err %u.\n", path, GetLastError() ); + if (ret) + { + ret = WaitForSingleObject( start_event, 5000 ); + ok( ret == WAIT_OBJECT_0, "%u: WaitForSingleObject failed\n", i ); + if (ret == WAIT_OBJECT_0) + { + ret = WaitForInputIdle( pi.hProcess, 1000 ); + if (ret == WAIT_FAILED) + ok( console_app || + ret == wait_idle_expect[i].exp || + broken(ret == wait_idle_expect[i].broken), + "%u: WaitForInputIdle error %08x expected %08x\n", + i, ret, wait_idle_expect[i].exp ); + else if (wait_idle_expect[i].todo) + todo_wine + ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), + "%u: WaitForInputIdle error %08x expected %08x\n", + i, ret, wait_idle_expect[i].exp ); + else + ok( ret == wait_idle_expect[i].exp || broken(ret == wait_idle_expect[i].broken), + "%u: WaitForInputIdle error %08x expected %08x\n", + i, ret, wait_idle_expect[i].exp ); + SetEvent( end_event ); + WaitForSingleObject( pi.hProcess, 1000 ); /* give it a chance to exit on its own */ + } + TerminateProcess( pi.hProcess, 0 ); /* just in case */ + winetest_wait_child_process( pi.hProcess ); + ret = WaitForInputIdle( pi.hProcess, 100 ); + ok( ret == WAIT_FAILED, "%u: WaitForInputIdle after exit error %08x\n", i, ret ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + } + CloseHandle( start_event ); + PostThreadMessage( id, WM_QUIT, 0, 0 ); + WaitForSingleObject( thread, 10000 ); + CloseHandle( thread ); +} + START_TEST(msg) { + char **test_argv; BOOL ret; BOOL (WINAPI *pIsWinEventHookInstalled)(DWORD)= 0;/*GetProcAddress(user32, "IsWinEventHookInstalled");*/ + int argc = winetest_get_mainargs( &test_argv ); + if (argc >= 3) + { + unsigned int arg; + /* Child process. */ + sscanf (test_argv[2], "%d", (unsigned int *) &arg); + do_wait_idle_child( arg ); + return; + } + init_procs(); if (!RegisterWindowClasses()) assert(0); @@ -12059,6 +12297,7 @@ START_TEST(msg) test_ShowWindow(); test_PeekMessage(); test_PeekMessage2(); + test_WaitForInputIdle( test_argv[0] ); test_scrollwindowex(); test_messages(); test_setwindowpos();

1 0