October 2012 - Wine-Commits

Alexandre Julliard : winex11: Get rid of the __wine_x11_managed property.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

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

Sergey Guralnik : user32: Add internal class small icons.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

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

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

Oct. 15, 2012

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

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

Oct. 15, 2012

Module: wine Branch: master Commit: 0b5c0855be4b59c3f7c156497ab120c12a62c370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5c0855be4b59c3f7c156497… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 14 12:07:06 2012 -0400 ole32: Store destination context and context data in server channel. --- dlls/ole32/compobj_private.h | 7 ++++--- dlls/ole32/marshal.c | 11 ++++++----- dlls/ole32/rpc.c | 10 ++++------ dlls/ole32/stubmanager.c | 9 +++++---- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index fc92389..0039655 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -185,7 +185,8 @@ ULONG stub_manager_int_release(struct stub_manager *This) DECLSPEC_HIDDEN; struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) DECLSPEC_HIDDEN; ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak) DECLSPEC_HIDDEN; ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tableweak, BOOL last_unlock_releases) DECLSPEC_HIDDEN; -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; +struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, + DWORD dest_context, void *dest_context_data, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct ifstub *stub_manager_find_ifstub(struct stub_manager *m, REFIID iid, MSHLFLAGS flags) DECLSPEC_HIDDEN; struct stub_manager *get_stub_manager(APARTMENT *apt, OID oid) DECLSPEC_HIDDEN; struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, void *object) DECLSPEC_HIDDEN; @@ -195,7 +196,7 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; HRESULT start_apartment_remote_unknown(void) DECLSPEC_HIDDEN; -HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; +HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; /* RPC Backend */ @@ -206,7 +207,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, const OXID_INFO *oxid_info, DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; -HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; +HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; void RPC_ExecuteCall(struct dispatch_params *params) DECLSPEC_HIDDEN; HRESULT RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; void RPC_UnregisterInterface(REFIID riid) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 5cd17e0..76431da 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -115,7 +115,8 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) } /* marshals an object into a STDOBJREF structure */ -HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, MSHLFLAGS mshlflags) +HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *object, + DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) { struct stub_manager *manager; struct ifstub *ifstub; @@ -192,7 +193,7 @@ HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnkno /* make sure ifstub that we are creating is unique */ ifstub = stub_manager_find_ifstub(manager, riid, mshlflags); if (!ifstub) - ifstub = stub_manager_new_ifstub(manager, stub, iobject, riid, mshlflags); + ifstub = stub_manager_new_ifstub(manager, stub, iobject, riid, dest_context, dest_context_data, mshlflags); if (stub) IRpcStubBuffer_Release(stub); IUnknown_Release(iobject); @@ -1225,8 +1226,8 @@ StdMarshalImpl_GetMarshalSizeMax( static HRESULT WINAPI StdMarshalImpl_MarshalInterface( - LPMARSHAL iface, IStream *pStm,REFIID riid, void* pv, DWORD dwDestContext, - void* pvDestContext, DWORD mshlflags) + LPMARSHAL iface, IStream *pStm,REFIID riid, void* pv, DWORD dest_context, + void* dest_context_data, DWORD mshlflags) { STDOBJREF stdobjref; ULONG res; @@ -1244,7 +1245,7 @@ StdMarshalImpl_MarshalInterface( /* make sure this apartment can be reached from other threads / processes */ RPC_StartRemoting(apt); - hres = marshal_object(apt, &stdobjref, riid, pv, mshlflags); + hres = marshal_object(apt, &stdobjref, riid, pv, dest_context, dest_context_data, mshlflags); if (hres != S_OK) { ERR("Failed to create ifstub, hres=0x%x\n", hres); diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9fd863d..9b57206 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1052,10 +1052,8 @@ static HRESULT WINAPI ServerRpcChannelBuffer_GetDestCtx(LPRPCCHANNELBUFFER iface { RpcChannelBuffer *This = (RpcChannelBuffer *)iface; - WARN("(%p,%p), stub!\n", dest_context, dest_context_data); + TRACE("(%p,%p)\n", dest_context, dest_context_data); - /* FIXME: implement this by storing the dwDestContext and pvDestContext - * values passed into IMarshal_MarshalInterface and returning them here */ *dest_context = This->dest_context; *dest_context_data = This->dest_context_data; return S_OK; @@ -1159,7 +1157,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, return S_OK; } -HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan) +HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) { RpcChannelBuffer *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) @@ -1167,8 +1165,8 @@ HRESULT RPC_CreateServerChannel(IRpcChannelBuffer **chan) This->IRpcChannelBuffer_iface.lpVtbl = &ServerRpcChannelBufferVtbl; This->refs = 1; - This->dest_context = MSHCTX_DIFFERENTMACHINE; - This->dest_context_data = NULL; + This->dest_context = dest_context; + This->dest_context_data = dest_context_data; *chan = &This->IRpcChannelBuffer_iface; diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index ea19a20..e7018b9 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -67,7 +67,8 @@ static inline HRESULT generate_ipid(struct stub_manager *m, IPID *ipid) } /* registers a new interface stub COM object with the stub manager and returns registration record */ -struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, MSHLFLAGS flags) +struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *sb, IUnknown *iptr, REFIID iid, DWORD dest_context, + void *dest_context_data, MSHLFLAGS flags) { struct ifstub *stub; HRESULT hr; @@ -78,7 +79,7 @@ struct ifstub *stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *s stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub)); if (!stub) return NULL; - hr = RPC_CreateServerChannel(&stub->chan); + hr = RPC_CreateServerChannel(dest_context, dest_context_data, &stub->chan); if (hr != S_OK) { HeapFree(GetProcessHeap(), 0, stub); @@ -666,7 +667,7 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface, for (i = 0; i < cIids; i++) { HRESULT hrobj = marshal_object(apt, &(*ppQIResults)[i].std, &iids[i], - stubmgr->object, MSHLFLAGS_NORMAL); + stubmgr->object, MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL); if (hrobj == S_OK) successful_qis++; (*ppQIResults)[i].hResult = hrobj; @@ -775,7 +776,7 @@ HRESULT start_apartment_remote_unknown(void) { STDOBJREF stdobjref; /* dummy - not used */ /* register it with the stub manager */ - hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, MSHLFLAGS_NORMAL|MSHLFLAGSP_REMUNKNOWN); + hr = marshal_object(apt, &stdobjref, &IID_IRemUnknown, (IUnknown *)pRemUnknown, MSHCTX_DIFFERENTMACHINE, NULL, MSHLFLAGS_NORMAL|MSHLFLAGSP_REMUNKNOWN); /* release our reference to the object as the stub manager will manage the life cycle for us */ IRemUnknown_Release(pRemUnknown); if (hr == S_OK)

1 0

Nikolay Sivov : dwrite: Correct reference count behavior for font face interface.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 438d115ec6c0d46b014406da19b14ed2402a27df URL: http://source.winehq.org/git/wine.git/?a=commit;h=438d115ec6c0d46b014406da1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 13 01:22:05 2012 -0400 dwrite: Correct reference count behavior for font face interface. --- dlls/dwrite/font.c | 3 +-- dlls/dwrite/tests/font.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e7beee5..d145df0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -352,6 +352,7 @@ static ULONG WINAPI dwritefont_Release(IDWriteFont *iface) if (!ref) { + if (This->face) IDWriteFontFace_Release(This->face); IDWriteFontFamily_Release(This->family); heap_free(This); } @@ -442,8 +443,6 @@ static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont *iface, IDWriteFontF { HRESULT hr = create_fontface(&This->face); if (FAILED(hr)) return hr; - *face = This->face; - return hr; } *face = This->face; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 70c714c..83c19da 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -433,17 +433,17 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(font, 1); - EXPECT_REF(fontface, 1); + EXPECT_REF(fontface, 2); hr = IDWriteFont_CreateFontFace(font, &fontface2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface == fontface2, "got %p, was %p\n", fontface2, fontface); - EXPECT_REF(fontface, 2); + EXPECT_REF(fontface, 3); EXPECT_REF(font, 1); IDWriteFontFace_AddRef(fontface); EXPECT_REF(font, 1); - EXPECT_REF(fontface, 3); + EXPECT_REF(fontface, 4); IDWriteFontFace_Release(fontface); IDWriteFontFace_Release(fontface);

1 0

Christian Costa : qcap: Remove useless FIXME.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: c503af851655af18e5db327d0f85f1d50d719c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c503af851655af18e5db327d0… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 14 18:22:07 2012 +0200 qcap: Remove useless FIXME. --- dlls/qcap/capturegraph.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index fd619aa..7cec77e 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -58,7 +58,6 @@ typedef struct CaptureGraphImpl ICaptureGraphBuilder ICaptureGraphBuilder_iface; LONG ref; IGraphBuilder *mygraph; - CRITICAL_SECTION csFilter; } CaptureGraphImpl; @@ -143,8 +142,7 @@ fnCaptureGraphBuilder2_AddRef(ICaptureGraphBuilder2 * iface) return ref; } -static ULONG WINAPI -fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface) +static ULONG WINAPI fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); DWORD ref = InterlockedDecrement(&This->ref); @@ -153,10 +151,9 @@ fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface) if (!ref) { - FIXME("Release IGraphFilter or w/e\n"); This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); - if (This->mygraph != NULL) + if (This->mygraph) IGraphBuilder_Release(This->mygraph); CoTaskMemFree(This); ObjectRefCount(FALSE); @@ -212,7 +209,7 @@ fnCaptureGraphBuilder2_GetFilterGraph(ICaptureGraphBuilder2 * iface, } IGraphBuilder_AddRef(This->mygraph); - + TRACE("(%p) return filtergraph %p\n", iface, *pfg); return S_OK; } @@ -452,7 +449,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, } static const ICaptureGraphBuilder2Vtbl builder2_Vtbl = -{ +{ fnCaptureGraphBuilder2_QueryInterface, fnCaptureGraphBuilder2_AddRef, fnCaptureGraphBuilder2_Release, @@ -578,7 +575,7 @@ fnCaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBuilder * iface, } static const ICaptureGraphBuilderVtbl builder_Vtbl = -{ +{ fnCaptureGraphBuilder_QueryInterface, fnCaptureGraphBuilder_AddRef, fnCaptureGraphBuilder_Release,

1 0

Christian Costa : kernel32: Implement FileNameInfo in GetFileInformationByHandleEx.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: d13f7720eb77d6a5167a0887bfbdd212bd1dd53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d13f7720eb77d6a5167a0887b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 14 17:27:57 2012 +0200 kernel32: Implement FileNameInfo in GetFileInformationByHandleEx. --- dlls/kernel32/file.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 41abe49..43818b0 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -876,7 +876,6 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA { case FileBasicInfo: case FileStandardInfo: - case FileNameInfo: case FileRenameInfo: case FileDispositionInfo: case FileAllocationInfo: @@ -897,6 +896,15 @@ BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLA SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; + case FileNameInfo: + status = NtQueryInformationFile( handle, &io, info, size, FileNameInformation ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; + case FileIdBothDirectoryRestartInfo: case FileIdBothDirectoryInfo: status = NtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, info, size,

1 0

Jason Edmeades : cmd: Add full support for copy concatenation and ascii/ binary.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 130cdcd72704bda70c5f13c711cd3febdd151825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=130cdcd72704bda70c5f13c71… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Fri Oct 12 10:23:24 2012 +0100 cmd: Add full support for copy concatenation and ascii/binary. --- programs/cmd/builtins.c | 101 +++++++++++++++++++++++++---- programs/cmd/tests/test_builtins.cmd | 4 + programs/cmd/tests/test_builtins.cmd.exp | 29 +++++---- 3 files changed, 106 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=130cdcd72704bda70c5f1…

1 0

Christian Costa : dinput: Replace FIXMEs by TRACEs in dump function.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: 6d62cc1212598f0efa6fd82c171dc91cbddc773a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d62cc1212598f0efa6fd82c1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Oct 12 23:58:10 2012 +0200 dinput: Replace FIXMEs by TRACEs in dump function. --- dlls/dinput/dinput_main.c | 53 +++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 63ff439..c07b333 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -185,7 +185,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW(HINSTANCE hinst, DWORD dwVer return DirectInputCreateEx(hinst, dwVersion, &IID_IDirectInput7W, (LPVOID *)ppDI, punkOuter); } -static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) { +static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) +{ switch (dwDevType) { case 0: return "All devices"; case DIDEVTYPE_MOUSE: return "DIDEVTYPE_MOUSE"; @@ -196,7 +197,8 @@ static const char *_dump_DIDEVTYPE_value(DWORD dwDevType) { } } -static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { +static void _dump_EnumDevices_dwFlags(DWORD dwFlags) +{ if (TRACE_ON(dinput)) { unsigned int i; static const struct { @@ -224,33 +226,34 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { TRACE("\n"); } -static void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { +static void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) +{ unsigned int i; - FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); - FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize); - FIXME("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize); - FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); - FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); - FIXME("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap)); - FIXME("diaf.dwGenre = 0x%08x\n", lpdiActionFormat->dwGenre); - FIXME("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize); - FIXME("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin); - FIXME("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax); - FIXME("diaf.hInstString = %p\n", lpdiActionFormat->hInstString); - FIXME("diaf.ftTimeStamp ...\n"); - FIXME("diaf.dwCRC = 0x%x\n", lpdiActionFormat->dwCRC); - FIXME("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap)); + TRACE("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); + TRACE("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize); + TRACE("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize); + TRACE("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); + TRACE("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); + TRACE("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap)); + TRACE("diaf.dwGenre = 0x%08x\n", lpdiActionFormat->dwGenre); + TRACE("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize); + TRACE("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin); + TRACE("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax); + TRACE("diaf.hInstString = %p\n", lpdiActionFormat->hInstString); + TRACE("diaf.ftTimeStamp ...\n"); + TRACE("diaf.dwCRC = 0x%x\n", lpdiActionFormat->dwCRC); + TRACE("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap)); for (i = 0; i < lpdiActionFormat->dwNumActions; i++) { - FIXME("diaf.rgoAction[%u]:\n", i); - FIXME("\tuAppData=0x%lx\n", lpdiActionFormat->rgoAction[i].uAppData); - FIXME("\tdwSemantic=0x%08x\n", lpdiActionFormat->rgoAction[i].dwSemantic); - FIXME("\tdwFlags=0x%x\n", lpdiActionFormat->rgoAction[i].dwFlags); - FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); - FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); - FIXME("\tdwObjID=0x%x\n", lpdiActionFormat->rgoAction[i].dwObjID); - FIXME("\tdwHow=0x%x\n", lpdiActionFormat->rgoAction[i].dwHow); + TRACE("diaf.rgoAction[%u]:\n", i); + TRACE("\tuAppData=0x%lx\n", lpdiActionFormat->rgoAction[i].uAppData); + TRACE("\tdwSemantic=0x%08x\n", lpdiActionFormat->rgoAction[i].dwSemantic); + TRACE("\tdwFlags=0x%x\n", lpdiActionFormat->rgoAction[i].dwFlags); + TRACE("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); + TRACE("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); + TRACE("\tdwObjID=0x%x\n", lpdiActionFormat->rgoAction[i].dwObjID); + TRACE("\tdwHow=0x%x\n", lpdiActionFormat->rgoAction[i].dwHow); } }

1 0

Christian Costa : ntoskrnl.exe: Add stub for IoAcquireRemoveLockEx.
by Alexandre Julliard Oct. 15, 2012

Oct. 15, 2012

Module: wine Branch: master Commit: ee67d124ac6e510cdacdf72c58b42a15d16de45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee67d124ac6e510cdacdf72c5… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sat Oct 13 13:11:28 2012 +0200 ntoskrnl.exe: Add stub for IoAcquireRemoveLockEx. --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 03e932c..654957a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1787,7 +1787,7 @@ POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT DeviceObject, POWER_STATE_TYPE */ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Action) { - FIXME("(%p %u ) stub\n", DeviceObject, Action); + FIXME("(%p %u) stub\n", DeviceObject, Action); return STATUS_SUCCESS; } @@ -1824,11 +1824,25 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) * IoInitializeRemoveLockEx (NTOSKRNL.EXE.@) */ VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK lock, ULONG tag, - ULONG maxmin, ULONG high, ULONG size) + ULONG maxmin, ULONG high, ULONG size) { FIXME("(%p %u %u %u %u) stub\n", lock, tag, maxmin, high, size); } + +/***************************************************** + * IoAcquireRemoveLockEx (NTOSKRNL.EXE.@) + */ + +NTSTATUS WINAPI IoAcquireRemoveLockEx(PIO_REMOVE_LOCK lock, PVOID tag, + LPCSTR file, ULONG line, ULONG lock_size) +{ + FIXME("(%p, %p, %s, %u, %u): stub\n", lock, tag, debugstr_a(file), line, lock_size); + + return STATUS_NOT_IMPLEMENTED; +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 4bce7ec..2c13728 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -304,7 +304,7 @@ @ stub InbvSolidColorFill @ stub InitSafeBootMode @ stdcall IoAcquireCancelSpinLock(ptr) -@ stub IoAcquireRemoveLockEx +@ stdcall IoAcquireRemoveLockEx(ptr ptr ptr long long) @ stub IoAcquireVpbSpinLock @ stub IoAdapterObjectType @ stub IoAllocateAdapterChannel

1 0