November 2007 - Wine-Commits

Lauris Kaplinski : wined3d: Fixed potential reference of freed backBuffer array in IWineD3DDeviceImpl_SetFrontBackBuffers .
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 49ea085f118712b54dfef270391fa9b42bfefdec URL: http://source.winehq.org/git/wine.git/?a=commit;h=49ea085f118712b54dfef2703… Author: Lauris Kaplinski <lauris(a)kaplinski.com> Date: Sun Nov 25 23:07:24 2007 +0200 wined3d: Fixed potential reference of freed backBuffer array in IWineD3DDeviceImpl_SetFrontBackBuffers. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30ac0b7..8be3385 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6047,6 +6047,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], (IWineD3DBase *) Swapchain); } else { HeapFree(GetProcessHeap(), 0, Swapchain->backBuffer); + Swapchain->backBuffer = NULL; } }

1 0

Andrew Talbot : gdi32: Fix a typo.
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 03bba1e6d4b8560ed0135e9cfa697c0b8e0f57da URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bba1e6d4b8560ed0135e9cf… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 15:09:59 2007 +0000 gdi32: Fix a typo. --- dlls/gdi32/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 705d263..161e0df 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -472,7 +472,7 @@ void WINAPI SetDCState( HDC hdc, HDC hdcs ) release_dc_ptr( dc ); return; } - if (!dcs->flags & DC_SAVED) + if (!(dcs->flags & DC_SAVED)) { release_dc_ptr( dc ); release_dc_ptr( dcs );

1 0

Michael Stefaniuc : wininet/tests: Do not compare the return value of socket() with 0. Use INVALID_SOCKET instead.
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 6d8c2d744b7bba19e1d25a11dfb0f976828f2bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d8c2d744b7bba19e1d25a11d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 26 23:07:34 2007 +0100 wininet/tests: Do not compare the return value of socket() with 0. Use INVALID_SOCKET instead. --- dlls/wininet/tests/http.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4a28db9..ec2df72 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1228,7 +1228,8 @@ struct server_info { static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; - int r, s, c, i, on; + int r, c, i, on; + SOCKET s; struct sockaddr_in sa; char buffer[0x100]; WSADATA wsaData; @@ -1237,7 +1238,7 @@ static DWORD CALLBACK server_thread(LPVOID param) WSAStartup(MAKEWORD(1,1), &wsaData); s = socket(AF_INET, SOCK_STREAM, 0); - if (s<0) + if (s == INVALID_SOCKET) return 1; on = 1;

1 0

Michael Stefaniuc : rpcrt4: socket() returns -1 on error so check the return value against that.
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 61ed0c99e6e4bd85a68381396e2f7e0b5337fe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed0c99e6e4bd85a68381396… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 26 23:09:28 2007 +0100 rpcrt4: socket() returns -1 on error so check the return value against that. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index dfb7ece..40cc613 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -773,7 +773,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) } sock = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); - if (sock < 0) + if (sock == -1) { WARN("socket() failed: %s\n", strerror(errno)); continue; @@ -850,7 +850,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *pr } sock = socket(ai_cur->ai_family, ai_cur->ai_socktype, ai_cur->ai_protocol); - if (sock < 0) + if (sock == -1) { WARN("socket() failed: %s\n", strerror(errno)); status = RPC_S_CANT_CREATE_ENDPOINT;

1 0

Rob Shearman : advapi32: Add support for using the Mac Keychain services as a backend for the credential functions instead of the registry .
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 312a1db3ec28fe13cacc2719f782161ff6e224c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=312a1db3ec28fe13cacc2719f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:57:35 2007 +0000 advapi32: Add support for using the Mac Keychain services as a backend for the credential functions instead of the registry. --- configure | 8 +- configure.ac | 1 + dlls/advapi32/Makefile.in | 1 + dlls/advapi32/cred.c | 540 ++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 543 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=312a1db3ec28fe13cacc2…

1 0

Andrew Talbot : dinput: Use bitwise NOT not logical NOT.
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 1067f56ca5cea4ea863d107f892aaa52aa80cae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1067f56ca5cea4ea863d107f8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Nov 26 15:09:55 2007 +0000 dinput: Use bitwise NOT not logical NOT. --- dlls/dinput/effect_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index f5851fc..37af31f 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -540,7 +540,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( _dump_DIEFFECT(peff, &This->guid); - if ((dwFlags & !DIEP_NORESTART & !DIEP_NODOWNLOAD & !DIEP_START) == 0) { + if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { /* set everything */ dwFlags = DIEP_AXES | DIEP_DIRECTION | DIEP_DURATION | DIEP_ENVELOPE | DIEP_GAIN | DIEP_SAMPLEPERIOD | DIEP_STARTDELAY | DIEP_TRIGGERBUTTON |

1 0

Rob Shearman : ole32: Add tests for WdtpInterfacePointer_* functions.
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: c111c2d6859a18331b361aedd6cd5460ed54ef58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c111c2d6859a18331b361aedd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:52:07 2007 +0000 ole32: Add tests for WdtpInterfacePointer_* functions. Add stubs for these so that the tests link. --- dlls/ole32/ole32.spec | 8 ++-- dlls/ole32/tests/usrmarshal.c | 113 +++++++++++++++++++++++++++++++++++++++++ dlls/ole32/usrmarshal.c | 94 ++++++++++++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 1643484..25a1955 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -267,10 +267,10 @@ @ stub UtConvertDvtd32toDvtd16 @ stub UtGetDvtd16Info @ stub UtGetDvtd32Info -@ stub WdtpInterfacePointer_UserFree -@ stub WdtpInterfacePointer_UserMarshal -@ stub WdtpInterfacePointer_UserSize -@ stub WdtpInterfacePointer_UserUnmarshal +@ stdcall WdtpInterfacePointer_UserFree(ptr) +@ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) +@ stdcall WdtpInterfacePointer_UserSize(ptr long ptr long ptr) +@ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) @ stdcall WriteClassStg(ptr ptr) @ stdcall WriteClassStm(ptr ptr) @ stdcall WriteFmtUserTypeStg(ptr long ptr) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 28c6687..281f9a0 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -366,6 +366,118 @@ static void test_marshal_HMETAFILEPICT(void) HMETAFILEPICT_UserFree(&flags, &hmfp2); } +static HRESULT WINAPI Test_IUnknown_QueryInterface( + LPUNKNOWN iface, + REFIID riid, + LPVOID *ppvObj) +{ + if (ppvObj == NULL) return E_POINTER; + + if (IsEqualGUID(riid, &IID_IUnknown)) + { + *ppvObj = (LPVOID)iface; + IUnknown_AddRef(iface); + return S_OK; + } + + *ppvObj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI Test_IUnknown_AddRef(LPUNKNOWN iface) +{ + return 2; /* non-heap-based object */ +} + +static ULONG WINAPI Test_IUnknown_Release(LPUNKNOWN iface) +{ + return 1; /* non-heap-based object */ +} + +static const IUnknownVtbl TestUnknown_Vtbl = +{ + Test_IUnknown_QueryInterface, + Test_IUnknown_AddRef, + Test_IUnknown_Release, +}; + +static IUnknown Test_Unknown = { &TestUnknown_Vtbl }; + +ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *, ULONG, ULONG, IUnknown *, REFIID); +unsigned char * __RPC_USER WdtpInterfacePointer_UserMarshal(ULONG *, ULONG, unsigned char *, IUnknown *, REFIID); +unsigned char * __RPC_USER WdtpInterfacePointer_UserUnmarshal(ULONG *, unsigned char *, IUnknown **, REFIID); +void __RPC_USER WdtpInterfacePointer_UserFree(IUnknown *); + +static void test_marshal_WdtpInterfacePointer(void) +{ + unsigned char *buffer, *buffer_end; + ULONG size; + MIDL_STUB_MESSAGE stubmsg; + USER_MARSHAL_CB umcb; + IUnknown *unk; + IUnknown *unk2; + unsigned char *wireip; + const IID *iid; + + memset(&stubmsg, 0xcc, sizeof(stubmsg)); + stubmsg.dwDestContext = MSHCTX_INPROC; + stubmsg.pvDestContext = NULL; + + memset(&umcb, 0xcc, sizeof(umcb)); + umcb.Flags = MAKELONG(MSHCTX_INPROC, NDR_LOCAL_DATA_REPRESENTATION); + umcb.pStubMsg = &stubmsg; + + /* shows that the WdtpInterfacePointer functions don't marshal anything for + * NULL pointers, so code using these functions must handle that case + * itself */ + unk = NULL; + size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); + ok(size == 0, "size should be 0 bytes, not %d\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); + wireip = buffer; + HeapFree(GetProcessHeap(), 0, buffer); + + unk = &Test_Unknown; + size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); + todo_wine + ok(size == 108, "size should be 108 bytes, not %d\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); + wireip = buffer; + if (size >= 28) + { + ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x44, "wireip + 0x8 should be 0x4c instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x574f454d /* 'MEOW' */, "wireip + 0xc should be 0x574f454d instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 0x1, "wireip + 0x10 should be 0x1 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + iid = (const IID *)buffer; + ok(!IsEqualIID(iid, &IID_IUnknown), + "wireip + 0x14 should be IID_IUnknown instead of {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + iid->Data1, iid->Data2, iid->Data3, + iid->Data4[0], iid->Data4[1], iid->Data4[2], iid->Data4[3], + iid->Data4[4], iid->Data4[5], iid->Data4[6], iid->Data4[7]); + ok(*(DWORD *)wireip == 0, "wireip + 0x14 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(IID); + ok(*(DWORD *)wireip == 0, "wireip + 0x20 should be 0 instead of 0x%08x\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + ok(*(DWORD *)wireip == 5, "wireip + 0x24 should be 5 instead of %d\n", *(DWORD *)wireip); + wireip += sizeof(DWORD); + /* the rest is dynamic so can't really be tested */ + } + + unk2 = NULL; + WdtpInterfacePointer_UserUnmarshal(&umcb.Flags, buffer, &unk2, &IID_IUnknown); + todo_wine + ok(unk2 != NULL, "IUnknown object didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + WdtpInterfacePointer_UserFree(unk2); +} + START_TEST(usrmarshal) { CoInitialize(NULL); @@ -376,6 +488,7 @@ START_TEST(usrmarshal) test_marshal_HENHMETAFILE(); test_marshal_HMETAFILE(); test_marshal_HMETAFILEPICT(); + test_marshal_WdtpInterfacePointer(); CoUninitialize(); } diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index a1e1d89..c25b86a 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1434,6 +1434,100 @@ void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp) } /****************************************************************************** + * WdtpInterfacePointer_UserSize [OLE32.@] + * + * Calculates the buffer size required to marshal an interface pointer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * RealFlags [I] The MSHCTX to use when marshaling the interface. + * punk [I] Interface pointer to size. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * riid [I] ID of interface to size. + * + * RETURNS + * The buffer size required to marshal an interface pointer plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + */ +ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, IUnknown *punk, ULONG StartingSize, REFIID riid) +{ + FIXME("(%s, 0%x, %p, %d, %s): stub\n", debugstr_user_flags(pFlags), RealFlags, punk, StartingSize, debugstr_guid(riid)); + return 0; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserMarshal [OLE32.@] + * + * Marshals an interface pointer into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * RealFlags [I] The MSHCTX to use when marshaling the interface. + * pBuffer [I] Buffer to marshal the clip format into. + * punk [I] Interface pointer to marshal. + * riid [I] ID of interface to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + */ +unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG RealFlags, unsigned char *pBuffer, IUnknown *punk, REFIID riid) +{ + FIXME("(%s, 0x%x, %p, &%p, %s): stub\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid)); + return NULL; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserUnmarshal [OLE32.@] + * + * Unmarshals an interface pointer from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * ppunk [I/O] Address that receives the unmarshaled interface pointer. + * riid [I] ID of interface to unmarshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + */ +unsigned char * WINAPI WdtpInterfacePointer_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, IUnknown **ppunk, REFIID riid) +{ + FIXME("(%s, %p, %p, %s): stub\n", debugstr_user_flags(pFlags), pBuffer, ppunk, debugstr_guid(riid)); + return NULL; +} + +/****************************************************************************** + * WdtpInterfacePointer_UserFree [OLE32.@] + * + * Frees an unmarshaled interface pointer. + * + * PARAMS + * punk [I] Interface pointer to free. + * + * RETURNS + * Nothing. + */ +void WINAPI WdtpInterfacePointer_UserFree(IUnknown *punk) +{ + FIXME("(%p): stub\n", punk); +} + +/****************************************************************************** * STGMEDIUM_UserSize [OLE32.@] * * Calculates the buffer size required to marshal an STGMEDIUM.

1 0

Rob Shearman : ole32: Clean up properly in ClientRpcChannelBuffer_SendReceive in the case where PostMessageW fails .
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: ddf59f50f77448f7ba2d240e93eb3e8ed535c1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf59f50f77448f7ba2d240e9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:50:48 2007 +0000 ole32: Clean up properly in ClientRpcChannelBuffer_SendReceive in the case where PostMessageW fails. --- dlls/ole32/rpc.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index d4e6bfd..40330d4 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -796,6 +796,14 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac (LPARAM)&message_state->params)) { ERR("PostMessage failed with error %u\n", GetLastError()); + + IRpcStubBuffer_Release(message_state->params.stub); + message_state->params.stub = NULL; + IRpcChannelBuffer_Release(message_state->params.chan); + message_state->params.chan = NULL; + /* Note: message_state->params.iface doesn't have a reference and + * so doesn't need to be released */ + hr = HRESULT_FROM_WIN32(GetLastError()); } }

1 0

Rob Shearman : ole32: Store the dispatch parameters in the message state structure to allow them to be initialised earlier in the sequence of IRpcChannelBuffer calls .
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 6262230a4b51f1541987c374e9d513c5ab73a1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6262230a4b51f1541987c374e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 22:50:32 2007 +0000 ole32: Store the dispatch parameters in the message state structure to allow them to be initialised earlier in the sequence of IRpcChannelBuffer calls. --- dlls/ole32/rpc.c | 47 ++++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 57570c1..d4e6bfd 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -127,6 +127,9 @@ struct message_state RPC_BINDING_HANDLE binding_handle; ULONG prefix_data_len; SChannelHookCallInfo channel_hook_info; + + /* client only */ + struct dispatch_params params; }; typedef struct @@ -600,6 +603,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, message_state->channel_hook_info.dwServerPid = This->server_pid; message_state->channel_hook_info.iMethod = msg->ProcNum; message_state->channel_hook_info.pObject = NULL; /* only present on server-side */ + memset(&message_state->params, 0, sizeof(message_state->params)); extensions_size = ChannelHooks_ClientGetSize(&message_state->channel_hook_info, &channel_hook_data, &channel_hook_count, &extension_count); @@ -731,7 +735,6 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac RPC_MESSAGE *msg = (RPC_MESSAGE *)olemsg; RPC_STATUS status; DWORD index; - struct dispatch_params *params; APARTMENT *apt = NULL; IPID ipid; struct message_state *message_state; @@ -762,18 +765,15 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac return RPC_E_CANTCALLOUT_ININPUTSYNCCALL; } - params = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*params)); - if (!params) return E_OUTOFMEMORY; - message_state = (struct message_state *)msg->Handle; /* restore the binding handle and the real start of data */ msg->Handle = message_state->binding_handle; msg->Buffer = (char *)msg->Buffer - message_state->prefix_data_len; msg->BufferLength += message_state->prefix_data_len; - params->msg = olemsg; - params->status = RPC_S_OK; - params->hr = S_OK; + message_state->params.msg = olemsg; + message_state->params.status = RPC_S_OK; + message_state->params.hr = S_OK; /* Note: this is an optimization in the Microsoft OLE runtime that we need * to copy, as shown by the test_no_couninitialize_client test. without @@ -783,14 +783,17 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac * from DllMain */ RpcBindingInqObject(message_state->binding_handle, &ipid); - hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan, - &params->iid, &params->iface); - params->handle = ClientRpcChannelBuffer_GetEventHandle(This); + hr = ipid_get_dispatch_params(&ipid, &apt, &message_state->params.stub, + &message_state->params.chan, + &message_state->params.iid, + &message_state->params.iface); + message_state->params.handle = ClientRpcChannelBuffer_GetEventHandle(This); if ((hr == S_OK) && !apt->multi_threaded) { TRACE("Calling apartment thread 0x%08x...\n", apt->tid); - if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, (LPARAM)params)) + if (!PostMessageW(apartment_getwindow(apt), DM_EXECUTERPC, 0, + (LPARAM)&message_state->params)) { ERR("PostMessage failed with error %u\n", GetLastError()); hr = HRESULT_FROM_WIN32(GetLastError()); @@ -802,10 +805,10 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac { /* otherwise, we go via RPC runtime so the stub and channel aren't * needed here */ - IRpcStubBuffer_Release(params->stub); - params->stub = NULL; - IRpcChannelBuffer_Release(params->chan); - params->chan = NULL; + IRpcStubBuffer_Release(message_state->params.stub); + message_state->params.stub = NULL; + IRpcChannelBuffer_Release(message_state->params.chan); + message_state->params.chan = NULL; } /* we use a separate thread here because we need to be able to @@ -814,7 +817,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac * and re-enter this STA from an incoming server thread will * deadlock. InstallShield is an example of that. */ - if (!QueueUserWorkItem(rpc_sendreceive_thread, params, WT_EXECUTEDEFAULT)) + if (!QueueUserWorkItem(rpc_sendreceive_thread, &message_state->params, WT_EXECUTEDEFAULT)) { ERR("QueueUserWorkItem failed with error %u\n", GetLastError()); hr = E_UNEXPECTED; @@ -826,22 +829,20 @@ static HRESULT WINAPI ClientRpcChannelBuffer_SendReceive(LPRPCCHANNELBUFFER ifac if (hr == S_OK) { - if (WaitForSingleObject(params->handle, 0)) + if (WaitForSingleObject(message_state->params.handle, 0)) { COM_CurrentInfo()->pending_call_count_client++; - hr = CoWaitForMultipleHandles(0, INFINITE, 1, &params->handle, &index); + hr = CoWaitForMultipleHandles(0, INFINITE, 1, &message_state->params.handle, &index); COM_CurrentInfo()->pending_call_count_client--; } } - ClientRpcChannelBuffer_ReleaseEventHandle(This, params->handle); + ClientRpcChannelBuffer_ReleaseEventHandle(This, message_state->params.handle); /* for WM shortcut, faults are returned in params->hr */ if (hr == S_OK) - hrFault = params->hr; + hrFault = message_state->params.hr; - status = params->status; - HeapFree(GetProcessHeap(), 0, params); - params = NULL; + status = message_state->params.status; orpcthat.flags = ORPCF_NULL; orpcthat.extensions = NULL;

1 0

Rob Shearman : advapi32: Fix a typo in CredEnumerateW.
by Alexandre Julliard Nov. 27, 2007

Nov. 27, 2007

Module: wine Branch: master Commit: 50532d8b4d257f8eb9126f4914d1a638b36eddcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=50532d8b4d257f8eb9126f491… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 26 19:41:00 2007 +0000 advapi32: Fix a typo in CredEnumerateW. --- dlls/advapi32/cred.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index e9bd3e8..3712329 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -832,7 +832,7 @@ BOOL WINAPI CredEnumerateW(LPCWSTR Filter, DWORD Flags, DWORD *Count, SetLastError(ret); return FALSE; } - len += *Count + sizeof(PCREDENTIALW); + len += *Count * sizeof(PCREDENTIALW); if (ret == ERROR_SUCCESS) {

1 0