January 2009 - Wine-commits

Andrew Talbot : msi: Declare some functions static.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 668197a898d4c34d44d97096fec36c3805a53188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668197a898d4c34d44d97096f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 10 14:20:03 2009 +0000 msi: Declare some functions static. --- dlls/msi/database.c | 4 +- dlls/msi/dialog.c | 64 +++++++++++++++++++++++++------------------------- dlls/msi/media.c | 4 +- dlls/msi/msipriv.h | 17 ------------- dlls/msi/preview.c | 4 +- dlls/msi/record.c | 6 ++-- dlls/msi/registry.c | 2 +- dlls/msi/string.c | 58 +++++++++++++++++++++++----------------------- dlls/msi/table.c | 4 +- 9 files changed, 73 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=668197a898d4c34d44d97…

1 0

Rob Shearman : ntoskrnl: Free allocated buffers on exit from wine_ntoskrnl_main_loop.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 07090c248576f07b2e0afcf992ba908e54c4b7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=07090c248576f07b2e0afcf99… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jan 10 20:56:10 2009 +0000 ntoskrnl: Free allocated buffers on exit from wine_ntoskrnl_main_loop. Avoids a warning of a memory leak in Valgrind. --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 81c4f33..7d7236d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -257,7 +257,11 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) break; case STATUS_PENDING: if (WaitForMultipleObjects( 2, handles, FALSE, INFINITE ) == WAIT_OBJECT_0) + { + HeapFree( GetProcessHeap(), 0, in_buff ); + HeapFree( GetProcessHeap(), 0, out_buff ); return STATUS_SUCCESS; + } break; } }

1 0

Rob Shearman : user32: Free allocated memory in USER_unload_driver.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: ea00dc4b49de4e339c154defdd4e1258ada0290a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea00dc4b49de4e339c154defd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jan 10 20:56:21 2009 +0000 user32: Free allocated memory in USER_unload_driver. --- dlls/user32/driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 86d1543..6454f65 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -141,8 +141,11 @@ static const USER_DRIVER *load_driver(void) /* unload the graphics driver on process exit */ void USER_unload_driver(void) { + USER_DRIVER *prev; /* make sure we don't try to call the driver after it has been detached */ - USER_Driver = &null_driver; + prev = InterlockedExchangePointer( (void **)&USER_Driver, &null_driver ); + if (prev != &lazy_load_driver && prev != &null_driver) + HeapFree( GetProcessHeap(), 0, prev ); }

1 0

Rob Shearman : oleaut32: Test the return value of the remote IWidget_StructArgs call.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 17a30ff2e8ab5fbd29e8fe86a3cf98d2221c8658 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17a30ff2e8ab5fbd29e8fe86a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jan 10 20:56:52 2009 +0000 oleaut32: Test the return value of the remote IWidget_StructArgs call. --- dlls/oleaut32/tests/tmarshal.c | 15 +++++++++++---- dlls/oleaut32/tests/tmarshal.idl | 6 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 6193d80..713c366 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -546,7 +546,7 @@ static HRESULT WINAPI Widget_VariantArrayPtr( return S_OK; } -static void WINAPI Widget_Variant( +static HRESULT WINAPI Widget_Variant( IWidget __RPC_FAR * iface, VARIANT var) { @@ -554,9 +554,10 @@ static void WINAPI Widget_Variant( ok(V_VT(&var) == VT_CY, "V_VT(&var) was %d\n", V_VT(&var)); ok(S(V_CY(&var)).Hi == 0xdababe, "V_CY(&var).Hi was 0x%x\n", S(V_CY(&var)).Hi); ok(S(V_CY(&var)).Lo == 0xdeadbeef, "V_CY(&var).Lo was 0x%x\n", S(V_CY(&var)).Lo); + return S_OK; } -static void WINAPI Widget_VarArg( +static HRESULT WINAPI Widget_VarArg( IWidget * iface, int numexpect, SAFEARRAY * values) @@ -586,9 +587,11 @@ static void WINAPI Widget_VarArg( hr = SafeArrayUnaccessData(values); ok(hr == S_OK, "SafeArrayUnaccessData failed with %x\n", hr); + + return S_OK; } -static void WINAPI Widget_StructArgs( +static HRESULT WINAPI Widget_StructArgs( IWidget * iface, MYSTRUCT byval, MYSTRUCT *byptr, @@ -597,6 +600,7 @@ static void WINAPI Widget_StructArgs( ok(memcmp(&byval, &MYSTRUCT_BYVAL, sizeof(MYSTRUCT))==0, "Struct parameter passed by value corrupted\n"); ok(memcmp(byptr, &MYSTRUCT_BYPTR, sizeof(MYSTRUCT))==0, "Struct parameter passed by pointer corrupted\n"); ok(memcmp(arr, MYSTRUCT_ARRAY, sizeof(MYSTRUCT_ARRAY))==0, "Array of structs corrupted\n"); + return S_OK; } @@ -1102,7 +1106,10 @@ static void test_typelibmarshal(void) /* call StructArgs (direct) */ mystruct = MYSTRUCT_BYPTR; memcpy(mystructArray, MYSTRUCT_ARRAY, sizeof(mystructArray)); - IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); + hr = IWidget_StructArgs(pWidget, MYSTRUCT_BYVAL, &mystruct, mystructArray); + todo_wine { + ok_ole_success(hr, IWidget_StructArgs); + } /* call Clone */ dispparams.cNamedArgs = 0; diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index ea10797..2b57ddd 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -112,13 +112,13 @@ library TestTypelib HRESULT VariantArrayPtr([in] SAFEARRAY(VARIANT) *values); [id(DISPID_TM_VARIANT)] - void Variant([in] VARIANT var); + HRESULT Variant([in] VARIANT var); [vararg, id(DISPID_TM_VARARG)] - void VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); + HRESULT VarArg([in] int numexpect, [in] SAFEARRAY(VARIANT) values); [id(DISPID_TM_STRUCTARGS)] - void StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]); + HRESULT StructArgs([in] MYSTRUCT byval, [in] MYSTRUCT *byptr, [in] MYSTRUCT arr[5]); [id(DISPID_TM_ERROR)] HRESULT Error();

1 0

Rob Shearman : rpcrt4: Unmarshalling functions should always set fMustAlloc when allocating memory .
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 59158fb25ce0b8d8f75fd44137085908a53bbafa URL: http://source.winehq.org/git/wine.git/?a=commit;h=59158fb25ce0b8d8f75fd4413… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jan 10 22:17:15 2009 +0000 rpcrt4: Unmarshalling functions should always set fMustAlloc when allocating memory. The memory is uninitialised and so further unmarshalling shouldn't try to reuse any memory. fMustAlloc is always set to TRUE when allocating memory so that it is clear that the unmarshalling is safe and to avoid future problems with change or the code being copied. --- dlls/rpcrt4/ndr_marshall.c | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f0a13de..37d286d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2440,7 +2440,9 @@ unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStu validate_string_data(pStubMsg, bufsize, esize); - if (fMustAlloc || !*ppMemory) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, memsize); safe_copy_from_buffer(pStubMsg, *ppMemory, bufsize); @@ -3380,7 +3382,9 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, offset = pStubMsg->Offset; } - if (fMustAlloc || !*ppMemory) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); pMemory = ComplexUnmarshall(pStubMsg, *ppMemory, pFormat, pointer_desc, fMustAlloc); @@ -3921,7 +3925,9 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pFormat = ReadConformance(pStubMsg, pFormat); pFormat = ReadVariance(pStubMsg, pFormat, pStubMsg->MaxCount); - if (fMustAlloc || !*ppMemory) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); ALIGN_POINTER(pStubMsg->Buffer, alignment); @@ -4193,8 +4199,13 @@ unsigned char * WINAPI NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, else ALIGN_POINTER(pStubMsg->Buffer, (flags & 0xf) + 1); - if (fMustAlloc || !*ppMemory) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) + { *ppMemory = NdrAllocate(pStubMsg, memsize); + memset(*ppMemory, 0, memsize); + } pStubMsg->Buffer = pStubMsg->StubDesc->aUserMarshalQuadruple[index].pfnUnmarshall( @@ -4662,7 +4673,9 @@ unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE TRACE("memory_size = %d\n", pCVStructFormat->memory_size); /* work out how much memory to allocate if we need to do so */ - if (!*ppMemory || fMustAlloc) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) { SIZE_T size = pCVStructFormat->memory_size + memsize; *ppMemory = NdrAllocate(pStubMsg, size); @@ -5149,7 +5162,9 @@ unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, bufsize = safe_multiply(esize, pStubMsg->ActualCount); offset = pStubMsg->Offset; - if (!*ppMemory || fMustAlloc) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; safe_buffer_increment(pStubMsg, bufsize); @@ -5707,7 +5722,9 @@ unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubM TRACE("got switch value 0x%x\n", switch_value); size = *(const unsigned short*)pFormat + increment; - if(!*ppMemory || fMustAlloc) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); NdrBaseTypeUnmarshall(pStubMsg, ppMemory, &switch_type, FALSE); @@ -5887,7 +5904,9 @@ unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pSt size = *(const unsigned short*)pFormat; - if(!*ppMemory || fMustAlloc) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); return union_arm_unmarshall(pStubMsg, ppMemory, discriminant, pFormat, fMustAlloc); @@ -6109,7 +6128,9 @@ unsigned char *WINAPI NdrRangeUnmarshall( do \ { \ ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ - if (fMustAlloc || !*ppMemory) \ + if (!fMustAlloc && !*ppMemory) \ + fMustAlloc = TRUE; \ + if (fMustAlloc) \ *ppMemory = NdrAllocate(pStubMsg, sizeof(type)); \ if (pStubMsg->Buffer + sizeof(type) > pStubMsg->BufferEnd) \ { \ @@ -6363,7 +6384,9 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( break; case RPC_FC_ENUM16: ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); - if (fMustAlloc || !*ppMemory) + if (!fMustAlloc && !*ppMemory) + fMustAlloc = TRUE; + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, sizeof(UINT)); if (pStubMsg->Buffer + sizeof(USHORT) > pStubMsg->BufferEnd) RpcRaiseException(RPC_X_BAD_STUB_DATA);

1 0

David Adam : d3dx9_36/test: Remove an unconsistent test.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: e1fefd57e784fcf14bdfc0f97a279ec775b50fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1fefd57e784fcf14bdfc0f97… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Sun Jan 11 12:48:03 2009 +0100 d3dx9_36/test: Remove an unconsistent test. --- dlls/d3dx9_36/math.c | 5 ----- dlls/d3dx9_36/tests/math.c | 5 ----- 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index a00ffc5..542e408 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -84,11 +84,6 @@ HRESULT WINAPI D3DXMatrixDecompose(D3DXVECTOR3 *poutscale, D3DXQUATERNION *poutr D3DXMATRIX normalized; D3DXVECTOR3 vec; - if (!pm) - { - return D3DERR_INVALIDCALL; - } - /*Compute the scaling part.*/ vec.x=pm->u.m[0][0]; vec.y=pm->u.m[0][1]; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index f3bb482..2240fb0 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -578,11 +578,6 @@ static void test_Matrix_Decompose(void) hr = D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, &pm); ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %x\n", hr); - -/*___________*/ - - hr = D3DXMatrixDecompose(&got_scale, &got_rotation, &got_translation, NULL); - ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %x\n", hr); } static void test_Matrix_Transformation2D(void)

1 0

Rob Shearman : oleaut32: Dump MSFT format typeinfos upon loading.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: b3c8124a15e8c6ec078c06d3bb3fffe974e2a9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c8124a15e8c6ec078c06d3b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jan 10 20:55:55 2009 +0000 oleaut32: Dump MSFT format typeinfos upon loading. --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9bc601e..0f35fc1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2214,6 +2214,8 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( debugstr_w(ptiRet->Name), debugstr_guid(&ptiRet->TypeAttr.guid), typekind_desc[ptiRet->TypeAttr.typekind]); + if (TRACE_ON(typelib)) + dump_TypeInfo(ptiRet); return ptiRet; }

1 0

Michael Stefaniuc : dxgi: Remove superfluous pointer casts.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: f93b29b04d07ba4a9a76e7e54c82c752421a3e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93b29b04d07ba4a9a76e7e54… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:15:40 2009 +0100 dxgi: Remove superfluous pointer casts. --- dlls/dxgi/dxgi_main.c | 2 +- dlls/dxgi/factory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index b72c04a..06086f7 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -315,7 +315,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I goto fail; } - *device = (IUnknown *)dxgi_device; + *device = dxgi_device; return hr; diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 03db096..19bc4cf 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -131,7 +131,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa return DXGI_ERROR_NOT_FOUND; } - *adapter = (IDXGIAdapter *)This->adapters[adapter_idx]; + *adapter = This->adapters[adapter_idx]; IDXGIAdapter_AddRef(*adapter); TRACE("Returning adapter %p\n", *adapter);

1 0

Michael Stefaniuc : include: Replace unsigned long with unsigned int in winerror.h.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: de97ce150ce24699f94e38f8b6624e1d71f6d13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de97ce150ce24699f94e38f8b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:16:47 2009 +0100 include: Replace unsigned long with unsigned int in winerror.h. --- include/winerror.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/winerror.h b/include/winerror.h index 5d32374..c7427d7 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -65,12 +65,12 @@ #define MAKE_HRESULT(sev,fac,code) \ - ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) ) + ((HRESULT) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) ) #define MAKE_SCODE(sev,fac,code) \ - ((SCODE) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) ) + ((SCODE) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) ) #define SUCCEEDED(stat) ((HRESULT)(stat)>=0) #define FAILED(stat) ((HRESULT)(stat)<0) -#define IS_ERROR(stat) (((unsigned long)(stat)>>31) == SEVERITY_ERROR) +#define IS_ERROR(stat) (((unsigned int)(stat)>>31) == SEVERITY_ERROR) #define HRESULT_CODE(hr) ((hr) & 0xFFFF) #define SCODE_CODE(sc) ((sc) & 0xFFFF) @@ -90,7 +90,7 @@ typedef long HRESULT; typedef int HRESULT; # endif #endif -static inline HRESULT HRESULT_FROM_WIN32(unsigned long x) +static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) { return (HRESULT)x > 0 ? ((HRESULT) ((x & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)x; }

1 0

Michael Stefaniuc : include: Use ULONG in rpcdcep.h for Win64 compatibility .
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: c171379f47683d1d10c5dd298f7059dda5671c9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c171379f47683d1d10c5dd298… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 11 00:17:01 2009 +0100 include: Use ULONG in rpcdcep.h for Win64 compatibility. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 ++-- include/rpcdcep.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index de49848..83a80d9 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1143,7 +1143,7 @@ static void test_client_init(void) /* Note: ReservedForRuntime not tested */ TEST_POINTER_UNSET(ManagerEpv); TEST_POINTER_UNSET(ImportContext); - ok(rpcMsg.RpcFlags == 0, "rpcMsg.RpcFlags should have been 0 instead of 0x%lx\n", rpcMsg.RpcFlags); + ok(rpcMsg.RpcFlags == 0, "rpcMsg.RpcFlags should have been 0 instead of 0x%x\n", rpcMsg.RpcFlags); #undef TEST_POINTER_UNSET #define TEST_ZERO(field, fmt) ok(stubMsg.field == 0, #field " should have been set to zero instead of " fmt "\n", stubMsg.field) @@ -1978,7 +1978,7 @@ static void test_ndr_buffer(void) ok(RpcMessage.BufferLength == 10 || broken(RpcMessage.BufferLength == 12), /* win2k */ "RpcMessage.BufferLength should have been 10 instead of %d\n", RpcMessage.BufferLength); - ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%lx\n", RpcMessage.RpcFlags); + ok(RpcMessage.RpcFlags == 0, "RpcMessage.RpcFlags should have been 0x0 instead of 0x%x\n", RpcMessage.RpcFlags); ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); ok(!StubMsg.BufferStart, "BufferStart should have been NULL instead of %p\n", StubMsg.BufferStart); ok(!StubMsg.BufferEnd, "BufferEnd should have been NULL instead of %p\n", StubMsg.BufferEnd); diff --git a/include/rpcdcep.h b/include/rpcdcep.h index 1bdfb47..0169586 100644 --- a/include/rpcdcep.h +++ b/include/rpcdcep.h @@ -36,7 +36,7 @@ typedef struct _RPC_SYNTAX_IDENTIFIER { typedef struct _RPC_MESSAGE { RPC_BINDING_HANDLE Handle; - unsigned long DataRepresentation; + ULONG DataRepresentation; void* Buffer; unsigned int BufferLength; unsigned int ProcNum; @@ -45,7 +45,7 @@ typedef struct _RPC_MESSAGE void* ReservedForRuntime; RPC_MGR_EPV* ManagerEpv; void* ImportContext; - unsigned long RpcFlags; + ULONG RpcFlags; } RPC_MESSAGE, *PRPC_MESSAGE; /* or'ed with ProcNum */ @@ -202,13 +202,13 @@ RPCRTAPI RPC_STATUS RPC_ENTRY typedef RPC_STATUS (*RPC_BLOCKING_FN)(void* hWnd, void* Context, void* hSyncEvent); RPCRTAPI RPC_STATUS RPC_ENTRY - I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, unsigned long ServerTid ); + I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, ULONG ServerTid ); RPCRTAPI RPC_STATUS RPC_ENTRY I_RpcSetThreadParams( int fClientFree, void* Context, void* hWndClient ); RPCRTAPI UINT RPC_ENTRY - I_RpcWindowProc( void* hWnd, unsigned int Message, unsigned int wParam, unsigned long lParam ); + I_RpcWindowProc( void* hWnd, unsigned int Message, unsigned int wParam, ULONG lParam ); #endif

1 0