November 2015 - Wine-commits

Sebastian Lackner : kernel32/tests: Add tests for calling wait functions with pseudo handles.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: 46a208d6faf5668e88a98fc3a14733ba5e62efe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a208d6faf5668e88a98fc3a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 26 01:46:24 2015 +0100 kernel32/tests: Add tests for calling wait functions with pseudo handles. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 59 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 4ac6a99..525656a 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -59,6 +59,7 @@ static BOOLEAN (WINAPI *pTryAcquireSRWLockShared)(PSRWLOCK); static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_T *, ULONG, ULONG); static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); +static NTSTATUS (WINAPI *pNtWaitForSingleObject)(HANDLE, BOOLEAN, const LARGE_INTEGER *); static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); static void test_signalandwait(void) @@ -1075,6 +1076,8 @@ static HANDLE modify_handle(HANDLE handle, DWORD modify) static void test_WaitForSingleObject(void) { HANDLE signaled, nonsignaled, invalid; + LARGE_INTEGER timeout; + NTSTATUS status; DWORD ret; signaled = CreateEventW(NULL, TRUE, TRUE, NULL); @@ -1144,12 +1147,29 @@ static void test_WaitForSingleObject(void) ok(ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %d\n", GetLastError()); + /* pseudo handles are allowed in WaitForSingleObject and NtWaitForSingleObject */ + ret = WaitForSingleObject(GetCurrentProcess(), 100); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", ret); + + ret = WaitForSingleObject(GetCurrentThread(), 100); + ok(ret == WAIT_TIMEOUT, "expected WAIT_TIMEOUT, got %u\n", ret); + + timeout.QuadPart = -1000000; + status = pNtWaitForSingleObject(GetCurrentProcess(), FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "expected STATUS_TIMEOUT, got %08x\n", status); + + timeout.QuadPart = -1000000; + status = pNtWaitForSingleObject(GetCurrentThread(), FALSE, &timeout); + ok(status == STATUS_TIMEOUT, "expected STATUS_TIMEOUT, got %08x\n", status); + CloseHandle(signaled); CloseHandle(nonsignaled); } static void test_WaitForMultipleObjects(void) { + LARGE_INTEGER timeout; + NTSTATUS status; DWORD r; int i; HANDLE maxevents[MAXIMUM_WAIT_OBJECTS]; @@ -1180,20 +1200,46 @@ static void test_WaitForMultipleObjects(void) SetEvent(maxevents[i]); /* a manual-reset event remains signaled, an auto-reset event is cleared */ - r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); - ok( r == WAIT_OBJECT_0, "should signal lowest handle first, got %d\n", r); - r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); - ok( r == WAIT_OBJECT_0, "should signal handle #0 first, got %d\n", r); + status = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); + ok(status == STATUS_WAIT_0, "should signal lowest handle first, got %08x\n", status); + status = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); + ok(status == STATUS_WAIT_0, "should signal handle #0 first, got %08x\n", status); ok(ResetEvent(maxevents[0]), "ResetEvent\n"); for (i=1; i<MAXIMUM_WAIT_OBJECTS; i++) { /* the lowest index is checked first and remaining events are untouched */ - r = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); - ok( r == WAIT_OBJECT_0+i, "should signal handle #%d first, got %d\n", i, r); + status = pNtWaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, TRUE, FALSE, NULL); + ok(status == STATUS_WAIT_0 + i, "should signal handle #%d first, got %08x\n", i, status); } for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) if (maxevents[i]) CloseHandle(maxevents[i]); + + /* in contrast to WaitForSingleObject, pseudo handles are not allowed in + * WaitForMultipleObjects and NtWaitForMultipleObjects */ + maxevents[0] = GetCurrentProcess(); + SetLastError(0xdeadbeef); + r = WaitForMultipleObjects(1, maxevents, FALSE, 100); + todo_wine ok(r == WAIT_FAILED, "expected WAIT_FAILED, got %u\n", r); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, + "expected ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + + maxevents[0] = GetCurrentThread(); + SetLastError(0xdeadbeef); + r = WaitForMultipleObjects(1, maxevents, FALSE, 100); + todo_wine ok(r == WAIT_FAILED, "expected WAIT_FAILED, got %u\n", r); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, + "expected ERROR_INVALID_HANDLE, got %u\n", GetLastError()); + + timeout.QuadPart = -1000000; + maxevents[0] = GetCurrentProcess(); + status = pNtWaitForMultipleObjects(1, maxevents, TRUE, FALSE, &timeout); + todo_wine ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08x\n", status); + + timeout.QuadPart = -1000000; + maxevents[0] = GetCurrentThread(); + status = pNtWaitForMultipleObjects(1, maxevents, TRUE, FALSE, &timeout); + todo_wine ok(status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08x\n", status); } static BOOL g_initcallback_ret, g_initcallback_called; @@ -2526,6 +2572,7 @@ START_TEST(sync) pTryAcquireSRWLockShared = (void *)GetProcAddress(hdll, "TryAcquireSRWLockShared"); pNtAllocateVirtualMemory = (void *)GetProcAddress(hntdll, "NtAllocateVirtualMemory"); pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory"); + pNtWaitForSingleObject = (void *)GetProcAddress(hntdll, "NtWaitForSingleObject"); pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); argc = winetest_get_mainargs( &argv );

1 0

Sebastian Lackner : kernel32/tests: Avoid busy-looping in APC deadlock tests.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: 9f18d217a763d589a4b52198b88fb8fd9174b061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f18d217a763d589a4b52198b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 26 01:46:39 2015 +0100 kernel32/tests: Avoid busy-looping in APC deadlock tests. Spotted by Amine Khaldi. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 525656a..fc278f8 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2580,8 +2580,7 @@ START_TEST(sync) { if (!strcmp(argv[2], "apc_deadlock")) { - HANDLE handle = GetCurrentThread(); - for (;;) WaitForMultipleObjectsEx(1, &handle, FALSE, INFINITE, TRUE); + for (;;) SleepEx(INFINITE, TRUE); } return; }

1 0

Sebastian Lackner : gdi32: Add check for NULL pointer in dibdrv_wglDescribePixelFormat.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: a1790df348caa0318c132717ac572d1b10b76827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1790df348caa0318c132717a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 26 05:09:53 2015 +0100 gdi32: Add check for NULL pointer in dibdrv_wglDescribePixelFormat. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 3 ++- dlls/gdi32/tests/dc.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index a25da208..4133116 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -149,7 +149,8 @@ static int dibdrv_wglDescribePixelFormat( HDC hdc, int fmt, UINT size, PIXELFORM { int ret = sizeof(pixel_formats) / sizeof(pixel_formats[0]); - if (fmt <= 0 || fmt > ret) return ret; + if (!descr) return ret; + if (fmt <= 0 || fmt > ret) return 0; if (size < sizeof(*descr)) return 0; memset( descr, 0, sizeof(*descr) ); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index d215d9c..cb42219 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -630,11 +630,13 @@ static void test_CreateCompatibleDC(void) static void test_DC_bitmap(void) { + PIXELFORMATDESCRIPTOR descr; HDC hdc, hdcmem; DWORD bits[64]; HBITMAP hbmp, oldhbmp; COLORREF col; int i, bitspixel; + int ret, ret2; /* fill bitmap data with b&w pattern */ for( i = 0; i < 64; i++) bits[i] = i & 1 ? 0 : 0xffffff; @@ -645,7 +647,31 @@ static void test_DC_bitmap(void) /* create a memory dc */ hdcmem = CreateCompatibleDC( hdc); ok( hdcmem != NULL, "CreateCompatibleDC rets %p\n", hdcmem); - /* tests */ + + /* test DescribePixelFormat with descr == NULL */ + ret2 = DescribePixelFormat(hdcmem, 0, sizeof(descr), NULL); + ok(ret2 > 0, "expected ret2 > 0, got %d\n", ret2); + ret = DescribePixelFormat(hdcmem, 1, sizeof(descr), NULL); + ok(ret == ret2, "expected ret == %d, got %d\n", ret2, ret); + ret = DescribePixelFormat(hdcmem, 0x10000, sizeof(descr), NULL); + ok(ret == ret2, "expected ret == %d, got %d\n", ret2, ret); + + /* test DescribePixelFormat with descr != NULL */ + memset(&descr, 0, sizeof(descr)); + ret = DescribePixelFormat(hdcmem, 0, sizeof(descr), &descr); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(descr.nSize == 0, "expected descr.nSize == 0, got %d\n", descr.nSize); + + memset(&descr, 0, sizeof(descr)); + ret = DescribePixelFormat(hdcmem, 1, sizeof(descr), &descr); + ok(ret == ret2, "expected ret == %d, got %d\n", ret2, ret); + ok(descr.nSize == sizeof(descr), "expected desc.nSize == sizeof(descr), got %d\n", descr.nSize); + + memset(&descr, 0, sizeof(descr)); + ret = DescribePixelFormat(hdcmem, 0x10000, sizeof(descr), &descr); + ok(ret == 0, "expected ret == 0, got %d\n", ret); + ok(descr.nSize == 0, "expected descr.nSize == 0, got %d\n", descr.nSize); + /* test monochrome bitmap: should always work */ hbmp = CreateBitmap(32, 32, 1, 1, bits); ok( hbmp != NULL, "CreateBitmap returns %p\n", hbmp);

1 0

Jiaxing Wang : regedit: Need 3 bytes of room at end of buffer for \r\n\0 to avoid endless loop.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: ebacf05258bc5f8db39cc13275e254390569b63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebacf05258bc5f8db39cc1327… Author: Jiaxing Wang <hello.wjx(a)gmail.com> Date: Thu Nov 26 05:22:40 2015 +0100 regedit: Need 3 bytes of room at end of buffer for \r\n\0 to avoid endless loop. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 643b559..2d766de 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -641,7 +641,7 @@ static void processRegLinesA(FILE *in, char* first_chars) /* Do we need to expand the buffer ? */ assert (s >= line && s <= line + lineSize); size_remaining = lineSize - (s-line); - if (size_remaining < 2) /* room for 1 character and the \0 */ + if (size_remaining < 3) /* need at least 3 bytes of room for \r\n\0 */ { char *new_buffer; size_t new_size = lineSize + REG_VAL_BUF_SIZE;

1 0

Bruno Jesus : ws2_32/tests: Ensure we have more than one IP to test gethostbyname.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: a787321d622c4920e362310d825726c67d66a217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a787321d622c4920e362310d8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Nov 26 13:22:12 2015 +0800 ws2_32/tests: Ensure we have more than one IP to test gethostbyname. Sebastian called my attention about his machine that has a single IP and make test fails. In such cases it is safe to assume that the IP returned is the default route so the test is meaningless in this situation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3c66f7d..f483197 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4468,7 +4468,7 @@ static void test_gethostbyname(void) struct hostent *he; struct in_addr **addr_list; char name[256], first_ip[16]; - int ret, i; + int ret, i, count; PMIB_IPFORWARDTABLE routes = NULL; PIP_ADAPTER_INFO adapters = NULL, k; DWORD adap_size = 0, route_size = 0; @@ -4484,9 +4484,9 @@ static void test_gethostbyname(void) strcpy(first_ip, inet_ntoa(*addr_list[0])); trace("List of local IPs:\n"); - for(i = 0; addr_list[i] != NULL; i++) + for(count = 0; addr_list[count] != NULL; count++) { - char *ip = inet_ntoa(*addr_list[i]); + char *ip = inet_ntoa(*addr_list[count]); if (!strcmp(ip, "127.0.0.1")) local_ip = TRUE; trace("%s\n", ip); @@ -4494,7 +4494,7 @@ static void test_gethostbyname(void) if (local_ip) { - ok (i == 1, "expected 127.0.0.1 to be the only IP returned\n"); + ok (count == 1, "expected 127.0.0.1 to be the only IP returned\n"); skip("Only the loopback address is present, skipping tests\n"); return; } @@ -4518,6 +4518,13 @@ static void test_gethostbyname(void) ret = pGetIpForwardTable(routes, &route_size, FALSE); ok (ret == NO_ERROR, "GetIpForwardTable failed, error: %d\n", ret); + /* This test only has meaning if there is more than one IP configured */ + if (adapters->Next == NULL && count == 1) + { + skip("Only one IP is present, skipping tests\n"); + goto cleanup; + } + for (i = 0; !found_default && i < routes->dwNumEntries; i++) { /* default route (ip 0.0.0.0) ? */ @@ -4541,6 +4548,7 @@ static void test_gethostbyname(void) todo_wine ok (found_default, "failed to find the first IP from gethostbyname!\n"); +cleanup: HeapFree(GetProcessHeap(), 0, adapters); HeapFree(GetProcessHeap(), 0, routes); }

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: a58c4df5f53db7b354879f84106e22c3a412e383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58c4df5f53db7b354879f841… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 25 20:04:21 2015 -0700 po: Update Catalan translation. Includes suggestions from Jordi Mas of Softcatalà. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 436 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 205 insertions(+), 231 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a58c4df5f53db7b354879…

1 0

Dmitry Timoshkov : oleaut32: Grow the marshalling buffer exponentially.
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: 4a315cd78a3c97d76ae06e3185ab01a70eb9a1a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a315cd78a3c97d76ae06e318… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 26 14:52:03 2015 +0800 oleaut32: Grow the marshalling buffer exponentially. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tmarshal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index f4ce311..5fd1fdd 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -79,12 +79,14 @@ xbuf_resize(marshal_state *buf, DWORD newsize) if(buf->base) { + newsize = max(newsize, buf->size * 2); buf->base = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf->base, newsize); if(!buf->base) return E_OUTOFMEMORY; } else { + newsize = max(newsize, 256); buf->base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, newsize); if(!buf->base) return E_OUTOFMEMORY; @@ -100,7 +102,7 @@ xbuf_add(marshal_state *buf, const BYTE *stuff, DWORD size) if(buf->size - buf->curoff < size) { - hr = xbuf_resize(buf, buf->size + size + 100); + hr = xbuf_resize(buf, buf->size + size); if(FAILED(hr)) return hr; } memcpy(buf->base+buf->curoff,stuff,size);

1 0

Vincent Povirk : d3d9/tests: Accept CURSOR_SUPPRESSED in cursor flags.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 7578bca0c09f233e8f1582cc77dcfd0aa266ac10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7578bca0c09f233e8f1582cc7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 24 14:41:08 2015 -0600 d3d9/tests: Accept CURSOR_SUPPRESSED in cursor flags. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 326e789..6cdb225 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -22,6 +22,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #define COBJMACROS #include <d3d9.h> #include "wine/test.h" @@ -1657,7 +1658,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ @@ -1671,7 +1672,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); - ok(info.flags & CURSOR_SHOWING, "The gdi cursor is hidden (%08x)\n", info.flags); + ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); refcount = IDirect3DDevice9_Release(device);

1 0

Stefan Dösinger : include: Add DXGI_SWAP_EFFECT_FLIP_DISCARD.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: e990d94dba96aecc584eaf657c0e10821a50f66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e990d94dba96aecc584eaf657… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:44 2015 +0100 include: Add DXGI_SWAP_EFFECT_FLIP_DISCARD. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index dd16309..cc98970 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -69,7 +69,8 @@ const UINT DXGI_ENUM_MODES_SCALING = 2; typedef enum DXGI_SWAP_EFFECT { DXGI_SWAP_EFFECT_DISCARD = 0, DXGI_SWAP_EFFECT_SEQUENTIAL = 1, - DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3 + DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3, + DXGI_SWAP_EFFECT_FLIP_DISCARD = 4 } DXGI_SWAP_EFFECT; typedef enum DXGI_RESIDENCY {

1 0

Stefan Dösinger : dxgi/tests: Test DXGI_SWAP_EFFECT_FLIP_DISCARD.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: a971d4f2f67f3271e3fe331f32eee2241c2691bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a971d4f2f67f3271e3fe331f3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 24 22:18:45 2015 +0100 dxgi/tests: Test DXGI_SWAP_EFFECT_FLIP_DISCARD. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 1 + dlls/dxgi/tests/device.c | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 2e0d5ab..5da45f3 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -201,6 +201,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa min_buffer_count = 1; break; + case DXGI_SWAP_EFFECT_FLIP_DISCARD: case DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL: min_buffer_count = 2; break; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index f5480de..522d5de 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1077,15 +1077,20 @@ static void test_swapchain_parameters(void) {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, - {TRUE, 0, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 1, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 2, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, @@ -1101,15 +1106,23 @@ static void test_swapchain_parameters(void) {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, - {FALSE, 0, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 1, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 2, 4 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + /* The following test fails on Nvidia with E_OUTOFMEMORY and leaks device references in the + * process. Disable it for now. + {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + */ {FALSE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, }; if (!(device = create_device()))

1 0