October 2012 - Wine-commits

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

15 Oct '12

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 15 Oct '12

15 Oct '12

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 15 Oct '12

15 Oct '12

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

Christian Costa : kernel32: Implement FileNameInfo in GetFileInformationByHandleEx.
by Alexandre Julliard 15 Oct '12

15 Oct '12

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

Christian Costa : qcap: Remove useless FIXME.
by Alexandre Julliard 15 Oct '12

15 Oct '12

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

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

15 Oct '12

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

Nikolay Sivov : ole32: Fix debug output for user marshal flags.
by Alexandre Julliard 15 Oct '12

15 Oct '12

Module: wine Branch: master Commit: af5cee18624482b5d184a18cb24f06605c9eaaa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af5cee18624482b5d184a18cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 14 10:27:22 2012 -0400 ole32: Fix debug output for user marshal flags. --- dlls/ole32/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8f5feef..d1f56c7 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -74,9 +74,9 @@ static const char* debugstr_user_flags(ULONG *pFlags) } if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION) - return wine_dbg_sprintf("MAKELONG(NDR_LOCAL_REPRESENTATION, %s)", loword); + return wine_dbg_sprintf("MAKELONG(%s, NDR_LOCAL_DATA_REPRESENTATION)", loword); else - return wine_dbg_sprintf("MAKELONG(0x%04x, %s)", HIWORD(*pFlags), loword); + return wine_dbg_sprintf("MAKELONG(%s, 0x%04x)", loword, HIWORD(*pFlags)); } /******************************************************************************

1 0

Nikolay Sivov : ole32: Cleanup IRpcChannelBuffer.
by Alexandre Julliard 15 Oct '12

15 Oct '12

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 15 Oct '12

15 Oct '12

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

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

15 Oct '12

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