October 2012 - Wine-Commits

Nikolay Sivov : ole32: Cleanup IRpcChannelBuffer.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 27d59c891997db05d6ef4921e04009ed0c04e4bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d59c891997db05d6ef4921e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 14 10:38:04 2012 -0400 ole32: Cleanup IRpcChannelBuffer. --- dlls/ole32/rpc.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index cf3a823..12c6bb0 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -94,8 +94,8 @@ static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) typedef struct { - const IRpcChannelBufferVtbl *lpVtbl; - LONG refs; + IRpcChannelBuffer IRpcChannelBuffer_iface; + LONG refs; } RpcChannelBuffer; typedef struct @@ -1142,7 +1142,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, return E_OUTOFMEMORY; } - This->super.lpVtbl = &ClientRpcChannelBufferVtbl; + This->super.IRpcChannelBuffer_iface.lpVtbl = &ClientRpcChannelBufferVtbl; This->super.refs = 1; This->bind = bind; apartment_getoxid(COM_CurrentApt(), &This->oxid); @@ -1151,7 +1151,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, This->dest_context_data = dest_context_data; This->event = NULL; - *chan = (IRpcChannelBuffer*)This; + *chan = &This->super.IRpcChannelBuffer_iface; return S_OK; } @@ -1162,10 +1162,10 @@ HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &ServerRpcChannelBufferVtbl; + This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl; This->refs = 1; - *chan = (IRpcChannelBuffer*)This; + *chan = &This->IRpcChannelBuffer_iface; return S_OK; }

1 0

Nikolay Sivov : ole32: Store destination context data in channel buffer.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 3099a25464e1b9d6016c0740505168dc1718ba94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3099a25464e1b9d6016c07405… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 14 10:50:05 2012 -0400 ole32: Store destination context data in channel buffer. --- dlls/ole32/rpc.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 12c6bb0..9fd863d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -96,6 +96,9 @@ typedef struct { IRpcChannelBuffer IRpcChannelBuffer_iface; LONG refs; + + DWORD dest_context; /* returned from GetDestCtx */ + void *dest_context_data; /* returned from GetDestCtx */ } RpcChannelBuffer; typedef struct @@ -105,8 +108,6 @@ typedef struct RPC_BINDING_HANDLE bind; /* handle to the remote server */ OXID oxid; /* apartment in which the channel is valid */ DWORD server_pid; /* id of server process */ - DWORD dest_context; /* returned from GetDestCtx */ - LPVOID dest_context_data; /* returned from GetDestCtx */ HANDLE event; /* cached event handle */ } ClientRpcChannelBuffer; @@ -1041,20 +1042,22 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface TRACE("(%p,%p)\n", pdwDestContext, ppvDestContext); - *pdwDestContext = This->dest_context; - *ppvDestContext = This->dest_context_data; + *pdwDestContext = This->super.dest_context; + *ppvDestContext = This->super.dest_context_data; return S_OK; } -static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* pdwDestContext, void** ppvDestContext) +static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface, DWORD* dest_context, void** dest_context_data) { - WARN("(%p,%p), stub!\n", pdwDestContext, ppvDestContext); + RpcChannelBuffer *This = (RpcChannelBuffer *)iface; + + WARN("(%p,%p), stub!\n", dest_context, dest_context_data); /* FIXME: implement this by storing the dwDestContext and pvDestContext * values passed into IMarshal_MarshalInterface and returning them here */ - *pdwDestContext = MSHCTX_DIFFERENTMACHINE; - *ppvDestContext = NULL; + *dest_context = This->dest_context; + *dest_context_data = This->dest_context_data; return S_OK; } @@ -1144,11 +1147,11 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, This->super.IRpcChannelBuffer_iface.lpVtbl = &ClientRpcChannelBufferVtbl; This->super.refs = 1; + This->super.dest_context = dest_context; + This->super.dest_context_data = dest_context_data; This->bind = bind; apartment_getoxid(COM_CurrentApt(), &This->oxid); This->server_pid = oxid_info->dwPid; - This->dest_context = dest_context; - This->dest_context_data = dest_context_data; This->event = NULL; *chan = &This->super.IRpcChannelBuffer_iface; @@ -1164,6 +1167,8 @@ HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan) This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl; This->refs = 1; + This->dest_context = MSHCTX_DIFFERENTMACHINE; + This->dest_context_data = NULL; *chan = &This->IRpcChannelBuffer_iface;

1 0

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

Oct. 15, 2012

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

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

Oct. 15, 2012

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

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

Oct. 15, 2012

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

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

Oct. 15, 2012

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

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

Oct. 15, 2012

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

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

Oct. 15, 2012

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

Aric Stewart : imm32: Switch the value of IMMGWL_IMC in the UI window when a new imc opens.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 968a1e9b72866dd8663de34303b3ca1040007989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968a1e9b72866dd8663de3430… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 15 11:01:30 2012 -0500 imm32: Switch the value of IMMGWL_IMC in the UI window when a new imc opens. --- dlls/imm32/imm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index edd9e71..6bca604 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2351,6 +2351,8 @@ BOOL WINAPI ImmSetOpenStatus(HIMC hIMC, BOOL fOpen) 0, data->immKbd->hIME, 0); SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); } + else if (fOpen) + SetWindowLongPtrW(data->immKbd->UIWnd, IMMGWL_IMC, (LONG_PTR)data); if (!fOpen != !data->IMC.fOpen) {

1 0

Alexandre Julliard : user32: Delay message spying initialization until needed.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

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