June 2008 - Wine-commits - list.winehq.org

Zac Brown : ntdll/tests: Add tests for (Rtl) IsTextUnicode to verify that IS_TEXT_UNICODE_CONTROLS and IS_TEXT_UNICODE_REVERSE_CONTROLS are not mutually exclusive .
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: e24e7e7852704a3d4594d2fe7b3ad6913697c5c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24e7e7852704a3d4594d2fe7… Author: Zac Brown <zac(a)zacbrown.org> Date: Tue Jun 24 09:57:11 2008 -0700 ntdll/tests: Add tests for (Rtl)IsTextUnicode to verify that IS_TEXT_UNICODE_CONTROLS and IS_TEXT_UNICODE_REVERSE_CONTROLS are not mutually exclusive. --- dlls/ntdll/tests/rtlstr.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index aa4a391..74ba8ea 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1678,7 +1678,11 @@ static void test_RtlIsTextUnicode(void) { char ascii[] = "A simple string"; WCHAR unicode[] = {'A',' ','U','n','i','c','o','d','e',' ','s','t','r','i','n','g',0}; + WCHAR unicode_no_controls[] = {'A','U','n','i','c','o','d','e','s','t','r','i','n','g',0}; + /* String with both byte-reversed and standard Unicode control characters. */ + WCHAR mixed_controls[] = {'\t',0x9000,0x0d00,'\n',0}; WCHAR *be_unicode; + WCHAR *be_unicode_no_controls; int flags; int i; @@ -1721,7 +1725,81 @@ static void test_RtlIsTextUnicode(void) todo_wine ok(flags == (IS_TEXT_UNICODE_REVERSE_CONTROLS | IS_TEXT_UNICODE_REVERSE_SIGNATURE), "Expected flags 0xc0, obtained %x\n", flags); + + /* build byte reversed unicode string with no control chars */ + be_unicode_no_controls = HeapAlloc(GetProcessHeap(), 0, sizeof(unicode) + sizeof(WCHAR)); + ok(be_unicode_no_controls != NULL, "Expeced HeapAlloc to succeed.\n"); + be_unicode_no_controls[0] = 0xfffe; + for (i = 0; i < sizeof(unicode_no_controls)/sizeof(unicode_no_controls[0]); i++) + be_unicode_no_controls[i + 1] = (unicode_no_controls[i] >> 8) | ((unicode_no_controls[i] & 0xff) << 8); + + + /* The following tests verify that the tests for */ + /* IS_TEXT_UNICODE_CONTROLS and IS_TEXT_UNICODE_REVERSE_CONTROLS */ + /* are not mutually exclusive. Regardless of whether the strings */ + /* contain an indication of endianness, the tests are still */ + /* run if the flag is passed to (Rtl)IsTextUnicode. */ + + /* Test IS_TEXT_UNICODE_CONTROLS flag */ + flags = IS_TEXT_UNICODE_CONTROLS; + ok(!pRtlIsTextUnicode(unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on byte-reversed Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_CONTROLS; + todo_wine + { + ok(pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Test should pass on Unicode string lacking control characters.\n"); + ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); + } + + flags = IS_TEXT_UNICODE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode_no_controls, sizeof(unicode_no_controls) + 2, &flags), + "Test should not pass with standard Unicode string.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_CONTROLS; + todo_wine + { + ok(pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on a string containing control characters.\n"); + ok(flags == IS_TEXT_UNICODE_CONTROLS, "Expected flags 0x04, obtained %x\n", flags); + } + + /* Test IS_TEXT_UNICODE_REVERSE_CONTROLS flag */ + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(unicode_no_controls, sizeof(unicode_no_controls), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(unicode, sizeof(unicode), &flags), "Test should not pass on Unicode string lacking control characters.\n"); + ok(flags == 0, "Expected flags 0x0, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(be_unicode, sizeof(unicode) + 2, &flags), + "Test should pass with byte-reversed Unicode string containing control characters.\n"); + todo_wine + ok(flags == IS_TEXT_UNICODE_REVERSE_CONTROLS, "Expected flags 0x40, obtained %x\n", flags); + + flags = IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on a string containing byte-reversed control characters.\n"); + todo_wine + ok(flags == IS_TEXT_UNICODE_REVERSE_CONTROLS, "Expected flags 0x40, obtained %x\n", flags); + + /* Test with flags for both byte-reverse and standard Unicode characters */ + flags = IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_REVERSE_CONTROLS; + ok(!pRtlIsTextUnicode(mixed_controls, sizeof(mixed_controls), &flags), "Test should pass on string containing both byte-reversed and standard control characters.\n"); + todo_wine + ok(flags == (IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_REVERSE_CONTROLS), "Expected flags 0x44, obtained %x\n", flags); + HeapFree(GetProcessHeap(), 0, be_unicode); + HeapFree(GetProcessHeap(), 0, be_unicode_no_controls); } static const WCHAR szGuid[] = { '{','0','1','0','2','0','3','0','4','-',

1 0

Roy Shea : dsound/tests: Removed test depending on value of undefined variable.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: d776828857706547e05053d7c1199028029d9c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d776828857706547e05053d7c… Author: Roy Shea <royshea(a)gmail.com> Date: Tue Jun 24 10:29:06 2008 -0700 dsound/tests: Removed test depending on value of undefined variable. --- dlls/dsound/tests/dsound.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 6c81640..fc15bad 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -407,12 +407,6 @@ static HRESULT test_primary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," "dsbo=%p\n",DXGetErrorString8(rc),primary); - /* DSOUND: Error: Invalid buffer description pointer */ - rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,0,NULL); - ok(rc==DSERR_INVALIDPARAM && primary==0, - "IDirectSound_CreateSoundBuffer() should have failed: rc=%s," - "dsbo=0x%p\n",DXGetErrorString8(rc),primary); - ZeroMemory(&bufdesc, sizeof(bufdesc)); /* DSOUND: Error: Invalid size */

1 0

Alexander Dorofeyev : quartz: Fix accessing variant string.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: c782cdad96caad50942cb96f8bf82c754c6285e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c782cdad96caad50942cb96f8… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Tue Jun 24 16:44:53 2008 +0300 quartz: Fix accessing variant string. --- dlls/quartz/filtermapper.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b54ccea..24055d6 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1273,14 +1273,14 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( if (SUCCEEDED(hrSub)) { - len = (strlenW((WCHAR*)&V_UNION(&var, bstrVal))+1) * sizeof(WCHAR); + len = (strlenW((WCHAR*)V_UNION(&var, bstrVal))+1) * sizeof(WCHAR); if (!(regfilters[idx].Name = CoTaskMemAlloc(len*2))) hr = E_OUTOFMEMORY; } if (SUCCEEDED(hrSub)) { - memcpy(regfilters[idx].Name, &V_UNION(&var, bstrVal), len); + memcpy(regfilters[idx].Name, V_UNION(&var, bstrVal), len); regfilters[idx].Clsid = clsid; idx++; }

1 0

Vladimir Pankratov : hhctrl.ocx: Update Russian translation.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 2eee5fbfbe650541b3589f011bba2a589148f490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eee5fbfbe650541b3589f011… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 24 15:41:32 2008 +0500 hhctrl.ocx: Update Russian translation. --- dlls/hhctrl.ocx/Ru.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hhctrl.ocx/Ru.rc b/dlls/hhctrl.ocx/Ru.rc index 4333033..a530f80 100644 --- a/dlls/hhctrl.ocx/Ru.rc +++ b/dlls/hhctrl.ocx/Ru.rc @@ -38,11 +38,11 @@ BEGIN IDTB_BACK "��" IDTB_HOME "� ��" IDTB_SYNC "��" - IDTB_PRINT "��" + IDTB_PRINT "��" IDTB_OPTIONS "��" - IDTB_FORWARD "� ��" + IDTB_FORWARD "��" IDTB_NOTES "��" - IDTB_BROWSE_FWD "�� " + IDTB_BROWSE_FWD "�� " IDTB_BROWSE_BACK "�� " IDTB_CONTENTS "��" IDTB_INDEX "��"

1 0

Alexandre Julliard : user32: Make sure that IsWindowVisible returns FALSE for HWND_MESSAGE windows.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 6536868d0771ab987b37d8a444ba8aaf71cd0389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6536868d0771ab987b37d8a44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 15:49:44 2008 +0200 user32: Make sure that IsWindowVisible returns FALSE for HWND_MESSAGE windows. --- dlls/user32/tests/win.c | 9 +++++++++ dlls/user32/win.c | 8 ++++---- server/window.c | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3a3a152..cac34f7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4755,6 +4755,15 @@ static void test_hwnd_message(void) ok( found == hwnd, "didn't find message window %p/%p\n", found, hwnd ); } + /* test IsChild behavior */ + + if (parent) ok( !IsChild( parent, hwnd ), "HWND_MESSAGE is child of top window\n" ); + + /* test IsWindowVisible behavior */ + + ok( !IsWindowVisible( hwnd ), "HWND_MESSAGE window is visible\n" ); + if (parent) ok( !IsWindowVisible( parent ), "HWND_MESSAGE parent is visible\n" ); + DestroyWindow(hwnd); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9a21246..9a97a3a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2758,11 +2758,11 @@ BOOL WINAPI IsWindowVisible( HWND hwnd ) if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; if (!(list = list_window_parents( hwnd ))) return TRUE; - if (list[0] && list[1]) /* desktop window is considered always visible so we don't check it */ + if (list[0]) { for (i = 0; list[i+1]; i++) if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_VISIBLE)) break; - retval = !list[i+1]; + retval = !list[i+1] && (list[i] == GetDesktopWindow()); /* top message window isn't visible */ } HeapFree( GetProcessHeap(), 0, list ); return retval; @@ -2787,12 +2787,12 @@ BOOL WIN_IsWindowDrawable( HWND hwnd, BOOL icon ) if ((style & WS_MINIMIZE) && icon && GetClassLongPtrW( hwnd, GCLP_HICON )) return FALSE; if (!(list = list_window_parents( hwnd ))) return TRUE; - if (list[0] && list[1]) /* desktop window is considered always visible so we don't check it */ + if (list[0]) { for (i = 0; list[i+1]; i++) if ((GetWindowLongW( list[i], GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) != WS_VISIBLE) break; - retval = !list[i+1]; + retval = !list[i+1] && (list[i] == GetDesktopWindow()); /* top message window isn't visible */ } HeapFree( GetProcessHeap(), 0, list ); return retval; diff --git a/server/window.c b/server/window.c index ed8f042..303a6cf 100644 --- a/server/window.c +++ b/server/window.c @@ -604,7 +604,7 @@ static inline void inc_window_paint_count( struct window *win, int incr ) /* check if window and all its ancestors are visible */ static int is_visible( const struct window *win ) { - while (win && win->parent) + while (win) { if (!(win->style & WS_VISIBLE)) return 0; win = win->parent;

1 0

Alexandre Julliard : user32: Add support for finding HWND_MESSAGE windows in FindWindowEx.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 612c0104312e81c21b0a1216edd181cd46687404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612c0104312e81c21b0a1216e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 15:30:22 2008 +0200 user32: Add support for finding HWND_MESSAGE windows in FindWindowEx. --- dlls/user32/tests/win.c | 14 +++++++++- dlls/user32/win.c | 9 +++++- server/window.c | 68 +++++++++++++++++++++++++++++++++-------------- 3 files changed, 69 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 182a0b6..3a3a152 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4709,7 +4709,7 @@ static void test_GetWindowModuleFileName(void) static void test_hwnd_message(void) { - HWND parent = 0, hwnd; + HWND parent = 0, hwnd, found; RECT rect; hwnd = CreateWindowExA(0, "MainWindowClass", "message window", WS_CAPTION | WS_VISIBLE, @@ -4743,6 +4743,18 @@ static void test_hwnd_message(void) ok( rect.left == 100 && rect.right == 300 && rect.top == 100 && rect.bottom == 300, "wrong window rect %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + /* test FindWindow behavior */ + + found = FindWindowExA( 0, 0, 0, "message window" ); + ok( found == hwnd, "didn't find message window %p/%p\n", found, hwnd ); + found = FindWindowExA( GetDesktopWindow(), 0, 0, "message window" ); + ok( found == 0, "found message window %p/%p\n", found, hwnd ); + if (parent) + { + found = FindWindowExA( parent, 0, 0, "message window" ); + ok( found == hwnd, "didn't find message window %p/%p\n", found, hwnd ); + } + DestroyWindow(hwnd); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3ba4d76..9a21246 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1578,7 +1578,9 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t int i = 0, len = 0; WCHAR *buffer = NULL; - if (!parent) parent = GetDesktopWindow(); + if (!parent && child) parent = GetDesktopWindow(); + else if (parent == HWND_MESSAGE) parent = get_hwnd_message_parent(); + if (title) { len = strlenW(title) + 1; /* one extra char to check for chars beyond the end */ @@ -2940,6 +2942,11 @@ HWND WINAPI GetLastActivePopup( HWND hwnd ) */ HWND *WIN_ListChildren( HWND hwnd ) { + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return NULL; + } return list_window_children( 0, hwnd, NULL, 0 ); } diff --git a/server/window.c b/server/window.c index 53ea59f..ed8f042 100644 --- a/server/window.c +++ b/server/window.c @@ -639,6 +639,29 @@ static inline int is_point_in_window( struct window *win, int x, int y ) return 1; } +/* fill an array with the handles of the children of a specified window */ +static unsigned int get_children_windows( struct window *parent, atom_t atom, thread_id_t tid, + user_handle_t *handles, unsigned int max_count ) +{ + struct window *ptr; + unsigned int count = 0; + + if (!parent) return 0; + + LIST_FOR_EACH_ENTRY( ptr, &parent->children, struct window, entry ) + { + if (atom && get_class_atom(ptr->class) != atom) continue; + if (tid && get_thread_id(ptr->thread) != tid) continue; + if (handles) + { + if (count >= max_count) break; + handles[count] = ptr->handle; + } + count++; + } + return count; +} + /* find child of 'parent' that contains the given point (in parent-relative coords) */ static struct window *child_window_from_point( struct window *parent, int x, int y ) { @@ -1932,46 +1955,51 @@ DECL_HANDLER(get_window_parents) /* get a list of the window children */ DECL_HANDLER(get_window_children) { - struct window *ptr, *parent; - int total = 0; + struct window *parent = NULL; + unsigned int total; user_handle_t *data; data_size_t len; struct unicode_str cls_name; atom_t atom = req->atom; + struct desktop *desktop = NULL; if (req->desktop) { - struct desktop *desktop = get_desktop_obj( current->process, req->desktop, DESKTOP_ENUMERATE ); - if (!desktop) return; + if (!(desktop = get_desktop_obj( current->process, req->desktop, DESKTOP_ENUMERATE ))) return; parent = desktop->top_window; - release_object( desktop ); } - else parent = get_window( req->parent ); - - if (!parent) return; + else + { + if (req->parent && !(parent = get_window( req->parent ))) return; + if (!parent && !(desktop = get_thread_desktop( current, 0 ))) return; + } get_req_unicode_str( &cls_name ); if (cls_name.len && !(atom = find_global_atom( NULL, &cls_name ))) return; - LIST_FOR_EACH_ENTRY( ptr, &parent->children, struct window, entry ) - { - if (atom && get_class_atom(ptr->class) != atom) continue; - if (req->tid && get_thread_id(ptr->thread) != req->tid) continue; - total++; - } + if (parent) + total = get_children_windows( parent, atom, req->tid, NULL, 0 ); + else + total = get_children_windows( desktop->top_window, atom, req->tid, NULL, 0 ) + + get_children_windows( desktop->msg_window, atom, req->tid, NULL, 0 ); + reply->count = total; len = min( get_reply_max_size(), total * sizeof(user_handle_t) ); if (len && ((data = set_reply_data_size( len )))) { - LIST_FOR_EACH_ENTRY( ptr, &parent->children, struct window, entry ) + if (parent) get_children_windows( parent, atom, req->tid, data, len / sizeof(user_handle_t) ); + else { - if (len < sizeof(*data)) break; - if (atom && get_class_atom(ptr->class) != atom) continue; - if (req->tid && get_thread_id(ptr->thread) != req->tid) continue; - *data++ = ptr->handle; - len -= sizeof(*data); + total = get_children_windows( desktop->top_window, atom, req->tid, + data, len / sizeof(user_handle_t) ); + data += total; + len -= total * sizeof(user_handle_t); + if (len >= sizeof(user_handle_t)) + get_children_windows( desktop->msg_window, atom, req->tid, + data, len / sizeof(user_handle_t) ); } } + if (desktop) release_object( desktop ); }

1 0

Alexandre Julliard : user32/tests: Add some more tests for HWND_MESSAGE windows.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 9b9dbb20f2f173571ad40c79f4191dff206d40af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9dbb20f2f173571ad40c79f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 15:24:02 2008 +0200 user32/tests: Add some more tests for HWND_MESSAGE windows. --- dlls/user32/tests/win.c | 58 +++++++++++++++++++++++++++++++++------------- 1 files changed, 41 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 68d5530..182a0b6 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4707,27 +4707,51 @@ static void test_GetWindowModuleFileName(void) ok(!ret1, "expected 0, got %u\n", ret1); } +static void test_hwnd_message(void) +{ + HWND parent = 0, hwnd; + RECT rect; + + hwnd = CreateWindowExA(0, "MainWindowClass", "message window", WS_CAPTION | WS_VISIBLE, + 100, 100, 200, 200, HWND_MESSAGE, 0, 0, NULL); + if (!hwnd) + { + win_skip("CreateWindowExA with parent HWND_MESSAGE failed\n"); + return; + } + + ok( !GetParent(hwnd), "GetParent should return 0 for message only windows\n" ); + if (pGetAncestor) + { + char buffer[100]; + HWND root, desktop = GetDesktopWindow(); + + parent = pGetAncestor(hwnd, GA_PARENT); + ok(parent != 0, "GetAncestor(GA_PARENT) should not return 0 for message windows\n"); + ok(parent != desktop, "GetAncestor(GA_PARENT) should not return desktop for message windows\n"); + root = pGetAncestor(hwnd, GA_ROOT); + ok(root == hwnd, "GetAncestor(GA_ROOT) should return hwnd for message windows\n"); + ok( !pGetAncestor(parent, GA_PARENT), "parent shouldn't have a parent\n" ); + trace("parent %p root %p desktop %p\n", parent, root, desktop); + if (!GetClassNameA( parent, buffer, sizeof(buffer) )) buffer[0] = 0; + ok( !lstrcmpi( buffer, "Message" ), "wrong parent class '%s'\n", buffer ); + GetWindowRect( parent, &rect ); + ok( rect.left == 0 && rect.right == 100 && rect.top == 0 && rect.bottom == 100, + "wrong parent rect %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + } + GetWindowRect( hwnd, &rect ); + ok( rect.left == 100 && rect.right == 300 && rect.top == 100 && rect.bottom == 300, + "wrong window rect %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + + DestroyWindow(hwnd); +} + START_TEST(win) { pGetAncestor = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetAncestor" ); pGetWindowInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetWindowInfo" ); pGetWindowModuleFileNameA = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetWindowModuleFileNameA" ); - hwndMain = CreateWindowExA(0, "static", NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, 0, NULL); - if (hwndMain) - { - ok(!GetParent(hwndMain), "GetParent should return 0 for message only windows\n"); - if (pGetAncestor) - { - hwndMessage = pGetAncestor(hwndMain, GA_PARENT); - ok(hwndMessage != 0, "GetAncestor(GA_PARENT) should not return 0 for message only windows\n"); - trace("hwndMessage %p\n", hwndMessage); - } - DestroyWindow(hwndMain); - } - else - trace("CreateWindowExA with parent HWND_MESSAGE failed\n"); - if (!RegisterWindowClasses()) assert(0); hhook = SetWindowsHookExA(WH_CBT, cbt_hook_proc, 0, GetCurrentThreadId()); @@ -4738,8 +4762,6 @@ START_TEST(win) WS_MAXIMIZEBOX | WS_POPUP, 100, 100, 200, 200, 0, 0, GetModuleHandle(0), NULL); - test_nonclient_area(hwndMain); - hwndMain2 = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window 2", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, @@ -4751,6 +4773,8 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ + test_hwnd_message(); + test_nonclient_area(hwndMain); test_params(); test_GetWindowModuleFileName(); test_capture_1();

1 0

Alexandre Julliard : user32: Treat the top-level message window as a desktop window.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 782403085f98423250c9286f7104c0191eb27234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782403085f98423250c9286f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 15:20:26 2008 +0200 user32: Treat the top-level message window as a desktop window. --- dlls/user32/dialog.c | 2 +- dlls/user32/focus.c | 1 + dlls/user32/message.c | 10 ++++---- dlls/user32/win.c | 53 ++++++++++++++++++++++++++++++++++++++---------- dlls/user32/win.h | 2 + dlls/user32/winpos.c | 2 +- 6 files changed, 52 insertions(+), 18 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index a9867c6..444a73d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1085,7 +1085,7 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) if (CallMsgFilterW( msg, MSGF_DIALOGBOX )) return TRUE; hwndDlg = WIN_GetFullHandle( hwndDlg ); - if (hwndDlg == GetDesktopWindow()) return FALSE; + if (is_desktop_window(hwndDlg)) return FALSE; if ((hwndDlg != msg->hwnd) && !IsChild( hwndDlg, msg->hwnd )) return FALSE; hwndDlg = DIALOG_FindMsgDestination(hwndDlg); diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index 2eb1496..3253a87 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -264,6 +264,7 @@ HWND WINAPI SetFocus( HWND hwnd ) if (style & (WS_MINIMIZE | WS_DISABLED)) return 0; parent = GetAncestor( hwndTop, GA_PARENT ); if (!parent || parent == GetDesktopWindow()) break; + if (parent == get_hwnd_message_parent()) return 0; hwndTop = parent; } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 19b3935..6588f8e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1281,21 +1281,21 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR case WM_WINE_DESTROYWINDOW: return WIN_DestroyWindow( hwnd ); case WM_WINE_SETWINDOWPOS: - if (hwnd == GetDesktopWindow()) return 0; + if (is_desktop_window( hwnd )) return 0; return USER_SetWindowPos( (WINDOWPOS *)lparam ); case WM_WINE_SHOWWINDOW: - if (hwnd == GetDesktopWindow()) return 0; + if (is_desktop_window( hwnd )) return 0; return ShowWindow( hwnd, wparam ); case WM_WINE_SETPARENT: - if (hwnd == GetDesktopWindow()) return 0; + if (is_desktop_window( hwnd )) return 0; return (LRESULT)SetParent( hwnd, (HWND)wparam ); case WM_WINE_SETWINDOWLONG: return WIN_SetWindowLong( hwnd, (short)LOWORD(wparam), HIWORD(wparam), lparam, TRUE ); case WM_WINE_ENABLEWINDOW: - if (hwnd == GetDesktopWindow()) return 0; + if (is_desktop_window( hwnd )) return 0; return EnableWindow( hwnd, wparam ); case WM_WINE_SETACTIVEWINDOW: - if (hwnd == GetDesktopWindow()) return 0; + if (is_desktop_window( hwnd )) return 0; return (LRESULT)SetActiveWindow( (HWND)wparam ); case WM_WINE_KEYBOARD_LL_HOOK: case WM_WINE_MOUSE_LL_HOOK: diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 3e65a2f..3ba4d76 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -362,7 +362,7 @@ static void get_server_window_text( HWND hwnd, LPWSTR text, INT count ) * * Return the parent for HWND_MESSAGE windows. */ -static HWND get_hwnd_message_parent(void) +HWND get_hwnd_message_parent(void) { struct user_thread_info *thread_info = get_user_thread_info(); @@ -371,6 +371,28 @@ static HWND get_hwnd_message_parent(void) } +/******************************************************************* + * is_desktop_window + * + * Check if window is the desktop or the HWND_MESSAGE top parent. + */ +BOOL is_desktop_window( HWND hwnd ) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + + if (!hwnd) return FALSE; + if (hwnd == thread_info->top_window) return TRUE; + if (hwnd == thread_info->msg_window) return TRUE; + + if (!HIWORD(hwnd) || HIWORD(hwnd) == 0xffff) + { + if (LOWORD(thread_info->top_window) == LOWORD(hwnd)) return TRUE; + if (LOWORD(thread_info->msg_window) == LOWORD(hwnd)) return TRUE; + } + return FALSE; +} + + /*********************************************************************** * WIN_GetPtr * @@ -393,11 +415,7 @@ WND *WIN_GetPtr( HWND hwnd ) return ptr; ptr = NULL; } - else if (index == USER_HANDLE_TO_INDEX(GetDesktopWindow())) - { - if (hwnd == GetDesktopWindow() || !HIWORD(hwnd) || HIWORD(hwnd) == 0xffff) ptr = WND_DESKTOP; - else ptr = NULL; - } + else if (is_desktop_window( hwnd )) ptr = WND_DESKTOP; else ptr = WND_OTHER_PROCESS; USER_Unlock(); return ptr; @@ -454,7 +472,11 @@ HWND WIN_Handle32( HWND16 hwnd16 ) if (!(ptr = WIN_GetPtr( hwnd ))) return hwnd; - if (ptr == WND_DESKTOP) return GetDesktopWindow(); + if (ptr == WND_DESKTOP) + { + if (LOWORD(hwnd) == LOWORD(GetDesktopWindow())) return GetDesktopWindow(); + else return get_hwnd_message_parent(); + } if (ptr != WND_OTHER_PROCESS) { @@ -569,8 +591,16 @@ BOOL WIN_GetRectangles( HWND hwnd, RECT *rectWindow, RECT *rectClient ) { RECT rect; rect.left = rect.top = 0; - rect.right = GetSystemMetrics(SM_CXSCREEN); - rect.bottom = GetSystemMetrics(SM_CYSCREEN); + if (hwnd == get_hwnd_message_parent()) + { + rect.right = 100; + rect.bottom = 100; + } + else + { + rect.right = GetSystemMetrics(SM_CXSCREEN); + rect.bottom = GetSystemMetrics(SM_CYSCREEN); + } if (rectWindow) *rectWindow = rect; if (rectClient) *rectClient = rect; } @@ -1431,7 +1461,7 @@ BOOL WINAPI DestroyWindow( HWND hwnd ) { BOOL is_child; - if (!(hwnd = WIN_IsCurrentThread( hwnd )) || (hwnd == GetDesktopWindow())) + if (!(hwnd = WIN_IsCurrentThread( hwnd )) || is_desktop_window( hwnd )) { SetLastError( ERROR_ACCESS_DENIED ); return FALSE; @@ -2609,7 +2639,8 @@ HWND WINAPI GetAncestor( HWND hwnd, UINT type ) break; case GA_ROOTOWNER: - if ((ret = WIN_GetFullHandle( hwnd )) == GetDesktopWindow()) return 0; + if (is_desktop_window( hwnd )) return 0; + ret = WIN_GetFullHandle( hwnd ); for (;;) { HWND parent = GetParent( ret ); diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 5e7a67e..bc024f4 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -76,6 +76,8 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0080 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ /* Window functions */ +extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; +extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_Handle32( HWND16 hwnd16 ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index aeea354..7398152 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2100,7 +2100,7 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, hdwp, hwnd, hwndAfter, x, y, cx, cy, flags); hwnd = WIN_GetFullHandle( hwnd ); - if (hwnd == GetDesktopWindow()) return 0; + if (is_desktop_window( hwnd )) return 0; if (!(pDWP = USER_HEAP_LIN_ADDR( hdwp ))) return 0;

1 0

Alexandre Julliard : user32: Use the top-level message window as parent for HWND_MESSAGE windows.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 1abbe0dfe33d3c3ce63004913a9d37cfa02d10ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=1abbe0dfe33d3c3ce63004913… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 15:10:42 2008 +0200 user32: Use the top-level message window as parent for HWND_MESSAGE windows. --- dlls/user32/win.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a924fe3..3e65a2f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -357,6 +357,20 @@ static void get_server_window_text( HWND hwnd, LPWSTR text, INT count ) } +/******************************************************************* + * get_hwnd_message_parent + * + * Return the parent for HWND_MESSAGE windows. + */ +static HWND get_hwnd_message_parent(void) +{ + struct user_thread_info *thread_info = get_user_thread_info(); + + if (!thread_info->msg_window) GetDesktopWindow(); /* trigger creation */ + return thread_info->msg_window; +} + + /*********************************************************************** * WIN_GetPtr * @@ -969,11 +983,7 @@ static HWND WIN_CreateWindowEx( CREATESTRUCTA *cs, LPCWSTR className, UINT flags if (cs->hwndParent == HWND_MESSAGE) { - /* native ole32.OleInitialize uses HWND_MESSAGE to create the - * message window (style: WS_POPUP|WS_DISABLED) - */ - FIXME("Parent is HWND_MESSAGE\n"); - parent = GetDesktopWindow(); + cs->hwndParent = parent = get_hwnd_message_parent(); } else if (cs->hwndParent) { @@ -2630,6 +2640,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) } if (!parent) parent = GetDesktopWindow(); + else if (parent == HWND_MESSAGE) parent = get_hwnd_message_parent(); else parent = WIN_GetFullHandle( parent ); if (!IsWindow( parent ))

1 0

Alexandre Julliard : explorer.exe: Create the top-level message window along with the desktop window.
by Alexandre Julliard 25 Jun '08

25 Jun '08

Module: wine Branch: master Commit: 966cf7c86e72c456bd7f149bc37265389055e819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966cf7c86e72c456bd7f149bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 25 14:49:33 2008 +0200 explorer.exe: Create the top-level message window along with the desktop window. --- programs/explorer/desktop.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 246e14b..552d11b 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -230,8 +230,9 @@ static void set_desktop_window_title( HWND hwnd, const WCHAR *name ) void manage_desktop( WCHAR *arg ) { static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; MSG msg; - HWND hwnd; + HWND hwnd, msg_hwnd; unsigned long xwin = 0; unsigned int width, height; WCHAR *cmdline = NULL; @@ -293,6 +294,11 @@ void manage_desktop( WCHAR *arg ) GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), 0, 0, 0, NULL ); + + /* create the HWND_MESSAGE parent */ + msg_hwnd = CreateWindowExW( 0, messageW, NULL, WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + 0, 0, 100, 100, 0, 0, 0, NULL ); + if (hwnd == GetDesktopWindow()) { SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); @@ -309,6 +315,8 @@ void manage_desktop( WCHAR *arg ) hwnd = 0; } + if (GetAncestor( msg_hwnd, GA_PARENT )) DestroyWindow( msg_hwnd ); /* someone beat us to it */ + /* if we have a command line, execute it */ if (cmdline) {

1 0