September 2011 - Wine-Commits

Stefan Dösinger : ddraw: Remove crashing tests.
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: 252bead28027331c30887b331f55de2245d5d607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252bead28027331c30887b331… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 7 00:12:35 2011 +0200 ddraw: Remove crashing tests. --- dlls/ddraw/tests/ddrawmodes.c | 36 ------------------------------------ 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 61f07fe..81ff43e 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -104,13 +104,6 @@ static void releasedirectdraw(void) } } -static BOOL WINAPI crash_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, - LPSTR lpDriverName, LPVOID lpContext) -{ - *(volatile char*)0 = 2; - return TRUE; -} - static BOOL WINAPI test_nullcontext_callbackA(GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext) { @@ -147,19 +140,6 @@ static void test_DirectDrawEnumerateA(void) ret = pDirectDrawEnumerateA(NULL, NULL); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with invalid callback parameter. */ - ret = pDirectDrawEnumerateA((LPDDENUMCALLBACKA)0xdeadbeef, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - - if (pDirectDrawEnumerateExA) - { - /* Test with callback that crashes. */ - ret = pDirectDrawEnumerateA(crash_callbackA, NULL); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - } - else - win_skip("Test would crash on older ddraw\n"); - /* Test with valid callback parameter and NULL context parameter. */ trace("Calling DirectDrawEnumerateA with test_nullcontext_callbackA callback and NULL context.\n"); ret = pDirectDrawEnumerateA(test_nullcontext_callbackA, NULL); @@ -207,14 +187,6 @@ static void test_DirectDrawEnumerateW(void) ok(ret == DDERR_UNSUPPORTED, "Expected DDERR_UNSUPPORTED, got %d\n", ret); } -static BOOL WINAPI crash_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription, - LPSTR lpDriverName, LPVOID lpContext, - HMONITOR hm) -{ - *(volatile char*)0 = 2; - return TRUE; -} - static BOOL WINAPI test_nullcontext_callbackExA(GUID *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm) @@ -253,14 +225,6 @@ static void test_DirectDrawEnumerateExA(void) ret = pDirectDrawEnumerateExA(NULL, NULL, 0); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with invalid callback parameter. */ - ret = pDirectDrawEnumerateExA((LPDDENUMCALLBACKEXA)0xdeadbeef, NULL, 0); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - - /* Test with callback that crashes. */ - ret = pDirectDrawEnumerateExA(crash_callbackExA, NULL, 0); - ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret); - /* Test with valid callback parameter and invalid flags */ ret = pDirectDrawEnumerateExA(test_nullcontext_callbackExA, NULL, ~0); ok(ret == DDERR_INVALIDPARAMS, "Expected DDERR_INVALIDPARAMS, got %d\n", ret);

1 0

Henri Verbeet : ddraw: Set the swap effect to WINED3DSWAPEFFECT_COPY in ddraw_create_gdi_swapchain ().
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: 5824551d76770ad566734e6646168cbe760757bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5824551d76770ad566734e664… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:50 2011 +0200 ddraw: Set the swap effect to WINED3DSWAPEFFECT_COPY in ddraw_create_gdi_swapchain(). The actual swapchain implementation ignores the swap effect and always does a copy anyway, but this makes it consistent with ddraw_attach_d3d_device(). --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b44ac9f..038ad18 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2817,7 +2817,7 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); presentation_parameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) ? primary->surface_desc.dwBackBufferCount : 0; - presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_FLIP; + presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; presentation_parameters.hDeviceWindow = window; presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN);

1 0

Henri Verbeet : wined3d: Implement wined3d_surface_flip() as a blit.
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: 79c438b2f2d3db5edd066f124c6b1b1d7564de8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c438b2f2d3db5edd066f124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:48 2011 +0200 wined3d: Implement wined3d_surface_flip() as a blit. This allows us to actually take the "override" parameter into account. Plain back -> front flips will be detected in wined3d_surface_flip() and will still be handled by wined3d_swapchain_present(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 706c70a..633517d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3807,7 +3807,7 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINED3D_OK; } - return wined3d_swapchain_present(swapchain, NULL, NULL, swapchain->win_handle, NULL, 0); + return wined3d_surface_blt(surface, NULL, override, NULL, 0, NULL, WINED3DTEXF_POINT); } /* Do not call while under the GL lock. */

1 0

Henri Verbeet : ddraw: Only explicitly initialize non-zero fields in ddraw_create_gdi_swapchain() .
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: 582767ce456edcd989661a6fd71b54807ea87610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=582767ce456edcd989661a6fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 6 19:19:49 2011 +0200 ddraw: Only explicitly initialize non-zero fields in ddraw_create_gdi_swapchain(). Update ddraw_attach_d3d_device() for consistency. --- dlls/ddraw/ddraw.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f1d7b37..b44ac9f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2761,6 +2761,8 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac /* Store the future Render Target surface */ ddraw->d3d_target = primary; + memset(&localParameters, 0, sizeof(localParameters)); + /* Use the surface description for the device parameters, not the device * settings. The application might render to an offscreen surface. */ localParameters.BackBufferWidth = primary->surface_desc.dwWidth; @@ -2768,17 +2770,9 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac localParameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); localParameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) ? primary->surface_desc.dwBackBufferCount : 0; - localParameters.MultiSampleType = WINED3DMULTISAMPLE_NONE; - localParameters.MultiSampleQuality = 0; localParameters.SwapEffect = WINED3DSWAPEFFECT_COPY; localParameters.hDeviceWindow = window; localParameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - localParameters.EnableAutoDepthStencil = FALSE; - localParameters.AutoDepthStencilFormat = WINED3DFMT_UNKNOWN; - localParameters.Flags = 0; - localParameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; - localParameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; - localParameters.AutoRestoreDisplayMode = FALSE; /* Set this NOW, otherwise creating the depth stencil surface will cause a * recursive loop until ram or emulated video memory is full. */ @@ -2823,17 +2817,9 @@ static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSur presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&primary->surface_desc.u4.ddpfPixelFormat); presentation_parameters.BackBufferCount = (primary->surface_desc.dwFlags & DDSD_BACKBUFFERCOUNT) ? primary->surface_desc.dwBackBufferCount : 0; - presentation_parameters.MultiSampleType = WINED3DMULTISAMPLE_NONE; - presentation_parameters.MultiSampleQuality = 0; presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_FLIP; presentation_parameters.hDeviceWindow = window; presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); - presentation_parameters.EnableAutoDepthStencil = FALSE; /* Not on GDI swapchains */ - presentation_parameters.AutoDepthStencilFormat = 0; - presentation_parameters.Flags = 0; - presentation_parameters.FullScreen_RefreshRateInHz = WINED3DPRESENT_RATE_DEFAULT; - presentation_parameters.PresentationInterval = WINED3DPRESENT_INTERVAL_DEFAULT; - presentation_parameters.AutoRestoreDisplayMode = FALSE; ddraw->d3d_target = primary; hr = wined3d_device_init_gdi(ddraw->wined3d_device, &presentation_parameters);

1 0

Alistair Leslie-Hughes : msxml3: Correct Objsafe tests for older msxml3.
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: e108c2dbed783982132aa19fa3cfb8bb7fce230f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e108c2dbed783982132aa19fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 7 08:25:54 2011 +1000 msxml3: Correct Objsafe tests for older msxml3. --- dlls/msxml3/tests/domdoc.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 42b3b05..22fb3ae 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4458,10 +4458,10 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); ok_(__FILE__,line)(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER, "Expected INTERFACESAFE_FOR_UNTRUSTED_CALLER got %08x\n", enabled); - ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_CALLER) || + ok_(__FILE__,line)(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, - "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " - "got %08x\n", supported); + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " + "got %08x\n", supported); hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, INTERFACESAFE_FOR_UNTRUSTED_DATA, @@ -4469,12 +4469,13 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); - ok_(__FILE__,line)(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), - "expected INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA got %08x\n", enabled); - ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_DATA) || + ok_(__FILE__,line)(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) || + enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) got %08x\n", enabled); + ok_(__FILE__,line)(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " - "got %08x\n", supported); + "got %08x\n", supported); } static void test_XMLHTTP(void)

1 0

Stefan Dösinger : ddraw: Add tests for dwZBufferBitDepth and dwMipMapCount values.
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: 73f9dd1c30a0046ebd7be9934f8dc952bf7d4c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f9dd1c30a0046ebd7be9934… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 4 23:41:41 2011 +0200 ddraw: Add tests for dwZBufferBitDepth and dwMipMapCount values. --- dlls/ddraw/tests/dsurface.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a307579..6b23c70 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4137,7 +4137,7 @@ static void zbufferbitdepth_test(void) U2(ddsd).dwZBufferBitDepth); } -static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const char *name) +static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const char *name, DWORD z_bit_depth) { IDirectDrawSurface *surface; IDirectDrawSurface7 *surface7; @@ -4166,6 +4166,8 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const if (expect_pf) { ok(out.dwFlags & DDSD_PIXELFORMAT, "%s surface: Expected DDSD_PIXELFORMAT to be set\n", name); + ok(out2.dwFlags & DDSD_PIXELFORMAT, + "%s surface: Expected DDSD_PIXELFORMAT to be set in DDSURFACEDESC2\n", name); } else { @@ -4176,12 +4178,20 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const if (expect_zd) { ok(out.dwFlags & DDSD_ZBUFFERBITDEPTH, "%s surface: Expected DDSD_ZBUFFERBITDEPTH to be set\n", name); + ok(U2(out).dwZBufferBitDepth == z_bit_depth, "ZBufferBitDepth is %u, expected %u\n", + U2(out).dwZBufferBitDepth, z_bit_depth); ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), "%s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + /* dwMipMapCount and dwZBufferBitDepth share the same union */ + ok(U2(out2).dwMipMapCount == 0, "dwMipMapCount is %u, expected 0\n", U2(out2).dwMipMapCount); } else { ok(!(out.dwFlags & DDSD_ZBUFFERBITDEPTH), "%s surface: Expected DDSD_ZBUFFERBITDEPTH not to be set\n", name); + ok(U2(out).dwZBufferBitDepth == 0, "ZBufferBitDepth is %u, expected 0\n", U2(out).dwZBufferBitDepth); + ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), + "%s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + ok(U2(out2).dwMipMapCount == 0, "dwMipMapCount is %u, expected 0\n", U2(out2).dwMipMapCount); } reset_ddsd(&out); @@ -4208,6 +4218,11 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const ok(!(out.dwFlags & DDSD_PIXELFORMAT), "Lock %s surface: Expected DDSD_PIXELFORMAT not to be set\n", name); } + if (out.dwFlags & DDSD_ZBUFFERBITDEPTH) + ok(U2(out).dwZBufferBitDepth == z_bit_depth, "ZBufferBitDepth is %u, expected %u\n", + U2(out).dwZBufferBitDepth, z_bit_depth); + else + ok(U2(out).dwZBufferBitDepth == 0, "ZBufferBitDepth is %u, expected 0\n", U2(out).dwZBufferBitDepth); } hr = IDirectDrawSurface7_Lock(surface7, NULL, &out2, 0, NULL); @@ -4221,6 +4236,7 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const "Lock %s surface: Expected DDSD_PIXELFORMAT to be set in DDSURFACEDESC2\n", name); ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), "Lock %s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + ok(U2(out2).dwMipMapCount == 0, "dwMipMapCount is %u, expected 0\n", U2(out2).dwMipMapCount); } IDirectDrawSurface7_Release(surface7); @@ -4248,12 +4264,12 @@ static void pixelformat_flag_test(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - test_ddsd(&ddsd, TRUE, FALSE, "offscreen plain"); + test_ddsd(&ddsd, TRUE, FALSE, "offscreen plain", ~0U); reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - test_ddsd(&ddsd, TRUE, FALSE, "primary"); + test_ddsd(&ddsd, TRUE, FALSE, "primary", ~0U); reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_ZBUFFERBITDEPTH; @@ -4261,7 +4277,7 @@ static void pixelformat_flag_test(void) ddsd.dwHeight = 64; U2(ddsd).dwZBufferBitDepth = 16; ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - test_ddsd(&ddsd, FALSE, TRUE, "Z buffer"); + test_ddsd(&ddsd, FALSE, TRUE, "Z buffer", 16); } static void set_surface_desc_test(void)

1 0

Stefan Dösinger : ddraw: Convert DDSURFACEDESC2 in lock.
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: 029c5a6cf1785901d7f0591da2b54bf639220839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029c5a6cf1785901d7f0591da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 4 23:33:52 2011 +0200 ddraw: Convert DDSURFACEDESC2 in lock. --- dlls/ddraw/surface.c | 104 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 73 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index abe3eed..081d4e1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -875,18 +875,14 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac * For more details, see IWineD3DSurface::LockRect * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, +static HRESULT WINAPI surface_lock(IDirectDrawSurfaceImpl *This, RECT *Rect, DDSURFACEDESC2 *DDSD, DWORD Flags, HANDLE h) { - IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); WINED3DLOCKED_RECT LockedRect; HRESULT hr; - TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", - iface, wine_dbgstr_rect(Rect), DDSD, Flags, h); - - if(!DDSD) - return DDERR_INVALIDPARAMS; + TRACE("This %p, rect %s, surface_desc %p, flags %#x, h %p.\n", + This, wine_dbgstr_rect(Rect), DDSD, Flags, h); /* This->surface_desc.dwWidth and dwHeight are changeable, thus lock */ EnterCriticalSection(&ddraw_cs); @@ -897,14 +893,6 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, * for the supported values. The others are ignored by WineD3D */ - if(DDSD->dwSize != sizeof(DDSURFACEDESC) && - DDSD->dwSize != sizeof(DDSURFACEDESC2)) - { - WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDSD->dwSize); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; - } - /* Windows zeroes this if the rect is invalid */ DDSD->lpSurface = 0; @@ -954,6 +942,23 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, return DD_OK; } +static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, + RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE h) +{ + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", + iface, wine_dbgstr_rect(rect), surface_desc, flags, h); + + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + return surface_lock(This, rect, surface_desc, flags, h); +} + static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE h) { @@ -961,49 +966,86 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + return surface_lock(This, rect, surface_desc, flags, h); } static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); + DDSURFACEDESC2 surface_desc2; + HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and - * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member */ - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, (DDSURFACEDESC2 *)surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + + surface_desc2.dwSize = surface_desc->dwSize; + hr = surface_lock(This, rect, &surface_desc2, flags, h); + DDSD2_to_DDSD(&surface_desc2, surface_desc); + surface_desc->dwSize = surface_desc2.dwSize; + return hr; } static HRESULT WINAPI ddraw_surface2_Lock(IDirectDrawSurface2 *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface2(iface); + DDSURFACEDESC2 surface_desc2; + HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and - * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member - * - * TODO: Test DDSD_ZBUFFERBITDEPTH behavior */ - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, (DDSURFACEDESC2 *)surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + + surface_desc2.dwSize = surface_desc->dwSize; + hr = surface_lock(This, rect, &surface_desc2, flags, h); + DDSD2_to_DDSD(&surface_desc2, surface_desc); + surface_desc->dwSize = surface_desc2.dwSize; + return hr; } static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface(iface); + DDSURFACEDESC2 surface_desc2; + HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and - * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member */ - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, (DDSURFACEDESC2 *)surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + + surface_desc2.dwSize = surface_desc->dwSize; + hr = surface_lock(This, rect, &surface_desc2, flags, h); + DDSD2_to_DDSD(&surface_desc2, surface_desc); + surface_desc->dwSize = surface_desc2.dwSize; + return hr; } /*****************************************************************************

1 0

Stefan Dösinger : ddraw: Check the alignment, not the size.
by Alexandre Julliard Sept. 7, 2011

Sept. 7, 2011

Module: wine Branch: master Commit: d6f17d686debb491d7213f973453659d6ffa76d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f17d686debb491d7213f973… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 17:18:09 2011 +0200 ddraw: Check the alignment, not the size. --- dlls/ddraw/tests/overlay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/overlay.c b/dlls/ddraw/tests/overlay.c index 5053efb..9660d74 100644 --- a/dlls/ddraw/tests/overlay.c +++ b/dlls/ddraw/tests/overlay.c @@ -215,7 +215,7 @@ static void yv12_test(void) ok(desc.dwWidth == 256 && desc.dwHeight == 256, "Expected size 256x256, got %ux%u\n", desc.dwWidth, desc.dwHeight); /* The overlay pitch seems to have 256 byte alignment */ - ok(U1(desc).lPitch == 256, "Unexpected pitch %u, expected 256\n", U1(desc).lPitch); + ok((U1(desc).lPitch & 0xff) == 0, "Expected 256 byte aligned pitch, got %u\n", U1(desc).lPitch); hr = IDirectDrawSurface7_Unlock(surface, NULL); ok(hr == DD_OK, "IDirectDrawSurface7_Unlock returned 0x%08x, expected DD_OK\n", hr);

1 0

Alexandre Julliard : gdi32: Add RLE support in SetDIBitsToDevice.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 6ae21b934595dd286aa3a0a088650ad88e7a671e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae21b934595dd286aa3a0a08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 14:36:27 2011 +0200 gdi32: Add RLE support in SetDIBitsToDevice. --- dlls/gdi32/dib.c | 66 +++++++++---- dlls/gdi32/tests/bitmap.c | 222 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ae21b934595dd286aa3a…

1 0

Alexandre Julliard : widl: Don' t output stubs for interfaces included in a typelib.
by Alexandre Julliard Sept. 6, 2011

Sept. 6, 2011

Module: wine Branch: master Commit: 8e15db40a8ba15f7e43196a9a683fc5cb3595e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e15db40a8ba15f7e43196a9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 6 15:42:16 2011 +0200 widl: Don't output stubs for interfaces included in a typelib. --- tools/widl/client.c | 2 -- tools/widl/header.c | 2 -- tools/widl/proxy.c | 15 +++------------ tools/widl/server.c | 4 +--- tools/widl/typegen.c | 16 ++-------------- 5 files changed, 6 insertions(+), 33 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index be42b1b..5c83588 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -472,8 +472,6 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou write_stubdescriptor(iface, expr_eval_routines); } } - else if (stmt->type == STMT_LIBRARY) - write_client_ifaces(stmt->u.lib->stmts, expr_eval_routines, proc_offset); } } diff --git a/tools/widl/header.c b/tools/widl/header.c index 9d20a3e..579ef5c 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -987,8 +987,6 @@ static void write_local_stubs_stmts(FILE *local_stubs, const statement_list_t *s { if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) write_locals(local_stubs, stmt->u.type, TRUE); - else if (stmt->type == STMT_LIBRARY) - write_local_stubs_stmts(local_stubs, stmt->u.lib->stmts); } } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 699e073..33ffbd3 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -754,12 +754,7 @@ static int does_any_iface(const statement_list_t *stmts, type_pred_t pred) if (stmts) LIST_FOR_EACH_ENTRY(stmt, stmts, const statement_t, entry) { - if (stmt->type == STMT_LIBRARY) - { - if (does_any_iface(stmt->u.lib->stmts, pred)) - return TRUE; - } - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { if (pred(stmt->u.type)) return TRUE; @@ -834,9 +829,7 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_ const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - write_proxy_stmts(stmt->u.lib->stmts, proc_offset); - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { if (need_proxy(stmt->u.type)) write_proxy(stmt->u.type, proc_offset); @@ -860,9 +853,7 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[], if (!stmts) return; LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - build_iface_list(stmt->u.lib->stmts, ifaces, count); - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; if (type_iface_get_inherit(iface) && need_proxy(iface)) diff --git a/tools/widl/server.c b/tools/widl/server.c index 3a8810e..7f817b0 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -463,9 +463,7 @@ static void write_server_stmts(const statement_list_t *stmts, int expr_eval_rout const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { - if (stmt->type == STMT_LIBRARY) - write_server_stmts(stmt->u.lib->stmts, expr_eval_routines, proc_offset); - else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) + if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE) { type_t *iface = stmt->u.type; if (!need_stub(iface)) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index dfc5a50..5a22525 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1488,8 +1488,6 @@ static void write_procformatstring_stmts(FILE *file, int indent, const statement write_procformatstring_func( file, indent, iface, func, offset, count++ ); } } - else if (stmt->type == STMT_LIBRARY) - write_procformatstring_stmts(file, indent, stmt->u.lib->stmts, pred, offset); } } @@ -3624,12 +3622,7 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, const type_t *iface; const statement_t *stmt_func; - if (stmt->type == STMT_LIBRARY) - { - process_tfs_stmts(file, stmt->u.lib->stmts, pred, typeformat_offset); - continue; - } - else if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) + if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) continue; iface = stmt->u.type; @@ -4510,12 +4503,7 @@ unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_ const type_t *iface; const statement_t *stmt_func; - if (stmt->type == STMT_LIBRARY) - { - size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1; - continue; - } - else if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) + if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE) continue; iface = stmt->u.type;

1 0