November 2019 - Wine-commits

Alexandre Julliard : Wine release 4.21
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: website Branch: master Commit: e8ab73647257569043a611efde9b23829aad288f URL: https://source.winehq.org/git/website.git/?a=commit;h=e8ab73647257569043a61… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 20:17:45 2019 +0100 Wine release 4.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019112901.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019112901.xml b/news/en/2019112901.xml new file mode 100644 index 00000000..1658f33b --- /dev/null +++ b/news/en/2019112901.xml @@ -0,0 +1,15 @@ +<news> +<date>November 29, 2019</date> +<title>Wine 4.21 Released</title> +<body> + The Wine development release 4.21 is now available. + <a href="{$root}/announce/4.21">What's new</a> in this release: +<ul> + <li>HTTP proxy configuration through DHCP.</li> + <li>Parameter block support in D3DX9.</li> + <li>A few more dlls converted to PE.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alistair Leslie-Hughes : d3dx9: Implement D3DXCreateFragmentLinker[Ex]().
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: fd06827bca416dfec8835f109834ad0729c996a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd06827bca416dfec8835f10… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 29 11:57:30 2019 +0100 d3dx9: Implement D3DXCreateFragmentLinker[Ex](). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38086 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 209 +++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx9_36/tests/shader.c | 49 ++++++++++ 2 files changed, 250 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c59fc791ea..d7adc18ff6 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2069,27 +2069,220 @@ HRESULT WINAPI D3DXGetShaderConstantTable(const DWORD *byte_code, ID3DXConstantT return D3DXGetShaderConstantTableEx(byte_code, 0, constant_table); } -HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +struct d3dx9_fragment_linker +{ + ID3DXFragmentLinker ID3DXFragmentLinker_iface; + LONG ref; + + struct IDirect3DDevice9 *device; + DWORD flags; +}; + +static inline struct d3dx9_fragment_linker *impl_from_ID3DXFragmentLinker(ID3DXFragmentLinker *iface) +{ + return CONTAINING_RECORD(iface, struct d3dx9_fragment_linker, ID3DXFragmentLinker_iface); +} + +static HRESULT WINAPI d3dx9_fragment_linker_QueryInterface(ID3DXFragmentLinker *iface, REFIID riid, void **out) +{ + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_ID3DXFragmentLinker)) + { + iface->lpVtbl->AddRef(iface); + *out = iface; + return D3D_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI d3dx9_fragment_linker_AddRef(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedIncrement(&linker->ref); + + TRACE("%p increasing refcount to %u.\n", linker, refcount); + + return refcount; +} + +static ULONG WINAPI d3dx9_fragment_linker_Release(ID3DXFragmentLinker *iface) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + ULONG refcount = InterlockedDecrement(&linker->ref); + + TRACE("%p decreasing refcount to %u.\n", linker, refcount); + + if (!refcount) + { + IDirect3DDevice9_Release(linker->device); + heap_free(linker); + } + + return refcount; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetDevice(ID3DXFragmentLinker *iface, struct IDirect3DDevice9 **device) +{ + struct d3dx9_fragment_linker *linker = impl_from_ID3DXFragmentLinker(iface); + + TRACE("iface %p, device %p.\n", linker, device); + + if (!device) + { + WARN("Invalid argument supplied.\n"); + return D3DERR_INVALIDCALL; + } + + IDirect3DDevice9_AddRef(linker->device); + *device = linker->device; + TRACE("Returning device %p.\n", *device); + + return S_OK; +} + +static UINT WINAPI d3dx9_fragment_linker_GetNumberOfFragments(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); + + return E_NOTIMPL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByIndex(ID3DXFragmentLinker *iface, UINT index) +{ + FIXME("iface %p, index %u: stub.\n", iface, index); + + return NULL; +} + +static D3DXHANDLE WINAPI d3dx9_fragment_linker_GetFragmentHandleByName(ID3DXFragmentLinker *iface, + const char *name) +{ + FIXME("iface %p, name %s: stub.\n", iface, debugstr_a(name)); + + return NULL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragmentDesc(ID3DXFragmentLinker *iface, D3DXHANDLE name, + D3DXFRAGMENT_DESC *desc) +{ + FIXME("iface %p, name %p, desc %p: stub.\n", iface, name, desc); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_AddFragments(ID3DXFragmentLinker *iface, const DWORD *fragments) +{ + FIXME("iface %p, fragments %p: stub.\n", iface, fragments); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetAllFragments(ID3DXFragmentLinker *iface, ID3DXBuffer **buffer) +{ + FIXME("iface %p, buffer %p: stub.\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_GetFragment(ID3DXFragmentLinker *iface, D3DXHANDLE name, + ID3DXBuffer **buffer) +{ + FIXME("iface %p, name %p, buffer %p: stub.\n", iface, name, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI d3dx9_fragment_linker_LinkShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, ID3DXBuffer **buffer, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, linker %p: stub.\n", device, size, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, buffer %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, buffer, errors); - if (linker) - *linker = NULL; + return E_NOTIMPL; +} +static HRESULT WINAPI d3dx9_fragment_linker_LinkVertexShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DVertexShader9 **shader, + ID3DXBuffer **errors) +{ + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); return E_NOTIMPL; } -HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, ID3DXFragmentLinker **linker) +static HRESULT WINAPI d3dx9_fragment_linker_LinkPixelShader(ID3DXFragmentLinker *iface, const char *profile, + DWORD flags, const D3DXHANDLE *handles, UINT fragment_count, IDirect3DPixelShader9 **shader, + ID3DXBuffer **errors) { - FIXME("device %p, size %u, flags %#x, linker %p: stub.\n", device, size, flags, linker); + FIXME("iface %p, profile %s, flags %#x, handles %p, fragment_count %u, shader %p, errors %p: stub.\n", + iface, debugstr_a(profile), flags, handles, fragment_count, shader, errors); + + return E_NOTIMPL; +} - if (linker) - *linker = NULL; +static HRESULT WINAPI d3dx9_fragment_linker_ClearCache(ID3DXFragmentLinker *iface) +{ + FIXME("iface %p: stub.\n", iface); return E_NOTIMPL; } +static const struct ID3DXFragmentLinkerVtbl d3dx9_fragment_linker_vtbl = +{ + d3dx9_fragment_linker_QueryInterface, + d3dx9_fragment_linker_AddRef, + d3dx9_fragment_linker_Release, + d3dx9_fragment_linker_GetDevice, + d3dx9_fragment_linker_GetNumberOfFragments, + d3dx9_fragment_linker_GetFragmentHandleByIndex, + d3dx9_fragment_linker_GetFragmentHandleByName, + d3dx9_fragment_linker_GetFragmentDesc, + d3dx9_fragment_linker_AddFragments, + d3dx9_fragment_linker_GetAllFragments, + d3dx9_fragment_linker_GetFragment, + d3dx9_fragment_linker_LinkShader, + d3dx9_fragment_linker_LinkVertexShader, + d3dx9_fragment_linker_LinkPixelShader, + d3dx9_fragment_linker_ClearCache +}; + +HRESULT WINAPI D3DXCreateFragmentLinkerEx(IDirect3DDevice9 *device, UINT size, DWORD flags, + ID3DXFragmentLinker **linker) +{ + struct d3dx9_fragment_linker *object; + + TRACE("device %p, size %u, flags %#x, linker %p.\n", device, size, flags, linker); + + object = heap_alloc(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->ID3DXFragmentLinker_iface.lpVtbl = &d3dx9_fragment_linker_vtbl; + object->ref = 1; + + IDirect3DDevice9_AddRef(device); + object->device = device; + object->flags = flags; + + *linker = &object->ID3DXFragmentLinker_iface; + + return S_OK; +} + +HRESULT WINAPI D3DXCreateFragmentLinker(IDirect3DDevice9 *device, UINT size, ID3DXFragmentLinker **linker) +{ + TRACE("device %p, size %u, linker %p.\n", device, size, linker); + + return D3DXCreateFragmentLinkerEx(device, size, 0, linker); +} + HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **samplers, UINT *count) { UINT i, sampler_count = 0; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index e6326bc411..e2925faad6 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6575,6 +6575,54 @@ static void test_shader_semantics(void) } } +static void test_fragment_linker(void) +{ + ID3DXFragmentLinker *linker; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create a D3D object.\n"); + DestroyWindow(window); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, + D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create a D3D device, hr %#x.\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = D3DXCreateFragmentLinker(device, 1024, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + hr = D3DXCreateFragmentLinkerEx(device, 1024, 0, &linker); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(!!linker, "Unexpected linker %p.\n", linker); + linker->lpVtbl->Release(linker); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3D9_Release(d3d); + ok(!refcount, "The D3D object has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6637,5 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_fragment_linker(); }

1 0

Alexandre Julliard : mscoree/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 9c3457215551b312dd11da7236f657d50f3bd066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c3457215551b312dd11da72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:41 2019 +0100 mscoree/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 3ec5f09511..26c06246a9 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -252,17 +252,17 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, NULL, MAX_PATH, &path_len, version, MAX_PATH, &size); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); /* With NULL-pointer for bufferlength, the buffer itself still gets filled with correct string */ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); + ok(!wcscmp(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ memset(version, 0, sizeof(version)); @@ -271,7 +271,7 @@ static void test_versioninfo(void) if(hr == S_OK) { /* .NET 1.1 may not be installed. */ - ok(!winetest_strcmpW(version, v1_1) || !winetest_strcmpW(version, v2_0), + ok(!wcscmp(version, v1_1) || !wcscmp(version, v2_0), "version is %s , expected %s or %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v1_1), wine_dbgstr_w(v2_0)); } @@ -287,7 +287,7 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); @@ -296,7 +296,7 @@ static void test_versioninfo(void) memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); todo_wine_if(!has_mono) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); - ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + ok(!wcscmp(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); hr = pCorIsLatestSvc(NULL, NULL); ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr);

1 0

Alexandre Julliard : msvcrt/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 65049191ab7f9404147ae00f3596347ee186c270 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65049191ab7f9404147ae00f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:46 2019 +0100 msvcrt/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/environ.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index b8e0ae6251..43115d86da 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -228,7 +228,7 @@ static void test__wenviron(void) if ((*p_wenviron)[i]) { ok( wenvp[i] != NULL, "Expected environment block pointer element to be non-NULL\n" ); - ok( !winetest_strcmpW((*p_wenviron)[i], wenvp[i]), + ok( !wcscmp((*p_wenviron)[i], wenvp[i]), "Expected _wenviron and environment block pointer strings (%s vs. %s) to match\n", wine_dbgstr_w((*p_wenviron)[i]), wine_dbgstr_w(wenvp[i]) ); }

1 0

Alexandre Julliard : msxml3/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: f077f8b08dae39046485725682a140f54c3b9327 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f077f8b08dae390464857256… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:51 2019 +0100 msxml3/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index f1f3e4206b..0fcaf757b2 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -983,7 +983,7 @@ static void test_collection_content(void) content[i] = bstr; for (j = 0; j < i; ++j) - ok(winetest_strcmpW(content[j], bstr), "got duplicate entry\n"); + ok(wcscmp(content[j], bstr), "got duplicate entry\n"); } for (i = 0; i < 3; ++i) @@ -1001,7 +1001,7 @@ static void test_collection_content(void) ok(bstr != NULL && *bstr, "expected non-empty string\n"); for (j = 0; j < i; ++j) - ok(winetest_strcmpW(content[j], bstr), "got duplicate entry\n"); + ok(wcscmp(content[j], bstr), "got duplicate entry\n"); content[i] = bstr; }

1 0

Alexandre Julliard : shell32/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 8310d7c4172ccae3233a843f3b8c37255dfef1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=8310d7c4172ccae3233a843f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:57:56 2019 +0100 shell32/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 3bfd9cbe38..db839200d5 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -496,9 +496,7 @@ void create_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int save_fails) { IMalloc *pmalloc; - lok(!winetest_strcmpW(path, str), "Expected %s, got %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(str)); - + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); SHGetMalloc(&pmalloc); IMalloc_Free(pmalloc, str); } @@ -554,9 +552,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) { IMalloc *pmalloc; - lok(!winetest_strcmpW(path, str), "Expected %s, got %s\n", - wine_dbgstr_w(path), wine_dbgstr_w(str)); - + lok(!wcscmp(path, str), "Expected %s, got %s\n", wine_dbgstr_w(path), wine_dbgstr_w(str)); SHGetMalloc(&pmalloc); IMalloc_Free(pmalloc, str); }

1 0

Alexandre Julliard : winhttp/tests: Avoid winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 88c05d90619fd2b2449b2dcec31e5b6873f1b295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c05d90619fd2b2449b2dce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:58:00 2019 +0100 winhttp/tests: Avoid winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2cf6f6a87d..6a8d496238 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -3651,7 +3651,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_USERNAME, &buffer, &size); ok(ret, "failed to query proxy username %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, proxy_userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_userW) * sizeof(WCHAR), "unexpected result %u\n", size); size = ARRAY_SIZE(buffer); @@ -3672,7 +3672,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PROXY_PASSWORD, &buffer, &size); ok(ret, "failed to query proxy password %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, proxy_passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(proxy_passW) * sizeof(WCHAR), "unexpected result %u\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_USERNAME, userW, lstrlenW(userW)); @@ -3681,7 +3681,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_USERNAME, &buffer, &size); ok(ret, "failed to query username %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, userW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(userW) * sizeof(WCHAR), "unexpected result %u\n", size); ret = WinHttpSetOption(req, WINHTTP_OPTION_PASSWORD, passW, lstrlenW(passW)); @@ -3690,7 +3690,7 @@ static void test_credentials(void) size = ARRAY_SIZE(buffer); ret = WinHttpQueryOption(req, WINHTTP_OPTION_PASSWORD, &buffer, &size); ok(ret, "failed to query password %u\n", GetLastError()); - ok(!winetest_strcmpW(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); + ok(!wcscmp(buffer, passW), "unexpected result %s\n", wine_dbgstr_w(buffer)); ok(size == lstrlenW(passW) * sizeof(WCHAR), "unexpected result %u\n", size); WinHttpCloseHandle(req);

1 0

Alexandre Julliard : include: Remove winetest_strcmpW.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 4dc4bab93fd97a73567df595bdbb75be27b48964 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4dc4bab93fd97a73567df595… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 13:58:05 2019 +0100 include: Remove winetest_strcmpW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index bfd893e8cd..aeb9a55dee 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -83,14 +83,6 @@ extern const char *wine_dbgstr_rect( const RECT *rect ); static inline const char *wine_dbgstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } extern const char *wine_dbgstr_longlong( ULONGLONG ll ); -/* strcmpW is available for tests compiled under Wine, but not in standalone - * builds under Windows, so we reimplement it under a different name. */ -static inline int winetest_strcmpW( const WCHAR *str1, const WCHAR *str2 ) -{ - while (*str1 && (*str1 == *str2)) { str1++; str2++; } - return *str1 - *str2; -} - #ifdef STANDALONE #define START_TEST(name) \ static void func_##name(void); \

1 0

Alexandre Julliard : ntdll: Remove trailing \n in fatal_perror() calls.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: dd732232890f176a9ae618b63fe63a2b62dbf93e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd732232890f176a9ae618b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 29 17:14:14 2019 +0100 ntdll: Remove trailing \n in fatal_perror() calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 204370a1b7..089eb3b89a 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1139,7 +1139,7 @@ static int setup_config_dir(void) if (chdir( config_dir ) == -1) { - if (errno != ENOENT) fatal_perror( "chdir to %s\n", config_dir ); + if (errno != ENOENT) fatal_perror( "chdir to %s", config_dir ); if ((p = strrchr( config_dir, '/' )) && p != config_dir) { @@ -1156,7 +1156,7 @@ static int setup_config_dir(void) } mkdir( config_dir, 0777 ); - if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); + if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } @@ -1164,7 +1164,7 @@ static int setup_config_dir(void) if (mkdir( "dosdevices", 0777 ) == -1) { if (errno == EEXIST) goto done; - fatal_perror( "cannot create %s/dosdevices\n", config_dir ); + fatal_perror( "cannot create %s/dosdevices", config_dir ); } /* create the drive symlinks */

1 0

Nikolay Sivov : dwrite: Update to IDWriteColorGlyphRunEnumerator1.
by Alexandre Julliard 29 Nov '19

29 Nov '19

Module: wine Branch: master Commit: 1b23a522afbef2a27a4d1648db8860771ffc13b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b23a522afbef2a27a4d1648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 29 12:54:25 2019 +0300 dwrite: Update to IDWriteColorGlyphRunEnumerator1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 138 ++++++++++++++++++++++++++++------------------- dlls/dwrite/tests/font.c | 28 ++++++++++ 2 files changed, 110 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1b23a522afbef2a27a4d…

1 0