December 2013 - Wine-commits

Ken Thomases : dbghelp: Fix some parameter names and types in the Mach-O support.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 3fe34fe34693d35822acee2c6ce154b1cffb3588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe34fe34693d35822acee2c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Dec 2 21:04:02 2013 -0600 dbghelp: Fix some parameter names and types in the Mach-O support. --- dlls/dbghelp/macho_module.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 1aaa7f1..5da31aa 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1023,7 +1023,7 @@ leave: * macho_load_file_from_path * Tries to load a Mach-O file from a set of paths (separated by ':') */ -static BOOL macho_load_file_from_path(HANDLE hProcess, +static BOOL macho_load_file_from_path(struct process* pcs, const WCHAR* filename, unsigned long load_addr, const char* path, @@ -1034,7 +1034,7 @@ static BOOL macho_load_file_from_path(HANDLE hProcess, WCHAR* pathW = NULL; unsigned len; - TRACE("(%p, %s, 0x%08lx, %s, %p)\n", hProcess, debugstr_w(filename), load_addr, + TRACE("(%p/%p, %s, 0x%08lx, %s, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, debugstr_a(path), macho_info); if (!path) return FALSE; @@ -1053,7 +1053,7 @@ static BOOL macho_load_file_from_path(HANDLE hProcess, strcpyW(fn, s); strcatW(fn, S_SlashW); strcatW(fn, filename); - ret = macho_load_file(hProcess, fn, load_addr, macho_info); + ret = macho_load_file(pcs, fn, load_addr, macho_info); HeapFree(GetProcessHeap(), 0, fn); if (ret) break; s = (t) ? (t+1) : NULL; @@ -1069,7 +1069,7 @@ static BOOL macho_load_file_from_path(HANDLE hProcess, * * Tries to load a Mach-O file from the dll path */ -static BOOL macho_load_file_from_dll_path(HANDLE hProcess, +static BOOL macho_load_file_from_dll_path(struct process* pcs, const WCHAR* filename, unsigned long load_addr, struct macho_info* macho_info) @@ -1078,7 +1078,7 @@ static BOOL macho_load_file_from_dll_path(HANDLE hProcess, unsigned int index = 0; const char *path; - TRACE("(%p, %s, 0x%08lx, %p)\n", hProcess, debugstr_w(filename), load_addr, + TRACE("(%p/%p, %s, 0x%08lx, %p)\n", pcs, pcs->handle, debugstr_w(filename), load_addr, macho_info); while (!ret && (path = wine_dll_enum_load_path( index++ ))) @@ -1095,7 +1095,7 @@ static BOOL macho_load_file_from_dll_path(HANDLE hProcess, MultiByteToWideChar(CP_UNIXCP, 0, path, -1, name, len); strcatW( name, S_SlashW ); strcatW( name, filename ); - ret = macho_load_file(hProcess, name, load_addr, macho_info); + ret = macho_load_file(pcs, name, load_addr, macho_info); HeapFree( GetProcessHeap(), 0, name ); } TRACE(" => %d\n", ret);

1 0

Ken Thomases : dbghelp: Add debug logging to some error paths in the Mach-O support.
by Alexandre Julliard 03 Dec '13

03 Dec '13

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/tests: Add a surface flipping test.
by Alexandre Julliard 03 Dec '13

03 Dec '13

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

Henri Verbeet : ddraw: Only set DDSCAPS_PRIMARYSURFACE on the root surface.
by Alexandre Julliard 03 Dec '13

03 Dec '13

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

Henri Verbeet : ddraw: Only set DDSCAPS_VISIBLE on the root surface.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 76420a2441d9a0daea1c6dca561b8bc084e09022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76420a2441d9a0daea1c6dca5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 09:59:17 2013 +0100 ddraw: Only set DDSCAPS_VISIBLE on the root surface. --- dlls/ddraw/surface.c | 3 ++- 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, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ebc143b..26e2648 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5979,7 +5979,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ /* Only one surface in the flipping chain is a back buffer, one is * a front buffer, the others are just flippable surfaces. */ - desc->ddsCaps.dwCaps &= ~(DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER | DDSCAPS_BACKBUFFER); + desc->ddsCaps.dwCaps &= ~(DDSCAPS_VISIBLE | DDSCAPS_PRIMARYSURFACE | DDSCAPS_FRONTBUFFER + | DDSCAPS_BACKBUFFER); if (!i) desc->ddsCaps.dwCaps |= DDSCAPS_BACKBUFFER; desc->dwBackBufferCount = 0; diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e3ef214..7dac193 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -3583,7 +3583,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer1, &caps, &backbuffer2); @@ -3592,7 +3592,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer2, &caps, &backbuffer3); @@ -3601,7 +3601,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer3, &caps, &surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d85908d..c70b98c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4264,7 +4264,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer1, &caps, &backbuffer2); @@ -4273,7 +4273,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer2, &caps, &backbuffer3); @@ -4282,7 +4282,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface_GetAttachedSurface(backbuffer3, &caps, &surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b639f86..dc9a282 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4868,7 +4868,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface4_GetAttachedSurface(backbuffer1, &caps, &backbuffer2); @@ -4877,7 +4877,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface4_GetAttachedSurface(backbuffer2, &caps, &backbuffer3); @@ -4886,7 +4886,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface4_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface4_GetAttachedSurface(backbuffer3, &caps, &surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0c099a5..743c4a2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4755,7 +4755,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer1, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX | DDSCAPS_BACKBUFFER), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface7_GetAttachedSurface(backbuffer1, &caps, &backbuffer2); @@ -4764,7 +4764,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer2, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface7_GetAttachedSurface(backbuffer2, &caps, &backbuffer3); @@ -4773,7 +4773,7 @@ static void test_flip(void) surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface7_GetSurfaceDesc(backbuffer3, &surface_desc); ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - todo_wine ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), + ok((surface_desc.ddsCaps.dwCaps & ~placement) == (DDSCAPS_FLIP | DDSCAPS_COMPLEX), "Got unexpected caps %#x.\n", surface_desc.ddsCaps.dwCaps); hr = IDirectDrawSurface7_GetAttachedSurface(backbuffer3, &caps, &surface);

1 0

Henri Verbeet : ddraw: Only set DDSCAPS_FRONTBUFFER on flippable surfaces.
by Alexandre Julliard 03 Dec '13

03 Dec '13

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 03 Dec '13

03 Dec '13

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 03 Dec '13

03 Dec '13

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 : xcopy: Clarify a comment.
by Alexandre Julliard 03 Dec '13

03 Dec '13

Module: wine Branch: master Commit: 7892df6fac185235e44d3796160ee38d66f919b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7892df6fac185235e44d37961… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 2 16:16:17 2013 -0800 xcopy: Clarify a comment. --- programs/xcopy/xcopy.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index e424eea..7ff751c 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -778,9 +778,9 @@ static int XCOPY_ParseCommandLine(WCHAR *suppliedsource, BOOL isError = FALSE; memset(&st, 0x00, sizeof(st)); - /* Microsoft's xcopy's usage implies that the date - * format depends on the locale but that false. - * It is hardcoded to month-day-year + /* Microsoft xcopy's usage message implies that the date + * format depends on the locale, but that is false. + * It is hardcoded to month-day-year. */ st.wMonth = _wtol(pos); while (*pos && isdigit(*pos)) pos++;

1 0

Austin English : apphelp: Add a stub for ShimFlushCache.
by Alexandre Julliard 03 Dec '13

03 Dec '13

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