November 2012 - Wine-commits

Piotr Caban : msvcp60: Fixed basic_string::_Copy implementation.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 0569947da09328d033fbe234587fcd31ab624ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0569947da09328d033fbe2345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 18 21:44:26 2012 +0100 msvcp60: Fixed basic_string::_Copy implementation. --- dlls/msvcp60/string.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 5b0b358..6fe2780 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -260,9 +260,8 @@ void __thiscall basic_string_char__Copy(basic_string_char *this, MSVCP_size_t co { TRACE("%p %lu\n", this, copy_len); - if(!basic_string_char__Grow(this, copy_len, FALSE)) + if(!basic_string_char__Grow(this, copy_len, TRUE)) return; - basic_string_char__Eos(this, copy_len); } /* ?_Pdif@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@CAIPBD0(a)Z */ @@ -1976,9 +1975,8 @@ void __thiscall basic_string_wchar__Copy(basic_string_wchar *this, MSVCP_size_t { TRACE("%p %lu\n", this, copy_len); - if(!basic_string_wchar__Grow(this, copy_len, FALSE)) + if(!basic_string_wchar__Grow(this, copy_len, TRUE)) return; - basic_string_wchar__Eos(this, copy_len); } /* ?_Pdif@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@CAIPBG0(a)Z */

1 0

Michael Stefaniuc : kernel32/tests: Don't cast zero.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: f62ba6ff5c9b2cc4ce179da18f8234168e0d1002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62ba6ff5c9b2cc4ce179da18… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:51:14 2012 +0100 kernel32/tests: Don't cast zero. --- dlls/kernel32/tests/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 7fdb633..10f1682 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1179,7 +1179,7 @@ static void test_initonce(void) ret = pInitOnceExecuteOnce(&initonce, initonce_callback, (void*)0xdeadbeef, &g_initctxt); ok(ret, "got wrong ret value %d\n", ret); ok(initonce.Ptr == (void*)0x2, "got %p\n", initonce.Ptr); - ok(g_initctxt == (void*)0x0, "got %p\n", g_initctxt); + ok(g_initctxt == NULL, "got %p\n", g_initctxt); ok(g_initcallback_called, "got %d\n", g_initcallback_called); /* so it's been called already so won't be called again */

1 0

Michael Stefaniuc : msvcp: Don't cast zero.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: cf36ddd6fc8ad944d3e74df1c3472d252b55e749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf36ddd6fc8ad944d3e74df1c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:46:29 2012 +0100 msvcp: Don't cast zero. --- dlls/msvcp100/locale.c | 2 +- dlls/msvcp71/locale.c | 2 +- dlls/msvcp90/locale.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 198cc33..eeb7440 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -3824,7 +3824,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found); diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 381c21e..fe6d085 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -4242,7 +4242,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found); diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index c3f48d9..53b7afd 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4424,7 +4424,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = MSVCP_basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : 0; if(sep) MSVCP_basic_string_char_ctor(&groups_found);

1 0

Michael Stefaniuc : user32: Remove two superfluous casts.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 8f7eaf26ce329e0eea0e30aa1d32bd0b183b666b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7eaf26ce329e0eea0e30aa1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Nov 18 22:51:54 2012 +0100 user32: Remove two superfluous casts. --- dlls/user32/tests/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/resource.c b/dlls/user32/tests/resource.c index dd4342d..346cc2a 100644 --- a/dlls/user32/tests/resource.c +++ b/dlls/user32/tests/resource.c @@ -170,11 +170,11 @@ static void test_accel1(void) ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0000; + ac[n++].fVirt = 0x0000; ac[n].cmd = 0xfff0; ac[n].key = 0xffff; - ac[n++].fVirt = (SHORT) 0x0001; + ac[n++].fVirt = 0x0001; hAccel = CreateAcceleratorTable( &ac[0], n ); ok( hAccel != NULL, "create accelerator table\n");

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D2.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 4a339708d6034c58cee87369a355df834d402f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a339708d6034c58cee87369a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:47 2012 +0100 ddraw: Avoid LPDIRECT3D2. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f1b9e2d..24dcad6 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1036,7 +1036,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D2 *lplpDirect3D2) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D2 **d3d) PURE; /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; STDMETHOD(GetCurrentViewport)(THIS_ IDirect3DViewport2 **viewport) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3D.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 92a9fe463be7562e49faa088ddae8df7789313b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a9fe463be7562e49faa088d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:48 2012 +0100 ddraw: Avoid LPDIRECT3D. --- include/d3d.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 24dcad6..46fb2d6 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -409,7 +409,7 @@ DECLARE_INTERFACE_(IDirect3DLight,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DLight methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(SetLight)(THIS_ LPD3DLIGHT lpLight) PURE; STDMETHOD(GetLight)(THIS_ LPD3DLIGHT lpLight) PURE; }; @@ -447,7 +447,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DMaterial methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DMATERIALHANDLE *handle) PURE; @@ -652,7 +652,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -720,7 +720,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -796,7 +796,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DViewport methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; STDMETHOD(GetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT lpData) PURE; STDMETHOD(TransformVertices)(THIS_ DWORD dwVertexCount, LPD3DTRANSFORMDATA lpData, DWORD dwFlags, LPDWORD lpOffScreen) PURE; @@ -936,7 +936,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D, LPGUID lpGUID, LPD3DDEVICEDESC lpD3DDVDesc) PURE; + STDMETHOD(Initialize)(THIS_ IDirect3D *d3d, GUID *guid, D3DDEVICEDESC *desc) PURE; STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, @@ -958,7 +958,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD(DeleteMatrix)(THIS_ D3DMATRIXHANDLE D3DMatHandle) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D *lplpDirect3D) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D **d3d) PURE; }; #undef INTERFACE

1 0

Henri Verbeet : wined3d: Update the scissor rect and viewport even on redundant wined3d_device_set_render_target () calls.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 94ab9d5ef39c14cf3cb38f650c0f72a03c277222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ab9d5ef39c14cf3cb38f650… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:49 2012 +0100 wined3d: Update the scissor rect and viewport even on redundant wined3d_device_set_render_target() calls. --- dlls/wined3d/device.c | 55 ++++++++++++++++++++++++------------------------- 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6b4acf..16287ad 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4531,13 +4531,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - prev = device->fb.render_targets[render_target_idx]; - if (render_target == prev) - { - TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return WINED3D_OK; - } - /* Render target 0 can't be set to NULL. */ if (!render_target && !render_target_idx) { @@ -4551,6 +4544,33 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } + /* Set the viewport and scissor rectangles, if requested. Tests show that + * stateblock recording is ignored, the change goes directly into the + * primary stateblock. */ + if (!render_target_idx && set_viewport) + { + struct wined3d_state *state = &device->stateBlock->state; + + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = render_target->resource.width; + state->viewport.height = render_target->resource.height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; + device_invalidate_state(device, STATE_VIEWPORT); + + state->scissor_rect.top = 0; + state->scissor_rect.left = 0; + state->scissor_rect.right = render_target->resource.width; + state->scissor_rect.bottom = render_target->resource.height; + device_invalidate_state(device, STATE_SCISSORRECT); + } + + + prev = device->fb.render_targets[render_target_idx]; + if (render_target == prev) + return WINED3D_OK; + if (render_target) wined3d_surface_incref(render_target); device->fb.render_targets[render_target_idx] = render_target; @@ -4559,27 +4579,6 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (prev) wined3d_surface_decref(prev); - /* Render target 0 is special. */ - if (!render_target_idx && set_viewport) - { - /* Set the viewport and scissor rectangles, if requested. Tests show - * that stateblock recording is ignored, the change goes directly - * into the primary stateblock. */ - device->stateBlock->state.viewport.height = device->fb.render_targets[0]->resource.height; - device->stateBlock->state.viewport.width = device->fb.render_targets[0]->resource.width; - device->stateBlock->state.viewport.x = 0; - device->stateBlock->state.viewport.y = 0; - device->stateBlock->state.viewport.max_z = 1.0f; - device->stateBlock->state.viewport.min_z = 0.0f; - device_invalidate_state(device, STATE_VIEWPORT); - - device->stateBlock->state.scissor_rect.top = 0; - device->stateBlock->state.scissor_rect.left = 0; - device->stateBlock->state.scissor_rect.right = device->stateBlock->state.viewport.width; - device->stateBlock->state.scissor_rect.bottom = device->stateBlock->state.viewport.height; - device_invalidate_state(device, STATE_SCISSORRECT); - } - device_invalidate_state(device, STATE_FRAMEBUFFER); return WINED3D_OK;

1 0

Henri Verbeet : d3d8/tests: Add a test for the viewport after SetRenderTarget() calls.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: fa834b0bcc80f207a0ab5723bd0c3be9f6fd6e28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa834b0bcc80f207a0ab5723b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:50 2012 +0100 d3d8/tests: Add a test for the viewport after SetRenderTarget() calls. --- dlls/d3d8/tests/device.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index e41aeb3..6dd6d30 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3284,6 +3284,96 @@ done: DestroyWindow(window); } +static void test_set_rt_vp_scissor(void) +{ + IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; + IDirect3D8 *d3d8; + DWORD stateblock; + D3DVIEWPORT8 vp; + UINT refcount; + HWND window; + HRESULT hr; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == screen_width, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == screen_height, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeleteStateBlock(device, stateblock); + ok(SUCCEEDED(hr), "Failed to delete stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + vp.X = 10; + vp.Y = 20; + vp.Width = 30; + vp.Height = 40; + vp.MinZ = 0.25f; + vp.MaxZ = 0.75f; + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -3340,6 +3430,7 @@ START_TEST(device) test_device_window_reset(); test_reset_resources(); depth_blit_test(); + test_set_rt_vp_scissor(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Henri Verbeet : d3d9/tests: Add a test for the scissor rect and viewport after SetRenderTarget() calls .
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: 8180b9000ab766d885e374e3a98800384a133891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8180b9000ab766d885e374e3a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 19 00:15:51 2012 +0100 d3d9/tests: Add a test for the scissor rect and viewport after SetRenderTarget() calls. --- dlls/d3d9/tests/device.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fd3fd30..f51a8ae 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3565,6 +3565,118 @@ done: DestroyWindow(window); } +static void test_set_rt_vp_scissor(void) +{ + IDirect3DStateBlock9 *stateblock; + IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d9; + D3DVIEWPORT9 vp; + UINT refcount; + HWND window; + HRESULT hr; + RECT rect; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == screen_width, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == screen_height, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == screen_width && rect.bottom == screen_height, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + hr = IDirect3DDevice9_BeginStateBlock(device); + ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_EndStateBlock(device, &stateblock); + ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + IDirect3DStateBlock9_Release(stateblock); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == 128 && rect.bottom == 128, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + vp.X = 10; + vp.Y = 20; + vp.Width = 30; + vp.Height = 40; + vp.MinZ = 0.25f; + vp.MaxZ = 0.75f; + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr); + + SetRect(&rect, 50, 60, 70, 80); + hr = IDirect3DDevice9_SetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to set scissor rect, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetViewport(device, &vp); + ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr); + ok(!vp.X, "Got unexpected vp.X %u.\n", vp.X); + ok(!vp.Y, "Got unexpected vp.Y %u.\n", vp.Y); + ok(vp.Width == 128, "Got unexpected vp.Width %u.\n", vp.Width); + ok(vp.Height == 128, "Got unexpected vp.Height %u.\n", vp.Height); + ok(vp.MinZ == 0.0f, "Got unexpected vp.MinZ %.8e.\n", vp.MinZ); + ok(vp.MaxZ == 1.0f, "Got unexpected vp.MaxZ %.8e.\n", vp.MaxZ); + + hr = IDirect3DDevice9_GetScissorRect(device, &rect); + ok(SUCCEEDED(hr), "Failed to get scissor rect, hr %#x.\n", hr); + ok(rect.left == 0 && rect.top == 0 && rect.right == 128 && rect.bottom == 128, + "Got unexpected scissor rect {%d, %d, %d, %d}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + IDirect3DSurface9_Release(rt); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -3622,6 +3734,7 @@ START_TEST(device) test_mode_change(); test_device_window_reset(); test_reset_resources(); + test_set_rt_vp_scissor(); } out:

1 0

Dmitry Timoshkov : gdiplus: Avoid more cases of allocating a transformation matrix on the heap.
by Alexandre Julliard 19 Nov '12

19 Nov '12

Module: wine Branch: master Commit: b9ead1a7ea207bfb2492c59b50a34dcdbe22565f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9ead1a7ea207bfb2492c59b5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 19 11:58:48 2012 +0800 gdiplus: Avoid more cases of allocating a transformation matrix on the heap. --- dlls/gdiplus/graphics.c | 39 +++++++++++++-------------------------- 1 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 083c115..f56682b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1439,7 +1439,7 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s const GpCustomLineCap *custom, REAL x1, REAL y1, REAL x2, REAL y2) { HGDIOBJ oldbrush = NULL, oldpen = NULL; - GpMatrix *matrix = NULL; + GpMatrix matrix; HBRUSH brush = NULL; HPEN pen = NULL; PointF ptf[4], *custptf = NULL; @@ -1584,16 +1584,17 @@ static void draw_cap(GpGraphics *graphics, COLORREF color, GpLineCap cap, REAL s custpt = GdipAlloc(count * sizeof(POINT)); tp = GdipAlloc(count); - if(!custptf || !custpt || !tp || (GdipCreateMatrix(&matrix) != Ok)) + if(!custptf || !custpt || !tp) goto custend; memcpy(custptf, custom->pathdata.Points, count * sizeof(PointF)); - GdipScaleMatrix(matrix, size, size, MatrixOrderAppend); - GdipRotateMatrix(matrix, (180.0 / M_PI) * (theta - M_PI_2), + GdipSetMatrixElements(&matrix, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); + GdipScaleMatrix(&matrix, size, size, MatrixOrderAppend); + GdipRotateMatrix(&matrix, (180.0 / M_PI) * (theta - M_PI_2), MatrixOrderAppend); - GdipTranslateMatrix(matrix, x2, y2, MatrixOrderAppend); - GdipTransformMatrixPoints(matrix, custptf, count); + GdipTranslateMatrix(&matrix, x2, y2, MatrixOrderAppend); + GdipTransformMatrixPoints(&matrix, custptf, count); transform_and_round_points(graphics, custpt, custptf, count); @@ -1613,7 +1614,6 @@ custend: GdipFree(custptf); GdipFree(custpt); GdipFree(tp); - GdipDeleteMatrix(matrix); break; default: break; @@ -3127,7 +3127,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image RECT dst_area; GpRect src_area; int i, x, y, src_stride, dst_stride; - GpMatrix *dst_to_src; + GpMatrix dst_to_src; REAL m11, m12, m21, m22, mdx, mdy; LPBYTE src_data, dst_data; BitmapData lockeddata; @@ -3159,22 +3159,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image m22 = (ptf[2].Y - ptf[0].Y) / srcheight; mdy = ptf[0].Y - m12 * srcx - m22 * srcy; - stat = GdipCreateMatrix2(m11, m12, m21, m22, mdx, mdy, &dst_to_src); - if (stat != Ok) return stat; + GdipSetMatrixElements(&dst_to_src, m11, m12, m21, m22, mdx, mdy); - stat = GdipInvertMatrix(dst_to_src); - if (stat != Ok) - { - GdipDeleteMatrix(dst_to_src); - return stat; - } + stat = GdipInvertMatrix(&dst_to_src); + if (stat != Ok) return stat; dst_data = GdipAlloc(sizeof(ARGB) * (dst_area.right - dst_area.left) * (dst_area.bottom - dst_area.top)); - if (!dst_data) - { - GdipDeleteMatrix(dst_to_src); - return OutOfMemory; - } + if (!dst_data) return OutOfMemory; dst_stride = sizeof(ARGB) * (dst_area.right - dst_area.left); @@ -3187,7 +3178,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (!src_data) { GdipFree(dst_data); - GdipDeleteMatrix(dst_to_src); return OutOfMemory; } src_stride = sizeof(ARGB) * src_area.Width; @@ -3210,7 +3200,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (src_data != dst_data) GdipFree(src_data); GdipFree(dst_data); - GdipDeleteMatrix(dst_to_src); return stat; } @@ -3219,7 +3208,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image src_stride, ColorAdjustTypeBitmap); /* Transform the bits as needed to the destination. */ - GdipTransformMatrixPoints(dst_to_src, dst_to_src_points, 3); + GdipTransformMatrixPoints(&dst_to_src, dst_to_src_points, 3); x_dx = dst_to_src_points[1].X - dst_to_src_points[0].X; x_dy = dst_to_src_points[1].Y - dst_to_src_points[0].Y; @@ -3246,8 +3235,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } } - GdipDeleteMatrix(dst_to_src); - GdipFree(src_data); stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top,

1 0