January 2017 - Wine-Commits

Jacek Caban : urlmon: Correctly handle INTERNET_STATUS_REQUEST_COMPLETE notification with no data available.
by Alexandre Julliard Jan. 19, 2017

Jan. 19, 2017

Module: wine Branch: master Commit: aa2ed7338793598c91716a79ba8b73ffc18d8200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa2ed7338793598c91716a79b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 12:34:37 2017 +0100 urlmon: Correctly handle INTERNET_STATUS_REQUEST_COMPLETE notification with no data available. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/protocol.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 1437152..abe8668 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -395,13 +395,7 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) if(res) { TRACE("available %u bytes\n", protocol->query_available); if(!protocol->query_available) { - if(is_start) { - TRACE("empty file\n"); - all_data_read(protocol); - }else { - WARN("unexpected end of file?\n"); - report_result(protocol, INET_E_DOWNLOAD_FAILURE); - } + all_data_read(protocol); return S_OK; } protocol->available_bytes = protocol->query_available;

1 0

Nikolay Sivov : uxtheme/tests: Some tests for buffered painting API.
by Alexandre Julliard Jan. 19, 2017

Jan. 19, 2017

Module: wine Branch: master Commit: e41747a7840ffbc4b7bc9dc163583f7c5cb62d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41747a7840ffbc4b7bc9dc16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 19 17:13:29 2017 +0300 uxtheme/tests: Some tests for buffered painting API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/Makefile.in | 2 +- dlls/uxtheme/tests/system.c | 141 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 139 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/tests/Makefile.in b/dlls/uxtheme/tests/Makefile.in index 5e6c272..42bdcfa 100644 --- a/dlls/uxtheme/tests/Makefile.in +++ b/dlls/uxtheme/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = uxtheme.dll -IMPORTS = user32 uxtheme +IMPORTS = user32 gdi32 uxtheme C_SRCS = \ system.c diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index d40679d..d7ba43c 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -27,13 +27,30 @@ #include "wine/test.h" static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); - -#define UXTHEME_GET_PROC(func) p ## func = (void*)GetProcAddress(hUxtheme, #func); +static HPAINTBUFFER (WINAPI *pBeginBufferedPaint)(HDC, const RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *); +static HRESULT (WINAPI *pBufferedPaintClear)(HPAINTBUFFER, const RECT *); +static HRESULT (WINAPI *pEndBufferedPaint)(HPAINTBUFFER, BOOL); +static HRESULT (WINAPI *pGetBufferedPaintBits)(HPAINTBUFFER, RGBQUAD **, int *); +static HDC (WINAPI *pGetBufferedPaintDC)(HPAINTBUFFER); +static HDC (WINAPI *pGetBufferedPaintTargetDC)(HPAINTBUFFER); +static HRESULT (WINAPI *pGetBufferedPaintTargetRect)(HPAINTBUFFER, RECT *); static void init_funcs(void) { HMODULE hUxtheme = GetModuleHandleA("uxtheme.dll"); - UXTHEME_GET_PROC(OpenThemeDataEx) + +#define UXTHEME_GET_PROC(func) p ## func = (void*)GetProcAddress(hUxtheme, #func) + UXTHEME_GET_PROC(BeginBufferedPaint); + UXTHEME_GET_PROC(BufferedPaintClear); + UXTHEME_GET_PROC(EndBufferedPaint); + UXTHEME_GET_PROC(GetBufferedPaintBits); + UXTHEME_GET_PROC(GetBufferedPaintDC); + UXTHEME_GET_PROC(GetBufferedPaintTargetDC); + UXTHEME_GET_PROC(GetBufferedPaintTargetRect); + UXTHEME_GET_PROC(BufferedPaintClear); + + UXTHEME_GET_PROC(OpenThemeDataEx); +#undef UXTHEME_GET_PROC } static void test_IsThemed(void) @@ -506,6 +523,122 @@ static void test_CloseThemeData(void) ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); } +static void test_buffered_paint(void) +{ + BP_PAINTPARAMS params = { 0 }; + BP_BUFFERFORMAT format; + HDC target, src, hdc; + HPAINTBUFFER buffer; + RECT rect, rect2; + HRESULT hr; + + if (!pBeginBufferedPaint) + { + win_skip("Buffered painting API is not supported.\n"); + return; + } + + buffer = pBeginBufferedPaint(NULL, NULL, BPBF_COMPATIBLEBITMAP, + NULL, NULL); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + target = CreateCompatibleDC(0); + buffer = pBeginBufferedPaint(target, NULL, BPBF_COMPATIBLEBITMAP, + NULL, NULL); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + params.cbSize = sizeof(params); + buffer = pBeginBufferedPaint(target, NULL, BPBF_COMPATIBLEBITMAP, + &params, NULL); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + buffer = pBeginBufferedPaint(target, NULL, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + /* target rect is mandatory */ + rect.left = rect.top = 0; + rect.right = rect.bottom = 0; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); + ok(buffer == NULL, "Unexpected buffer %p\n", buffer); + + rect.left = rect.top = 0; + rect.right = rect.bottom = 5; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); +todo_wine + ok(buffer != NULL, "Unexpected buffer %p\n", buffer); + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + + rect.left = rect.top = 0; + rect.right = rect.bottom = 5; + buffer = pBeginBufferedPaint(target, &rect, BPBF_COMPATIBLEBITMAP, + &params, &src); +todo_wine + ok(buffer != NULL, "Unexpected buffer %p\n", buffer); + + /* clearing */ + hr = pBufferedPaintClear(NULL, NULL); +todo_wine + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + + hr = pBufferedPaintClear(buffer, NULL); +todo_wine + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + + /* access buffer attributes */ + hdc = pGetBufferedPaintDC(buffer); +todo_wine + ok(hdc == src, "Unexpected hdc, %p, buffered dc %p\n", hdc, src); + + hdc = pGetBufferedPaintTargetDC(buffer); +todo_wine + ok(hdc == target, "Unexpected target hdc %p, original %p\n", hdc, target); + + hr = pGetBufferedPaintTargetRect(buffer, NULL); +todo_wine + ok(hr == E_POINTER, "Unexpected return code %#x\n", hr); + + SetRectEmpty(&rect2); + hr = pGetBufferedPaintTargetRect(buffer, &rect2); +todo_wine { + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + ok(EqualRect(&rect, &rect2), "Wrong target rect\n"); +} + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + + /* access buffer bits */ + for (format = BPBF_COMPATIBLEBITMAP; format <= BPBF_TOPDOWNMONODIB; format++) + { + RGBQUAD *bits; + int row; + + buffer = pBeginBufferedPaint(target, &rect, format, &params, &src); + + /* only works for DIB buffers */ + bits = NULL; + row = 0; + hr = pGetBufferedPaintBits(buffer, &bits, &row); +todo_wine { + if (format == BPBF_COMPATIBLEBITMAP) + ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); + else + { + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + ok(bits != NULL, "Bitmap bits %p\n", bits); + ok(row > 0, "Bitmap width %d\n", row); + } +} + hr = pEndBufferedPaint(buffer, FALSE); + ok(hr == S_OK, "Unexpected return code %#x\n", hr); + } + + DeleteDC(target); +} + START_TEST(system) { init_funcs(); @@ -541,4 +674,6 @@ START_TEST(system) /* CloseThemeData */ trace("Starting test_CloseThemeData()\n"); test_CloseThemeData(); + + test_buffered_paint(); }

1 0

Jacek Caban : kernel32/tests: Improved pipe CloseHandle tests.
by Alexandre Julliard Jan. 19, 2017

Jan. 19, 2017

Module: wine Branch: master Commit: 3ba2b5898cf9c78f81afc1fd620e5046a3392be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba2b5898cf9c78f81afc1fd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 19 18:17:15 2017 +0100 kernel32/tests: Improved pipe CloseHandle tests. Current tests suggest that SetNamedPipeHandleState between ReadFile calls makes a difference (and it doesn't). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index b9ac06c..33440bf 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -1473,6 +1473,11 @@ static void test_CloseHandle(void) todo_wine ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); + SetLastError(0xdeadbeef); + ret = ReadFile(hfile, buffer, 0, &numbytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + todo_wine ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + ret = GetNamedPipeHandleStateA(hfile, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); state = PIPE_READMODE_MESSAGE | PIPE_WAIT; @@ -1567,6 +1572,11 @@ static void test_CloseHandle(void) todo_wine ok(ret, "ReadFile failed with %u\n", GetLastError()); ok(numbytes == 0, "expected 0, got %u\n", numbytes); + SetLastError(0xdeadbeef); + ret = ReadFile(hpipe, buffer, 0, &numbytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_BROKEN_PIPE, "expected ERROR_BROKEN_PIPE, got %u\n", GetLastError()); + ret = GetNamedPipeHandleStateA(hpipe, &state, NULL, NULL, NULL, NULL, 0); ok(ret, "GetNamedPipeHandleState failed with %u\n", GetLastError()); state = PIPE_READMODE_MESSAGE | PIPE_WAIT;

1 0

André Hentschel : ntdll: Fix some spec file entries.
by Alexandre Julliard Jan. 19, 2017

Jan. 19, 2017

Module: wine Branch: master Commit: a8956794c15bf38b990d442ee59a8ab03efa0dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8956794c15bf38b990d442ee… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 19 15:55:59 2017 +0100 ntdll: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 8 ++++---- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 28aa2df..f38401d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -130,7 +130,7 @@ @ stdcall NtCreateDirectoryObject(long long long) @ stdcall NtCreateEvent(long long long long long) @ stub NtCreateEventPair -@ stdcall NtCreateFile(ptr long ptr ptr long long long ptr long long ptr) +@ stdcall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) @ stdcall NtCreateIoCompletion(ptr long ptr long) @ stdcall NtCreateJobObject(ptr long ptr) # @ stub NtCreateJobSet @@ -162,7 +162,7 @@ @ stdcall NtDeleteKey(long) # @ stub NtDeleteObjectAuditAlarm @ stdcall NtDeleteValueKey(long ptr) -@ stdcall NtDeviceIoControlFile(long long long long long long long long long long) +@ stdcall NtDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) @ stdcall NtDisplayString(ptr) @ stdcall NtDuplicateObject(long long long ptr long long long) @ stdcall NtDuplicateToken(long long long long long long) @@ -1056,7 +1056,7 @@ @ stdcall -private ZwCreateDirectoryObject(long long long) NtCreateDirectoryObject @ stdcall -private ZwCreateEvent(long long long long long) NtCreateEvent @ stub ZwCreateEventPair -@ stdcall -private ZwCreateFile(ptr long ptr ptr long long long ptr long long ptr) NtCreateFile +@ stdcall -private ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @ stdcall -private ZwCreateJobObject(ptr long ptr) NtCreateJobObject # @ stub ZwCreateJobSet @@ -1087,7 +1087,7 @@ @ stdcall -private ZwDeleteKey(long) NtDeleteKey # @ stub ZwDeleteObjectAuditAlarm @ stdcall -private ZwDeleteValueKey(long ptr) NtDeleteValueKey -@ stdcall -private ZwDeviceIoControlFile(long long long long long long long long long long) NtDeviceIoControlFile +@ stdcall -private ZwDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) NtDeviceIoControlFile @ stdcall -private ZwDisplayString(ptr) NtDisplayString @ stdcall -private ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject @ stdcall -private ZwDuplicateToken(long long long long long long) NtDuplicateToken diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index c004a96..40bf0d2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -742,11 +742,11 @@ @ stdcall NtClose(long) ntdll.NtClose @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) ntdll.NtConnectPort @ stdcall NtCreateEvent(long long long long long) ntdll.NtCreateEvent -@ stdcall NtCreateFile(ptr long ptr ptr long long long ptr long long ptr) ntdll.NtCreateFile +@ stdcall NtCreateFile(ptr long ptr ptr ptr long long long long ptr long) ntdll.NtCreateFile @ stdcall NtCreateSection(ptr long ptr ptr long long long) ntdll.NtCreateSection @ stdcall NtDeleteAtom(long) ntdll.NtDeleteAtom @ stdcall NtDeleteFile(ptr) ntdll.NtDeleteFile -@ stdcall NtDeviceIoControlFile(long long long long long long long long long long) ntdll.NtDeviceIoControlFile +@ stdcall NtDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) ntdll.NtDeviceIoControlFile @ stdcall NtDuplicateObject(long long long ptr long long long) ntdll.NtDuplicateObject @ stdcall NtDuplicateToken(long long long long long long) ntdll.NtDuplicateToken @ stdcall NtFindAtom(ptr long ptr) ntdll.NtFindAtom @@ -1292,7 +1292,7 @@ @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) ntdll.ZwConnectPort @ stdcall -private ZwCreateDirectoryObject(long long long) ntdll.ZwCreateDirectoryObject @ stdcall -private ZwCreateEvent(long long long long long) ntdll.ZwCreateEvent -@ stdcall -private ZwCreateFile(ptr long ptr ptr long long long ptr long long ptr) ntdll.ZwCreateFile +@ stdcall -private ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) ntdll.ZwCreateFile @ stdcall -private ZwCreateJobObject(ptr long ptr) ntdll.ZwCreateJobObject @ stdcall -private ZwCreateKey(ptr long ptr long ptr long long) ntdll.ZwCreateKey @ stdcall -private ZwCreateSection(ptr long ptr ptr long long long) ntdll.ZwCreateSection @@ -1302,7 +1302,7 @@ @ stdcall -private ZwDeleteFile(ptr) ntdll.ZwDeleteFile @ stdcall -private ZwDeleteKey(long) ntdll.ZwDeleteKey @ stdcall -private ZwDeleteValueKey(long ptr) ntdll.ZwDeleteValueKey -@ stdcall -private ZwDeviceIoControlFile(long long long long long long long long long long) ntdll.ZwDeviceIoControlFile +@ stdcall -private ZwDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) ntdll.ZwDeviceIoControlFile @ stdcall -private ZwDisplayString(ptr) ntdll.ZwDisplayString @ stdcall -private ZwDuplicateObject(long long long ptr long long long) ntdll.ZwDuplicateObject @ stdcall -private ZwDuplicateToken(long long long long long long) ntdll.ZwDuplicateToken

1 0

Austin English : ntoskrnl.exe: Forward RtlUnwindEx to ntdll.
by Alexandre Julliard Jan. 19, 2017

Jan. 19, 2017

Module: wine Branch: master Commit: 72a431e0efd67e89da16b8b470375ba09d84e803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a431e0efd67e89da16b8b47… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 18 17:47:09 2017 -0600 ntoskrnl.exe: Forward RtlUnwindEx to ntdll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 50c442a..c004a96 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1182,6 +1182,7 @@ @ stdcall RtlUnicodeToOemN(ptr long ptr ptr long) ntdll.RtlUnicodeToOemN @ stub RtlUnlockBootStatusData @ stdcall -register RtlUnwind(ptr ptr ptr ptr) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr) ntdll.RtlUnwindEx @ stdcall RtlUpcaseUnicodeChar(long) ntdll.RtlUpcaseUnicodeChar @ stdcall RtlUpcaseUnicodeString(ptr ptr long) ntdll.RtlUpcaseUnicodeString @ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long) ntdll.RtlUpcaseUnicodeStringToAnsiString

1 0

Huw Davies : msxml3/tests: Windows 10 no longer supports variants by reference, so pass it directly.
by Alexandre Julliard Jan. 18, 2017

Jan. 18, 2017

Module: wine Branch: master Commit: 5124eb99fea49ac83b16778d348e81510d1d4f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5124eb99fea49ac83b16778d3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 14:57:54 2017 +0000 msxml3/tests: Windows 10 no longer supports variants by reference, so pass it directly. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index b50b153..55ea8b6 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1433,7 +1433,7 @@ static void test_XMLHTTP(void) IXMLHttpRequest *xhr; IObjectWithSite *obj_site, *obj_site2; BSTR bstrResponse, str, str1; - VARIANT varbody, varbody_ref; + VARIANT varbody; VARIANT dummy; LONG state, status, bound; IDispatch *event; @@ -1619,12 +1619,11 @@ static void test_XMLHTTP(void) SysFreeString(bstrResponse); } - /* POST: VT_VARIANT|VT_BYREF body */ + /* POST: VT_VARIANT body */ + /* VT_VARIANT|VT_BYREF fails on Windows 10 */ test_open(xhr, "POST", urlA, S_OK); - V_VT(&varbody_ref) = VT_VARIANT|VT_BYREF; - V_VARIANTREF(&varbody_ref) = &varbody; - hr = IXMLHttpRequest_send(xhr, varbody_ref); + hr = IXMLHttpRequest_send(xhr, varbody); EXPECT_HR(hr, S_OK); /* GET request */

1 0

Henri Verbeet : wined3d: Add GPU information for AMD TONGA.
by Alexandre Julliard Jan. 18, 2017

Jan. 18, 2017

Module: wine Branch: master Commit: 332a6ff9169a852a1b5cc432dabba4bd98783a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=332a6ff9169a852a1b5cc432d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 13:48:35 2017 +0100 wined3d: Add GPU information for AMD TONGA. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 22e0fee..6247404 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1374,7 +1374,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD8770, "AMD Radeon HD 8770", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R3, "AMD Radeon HD 8400 / R3 Series", DRIVER_AMD_R600, 2048}, {HW_VENDOR_AMD, CARD_AMD_RADEON_R7, "AMD Radeon(TM) R7 Graphics", DRIVER_AMD_R600, 2048}, - {HW_VENDOR_AMD, CARD_AMD_RADEON_R9, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_285, "AMD Radeon R9 285", DRIVER_AMD_RX, 2048}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_R9_290, "AMD Radeon R9 290", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_460, "Radeon(TM) RX 460 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, @@ -2134,8 +2135,10 @@ cards_amd_mesa[] = /* Polaris 10/11 */ {"POLARIS10", CARD_AMD_RADEON_RX_480}, {"POLARIS11", CARD_AMD_RADEON_RX_460}, + /* Volcanic Islands */ + {"TONGA", CARD_AMD_RADEON_R9_285}, /* Sea Islands */ - {"HAWAII", CARD_AMD_RADEON_R9 }, + {"HAWAII", CARD_AMD_RADEON_R9_290}, {"KAVERI", CARD_AMD_RADEON_R7 }, {"KABINI", CARD_AMD_RADEON_R3 }, {"BONAIRE", CARD_AMD_RADEON_HD8770}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a59ba5..6b28a3e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1905,7 +1905,8 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD8770 = 0x665c, CARD_AMD_RADEON_R3 = 0x9830, CARD_AMD_RADEON_R7 = 0x130f, - CARD_AMD_RADEON_R9 = 0x67b1, + CARD_AMD_RADEON_R9_285 = 0x6939, + CARD_AMD_RADEON_R9_290 = 0x67b1, CARD_AMD_RADEON_RX_460 = 0x67ef, CARD_AMD_RADEON_RX_480 = 0x67df,

1 0

Huw Davies : user32/tests: Windows 10 no longer supports setting bpp to zero.
by Alexandre Julliard Jan. 18, 2017

Jan. 18, 2017

Module: wine Branch: master Commit: e641e6e49b658efec8ede5a6402de3ce591ee7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e641e6e49b658efec8ede5a64… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 18 08:54:32 2017 +0000 user32/tests: Windows 10 no longer supports setting bpp to zero. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7a039e5..dfdca49 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -131,9 +131,9 @@ struct vid_mode }; static const struct vid_mode vid_modes_test[] = { - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 1}, + {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFREQUENCY, 0}, {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY, 1}, - {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 1}, + {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL , 0}, {640, 480, 0, 0, DM_PELSWIDTH | DM_PELSHEIGHT , 1}, {640, 480, 0, 0, DM_BITSPERPEL , 0}, {640, 480, 0, 0, DM_DISPLAYFREQUENCY, 0},

1 0

Nikolay Sivov : dwrite: Let freetype face cache manage lifetime of requested file fragments.
by Alexandre Julliard Jan. 18, 2017

Jan. 18, 2017

Module: wine Branch: master Commit: 274a82b33c2907a2d28a50ba6919711cfabf1b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=274a82b33c2907a2d28a50ba6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 18 23:02:41 2017 +0300 dwrite: Let freetype face cache manage lifetime of requested file fragments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 3179438..9cc157e 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -93,6 +93,22 @@ MAKE_FUNCPTR(FTC_Manager_LookupSize); MAKE_FUNCPTR(FTC_Manager_RemoveFaceID); #undef MAKE_FUNCPTR +struct face_finalizer_data +{ + IDWriteFontFileStream *stream; + void *context; +}; + +static void face_finalizer(void *object) +{ + FT_Face face = object; + struct face_finalizer_data *data = (struct face_finalizer_data *)face->generic.data; + + IDWriteFontFileStream_ReleaseFileFragment(data->stream, data->context); + IDWriteFontFileStream_Release(data->stream); + heap_free(data); +} + static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face) { IDWriteFontFace *fontface = (IDWriteFontFace*)face_id; @@ -136,7 +152,19 @@ static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointe index = IDWriteFontFace_GetIndex(fontface); fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face); - IDWriteFontFileStream_ReleaseFileFragment(stream, context); + if (fterror == FT_Err_Ok) { + struct face_finalizer_data *data; + + data = heap_alloc(sizeof(*data)); + data->stream = stream; + data->context = context; + + (*face)->generic.data = data; + (*face)->generic.finalizer = face_finalizer; + return fterror; + } + else + IDWriteFontFileStream_ReleaseFileFragment(stream, context); fail: IDWriteFontFileStream_Release(stream);

1 0

Bruno Jesus : msacm32: Reduce block align condition scope to test covered drivers.
by Alexandre Julliard Jan. 18, 2017

Jan. 18, 2017

Module: wine Branch: master Commit: 0afcefd338f1c220ed0a175a3a88fe7a5af596ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0afcefd338f1c220ed0a175a3… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jan 17 14:48:02 2017 -0200 msacm32: Reduce block align condition scope to test covered drivers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/stream.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index 6e81151..e06503a 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -317,7 +317,9 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, WARN("invalid use of reserved parameter\n"); return MMSYSERR_INVALFLAG; } - if (pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { + if ((was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM || + was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) && + pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { WARN("source smaller than block align (%d < %d)\n", pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM;

1 0