December 2007 - Wine-Commits

Andrew Talbot : advapi32: Remove unneeded casts.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 05f38321c4b5672238c635c27079cac079074dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f38321c4b5672238c635c27… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Dec 29 15:37:21 2007 +0000 advapi32: Remove unneeded casts. --- dlls/advapi32/crypt_md4.c | 4 ++-- dlls/advapi32/crypt_md5.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/crypt_md4.c b/dlls/advapi32/crypt_md4.c index 5f4e709..3341f08 100644 --- a/dlls/advapi32/crypt_md4.c +++ b/dlls/advapi32/crypt_md4.c @@ -58,7 +58,7 @@ static void byteReverse( unsigned char *buf, unsigned longs ) unsigned int t; do { - t = (unsigned int)((unsigned)buf[3] << 8 | buf[2]) << 16 | + t = ((unsigned)buf[3] << 8 | buf[2]) << 16 | ((unsigned)buf[1] << 8 | buf[0]); *(unsigned int *)buf = t; buf += 4; @@ -90,7 +90,7 @@ VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len /* Update bitcount */ t = ctx->i[0]; - if ((ctx->i[0] = t + ((unsigned int)len << 3)) < t) + if ((ctx->i[0] = t + (len << 3)) < t) ctx->i[1]++; /* Carry from low to high */ ctx->i[1] += len >> 29; diff --git a/dlls/advapi32/crypt_md5.c b/dlls/advapi32/crypt_md5.c index d326715..3cb039a 100644 --- a/dlls/advapi32/crypt_md5.c +++ b/dlls/advapi32/crypt_md5.c @@ -55,7 +55,7 @@ static void byteReverse( unsigned char *buf, unsigned longs ) unsigned int t; do { - t = (unsigned int)((unsigned)buf[3] << 8 | buf[2]) << 16 | + t = ((unsigned)buf[3] << 8 | buf[2]) << 16 | ((unsigned)buf[1] << 8 | buf[0]); *(unsigned int *)buf = t; buf += 4; @@ -87,7 +87,7 @@ VOID WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len /* Update bitcount */ t = ctx->i[0]; - if ((ctx->i[0] = t + ((unsigned int)len << 3)) < t) + if ((ctx->i[0] = t + (len << 3)) < t) ctx->i[1]++; /* Carry from low to high */ ctx->i[1] += len >> 29;

1 0

Rob Shearman : ntdll: Add some tests for NtQueryValueKey.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 05fbee5e2dfde78595f9132b1e717632ddd92cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05fbee5e2dfde78595f9132b1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 29 12:14:07 2007 +0000 ntdll: Add some tests for NtQueryValueKey. --- dlls/ntdll/tests/reg.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 2f622df..0a58d68 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -67,6 +67,30 @@ typedef struct _RTL_QUERY_REGISTRY_TABLE { ULONG DefaultLength; } RTL_QUERY_REGISTRY_TABLE, *PRTL_QUERY_REGISTRY_TABLE; +typedef struct _KEY_VALUE_PARTIAL_INFORMATION { + ULONG TitleIndex; + ULONG Type; + ULONG DataLength; + UCHAR Data[1]; +} KEY_VALUE_PARTIAL_INFORMATION, *PKEY_VALUE_PARTIAL_INFORMATION; + +typedef struct _KEY_VALUE_FULL_INFORMATION { + ULONG TitleIndex; + ULONG Type; + ULONG DataOffset; + ULONG DataLength; + ULONG NameLength; + WCHAR Name[1]; +} KEY_VALUE_FULL_INFORMATION, *PKEY_VALUE_FULL_INFORMATION; + +typedef enum _KEY_VALUE_INFORMATION_CLASS { + KeyValueBasicInformation, + KeyValueFullInformation, + KeyValuePartialInformation, + KeyValueFullInformationAlign64, + KeyValuePartialInformationAlign64 +} KEY_VALUE_INFORMATION_CLASS; + #define InitializeObjectAttributes(p,n,a,r,s) \ do { \ (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ @@ -93,6 +117,7 @@ static NTSTATUS (WINAPI * pNtDeleteKey)(HKEY); static NTSTATUS (WINAPI * pNtCreateKey)( PHKEY retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, PULONG dispos ); +static NTSTATUS (WINAPI * pNtQueryValueKey)(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); static NTSTATUS (WINAPI * pNtSetValueKey)( PHKEY, const PUNICODE_STRING, ULONG, ULONG, const PVOID, ULONG ); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); @@ -138,6 +163,7 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtCreateKey) NTDLL_GET_PROC(NtFlushKey) NTDLL_GET_PROC(NtDeleteKey) + NTDLL_GET_PROC(NtQueryValueKey) NTDLL_GET_PROC(NtSetValueKey) NTDLL_GET_PROC(NtOpenKey) NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) @@ -432,6 +458,53 @@ static void test_NtFlushKey(void) pNtClose(hkey); } +static void test_NtQueryValueKey(void) +{ + HANDLE key; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING ValName; + KEY_VALUE_PARTIAL_INFORMATION *partial_info; + KEY_VALUE_FULL_INFORMATION *full_info; + DWORD len; + + pRtlCreateUnicodeStringFromAsciiz(&ValName, "deletetest"); + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); + partial_info = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); + ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->Type); + ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", partial_info->Type); + todo_wine + ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", partial_info->DataLength); + todo_wine + ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %d\n", len); + HeapFree(GetProcessHeap(), 0, partial_info); + + len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); + full_info = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); + ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", full_info->Type); + ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", full_info->Type); + todo_wine + ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", full_info->DataLength); + todo_wine + ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", full_info->NameLength); + todo_wine + ok(len == FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength, + "NtQueryValueKey returned wrong len %d\n", len); + HeapFree(GetProcessHeap(), 0, full_info); + + pRtlFreeUnicodeString(&ValName); + pNtClose(key); +} + static void test_NtDeleteKey(void) { NTSTATUS status; @@ -477,6 +550,7 @@ START_TEST(reg) test_RtlQueryRegistryValues(); test_RtlpNtQueryValueKey(); test_NtFlushKey(); + test_NtQueryValueKey(); test_NtDeleteKey(); pRtlFreeUnicodeString(&winetestpath);

1 0

Rob Shearman : ntdll: Set the DataLength field of the information field in NtQueryValueKey to how much data should be returned , not what was actually returned.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: ec3448ff8ca5880d72ca8d45135d370275fc7c83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec3448ff8ca5880d72ca8d451… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Dec 29 12:14:19 2007 +0000 ntdll: Set the DataLength field of the information field in NtQueryValueKey to how much data should be returned, not what was actually returned. --- dlls/ntdll/reg.c | 2 +- dlls/ntdll/tests/reg.c | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index a095ee3..7620bdd 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -505,7 +505,7 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, if (!(ret = wine_server_call( req ))) { copy_key_value_info( info_class, info, length, reply->type, - 0, wine_server_reply_size(reply) ); + name->Length, reply->total ); *result_len = fixed_size + reply->total; if (length < *result_len) ret = STATUS_BUFFER_OVERFLOW; } diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 0a58d68..4a559a5 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -480,9 +480,7 @@ static void test_NtQueryValueKey(void) ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->Type); ok(partial_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", partial_info->Type); - todo_wine ok(partial_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", partial_info->DataLength); - todo_wine ok(len == FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[partial_info->DataLength]), "NtQueryValueKey returned wrong len %d\n", len); HeapFree(GetProcessHeap(), 0, partial_info); @@ -492,9 +490,7 @@ static void test_NtQueryValueKey(void) ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", full_info->Type); ok(full_info->Type == REG_DWORD, "NtQueryValueKey returned wrong Type %d\n", full_info->Type); - todo_wine ok(full_info->DataLength == 4, "NtQueryValueKey returned wrong DataLength %d\n", full_info->DataLength); - todo_wine ok(full_info->NameLength == 20, "NtQueryValueKey returned wrong NameLength %d\n", full_info->NameLength); todo_wine ok(len == FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]) + full_info->DataLength + full_info->NameLength,

1 0

Gerald Pfeifer : wined3d: Remove noop check in IWineD3DBaseTextureImpl_Appl ().
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: d3840f0bb708559ff25b3fe47641ab7022328dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3840f0bb708559ff25b3fe47… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 29 09:32:43 2007 +0100 wined3d: Remove noop check in IWineD3DBaseTextureImpl_Appl(). --- dlls/wined3d/basetexture.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index d17a4f4..46849aa 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -434,9 +434,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface This->baseTexture.states[WINED3DTEXSTA_MINFILTER] = samplerStates[WINED3DSAMP_MINFILTER]; This->baseTexture.states[WINED3DTEXSTA_MAXMIPLEVEL] = samplerStates[WINED3DSAMP_MAXMIPLEVEL]; - if (This->baseTexture.states[WINED3DTEXSTA_MINFILTER] < WINED3DTEXF_NONE || - This->baseTexture.states[WINED3DTEXSTA_MIPFILTER] < WINED3DTEXF_NONE || - This->baseTexture.states[WINED3DTEXSTA_MINFILTER] > WINED3DTEXF_ANISOTROPIC || + if (This->baseTexture.states[WINED3DTEXSTA_MINFILTER] > WINED3DTEXF_ANISOTROPIC || This->baseTexture.states[WINED3DTEXSTA_MIPFILTER] > WINED3DTEXF_LINEAR) {

1 0

Gerald Pfeifer : user32: Fix type of loop variable.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 2ea16a49e8ebcbd68036e092715272e9af1ef1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea16a49e8ebcbd68036e0927… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 29 09:41:02 2007 +0100 user32: Fix type of loop variable. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 8cd2dcb..11cdc9f 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2898,7 +2898,7 @@ BOOL WINAPI SetSysColors( INT nChanges, const INT *lpSysColor, */ DWORD WINAPI SetSysColorsTemp( const COLORREF *pPens, const HBRUSH *pBrushes, DWORD n) { - int i; + DWORD i; if (pPens && pBrushes) /* "set" call */ {

1 0

Gerald Pfeifer : msi: Add missing initializer for delete_ops.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 63655bc1a1fff3088dce4ef325d58af25f36cc8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63655bc1a1fff3088dce4ef32… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Dec 29 09:14:07 2007 +0100 msi: Add missing initializer for delete_ops. --- dlls/msi/delete.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index 57b0a2e..d315f27 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -198,6 +198,7 @@ static const MSIVIEWOPS delete_ops = NULL, NULL, NULL, + NULL }; UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table )

1 0

Alexandre Julliard : winedos: Don' t emulate in 32-bit mode interrupts that don't have a specific handler.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 4d53055f623a356df6c872b1f35fd92aaa50a914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d53055f623a356df6c872b1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 31 17:25:05 2007 +0100 winedos: Don't emulate in 32-bit mode interrupts that don't have a specific handler. --- dlls/winedos/interrupts.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winedos/interrupts.c b/dlls/winedos/interrupts.c index f254f5a..a7c791f 100644 --- a/dlls/winedos/interrupts.c +++ b/dlls/winedos/interrupts.c @@ -328,8 +328,10 @@ BOOL WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *context, BYTE intnum ) } else if (wine_ldt_is_system(context->SegCs)) { - INTPROC proc = DOSVM_GetBuiltinHandler( intnum ); - if (!proc) return FALSE; + INTPROC proc; + if (intnum >= sizeof(DOSVM_VectorsBuiltin)/sizeof(INTPROC)) return FALSE; + if (!(proc = DOSVM_VectorsBuiltin[intnum])) return FALSE; + proc( context ); } else {

1 0

Alexandre Julliard : shell32: Fix messed up indentation.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: f9e27d37b96e880fc1f290dbd00ad6e3eb921975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e27d37b96e880fc1f290dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 31 17:25:08 2007 +0100 shell32: Fix messed up indentation. --- dlls/shell32/shfldr_netplaces.c | 72 +++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/shell32/shfldr_netplaces.c b/dlls/shell32/shfldr_netplaces.c index 1216341..51b5aad 100644 --- a/dlls/shell32/shfldr_netplaces.c +++ b/dlls/shell32/shfldr_netplaces.c @@ -272,31 +272,31 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnCreateViewObject (IShellFolder2 * ifac HRESULT hr = E_INVALIDARG; TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, - hwndOwner, shdebugstr_guid (riid), ppvOut); + hwndOwner, shdebugstr_guid (riid), ppvOut); if (!ppvOut) return hr; - *ppvOut = NULL; + *ppvOut = NULL; - if (IsEqualIID (riid, &IID_IDropTarget)) + if (IsEqualIID (riid, &IID_IDropTarget)) { - WARN ("IDropTarget not implemented\n"); - hr = E_NOTIMPL; - } + WARN ("IDropTarget not implemented\n"); + hr = E_NOTIMPL; + } else if (IsEqualIID (riid, &IID_IContextMenu)) { - WARN ("IContextMenu not implemented\n"); - hr = E_NOTIMPL; - } + WARN ("IContextMenu not implemented\n"); + hr = E_NOTIMPL; + } else if (IsEqualIID (riid, &IID_IShellView)) { - pShellView = IShellView_Constructor ((IShellFolder *) iface); - if (pShellView) + pShellView = IShellView_Constructor ((IShellFolder *) iface); + if (pShellView) { hr = IShellView_QueryInterface (pShellView, riid, ppvOut); IShellView_Release (pShellView); - } + } } TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); return hr; @@ -380,43 +380,43 @@ static HRESULT WINAPI ISF_NetworkPlaces_fnGetUIObjectOf (IShellFolder2 * iface, if (!ppvOut) return hr; - *ppvOut = NULL; + *ppvOut = NULL; - if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) + if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) { - pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); - hr = S_OK; - } + pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) { - pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); - hr = S_OK; - } + pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) { - pidl = ILCombine (This->pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); - SHFree (pidl); - hr = S_OK; - } + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) { - pidl = ILCombine (This->pidlRoot, apidl[0]); - pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); - SHFree (pidl); - hr = S_OK; - } + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) { - hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); - } + hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); + } else - hr = E_NOINTERFACE; + hr = E_NOINTERFACE; - if (SUCCEEDED(hr) && !pObj) - hr = E_OUTOFMEMORY; + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; - *ppvOut = pObj; + *ppvOut = pObj; TRACE ("(%p)->hr=0x%08x\n", This, hr); return hr; }

1 0

Rob Shearman : rpcrt4: Fix NdrGetBuffer to set the correct fields in the MIDL_STUB_MESSAGE structure .
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: 56da854c2168c0f05630e3aaaefd863cd2d362d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56da854c2168c0f05630e3aaa… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:46:45 2007 +0000 rpcrt4: Fix NdrGetBuffer to set the correct fields in the MIDL_STUB_MESSAGE structure. Fix NdrFreeBuffer to use the fBufferValid flag to determine whether or not I_RpcFreeBuffer needs to be called. --- dlls/rpcrt4/ndr_clientserver.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index a43b920..809d4cb 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -53,8 +53,6 @@ void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE TRACE("(pRpcMessage == ^%p, pStubMsg == ^%p, pStubDesc == ^%p, ProcNum == %d)\n", pRpcMessage, pStubMsg, pStubDesc, ProcNum); - assert( pRpcMessage && pStubMsg && pStubDesc ); - pRpcMessage->Handle = NULL; pRpcMessage->ProcNum = ProcNum; pRpcMessage->RpcInterfaceInformation = pStubDesc->RpcInterfaceInformation; @@ -150,31 +148,33 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M */ unsigned char *WINAPI NdrGetBuffer(PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC_BINDING_HANDLE handle) { - TRACE("(stubmsg == ^%p, buflen == %u, handle == %p): wild guess.\n", stubmsg, buflen, handle); - - assert( stubmsg && stubmsg->RpcMsg ); + RPC_STATUS status; - /* I guess this is our chance to put the binding handle into the RPC_MESSAGE */ - stubmsg->RpcMsg->Handle = handle; + TRACE("(stubmsg == ^%p, buflen == %u, handle == %p)\n", stubmsg, buflen, handle); + stubmsg->RpcMsg->Handle = handle; stubmsg->RpcMsg->BufferLength = buflen; - if (I_RpcGetBuffer(stubmsg->RpcMsg) != S_OK) - return NULL; - stubmsg->Buffer = stubmsg->BufferStart = stubmsg->RpcMsg->Buffer; + status = I_RpcGetBuffer(stubmsg->RpcMsg); + if (status != RPC_S_OK) + RpcRaiseException(status); + + stubmsg->Buffer = stubmsg->RpcMsg->Buffer; + stubmsg->fBufferValid = TRUE; stubmsg->BufferLength = stubmsg->RpcMsg->BufferLength; - stubmsg->BufferEnd = stubmsg->Buffer + stubmsg->BufferLength; - return (stubmsg->Buffer = (unsigned char *)stubmsg->RpcMsg->Buffer); + return stubmsg->Buffer; } /*********************************************************************** * NdrFreeBuffer [RPCRT4.@] */ void WINAPI NdrFreeBuffer(PMIDL_STUB_MESSAGE pStubMsg) { - TRACE("(pStubMsg == ^%p): wild guess.\n", pStubMsg); - I_RpcFreeBuffer(pStubMsg->RpcMsg); - pStubMsg->BufferLength = 0; - pStubMsg->Buffer = pStubMsg->BufferEnd = (unsigned char *)(pStubMsg->RpcMsg->Buffer = NULL); + TRACE("(pStubMsg == ^%p)\n", pStubMsg); + if (pStubMsg->fBufferValid) + { + I_RpcFreeBuffer(pStubMsg->RpcMsg); + pStubMsg->fBufferValid = FALSE; + } } /************************************************************************

1 0

Rob Shearman : rpcrt4: Fix the MIDL_STUB_MESSAGE fields set by NdrServerInitializeNew.
by Alexandre Julliard Dec. 31, 2007

Dec. 31, 2007

Module: wine Branch: master Commit: e745f93c79404b166f45eefcb883ff4d761f90fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e745f93c79404b166f45eefcb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 30 16:46:05 2007 +0000 rpcrt4: Fix the MIDL_STUB_MESSAGE fields set by NdrServerInitializeNew. --- dlls/rpcrt4/ndr_clientserver.c | 44 +++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index fe424a6..a43b920 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -106,22 +106,42 @@ unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_M { TRACE("(pRpcMsg == ^%p, pStubMsg == ^%p, pStubDesc == ^%p)\n", pRpcMsg, pStubMsg, pStubDesc); - assert( pRpcMsg && pStubMsg && pStubDesc ); - - /* not everyone allocates stack space for w2kReserved */ - memset(pStubMsg, 0, FIELD_OFFSET(MIDL_STUB_MESSAGE,pCSInfo)); - - pStubMsg->ReuseBuffer = TRUE; - pStubMsg->IsClient = FALSE; - pStubMsg->StubDesc = pStubDesc; - pStubMsg->pfnAllocate = pStubDesc->pfnAllocate; - pStubMsg->pfnFree = pStubDesc->pfnFree; pStubMsg->RpcMsg = pRpcMsg; pStubMsg->Buffer = pStubMsg->BufferStart = pRpcMsg->Buffer; + pStubMsg->BufferEnd = pStubMsg->Buffer + pRpcMsg->BufferLength; pStubMsg->BufferLength = pRpcMsg->BufferLength; - pStubMsg->BufferEnd = pStubMsg->Buffer + pStubMsg->BufferLength; + pStubMsg->IsClient = FALSE; + pStubMsg->ReuseBuffer = FALSE; + pStubMsg->pAllocAllNodesContext = NULL; + pStubMsg->pPointerQueueState = NULL; + pStubMsg->IgnoreEmbeddedPointers = 0; + pStubMsg->PointerBufferMark = NULL; + pStubMsg->uFlags = 0; + pStubMsg->pfnAllocate = pStubDesc->pfnAllocate; + pStubMsg->pfnFree = pStubDesc->pfnFree; + pStubMsg->StackTop = NULL; + pStubMsg->StubDesc = pStubDesc; + pStubMsg->FullPtrXlatTables = NULL; + pStubMsg->FullPtrRefId = 0; + pStubMsg->PointerLength = 0; + pStubMsg->fInDontFree = 0; + pStubMsg->fDontCallFreeInst = 0; + pStubMsg->fInOnlyParam = 0; + pStubMsg->fHasReturn = 0; + pStubMsg->fHasExtensions = 0; + pStubMsg->fHasNewCorrDesc = 0; + pStubMsg->fUnused = 0; + pStubMsg->dwDestContext = MSHCTX_DIFFERENTMACHINE; + pStubMsg->pvDestContext = NULL; + pStubMsg->pRpcChannelBuffer = NULL; + pStubMsg->pArrayInfo = NULL; + pStubMsg->dwStubPhase = 0; + /* FIXME: LowStackMark */ + pStubMsg->pAsyncMsg = NULL; + pStubMsg->pCorrInfo = NULL; + pStubMsg->pCorrMemory = NULL; + pStubMsg->pMemoryList = NULL; - /* FIXME: determine the proper return value */ return NULL; }

1 0