February 2008 - Wine-Commits

Rob Shearman : oleaut32: Fix local variable shadowing in OLEFontImpl_Invoke .
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: ed9c7396fa3def40dcd3dc664482c4c4f1969173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed9c7396fa3def40dcd3dc664… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 16:48:07 2008 +0000 oleaut32: Fix local variable shadowing in OLEFontImpl_Invoke. --- dlls/oleaut32/olefont.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index fb7b40b..b8e4ee2 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1377,7 +1377,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( return hr; } else { VARIANTARG vararg; - HRESULT hr; VariantInit(&vararg); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL); @@ -1399,7 +1398,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( return hr; } else { VARIANTARG vararg; - HRESULT hr; VariantInit(&vararg); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL); @@ -1421,7 +1419,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( return hr; } else { VARIANTARG vararg; - HRESULT hr; VariantInit(&vararg); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_BOOL); @@ -1440,7 +1437,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( return OLEFontImpl_get_Size((IFont *)this, &V_CY(pVarResult)); } else { VARIANTARG vararg; - HRESULT hr; VariantInit(&vararg); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_CY); @@ -1459,7 +1455,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( return OLEFontImpl_get_Weight((IFont *)this, &V_I2(pVarResult)); } else { VARIANTARG vararg; - HRESULT hr; VariantInit(&vararg); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I2); @@ -1478,7 +1473,6 @@ static HRESULT WINAPI OLEFontImpl_Invoke( return OLEFontImpl_get_Charset((IFont *)this, &V_I2(pVarResult)); } else { VARIANTARG vararg; - HRESULT hr; VariantInit(&vararg); hr = VariantChangeTypeEx(&vararg, &pDispParams->rgvarg[0], lcid, 0, VT_I2);

1 0

Rob Shearman : oleaut32: Don' t store result of CompareStringW in HRESULT in OLEFontImpl_IsEqual.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: ab8302d88f0a483c94c26a32814172f15001e56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8302d88f0a483c94c26a328… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 16:48:00 2008 +0000 oleaut32: Don't store result of CompareStringW in HRESULT in OLEFontImpl_IsEqual. It returns an INT, which is quite different to an HRESULT. --- dlls/oleaut32/olefont.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index fe787a7..9a76992 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -941,7 +941,7 @@ static HRESULT WINAPI OLEFontImpl_IsEqual( { OLEFontImpl *left = (OLEFontImpl *)iface; OLEFontImpl *right = (OLEFontImpl *)pFontOther; - HRESULT hres; + INT ret; INT left_len,right_len; if((iface == NULL) || (pFontOther == NULL)) @@ -964,9 +964,9 @@ static HRESULT WINAPI OLEFontImpl_IsEqual( /* Check from string */ left_len = strlenW(left->description.lpstrName); right_len = strlenW(right->description.lpstrName); - hres = CompareStringW(0,0,left->description.lpstrName, left_len, + ret = CompareStringW(0,0,left->description.lpstrName, left_len, right->description.lpstrName, right_len); - if (hres != CSTR_EQUAL) + if (ret != CSTR_EQUAL) return S_FALSE; return S_OK;

1 0

Rob Shearman : msi: Fix the buffer size calculation in msi_build_createsql_prelude.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 03e466b8378685ade8c58392f946900279f63f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e466b8378685ade8c58392f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 16:47:51 2008 +0000 msi: Fix the buffer size calculation in msi_build_createsql_prelude. --- dlls/msi/database.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 425486e..bad40b8 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -348,7 +348,7 @@ static LPWSTR msi_build_createsql_prelude(LPWSTR table) static const WCHAR create_fmt[] = {'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','%','s','`',' ','(',' ',0}; - size = sizeof(create_fmt) + lstrlenW(table) - 2; + size = sizeof(create_fmt)/sizeof(create_fmt[0]) + lstrlenW(table) - 2; prelude = msi_alloc(size * sizeof(WCHAR)); if (!prelude) return NULL;

1 0

Rob Shearman : msi: Fix buffer size calculation in build_default_format.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 3183ad65d27d1ba4de255400277dfd46044d2ab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3183ad65d27d1ba4de2554002… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 27 16:47:55 2008 +0000 msi: Fix buffer size calculation in build_default_format. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 8c5b246..f58f517 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -346,7 +346,7 @@ static LPWSTR build_default_format(const MSIRECORD* record) sprintfW(index, fmt_index, i); str = MSI_RecordGetString(record, i); len = (str) ? lstrlenW(str) : 0; - len += (sizeof(fmt_null) - 3) + lstrlenW(index); + len += (sizeof(fmt_null)/sizeof(fmt_null[0]) - 3) + lstrlenW(index); size += len; if (len > max_len)

1 0

Hans Leidekker : gdi32: Return registered monitor profile from GetICMProfile.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: d6bb9e76b307d2d2a8c83e13ed2b69ddc3cf5c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6bb9e76b307d2d2a8c83e13e… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Feb 27 15:13:44 2008 +0100 gdi32: Return registered monitor profile from GetICMProfile. --- dlls/gdi32/icm.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/icm.c b/dlls/gdi32/icm.c index 860a6f2..12d1f3b 100644 --- a/dlls/gdi32/icm.c +++ b/dlls/gdi32/icm.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winnls.h" +#include "winreg.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -96,20 +97,37 @@ BOOL WINAPI GetICMProfileA(HDC hdc, LPDWORD size, LPSTR filename) */ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) { + HKEY hkey; DWORD required; - WCHAR systemdir[MAX_PATH]; - static const WCHAR profile[] = + WCHAR profile[MAX_PATH], fullname[MAX_PATH]; + static const WCHAR path[] = {'\\','s','p','o','o','l','\\','d','r','i','v','e','r','s', - '\\','c','o','l','o','r','\\','s','R','G','B',' ','C','o','l','o','r',' ', - 'S','p','a','c','e',' ','P','r','o','f','i','l','e','.','i','c','m',0}; + '\\','c','o','l','o','r','\\',0}; + static const WCHAR srgb[] = + {'s','R','G','B',' ','C','o','l','o','r',' ','S','p','a','c','e',' ', + 'P','r','o','f','i','l','e','.','i','c','m',0}; + static const WCHAR mntr[] = + {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t', + 'V','e','r','s','i','o','n','\\','I','C','M','\\','m','n','t','r',0}; TRACE("%p, %p, %p\n", hdc, size, filename); if (!hdc || !size) return FALSE; - required = GetSystemDirectoryW(systemdir, MAX_PATH); - required += sizeof(profile) / sizeof(WCHAR); + strcpyW(profile, srgb); + if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, mntr, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL)) + { + DWORD size = sizeof(profile) / sizeof(WCHAR); + /* FIXME handle multiple values */ + RegEnumValueW(hkey, 0, profile, &size, NULL, NULL, NULL, NULL); + RegCloseKey(hkey); + } + GetSystemDirectoryW(fullname, MAX_PATH); + strcatW(fullname, path); + strcatW(fullname, profile); + required = strlenW(fullname) + 1; if (*size < required) { *size = required; @@ -118,9 +136,7 @@ BOOL WINAPI GetICMProfileW(HDC hdc, LPDWORD size, LPWSTR filename) } if (filename) { - strcpyW(filename, systemdir); - strcatW(filename, profile); - + strcpyW(filename, fullname); if (GetFileAttributesW(filename) == INVALID_FILE_ATTRIBUTES) WARN("color profile not found\n"); }

1 0

Alexandre Julliard : winex11: Check the current window state on Map/ UnmapNotify and ignore obsolete events.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: eaea28e5d83b8d302eed62dbf574b5d6d2c14cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaea28e5d83b8d302eed62dbf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 19:15:12 2008 +0100 winex11: Check the current window state on Map/UnmapNotify and ignore obsolete events. --- dlls/winex11.drv/winpos.c | 34 +++++++++++++++++++++++++++------- 1 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 3fecec2..3e04810 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -745,14 +745,27 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT cmd ) void X11DRV_MapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; - HWND hwndFocus = GetFocus(); WND *win; + int state; if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!data->mapped) return; - if (!(win = WIN_GetPtr( hwnd ))) return; + if (!data->managed) + { + HWND hwndFocus = GetFocus(); + if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ + return; + } - if (data->managed && (win->dwStyle & WS_VISIBLE) && (win->dwStyle & WS_MINIMIZE)) + state = get_window_wm_state( event->xmap.display, data ); + if (state != NormalState) + { + TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); + return; + } + + if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_VISIBLE|WS_MINIMIZE)) == (WS_VISIBLE|WS_MINIMIZE)) { int x, y; unsigned int width, height, border, depth; @@ -773,6 +786,7 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) OffsetRect( &rect, virtual_screen_rect.left, virtual_screen_rect.top ); X11DRV_X_to_window_rect( data, &rect ); + if (!(win = WIN_GetPtr( hwnd ))) return; if (win->flags & WIN_RESTORE_MAX) style |= WS_MAXIMIZE; WIN_SetStyle( hwnd, style, WS_MINIMIZE ); WIN_ReleasePtr( win ); @@ -783,8 +797,6 @@ void X11DRV_MapNotify( HWND hwnd, XEvent *event ) SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED | SWP_STATECHANGED ); data->lock_changes--; } - else WIN_ReleasePtr( win ); - if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ } @@ -795,13 +807,21 @@ void X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) { struct x11drv_win_data *data; WND *win; + int state; if (!(data = X11DRV_get_win_data( hwnd ))) return; + if (!data->managed || !data->mapped) return; + + state = get_window_wm_state( event->xunmap.display, data ); + if (state != IconicState) + { + TRACE( "win %p/%lx ignoring since state=%d\n", hwnd, data->whole_window, state ); + return; + } if (!(win = WIN_GetPtr( hwnd ))) return; - if ((win->dwStyle & WS_VISIBLE) && data->managed && - X11DRV_is_window_rect_mapped( &win->rectWindow )) + if ((win->dwStyle & WS_VISIBLE) && X11DRV_is_window_rect_mapped( &win->rectWindow )) { if (win->dwStyle & WS_MAXIMIZE) win->flags |= WIN_RESTORE_MAX;

1 0

Alexandre Julliard : winex11: Added tracking of the WM_STATE window property.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 5a5344b4ad2b9be527940c8d259961e4b4e9cfb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a5344b4ad2b9be527940c8d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 19:11:43 2008 +0100 winex11: Added tracking of the WM_STATE window property. --- dlls/winex11.drv/event.c | 71 ++++++++++++++++++++++++++++----------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 55 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ad42ef2..ee96d02 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -583,35 +583,66 @@ static void EVENT_FocusOut( HWND hwnd, XEvent *xev ) /*********************************************************************** + * get_window_wm_state + */ +int get_window_wm_state( Display *display, struct x11drv_win_data *data ) +{ + struct + { + CARD32 state; + XID icon; + } *state; + Atom type; + int format, ret = -1; + unsigned long count, remaining; + + wine_tsx11_lock(); + if (!XGetWindowProperty( display, data->whole_window, x11drv_atom(WM_STATE), 0, + sizeof(*state)/sizeof(CARD32), False, x11drv_atom(WM_STATE), + &type, &format, &count, &remaining, (unsigned char **)&state )) + { + if (type == x11drv_atom(WM_STATE) && format && count >= sizeof(*state)/(format/8)) + ret = state->state; + XFree( state ); + } + wine_tsx11_unlock(); + return ret; +} + + +/*********************************************************************** * EVENT_PropertyNotify - * We use this to release resources like Pixmaps when a selection - * client no longer needs them. */ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) { - XPropertyEvent *event = &xev->xproperty; - /* Check if we have any resources to free */ - TRACE("Received PropertyNotify event:\n"); + XPropertyEvent *event = &xev->xproperty; + struct x11drv_win_data *data; - switch(event->state) - { - case PropertyDelete: + if (!hwnd) return; + if (!(data = X11DRV_get_win_data( hwnd ))) return; + + switch(event->state) { - TRACE("\tPropertyDelete for atom %ld on window %ld\n", - event->atom, (long)event->window); - break; - } + case PropertyDelete: + if (event->atom == x11drv_atom(WM_STATE)) + { + data->wm_state = WithdrawnState; + TRACE( "%p/%lx: WM_STATE deleted\n", data->hwnd, data->whole_window ); + } + break; case PropertyNewValue: - { - TRACE("\tPropertyNewValue for atom %ld on window %ld\n\n", - event->atom, (long)event->window); - break; + if (event->atom == x11drv_atom(WM_STATE)) + { + int new_state = get_window_wm_state( event->display, data ); + if (new_state != -1 && new_state != data->wm_state) + { + TRACE( "%p/%lx: new WM_STATE %d\n", data->hwnd, data->whole_window, new_state ); + data->wm_state = new_state; + } + } + break; } - - default: - break; - } } static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index cf84389..71edc60 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -200,7 +200,7 @@ static int get_window_attributes( Display *display, struct x11drv_win_data *data attr->event_mask = (ExposureMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | EnterWindowMask | KeyPressMask | KeyReleaseMask | FocusChangeMask | KeymapStateMask); - if (data->managed) attr->event_mask |= StructureNotifyMask; + if (data->managed) attr->event_mask |= StructureNotifyMask | PropertyChangeMask; return (CWOverrideRedirect | CWSaveUnder | CWColormap | CWCursor | CWEventMask | CWBitGravity | CWBackingStore); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 79631c4..375b04b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -559,6 +559,7 @@ enum x11drv_atoms XATOM_RAW_CAP_HEIGHT, XATOM_WM_PROTOCOLS, XATOM_WM_DELETE_WINDOW, + XATOM_WM_STATE, XATOM_WM_TAKE_FOCUS, XATOM_KWM_DOCKWINDOW, XATOM_DndProtocol, @@ -669,6 +670,7 @@ struct x11drv_win_data XWMHints *wm_hints; /* window manager hints */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ + int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ unsigned int lock_changes; /* lock count for X11 change requests */ HBITMAP hWMIconBitmap; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 32f6437..8982716 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -123,6 +123,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "RAW_CAP_HEIGHT", "WM_PROTOCOLS", "WM_DELETE_WINDOW", + "WM_STATE", "WM_TAKE_FOCUS", "KWM_DOCKWINDOW", "DndProtocol",

1 0

Alexandre Julliard : winex11: Clear the NET_WM_STATE status when a window is withdrawn.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: 9939b7b4305def8505aa16b631ba6d76d74def53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9939b7b4305def8505aa16b63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 18:01:31 2008 +0100 winex11: Clear the NET_WM_STATE status when a window is withdrawn. Change WM_STATE to NET_WM_STATE in variable and function names to avoid confusion with the ICCCM WM_STATE property. --- dlls/winex11.drv/winpos.c | 31 +++++++++++++------------------ dlls/winex11.drv/x11drv.h | 14 +++++++------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 13aec41..719627b 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -177,11 +177,11 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) /*********************************************************************** - * update_wm_states + * update_net_wm_states */ -static void update_wm_states( Display *display, struct x11drv_win_data *data, BOOL force ) +static void update_net_wm_states( Display *display, struct x11drv_win_data *data ) { - static const unsigned int state_atoms[NB_WM_STATES] = + static const unsigned int state_atoms[NB_NET_WM_STATES] = { XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_STATE_ABOVE, @@ -197,13 +197,13 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO if (data->whole_rect.left <= 0 && data->whole_rect.right >= screen_width && data->whole_rect.top <= 0 && data->whole_rect.bottom >= screen_height) - new_state |= (1 << WM_STATE_FULLSCREEN); + new_state |= (1 << NET_WM_STATE_FULLSCREEN); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) - new_state |= (1 << WM_STATE_ABOVE); + new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) - new_state |= (1 << WM_STATE_SKIP_TASKBAR) | (1 << WM_STATE_SKIP_PAGER); + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); xev.xclient.type = ClientMessage; xev.xclient.window = data->whole_window; @@ -215,17 +215,13 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO xev.xclient.data.l[2] = 0; xev.xclient.data.l[3] = 1; - for (i = 0; i < NB_WM_STATES; i++) + for (i = 0; i < NB_NET_WM_STATES; i++) { - if (!((data->wm_state ^ new_state) & (1 << i))) /* unchanged */ - { - /* if forced, we only add states, we don't remove them */ - if (!force || !(new_state & (1 << i))) continue; - } + if (!((data->net_wm_state ^ new_state) & (1 << i))) continue; /* unchanged */ TRACE( "setting wm state %u for window %p/%lx to %u prev %u\n", i, data->hwnd, data->whole_window, - (new_state & (1 << i)) != 0, (data->wm_state & (1 << i)) != 0 ); + (new_state & (1 << i)) != 0, (data->net_wm_state & (1 << i)) != 0 ); xev.xclient.data.l[0] = (new_state & (1 << i)) ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE; xev.xclient.data.l[1] = X11DRV_Atoms[state_atoms[i] - FIRST_XATOM]; @@ -233,7 +229,7 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO XSendEvent( display, root_window, False, SubstructureRedirectMask | SubstructureNotifyMask, &xev ); wine_tsx11_unlock(); } - data->wm_state = new_state; + data->net_wm_state = new_state; } @@ -394,6 +390,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, XUnmapWindow( display, data->whole_window ); wine_tsx11_unlock(); data->mapped = FALSE; + data->net_wm_state = 0; } X11DRV_sync_window_position( display, data, swp_flags, &old_client_rect, &old_whole_rect ); @@ -401,8 +398,6 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if ((new_style & WS_VISIBLE) && !(new_style & WS_MINIMIZE) && X11DRV_is_window_rect_mapped( rectWindow )) { - BOOL was_mapped = data->mapped; - if (!data->mapped || (swp_flags & SWP_FRAMECHANGED)) X11DRV_set_wm_hints( display, data ); @@ -416,7 +411,7 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, wine_tsx11_unlock(); data->mapped = TRUE; } - update_wm_states( display, data, !was_mapped ); + update_net_wm_states( display, data ); } } @@ -841,7 +836,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE) { /* update the full screen state */ - update_wm_states( display, data, FALSE ); + update_net_wm_states( display, data ); } if (resize_data->old_virtual_rect.left != virtual_screen_rect.left) mask |= CWX; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8f80452..79631c4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -642,13 +642,13 @@ enum x11drv_window_messages }; /* _NET_WM_STATE properties that we keep track of */ -enum x11drv_wm_state +enum x11drv_net_wm_state { - WM_STATE_FULLSCREEN, - WM_STATE_ABOVE, - WM_STATE_SKIP_PAGER, - WM_STATE_SKIP_TASKBAR, - NB_WM_STATES + NET_WM_STATE_FULLSCREEN, + NET_WM_STATE_ABOVE, + NET_WM_STATE_SKIP_PAGER, + NET_WM_STATE_SKIP_TASKBAR, + NB_NET_WM_STATES }; /* x11drv private window data */ @@ -669,7 +669,7 @@ struct x11drv_win_data XWMHints *wm_hints; /* window manager hints */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */ - DWORD wm_state; /* bit mask of active x11drv_wm_state values */ + DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ unsigned int lock_changes; /* lock count for X11 change requests */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask;

1 0

Alexandre Julliard : winex11: Use XWithdrawWindow to unmap managed windows, and wait until they are withdrawn before mapping them again.
by Alexandre Julliard Feb. 28, 2008

Feb. 28, 2008

Module: wine Branch: master Commit: b76db19e88cf6de04687048a8b28367854a7bbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76db19e88cf6de04687048a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 27 19:13:09 2008 +0100 winex11: Use XWithdrawWindow to unmap managed windows, and wait until they are withdrawn before mapping them again. --- dlls/winex11.drv/event.c | 52 ++++++++++++++++++++++++++++++++++++++++---- dlls/winex11.drv/winpos.c | 9 +++++-- dlls/winex11.drv/x11drv.h | 3 ++ 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ee96d02..01dfc6d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -21,6 +21,12 @@ #include "config.h" +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +#include <sys/poll.h> +#endif #include <X11/Xatom.h> #include <X11/keysym.h> #include <X11/Xlib.h> @@ -239,7 +245,7 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) /*********************************************************************** * process_events */ -static int process_events( Display *display, ULONG_PTR mask ) +static int process_events( Display *display, Bool (*filter)(), ULONG_PTR arg ) { XEvent event; HWND hwnd; @@ -247,14 +253,14 @@ static int process_events( Display *display, ULONG_PTR mask ) x11drv_event_handler handler; wine_tsx11_lock(); - while (XCheckIfEvent( display, &event, filter_event, (char *)mask )) + while (XCheckIfEvent( display, &event, filter, (char *)arg )) { count++; if (XFilterEvent( &event, None )) continue; /* filtered, ignore it */ if (!(handler = find_handler( event.type ))) { - TRACE( "%s, ignoring\n", dbgstr_event( event.type )); + TRACE( "%s for win %lx, ignoring\n", dbgstr_event( event.type ), event.xany.window ); continue; /* no handler, ignore it */ } @@ -295,12 +301,12 @@ DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, data->process_event_count++; - if (process_events( data->display, mask )) ret = count - 1; + if (process_events( data->display, filter_event, mask )) ret = count - 1; else if (count || timeout) { ret = WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, timeout, flags & MWMO_ALERTABLE ); - if (ret == count - 1) process_events( data->display, mask ); + if (ret == count - 1) process_events( data->display, filter_event, mask ); } else ret = WAIT_TIMEOUT; @@ -645,6 +651,42 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) } } + +/* event filter to wait for a WM_STATE change notification on a window */ +static Bool is_wm_state_notify( Display *display, XEvent *event, XPointer arg ) +{ + return (event->type == PropertyNotify && + event->xproperty.window == (Window)arg && + event->xproperty.atom == x11drv_atom(WM_STATE)); +} + +/*********************************************************************** + * wait_for_withdrawn_state + */ +void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data ) +{ + DWORD end = GetTickCount() + 2000; + + if (!data->whole_window || !data->managed) return; + + while (data->wm_state != WithdrawnState && + !process_events( display, is_wm_state_notify, data->whole_window )) + { + struct pollfd pfd; + int timeout = end - GetTickCount(); + + TRACE( "waiting for window %p/%lx to become withdrawn\n", data->hwnd, data->whole_window ); + pfd.fd = ConnectionNumber(display); + pfd.events = POLLIN; + if (timeout <= 0 || poll( &pfd, 1, timeout ) != 1) + { + FIXME( "window %p/%lx wait timed out\n", data->hwnd, data->whole_window ); + return; + } + } +} + + static HWND find_drop_window( HWND hQueryWnd, LPPOINT lpPt ) { RECT tempRect; diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 719627b..3fecec2 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -153,6 +153,7 @@ void X11DRV_SetWindowStyle( HWND hwnd, DWORD old_style ) if (!data->mapped) { TRACE( "mapping win %p\n", hwnd ); + wait_for_withdrawn_state( display, data ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); @@ -385,9 +386,10 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if (data->mapped && (!(new_style & WS_VISIBLE) || !X11DRV_is_window_rect_mapped( rectWindow ))) { - TRACE( "unmapping win %p\n", hwnd ); + TRACE( "unmapping win %p/%lx\n", hwnd, data->whole_window ); wine_tsx11_lock(); - XUnmapWindow( display, data->whole_window ); + if (data->managed) XWithdrawWindow( display, data->whole_window, DefaultScreen(display) ); + else XUnmapWindow( display, data->whole_window ); wine_tsx11_unlock(); data->mapped = FALSE; data->net_wm_state = 0; @@ -403,7 +405,8 @@ void X11DRV_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags, if (!data->mapped) { - TRACE( "mapping win %p\n", hwnd ); + TRACE( "mapping win %p/%lx\n", hwnd, data->whole_window ); + wait_for_withdrawn_state( display, data ); X11DRV_sync_window_style( display, data ); wine_tsx11_lock(); XMapWindow( display, data->whole_window ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 375b04b..20590b3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -691,6 +691,9 @@ extern void mark_drawable_dirty( Drawable old, Drawable new ); extern Drawable create_glxpixmap( Display *display, XVisualInfo *vis, Pixmap parent ); extern void flush_gl_drawable( X11DRV_PDEVICE *physDev ); +extern int get_window_wm_state( Display *display, struct x11drv_win_data *data ); +extern void wait_for_withdrawn_state( Display *display, struct x11drv_win_data *data ); + /* X context to associate a hwnd to an X window */ extern XContext winContext;

1 0

Dmitry Timoshkov : kernel32: Return upper cased drive letters in paths, some applications depend on it.
by Alexandre Julliard Feb. 27, 2008

Feb. 27, 2008

Module: wine Branch: master Commit: aebcbf0f6e10d80b04bc4a3dcd3e8ca55dfd60d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebcbf0f6e10d80b04bc4a3dc… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 27 19:58:40 2008 +0800 kernel32: Return upper cased drive letters in paths, some applications depend on it. --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/path.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/path.c | 2 +- 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8e7e675..b3bf535 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -690,7 +690,7 @@ static void init_windows_dirs(void) static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; - static const WCHAR default_windirW[] = {'c',':','\\','w','i','n','d','o','w','s',0}; + static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; static const WCHAR default_sysdirW[] = {'\\','s','y','s','t','e','m','3','2',0}; DWORD len; diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 05111a8..dfb7748 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -727,6 +727,7 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) "GetFullPathNameA returned part '%s' instead of '%s'\n",strptr,SHORTFILE); /* Otherwise insert the missing leading slash */ if( otherDrive != NOT_A_VALID_DRIVE) { + /* FIXME: this test assumes that current directory on other drive is root */ sprintf(tmpstr,"%c:%s\\%s",otherDrive,SHORTDIR,SHORTFILE); ok(GetFullPathNameA(tmpstr,MAX_PATH,tmpstr1,&strptr),"GetFullPathNameA failed for %s\n", tmpstr); sprintf(tmpstr,"%c:\\%s\\%s",otherDrive,SHORTDIR,SHORTFILE); @@ -1157,6 +1158,87 @@ static void test_NeedCurrentDirectoryForExePathW(void) ok(!pNeedCurrentDirectoryForExePathW(cmdname), "returned TRUE for \"cmd.exe\"\n"); } +/* Call various path/file name retrieving APIs and check the case of + * the returned drive letter. Some apps (for instance Adobe Photoshop CS3 + * installer) depend on the driver letter being in upper case. + */ +static void test_drive_letter_case(void) +{ + UINT ret; + char buf[MAX_PATH]; + +#define is_upper_case_letter(a) ((a) >= 'A' && (a) <= 'Z') + + memset(buf, 0, sizeof(buf)); + SetLastError(0xdeadbeef); + ret = GetWindowsDirectory(buf, sizeof(buf)); + ok(ret, "GetWindowsDirectory error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + + /* re-use the buffer returned by GetFullPathName */ + buf[2] = '/'; + SetLastError(0xdeadbeef); + ret = GetFullPathName(buf + 2, sizeof(buf), buf, NULL); + ok(ret, "GetFullPathName error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + + memset(buf, 0, sizeof(buf)); + SetLastError(0xdeadbeef); + ret = GetSystemDirectory(buf, sizeof(buf)); + ok(ret, "GetSystemDirectory error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + + memset(buf, 0, sizeof(buf)); + SetLastError(0xdeadbeef); + ret = GetCurrentDirectory(sizeof(buf), buf); + ok(ret, "GetCurrentDirectory error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + + memset(buf, 0, sizeof(buf)); + SetLastError(0xdeadbeef); + ret = GetTempPath(sizeof(buf), buf); + ok(ret, "GetTempPath error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + + memset(buf, 0, sizeof(buf)); + SetLastError(0xdeadbeef); + ret = GetFullPathName(".", sizeof(buf), buf, NULL); + ok(ret, "GetFullPathName error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + + /* re-use the buffer returned by GetFullPathName */ + SetLastError(0xdeadbeef); + ret = GetShortPathName(buf, buf, sizeof(buf)); + ok(ret, "GetShortPathName error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + + if (pGetLongPathNameA) + { + /* re-use the buffer returned by GetShortPathName */ + SetLastError(0xdeadbeef); + ret = pGetLongPathNameA(buf, buf, sizeof(buf)); + ok(ret, "GetLongPathNameA error %u\n", GetLastError()); + ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); + ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); + ok(is_upper_case_letter(buf[0]), "expected buf[0] upper case letter got %c\n", buf[0]); + } +#undef is_upper_case_letter +} + START_TEST(path) { CHAR origdir[MAX_PATH],curdir[MAX_PATH], curDrive, otherDrive; @@ -1188,4 +1270,5 @@ START_TEST(path) { test_NeedCurrentDirectoryForExePathW(); } + test_drive_letter_case(); } diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index db4cd10..73a77a8 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -1025,7 +1025,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) */ NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ) { - static const WCHAR prefixW[] = {'\\','?','?','\\','a',':','\\'}; + static const WCHAR prefixW[] = {'\\','?','?','\\','A',':','\\'}; unsigned int lenW, lenA = name->Length; const char *path = name->Buffer; char *cwd;

1 0