October 2012 - Wine-commits

Nikolay Sivov : ole32: Cleanup IMultiQI interface of proxy manager.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: ba4b88bc00c1a0197908efb3ca7c1cc1ae1f130b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba4b88bc00c1a0197908efb3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 15 11:41:44 2012 -0400 ole32: Cleanup IMultiQI interface of proxy manager. --- dlls/ole32/marshal.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 76431da..8612b30 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -55,7 +55,7 @@ extern const CLSID CLSID_DfMarshal; /* imported object / proxy manager */ struct proxy_manager { - const IMultiQIVtbl *lpVtbl; + IMultiQI IMultiQI_iface; const IMarshalVtbl *lpVtblMarshal; const IClientSecurityVtbl *lpVtblCliSec; struct apartment *parent; /* owning apartment (RO) */ @@ -385,19 +385,19 @@ static HRESULT WINAPI StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwR static HRESULT WINAPI Proxy_QueryInterface(IMarshal *iface, REFIID riid, void **ppvObject) { struct proxy_manager *This = impl_from_IMarshal( iface ); - return IMultiQI_QueryInterface((IMultiQI *)&This->lpVtbl, riid, ppvObject); + return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject); } static ULONG WINAPI Proxy_AddRef(IMarshal *iface) { struct proxy_manager *This = impl_from_IMarshal( iface ); - return IMultiQI_AddRef((IMultiQI *)&This->lpVtbl); + return IMultiQI_AddRef(&This->IMultiQI_iface); } static ULONG WINAPI Proxy_Release(IMarshal *iface) { struct proxy_manager *This = impl_from_IMarshal( iface ); - return IMultiQI_Release((IMultiQI *)&This->lpVtbl); + return IMultiQI_Release(&This->IMultiQI_iface); } static HRESULT WINAPI Proxy_MarshalInterface( @@ -530,19 +530,19 @@ static const IMarshalVtbl ProxyMarshal_Vtbl = static HRESULT WINAPI ProxyCliSec_QueryInterface(IClientSecurity *iface, REFIID riid, void **ppvObject) { struct proxy_manager *This = impl_from_IClientSecurity( iface ); - return IMultiQI_QueryInterface((IMultiQI *)&This->lpVtbl, riid, ppvObject); + return IMultiQI_QueryInterface(&This->IMultiQI_iface, riid, ppvObject); } static ULONG WINAPI ProxyCliSec_AddRef(IClientSecurity *iface) { struct proxy_manager *This = impl_from_IClientSecurity( iface ); - return IMultiQI_AddRef((IMultiQI *)&This->lpVtbl); + return IMultiQI_AddRef(&This->IMultiQI_iface); } static ULONG WINAPI ProxyCliSec_Release(IClientSecurity *iface) { struct proxy_manager *This = impl_from_IClientSecurity( iface ); - return IMultiQI_Release((IMultiQI *)&This->lpVtbl); + return IMultiQI_Release(&This->IMultiQI_iface); } static HRESULT WINAPI ProxyCliSec_QueryBlanket(IClientSecurity *iface, @@ -754,7 +754,7 @@ static HRESULT proxy_manager_construct( } } - This->lpVtbl = &ClientIdentity_Vtbl; + This->IMultiQI_iface.lpVtbl = &ClientIdentity_Vtbl; This->lpVtblMarshal = &ProxyMarshal_Vtbl; This->lpVtblCliSec = &ProxyCliSec_Vtbl; @@ -869,8 +869,8 @@ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMultiQI)) { - *ppv = &This->lpVtbl; - IUnknown_AddRef((IUnknown *)*ppv); + *ppv = &This->IMultiQI_iface; + IMultiQI_AddRef(&This->IMultiQI_iface); return S_OK; } if (IsEqualIID(riid, &IID_IMarshal)) @@ -922,8 +922,8 @@ static HRESULT proxy_manager_create_ifproxy( * proxy associated with the ifproxy as we handle IUnknown ourselves */ if (IsEqualIID(riid, &IID_IUnknown)) { - ifproxy->iface = &This->lpVtbl; - IMultiQI_AddRef((IMultiQI *)&This->lpVtbl); + ifproxy->iface = &This->IMultiQI_iface; + IMultiQI_AddRef(&This->IMultiQI_iface); hr = S_OK; } else @@ -935,7 +935,7 @@ static HRESULT proxy_manager_create_ifproxy( * This ensures the COM identity rules are not violated, by having a * one-to-one mapping of objects on the proxy side to objects on the * stub side, no matter which interface you view the object through */ - hr = IPSFactoryBuffer_CreateProxy(psfb, (IUnknown *)&This->lpVtbl, riid, + hr = IPSFactoryBuffer_CreateProxy(psfb, (IUnknown*)&This->IMultiQI_iface, riid, &ifproxy->proxy, &ifproxy->iface); IPSFactoryBuffer_Release(psfb); if (hr != S_OK) @@ -1138,7 +1138,7 @@ static BOOL find_proxy_manager(APARTMENT * apt, OXID oxid, OID oid, struct proxy /* be careful of a race with ClientIdentity_Release, which would * cause us to return a proxy which is in the process of being * destroyed */ - if (ClientIdentity_AddRef((IMultiQI *)&proxy->lpVtbl) != 0) + if (IMultiQI_AddRef(&proxy->IMultiQI_iface) != 0) { *proxy_found = proxy; found = TRUE; @@ -1322,7 +1322,7 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, /* release our reference to the proxy manager - the client/apartment * will hold on to the remaining reference for us */ - if (proxy_manager) ClientIdentity_Release((IMultiQI*)&proxy_manager->lpVtbl); + if (proxy_manager) IMultiQI_Release(&proxy_manager->IMultiQI_iface); return hr; }

1 0

Daniel Jelinski : comctl32: Allow expanding/ collapsing treeview nodes multiple times.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 06d284cabb68a082b7c02435c99555bf9734cb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d284cabb68a082b7c02435c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Fri Oct 12 21:33:17 2012 +0200 comctl32: Allow expanding/collapsing treeview nodes multiple times. --- dlls/comctl32/treeview.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 7d195a0..032f49e 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5238,13 +5238,11 @@ TREEVIEW_KeyDown(TREEVIEW_INFO *infoPtr, WPARAM wParam) break; case VK_ADD: - if (!(prevItem->state & TVIS_EXPANDED)) - TREEVIEW_Expand(infoPtr, prevItem, FALSE, TRUE); + TREEVIEW_Expand(infoPtr, prevItem, FALSE, TRUE); break; case VK_SUBTRACT: - if (prevItem->state & TVIS_EXPANDED) - TREEVIEW_Collapse(infoPtr, prevItem, FALSE, TRUE); + TREEVIEW_Collapse(infoPtr, prevItem, FALSE, TRUE); break; case VK_PRIOR:

1 0

Sergey Guralnik : user32: Add internal class small icons.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 3d4db9f28f13a360e87a1a057248c87c06d82b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d4db9f28f13a360e87a1a057… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Fri Oct 12 10:36:10 2012 +0400 user32: Add internal class small icons. --- dlls/user32/class.c | 32 +++++++++++++++++++++++++++++--- dlls/user32/tests/class.c | 5 ----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 8b5060a..a66f0db 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -56,6 +56,7 @@ typedef struct tagCLASS HINSTANCE hInstance; /* Module that created the task */ HICON hIcon; /* Default icon */ HICON hIconSm; /* Default small icon */ + HICON hIconSmIntern; /* Internal small icon, derived from hIcon */ HCURSOR hCursor; /* Default cursor */ HBRUSH hbrBackground; /* Default background */ ATOM atomName; /* Name of the class */ @@ -518,6 +519,10 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) classPtr->hIcon = wc->hIcon; classPtr->hIconSm = wc->hIconSm; + classPtr->hIconSmIntern = wc->hIcon && !wc->hIconSm ? + CopyImage( wc->hIcon, IMAGE_ICON, + GetSystemMetrics( SM_CXSMICON ), + GetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; classPtr->hCursor = wc->hCursor; classPtr->hbrBackground = wc->hbrBackground; classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, FALSE ); @@ -556,6 +561,10 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) classPtr->hIcon = wc->hIcon; classPtr->hIconSm = wc->hIconSm; + classPtr->hIconSmIntern = wc->hIcon && !wc->hIconSm ? + CopyImage( wc->hIcon, IMAGE_ICON, + GetSystemMetrics( SM_CXSMICON ), + GetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; classPtr->hCursor = wc->hCursor; classPtr->hbrBackground = wc->hbrBackground; classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, TRUE ); @@ -741,7 +750,7 @@ static ULONG_PTR CLASS_GetClassLong( HWND hwnd, INT offset, UINT size, retvalue = (ULONG_PTR)class->hIcon; break; case GCLP_HICONSM: - retvalue = (ULONG_PTR)class->hIconSm; + retvalue = (ULONG_PTR)(class->hIconSm ? class->hIconSm : class->hIconSmIntern); break; case GCL_STYLE: retvalue = class->style; @@ -884,10 +893,27 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, break; case GCLP_HICON: retval = (ULONG_PTR)class->hIcon; + if (retval && class->hIconSmIntern) + { + DestroyIcon(class->hIconSmIntern); + class->hIconSmIntern = NULL; + } + if (newval && !class->hIconSm) + class->hIconSmIntern = CopyImage( (HICON)newval, IMAGE_ICON, + GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ), 0 ); class->hIcon = (HICON)newval; break; case GCLP_HICONSM: retval = (ULONG_PTR)class->hIconSm; + if (retval && !newval) + class->hIconSmIntern = class->hIcon ? CopyImage( class->hIcon, IMAGE_ICON, + GetSystemMetrics( SM_CXSMICON ), + GetSystemMetrics( SM_CYSMICON ), 0 ) : NULL; + else if (!retval && newval && class->hIconSmIntern) + { + DestroyIcon(class->hIconSmIntern); + class->hIconSmIntern = NULL; + } class->hIconSm = (HICON)newval; break; case GCL_STYLE: @@ -1099,7 +1125,7 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) wc->cbWndExtra = classPtr->cbWndExtra; wc->hInstance = (hInstance == user32_module) ? 0 : hInstance; wc->hIcon = classPtr->hIcon; - wc->hIconSm = classPtr->hIconSm; + wc->hIconSm = classPtr->hIconSm ? classPtr->hIconSm : classPtr->hIconSmIntern; wc->hCursor = classPtr->hCursor; wc->hbrBackground = classPtr->hbrBackground; wc->lpszMenuName = CLASS_GetMenuNameA( classPtr ); @@ -1141,7 +1167,7 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc wc->cbWndExtra = classPtr->cbWndExtra; wc->hInstance = (hInstance == user32_module) ? 0 : hInstance; wc->hIcon = classPtr->hIcon; - wc->hIconSm = classPtr->hIconSm; + wc->hIconSm = classPtr->hIconSm ? classPtr->hIconSm : classPtr->hIconSmIntern; wc->hCursor = classPtr->hCursor; wc->hbrBackground = classPtr->hbrBackground; wc->lpszMenuName = CLASS_GetMenuNameW( classPtr ); diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 8e4be6a..2f497a5 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -999,11 +999,9 @@ static void test_icons(void) ok(GetClassInfoExW(hinst, cls_name, &ret_wcex), "Class info was not retrieved\n"); ok(wcex.hIcon == ret_wcex.hIcon, "Icons don't match\n"); -todo_wine ok(ret_wcex.hIconSm != NULL, "hIconSm should be non-zero handle\n"); hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); -todo_wine ok(hsmicon != NULL, "GetClassLong should return non-zero handle\n"); hsmallnew = CopyImage(wcex.hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), @@ -1016,7 +1014,6 @@ todo_wine SetClassLongPtrW(hwnd, GCLP_HICONSM, 0); hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); -todo_wine ok( hsmicon != NULL, "GetClassLong should return non-zero handle\n"); SetClassLongPtrW(hwnd, GCLP_HICON, 0); @@ -1024,10 +1021,8 @@ todo_wine SetClassLongPtrW(hwnd, GCLP_HICON, (LONG_PTR)LoadIconW(NULL, (LPCWSTR)IDI_QUESTION)); hsmicon = (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM); -todo_wine ok(hsmicon != NULL, "GetClassLong should return non-zero handle\n"); UnregisterClassW(cls_name, hinst); -todo_wine ok(GetIconInfo(hsmicon, &icinf), "Icon should NOT be destroyed\n"); DestroyIcon(hsmallnew);

1 0

Alexandre Julliard : winex11: Move the icon window off-screen for managed windows.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 0bc93684f011d35fa63cdc126f938fa4adac7452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bc93684f011d35fa63cdc126… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 16:17:22 2012 +0200 winex11: Move the icon window off-screen for managed windows. --- dlls/user32/tests/msg.c | 5 ----- dlls/winex11.drv/window.c | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7d14b12..bfc3830 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11031,11 +11031,6 @@ static void test_ShowWindow(void) } else { - if (wp.ptMinPosition.x != sw[i].wp_min.x || wp.ptMinPosition.y != sw[i].wp_min.y) - todo_wine - ok(wp.ptMinPosition.x == sw[i].wp_min.x && wp.ptMinPosition.y == sw[i].wp_min.y, - "expected %d,%d got %d,%d\n", sw[i].wp_min.x, sw[i].wp_min.y, wp.ptMinPosition.x, wp.ptMinPosition.y); - else ok(wp.ptMinPosition.x == sw[i].wp_min.x && wp.ptMinPosition.y == sw[i].wp_min.y, "expected %d,%d got %d,%d\n", sw[i].wp_min.x, sw[i].wp_min.y, wp.ptMinPosition.x, wp.ptMinPosition.y); } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f5f7af5..8b76441 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2175,7 +2175,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (data->mapped && event_type != ReparentNotify) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (!event_type && + (!event_type && !(new_style & WS_MINIMIZE) && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) { release_win_data( data ); @@ -2241,9 +2241,18 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data = get_win_data( hwnd ); - if (!data || !data->whole_window || !data->managed || !data->mapped || data->iconic) goto done; - if (style & WS_MINIMIZE) goto done; + if (!data || !data->whole_window || !data->managed) goto done; if (IsRectEmpty( rect )) goto done; + if (style & WS_MINIMIZE) + { + if (rect->left != -32000 || rect->top != -32000) + { + OffsetRect( rect, -32000 - rect->left, -32000 - rect->top ); + swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE); + } + goto done; + } + if (!data->mapped || data->iconic) goto done; /* only fetch the new rectangle if the ShowWindow was a result of a window manager event */

1 0

Alexandre Julliard : user32: Don't show the icon title for off-screen icons .
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 49a5db38696d5c768ec5e2a4add25c264844c8c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a5db38696d5c768ec5e2a4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 16:17:46 2012 +0200 user32: Don't show the icon title for off-screen icons. --- dlls/user32/winpos.c | 57 +++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index a04bf2c..5a2f1f2 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -660,42 +660,43 @@ BOOL WINPOS_RedrawIconTitle( HWND hWnd ) /*********************************************************************** * WINPOS_ShowIconTitle */ -static BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) +static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) { - if (!GetPropA( hwnd, "__wine_x11_managed" )) - { - WND *win = WIN_GetPtr( hwnd ); - HWND title = 0; + WND *win = WIN_GetPtr( hwnd ); + HWND title = 0; - TRACE("%p %i\n", hwnd, (bShow != 0) ); + TRACE("%p %i\n", hwnd, (bShow != 0) ); - if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; - title = win->icon_title; - WIN_ReleasePtr( win ); + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return; + if (win->rectWindow.left == -32000 || win->rectWindow.top == -32000) + { + TRACE( "not showing title for hidden icon %p\n", hwnd ); + bShow = FALSE; + } + else title = win->icon_title; + WIN_ReleasePtr( win ); - if( bShow ) + if (bShow) + { + if (!title) { - if (!title) - { - title = ICONTITLE_Create( hwnd ); - if (!(win = WIN_GetPtr( hwnd )) || win == WND_OTHER_PROCESS) - { - DestroyWindow( title ); - return FALSE; - } - win->icon_title = title; - WIN_ReleasePtr( win ); - } - if (!IsWindowVisible(title)) + title = ICONTITLE_Create( hwnd ); + if (!(win = WIN_GetPtr( hwnd )) || win == WND_OTHER_PROCESS) { - SendMessageW( title, WM_SHOWWINDOW, TRUE, 0 ); - SetWindowPos( title, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | - SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW ); + DestroyWindow( title ); + return; } - } - else if (title) ShowWindow( title, SW_HIDE ); + win->icon_title = title; + WIN_ReleasePtr( win ); + } + if (!IsWindowVisible(title)) + { + SendMessageW( title, WM_SHOWWINDOW, TRUE, 0 ); + SetWindowPos( title, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_SHOWWINDOW ); + } } - return FALSE; + else if (title) ShowWindow( title, SW_HIDE ); } /*******************************************************************

1 0

Alexandre Julliard : winex11: Get rid of the __wine_x11_managed property.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 0f71ff281fa7422cf8d133fdd8f18c422f7672cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f71ff281fa7422cf8d133fdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 16:19:09 2012 +0200 winex11: Get rid of the __wine_x11_managed property. --- dlls/winex11.drv/window.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8b76441..59957a4 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -83,7 +83,6 @@ static Window user_time_window; static const char foreign_window_prop[] = "__wine_x11_foreign_window"; static const char whole_window_prop[] = "__wine_x11_whole_window"; static const char clip_window_prop[] = "__wine_x11_clip_window"; -static const char managed_prop[] = "__wine_x11_managed"; static CRITICAL_SECTION win_data_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -1135,7 +1134,6 @@ void make_window_embedded( struct x11drv_win_data *data ) } data->embedded = TRUE; data->managed = TRUE; - SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); sync_window_style( data ); set_xembed_flags( data, data->mapped ? XEMBED_MAPPED : 0 ); } @@ -1353,7 +1351,6 @@ static void create_whole_window( struct x11drv_win_data *data ) { TRACE( "making win %p/%lx managed\n", data->hwnd, data->whole_window ); data->managed = TRUE; - SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); } if ((win_rgn = CreateRectRgn( 0, 0, 0, 0 )) && GetWindowRgn( data->hwnd, win_rgn ) == ERROR) @@ -1577,7 +1574,6 @@ static BOOL create_desktop_win_data( Display *display, HWND hwnd ) if (!(data = alloc_win_data( display, hwnd ))) return FALSE; data->whole_window = root_window; data->managed = TRUE; - SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); SetPropA( data->hwnd, whole_window_prop, (HANDLE)root_window ); set_initial_wm_hints( display, root_window ); release_win_data( data ); @@ -1989,11 +1985,7 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) { /* destroy the old X windows */ destroy_whole_window( data, FALSE ); - if (data->managed) - { - data->managed = FALSE; - RemovePropA( data->hwnd, managed_prop ); - } + data->managed = FALSE; } } else /* new top level window */ @@ -2044,7 +2036,6 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag unmap_window( hwnd ); if (!(data = get_win_data( hwnd ))) return; data->managed = TRUE; - SetPropA( hwnd, managed_prop, (HANDLE)1 ); } *visible_rect = *window_rect;

1 0

Alexandre Julliard : user32: Delay message spying initialization until needed.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 003355946fb4d94bc84929aa227cff65a932a713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003355946fb4d94bc84929aa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 15 18:02:36 2012 +0200 user32: Delay message spying initialization until needed. --- dlls/user32/spy.c | 138 +++++++++++++++++++++++++------------------- dlls/user32/user_main.c | 3 - dlls/user32/user_private.h | 1 - 3 files changed, 79 insertions(+), 63 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 6a01ea4..b370aea 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1998,11 +1998,17 @@ static const SPY_NOTIFY spnfy_array[] = { }; #undef SPNFY -static unsigned char SPY_Exclude[SPY_MAX_MSGNUM+1]; -static unsigned char SPY_ExcludeDWP = 0; +static unsigned char *spy_exclude; -#define SPY_EXCLUDE(msg) \ - (SPY_Exclude[(msg) > SPY_MAX_MSGNUM ? SPY_MAX_MSGNUM : (msg)]) +static inline BOOL exclude_msg( UINT msg ) +{ + return spy_exclude[ min( msg, SPY_MAX_MSGNUM ) ]; +} + +static inline BOOL exclude_dwp(void) +{ + return spy_exclude[SPY_MAX_MSGNUM + 1]; +} typedef struct @@ -2017,7 +2023,7 @@ typedef struct WCHAR wnd_name[16]; /* window name for message */ } SPY_INSTANCE; -static int indent_tls_index; +static int indent_tls_index = TLS_OUT_OF_INDEXES; /*********************************************************************** * get_indent_level @@ -2521,6 +2527,70 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) } } + + +/*********************************************************************** + * spy_init + */ +static BOOL spy_init(void) +{ + int i; + char buffer[1024]; + HKEY hkey; + char *exclude; + + if (!TRACE_ON(message)) return FALSE; + + if (indent_tls_index == TLS_OUT_OF_INDEXES) + { + DWORD index = TlsAlloc(); + if (InterlockedCompareExchange( &indent_tls_index, index, TLS_OUT_OF_INDEXES ) != TLS_OUT_OF_INDEXES) + TlsFree( index ); + } + + if (spy_exclude) return TRUE; + exclude = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, SPY_MAX_MSGNUM + 2 ); + + /* @@ Wine registry key: HKCU\Software\Wine\Debug */ + if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Debug", &hkey)) + { + DWORD type, count = sizeof(buffer); + + buffer[0] = 0; + if (!RegQueryValueExA(hkey, "SpyInclude", 0, &type, (LPBYTE) buffer, &count) && + strcmp( buffer, "INCLUDEALL" )) + { + TRACE("Include=%s\n", buffer ); + for (i = 0; i <= SPY_MAX_MSGNUM; i++) + exclude[i] = (MessageTypeNames[i] && !strstr(buffer,MessageTypeNames[i])); + } + + count = sizeof(buffer); + buffer[0] = 0; + if (!RegQueryValueExA(hkey, "SpyExclude", 0, &type, (LPBYTE) buffer, &count)) + { + TRACE("Exclude=%s\n", buffer ); + if (!strcmp( buffer, "EXCLUDEALL" )) + for (i = 0; i <= SPY_MAX_MSGNUM; i++) exclude[i] = TRUE; + else + for (i = 0; i <= SPY_MAX_MSGNUM; i++) + exclude[i] = (MessageTypeNames[i] && strstr(buffer,MessageTypeNames[i])); + } + + count = sizeof(buffer); + if(!RegQueryValueExA(hkey, "SpyExcludeDWP", 0, &type, (LPBYTE) buffer, &count)) + exclude[SPY_MAX_MSGNUM + 1] = atoi(buffer); + + RegCloseKey(hkey); + } + + if (InterlockedCompareExchangePointer( (void **)&spy_exclude, exclude, NULL )) + HeapFree( GetProcessHeap(), 0, exclude ); + + return TRUE; +} + + /*********************************************************************** * SPY_EnterMessage */ @@ -2531,7 +2601,7 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg, int indent; DWORD save_error = GetLastError(); - if (!TRACE_ON(message) || SPY_EXCLUDE(msg)) return; + if (!spy_init() || exclude_msg(msg)) return; sp_e.msgnum = msg; sp_e.msg_hwnd = hWnd; @@ -2566,7 +2636,7 @@ void SPY_EnterMessage( INT iFlag, HWND hWnd, UINT msg, break; case SPY_DEFWNDPROC: - if( SPY_ExcludeDWP ) return; + if (exclude_dwp()) return; TRACE("%*s(%p) DefWindowProc:[%04x] %s wp=%08lx lp=%08lx\n", indent, "", hWnd, msg, sp_e.msg_name, wParam, lParam ); break; @@ -2586,8 +2656,8 @@ void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn, int indent; DWORD save_error = GetLastError(); - if (!TRACE_ON(message) || SPY_EXCLUDE(msg) || - (SPY_ExcludeDWP && iFlag == SPY_RESULT_DEFWND)) + if (!TRACE_ON(message) || exclude_msg(msg) || + (exclude_dwp() && iFlag == SPY_RESULT_DEFWND)) return; sp_e.msgnum = msg; @@ -2619,53 +2689,3 @@ void SPY_ExitMessage( INT iFlag, HWND hWnd, UINT msg, LRESULT lReturn, } SetLastError( save_error ); } - - -/*********************************************************************** - * SPY_Init - */ -int SPY_Init(void) -{ - int i; - char buffer[1024]; - HKEY hkey; - - if (!TRACE_ON(message)) return TRUE; - - indent_tls_index = TlsAlloc(); - /* @@ Wine registry key: HKCU\Software\Wine\Debug */ - if(!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Debug", &hkey)) - { - DWORD type, count = sizeof(buffer); - - buffer[0] = 0; - if (!RegQueryValueExA(hkey, "SpyInclude", 0, &type, (LPBYTE) buffer, &count) && - strcmp( buffer, "INCLUDEALL" )) - { - TRACE("Include=%s\n", buffer ); - for (i = 0; i <= SPY_MAX_MSGNUM; i++) - SPY_Exclude[i] = (MessageTypeNames[i] && !strstr(buffer,MessageTypeNames[i])); - } - - count = sizeof(buffer); - buffer[0] = 0; - if (!RegQueryValueExA(hkey, "SpyExclude", 0, &type, (LPBYTE) buffer, &count)) - { - TRACE("Exclude=%s\n", buffer ); - if (!strcmp( buffer, "EXCLUDEALL" )) - for (i = 0; i <= SPY_MAX_MSGNUM; i++) SPY_Exclude[i] = TRUE; - else - for (i = 0; i <= SPY_MAX_MSGNUM; i++) - SPY_Exclude[i] = (MessageTypeNames[i] && strstr(buffer,MessageTypeNames[i])); - } - - SPY_ExcludeDWP = 0; - count = sizeof(buffer); - if(!RegQueryValueExA(hkey, "SpyExcludeDWP", 0, &type, (LPBYTE) buffer, &count)) - SPY_ExcludeDWP = atoi(buffer); - - RegCloseKey(hkey); - } - - return 1; -} diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 6e39999..c5b4714 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -281,9 +281,6 @@ static BOOL process_attach(void) /* Initialize built-in window classes */ CLASS_RegisterBuiltinClasses(); - /* Initialize message spying */ - if (!SPY_Init()) return FALSE; - return TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 6e337ca..3afc7cf 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -267,7 +267,6 @@ extern const char *SPY_GetVKeyName(WPARAM wParam) DECLSPEC_HIDDEN; extern void SPY_EnterMessage( INT iFlag, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern void SPY_ExitMessage( INT iFlag, HWND hwnd, UINT msg, LRESULT lReturn, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern int SPY_Init(void) DECLSPEC_HIDDEN; #include "pshpack1.h"

1 0

Hans Leidekker : wbemprox: Pass an object instance to class methods.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 755e01bc986b786770a2700296c577f1c0526d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=755e01bc986b786770a270029… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 15 16:18:59 2012 +0200 wbemprox: Pass an object instance to class methods. --- dlls/wbemprox/reg.c | 6 +++--- dlls/wbemprox/services.c | 26 ++++++++++++++++++++------ dlls/wbemprox/wbemprox_private.h | 8 ++++---- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 151ab4b..b4731fe 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -121,7 +121,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT return hr; } -HRESULT reg_enum_key( IWbemClassObject *in, IWbemClassObject **out ) +HRESULT reg_enum_key( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { VARIANT defkey, subkey, names, retval; IWbemClassObject *sig; @@ -219,7 +219,7 @@ done: return hr; } -HRESULT reg_enum_values( IWbemClassObject *in, IWbemClassObject **out ) +HRESULT reg_enum_values( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { VARIANT defkey, subkey, names, types, retval; IWbemClassObject *sig; @@ -291,7 +291,7 @@ done: return hr; } -HRESULT reg_get_stringvalue( IWbemClassObject *in, IWbemClassObject **out ) +HRESULT reg_get_stringvalue( IWbemClassObject *obj, IWbemClassObject *in, IWbemClassObject **out ) { VARIANT defkey, subkey, name, value, retval; IWbemClassObject *sig; diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 3f87d5b..663d2d0 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -578,6 +578,7 @@ static HRESULT WINAPI wbem_services_ExecMethod( IWbemClassObject **ppOutParams, IWbemCallResult **ppCallResult ) { + IWbemClassObject *obj; struct table *table; class_method *func; struct path *path; @@ -588,16 +589,29 @@ static HRESULT WINAPI wbem_services_ExecMethod( if (lFlags) FIXME("flags %08x not supported\n", lFlags); - if ((hr = parse_path( strObjectPath, &path )) != S_OK) return hr; - + if ((hr = get_object( strObjectPath, &obj ))) return hr; + if ((hr = parse_path( strObjectPath, &path )) != S_OK) + { + IWbemClassObject_Release( obj ); + return hr; + } table = grab_table( path->class ); free_path( path ); - if (!table) return WBEM_E_NOT_FOUND; - + if (!table) + { + IWbemClassObject_Release( obj ); + return WBEM_E_NOT_FOUND; + } hr = get_method( table, strMethodName, &func ); release_table( table ); - if (hr != S_OK) return hr; - return func( pInParams, ppOutParams ); + if (hr != S_OK) + { + IWbemClassObject_Release( obj ); + return hr; + } + hr = func( obj, pInParams, ppOutParams ); + IWbemClassObject_Release( obj ); + return hr; } static HRESULT WINAPI wbem_services_ExecMethodAsync( diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 2c57ad7e..02fc919 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -38,7 +38,7 @@ enum param_direction #define COL_FLAG_KEY 0x00020000 #define COL_FLAG_METHOD 0x00040000 -typedef HRESULT (class_method)(IWbemClassObject *, IWbemClassObject **); +typedef HRESULT (class_method)(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **); struct column { @@ -196,9 +196,9 @@ HRESULT create_class_object(const WCHAR *, IEnumWbemClassObject *, UINT, struct record *, IWbemClassObject **) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; -HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT reg_enum_key(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT reg_enum_values(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; +HRESULT reg_get_stringvalue(IWbemClassObject *, IWbemClassObject *, IWbemClassObject **) DECLSPEC_HIDDEN; static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc( size_t len )

1 0

Francois Gouget : d3dcompiler_43: Make free_function{_decl}() static.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: 25c465269c09507172d94ae7ba41e1d08a1d826e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25c465269c09507172d94ae7b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 15 17:24:25 2012 +0200 d3dcompiler_43: Make free_function{_decl}() static. --- dlls/d3dcompiler_43/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 830965d..6d174f6 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2468,7 +2468,7 @@ void free_instr(struct hlsl_ir_node *node) } } -void free_function_decl(struct hlsl_ir_function_decl *func) +static void free_function_decl(struct hlsl_ir_function_decl *func) { d3dcompiler_free((void *)func->semantic); d3dcompiler_free(func->parameters); @@ -2481,7 +2481,7 @@ static void free_function_decl_rb(struct wine_rb_entry *entry, void *context) free_function_decl(WINE_RB_ENTRY_VALUE(entry, struct hlsl_ir_function_decl, entry)); } -void free_function(struct hlsl_ir_function *func) +static void free_function(struct hlsl_ir_function *func) { wine_rb_destroy(&func->overloads, free_function_decl_rb, NULL); d3dcompiler_free((void *)func->name);

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: b17ded0ac129aa6b31e5161399714da3b823bb53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17ded0ac129aa6b31e516139… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 15 17:24:41 2012 +0200 user32/tests: Add a trailing '\n' to an ok() call. --- dlls/user32/tests/class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 2f497a5..4406310 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1009,7 +1009,7 @@ static void test_icons(void) ok(!SetClassLongPtrW(hwnd, GCLP_HICONSM, (LONG_PTR)hsmallnew), "Previous hIconSm should be zero\n"); ok(hsmallnew == (HICON)GetClassLongPtrW(hwnd, GCLP_HICONSM), - "Should return explicitly assigned small icon"); + "Should return explicitly assigned small icon\n"); ok(!GetIconInfo(hsmicon, &icinf), "Previous small icon should be destroyed\n"); SetClassLongPtrW(hwnd, GCLP_HICONSM, 0);

1 0