December 2007 - Wine-commits

Dmitry Timoshkov : gdi32: Add a test for minimal acceptable DEVMODEA size, make it pass under Wine.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: c3fe9ec2f74ed135df1fb08faf13730050734b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fe9ec2f74ed135df1fb08fa… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 20 14:49:59 2007 +0800 gdi32: Add a test for minimal acceptable DEVMODEA size, make it pass under Wine. --- dlls/gdi32/driver.c | 5 +++++ dlls/gdi32/tests/dc.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index a2aa033..31810b0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -414,6 +414,11 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA) WORD dmW_size, dmA_size; dmA_size = dmA->dmSize; + + /* this is the minimal dmSize that XP accepts */ + if (dmA_size < FIELD_OFFSET(DEVMODEA, dmFields)) + return NULL; + if (dmA_size > sizeof(DEVMODEA)) dmA_size = sizeof(DEVMODEA); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 60b6ad7..01cb064 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -222,6 +222,19 @@ static void test_GdiConvertToDevmodeW(void) "expected %04x, got %04x\n", FIELD_OFFSET(DEVMODEW, dmPanningHeight) + sizeof(dmW->dmPanningHeight), dmW->dmSize); HeapFree(GetProcessHeap(), 0, dmW); + + SetLastError(0xdeadbeef); + dmA.dmSize = 0; + dmW = pGdiConvertToDevmodeW(&dmA); + ok(!dmW, "GdiConvertToDevmodeW should fail\n"); + ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + + /* this is the minimal dmSize that XP accepts */ + dmA.dmSize = FIELD_OFFSET(DEVMODEA, dmFields); + dmW = pGdiConvertToDevmodeW(&dmA); + ok(dmW->dmSize == FIELD_OFFSET(DEVMODEW, dmFields), + "expected %04x, got %04x\n", FIELD_OFFSET(DEVMODEW, dmFields), dmW->dmSize); + HeapFree(GetProcessHeap(), 0, dmW); } START_TEST(dc)

1 0

Dmitry Timoshkov : user32: Add a test for an invalid DEVMODE passed to ChangeDisplaySettings, make it pass under Wine.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 78718a41c7304cde78275a6e6d706bd7565eeca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78718a41c7304cde78275a6e6… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Dec 20 14:50:30 2007 +0800 user32: Add a test for an invalid DEVMODE passed to ChangeDisplaySettings, make it pass under Wine. --- dlls/user32/sysparams.c | 9 +++++++-- dlls/user32/tests/monitor.c | 33 +++++++++++++++++++++++++++++++-- dlls/winex11.drv/settings.c | 4 ++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index dd44639..8cd2dcb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2999,8 +2999,13 @@ LONG WINAPI ChangeDisplaySettingsExA( LPCSTR devname, LPDEVMODEA devmode, HWND h DEVMODEW *devmodeW; devmodeW = GdiConvertToDevmodeW(devmode); - ret = ChangeDisplaySettingsExW(nameW.Buffer, devmodeW, hwnd, flags, lparam); - HeapFree(GetProcessHeap(), 0, devmodeW); + if (devmodeW) + { + ret = ChangeDisplaySettingsExW(nameW.Buffer, devmodeW, hwnd, flags, lparam); + HeapFree(GetProcessHeap(), 0, devmodeW); + } + else + ret = DISP_CHANGE_SUCCESSFUL; } else { diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 14acdf5..a723dd1 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -25,6 +25,7 @@ static HMODULE hdll; static LONG (WINAPI *pChangeDisplaySettingsExA)(LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID); +static LONG (WINAPI *pChangeDisplaySettingsExW)(LPCWSTR, LPDEVMODEW, HWND, DWORD, LPVOID); static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); @@ -41,6 +42,7 @@ static void init_function_pointers(void) trace("GetProcAddress(%s) failed\n", #func); GET_PROC(ChangeDisplaySettingsExA) + GET_PROC(ChangeDisplaySettingsExW) GET_PROC(EnumDisplayDevicesA) GET_PROC(EnumDisplayMonitors) GET_PROC(GetMonitorInfoA) @@ -113,7 +115,7 @@ struct vid_mode LONG success; }; -static struct vid_mode vid_modes_test[] = { +static const struct vid_mode vid_modes_test[] = { {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 1}, {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 1}, @@ -135,7 +137,9 @@ static struct vid_mode vid_modes_test[] = { static void test_ChangeDisplaySettingsEx(void) { - DEVMODE dm; + DEVMODEA dm; + DEVMODEW dmW; + DWORD width; LONG res; int i; @@ -145,6 +149,31 @@ static void test_ChangeDisplaySettingsEx(void) return; } + SetLastError(0xdeadbeef); + res = EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettings error %u\n", GetLastError()); + + width = dm.dmPelsWidth; + + /* the following 2 tests show that dm.dmSize being 0 is invalid, but + * ChangeDisplaySettingsExA still reports success. + */ + memset(&dm, 0, sizeof(dm)); + dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPelsWidth = width; + res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); + ok(res == DISP_CHANGE_SUCCESSFUL, + "ChangeDisplaySettingsExA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); + + memset(&dmW, 0, sizeof(dmW)); + dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + dmW.dmPelsWidth = width; + SetLastError(0xdeadbeef); + res = pChangeDisplaySettingsExW(NULL, &dmW, NULL, CDS_TEST, NULL); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + ok(res == DISP_CHANGE_FAILED, + "ChangeDisplaySettingsExW returned %d, expected DISP_CHANGE_FAILED\n", res); + memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index ada827e..373562b 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -358,6 +358,10 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, TRACE("flags=%s\n",_CDS_flags(flags)); if (devmode) { + /* this is the minimal dmSize that XP accepts */ + if (devmode->dmSize < FIELD_OFFSET(DEVMODEW, dmFields)) + return DISP_CHANGE_FAILED; + TRACE("DM_fields=%s\n",_DM_fields(devmode->dmFields)); TRACE("width=%d height=%d bpp=%d freq=%d (%s)\n", devmode->dmPelsWidth,devmode->dmPelsHeight,

1 0

Andrew Riedi : gdiplus: Add GdipCreateHBITMAPFromBitmap() stub.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: ef00028407fef8c4f527b62294fcbc2b328d87b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef00028407fef8c4f527b6229… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Wed Dec 19 00:58:51 2007 -0800 gdiplus: Add GdipCreateHBITMAPFromBitmap() stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 615bb90..607ac6a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -93,7 +93,7 @@ @ stdcall GdipCreateFromHDC(long ptr) @ stdcall GdipCreateFromHWND(long ptr) @ stub GdipCreateFromHWNDICM -@ stub GdipCreateHBITMAPFromBitmap +@ stdcall GdipCreateHBITMAPFromBitmap(ptr ptr long) @ stub GdipCreateHICONFromBitmap @ stub GdipCreateHalftonePalette @ stub GdipCreateHatchBrush diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e22a2df..b08c5e5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -253,6 +253,16 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, return stat; } +GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, + HBITMAP* hbmReturn, ARGB background) +{ + FIXME("stub\n"); + + hbmReturn = NULL; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, GpMetafile* metafile, BOOL* succ, EmfType emfType, const WCHAR* description, GpMetafile** out_metafile)

1 0

James Hawkins : msi: Allow NULL parameters to be passed to the local MsiSetProperty.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 1d42de71ea9b2207d1960fa3deca04f1ad3c28f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d42de71ea9b2207d1960fa3d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 20 00:05:30 2007 -0600 msi: Allow NULL parameters to be passed to the local MsiSetProperty. --- dlls/msi/package.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 79c8764..a448214 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1345,7 +1345,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue if( !package ) { HRESULT hr; - BSTR name, value; + BSTR name = NULL, value = NULL; IWineMsiRemotePackage *remote_package; remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); @@ -1354,7 +1354,7 @@ UINT WINAPI MsiSetPropertyW( MSIHANDLE hInstall, LPCWSTR szName, LPCWSTR szValue name = SysAllocString( szName ); value = SysAllocString( szValue ); - if (!name || !value) + if ((!name && szName) || (!value && szValue)) { SysFreeString( name ); SysFreeString( value );

1 0

Rico Schüller : wined3d: Fix some typos.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: b7dfe3afb6527f3a6f53acfbf249dbbb06bd55dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7dfe3afb6527f3a6f53acfbf… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 19 19:12:12 2007 +0100 wined3d: Fix some typos. --- dlls/wined3d/state.c | 88 +++++++++++++++++++++++++------------------------- 1 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7dfe3afb6527f3a6f53a…

1 0

Andrew Talbot : kernel32: Remove unneeded casts.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 7bce56881f4715f8a3fb4cc5f4645267a792a1e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bce56881f4715f8a3fb4cc5f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 19 21:52:17 2007 +0000 kernel32: Remove unneeded casts. --- dlls/kernel32/ne_module.c | 4 ++-- dlls/kernel32/ne_segment.c | 4 ++-- dlls/kernel32/resource.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/ne_module.c b/dlls/kernel32/ne_module.c index 93f8f8e..e41ced9 100644 --- a/dlls/kernel32/ne_module.c +++ b/dlls/kernel32/ne_module.c @@ -529,7 +529,7 @@ FARPROC16 NE_GetEntryPointEx( HMODULE16 hModule, WORD ordinal, BOOL16 snoop ) if (!snoop) return (FARPROC16)MAKESEGPTR( sel, offset ); else - return (FARPROC16)SNOOP16_GetProcAddress16(hModule,ordinal,(FARPROC16)MAKESEGPTR( sel, offset )); + return SNOOP16_GetProcAddress16(hModule,ordinal,(FARPROC16)MAKESEGPTR( sel, offset )); } @@ -2051,7 +2051,7 @@ static HMODULE16 create_dummy_module( HMODULE module32 ) pStr += len+2; /* All tables zero terminated */ - pModule->ne_rsrctab = pModule->ne_imptab = pModule->ne_enttab = (char *)pStr - (char *)pModule; + pModule->ne_rsrctab = pModule->ne_imptab = pModule->ne_enttab = pStr - (char *)pModule; NE_RegisterModule( pModule ); pModule->owner32 = LoadLibraryA( filename ); /* increment the ref count of the 32-bit module */ diff --git a/dlls/kernel32/ne_segment.c b/dlls/kernel32/ne_segment.c index 7758d6d..8a3497e 100644 --- a/dlls/kernel32/ne_segment.c +++ b/dlls/kernel32/ne_segment.c @@ -463,7 +463,7 @@ BOOL NE_LoadSegment( NE_MODULE *pModule, WORD segnum ) BOOL NE_LoadAllSegments( NE_MODULE *pModule ) { int i; - SEGTABLEENTRY * pSegTable = (SEGTABLEENTRY *) NE_SEG_TABLE(pModule); + SEGTABLEENTRY * pSegTable = NE_SEG_TABLE(pModule); if (pModule->ne_flags & NE_FFLAGS_SELFLOAD) { @@ -551,7 +551,7 @@ static void NE_FixupSegmentPrologs(NE_MODULE *pModule, WORD segnum) /*TRACE("entry: %p, entry->segnum: %d, entry->offs: %04x\n", entry, entry->segnum, entry->offs);*/ if (entry->segnum == segnum) { - pFunc = ((BYTE *)pSeg+entry->offs); + pFunc = pSeg+entry->offs; TRACE("pFunc: %p, *(DWORD *)pFunc: %08x, num_entries: %d\n", pFunc, *(DWORD *)pFunc, num_entries); if (*(pFunc+2) == 0x90) { diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index ff2ec95..2fbf263 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -586,7 +586,7 @@ LPVOID WINAPI LockResource( HGLOBAL handle ) TRACE("(%p)\n", handle ); if (HIWORD( handle )) /* 32-bit memory handle */ - return (LPVOID)handle; + return handle; /* 16-bit memory handle */ return LockResource16( HGLOBAL_16(handle) );

1 0

Rob Shearman : rpcrt4: Initialise memory passed into RPCs in the server test.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: c49a73b853a34fc83b1455f1effdc574cf9ae4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49a73b853a34fc83b1455f1e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 19 14:53:30 2007 +0000 rpcrt4: Initialise memory passed into RPCs in the server test. aligns contains padding, but the memory is marshalled in one block so call memset to avoid Valgrind warnings. padded and padded2 are marshalled as complex types so this is not required here. Initialise the dummy member of test_list_t to zero for the TL_NULL case. Change the type to the smallest available to not waste buffer space. --- dlls/rpcrt4/tests/server.c | 8 +++++++- dlls/rpcrt4/tests/server.idl | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 6b747b8..0869c88 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -549,7 +549,7 @@ basic_tests(void) pvectors_t pvecs = {&vec1, &pvec2}; sp_inner_t spi = {42}; sp_t sp = {-13, &spi}; - aligns_t aligns = {3, 4, 5, 6.0}; + aligns_t aligns; pints_t pints; ptypes_t ptypes; padded_t padded; @@ -633,6 +633,11 @@ basic_tests(void) ok(enum_ord(E3) == 3, "RPC enum_ord\n"); ok(enum_ord(E4) == 4, "RPC enum_ord\n"); + memset(&aligns, 0, sizeof(aligns)); + aligns.c = 3; + aligns.i = 4; + aligns.s = 5; + aligns.d = 6.0; ok(sum_aligns(&aligns) == 18.0, "RPC sum_aligns\n"); padded.i = -3; @@ -711,6 +716,7 @@ null_list(void) { test_list_t *n = HeapAlloc(GetProcessHeap(), 0, sizeof *n); n->t = TL_NULL; + n->u.x = 0; return n; } diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index c9d9143..4ce89d2 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -112,7 +112,7 @@ cpp_quote("#endif") int t; [switch_is(t)] union { - [case(TL_NULL)] int x; /* end of list */ + [case(TL_NULL)] char x; /* end of list */ [case(TL_LIST)] struct test_list *tail; } u; } test_list_t;

1 0

Rob Shearman : rpcrt4: Don't use BufferEnd in RpcStream_Write.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 6382c8af3f44629ad9f3ccab046a3728800fb203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6382c8af3f44629ad9f3ccab0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 19 14:53:40 2007 +0000 rpcrt4: Don't use BufferEnd in RpcStream_Write. It is usually used during marshalling, where pStubMsg->BufferStart and pStubMsg->BufferEnd won't be valid. Replace it with a check using RpcMsg->Buffer and pStubMsg->BufferLength. --- dlls/rpcrt4/ndr_ole.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 0a8c1f2..5c1845a 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -82,7 +82,7 @@ typedef struct RpcStreamImpl DWORD RefCount; PMIDL_STUB_MESSAGE pMsg; LPDWORD size; - char *data; + unsigned char *data; DWORD pos; } RpcStreamImpl; @@ -145,7 +145,7 @@ static HRESULT WINAPI RpcStream_Write(LPSTREAM iface, ULONG *pcbWritten) { RpcStreamImpl *This = (RpcStreamImpl *)iface; - if (This->data + cb > (char *)This->pMsg->BufferEnd) + if (This->data + cb > (unsigned char *)This->pMsg->RpcMsg->Buffer + This->pMsg->BufferLength) return STG_E_MEDIUMFULL; memcpy(This->data + This->pos, pv, cb); This->pos += cb; @@ -215,7 +215,7 @@ static LPSTREAM RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init) This->RefCount = 1; This->pMsg = pStubMsg; This->size = (LPDWORD)pStubMsg->Buffer; - This->data = (char*)(This->size + 1); + This->data = (unsigned char*)(This->size + 1); This->pos = 0; if (init) *This->size = 0; TRACE("init size=%d\n", *This->size);

1 0

Alex Villacís Lasso : user32: Fix regression in DlgDirList caused by modified LB_DIR return behavior, with tests.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 4612b15ffff5eeb98da5075310a5c46e900e5b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4612b15ffff5eeb98da507531… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Dec 19 10:57:18 2007 -0500 user32: Fix regression in DlgDirList caused by modified LB_DIR return behavior, with tests. --- dlls/user32/dialog.c | 18 ++--- dlls/user32/tests/listbox.c | 152 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 153 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4612b15ffff5eeb98da50…

1 0

Rob Shearman : rpcrt4: Memory should only be cleared in ComplexUnmarshall, not in ComplexMarshall.
by Alexandre Julliard 20 Dec '07

20 Dec '07

Module: wine Branch: master Commit: 22b20879f7b7779644b0be21729ec23f9c783536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b20879f7b7779644b0be217… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Dec 19 14:53:12 2007 +0000 rpcrt4: Memory should only be cleared in ComplexUnmarshall, not in ComplexMarshall. Also clear memory when FC_STRUCTPAD* is encountered. --- dlls/rpcrt4/ndr_marshall.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 6aabb23..0167bcf 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2008,10 +2008,10 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, break; } case RPC_FC_ALIGNM4: - ALIGN_POINTER_CLEAR(pMemory, 4); + ALIGN_POINTER(pMemory, 4); break; case RPC_FC_ALIGNM8: - ALIGN_POINTER_CLEAR(pMemory, 8); + ALIGN_POINTER(pMemory, 8); break; case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2: @@ -2127,10 +2127,10 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, break; } case RPC_FC_ALIGNM4: - ALIGN_POINTER(pMemory, 4); + ALIGN_POINTER_CLEAR(pMemory, 4); break; case RPC_FC_ALIGNM8: - ALIGN_POINTER(pMemory, 8); + ALIGN_POINTER_CLEAR(pMemory, 8); break; case RPC_FC_STRUCTPAD1: case RPC_FC_STRUCTPAD2: @@ -2139,6 +2139,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, case RPC_FC_STRUCTPAD5: case RPC_FC_STRUCTPAD6: case RPC_FC_STRUCTPAD7: + memset(pMemory, 0, *pFormat - RPC_FC_STRUCTPAD1 + 1); pMemory += *pFormat - RPC_FC_STRUCTPAD1 + 1; break; case RPC_FC_EMBEDDED_COMPLEX:

1 0