wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Stefan Dösinger : wined3d: Invalidate streamsrc, vdecl and indexbuffer after strided draws.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 0fc7cd5ad72b813bfbd99951e4c649f8514e1de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc7cd5ad72b813bfbd99951e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 19 00:55:14 2011 +0200 wined3d: Invalidate streamsrc, vdecl and indexbuffer after strided draws. --- dlls/wined3d/device.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 51a6c39..819e481 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4242,11 +4242,21 @@ HRESULT CDECL wined3d_device_draw_primitive_strided(struct wined3d_device *devic * baseVertexIndex because that call is only called by ddraw which does * not need that value. */ device_invalidate_state(device, STATE_VDECL); + device_invalidate_state(device, STATE_STREAMSRC); device_invalidate_state(device, STATE_INDEXBUFFER); + device->stateBlock->state.base_vertex_index = 0; device->up_strided = strided_data; drawPrimitive(device, vertex_count, 0, 0, NULL); device->up_strided = NULL; + + /* Invalidate the states again to make sure the values from the stateblock + * are properly applied in the next regular draw. Note that the application- + * provided strided data has ovwritten pretty much the entire vertex and + * and index stream related states */ + device_invalidate_state(device, STATE_VDECL); + device_invalidate_state(device, STATE_STREAMSRC); + device_invalidate_state(device, STATE_INDEXBUFFER); return WINED3D_OK; } @@ -4261,12 +4271,18 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_strided(struct wined3d_devic * that value. */ device_invalidate_state(device, STATE_VDECL); + device_invalidate_state(device, STATE_STREAMSRC); device_invalidate_state(device, STATE_INDEXBUFFER); + device->stateBlock->state.user_stream = TRUE; device->stateBlock->state.base_vertex_index = 0; device->up_strided = strided_data; drawPrimitive(device, index_count, 0, index_size, index_data); device->up_strided = NULL; + + device_invalidate_state(device, STATE_VDECL); + device_invalidate_state(device, STATE_STREAMSRC); + device_invalidate_state(device, STATE_INDEXBUFFER); return WINED3D_OK; }

1 0

Michael Stefaniuc : wined3d: Sync a function prototype with its definition.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 42a6455ea5a6f1882e2c48f32e1ed2e6ec4f9057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a6455ea5a6f1882e2c48f32… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 22 00:22:40 2011 +0200 wined3d: Sync a function prototype with its definition. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5e20740..b2da2ec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2457,7 +2457,7 @@ const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN; const char *debug_d3ddeclmethod(WINED3DDECLMETHOD method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) DECLSPEC_HIDDEN; -const char *debug_d3drenderstate(DWORD state) DECLSPEC_HIDDEN; +const char *debug_d3drenderstate(WINED3DRENDERSTATETYPE state) DECLSPEC_HIDDEN; const char *debug_d3dsamplerstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN;

1 0

Chris Robinson : wined3d: Don' t use the old depth-stencil surface after decrementing its ref count.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 342d2b8979fbe71aa0bf52717a0b1b9e1a3b6150 URL: http://source.winehq.org/git/wine.git/?a=commit;h=342d2b8979fbe71aa0bf52717… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 11 23:21:51 2011 -0700 wined3d: Don't use the old depth-stencil surface after decrementing its ref count. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 66f89f1..51a6c39 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5157,8 +5157,6 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st device->fb.depth_stencil = depth_stencil; if (depth_stencil) wined3d_surface_incref(depth_stencil); - if (prev) - wined3d_surface_decref(prev); if (!prev != !depth_stencil) { @@ -5172,6 +5170,8 @@ HRESULT CDECL wined3d_device_set_depth_stencil(struct wined3d_device *device, st { device_invalidate_state(device, STATE_RENDER(WINED3DRS_DEPTHBIAS)); } + if (prev) + wined3d_surface_decref(prev); device_invalidate_state(device, STATE_FRAMEBUFFER);

1 0

Austin English : gdi32/tests: Remove win9x hacks.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 4cdd01fc82588dfe7d075e26f5e2ce95f9a2c610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cdd01fc82588dfe7d075e26f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Aug 9 18:12:01 2011 -0700 gdi32/tests: Remove win9x hacks. --- dlls/gdi32/tests/mapping.c | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index b0688a7..650efda 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -79,16 +79,11 @@ static DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); static void test_world_transform(void) { - BOOL is_win9x; HDC hdc; INT ret, size_cx, size_cy, res_x, res_y, dpi_x, dpi_y; XFORM xform; SIZE size; - SetLastError(0xdeadbeef); - GetWorldTransform(0, NULL); - is_win9x = GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; - hdc = CreateCompatibleDC(0); xform.eM11 = 1.0f; @@ -118,22 +113,14 @@ static void test_world_transform(void) ret = SetMapMode(hdc, MM_LOMETRIC); ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); - if (is_win9x) - { - expect_viewport_ext(hdc, dpi_x, dpi_y); - expect_window_ext(hdc, 254, -254); - } - else - { - expect_viewport_ext(hdc, res_x, -res_y); - ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); - ok( rough_match( size.cx, size_cx * 10 ) || - rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ - "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); - ok( rough_match( size.cy, size_cy * 10 ) || - rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ - "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); - } + expect_viewport_ext(hdc, res_x, -res_y); + ok( GetWindowExtEx( hdc, &size ), "GetWindowExtEx failed\n" ); + ok( rough_match( size.cx, size_cx * 10 ) || + rough_match( size.cx, MulDiv( res_x, 254, dpi_x )), /* Vista uses a more precise method */ + "expected cx %d or %d, got %d\n", size_cx * 10, MulDiv( res_x, 254, dpi_x ), size.cx ); + ok( rough_match( size.cy, size_cy * 10 ) || + rough_match( size.cy, MulDiv( res_y, 254, dpi_y )), /* Vista uses a more precise method */ + "expected cy %d or %d, got %d\n", size_cy * 10, MulDiv( res_y, 254, dpi_y ), size.cy ); expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, MulDiv(1000 / 10, res_x, size_cx), -MulDiv(1000 / 10, res_y, size_cy)); @@ -410,12 +397,7 @@ static void test_modify_world_transform(void) int ret; ret = SetGraphicsMode(hdc, GM_ADVANCED); - if(!ret) /* running in win9x so quit */ - { - ReleaseDC(0, hdc); - skip("GM_ADVANCED is not supported on this platform\n"); - return; - } + ok(ret, "ret = %d\n", ret); ret = ModifyWorldTransform(hdc, NULL, MWT_IDENTITY); ok(ret, "ret = %d\n", ret);

1 0

Austin English : d3d8/tests: Make sure to use return values (LLVM/Clang).
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 6e69d1168f82c20d350f0ad1be6fb67a9fde7eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e69d1168f82c20d350f0ad1b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Aug 9 17:46:54 2011 -0700 d3d8/tests: Make sure to use return values (LLVM/Clang). --- dlls/d3d8/tests/device.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4824fd4..aeed57f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1050,6 +1050,7 @@ static void test_reset(void) hr = IDirect3DDevice8_GetRenderTarget(device1, &surface); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); ok(surface_desc.Width == modes[i].w, "Back buffer width is %u, expected %u.\n", surface_desc.Width, modes[i].w); ok(surface_desc.Height == modes[i].h, "Back buffer height is %u, expected %u.\n", @@ -1088,6 +1089,7 @@ static void test_reset(void) hr = IDirect3DDevice8_GetRenderTarget(device1, &surface); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(hr == D3D_OK, "GetDesc failed, hr %#x.\n", hr); ok(surface_desc.Width == 400, "Back buffer width is %u, expected 400.\n", surface_desc.Width); ok(surface_desc.Height == 300, "Back buffer height is %u, expected 300.\n", @@ -2600,15 +2602,18 @@ static void test_depth_stencil_size(void) ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetRenderTarget(device, &surf); + ok(hr == D3D_OK, "IDirect3DDevice8_GetRenderTarget failed, hr %#x.\n", hr); ok(surf == rt, "The render target is %p, expected %p\n", surf, rt); IDirect3DSurface8_Release(surf); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surf); + ok(hr == D3D_OK, "IDirect3DDevice8_GetDepthStencilSurface failed, hr %#x.\n", hr); ok(surf == ds_bigger2, "The depth stencil is %p, expected %p\n", surf, ds_bigger2); IDirect3DSurface8_Release(surf); hr = IDirect3DDevice8_SetRenderTarget(device, NULL, NULL); ok(SUCCEEDED(hr), "IDirect3DDevice8_SetRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surf); + ok(FAILED(hr), "IDirect3DDevice8_GetDepthStencilSurface should have failed, hr %#x.\n", hr); ok(surf == NULL, "The depth stencil is %p, expected NULL\n", surf); if (surf) IDirect3DSurface8_Release(surf);

1 0

Austin English : kernel32/tests: Remove win9x hacks.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e2cbe25ba76925d30ed87d260bcada7049688734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cbe25ba76925d30ed87d260… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Aug 9 13:06:26 2011 -0700 kernel32/tests: Remove win9x hacks. --- dlls/kernel32/tests/atom.c | 39 ++++++++++----------------------------- dlls/kernel32/tests/debugger.c | 10 +++------- dlls/kernel32/tests/sync.c | 21 ++++----------------- 3 files changed, 17 insertions(+), 53 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index f85d272..15ef04c 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -192,26 +192,16 @@ static void test_get_atom_name(void) else ok( !len, "bad length %d\n", len ); - SetLastError(0xdeadbeef); + SetLastError(0xdeadbeef); len = GlobalGetAtomNameA( (ATOM)i, buf, 2); - if (!len) /* the NT way */ - { - ok(GetLastError() == (i ? ERROR_MORE_DATA : ERROR_INVALID_PARAMETER) || - GetLastError() == 0xdeadbeef, /* the Win 9x way */ - "wrong error conditions %u for %u\n", GetLastError(), i); - } - else /* the Win 9x way */ - { - ok(GetLastError() == 0xdeadbeef, - "wrong error conditions %u for %u\n", GetLastError(), i); - } + ok(!len, "bad length %d\n", len); + ok(GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INVALID_PARAMETER, + "wrong error conditions %u for %u\n", GetLastError(), i); } memset( buf, '.', sizeof(buf) ); len = GlobalGetAtomNameA( atom, buf, 6 ); - ok( len == 0 || - len == 5, /* win9x */ - "bad length %d\n", len ); + ok( len == 0, "bad length %d\n", len ); ok( !memcmp( buf, "fooba\0....", 10 ), "bad buffer contents\n"); if (unicode_OS) { @@ -238,14 +228,8 @@ static void test_get_atom_name(void) memset(out, '.', sizeof(out)); SetLastError(0xdeadbeef); len = GlobalGetAtomNameA(atom, out, 10); - if (!len) /* the NT way */ - { - ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%u instead of %u)\n", GetLastError(), ERROR_MORE_DATA); - } - else /* the Win9x way */ - { - ok(GetLastError() == 0xdeadbeef, "wrong error code (%u instead of %u)\n", GetLastError(), 0xdeadbeef); - } + ok(!len, "bad length %d\n", len); + ok(GetLastError() == ERROR_MORE_DATA, "wrong error code (%u instead of %u)\n", GetLastError(), ERROR_MORE_DATA); for (i = 0; i < 9; i++) { ok(out[i] == "abcdefghij"[i % 10], "wrong string at %i (%c instead of %c)\n", i, out[i], "abcdefghij"[i % 10]); @@ -487,13 +471,11 @@ static void test_local_get_atom_name(void) /* ERROR_MORE_DATA is on nt3.51 sp5 */ if (i) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER || - GetLastError() == ERROR_MORE_DATA || - GetLastError() == 0xdeadbeef, /* the Win 9x way */ + GetLastError() == ERROR_MORE_DATA, "wrong error conditions %u for %u\n", GetLastError(), i); else ok(GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_MORE_DATA || - GetLastError() == 0xdeadbeef, /* the Win 9x way */ + GetLastError() == ERROR_MORE_DATA, "wrong error conditions %u for %u\n", GetLastError(), i); } /* test string limits & overflow */ @@ -522,8 +504,7 @@ static void test_local_get_atom_name(void) /* ERROR_MORE_DATA is on nt3.51 sp5 */ ok(GetLastError() == ERROR_INVALID_PARAMETER || - GetLastError() == ERROR_MORE_DATA || - GetLastError() == 0xdeadbeef, /* the Win 9x way */ + GetLastError() == ERROR_MORE_DATA, "wrong error code (%u)\n", GetLastError()); if (unicode_OS) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 7f7b052..2094190 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -337,14 +337,12 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) */ ok(exit_code == STATUS_DEBUGGER_INACTIVE || broken(exit_code == STATUS_ACCESS_VIOLATION) || /* Intermittent Vista+ */ - broken(exit_code == 0xffffffff) || /* Win9x */ broken(exit_code == WAIT_ABANDONED), /* NT4, W2K */ "wrong exit code : %08x\n", exit_code); } else ok(exit_code == STATUS_ACCESS_VIOLATION || - broken(exit_code == WAIT_ABANDONED) || /* NT4, W2K, W2K3 */ - broken(exit_code == 0xffffffff), /* Win9x, WinME */ + broken(exit_code == WAIT_ABANDONED), /* NT4, W2K, W2K3 */ "wrong exit code : %08x\n", exit_code); CloseHandle(info.hProcess); @@ -478,10 +476,8 @@ static void test_ExitCode(void) crash_and_debug(hkey, test_exe, "dbg,none"); else skip("\"none\" debugger test needs user interaction\n"); - if (disposition == REG_CREATED_NEW_KEY) - win_skip("'dbg,event,order' test doesn't finish on Win9x/WinMe\n"); - else - crash_and_debug(hkey, test_exe, "dbg,event,order"); + ok(disposition == REG_OPENED_EXISTING_KEY, "expected REG_OPENED_EXISTING_KEY, got %d\n", disposition); + crash_and_debug(hkey, test_exe, "dbg,event,order"); crash_and_debug(hkey, test_exe, "dbg,attach,event,code2"); if (pDebugSetProcessKillOnExit) crash_and_debug(hkey, test_exe, "dbg,attach,event,nokill"); diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 72f33ae..e2a6c7e 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -149,16 +149,12 @@ static void test_mutex(void) SetLastError(0xdeadbeef); hOpened = OpenMutex(READ_CONTROL, FALSE, "WINETESTMUTEX"); ok(!hOpened, "OpenMutex succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_INVALID_NAME, /* win9x */ - "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); hOpened = OpenMutex(READ_CONTROL, FALSE, "winetestmutex"); ok(!hOpened, "OpenMutex succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_INVALID_NAME, /* win9x */ - "wrong error %u\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); hOpened = CreateMutex(NULL, FALSE, "WineTestMutex"); @@ -328,9 +324,7 @@ static void test_event(void) SetLastError(0xdeadbeef); handle2 = OpenEventA( EVENT_ALL_ACCESS, FALSE, __FILE__ ": TEST EVENT"); ok( !handle2, "OpenEvent succeeded\n"); - ok( GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_INVALID_NAME, /* win9x */ - "wrong error %u\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); CloseHandle( handle ); } @@ -366,9 +360,7 @@ static void test_semaphore(void) SetLastError(0xdeadbeef); handle2 = OpenSemaphoreA( SEMAPHORE_ALL_ACCESS, FALSE, __FILE__ ": TEST SEMAPHORE"); ok( !handle2, "OpenSemaphore succeeded\n"); - ok( GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_INVALID_NAME, /* win9x */ - "wrong error %u\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); CloseHandle( handle ); } @@ -938,11 +930,6 @@ static void test_WaitForSingleObject(void) DWORD ret; signaled = CreateEventW(NULL, TRUE, TRUE, NULL); - if(signaled == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("Handles work differently on win9x\n"); - return; - } nonsignaled = CreateEventW(NULL, TRUE, FALSE, NULL); invalid = (HANDLE) 0xdeadbee0;

1 0

Owen Rudge : comctl32: Fix incorrect use of border metrics.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 2d8ad31e22eaa41a15bae88030c5ef717f7cab9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d8ad31e22eaa41a15bae8803… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Aug 9 16:39:09 2011 +0100 comctl32: Fix incorrect use of border metrics. --- dlls/comctl32/toolbar.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d5778e3..fba9bce 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3066,8 +3066,8 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & WS_BORDER) { - cy += 2 * GetSystemMetrics(SM_CXBORDER); - cx += 2 * GetSystemMetrics(SM_CYBORDER); + cx += 2 * GetSystemMetrics(SM_CXBORDER); + cy += 2 * GetSystemMetrics(SM_CYBORDER); } SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags);

1 0

Ričardas Barkauskas : ddraw: Print IDirectDrawGammaControl interface reference count for easier debugging .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 68f3d21f0279aef932f620044751bf2f073c46af URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f3d21f0279aef932f620044… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 8 01:26:19 2011 +0300 ddraw: Print IDirectDrawGammaControl interface reference count for easier debugging. --- dlls/ddraw/main.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index f7713c5..37a125d 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -752,7 +752,7 @@ DestroyCallback(IDirectDrawSurface7 *surf, void *context) { IDirectDrawSurfaceImpl *Impl = impl_from_IDirectDrawSurface7(surf); - ULONG ref7, ref4, ref3, ref2, ref1, iface_count; + ULONG ref7, ref4, ref3, ref2, ref1, gamma_count, iface_count; ref7 = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ IDirectDrawSurface4_AddRef(&Impl->IDirectDrawSurface4_iface); @@ -763,8 +763,10 @@ DestroyCallback(IDirectDrawSurface7 *surf, ref2 = IDirectDrawSurface2_Release(&Impl->IDirectDrawSurface2_iface); IDirectDrawSurface_AddRef(&Impl->IDirectDrawSurface_iface); ref1 = IDirectDrawSurface_Release(&Impl->IDirectDrawSurface_iface); - WARN("Surface %p has an reference counts of 7: %u 4: %u 3: %u 2: %u 1: %u\n", - Impl, ref7, ref4, ref3, ref2, ref1); + IDirectDrawGammaControl_AddRef(&Impl->IDirectDrawGammaControl_iface); + gamma_count = IDirectDrawGammaControl_Release(&Impl->IDirectDrawGammaControl_iface); + WARN("Surface %p has an reference counts of 7: %u 4: %u 3: %u 2: %u 1: %u gamma: %u\n", + Impl, ref7, ref4, ref3, ref2, ref1, gamma_count); /* Skip surfaces which are attached somewhere or which are * part of a complex compound. They will get released when destroying

1 0

Ričardas Barkauskas : ddraw: Do not AddRef IDirectDraw7 iface in CreateSurface helper.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 5c8ad267572d36ed006e63e795f314fd3f382240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8ad267572d36ed006e63e79… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 8 01:26:08 2011 +0300 ddraw: Do not AddRef IDirectDraw7 iface in CreateSurface helper. --- dlls/ddraw/ddraw.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index daea1ca..fc0dd93 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3471,10 +3471,6 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, ddraw_create_gdi_swapchain(ddraw, object); } - /* Addref the ddraw interface to keep an reference for each surface */ - IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - object->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface; - /* Create a WineD3DTexture if a texture was requested */ if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) { @@ -3523,6 +3519,8 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * } *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -3563,7 +3561,6 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, } *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw4_AddRef(iface); impl->ifaceToRelease = (IUnknown *)iface; @@ -3606,7 +3603,6 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw3_AddRef(iface); impl->ifaceToRelease = (IUnknown *)iface; @@ -3649,7 +3645,6 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; return hr; @@ -3682,7 +3677,6 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; return hr;

1 0

Ričardas Barkauskas : ddraw: Don' t allow setting palette on non root surfaces.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: abf8728e1f2f966650eaa5528a1f593a6e1986bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf8728e1f2f966650eaa5528… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 8 01:26:00 2011 +0300 ddraw: Don't allow setting palette on non root surfaces. --- dlls/ddraw/surface.c | 5 +++++ dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2b06cb9..c6ae89b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4233,6 +4233,11 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir return DDERR_INVALIDPIXELFORMAT; } + if (!This->is_complex_root) + { + return DDERR_NOTONMIPMAPSUBLEVEL; + } + /* Find the old palette */ EnterCriticalSection(&ddraw_cs); hr = IDirectDrawSurface_GetPalette(iface, &oldPal); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 2197c64..685ed45 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3006,7 +3006,7 @@ static void DeviceLoadTest(void) ok(hr==DDERR_NOPALETTEATTACHED, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); hr = IDirectDrawSurface7_SetPalette(texture_levels[0][1], palettes[1]); - todo_wine ok(hr==DDERR_NOTONMIPMAPSUBLEVEL, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); + ok(hr==DDERR_NOTONMIPMAPSUBLEVEL, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); hr = IDirectDrawSurface7_SetPalette(texture_levels[1][0], palettes[2]); ok(hr==DD_OK, "IDirectDrawSurface7_SetPalette returned: %x\n", hr);

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011