December 2013 - Wine-Commits

Henri Verbeet : ddraw: Only set DDSCAPS_PRIMARYSURFACE on the root surface.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 28efaec21f4420f98a7d2c78f6e5b6d0546ba154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28efaec21f4420f98a7d2c78f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 09:59:16 2013 +0100 ddraw: Only set DDSCAPS_PRIMARYSURFACE on the root surface. --- dlls/ddraw/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 37fd096..ebc143b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4722,7 +4722,7 @@ static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDir if(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) { /* For primary surfaces the tree is just a list, so the simpler scheme fits too */ - DDSCAPS2 caps2 = { DDSCAPS_PRIMARYSURFACE, 0, 0, 0 }; + DDSCAPS2 caps2 = { DDSCAPS_FLIP, 0, 0, 0 }; surf = This; while(1) @@ -5978,8 +5978,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ desc = &texture->surface_desc; /* Only one surface in the flipping chain is a back buffer, one is - * a front buffer, the others are just primary surfaces. */ - desc->ddsCaps.dwCaps &= ~(DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER); + * a front buffer, the others are just flippable surfaces. */ + desc->ddsCaps.dwCaps &= ~(DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER); if (!i) desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->dwBackBufferCount = 0;

1 0

Ken Thomases : dbghelp: Add debug logging to some error paths in the Mach-O support.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 15467577fc5cda2e31253f575c2f618c1d6a5bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15467577fc5cda2e31253f575… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:04:13 2013 -0600 dbghelp: Add debug logging to some error paths in the Mach-O support. --- dlls/dbghelp/macho_module.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 5da31aa..6d71168 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -30,6 +30,7 @@ #include <assert.h> #include <stdarg.h> +#include <errno.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif @@ -432,17 +433,32 @@ static BOOL macho_map_file(const WCHAR* filenameW, struct macho_file_map* fmap) RtlInitializeBitMap(&fmap->sect_is_code, fmap->sect_is_code_buff, MAX_SECT + 1); len = WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, NULL, 0, NULL, NULL); - if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; + if (!(filename = HeapAlloc(GetProcessHeap(), 0, len))) + { + WARN("failed to allocate filename buffer\n"); + return FALSE; + } WideCharToMultiByte(CP_UNIXCP, 0, filenameW, -1, filename, len, NULL, NULL); /* check that the file exists */ - if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) goto done; + if (stat(filename, &statbuf) == -1 || S_ISDIR(statbuf.st_mode)) + { + TRACE("stat() failed or %s is directory: %s\n", debugstr_a(filename), strerror(errno)); + goto done; + } /* Now open the file, so that we can mmap() it. */ - if ((fmap->fd = open(filename, O_RDONLY)) == -1) goto done; + if ((fmap->fd = open(filename, O_RDONLY)) == -1) + { + TRACE("failed to open file %s: %d\n", debugstr_a(filename), errno); + goto done; + } if (read(fmap->fd, &fat_header, sizeof(fat_header)) != sizeof(fat_header)) + { + TRACE("failed to read fat header: %d\n", errno); goto done; + } TRACE("... got possible fat header\n"); /* Fat header is always in big-endian order. */

1 0

Henri Verbeet : ddraw: Only set DDSCAPS_FRONTBUFFER on flippable surfaces.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 66c71baefecb7d13eb4c5dd3004d293f7592f859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c71baefecb7d13eb4c5dd30… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 09:59:18 2013 +0100 ddraw: Only set DDSCAPS_FRONTBUFFER on flippable surfaces. --- dlls/ddraw/surface.c | 34 ++++++++++++++++++---------------- dlls/ddraw/tests/dsurface.c | 30 +++++++++--------------------- 2 files changed, 27 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66c71baefecb7d13eb4c5…

1 0

Henri Verbeet : ddraw: Return the correct error in ddraw_surface7_Flip() when the surface is not flippable.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: e780ee581d9b2d47259651c4e7952768955a6b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e780ee581d9b2d47259651c4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 09:59:19 2013 +0100 ddraw: Return the correct error in ddraw_surface7_Flip() when the surface is not flippable. --- dlls/ddraw/surface.c | 4 +--- dlls/ddraw/tests/ddraw1.c | 6 +++--- dlls/ddraw/tests/ddraw2.c | 6 +++--- dlls/ddraw/tests/ddraw4.c | 6 +++--- dlls/ddraw/tests/ddraw7.c | 6 +++--- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 980b83a..8403a32 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1197,10 +1197,8 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra TRACE("iface %p, dst %p, flags %#x.\n", iface, DestOverride, Flags); - /* Flip has to be called from a front buffer - * What about overlay surfaces, AFAIK they can flip too? */ if (!(surface->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY))) - return DDERR_INVALIDOBJECT; /* Unchecked */ + return DDERR_NOTFLIPPABLE; wined3d_mutex_lock(); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7dac193..2d62ec6 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3625,11 +3625,11 @@ static void test_flip(void) hr = IDirectDrawSurface_Flip(primary, primary, DDFLIP_WAIT); todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(backbuffer1, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(backbuffer2, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(backbuffer3, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index c70b98c..bb07bea 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4306,11 +4306,11 @@ static void test_flip(void) hr = IDirectDrawSurface_Flip(primary, primary, DDFLIP_WAIT); todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(backbuffer1, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(backbuffer2, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface_Flip(backbuffer3, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index dc9a282..376d80e 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4910,11 +4910,11 @@ static void test_flip(void) hr = IDirectDrawSurface4_Flip(primary, primary, DDFLIP_WAIT); todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(backbuffer1, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(backbuffer2, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_Flip(backbuffer3, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 743c4a2..400a8bc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4797,11 +4797,11 @@ static void test_flip(void) hr = IDirectDrawSurface7_Flip(primary, primary, DDFLIP_WAIT); todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(backbuffer1, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(backbuffer2, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_Flip(backbuffer3, NULL, DDFLIP_WAIT); - todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); memset(&fx, 0, sizeof(fx)); fx.dwSize = sizeof(fx);

1 0

Frédéric Delanoy : rpcrt4: Use BOOL type where appropriate.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 47ed171aac8b9dd1ea4d6ee973e6fc2c6e9ae73d URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ed171aac8b9dd1ea4d6ee97… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 3 00:02:50 2013 +0100 rpcrt4: Use BOOL type where appropriate. --- dlls/rpcrt4/ndr_marshall.c | 66 ++++++++++++++++++++++---------------------- dlls/rpcrt4/rpcrt4_main.c | 5 ++- 2 files changed, 36 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47ed171aac8b9dd1ea4d6…

1 0

Austin English : apphelp: Add a stub for ShimFlushCache.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 58bb2608859488a618267a8ed904b61b182cbecb URL: http://source.winehq.org/git/wine.git/?a=commit;h=58bb2608859488a618267a8ed… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 2 15:58:46 2013 -0800 apphelp: Add a stub for ShimFlushCache. --- dlls/apphelp/apphelp.c | 7 +++++++ dlls/apphelp/apphelp.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/apphelp/apphelp.c b/dlls/apphelp/apphelp.c index a82bc94..e8fce78 100644 --- a/dlls/apphelp/apphelp.c +++ b/dlls/apphelp/apphelp.c @@ -74,3 +74,10 @@ BOOL WINAPI ApphelpCheckShellObject( REFCLSID clsid, BOOL shim, ULONGLONG *flags if (flags) *flags = 0; return TRUE; } + +BOOL WINAPI ShimFlushCache( HWND hwnd, HINSTANCE instance, LPCSTR cmdline, int cmd ) +{ + FIXME("stub: %p %p %s %u\n", hwnd, instance, debugstr_a(cmdline), cmd); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return TRUE; +} diff --git a/dlls/apphelp/apphelp.spec b/dlls/apphelp/apphelp.spec index 76af9ad..60d931c 100644 --- a/dlls/apphelp/apphelp.spec +++ b/dlls/apphelp/apphelp.spec @@ -164,4 +164,4 @@ @ stub SetPermLayers @ stub ShimDbgPrint @ stub ShimDumpCache -@ stub ShimFlushCache +@ stdcall ShimFlushCache(ptr ptr str long)

1 0

Stefan Dösinger : ddraw: SetSurfaceDesc accepts DDSD_CAPS with dwCaps=0.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: c15d89c803f8ac7f7052cec448d8e3a26f5a3205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15d89c803f8ac7f7052cec44… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:35 2013 +0100 ddraw: SetSurfaceDesc accepts DDSD_CAPS with dwCaps=0. --- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/ddraw2.c | 10 +++++++++- dlls/ddraw/tests/ddraw4.c | 13 ++++++++++++- dlls/ddraw/tests/ddraw7.c | 13 ++++++++++++- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index efa7f66..9966e50 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4264,7 +4264,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } - if (DDSD->dwFlags & DDSD_CAPS) + if ((DDSD->dwFlags & DDSD_CAPS) && DDSD->ddsCaps.dwCaps) { WARN("DDSD_CAPS is set, returning DDERR_INVALIDCAPS.\n"); return DDERR_INVALIDCAPS; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 154e1b2..ff03207 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4476,6 +4476,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); @@ -4485,7 +4486,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Setting DDSD_CAPS returned %#x.\n", hr); - /* TODO: The INVALIDCAPS return value suggests that some caps can be set. */ + /* dwCaps = 0 is allowed, but ignored. */ ddsd.dwFlags = DDSD_CAPS | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); @@ -4493,6 +4494,13 @@ static void test_set_surface_desc(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); + ddsd.ddsCaps.dwCaps = 0; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface3_GetSurfaceDesc(surface3, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 6012f73..cfc2ac4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5077,6 +5077,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); @@ -5086,7 +5088,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Setting DDSD_CAPS returned %#x.\n", hr); - /* TODO: The INVALIDCAPS return value suggests that some caps can be set. */ + /* dwCaps = 0 is allowed, but ignored. Caps2 can be anything and is ignored too. */ ddsd.dwFlags = DDSD_CAPS | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); @@ -5094,6 +5096,15 @@ static void test_set_surface_desc(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); + ddsd.ddsCaps.dwCaps = 0; + ddsd.ddsCaps.dwCaps2 = 0xdeadbeef; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 26bb82c..72e7f2e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4964,6 +4964,8 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the caps is an error. This also means the original description cannot be reapplied. */ hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); @@ -4973,7 +4975,7 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDPARAMS, "Setting DDSD_CAPS returned %#x.\n", hr); - /* TODO: The INVALIDCAPS return value suggests that some caps can be set. */ + /* dwCaps = 0 is allowed, but ignored. Caps2 can be anything and is ignored too. */ ddsd.dwFlags = DDSD_CAPS | DDSD_LPSURFACE; ddsd.lpSurface = data; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); @@ -4981,6 +4983,15 @@ static void test_set_surface_desc(void) ddsd.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY; hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); ok(hr == DDERR_INVALIDCAPS, "Setting DDSD_CAPS returned %#x.\n", hr); + ddsd.ddsCaps.dwCaps = 0; + ddsd.ddsCaps.dwCaps2 = 0xdeadbeef; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(ddsd.ddsCaps.dwCaps == DDSCAPS_SYSTEMMEMORY, "Got unexpected caps %#x.\n", ddsd.ddsCaps.dwCaps); + ok(ddsd.ddsCaps.dwCaps2 == 0, "Got unexpected caps2 %#x.\n", 0); /* Setting the height is allowed, but it cannot be set to 0, and only if LPSURFACE is set too. */ reset_ddsd(&ddsd);

1 0

Stefan Dösinger : ddraw: Check for lpSurface= NULL in SetSurfaceDesc.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: 5e43ee256c03e7703a91913192a54014acdec361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e43ee256c03e7703a9191319… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 3 13:44:36 2013 +0100 ddraw: Check for lpSurface=NULL in SetSurfaceDesc. --- dlls/ddraw/surface.c | 4 ++-- dlls/ddraw/tests/ddraw2.c | 4 ++++ dlls/ddraw/tests/ddraw4.c | 4 ++++ dlls/ddraw/tests/ddraw7.c | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9966e50..dcff746 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4259,9 +4259,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, WARN("Invalid flags (0x%08x) set, returning DDERR_INVALIDPARAMS\n", DDSD->dwFlags); return DDERR_INVALIDPARAMS; } - if (!(DDSD->dwFlags & DDSD_LPSURFACE)) + if (!(DDSD->dwFlags & DDSD_LPSURFACE) || !DDSD->lpSurface) { - WARN("DDSD_LPSURFACE is not set, returning DDERR_INVALIDPARAMS\n"); + WARN("DDSD_LPSURFACE is not set or lpSurface is NULL, returning DDERR_INVALIDPARAMS\n"); return DDERR_INVALIDPARAMS; } if ((DDSD->dwFlags & DDSD_CAPS) && DDSD->ddsCaps.dwCaps) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ff03207..209a473 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4471,6 +4471,10 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); + ddsd.lpSurface = NULL; + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Setting lpSurface=NULL returned %#x.\n", hr); + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, NULL, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with NULL desc returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index cfc2ac4..e7beb3f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5072,6 +5072,10 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); + ddsd.lpSurface = NULL; + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Setting lpSurface=NULL returned %#x.\n", hr); + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, NULL, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with NULL desc returned %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 72e7f2e..76ff437 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4959,6 +4959,10 @@ static void test_set_surface_desc(void) hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 1); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with flags=1 returned %#x.\n", hr); + ddsd.lpSurface = NULL; + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(hr == DDERR_INVALIDPARAMS, "Setting lpSurface=NULL returned %#x.\n", hr); + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, NULL, 0); ok(hr == DDERR_INVALIDPARAMS, "SetSurfaceDesc with NULL desc returned %#x.\n", hr);

1 0

Henri Verbeet : ddraw/tests: Add a surface flipping test.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: ebd5c2076c1bb805ac20d508ed03c8489e2813f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebd5c2076c1bb805ac20d508e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 09:59:15 2013 +0100 ddraw/tests: Add a surface flipping test. --- dlls/ddraw/tests/ddraw1.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 186 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 744 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebd5c2076c1bb805ac20d…

1 0

Ken Thomases : winemac: Include the OpenGL headers to fix building on OS X 10.9.
by Alexandre Julliard Dec. 3, 2013

Dec. 3, 2013

Module: wine Branch: master Commit: f0c4354a6bd0eeab094124f76987fa7de299c978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0c4354a6bd0eeab094124f76… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:02:28 2013 -0600 winemac: Include the OpenGL headers to fix building on OS X 10.9. --- dlls/winemac.drv/cocoa_opengl.m | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 13b9ea3..f546be5 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <OpenGL/gl.h> #import "cocoa_opengl.h" #include "macdrv_cocoa.h"

1 0