April 2008 - Wine-commits - list.winehq.org

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 4ba16af16bae9cd7b06befef0fdb008560339b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba16af16bae9cd7b06befef0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:02:26 2008 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 02d9c59..4353f51 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1763,7 +1763,7 @@ static void D3D1_ViewportClearTest(void) memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat); - U1(U1(mat).diffuse).r = 1.0f; + U1(U(mat).diffuse).r = 1.0f; hr = IDirect3DMaterial_SetMaterial(bgMaterial, &mat); ok(hr == D3D_OK, "IDirect3DMaterial_SetMaterial failed: %08x\n", hr); @@ -1781,16 +1781,16 @@ static void D3D1_ViewportClearTest(void) if (SUCCEEDED(hr)) { D3DRECT rect; - rect.x1 = rect.y1 = 0; - rect.x2 = 640; - rect.y2 = 480; + U1(rect).x1 = U2(rect).y1 = 0; + U3(rect).x2 = 640; + U4(rect).y2 = 480; hr = IDirect3DViewport_Clear(Viewport, 1, &rect, D3DCLEAR_TARGET); ok(hr == D3D_OK, "IDirect3DViewport_Clear failed: %08x\n", hr); memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat); - U1(U1(mat).diffuse).b = 1.0f; + U3(U(mat).diffuse).b = 1.0f; hr = IDirect3DMaterial_SetMaterial(bgMaterial, &mat); ok(hr == D3D_OK, "IDirect3DMaterial_SetMaterial failed: %08x\n", hr); @@ -1832,7 +1832,7 @@ static DWORD D3D3_getPixelColor(IDirectDraw4 *DirectDraw, IDirectDrawSurface4 *S */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.dwWidth = 640; ddsd.dwHeight = 480; @@ -1847,7 +1847,7 @@ static DWORD D3D3_getPixelColor(IDirectDraw4 *DirectDraw, IDirectDrawSurface4 *S memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); hr = IDirectDrawSurface4_BltFast(surf, 0, 0, Surface, NULL, 0); ok(hr == DD_OK, "IDirectDrawSurface_BltFast returned %08x\n", hr); @@ -2025,9 +2025,9 @@ static void D3D3_ViewportClearTest(void) ok(hr == D3D_OK, "IDirect3DDevice3_SetRenderState returned %08x\n", hr); if (SUCCEEDED(hr)) { - rect.x1 = rect.y1 = 0; - rect.x2 = 640; - rect.y2 = 480; + U1(rect).x1 = U2(rect).y1 = 0; + U3(rect).x2 = 640; + U4(rect).y2 = 480; hr = IDirect3DViewport3_Clear2(Viewport3, 1, &rect, D3DCLEAR_TARGET, 0x00ff00, 0.0f, 0); ok(hr == D3D_OK, "IDirect3DViewport3_Clear2 failed, hr = %08x\n", hr);

1 0

Francois Gouget : jscript/tests: Fix the '\n's in an ok() call.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 7b404ff9d662d1b212274d5e970ab7e878e254c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b404ff9d662d1b212274d5e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:02:13 2008 +0200 jscript/tests: Fix the '\n's in an ok() call. --- dlls/jscript/tests/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 2fec01c..a54aa48 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -68,7 +68,7 @@ static void test_safety(IUnknown *unk) INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER |INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); - ok(hres == E_FAIL, "SetInterfaceSafetyOptions failed: %08x\n, expected E_FAIL", hres); + ok(hres == E_FAIL, "SetInterfaceSafetyOptions failed: %08x, expected E_FAIL\n", hres); hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER,

1 0

Francois Gouget : wldap32: Fix typo in the French resources.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d9e9e67ffc12417a1060961e1d702276b535f808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e9e67ffc12417a1060961e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:02:05 2008 +0200 wldap32: Fix typo in the French resources. --- dlls/wldap32/wldap32_Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index a725754..8ea8d1c 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -56,7 +56,7 @@ STRINGTABLE DISCARDABLE 31 "" 32 "Objet inconnu" 33 "Probl�me d'alias" - 34 "Synatxe DN invalide" + 34 "Syntaxe DN invalide" 35 "Est une feuille" 36 "Probl�me de d�r�f�rencement d'alias" 37 ""

1 0

Vitaliy Margolen : dinput: Don't use dead-zone from the device.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 3ba6f864f434f4e29ad189588d3981e453254303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba6f864f434f4e29ad189588… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 12 11:33:28 2008 -0600 dinput: Don't use dead-zone from the device. --- dlls/dinput/joystick_linuxinput.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index f318392..50befd9 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -423,7 +423,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm int i, idx = 0; char buffer[MAX_PATH+16]; HKEY hkey, appkey; - LONG def_deadzone = -1; + LONG def_deadzone = 0; newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl)); if (!newDevice) return NULL; @@ -471,9 +471,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->props[idx].lMin = 0; newDevice->props[idx].lMax = 0xffff; newDevice->props[idx].lSaturation = 0; - newDevice->props[idx].lDeadZone = def_deadzone >= 0 ? def_deadzone : - MulDiv(newDevice->joydev->axes[i].flat, 0xffff, - newDevice->props[idx].lDevMax - newDevice->props[idx].lDevMin); + newDevice->props[idx].lDeadZone = def_deadzone; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS; }

1 0

Francois Gouget : ole32: Fix spelling of GetComparisonData().
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 02bcdf6db71d4a7614f65696116b9908e225090e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bcdf6db71d4a7614f656961… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:01:50 2008 +0200 ole32: Fix spelling of GetComparisonData(). --- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/classmoniker.c | 6 +++--- dlls/ole32/filemoniker.c | 2 +- dlls/ole32/itemmoniker.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index e6f811b..5c907b7 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -532,7 +532,7 @@ static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) } /****************************************************************************** - * AntiMonikerIROTData_GetComparaisonData + * AntiMonikerIROTData_GetComparisonData ******************************************************************************/ static HRESULT WINAPI AntiMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 514990a..5c95b0a 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -627,9 +627,9 @@ static ULONG WINAPI ClassMonikerROTData_Release(IROTData* iface) } /****************************************************************************** - * ClassMonikerIROTData_GetComparaisonData + * ClassMonikerIROTData_GetComparisonData ******************************************************************************/ -static HRESULT WINAPI ClassMonikerROTData_GetComparaisonData(IROTData* iface, +static HRESULT WINAPI ClassMonikerROTData_GetComparisonData(IROTData* iface, BYTE* pbData, ULONG cbMax, ULONG* pcbData) @@ -687,7 +687,7 @@ static const IROTDataVtbl ROTDataVtbl = ClassMonikerROTData_QueryInterface, ClassMonikerROTData_AddRef, ClassMonikerROTData_Release, - ClassMonikerROTData_GetComparaisonData + ClassMonikerROTData_GetComparisonData }; /****************************************************************************** diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 7737919..74c867a 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1264,7 +1264,7 @@ FileMonikerROTDataImpl_Release(IROTData* iface) } /****************************************************************************** - * FileMonikerIROTData_GetComparaisonData + * FileMonikerIROTData_GetComparisonData */ static HRESULT WINAPI FileMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 8cab4f9..1a8822a 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -956,7 +956,7 @@ ULONG WINAPI ItemMonikerROTDataImpl_Release(IROTData* iface) } /****************************************************************************** - * ItemMonikerIROTData_GetComparaisonData + * ItemMonikerIROTData_GetComparisonData ******************************************************************************/ HRESULT WINAPI ItemMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData,

1 0

Francois Gouget : Fix spelling of dwAssign.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0682f85c957253de79bc23ee246c2b575df10987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0682f85c957253de79bc23ee2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:01:58 2008 +0200 Fix spelling of dwAssign. --- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/shdocvw/tests/webbrowser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 9f1d73d..34a7f24 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1530,7 +1530,7 @@ static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface) return E_NOTIMPL; } -static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAsign, DWORD dwWhichMoniker, +static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmon) { ok(0, "unexpected call\n"); diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 0f337ed..2989076 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -671,7 +671,7 @@ static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface) return E_NOTIMPL; } -static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAsign, DWORD dwWhichMoniker, +static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmon) { ok(0, "unexpected call\n");

1 0

Vitaliy Margolen : dinput: Assign button GUID to joystick buttons.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b9801bba314561d76f0db171d8fa30522ec17219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9801bba314561d76f0db171d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 12 11:33:04 2008 -0600 dinput: Assign button GUID to joystick buttons. --- dlls/dinput/joystick_linux.c | 1 + dlls/dinput/joystick_linuxinput.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index a43f842..e9b8790 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -471,6 +471,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di for (i = 0; i < newDevice->buttons; i++) { memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i + 12], df->dwObjSize); + df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; } newDevice->base.data_format.wine_df = df; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c31fc28..76456b0 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -373,7 +373,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN if (id >= have_joydevs) { return FALSE; } - + if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) @@ -498,6 +498,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[newDevice->numButtons + WINE_JOYSTICK_MAX_AXES + WINE_JOYSTICK_MAX_POVS], df->dwObjSize); newDevice->buttons[i] = 0x80 | newDevice->numButtons; + df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numButtons++) | DIDFT_PSHBUTTON; } df->dwNumObjs = idx;

1 0

Vitaliy Margolen : dinput: Joysticks are not supported for DX v3.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e67c1cbf698f713761cf39abf9fe12375ab5e6e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67c1cbf698f713761cf39abf… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 12 11:33:18 2008 -0600 dinput: Joysticks are not supported for DX v3. --- dlls/dinput/joystick_linuxinput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 76456b0..f318392 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -375,7 +375,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return FALSE; @@ -400,7 +400,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return FALSE;

1 0

Rob Shearman : qmgr: Dynamically link to advpack.dll.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b2603687ccac5a6ce51132a1da9a7111cf5e2326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2603687ccac5a6ce51132a1d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 12 10:06:56 2008 +0100 qmgr: Dynamically link to advpack.dll. Use RegInstall instead of RegInstallA as RegInstallA isn't available in some native versions of advpack commonly installed by programs. --- dlls/qmgr/Makefile.in | 2 +- dlls/qmgr/qmgr_main.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index de636db..57609ca 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qmgr.dll -IMPORTS = advpack wininet urlmon ole32 advapi32 kernel32 +IMPORTS = wininet urlmon ole32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 2a21a28..5094874 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -141,6 +141,9 @@ static HRESULT register_server(BOOL do_register) { HRESULT hr; STRTABLEA strtable; + HMODULE hAdvpack; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; TRACE("(%x)\n", do_register); @@ -150,9 +153,12 @@ static HRESULT register_server(BOOL do_register) return hr; } + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); + hr = init_register_strtable(&strtable); if (SUCCEEDED(hr)) - hr = RegInstallA(hInst, do_register ? "RegisterDll" : "UnregisterDll", + hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); cleanup_register_strtable(&strtable);

1 0

Rob Shearman : rpcrt4: Add buffer size checks to base type unmarshalling.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e05ccfe2bb50bf0f6f44d113b8f6a537d4524084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05ccfe2bb50bf0f6f44d113b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 12 10:07:26 2008 +0100 rpcrt4: Add buffer size checks to base type unmarshalling. Reimplement NdrSimpleTypeUnmarshall using similar macros to NdrBaseTypeUnmarshalling without buffer checks, due to NdrSimpleTypeUnmarshall not doing any safety checks. --- dlls/rpcrt4/ndr_marshall.c | 65 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c496581..8e9ea5c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -24,7 +24,7 @@ * - transmit_as/represent as * - Multi-dimensional arrays * - Conversion functions (NdrConvert) - * - Checks for integer addition overflow in base type and user marshall functions + * - Checks for integer addition overflow in user marshall functions */ #include <stdarg.h> @@ -2003,11 +2003,70 @@ void WINAPI NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* p /*********************************************************************** * NdrSimpleTypeUnmarshall [RPCRT4.@] + * + * Unmarshall a base type. + * + * NOTES + * Doesn't check that the buffer is long enough before copying, so the caller + * should do this. */ void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ) { - NdrBaseTypeUnmarshall(pStubMsg, &pMemory, &FormatChar, 0); +#define BASE_TYPE_UNMARSHALL(type) \ + ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + TRACE("pMemory: %p\n", pMemory); \ + *(type *)pMemory = *(type *)pStubMsg->Buffer; \ + pStubMsg->Buffer += sizeof(type); + + switch(FormatChar) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + BASE_TYPE_UNMARSHALL(UCHAR); + TRACE("value: 0x%02x\n", *pMemory); + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + BASE_TYPE_UNMARSHALL(USHORT); + TRACE("value: 0x%04x\n", *(USHORT *)pMemory); + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: + BASE_TYPE_UNMARSHALL(ULONG); + TRACE("value: 0x%08x\n", *(ULONG *)pMemory); + break; + case RPC_FC_FLOAT: + BASE_TYPE_UNMARSHALL(float); + TRACE("value: %f\n", *(float *)pMemory); + break; + case RPC_FC_DOUBLE: + BASE_TYPE_UNMARSHALL(double); + TRACE("value: %f\n", *(double *)pMemory); + break; + case RPC_FC_HYPER: + BASE_TYPE_UNMARSHALL(ULONGLONG); + TRACE("value: %s\n", wine_dbgstr_longlong(*(ULONGLONG *)pMemory)); + break; + case RPC_FC_ENUM16: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); + TRACE("pMemory: %p\n", pMemory); + /* 16-bits on the wire, but int in memory */ + *(UINT *)pMemory = *(USHORT *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%08x\n", *(UINT *)pMemory); + break; + case RPC_FC_IGNORE: + break; + default: + FIXME("Unhandled base type: 0x%02x\n", FormatChar); + } +#undef BASE_TYPE_UNMARSHALL } /*********************************************************************** @@ -6013,7 +6072,7 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( TRACE("*ppMemory: %p\n", *ppMemory); \ **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ } \ - pStubMsg->Buffer += sizeof(type); + safe_buffer_increment(pStubMsg, sizeof(type)); switch(*pFormat) {

1 0