December 2007 - Wine-Commits

Roy Shea : wininet: Added check of dwStructSize required by Windows in calls to InternetCrackUrlA .
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 91d07f699590d0a64f0f72e49e438db17f699c30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d07f699590d0a64f0f72e49… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Dec 4 14:55:18 2007 -0800 wininet: Added check of dwStructSize required by Windows in calls to InternetCrackUrlA. --- dlls/wininet/internet.c | 4 +++- dlls/wininet/tests/url.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 5848ea1..cf4e9bf 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1069,7 +1069,8 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, TRACE("(%s %u %x %p)\n", debugstr_a(lpszUrl), dwUrlLength, dwFlags, lpUrlComponents); - if (!lpszUrl || !*lpszUrl) + if (!lpszUrl || !*lpszUrl || !lpUrlComponents || + lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSA)) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -1087,6 +1088,7 @@ BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags, MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength); memset(&UCW,0,sizeof(UCW)); + UCW.dwStructSize = sizeof(URL_COMPONENTSW); if(lpUrlComponents->dwHostNameLength!=0) UCW.dwHostNameLength= lpUrlComponents->dwHostNameLength; if(lpUrlComponents->dwUserNameLength!=0) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 8469072..e7c4288 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -239,6 +239,25 @@ static void InternetCrackUrl_test(void) GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); ok(GLE != 0xdeadbeef && GLE != ERROR_SUCCESS, "Expected GLE to represent a failure\n"); + + /* Invalid Call: must set size of components structure (Windows only + * inforces this on the InternetCrackUrlA version of the call) */ + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + SetLastError(0xdeadbeef); + urlComponents.dwStructSize = 0; + ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents); + ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); + ok(GLE != 0xdeadbeef && GLE != ERROR_SUCCESS, "Expected GLE to represent a failure\n"); + + /* Invalid Call: size of dwStructSize must be one of the "standard" sizes + * of the URL_COMPONENTS structure (Windows only inforces this on the + * InternetCrackUrlA version of the call) */ + copy_compsA(&urlSrc, &urlComponents, 0, 1024, 1024, 1024, 2048, 1024); + SetLastError(0xdeadbeef); + urlComponents.dwStructSize = sizeof(urlComponents) + 1; + ret = InternetCrackUrlA(TEST_URL, 0, 0, &urlComponents); + ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); + ok(GLE != 0xdeadbeef && GLE != ERROR_SUCCESS, "Expected GLE to represent a failure\n"); } static void InternetCrackUrlW_test(void)

1 0

James Hawkins : msi: Reimplement MsiGetComponentPath.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 383a8a5b926a3db6b51b257dbaa237a2d4d580ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=383a8a5b926a3db6b51b257db… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Dec 5 00:29:01 2007 -0600 msi: Reimplement MsiGetComponentPath. --- dlls/msi/msi.c | 80 +++++++++++++++++++++----------- dlls/msi/tests/msi.c | 117 +++++++++++++++------------------------------ dlls/msi/tests/package.c | 5 +-- 3 files changed, 93 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=383a8a5b926a3db6b51b2…

1 0

Jacek Caban : shlwapi: Uncomment IUnknown_EnableModeless code.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 5f3dd23f1065bda119e2a360514fccf6bb4104d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3dd23f1065bda119e2a3605… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 02:06:53 2007 +0100 shlwapi: Uncomment IUnknown_EnableModeless code. --- dlls/shlwapi/ordinal.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8dc0ffa..c4b45c0 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -46,6 +46,7 @@ #include "shlwapi.h" #include "shellapi.h" #include "commdlg.h" +#include "mshtmhst.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -3226,13 +3227,10 @@ HRESULT WINAPI IUnknown_EnableModeless(IUnknown *lpUnknown, BOOL bModeless) EnableModeless(IOleInPlaceFrame); else if (IsIface(IShellBrowser)) EnableModeless(IShellBrowser); -#if 0 - /* FIXME: Wine has no headers for these objects yet */ else if (IsIface(IInternetSecurityMgrSite)) EnableModeless(IInternetSecurityMgrSite); else if (IsIface(IDocHostUIHandler)) EnableModeless(IDocHostUIHandler); -#endif else return hRet;

1 0

Jacek Caban : mshtml: Improve debug traces.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 92223c19f92384256035314062c67e175b0c3f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=92223c19f9238425603531406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 02:05:02 2007 +0100 mshtml: Improve debug traces. --- dlls/mshtml/conpoint.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index a8e3d56..8a8be4c 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -36,6 +36,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONPOINT(x) ((IConnectionPoint*) &(x)->lpConnectionPointVtbl); +static const char *debugstr_cp_guid(REFIID riid) +{ +#define X(x) \ + if(IsEqualGUID(riid, &x)) \ + return #x + + X(IID_IPropertyNotifySink); + X(DIID_HTMLDocumentEvents); + X(DIID_HTMLDocumentEvents2); + X(DIID_HTMLTableEvents); + X(DIID_HTMLTextContainerEvents); + +#undef X + + return debugstr_guid(riid); +} + void call_property_onchanged(ConnectionPoint *This, DISPID dispid) { DWORD i; @@ -244,7 +261,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo ConnectionPointContainer *This = CONPTCONT_THIS(iface); ConnectionPoint *iter; - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppCP); + TRACE("(%p)->(%s %p)\n", This, debugstr_cp_guid(riid), ppCP); *ppCP = NULL; @@ -258,7 +275,7 @@ static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPo return S_OK; } - FIXME("unsupported riid %s\n", debugstr_guid(riid)); + FIXME("unsupported riid %s\n", debugstr_cp_guid(riid)); return CONNECT_E_NOCONNECTION; }

1 0

Jacek Caban : mshtml: Return NULL instead of empty string in IHTMLBodyElement::get_background.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 87e2bb3e637a2d1a7639c71c8ac5ba75df6b3490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e2bb3e637a2d1a7639c71c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 5 02:04:43 2007 +0100 mshtml: Return NULL instead of empty string in IHTMLBodyElement::get_background. --- dlls/mshtml/htmlbody.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e3fb732..c3a930c 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -127,7 +127,7 @@ static HRESULT WINAPI HTMLBodyElement_get_background(IHTMLBodyElement *iface, BS if(NS_SUCCEEDED(nsres)) { const PRUnichar *background; nsAString_GetData(&background_str, &background, NULL); - *p = SysAllocString(background); + *p = *background ? SysAllocString(background) : NULL; }else { ERR("GetBackground failed: %08x\n", nsres); *p = NULL;

1 0

James Hawkins : msi: Add tests for MsiGetComponentPath.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: ced84f5b53a1fad5ea86fc743f0d65252db9b8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced84f5b53a1fad5ea86fc743… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Dec 4 21:33:37 2007 -0600 msi: Add tests for MsiGetComponentPath. --- dlls/msi/tests/msi.c | 393 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 393 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ced84f5b53a1fad5ea86f…

1 0

Roy Shea : wininet: Removed inline from copy_compsA and zero_compsA to allow Windows testing.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 7903d7f3f480a1c571122f40ebd69a876a79bfdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7903d7f3f480a1c571122f40e… Author: Roy Shea <roy(a)cs.hmc.edu> Date: Tue Dec 4 14:54:12 2007 -0800 wininet: Removed inline from copy_compsA and zero_compsA to allow Windows testing. --- dlls/wininet/tests/url.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index 729be53..8469072 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -53,7 +53,7 @@ #define CREATE_URL11 "about:" #define CREATE_URL12 "http://www.winehq.org:65535" -static inline void copy_compsA( +static void copy_compsA( URL_COMPONENTSA *src, URL_COMPONENTSA *dst, DWORD scheLen, @@ -73,7 +73,7 @@ static inline void copy_compsA( SetLastError(0xfaceabad); } -static inline void zero_compsA( +static void zero_compsA( URL_COMPONENTSA *dst, DWORD scheLen, DWORD hostLen,

1 0

Louis Lenders : msvcrt40: Add DllMain.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 8946d462aaf9bcab0d87973f5ebced6de031138e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8946d462aaf9bcab0d87973f5… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Tue Dec 4 22:13:18 2007 +0000 msvcrt40: Add DllMain. --- dlls/msvcrt40/Makefile.in | 3 +++ dlls/msvcrt40/msvcrt40.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index 6f33b83..862aa11 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -7,6 +7,9 @@ MODULE = msvcrt40.dll IMPORTLIB = libmsvcrt40.$(IMPLIBEXT) IMPORTS = msvcrt kernel32 +C_SRCS = \ + msvcrt40.c + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msvcrt40/msvcrt40.c b/dlls/msvcrt40/msvcrt40.c new file mode 100644 index 0000000..48e4af0 --- /dev/null +++ b/dlls/msvcrt40/msvcrt40.c @@ -0,0 +1,42 @@ +/* + * msvcrt40 main file + * + * Copyright (C) 2007 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcrt40); + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + break; + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +}

1 0

Andrew Talbot : d3d8: Remove unneeded casts.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: cd2964483a1a0fba7e215013edd241acaa6a005b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd2964483a1a0fba7e215013e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 4 21:45:06 2007 +0000 d3d8: Remove unneeded casts. --- dlls/d3d8/device.c | 12 ++++++------ dlls/d3d8/volume.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 55ebe83..4c04820 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -243,7 +243,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 } EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_SetCursorProperties(This->WineD3DDevice,XHotSpot,YHotSpot,(IWineD3DSurface*)pSurface->wineD3DSurface); + hr = IWineD3DDevice_SetCursorProperties(This->WineD3DDevice,XHotSpot,YHotSpot,pSurface->wineD3DSurface); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -399,7 +399,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(LPDIRECT3DDEVICE8 iface TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d8_cs); - rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, 0, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); + rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, 0, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); IWineD3DSurface_Release(retSurface); @@ -811,10 +811,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(LPDIRECT3DDEVICE8 ifa HRESULT hr; TRACE("(%p) Relay\n" , This); - IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, NULL == pZSurface ? NULL : (IWineD3DSurface *)pZSurface->wineD3DSurface); + IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, NULL == pZSurface ? NULL : pZSurface->wineD3DSurface); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface ? (IWineD3DSurface *)pSurface->wineD3DSurface : NULL); + hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface ? pSurface->wineD3DSurface : NULL); LeaveCriticalSection(&d3d8_cs); return hr; } @@ -1229,7 +1229,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, D } EnterCriticalSection(&d3d8_cs); - rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, (IWineD3DBaseTexture **)&retTexture); + rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture); if (rc == D3D_OK && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); IWineD3DBaseTexture_Release(retTexture); @@ -2063,7 +2063,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(LPDIRECT3DDEVICE8 ifa } EnterCriticalSection(&d3d8_cs); - rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, (IWineD3DVertexBuffer **)&retStream, 0 /* Offset in bytes */, pStride); + rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, &retStream, 0 /* Offset in bytes */, pStride); if (rc == D3D_OK && NULL != retStream) { IWineD3DVertexBuffer_GetParent(retStream, (IUnknown **)pStream); IWineD3DVertexBuffer_Release(retStream); diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index bea2ea9..e37817a 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -237,7 +237,7 @@ HRESULT WINAPI D3D8CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT HeapFree(GetProcessHeap(), 0, object); *ppVolume = NULL; } else { - *ppVolume = (IWineD3DVolume *)object->wineD3DVolume; + *ppVolume = object->wineD3DVolume; object->container = pSuperior; object->forwardReference = pSuperior; }

1 0

Andrew Talbot : d3d9: Remove unneeded casts.
by Alexandre Julliard Dec. 5, 2007

Dec. 5, 2007

Module: wine Branch: master Commit: 77c8a1594d1e87bc9aa0b43e910429cad9cda6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c8a1594d1e87bc9aa0b43e9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Dec 4 21:45:09 2007 +0000 d3d9: Remove unneeded casts. --- dlls/d3d9/device.c | 10 +++++----- dlls/d3d9/volume.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f4024a2..6308eb5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -205,7 +205,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC } EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_SetCursorProperties(This->WineD3DDevice, XHotSpot, YHotSpot, (IWineD3DSurface*)pSurface->wineD3DSurface); + hr = IWineD3DDevice_SetCursorProperties(This->WineD3DDevice, XHotSpot, YHotSpot, pSurface->wineD3DSurface); LeaveCriticalSection(&d3d9_cs); return hr; } @@ -294,7 +294,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9 ifa TRACE("(%p) Relay\n", This); EnterCriticalSection(&d3d9_cs); - rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, (IWineD3DSurface **)&retSurface); + rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &retSurface); if (rc == D3D_OK && NULL != retSurface && NULL != ppBackBuffer) { IWineD3DSurface_GetParent(retSurface, (IUnknown **)ppBackBuffer); IWineD3DSurface_Release(retSurface); @@ -538,7 +538,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9 i TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? (IWineD3DSurface*)pSurface->wineD3DSurface : NULL); + hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, RenderTargetIndex, pSurface ? pSurface->wineD3DSurface : NULL); LeaveCriticalSection(&d3d9_cs); return hr; } @@ -847,7 +847,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9 iface, } EnterCriticalSection(&d3d9_cs); - rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, (IWineD3DBaseTexture **)&retTexture); + rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture); if (rc == D3D_OK && NULL != retTexture) { IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture); IWineD3DBaseTexture_Release(retTexture); @@ -1221,7 +1221,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(LPDIRECT3DDEVICE9 iface, U } EnterCriticalSection(&d3d9_cs); - rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, (IWineD3DVertexBuffer **)&retStream, OffsetInBytes, pStride); + rc = IWineD3DDevice_GetStreamSource(This->WineD3DDevice, StreamNumber, &retStream, OffsetInBytes, pStride); if (rc == D3D_OK && NULL != retStream) { IWineD3DVertexBuffer_GetParent(retStream, (IUnknown **)pStream); IWineD3DVertexBuffer_Release(retStream); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 1a6f32d..2af611d 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -205,7 +205,7 @@ HRESULT WINAPI D3D9CB_CreateVolume(IUnknown *pDevice, IUnknown *pSuperior, UINT HeapFree(GetProcessHeap(), 0, object); *ppVolume = NULL; } else { - *ppVolume = (IWineD3DVolume *)object->wineD3DVolume; + *ppVolume = object->wineD3DVolume; object->container = pSuperior; object->forwardReference = pSuperior; }

1 0