January 2009 - Wine-Commits

Michael Stefaniuc : ddraw/tests: Remove superfluous casts.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 91bb8dc04308959a46900c7fa28a9f43f0ee3889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91bb8dc04308959a46900c7fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:46:59 2009 +0100 ddraw/tests: Remove superfluous casts. --- dlls/ddraw/tests/d3d.c | 10 +++++----- dlls/ddraw/tests/dsurface.c | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 8a3dfd0..3a2cd2b 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -843,7 +843,7 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) { - D3D7ETest *d3d7et = (D3D7ETest*)Context; + D3D7ETest *d3d7et = Context; if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DRGBDevice)) d3d7et->rgb++; else if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DHALDevice)) @@ -871,7 +871,7 @@ static void D3D7EnumTest(void) } memset(&d3d7et, 0, sizeof(d3d7et)); - IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, (LPVOID) &d3d7et); + IDirect3D7_EnumDevices(lpD3D, enumDevicesCallbackTest7, &d3d7et); /* A couple of games (Delta Force LW and TFD) rely on this behaviour */ @@ -1130,7 +1130,7 @@ static void Direct3D1Test(void) memset(&transformdata, 0, sizeof(transformdata)); transformdata.dwSize = sizeof(transformdata); - transformdata.lpIn = (void *) testverts; + transformdata.lpIn = testverts; transformdata.dwInSize = sizeof(testverts[0]); transformdata.lpOut = out; transformdata.dwOutSize = sizeof(out[0]); @@ -1252,7 +1252,7 @@ static void Direct3D1Test(void) "Regular output DWORD %d remained untouched\n", i); } - transformdata.lpIn = (void *) cliptest; + transformdata.lpIn = cliptest; transformdata.dwInSize = sizeof(cliptest[0]); hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(cliptest) / sizeof(cliptest[0]), &transformdata, D3DTRANSFORM_CLIPPED, @@ -1356,7 +1356,7 @@ static void Direct3D1Test(void) ok(hr == D3D_OK, "IDirect3DViewport_TransformVertices returned %08x\n", hr); ok(i == (D3DCLIP_BOTTOM | D3DCLIP_LEFT), "Offscreen is %d\n", i); - transformdata.lpIn = (void *) offscreentest; + transformdata.lpIn = offscreentest; transformdata.dwInSize = sizeof(offscreentest[0]); SET_VP_DATA(vp_data); vp_data.dwWidth = 257; diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 91669ff..68a51cd 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -248,7 +248,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; lpData[0] = 0xCCCCCCCC; lpData[1] = 0xCCCCCCCC; lpData[2] = 0xCCCCCCCC; @@ -274,7 +274,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpSrc, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; lpData[0] = 0x77010203; lpData[1] = 0x00010203; lpData[2] = 0x77FF00FF; @@ -287,7 +287,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; /* Different behavior on some drivers / windows versions. Some versions ignore the X channel when * color keying, but copy it to the destination surface. Others apply it for color keying, but * do not copy it into the destination surface. @@ -388,7 +388,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpSrc, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; lpData[0] = 0x000000FF; /* Applies to src blt key in src surface */ lpData[1] = 0x00000000; /* Applies to dst blt key in src surface */ lpData[2] = 0x00FF0000; /* Dst color key in dst surface */ @@ -401,7 +401,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; lpData[0] = 0x55555555; lpData[1] = 0x55555555; lpData[2] = 0x55555555; @@ -418,7 +418,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; /* Should have copied src data unmodified to dst */ ok(lpData[0] == 0x000000FF && lpData[1] == 0x00000000 && @@ -443,7 +443,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; ok(lpData[0] == 0x55555555 && /* Here the src key applied */ lpData[1] == 0x00000000 && @@ -468,7 +468,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; ok(lpData[0] == 0x000000FF && lpData[1] == 0x00000000 && @@ -495,7 +495,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; ok(lpData[0] == 0x55555555 && lpData[1] == 0x55555555 && @@ -521,7 +521,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; /* DirectDraw uses the dest blit key from the SOURCE surface ! */ ok(lpData[0] == 0x00ff0000 && @@ -548,7 +548,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; ok(lpData[0] == 0x00FF0000 && lpData[1] == 0x00FF0000 && @@ -575,7 +575,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; ok(lpData[0] == 0x00FF0000 && lpData[1] == 0x00FF0000 && @@ -598,7 +598,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpSrc, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; lpData[5] = 0x000000FF; /* Applies to src blt key in src surface */ rc = IDirectDrawSurface_Unlock(lpSrc, NULL); ok(rc==DD_OK,"Unlock returned: %x\n",rc); @@ -610,7 +610,7 @@ static void SrcColorKey32BlitTest(void) rc = IDirectDrawSurface_Lock(lpDst, NULL, &ddsd2, DDLOCK_WAIT, NULL); ok(rc==DD_OK,"Lock returned: %x\n",rc); ok((ddsd2.dwFlags & DDSD_LPSURFACE) == 0, "Surface desc has LPSURFACE Flags set\n"); - lpData = (LPDWORD)ddsd2.lpSurface; + lpData = ddsd2.lpSurface; ok(lpData[0] == 0x00FF0000 && /* Masked by Destination key */ lpData[1] == 0x00FF0000 && /* Masked by Destination key */ @@ -1016,7 +1016,7 @@ static void EnumTest(void) ok(!ctx.expected[3], "expected NULL pointer\n"); ctx.count = 0; - rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, (void *) &ctx, enumCB); + rc = IDirectDraw_EnumSurfaces(lpDD, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &ddsd, &ctx, enumCB); ok(rc == DD_OK, "IDirectDraw_EnumSurfaces returned %08x\n", rc); ok(ctx.count == 3, "%d surfaces enumerated, expected 3\n", ctx.count); @@ -1433,7 +1433,7 @@ static HRESULT WINAPI CubeTestLvl2Enum(IDirectDrawSurface7 *surface, DDSURFACEDE static HRESULT WINAPI CubeTestLvl1Enum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { UINT mips = 0; - UINT *num = (UINT *) context; + UINT *num = context; static const struct compare expected[] = { {

1 0

Michael Stefaniuc : browseui: Remove superfluous casts from/ to void pointers.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 3a95eaab9ae3c5296cd859b74295e190a8c557a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a95eaab9ae3c5296cd859b74… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:46:07 2009 +0100 browseui: Remove superfluous casts from/to void pointers. --- dlls/browseui/browseui_main.c | 2 +- dlls/browseui/progressdlg.c | 2 +- dlls/browseui/tests/autocomplete.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 447e4f7..54e9c52 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -146,7 +146,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->vtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; - *ppvOut = (LPVOID)This; + *ppvOut = This; TRACE("Created class factory %p\n", This); BROWSEUI_refCount++; return S_OK; diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 120f072..42e7322 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -223,7 +223,7 @@ static DWORD WINAPI dialog_thread(LPVOID lpParameter) { /* Note: until we set the hEvent in WM_INITDIALOG, the ProgressDialog object * is protected by the critical section held by StartProgress */ - struct create_params *params = (struct create_params *)lpParameter; + struct create_params *params = lpParameter; HWND hwnd; MSG msg; diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 9442e6d..85a7da5 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -48,7 +48,7 @@ static LPWSTR strdup_AtoW(LPCSTR str) { int size = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - LPWSTR wstr = (LPWSTR)CoTaskMemAlloc((size + 1)*sizeof(WCHAR)); + LPWSTR wstr = CoTaskMemAlloc((size + 1)*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, size+1); return wstr; }

1 0

Michael Stefaniuc : ddraw/tests: Simplify a pointer increment.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 566a133a827016799bc47896c2a29c84d39e7008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566a133a827016799bc47896c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:46:26 2009 +0100 ddraw/tests: Simplify a pointer increment. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 94a0dfe..8a3dfd0 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1118,7 +1118,7 @@ static void Direct3D1Test(void) instr->bOpcode = D3DOP_TRIANGLE; instr->bSize = sizeof(D3DOP_TRIANGLE); instr->wCount = 0; - instr = ((D3DINSTRUCTION*)(instr))+1; + instr++; instr->bOpcode = D3DOP_EXIT; instr->bSize = 0; instr->wCount = 0;

1 0

Michael Karcher : oleaut32: Implement IPropertyBag::Read proxying.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: a16b79cf725f91ffa76d593cbfd21cac1336016c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16b79cf725f91ffa76d593cb… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jan 4 00:20:05 2009 +0100 oleaut32: Implement IPropertyBag::Read proxying. --- dlls/oleaut32/usrmarshal.c | 72 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 85faac4..2811fcf 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -2017,8 +2017,35 @@ HRESULT CALLBACK IPropertyBag_Read_Proxy( VARIANT *pVar, IErrorLog *pErrorLog) { - FIXME("not implemented\n"); - return E_FAIL; + IUnknown *pUnk = NULL; + TRACE("(%p, %s, %p, %p)\n", This, debugstr_w(pszPropName), pVar, pErrorLog); + + if(!pVar) + return E_POINTER; + + if(V_VT(pVar) & (VT_BYREF | VT_ARRAY | VT_VECTOR)) + { + FIXME("Variant type %x is byref, array or vector. Not implemented.\n", V_VT(pVar)); + return E_NOTIMPL; + } + + switch(V_VT(pVar)) + { + case VT_DISPATCH: + pUnk = (IUnknown*)V_DISPATCH(pVar); + break; + case VT_UNKNOWN: + pUnk = V_UNKNOWN(pVar); + break; + case VT_SAFEARRAY: + FIXME("Safearray support not yet implemented.\n"); + return E_NOTIMPL; + default: + break; + } + + return IPropertyBag_RemoteRead_Proxy(This, pszPropName, pVar, pErrorLog, + V_VT(pVar), pUnk); } HRESULT __RPC_STUB IPropertyBag_Read_Stub( @@ -2029,8 +2056,45 @@ HRESULT __RPC_STUB IPropertyBag_Read_Stub( DWORD varType, IUnknown *pUnkObj) { - FIXME("not implemented\n"); - return E_FAIL; + static const WCHAR emptyWstr[1] = {0}; + IDispatch *disp; + HRESULT hr; + TRACE("(%p, %s, %p, %p, %x, %p)\n", This, debugstr_w(pszPropName), pVar, + pErrorLog, varType, pUnkObj); + + if(varType & (VT_BYREF | VT_ARRAY | VT_VECTOR)) + { + FIXME("Variant type %x is byref, array or vector. Not implemented.\n", V_VT(pVar)); + return E_NOTIMPL; + } + + V_VT(pVar) = varType; + switch(varType) + { + case VT_DISPATCH: + hr = IUnknown_QueryInterface(pUnkObj, &IID_IDispatch, (LPVOID*)&disp); + if(FAILED(hr)) + return hr; + IUnknown_Release(pUnkObj); + V_DISPATCH(pVar) = disp; + break; + case VT_UNKNOWN: + V_UNKNOWN(pVar) = pUnkObj; + break; + case VT_BSTR: + V_BSTR(pVar) = SysAllocString(emptyWstr); + break; + case VT_SAFEARRAY: + FIXME("Safearray support not yet implemented.\n"); + return E_NOTIMPL; + default: + break; + } + hr = IPropertyBag_Read(This, pszPropName, pVar, pErrorLog); + if(FAILED(hr)) + VariantClear(pVar); + + return hr; } /* call_as/local stubs for ocidl.idl */

1 0

Michael Stefaniuc : dpnet: Remove superfluous casts.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: a50629fad50455665644de5f099501e8e3f3e1b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50629fad50455665644de5f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 4 01:45:42 2009 +0100 dpnet: Remove superfluous casts. --- dlls/dpnet/address.c | 2 +- dlls/dpnet/dpnet_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d6d1730..d3f3498 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -202,7 +202,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS i break; case DPNA_DATATYPE_GUID: if (sizeof(GUID) != dwDataSize) return DPNERR_INVALIDPARAM; - TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid((const GUID*) lpvData)); + TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData)); break; case DPNA_DATATYPE_STRING: TRACE("(%p, %u): STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData); diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 3c8e2c5..34429ac 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -114,7 +114,7 @@ static IClassFactoryImpl DPNET_CFS[] = { { &DICF_Vtbl, 1, &CLSID_DirectPlay8Server, DPNET_CreateDirectPlay8Server }, { &DICF_Vtbl, 1, &CLSID_DirectPlay8Peer, DPNET_CreateDirectPlay8Peer }, { &DICF_Vtbl, 1, &CLSID_DirectPlay8Address, DPNET_CreateDirectPlay8Address }, - { &DICF_Vtbl, 1, &CLSID_DirectPlay8LobbiedApplication, (void *)DPNET_CreateDirectPlay8LobbiedApp }, + { &DICF_Vtbl, 1, &CLSID_DirectPlay8LobbiedApplication, DPNET_CreateDirectPlay8LobbiedApp }, { &DICF_Vtbl, 1, &CLSID_DirectPlay8ThreadPool, DPNET_CreateDirectPlay8ThreadPool}, { NULL, 0, NULL, NULL } };

1 0

Michael Karcher : ole32: Add HICON user marshalling stubs.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 11aef5e0a22ded5ac035b5a66d3be9879259ff8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=11aef5e0a22ded5ac035b5a66… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jan 4 00:21:43 2009 +0100 ole32: Add HICON user marshalling stubs. --- dlls/ole32/ole32.spec | 4 ++ dlls/ole32/usrmarshal.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 79376ac..49ff1d3 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -138,6 +138,10 @@ @ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) @ stdcall HGLOBAL_UserSize(ptr long ptr) @ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) +@ stdcall HICON_UserFree(ptr ptr) +@ stdcall HICON_UserMarshal(ptr ptr ptr) +@ stdcall HICON_UserSize(ptr long ptr) +@ stdcall HICON_UserUnmarshal(ptr ptr ptr) @ stdcall HMENU_UserFree(ptr ptr) @ stdcall HMENU_UserMarshal(ptr ptr ptr) @ stdcall HMENU_UserSize(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 8aed5d6..3af71df 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -647,6 +647,105 @@ void __RPC_USER HBITMAP_UserFree(ULONG *pFlags, HBITMAP *phBmp) } /****************************************************************************** + * HICON_UserSize [OLE32.@] + * + * Calculates the buffer size required to marshal an icon. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the icon. + * phIcon [I] Icon to size. + * + * RETURNS + * The buffer size required to marshal an icon 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. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HICON_UserSize(ULONG *pFlags, ULONG StartingSize, HICON *phIcon) +{ + FIXME(":stub\n"); + return StartingSize; +} + +/****************************************************************************** +* HICON_UserMarshal [OLE32.@] +* +* Marshals an icon into a buffer. +* +* PARAMS +* pFlags [I] Flags. See notes. +* pBuffer [I] Buffer to marshal the icon into. +* phIcon [I] Icon 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. +* This function is only intended to be called by the RPC runtime. +*/ +unsigned char * __RPC_USER HICON_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HICON *phIcon) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HICON_UserUnmarshal [OLE32.@] + * + * Unmarshals an icon from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the icon from. + * phIcon [O] Address that receive the unmarshaled icon. + * + * 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. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HICON_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HICON *phIcon) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HICON_UserFree [OLE32.@] + * + * Frees an unmarshaled icon. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phIcon [I] Icon to free. + * + * 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. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HICON_UserFree(ULONG *pFlags, HICON *phIcon) +{ + FIXME(":stub\n"); +} + +/****************************************************************************** * HDC_UserSize [OLE32.@] * * Calculates the buffer size required to marshal an HDC.

1 0

Stefan Reimer : loader: Fix build with gcc-4.3 and ssp.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 3dcd1285f16fab7dc73884330753308b5b12199b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dcd1285f16fab7dc73884330… Author: Stefan Reimer <lists(a)startux.de> Date: Fri Jan 2 18:40:17 2009 +0100 loader: Fix build with gcc-4.3 and ssp. --- loader/preloader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 5fcb974..1143972 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -163,6 +163,7 @@ void __bb_init_func(void) { return; } /* similar to the above but for -fstack-protector */ void *__stack_chk_guard = 0; +void __stack_chk_fail_local(void) { return; } void __stack_chk_fail(void) { return; } /* data for setting up the glibc-style thread-local storage in %gs */

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_location implementation.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 159cc19b03e9ceeba12e1a83471efcad868ce12e URL: http://source.winehq.org/git/wine.git/?a=commit;h=159cc19b03e9ceeba12e1a834… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jan 3 17:45:47 2009 +0100 mshtml: Added IHTMLWindow2::get_location implementation. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/tests/dom.c | 11 ++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b73811a..979ed53 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -248,8 +248,15 @@ static HRESULT WINAPI HTMLWindow2_get_Image(IHTMLWindow2 *iface, IHTMLImageEleme static HRESULT WINAPI HTMLWindow2_get_location(IHTMLWindow2 *iface, IHTMLLocation **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc) { + FIXME("This->doc is NULL\n"); + return E_FAIL; + } + + return IHTMLDocument2_get_location(HTMLDOC(This->doc), p); } static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index aa8dbb8..de363bb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2185,6 +2185,7 @@ static void test_compatmode(IHTMLDocument2 *doc) static void test_location(IHTMLDocument2 *doc) { IHTMLLocation *location, *location2; + IHTMLWindow2 *window; ULONG ref; HRESULT hres; @@ -2195,10 +2196,18 @@ static void test_location(IHTMLDocument2 *doc) ok(hres == S_OK, "get_location failed: %08x\n", hres); ok(location == location2, "location != location2\n"); + IHTMLLocation_Release(location2); - test_ifaces((IUnknown*)location, location_iids); + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + hres = IHTMLWindow2_get_location(window, &location2); + ok(hres == S_OK, "get_location failed: %08x\n", hres); + ok(location == location2, "location != location2\n"); IHTMLLocation_Release(location2); + + test_ifaces((IUnknown*)location, location_iids); + ref = IHTMLLocation_Release(location); ok(!ref, "location chould be destroyed here\n"); }

1 0

Alexandre Julliard : msvcrt/tests: Fix some printf formats for 64-bit.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 2cf2c4568f9ca364d01a2992a0aa0ac071a6508e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cf2c4568f9ca364d01a2992a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:24:10 2009 +0100 msvcrt/tests: Fix some printf formats for 64-bit. --- dlls/msvcrt/tests/file.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0f235b5..91effe9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -105,11 +105,11 @@ static void test_fileops( void ) rewind(file); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); - ok(pos == 0, "Unexpected result of fgetpos 0x%Lx\n", pos); - pos = (ULONGLONG)sizeof (outbuffer); + ok(pos == 0, "Unexpected result of fgetpos %x%08x\n", (DWORD)(pos >> 32), (DWORD)pos); + pos = sizeof (outbuffer); ok(fsetpos(file, &pos) == 0, "fsetpos failed unexpected\n"); ok(fgetpos(file,&pos) == 0, "fgetpos failed unexpected\n"); - ok(pos == (ULONGLONG)sizeof (outbuffer), "Unexpected result of fgetpos 0x%Lx\n", pos); + ok(pos == sizeof (outbuffer), "Unexpected result of fgetpos %x%08x\n", (DWORD)(pos >> 32), (DWORD)pos); fclose (file); fd = open ("fdopen.tst", O_RDONLY | O_TEXT); @@ -463,8 +463,7 @@ static void test_fgetwc( void ) ok(l==BUFSIZ-2, "ftell expected %d got %ld\n", BUFSIZ-2, l); fgetws(wtextW,LLEN,tempfh); l=ftell(tempfh); - ok(l==BUFSIZ-2+strlen(mytext), "ftell expected %d got %ld\n", - BUFSIZ-2+strlen(mytext), l); + ok(l==BUFSIZ-2+strlen(mytext), "ftell got %ld\n", l); mytextW = AtoW (mytext); aptr = mytextW; wptr = wtextW; @@ -1019,7 +1018,7 @@ static void test_pipes_child(int argc, char** args) for (i=0; i<N_TEST_MESSAGES; i++) { nwritten=write(fd, pipe_string, strlen(pipe_string)); - ok(nwritten == strlen(pipe_string), "i %d, expected to write %d bytes, wrote %d\n", i, strlen(pipe_string), nwritten); + ok(nwritten == strlen(pipe_string), "i %d, expected to write '%s' wrote %d\n", i, pipe_string, nwritten); /* let other process wake up so they can show off their "keep reading until EOF" behavior */ if (i < N_TEST_MESSAGES-1) Sleep(100); @@ -1057,7 +1056,7 @@ static void test_pipes(const char* selfname) for (i=0; i<N_TEST_MESSAGES; i++) { r=read(pipes[0], buf, sizeof(buf)-1); - ok(r == strlen(pipe_string), "i %d, expected to read %d bytes, got %d\n", i, strlen(pipe_string)+1, r); + ok(r == strlen(pipe_string), "i %d, got %d\n", i, r); if (r > 0) buf[r]='\0'; ok(strcmp(buf, pipe_string) == 0, "expected to read '%s', got '%s'\n", pipe_string, buf); @@ -1092,7 +1091,7 @@ static void test_pipes(const char* selfname) for (i=0; i<N_TEST_MESSAGES; i++) strcat(expected, pipe_string); r=fread(buf, 1, sizeof(buf)-1, file); - ok(r == strlen(expected), "fread() returned %d instead of %d: ferror=%d\n", r, strlen(expected), ferror(file)); + ok(r == strlen(expected), "fread() returned %d: ferror=%d\n", r, ferror(file)); if (r > 0) buf[r]='\0'; ok(strcmp(buf, expected) == 0, "got '%s' expected '%s'\n", buf, expected);

1 0

Alexandre Julliard : msvcrt/tests: Use unsigned int instead of size_t for the malloc tests.
by Alexandre Julliard Jan. 4, 2009

Jan. 4, 2009

Module: wine Branch: master Commit: 4282fc122de4c44920f01e3bd686831998df3c72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4282fc122de4c44920f01e3bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 3 20:23:06 2009 +0100 msvcrt/tests: Use unsigned int instead of size_t for the malloc tests. --- dlls/msvcrt/tests/heap.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index ae98e3b..e094992 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -29,7 +29,7 @@ static void * (*p_aligned_offset_malloc)(size_t,size_t,size_t) = NULL; static void * (*p_aligned_realloc)(void*,size_t,size_t) = NULL; static void * (*p_aligned_offset_realloc)(void*,size_t,size_t,size_t) = NULL; -static void test_aligned_malloc(size_t size, size_t alignment) +static void test_aligned_malloc(unsigned int size, unsigned int alignment) { void *mem; @@ -57,7 +57,7 @@ static void test_aligned_malloc(size_t size, size_t alignment) ok(errno == EINVAL, "_aligned_malloc(%d, %d) errno: %d != %d\n", size, alignment, errno, EINVAL); } -static void test_aligned_offset_malloc(size_t size, size_t alignment, size_t offset) +static void test_aligned_offset_malloc(unsigned int size, unsigned int alignment, unsigned int offset) { void *mem; @@ -88,7 +88,7 @@ static void test_aligned_offset_malloc(size_t size, size_t alignment, size_t off ok(errno == EINVAL, "_aligned_offset_malloc(%d, %d, %d) errno: %d != %d\n", size, alignment, offset, errno, EINVAL); } -static void test_aligned_realloc(size_t size1, size_t size2, size_t alignment) +static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigned int alignment) { void *mem, *mem1, *mem2; @@ -160,7 +160,8 @@ static void test_aligned_realloc(size_t size1, size_t size2, size_t alignment) ok(errno == EINVAL, "_aligned_malloc(%d, %d) errno: %d != %d\n", size1, alignment, errno, EINVAL); } -static void test_aligned_offset_realloc(size_t size1, size_t size2, size_t alignment, size_t offset) +static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2, + unsigned int alignment, unsigned int offset) { void *mem, *mem1, *mem2;

1 0