February 2020 - Wine-commits

Zebediah Figura : d3d8: Retrieve the vertex shader from the primary stateblock.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 1dca8313ce5a86a2764899fe8d2a608cdbcb15d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dca8313ce5a86a2764899fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:56 2020 -0600 d3d8: Retrieve the vertex shader from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8f851fa2a6..c7e4772b3b 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2967,7 +2967,7 @@ static HRESULT WINAPI d3d8_device_DeleteVertexShader(IDirect3DDevice8 *iface, DW } if (shader_impl->wined3d_shader - && wined3d_device_get_vertex_shader(device->wined3d_device) == shader_impl->wined3d_shader) + && wined3d_stateblock_get_state(device->state)->vs == shader_impl->wined3d_shader) IDirect3DDevice8_SetVertexShader(iface, 0); wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetVertexShader().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 4579ea590682d792893530696a9c6e1b776e0109 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4579ea590682d79289353069… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 09:53:57 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetVertexShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c7e4772b3b..ef1b3afde9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2889,12 +2889,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD wined3d_stateblock_set_vertex_declaration(device->update_state, d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration); wined3d_stateblock_set_vertex_shader(device->update_state, NULL); - if (!device->recording) - { - wined3d_device_set_vertex_declaration(device->wined3d_device, - d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration); - wined3d_device_set_vertex_shader(device->wined3d_device, NULL); - } wined3d_mutex_unlock(); return D3D_OK; @@ -2914,12 +2908,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD wined3d_stateblock_set_vertex_declaration(device->update_state, shader_impl->vertex_declaration->wined3d_vertex_declaration); wined3d_stateblock_set_vertex_shader(device->update_state, shader_impl->wined3d_shader); - if (!device->recording) - { - wined3d_device_set_vertex_declaration(device->wined3d_device, - shader_impl->vertex_declaration->wined3d_vertex_declaration); - wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); - } wined3d_mutex_unlock(); return D3D_OK;

1 0

Michael Stefaniuc : urlmon/tests: Get rid of a2w() in misc.c.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 81f2b5fd9a457cb6a5f64cdd3d1281088785f9a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81f2b5fd9a457cb6a5f64cdd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:19 2020 +0100 urlmon/tests: Get rid of a2w() in misc.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 83 ++++++++++++++++++------------------------------ 1 file changed, 31 insertions(+), 52 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 07ab52407e..4c5c6aea10 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -84,21 +84,6 @@ static HRESULT (WINAPI *pCoInternetIsFeatureEnabled)(INTERNETFEATURELIST,DWORD); static HRESULT (WINAPI *pCoInternetSetFeatureEnabled)(INTERNETFEATURELIST,DWORD,BOOL); static HRESULT (WINAPI *pIEInstallScope)(DWORD*); -static WCHAR *a2w(const char *str) -{ - WCHAR *ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - static WCHAR *a2co(const char *str) { WCHAR *ret; @@ -476,22 +461,22 @@ static void test_CoInternetQueryInfo(void) } static const struct { - const char *url; + const WCHAR *url; const WCHAR *mime; HRESULT hres; BOOL broken_failure; const WCHAR *broken_mime; } mime_tests[] = { - {"res://mshtml.dll/blank.htm", L"text/html", S_OK}, - {"index.htm", L"text/html", S_OK}, - {"file://c:\\Index.htm", L"text/html", S_OK}, - {"file://c:\\Index.htm?q=test", L"text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part", L"text/html", S_OK, TRUE}, - {"file://c:\\Index.htm#hash_part.txt", L"text/html", S_OK, FALSE, L"text/plain"}, - {"file://some%20file%2ejpg", NULL, E_FAIL}, - {"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, - {"about:blank", NULL, E_FAIL}, - {"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} + {L"res://mshtml.dll/blank.htm", L"text/html", S_OK}, + {L"index.htm", L"text/html", S_OK}, + {L"file://c:\\Index.htm", L"text/html", S_OK}, + {L"file://c:\\Index.htm?q=test", L"text/html", S_OK, TRUE}, + {L"file://c:\\Index.htm#hash_part", L"text/html", S_OK, TRUE}, + {L"file://c:\\Index.htm#hash_part.txt", L"text/html", S_OK, FALSE, L"text/plain"}, + {L"file://some%20file%2ejpg", NULL, E_FAIL}, + {L"http://www.winehq.org", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)}, + {L"about:blank", NULL, E_FAIL}, + {L"ftp://winehq.org/file.test", NULL, __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)} }; static BYTE data1[] = "test data\n"; @@ -599,8 +584,8 @@ static const struct { const WCHAR *mime; const WCHAR *mime_pjpeg; const WCHAR *broken_mime; - const char *url; - const char *proposed_mime; + const WCHAR *url; + const WCHAR *proposed_mime; } mime_tests2[] = { {data1, sizeof(data1), L"text/plain"}, {data2, sizeof(data2), L"application/octet-stream", L"image/pjpeg"}, @@ -700,22 +685,22 @@ static const struct { {data96, sizeof(data96), L"text/plain"}, {data97, sizeof(data97), L"text/html", L"text/plain"}, {data98, sizeof(data98), L"text/html", L"text/plain"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {NULL, 0, L"text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "res://mshtml.dll/blank.htm", "application/octet-stream"}, - {data1, sizeof(data1), L"text/plain", NULL, NULL, "file:some%20file%2ejpg", "application/octet-stream"}, - {NULL, sizeof(data1), L"text/html", NULL, NULL, "res://mshtml.dll/blank.htm"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data2, sizeof(data2), L"text/css", NULL, NULL, "http://www.winehq.org/test.css"}, - {data10, sizeof(data10), L"text/html", NULL, NULL, "http://www.winehq.org/test.css"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css", "text/plain"}, - {data1, sizeof(data1), L"text/css", NULL, NULL, "http://www.winehq.org/test.css", "application/octet-stream"}, - {data1, sizeof(data1), L"text/test", NULL, NULL, "http://www.winehq.org/test.css", "text/test"} + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {NULL, 0, L"text/html", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"res://mshtml.dll/blank.htm", L"application/octet-stream"}, + {data1, sizeof(data1), L"text/plain", NULL, NULL, L"file:some%20file%2ejpg", L"application/octet-stream"}, + {NULL, sizeof(data1), L"text/html", NULL, NULL, L"res://mshtml.dll/blank.htm"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data2, sizeof(data2), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data10, sizeof(data10), L"text/html", NULL, NULL, L"http://www.winehq.org/test.css"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css", L"text/plain"}, + {data1, sizeof(data1), L"text/css", NULL, NULL, L"http://www.winehq.org/test.css", L"application/octet-stream"}, + {data1, sizeof(data1), L"text/test", NULL, NULL, L"http://www.winehq.org/test.css", L"text/test"} }; static void test_FindMimeFromData(void) { - WCHAR *mime, *proposed_mime, *url; + WCHAR *mime; HRESULT hres; BYTE b; int i; @@ -728,8 +713,7 @@ static void test_FindMimeFromData(void) for(i = 0; i < ARRAY_SIZE(mime_tests); i++) { mime = (LPWSTR)0xf0f0f0f0; - url = a2w(mime_tests[i].url); - hres = pFindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, NULL, 0, &mime, 0); if(mime_tests[i].mime) { ok(hres == S_OK || broken(mime_tests[i].broken_failure), "[%d] FindMimeFromData failed: %08x\n", i, hres); if(hres == S_OK) { @@ -746,32 +730,27 @@ static void test_FindMimeFromData(void) } mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, url, NULL, 0, text_plainW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, text_plainW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, L"text/plain"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); mime = (LPWSTR)0xf0f0f0f0; - hres = pFindMimeFromData(NULL, url, NULL, 0, app_octet_streamW, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests[i].url, NULL, 0, app_octet_streamW, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); ok(!lstrcmpW(mime, L"application/octet-stream"), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); CoTaskMemFree(mime); - heap_free(url); } for(i = 0; i < ARRAY_SIZE(mime_tests2); i++) { - url = a2w(mime_tests2[i].url); - proposed_mime = a2w(mime_tests2[i].proposed_mime); - hres = pFindMimeFromData(NULL, url, mime_tests2[i].data, mime_tests2[i].size, - proposed_mime, 0, &mime, 0); + hres = pFindMimeFromData(NULL, mime_tests2[i].url, mime_tests2[i].data, mime_tests2[i].size, + mime_tests2[i].proposed_mime, 0, &mime, 0); ok(hres == S_OK, "[%d] FindMimeFromData failed: %08x\n", i, hres); b = !lstrcmpW(mime, mime_tests2[i].mime); ok(b || broken(mime_tests2[i].broken_mime && !lstrcmpW(mime, mime_tests2[i].broken_mime)), "[%d] wrong mime: %s\n", i, wine_dbgstr_w(mime)); - heap_free(proposed_mime); - heap_free(url); CoTaskMemFree(mime); - if(!b || url || proposed_mime) + if(!b || mime_tests2[i].url || mime_tests2[i].proposed_mime) continue; hres = pFindMimeFromData(NULL, NULL, mime_tests2[i].data, mime_tests2[i].size,

1 0

Michael Stefaniuc : urlmon/tests: Get rid of strcmp_aw() in sec_mgr.c.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: c33e7dcadb2ddf7df4684a9766b103b77cb299d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c33e7dcadb2ddf7df4684a97… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:21 2020 +0100 urlmon/tests: Get rid of strcmp_aw() in sec_mgr.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2974eecc36..dda50dd056 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -190,13 +190,6 @@ static inline LPWSTR a2w(LPCSTR str) return ret; } -static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { - LPWSTR strAW = a2w(strA); - DWORD ret = lstrcmpW(strAW, strB); - heap_free(strAW); - return ret; -} - /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ static LONG myRegDeleteTreeA(HKEY hKey, LPCSTR lpszSubKey) @@ -1592,21 +1585,21 @@ static const struct { DWORD create_flags; const char *security_uri; HRESULT security_hres; - const char *default_uri; + const WCHAR *default_uri; HRESULT default_hres; BOOL todo; } sec_url_ex_tests[] = { - {"index.htm",Uri_CREATE_ALLOW_RELATIVE,"*:index.html",S_OK,"*:index.htm",S_OK}, - {"file://c:\\Index.htm",Uri_CREATE_FILE_USE_DOS_PATH,"file:///c:/Index.htm",S_OK,"file:///c:/Index.htm",S_OK}, - {"file:some%20file%2ejpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"file:some file.jpg",0,NULL,E_INVALIDARG,NULL,E_INVALIDARG}, - {"http://www.zone3.winetest/",0,"http://www.zone3.winetest/",S_OK,"http://www.zone3.winetest/",S_OK}, - {"about:blank",0,"about:blank",S_OK,"about:blank",S_OK}, - {"ftp://zone3.winetest/file.test",0,"ftp://zone3.winetest/file.test",S_OK,"ftp://zone3.winetest/file.test",S_OK}, - {"test:123abc",0,"test:123abc",S_OK,"test:123abc",S_OK}, - {"http:google.com/test.file",0,"http:google.com/test.file",S_OK,"http:google.com/test.file",S_OK}, - {"ftp://test(a)ftp.winehq.org/",0,"ftp://ftp.winehq.org/",S_OK,"ftp://ftp.winehq.org/",S_OK}, - {"test://google(a)ftp.winehq.org/",0,"test://google(a)ftp.winehq.org/",S_OK,"test://google(a)ftp.winehq.org/",S_OK} + {"index.htm", Uri_CREATE_ALLOW_RELATIVE, "*:index.html", S_OK, L"*:index.htm", S_OK}, + {"file://c:\\Index.htm", Uri_CREATE_FILE_USE_DOS_PATH, "file:///c:/Index.htm", S_OK, L"file:///c:/Index.htm", S_OK}, + {"file:some%20file%2ejpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"file:some file.jpg", 0, NULL, E_INVALIDARG, NULL, E_INVALIDARG}, + {"http://www.zone3.winetest/", 0, "http://www.zone3.winetest/", S_OK, L"http://www.zone3.winetest/", S_OK}, + {"about:blank", 0, "about:blank", S_OK, L"about:blank", S_OK}, + {"ftp://zone3.winetest/file.test", 0, "ftp://zone3.winetest/file.test", S_OK, L"ftp://zone3.winetest/file.test", S_OK}, + {"test:123abc", 0, "test:123abc", S_OK, L"test:123abc", S_OK}, + {"http:google.com/test.file", 0, "http:google.com/test.file", S_OK, L"http:google.com/test.file", S_OK}, + {"ftp://test(a)ftp.winehq.org/", 0, "ftp://ftp.winehq.org/", S_OK, L"ftp://ftp.winehq.org/", S_OK}, + {"test://google(a)ftp.winehq.org/", 0, "test://google(a)ftp.winehq.org/", S_OK, L"test://google(a)ftp.winehq.org/", S_OK} }; static void test_InternetGetSecurityUrlEx(void) @@ -1647,9 +1640,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received); @@ -1670,9 +1663,9 @@ static void test_InternetGetSecurityUrlEx(void) ok(hr == S_OK, "GetDisplayUri returned 0x%08x on test %d\n", hr, i); if(hr == S_OK) { todo_wine_if (sec_url_ex_tests[i].todo) { - ok(!strcmp_aw(sec_url_ex_tests[i].default_uri, received), - "Expected %s but got %s on test %d\n", sec_url_ex_tests[i].default_uri, - wine_dbgstr_w(received), i); + ok(!lstrcmpW(sec_url_ex_tests[i].default_uri, received), + "Expected %s but got %s on test %d\n", + wine_dbgstr_w(sec_url_ex_tests[i].default_uri), wine_dbgstr_w(received), i); } } SysFreeString(received);

1 0

Michael Stefaniuc : urlmon/tests: Get rid of a2w() in sec_mgr.c.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: eaacf86d6bc3bed715454ebdc825dfd3427fc2c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaacf86d6bc3bed715454ebd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 18 23:53:22 2020 +0100 urlmon/tests: Get rid of a2w() in sec_mgr.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 172 +++++++++++++++++++------------------------- 1 file changed, 72 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eaacf86d6bc3bed71545…

1 0

Zhiyi Zhang : dxgi: Check NULL adapter parameter in dxgi_factory_EnumAdapterByLuid().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 23a8887ded0e45b422c25a183adcb54ee0999eb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a8887ded0e45b422c25a18… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 20 20:48:04 2020 +0800 dxgi: Check NULL adapter parameter in dxgi_factory_EnumAdapterByLuid(). Signed-off-by: Zhiyi Zhang <zzhang(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 | 3 +++ dlls/dxgi/tests/dxgi.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a0038b4fe7..3f41df9e36 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -403,6 +403,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapterByLuid(IWineDXGIFactory TRACE("iface %p, luid %08x:%08x, iid %s, adapter %p.\n", iface, luid.HighPart, luid.LowPart, debugstr_guid(iid), adapter); + if (!adapter) + return DXGI_ERROR_INVALID_CALL; + adapter_index = 0; while ((hr = dxgi_factory_EnumAdapters1(iface, adapter_index, &adapter1)) == S_OK) { diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f8e63ea25e..3ff42c4bc6 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -912,6 +912,10 @@ static void test_adapter_luid(void) return; } + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, + &IID_IDXGIAdapter, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); @@ -4949,6 +4953,9 @@ static void test_multi_adapter(void) return; } + hr = IDXGIFactory_EnumAdapters(factory, 0, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); if (hr == DXGI_ERROR_NOT_FOUND) {

1 0

Zhiyi Zhang : dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: ba4ee497050df6bb211bfba47e268d67ee6cd198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba4ee497050df6bb211bfba4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 20 20:48:18 2020 +0800 dxgi: Check NULL output parameter in dxgi_adapter_EnumOutputs(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 3 +++ dlls/dxgi/tests/dxgi.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index d2fc629c84..7cdf7bd0d6 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -128,6 +128,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *ifac TRACE("iface %p, output_idx %u, output %p.\n", iface, output_idx, output); + if (!output) + return E_INVALIDARG; + if (output_idx > 0) { *output = NULL; diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3ff42c4bc6..e2b5df7b27 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1175,6 +1175,9 @@ static void test_output(void) hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_EnumOutputs(adapter, 0, &output); if (hr == DXGI_ERROR_NOT_FOUND) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 692095e561c81b808e1b5dd0fc161c87a609192b URL: https://source.winehq.org/git/wine.git/?a=commit;h=692095e561c81b808e1b5dd0… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 20 08:38:54 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 5f3bc950b1..a9b470e39e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-14 08:12+0200\n" +"PO-Revision-Date: 2020-02-20 08:38+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8418,16 +8418,12 @@ msgid "&Edit Value..." msgstr "&Redaguoti reikšmę..." #: version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Duomenų saito savybės" +msgstr "Duomenų saito klaida" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Išrinkite failą." +msgstr "Išrinkite tiekėją." #: version.rc:36 msgid "Data Link Properties"

1 0

Alistair Leslie-Hughes : oledb32: Ensure provider is selected before changing tabs.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: d480436d9a19203339f3cfd23ef9b310c25a62d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d480436d9a19203339f3cfd2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 18 21:29:27 2020 +0000 oledb32: Ensure provider is selected before changing tabs. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 35 +++++++++++++++++++++--- dlls/oledb32/resource.h | 2 ++ dlls/oledb32/version.rc | 3 ++ po/ar.po | 70 +++++++++++++++++++++++++++-------------------- po/ast.po | 68 ++++++++++++++++++++++++++-------------------- po/bg.po | 68 ++++++++++++++++++++++++++-------------------- po/ca.po | 70 +++++++++++++++++++++++++++-------------------- po/cs.po | 70 +++++++++++++++++++++++++++-------------------- po/da.po | 70 +++++++++++++++++++++++++++-------------------- po/de.po | 70 +++++++++++++++++++++++++++-------------------- po/el.po | 67 +++++++++++++++++++++++++-------------------- po/en.po | 66 ++++++++++++++++++++++++-------------------- po/en_US.po | 66 ++++++++++++++++++++++++-------------------- po/eo.po | 68 ++++++++++++++++++++++++++-------------------- po/es.po | 70 +++++++++++++++++++++++++++-------------------- po/fa.po | 67 +++++++++++++++++++++++++-------------------- po/fi.po | 70 +++++++++++++++++++++++++++-------------------- po/fr.po | 70 +++++++++++++++++++++++++++-------------------- po/he.po | 68 ++++++++++++++++++++++++++-------------------- po/hi.po | 67 +++++++++++++++++++++++++-------------------- po/hr.po | 70 +++++++++++++++++++++++++++-------------------- po/hu.po | 70 +++++++++++++++++++++++++++-------------------- po/it.po | 70 +++++++++++++++++++++++++++-------------------- po/ja.po | 70 +++++++++++++++++++++++++++-------------------- po/ko.po | 70 +++++++++++++++++++++++++++-------------------- po/lt.po | 70 +++++++++++++++++++++++++++-------------------- po/ml.po | 67 +++++++++++++++++++++++++-------------------- po/nb_NO.po | 70 +++++++++++++++++++++++++++-------------------- po/nl.po | 70 +++++++++++++++++++++++++++-------------------- po/or.po | 67 +++++++++++++++++++++++++-------------------- po/pa.po | 67 +++++++++++++++++++++++++-------------------- po/pl.po | 70 +++++++++++++++++++++++++++-------------------- po/pt_BR.po | 70 +++++++++++++++++++++++++++-------------------- po/pt_PT.po | 70 +++++++++++++++++++++++++++-------------------- po/rm.po | 66 ++++++++++++++++++++++++-------------------- po/ro.po | 70 +++++++++++++++++++++++++++-------------------- po/ru.po | 70 +++++++++++++++++++++++++++-------------------- po/si.po | 70 +++++++++++++++++++++++++++-------------------- po/sk.po | 71 ++++++++++++++++++++++++++++-------------------- po/sl.po | 70 +++++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 68 ++++++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 68 ++++++++++++++++++++++++++-------------------- po/sv.po | 70 +++++++++++++++++++++++++++-------------------- po/ta.po | 66 ++++++++++++++++++++++++-------------------- po/te.po | 67 +++++++++++++++++++++++++-------------------- po/th.po | 67 +++++++++++++++++++++++++-------------------- po/tr.po | 70 +++++++++++++++++++++++++++-------------------- po/uk.po | 70 +++++++++++++++++++++++++++-------------------- po/wa.po | 67 +++++++++++++++++++++++++-------------------- po/wine.pot | 66 ++++++++++++++++++++++++-------------------- po/zh_CN.po | 70 +++++++++++++++++++++++++++-------------------- po/zh_TW.po | 70 +++++++++++++++++++++++++++-------------------- 52 files changed, 1987 insertions(+), 1425 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d480436d9a19203339f3…

1 0

Sven Baars : user32: Add EnableNonClientDpiScaling stub.
by Alexandre Julliard 19 Feb '20

19 Feb '20

Module: wine Branch: master Commit: 9bd51fff5d10b05e31c519a7db2353c335e431ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bd51fff5d10b05e31c519a7… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Wed Feb 19 16:27:21 2020 +0100 user32: Add EnableNonClientDpiScaling stub. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 10 ++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index c5c98a7ea1..ab386a074e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3664,6 +3664,16 @@ BOOL WINAPI IsProcessDPIAware(void) return GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() ) != DPI_AWARENESS_UNAWARE; } +/********************************************************************** + * EnableNonClientDpiScaling (USER32.@) + */ +BOOL WINAPI EnableNonClientDpiScaling( HWND hwnd ) +{ + FIXME("(%p): stub\n", hwnd); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + /*********************************************************************** * GetDpiForSystem (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 1aedc32de2..d2a1487971 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -205,6 +205,7 @@ @ stdcall EmptyClipboard() @ stdcall EnableMenuItem(long long long) @ stdcall EnableMouseInPointer(long) +@ stdcall EnableNonClientDpiScaling(long) @ stdcall EnableScrollBar(long long long) @ stdcall EnableWindow(long long) @ stdcall EndDeferWindowPos(long) diff --git a/include/winuser.h b/include/winuser.h index 718f6e1c54..5fd774d295 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3702,6 +3702,7 @@ WINUSERAPI INT WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTP WINUSERAPI BOOL WINAPI EmptyClipboard(void); WINUSERAPI BOOL WINAPI EnableMenuItem(HMENU,UINT,UINT); WINUSERAPI BOOL WINAPI EnableMouseInPointer(BOOL); +WINUSERAPI BOOL WINAPI EnableNonClientDpiScaling(HWND); WINUSERAPI BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); WINUSERAPI BOOL WINAPI EnableWindow(HWND,BOOL); WINUSERAPI BOOL WINAPI EndDeferWindowPos(HDWP);

1 0