wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

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

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

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

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

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 : 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

Nikolay Sivov : winex11: Simplify XGetWindowProperty return code checks ( Clang).
by Alexandre Julliard 26 Nov '15

26 Nov '15

Module: wine Branch: master Commit: a6a20ccc3c9ae7d9a8cef84639cb98a5c9b0410f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6a20ccc3c9ae7d9a8cef8463… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 26 00:28:53 2015 +0300 winex11: Simplify XGetWindowProperty return code checks (Clang). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 842ebfe..5dc5e3c 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2448,7 +2448,7 @@ static int X11DRV_CLIPBOARD_QueryAvailableData(Display *display) /* Read the TARGETS property contents */ if (!XGetWindowProperty(display, xe.xselection.requestor, xe.xselection.property, 0, 0x3FFF, True, AnyPropertyType/*XA_ATOM*/, &atype, &aformat, &cSelectionTargets, - &remain, (unsigned char**)&targetList) != Success) + &remain, (unsigned char**)&targetList)) { TRACE("Type %lx,Format %d,nItems %ld, Remain %ld\n", atype, aformat, cSelectionTargets, remain); @@ -2583,7 +2583,7 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, for (;;) { if (XGetWindowProperty(display, w, prop, pos, INT_MAX / 4, False, - AnyPropertyType, atype, &aformat, &nitems, &remain, &buffer) != Success) + AnyPropertyType, atype, &aformat, &nitems, &remain, &buffer)) { WARN("Failed to read property\n"); HeapFree( GetProcessHeap(), 0, val ); @@ -3354,7 +3354,7 @@ static Atom X11DRV_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent if (!XGetWindowProperty(display, pevent->requestor, rprop, 0, 0x3FFF, False, AnyPropertyType, &atype,&aformat, &cTargetPropList, &remain, - (unsigned char**)&targetPropList) != Success) + (unsigned char**)&targetPropList)) { if (TRACE_ON(clipboard)) {

1 0

Jacek Caban : wininet: Improved debug traces.
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 6790d825d1b2c41de73ffe5cb5df28c1d1cc8878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6790d825d1b2c41de73ffe5cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 25 15:11:48 2015 +0100 wininet: Improved debug traces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/ftp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 8944c5c..96cbb5b 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2309,7 +2309,7 @@ BOOL WINAPI FtpCommandW( HINTERNET hConnect, BOOL fExpectResponse, DWORD dwFlags strcat(cmd, szCRLF); len--; - TRACE("Sending (%s) len(%d)\n", cmd, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(cmd), len); while ((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(lpwfs->sndSocket, cmd + nBytesSent, len - nBytesSent, 0); @@ -2728,7 +2728,7 @@ static BOOL FTP_SendCommandA(INT nSocket, FTP_COMMAND ftpCmd, LPCSTR lpszParam, sprintf(buf, "%s%s%s%s", szFtpCommands[ftpCmd], dwParamLen ? " " : "", dwParamLen ? lpszParam : "", szCRLF); - TRACE("Sending (%s) len(%d)\n", buf, len); + TRACE("Sending (%s) len(%d)\n", debugstr_a(buf), len); while((nBytesSent < len) && (nRC != -1)) { nRC = sock_send(nSocket, buf+nBytesSent, len - nBytesSent, 0);

1 0

Alistair Leslie-Hughes : d3d10core/tests: Add test for NULL blend factor in OMSetBlendState().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: 5269fdce2c6174dc93a86b14a3ec5a837a68e800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5269fdce2c6174dc93a86b14a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 25 13:39:56 2015 +1100 d3d10core/tests: Add test for NULL blend factor in OMSetBlendState(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index bec3763..d25600e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2223,6 +2223,7 @@ float4 main(float4 color : COLOR) : SV_TARGET D3D10_BUFFER_DESC buffer_desc; D3D10_BLEND_DESC blend_desc; ID3D10Texture2D *ds_texture; + float tmp_blend_factor[4]; float blend_factor[4]; ID3D10Device *device; BOOL predicate_value; @@ -2559,7 +2560,30 @@ float4 main(float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePredicate(device, &predicate_desc, &predicate); ok(SUCCEEDED(hr), "Failed to create predicate, hr %#x.\n", hr); + /* Verify the behavior of set state methods. */ + + blend_factor[0] = 0.1f; + blend_factor[1] = 0.2f; + blend_factor[2] = 0.3f; + blend_factor[3] = 0.4f; + ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10BlendState_Release(tmp_blend_state); + + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); + ok(tmp_blend_factor[0] == 1.0f && tmp_blend_factor[1] == 1.0f + && tmp_blend_factor[2] == 1.0f && tmp_blend_factor[3] == 1.0f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10BlendState_Release(tmp_blend_state); + /* Setup state. */ + ID3D10Device_VSSetConstantBuffers(device, 0, D3D10_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT, cb); ID3D10Device_VSSetShaderResources(device, 0, D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT, srv); ID3D10Device_VSSetSamplers(device, 0, D3D10_COMMONSHADER_SAMPLER_SLOT_COUNT, sampler);

1 0

Alistair Leslie-Hughes : d3d11: Make blend_factor optional in d3d11_immediate_context_OMSetBlendState().
by Alexandre Julliard 25 Nov '15

25 Nov '15

Module: wine Branch: master Commit: e7de17fce8e55a72d6e2e0dbc30e2b0916f3897a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7de17fce8e55a72d6e2e0dbc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 25 14:44:32 2015 +0100 d3d11: Make blend_factor optional in d3d11_immediate_context_OMSetBlendState(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f9d7c9e..b1f56c3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -606,10 +606,14 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi ID3D11BlendState *blend_state, const FLOAT blend_factor[4], UINT sample_mask) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + static const float default_blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; const D3D11_BLEND_DESC *desc; - TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", + iface, blend_state, blend_factor, sample_mask); + + if (!blend_factor) + blend_factor = default_blend_factor; if (blend_factor[0] != 1.0f || blend_factor[1] != 1.0f || blend_factor[2] != 1.0f || blend_factor[3] != 1.0f) FIXME("Ignoring blend factor {%.8e %.8e %.8e %.8e}.\n", @@ -3063,8 +3067,8 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface, struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_blend_state *blend_state_object; - TRACE("iface %p, blend_state %p, blend_factor {%.8e %.8e %.8e %.8e}, sample_mask 0x%08x.\n", - iface, blend_state, blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3], sample_mask); + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask 0x%08x.\n", + iface, blend_state, blend_factor, sample_mask); blend_state_object = unsafe_impl_from_ID3D10BlendState(blend_state); d3d11_immediate_context_OMSetBlendState(&device->immediate_context.ID3D11DeviceContext_iface,

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015