September 2008 - Wine-commits

Rob Shearman : winhttp: Add version resource.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: cd999b20de5f80d5af25463f77371b0619111a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd999b20de5f80d5af25463f7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 10 11:01:26 2008 +0100 winhttp: Add version resource. --- dlls/winhttp/Makefile.in | 3 +++ dlls/winhttp/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 287ee4d..5617a1d 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -14,6 +14,9 @@ C_SRCS = \ request.c \ session.c +RC_SRCS = \ + version.rc + @MAKE_DLL_RULES@ @DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winhttp/version.rc b/dlls/winhttp/version.rc new file mode 100644 index 0000000..3dca59f --- /dev/null +++ b/dlls/winhttp/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Robert Shearman + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine HTTP Library" +#define WINE_FILENAME_STR "winhttp.dll" +#define WINE_FILEVERSION_MAJOR 5 +#define WINE_FILEVERSION_MINOR 1 +#define WINE_FILEVERSION_BUILD 2600 +#define WINE_FILEVERSION_PLATFORMID 2180 + +#include "wine/wine_common_ver.rc"

1 0

Kai Blin : dplayx: Fix possible NULL pointer dereference (Coverity).
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 8348c9fa9411752b6c3cb6c9703f1ae0e2d8924f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8348c9fa9411752b6c3cb6c97… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Sep 10 11:20:09 2008 +0200 dplayx: Fix possible NULL pointer dereference (Coverity). --- dlls/dplayx/dplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index ce9cdb6..b349462 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -3032,7 +3032,7 @@ static HRESULT WINAPI DP_IF_Receive } /* Copy into the provided buffer */ - CopyMemory( lpData, lpMsg->msg, *lpdwDataSize ); + if (lpData) CopyMemory( lpData, lpMsg->msg, *lpdwDataSize ); return DP_OK; }

1 0

Kai Blin : dplayx: Fix possible NULL pointer deference in error path ( Coverity).
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: e738f6144ecae3b2e85b7f84c6cb042b7c20bdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e738f6144ecae3b2e85b7f84c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Sep 10 12:03:29 2008 +0200 dplayx: Fix possible NULL pointer deference in error path (Coverity). --- dlls/dplayx/dplayx_global.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c index f70335b..fc72dce 100644 --- a/dlls/dplayx/dplayx_global.c +++ b/dlls/dplayx/dplayx_global.c @@ -889,7 +889,8 @@ HRESULT DPLAYX_SetConnectionSettingsA { DPLAYX_ReleaseSemaphore(); - ERR("DPSESSIONDESC passed in? Size=%u\n", lpConn->lpSessionDesc->dwSize ); + ERR("DPSESSIONDESC passed in? Size=%u\n", + lpConn->lpSessionDesc?lpConn->lpSessionDesc->dwSize:0 ); return DPERR_INVALIDPARAMS; }

1 0

Rob Shearman : msi: Reduce destination file name used in the MoveFiles action to the long file name .
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: ef1b0cacfa47e01d859f1477adc8359343caa65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef1b0cacfa47e01d859f1477a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Sep 10 11:01:15 2008 +0100 msi: Reduce destination file name used in the MoveFiles action to the long file name. Add a test for this behaviour. --- dlls/msi/action.c | 22 ++++++++++++++++------ dlls/msi/tests/install.c | 4 ++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2208b58..cb43c5d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5564,7 +5564,8 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; - LPCWSTR sourcename, destname; + LPCWSTR sourcename; + LPWSTR destname = NULL; LPWSTR sourcedir = NULL, destdir = NULL; LPWSTR source = NULL, dest = NULL; int options; @@ -5582,7 +5583,6 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) } sourcename = MSI_RecordGetString(rec, 3); - destname = MSI_RecordGetString(rec, 4); options = MSI_RecordGetInteger(rec, 7); sourcedir = msi_dup_property(package, MSI_RecordGetString(rec, 5)); @@ -5617,11 +5617,20 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) wildcards = strchrW(source, '*') || strchrW(source, '?'); - if (!destname && !wildcards) + if (MSI_RecordIsNull(rec, 4)) { - destname = strdupW(sourcename); - if (!destname) - goto done; + if (!wildcards) + { + destname = strdupW(sourcename); + if (!destname) + goto done; + } + } + else + { + destname = strdupW(MSI_RecordGetString(rec, 4)); + if (destname) + reduce_to_longfilename(destname); } size = 0; @@ -5658,6 +5667,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) done: msi_free(sourcedir); msi_free(destdir); + msi_free(destname); msi_free(source); msi_free(dest); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index adfe28e..239abb6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -575,6 +575,7 @@ static const CHAR mov_move_file_dat[] = "FileKey\tComponent_\tSourceName\tDestNa "kazakhstan\taugustus\t\tkiribati\tFILEPATHGOOD\tMSITESTDIR\t1\n" "laos\taugustus\tlatvia\tlebanon\tSourceDir\tMSITESTDIR\t1\n" "namibia\taugustus\tnauru\tkiribati\tSourceDir\tMSITESTDIR\t1\n" + "pakistan\taugustus\tperu\tsfn|poland\tSourceDir\tMSITESTDIR\t1\n" "wildcard\taugustus\tapp*\twildcard\tSourceDir\tMSITESTDIR\t1\n" "single\taugustus\tf?o\tsingle\tSourceDir\tMSITESTDIR\t1\n" "wildcardnodest\taugustus\tbudd*\t\tSourceDir\tMSITESTDIR\t1\n" @@ -4390,6 +4391,7 @@ static void test_movefiles(void) create_file("kenya", 100); CreateDirectoryA("latvia", NULL); create_file("nauru", 100); + create_file("peru", 100); create_file("apple", 100); create_file("application", 100); create_file("ape", 100); @@ -4430,6 +4432,7 @@ static void test_movefiles(void) ok(delete_pf("msitest\\kiribati", TRUE), "File not moved\n"); ok(!delete_pf("msitest\\lebanon", TRUE), "File moved\n"); ok(!delete_pf("msitest\\lebanon", FALSE), "Directory moved\n"); + ok(delete_pf("msitest\\poland", TRUE), "File not moved\n"); /* either apple or application will be moved depending on directory order */ if (!delete_pf("msitest\\apple", TRUE)) ok(delete_pf("msitest\\application", TRUE), "File not moved\n"); @@ -4462,6 +4465,7 @@ static void test_movefiles(void) ok(!DeleteFileA("kenya"), "File not moved\n"); ok(RemoveDirectoryA("latvia"), "Directory moved\n"); ok(!DeleteFileA("nauru"), "File not moved\n"); + ok(!DeleteFileA("peru"), "File not moved\n"); ok(!DeleteFileA("apple"), "File not moved\n"); ok(!DeleteFileA("application"), "File not moved\n"); ok(DeleteFileA("ape"), "File moved\n");

1 0

Henri Verbeet : d3d9: Add a test for auto depth stencil reset.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 3783c5c029eef2979309be1e9c03b6fc927cb36c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3783c5c029eef2979309be1e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:58 2008 +0200 d3d9: Add a test for auto depth stencil reset. --- dlls/d3d9/tests/device.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c234478..d28da88 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -744,6 +744,8 @@ static void test_reset(void) d3dpp.BackBufferWidth = 800; d3dpp.BackBufferHeight = 600; d3dpp.BackBufferFormat = d3ddm.Format; + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; for(i = 0; i < IDirect3D9_GetAdapterModeCount(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format); i++) { ZeroMemory( &d3ddm2, sizeof(d3ddm2) ); @@ -924,6 +926,32 @@ static void test_reset(void) ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); IDirect3DSurface9_Release(surface); + /* The depth stencil should get reset to the auto depth stencil when present. */ + hr = IDirect3DDevice9_SetDepthStencilSurface(pDevice, NULL); + ok(hr == D3D_OK, "SetDepthStencilSurface failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &surface); + ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); + ok(surface == NULL, "Depth stencil should be NULL\n"); + + d3dpp.EnableAutoDepthStencil = TRUE; + d3dpp.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &surface); + ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + ok(surface != NULL, "Depth stencil should not be NULL\n"); + if (surface) IDirect3DSurface9_Release(surface); + + d3dpp.EnableAutoDepthStencil = FALSE; + hr = IDirect3DDevice9_Reset(pDevice, &d3dpp); + ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_GetDepthStencilSurface(pDevice, &surface); + ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); + ok(surface == NULL, "Depth stencil should be NULL\n"); + /* Will a sysmem or scratch survive while locked */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(pDevice, 16, 16, D3DFMT_R5G6B5, D3DPOOL_SYSTEMMEM, &surface, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_CreateOffscreenPlainSurface returned %08x\n", hr);

1 0

Henri Verbeet : d3d8: Add a test for auto depth stencil reset.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 8f07e99ec5f18f718a422a8b3956962b9ef283a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f07e99ec5f18f718a422a8b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:58 2008 +0200 d3d8: Add a test for auto depth stencil reset. --- dlls/d3d8/tests/device.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c3aa591..1909038 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1283,6 +1283,76 @@ static void test_render_zero_triangles(void) if(d3d8) IDirect3D8_Release(d3d8); } +static void test_depth_stencil_reset(void) +{ + D3DPRESENT_PARAMETERS present_parameters; + D3DDISPLAYMODE display_mode; + IDirect3DSurface8 *surface; + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + HRESULT hr; + HWND hwnd; + + d3d8 = pDirect3DCreate8(D3D_SDK_VERSION); + ok(d3d8 != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow("static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d8 || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &display_mode); + memset(&present_parameters, 0, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.BackBufferFormat = display_mode.Format; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + + hr = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device); + if(FAILED(hr)) + { + skip("could not create device, IDirect3D8_CreateDevice returned %#x\n", hr); + goto cleanup; + } + + hr = IDirect3DDevice8_TestCooperativeLevel(device); + ok(SUCCEEDED(hr), "TestCooperativeLevel failed with %#x\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, NULL, NULL); + ok(hr == D3D_OK, "SetRenderTarget failed with 0x%08x\n", hr); + + hr = IDirect3DDevice8_GetRenderTarget(device, &surface); + ok(hr == D3D_OK, "GetRenderTarget failed with 0x%08x\n", hr); + ok(surface != NULL, "Render target should not be NULL\n"); + if (surface) IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surface); + ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); + ok(surface == NULL, "Depth stencil should be NULL\n"); + + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(hr == D3D_OK, "Reset failed with 0x%08x\n", hr); + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surface); + ok(hr == D3D_OK, "GetDepthStencilSurface failed with 0x%08x\n", hr); + ok(surface != NULL, "Depth stencil should not be NULL\n"); + if (surface) IDirect3DSurface8_Release(surface); + + present_parameters.EnableAutoDepthStencil = FALSE; + hr = IDirect3DDevice8_Reset(device, &present_parameters); + ok(hr == D3D_OK, "Reset failed with 0x%08x\n", hr); + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surface); + ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); + ok(surface == NULL, "Depth stencil should be NULL\n"); + +cleanup: + if(d3d8) IDirect3D8_Release(d3d8); + if(device) IDirect3D8_Release(device); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -1308,5 +1378,6 @@ START_TEST(device) test_limits(); test_lights(); test_render_zero_triangles(); + test_depth_stencil_reset(); } }

1 0

Henri Verbeet : wined3d: Reset the auto depth stencil.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: d51ea0115913daa630ad64a0b2bb6301a3bcc0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51ea0115913daa630ad64a0b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:58 2008 +0200 wined3d: Reset the auto depth stencil. --- dlls/wined3d/device.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3cfc606..9e0cf4f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7356,10 +7356,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE pPresentationParameters->hDeviceWindow != swapchain->presentParms.hDeviceWindow) { ERR("Cannot change the device window yet\n"); } - if(pPresentationParameters->EnableAutoDepthStencil != swapchain->presentParms.EnableAutoDepthStencil) { - ERR("What do do about a changed auto depth stencil parameter?\n"); + if (pPresentationParameters->EnableAutoDepthStencil && !This->auto_depth_stencil_buffer) { + WARN("Auto depth stencil enabled, but no auto depth stencil present, returning WINED3DERR_INVALIDCALL\n"); + return WINED3DERR_INVALIDCALL; } + /* Reset the depth stencil */ + if (pPresentationParameters->EnableAutoDepthStencil) + IWineD3DDevice_SetDepthStencilSurface(iface, This->auto_depth_stencil_buffer); + else + IWineD3DDevice_SetDepthStencilSurface(iface, NULL); + delete_opengl_contexts(iface, (IWineD3DSwapChain *) swapchain); if(pPresentationParameters->Windowed) {

1 0

Henri Verbeet : d3d9: Only run the reset test once.
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 8a77aa03e0063156ae25197e2176eb5f6b3b1137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a77aa03e0063156ae25197e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:58 2008 +0200 d3d9: Only run the reset test once. --- dlls/d3d9/tests/device.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 41dcafb..c234478 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2131,7 +2131,6 @@ START_TEST(device) test_mipmap_levels(); test_cursor(); test_reset(); - test_reset(); test_scene(); test_limits(); test_depthstenciltest();

1 0

Henri Verbeet : d3d8: GetDepthStencilSurface returns D3DERR_NOTFOUND when no depth stencil is present .
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 01539fb92685899c5373580c4af496177e073bb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01539fb92685899c5373580c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:58 2008 +0200 d3d8: GetDepthStencilSurface returns D3DERR_NOTFOUND when no depth stencil is present. --- dlls/d3d8/device.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a81bf78..e877456 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -853,16 +853,17 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(LPDIRECT3DDE EnterCriticalSection(&d3d8_cs); hr=IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice,&pZStencilSurface); - if(hr == D3D_OK && pZStencilSurface != NULL){ + if (hr == WINED3D_OK) { IWineD3DSurface_GetParent(pZStencilSurface,(IUnknown**)ppZStencilSurface); IWineD3DSurface_Release(pZStencilSurface); }else{ - FIXME("Call to IWineD3DDevice_GetDepthStencilSurface failed\n"); + if (hr != WINED3DERR_NOTFOUND) + FIXME("Call to IWineD3DDevice_GetDepthStencilSurface failed with 0x%08x\n", hr); *ppZStencilSurface = NULL; } LeaveCriticalSection(&d3d8_cs); - return D3D_OK; + return hr; } static HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) {

1 0

Henri Verbeet : d3d8: Fix IDirect3DDevice8::SetRenderTarget().
by Alexandre Julliard 10 Sep '08

10 Sep '08

Module: wine Branch: master Commit: 43f5d8e5ad634795bd236c8adc907fb01269a9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f5d8e5ad634795bd236c8ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 10 11:08:58 2008 +0200 d3d8: Fix IDirect3DDevice8::SetRenderTarget(). The render target should be left alone if the render target argument is NULL. WineD3D calls should be done inside the critical section. --- dlls/d3d8/device.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e877456..976d7dd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -805,13 +805,22 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(LPDIRECT3DDEVICE8 ifa IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DSurface8Impl *pSurface = (IDirect3DSurface8Impl *)pRenderTarget; IDirect3DSurface8Impl *pZSurface = (IDirect3DSurface8Impl *)pNewZStencil; + IWineD3DSurface *original_ds = NULL; HRESULT hr; TRACE("(%p) Relay\n" , This); - IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, NULL == pZSurface ? NULL : pZSurface->wineD3DSurface); - EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface ? pSurface->wineD3DSurface : NULL); + + hr = IWineD3DDevice_GetDepthStencilSurface(This->WineD3DDevice, &original_ds); + if (hr == WINED3D_OK || hr == WINED3DERR_NOTFOUND) + { + hr = IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, pZSurface ? pZSurface->wineD3DSurface : NULL); + if (SUCCEEDED(hr) && pSurface) + hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface->wineD3DSurface); + if (FAILED(hr)) IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, original_ds); + } + if (original_ds) IWineD3DSurface_Release(original_ds); + LeaveCriticalSection(&d3d8_cs); return hr; }

1 0