wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Stefan Leichter : shdocvw: Remove 'recursive registry key delete' function.
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: c6a20d7161c888d52471b7685bf8b7bd4ba1bca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a20d7161c888d52471b7685… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Aug 20 20:12:16 2007 +0200 shdocvw: Remove 'recursive registry key delete' function. --- dlls/shdocvw/regsvr.c | 80 +++++-------------------------------------------- 1 files changed, 8 insertions(+), 72 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index c8cd814..90297b3 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -138,9 +138,6 @@ static LONG register_key_defvalueA(HKEY base, WCHAR const *name, static LONG register_progid(WCHAR const *clsid, char const *progid, char const *curver_progid, char const *name, char const *extra); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -229,7 +226,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -372,16 +370,19 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } if (list->viprogid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->viprogid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -493,71 +494,6 @@ error_close_progid_key: return res; } -/*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - - static const GUID CLSID_MicrosoftBrowserArchitecture = {0xa5e46e3a, 0x8849, 0x11d1, {0x9d, 0x8c, 0x00, 0xc0, 0x4f, 0xc9, 0x9d, 0x61}}; static const GUID CLSID_MruLongList =

1 0

Stefan Leichter : shell32: Remove 'recursive registry key delete' function.
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: 73d0bb7e2791693ea9ea7a15e3116bf882b02326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d0bb7e2791693ea9ea7a15e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Aug 19 21:45:11 2007 +0200 shell32: Remove 'recursive registry key delete' function. --- dlls/shell32/regsvr.c | 76 ++++--------------------------------------------- 1 files changed, 6 insertions(+), 70 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index f4cffd7..199a9dc 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -145,9 +145,6 @@ static LONG register_key_defvalueW(HKEY base, WCHAR const *name, WCHAR const *value); static LONG register_key_defvalueA(HKEY base, WCHAR const *name, char const *value); -static LONG recursive_delete_key(HKEY key); -static LONG recursive_delete_keyA(HKEY base, char const *name); -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name); /*********************************************************************** * register_interfaces @@ -236,7 +233,8 @@ static HRESULT unregister_interfaces(struct regsvr_interface const *list) WCHAR buf[39]; StringFromGUID2(list->iid, buf, 39); - res = recursive_delete_keyW(interface_key, buf); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } RegCloseKey(interface_key); @@ -405,11 +403,13 @@ static HRESULT unregister_coclasses(struct regsvr_coclass const *list) WCHAR buf[39]; StringFromGUID2(list->clsid, buf, 39); - res = recursive_delete_keyW(coclass_key, buf); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; if (list->progid) { - res = recursive_delete_keyA(HKEY_CLASSES_ROOT, list->progid); + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; if (res != ERROR_SUCCESS) goto error_close_coclass_key; } } @@ -532,70 +532,6 @@ static LONG register_key_defvalueA( } /*********************************************************************** - * recursive_delete_key - */ -static LONG recursive_delete_key(HKEY key) -{ - LONG res; - WCHAR subkey_name[MAX_PATH]; - DWORD cName; - HKEY subkey; - - for (;;) { - cName = sizeof(subkey_name) / sizeof(WCHAR); - res = RegEnumKeyExW(key, 0, subkey_name, &cName, - NULL, NULL, NULL, NULL); - if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) { - res = ERROR_SUCCESS; /* presumably we're done enumerating */ - break; - } - res = RegOpenKeyExW(key, subkey_name, 0, - KEY_READ | KEY_WRITE, &subkey); - if (res == ERROR_FILE_NOT_FOUND) continue; - if (res != ERROR_SUCCESS) break; - - res = recursive_delete_key(subkey); - RegCloseKey(subkey); - if (res != ERROR_SUCCESS) break; - } - - if (res == ERROR_SUCCESS) res = RegDeleteKeyW(key, 0); - return res; -} - -/*********************************************************************** - * recursive_delete_keyA - */ -static LONG recursive_delete_keyA(HKEY base, char const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExA(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** - * recursive_delete_keyW - */ -static LONG recursive_delete_keyW(HKEY base, WCHAR const *name) -{ - LONG res; - HKEY key; - - res = RegOpenKeyExW(base, name, 0, KEY_READ | KEY_WRITE, &key); - if (res == ERROR_FILE_NOT_FOUND) return ERROR_SUCCESS; - if (res != ERROR_SUCCESS) return res; - res = recursive_delete_key(key); - RegCloseKey(key); - return res; -} - -/*********************************************************************** * coclass list */ static GUID const CLSID_Desktop = {

1 0

Maarten Lankhorst : dsound: Handle failing of IDsDriver_CreateSoundBuffer better.
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: 9c469e1a9487d81186642282de89048fc51c0864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c469e1a9487d81186642282d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Aug 19 23:52:19 2007 +0200 dsound: Handle failing of IDsDriver_CreateSoundBuffer better. --- dlls/dsound/primary.c | 15 +++++++++++++-- dlls/wineoss.drv/dsrender.c | 4 +--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 3e75275..4063266 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -224,8 +224,19 @@ HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) &(device->buflen),&(device->buffer), (LPVOID*)&(device->hwbuf)); if (err != DS_OK) { - WARN("IDsDriver_CreateSoundBuffer failed\n"); - return err; + WARN("IDsDriver_CreateSoundBuffer failed, falling back to waveout\n"); + /* Wine-only: close wine directsound driver, then reopen without WAVE_DIRECTSOUND */ + device->drvdesc.dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT; + waveOutClose(device->hwo); + IDsDriver_Release(device->driver); + device->driver = device->buffer = NULL; + device->hwo = 0; + err = mmErr(waveOutOpen(&(device->hwo), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_callback, (DWORD)device, CALLBACK_FUNCTION)); + if (err != DS_OK) + { + WARN("Falling back to waveout failed too! Giving up\n"); + return err; + } } } diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c index aa9d373..27672fb 100644 --- a/dlls/wineoss.drv/dsrender.c +++ b/dlls/wineoss.drv/dsrender.c @@ -344,9 +344,7 @@ static HRESULT DSDB_MapBuffer(IDsDriverBufferImpl *dsdb) dsdb->mapping = mmap(NULL, dsdb->maplen, PROT_WRITE, MAP_SHARED, dsdb->fd, 0); if (dsdb->mapping == (LPBYTE)-1) { - ERR("Could not map sound device for direct access (%s)\n", strerror(errno)); - ERR("Please run winecfg, open \"Audio\" page and set\n" - "\"Hardware Acceleration\" to \"Emulation\".\n"); + WARN("Could not map sound device for direct access (%s)\n", strerror(errno)); return DSERR_GENERIC; } TRACE("The sound device has been mapped for direct access at %p, size=%d\n", dsdb->mapping, dsdb->maplen);

1 0

Maarten Lankhorst : winealsa: Report card name in volume control fixme.
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: 4a2424d6a325ad0201a7805d1f5f20b9db212342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a2424d6a325ad0201a7805d1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sun Aug 19 19:59:29 2007 +0200 winealsa: Report card name in volume control fixme. --- dlls/winealsa.drv/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 062b2ea..f1b2e12 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -511,7 +511,7 @@ static void ALSA_MixerInit(void) else if (!mastelem) { /* If there is nothing sensible that can act as 'Master' control, something is wrong */ - FIXME("No master control found, disabling mixer\n"); + FIXME("No master control found on %s, disabling mixer\n", snd_ctl_card_info_get_name(info)); goto close; }

1 0

Alexandre Julliard : winex11: Force a window to managed mode when it is activated.
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: f48eb1581dfe176043cbca5c46400c0f86eb5552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f48eb1581dfe176043cbca5c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 22:06:50 2007 +0200 winex11: Force a window to managed mode when it is activated. --- dlls/user32/tests/msg.c | 4 ++-- dlls/winex11.drv/window.c | 9 +++++---- dlls/winex11.drv/winpos.c | 8 +++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a603252..af05f7b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3724,7 +3724,7 @@ static void test_showwindow(void) 100, 100, 200, 200, 0, 0, 0, NULL); ok (hwnd != 0, "Failed to create popup window\n"); ok(!IsZoomed(hwnd), "window should NOT be maximized\n"); - ok_sequence(WmCreatePopupSeq, "CreateWindow(WS_VISIBLE):popup", TRUE); + ok_sequence(WmCreatePopupSeq, "CreateWindow(WS_VISIBLE):popup", FALSE); trace("done\n"); trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for visible popup window\n"); @@ -4065,7 +4065,7 @@ static void test_messages(void) ok_sequence(WmShowVisiblePopupSeq_2, "SetWindowPos:show_visible_popup_2", FALSE); flush_sequence(); SetWindowPos(hchild, 0,0,0,0,0, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE); - ok_sequence(WmShowVisiblePopupSeq_3, "SetWindowPos:show_visible_popup_3", FALSE); + ok_sequence(WmShowVisiblePopupSeq_3, "SetWindowPos:show_visible_popup_3", TRUE); DestroyWindow(hchild); /* this time add WS_VISIBLE for CreateWindowEx, but this fact actually diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ecc4c09..030989b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -974,7 +974,7 @@ static void get_desktop_xwin( Display *display, struct x11drv_win_data *data ) SetPropA( data->hwnd, visual_id_prop, (HANDLE)visualid ); data->whole_window = root_window; X11DRV_SetWindowPos( data->hwnd, 0, &virtual_screen_rect, &virtual_screen_rect, - SWP_NOZORDER, NULL ); + SWP_NOZORDER | SWP_NOACTIVATE, NULL ); if (root_window != DefaultRootWindow( display )) { data->managed = TRUE; @@ -1039,7 +1039,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) /* initialize the dimensions before sending WM_GETMINMAXINFO */ SetRect( &rect, cs->x, cs->y, cs->x + cs->cx, cs->y + cs->cy ); - X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER, NULL ); + X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER | SWP_NOACTIVATE, NULL ); /* create an X window if it's a top level window */ if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) @@ -1083,7 +1083,8 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) if (cs->cy < 0) cs->cy = 0; SetRect( &rect, cs->x, cs->y, cs->x + cs->cx, cs->y + cs->cy ); - if (!X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER, NULL )) return FALSE; + if (!X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER | SWP_NOACTIVATE, NULL )) + return FALSE; } /* send WM_NCCREATE */ @@ -1111,7 +1112,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) /* yes, even if the CBT hook was called with HWND_TOP */ insert_after = (wndPtr->dwStyle & WS_CHILD) ? HWND_BOTTOM : HWND_TOP; - X11DRV_SetWindowPos( hwnd, insert_after, &wndPtr->rectWindow, &rect, 0, NULL ); + X11DRV_SetWindowPos( hwnd, insert_after, &wndPtr->rectWindow, &rect, SWP_NOACTIVATE, NULL ); TRACE( "win %p window %d,%d,%d,%d client %d,%d,%d,%d whole %d,%d,%d,%d X client %d,%d,%d,%d xwin %x\n", hwnd, wndPtr->rectWindow.left, wndPtr->rectWindow.top, diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 25dabbb..eb615c6 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -252,7 +252,9 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, root_window == DefaultRootWindow( display ) && data->whole_window != root_window) { - if (is_window_managed( hwnd, rectWindow )) + if (!(swp_flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)) || + is_window_managed( hwnd, rectWindow ) || + hwnd == GetActiveWindow()) { TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); make_managed = TRUE; @@ -787,7 +789,7 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) SendMessageW( hwnd, WM_SHOWWINDOW, SW_RESTORE, 0 ); data->lock_changes++; SetWindowPos( hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - SWP_NOZORDER | SWP_FRAMECHANGED | SWP_STATECHANGED ); + SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED | SWP_STATECHANGED ); data->lock_changes--; } else WIN_ReleasePtr( win ); @@ -888,7 +890,7 @@ void X11DRV_handle_desktop_resize( unsigned int width, unsigned int height ) TRACE("desktop %p change to (%dx%d)\n", hwnd, width, height); data->lock_changes++; X11DRV_SetWindowPos( hwnd, 0, &virtual_screen_rect, &virtual_screen_rect, - SWP_NOZORDER|SWP_NOMOVE, NULL ); + SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE, NULL ); data->lock_changes--; ClipCursor(NULL); SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth,

1 0

Alexandre Julliard : winex11: Switch windows to managed mode in SetWindowPos instead of at creation time .
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: ac98e0c07535af4a373c0af343498903e2ff42a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac98e0c07535af4a373c0af34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 22:06:33 2007 +0200 winex11: Switch windows to managed mode in SetWindowPos instead of at creation time. --- dlls/winex11.drv/window.c | 31 ++++++++----------------------- dlls/winex11.drv/winpos.c | 29 ++++++++++++++++++++++++++--- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a16d0cd..ecc4c09 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -66,11 +66,10 @@ static const char visual_id_prop[] = "__wine_x11_visual_id"; * * Check if a given window should be managed */ -static inline BOOL is_window_managed( HWND hwnd ) +BOOL is_window_managed( HWND hwnd, const RECT *window_rect ) { DWORD style, ex_style; - if (!managed_mode) return FALSE; /* tray window is always managed */ ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TRAYWINDOW) return TRUE; @@ -87,13 +86,11 @@ static inline BOOL is_window_managed( HWND hwnd ) if (ex_style & WS_EX_APPWINDOW) return TRUE; if (style & WS_POPUP) { - RECT rect; - /* popup with sysmenu == caption are managed */ if (style & WS_SYSMENU) return TRUE; /* full-screen popup windows are managed */ - GetWindowRect( hwnd, &rect ); - if ((rect.right - rect.left) == screen_width && (rect.bottom - rect.top) == screen_height) + if ((window_rect->right - window_rect->left) == screen_width && + (window_rect->bottom - window_rect->top) == screen_height) return TRUE; } /* default: not managed */ @@ -130,14 +127,6 @@ BOOL X11DRV_is_window_rect_mapped( const RECT *rect ) static int get_window_attributes( Display *display, struct x11drv_win_data *data, XSetWindowAttributes *attr ) { - if (!data->managed && - root_window == DefaultRootWindow( display ) && - data->whole_window != root_window && - is_window_managed( data->hwnd )) - { - data->managed = TRUE; - SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); - } attr->override_redirect = !data->managed; attr->colormap = X11DRV_PALETTE_PaletteXColormap; attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); @@ -774,22 +763,18 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat int cx, cy, mask; XSetWindowAttributes attr; XIM xim; - RECT rect; - - rect = data->window_rect; - X11DRV_window_to_X_rect( data, &rect ); - if (!(cx = rect.right - rect.left)) cx = 1; - if (!(cy = rect.bottom - rect.top)) cy = 1; + if (!(cx = data->window_rect.right - data->window_rect.left)) cx = 1; + if (!(cy = data->window_rect.bottom - data->window_rect.top)) cy = 1; mask = get_window_attributes( display, data, &attr ); wine_tsx11_lock(); - data->whole_rect = rect; + data->whole_rect = data->window_rect; data->whole_window = XCreateWindow( display, root_window, - rect.left - virtual_screen_rect.left, - rect.top - virtual_screen_rect.top, + data->window_rect.left - virtual_screen_rect.left, + data->window_rect.top - virtual_screen_rect.top, cx, cy, 0, screen_depth, InputOutput, visual, mask, &attr ); diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index baee122..25dabbb 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -79,6 +79,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); #define _NET_WM_STATE_ADD 1 #define _NET_WM_STATE_TOGGLE 2 +static const char managed_prop[] = "__wine_x11_managed"; + /*********************************************************************** * X11DRV_Expose */ @@ -236,14 +238,29 @@ static BOOL fullscreen_state_changed( const struct x11drv_win_data *data, BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, const RECT *rectClient, UINT swp_flags, const RECT *valid_rects ) { + Display *display = thread_display(); struct x11drv_win_data *data; RECT new_whole_rect, old_client_rect, old_screen_rect; WND *win; DWORD old_style, new_style; - BOOL ret; + BOOL ret, make_managed = FALSE; if (!(data = X11DRV_get_win_data( hwnd ))) return FALSE; + /* check if we need to switch the window to managed */ + if (!data->managed && data->whole_window && managed_mode && + root_window == DefaultRootWindow( display ) && + data->whole_window != root_window) + { + if (is_window_managed( hwnd, rectWindow )) + { + TRACE( "making win %p/%lx managed\n", hwnd, data->whole_window ); + make_managed = TRUE; + data->managed = TRUE; + SetPropA( hwnd, managed_prop, (HANDLE)1 ); + } + } + new_whole_rect = *rectWindow; X11DRV_window_to_X_rect( data, &new_whole_rect ); @@ -294,8 +311,6 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, if (ret) { - Display *display = thread_display(); - /* invalidate DCEs */ if ((((swp_flags & SWP_AGG_NOPOSCHANGE) != SWP_AGG_NOPOSCHANGE) && (new_style & WS_VISIBLE)) || @@ -315,6 +330,14 @@ BOOL X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, const RECT *rectWindow, TRACE( "win %p window %s client %s style %08x\n", hwnd, wine_dbgstr_rect(rectWindow), wine_dbgstr_rect(rectClient), new_style ); + if (make_managed && (old_style & WS_VISIBLE)) + { + wine_tsx11_lock(); + XUnmapWindow( display, data->whole_window ); + wine_tsx11_unlock(); + old_style &= ~WS_VISIBLE; /* force it to be mapped again below */ + } + if (!IsRectEmpty( &valid_rects[0] )) { int x_offset = 0, y_offset = 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1fca990..8594e20 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -684,6 +684,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ); extern int X11DRV_check_error(void); +extern BOOL is_window_managed( HWND hwnd, const RECT *window_rect ); extern void X11DRV_set_iconic_state( HWND hwnd ); extern void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ); extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect );

1 0

Alexandre Julliard : user32/tests: Allow WM_MOUSEACTIVATE in the mouse hover test for compatibility with X11 focus policy .
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: f09bcc3eef18df1bf32d81ef4d3d33e5daee5cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f09bcc3eef18df1bf32d81ef4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 22:03:06 2007 +0200 user32/tests: Allow WM_MOUSEACTIVATE in the mouse hover test for compatibility with X11 focus policy. --- dlls/user32/tests/msg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ef2cd6f..a603252 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8421,6 +8421,8 @@ static void test_quit_message(void) } static const struct message WmMouseHoverSeq[] = { + { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */ + { WM_MOUSEACTIVATE, sent|optional }, { WM_TIMER, sent|optional }, /* XP sends it */ { WM_SYSTIMER, sent }, { WM_MOUSEHOVER, sent|wparam, 0 },

1 0

Alexandre Julliard : user32/tests: Use flush_events more consistently in the message tests.
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: 1b6533bc2c105d89d6f0dbf0f36d6062a59e66ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6533bc2c105d89d6f0dbf0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 22:01:55 2007 +0200 user32/tests: Use flush_events more consistently in the message tests. --- dlls/user32/tests/msg.c | 92 ++++++++++++++++++++++------------------------ dlls/user32/tests/win.c | 30 ++++++--------- 2 files changed, 56 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b6533bc2c105d89d6f0d…

1 0

Alexandre Julliard : ntdll: Return an error instead of dying in wine_server_call if the input buffer is invalid .
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: 7378fac50582b46b89e0d97f36ffb2dfc334952e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7378fac50582b46b89e0d97f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 14:40:18 2007 +0200 ntdll: Return an error instead of dying in wine_server_call if the input buffer is invalid. --- dlls/ntdll/server.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 29c9cfd..33f81dc 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -219,7 +219,7 @@ void server_protocol_perror( const char *err ) * * Send a request to the server. */ -static void send_request( const struct __server_request_info *req ) +static unsigned int send_request( const struct __server_request_info *req ) { unsigned int i; int ret; @@ -227,7 +227,7 @@ static void send_request( const struct __server_request_info *req ) if (!req->u.req.request_header.request_size) { if ((ret = write( ntdll_get_thread_data()->request_fd, &req->u.req, - sizeof(req->u.req) )) == sizeof(req->u.req)) return; + sizeof(req->u.req) )) == sizeof(req->u.req)) return STATUS_SUCCESS; } else @@ -242,11 +242,12 @@ static void send_request( const struct __server_request_info *req ) vec[i+1].iov_len = req->data[i].size; } if ((ret = writev( ntdll_get_thread_data()->request_fd, vec, i+1 )) == - req->u.req.request_header.request_size + sizeof(req->u.req)) return; + req->u.req.request_header.request_size + sizeof(req->u.req)) return STATUS_SUCCESS; } if (ret >= 0) server_protocol_error( "partial write %d\n", ret ); if (errno == EPIPE) server_abort_thread(0); + if (errno == EFAULT) return STATUS_ACCESS_VIOLATION; server_protocol_perror( "write" ); } @@ -283,11 +284,12 @@ static void read_reply_data( void *buffer, size_t size ) * * Wait for a reply from the server. */ -static inline void wait_reply( struct __server_request_info *req ) +static inline unsigned int wait_reply( struct __server_request_info *req ) { read_reply_data( &req->u.reply, sizeof(req->u.reply) ); if (req->u.reply.reply_header.reply_size) read_reply_data( req->reply_data, req->u.reply.reply_header.reply_size ); + return req->u.reply.reply_header.error; } @@ -317,12 +319,13 @@ unsigned int wine_server_call( void *req_ptr ) { struct __server_request_info * const req = req_ptr; sigset_t old_set; + unsigned int ret; pthread_functions.sigprocmask( SIG_BLOCK, &server_block_set, &old_set ); - send_request( req ); - wait_reply( req ); + ret = send_request( req ); + if (!ret) ret = wait_reply( req ); pthread_functions.sigprocmask( SIG_SETMASK, &old_set, NULL ); - return req->u.reply.reply_header.error; + return ret; }

1 0

Alexandre Julliard : winex11: Don' t select for StructureNotify events on unmanaged windows.
by Alexandre Julliard 20 Aug '07

20 Aug '07

Module: wine Branch: master Commit: 0ce718702d5f45358db82ade2342d66bd9ccb675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce718702d5f45358db82ade2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 20 14:23:10 2007 +0200 winex11: Don't select for StructureNotify events on unmanaged windows. --- dlls/winex11.drv/window.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1976c9b..a16d0cd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -142,7 +142,15 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data attr->colormap = X11DRV_PALETTE_PaletteXColormap; attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->cursor = x11drv_thread_data()->cursor; - return (CWOverrideRedirect | CWSaveUnder | CWColormap | CWCursor); + attr->bit_gravity = NorthWestGravity; + attr->backing_store = NotUseful; + attr->event_mask = (ExposureMask | PointerMotionMask | + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | + KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask); + if (data->managed) attr->event_mask |= StructureNotifyMask; + + return (CWOverrideRedirect | CWSaveUnder | CWColormap | CWCursor | + CWEventMask | CWBitGravity | CWBackingStore); } @@ -153,13 +161,15 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data */ void X11DRV_sync_window_style( Display *display, struct x11drv_win_data *data ) { - XSetWindowAttributes attr; - int mask = get_window_attributes( display, data, &attr ); + if (data->whole_window != root_window) + { + XSetWindowAttributes attr; + int mask = get_window_attributes( display, data, &attr ); - wine_tsx11_lock(); - if (data->whole_window != DefaultRootWindow(display)) + wine_tsx11_lock(); XChangeWindowAttributes( display, data->whole_window, mask, &attr ); - wine_tsx11_unlock(); + wine_tsx11_unlock(); + } } @@ -774,15 +784,6 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat mask = get_window_attributes( display, data, &attr ); - /* set the attributes that don't change over the lifetime of the window */ - attr.bit_gravity = NorthWestGravity; - attr.backing_store = NotUseful; - attr.event_mask = (ExposureMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask | - KeyPressMask | KeyReleaseMask | StructureNotifyMask | - FocusChangeMask | KeymapStateMask); - mask |= CWBitGravity | CWBackingStore | CWEventMask; - wine_tsx11_lock(); data->whole_rect = rect;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007