January 2020 - Wine-commits

Zebediah Figura : user32/tests: Make the DDE tests less verbose by default.
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: 497b9ed822a6171b3a7253ee4291cbecda9ae3ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=497b9ed822a6171b3a7253ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 5 11:55:49 2020 -0600 user32/tests: Make the DDE tests less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dde.c | 54 +++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=497b9ed822a6171b3a72…

1 0

Alexandre Julliard : ntdll: Make loop counter signed.
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: d96331d83050ef2748d0d7d70ecf921370e24bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=d96331d83050ef2748d0d7d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 4 11:21:28 2020 +0100 ntdll: Make loop counter signed. Spotted by Gianfranco Costamagna. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48398 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 687219ec40..6d72938809 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1519,7 +1519,8 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION *func, CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ptrs ) { - unsigned int i, len, offset, skip = 0; + int i; + unsigned int len, offset, skip = 0; unsigned int int_size = func->u.s.RegI * 8, fp_size = func->u.s.RegF * 8, regsave, local_size; TRACE( "function %lx-%lx: len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n",

1 0

Alexandre Julliard : Wine release 5.0-rc4
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: website Branch: master Commit: 6294d16db1d87b98760362dafee39bd5260db60b URL: https://source.winehq.org/git/website.git/?a=commit;h=6294d16db1d87b9876036… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 3 22:25:21 2020 +0100 Wine release 5.0-rc4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020010301.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2020010301.xml b/news/en/2020010301.xml new file mode 100644 index 00000000..0b592791 --- /dev/null +++ b/news/en/2020010301.xml @@ -0,0 +1,12 @@ +<news> +<date>January 3, 2020</date> +<title>Wine 5.0-rc4 Released</title> +<body> + The Wine development release 5.0-rc4 is now available. + <a href="{$root}/announce/5.0-rc4">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.0/wine-5.0-rc4.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

Zebediah Figura : d3dcompiler/tests: Load d3dx9_36.dll dynamically.
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: ae274b25e2f17c7b92d945a49e0fc8b4e671b1af URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae274b25e2f17c7b92d945a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jan 2 15:01:11 2020 -0600 d3dcompiler/tests: Load d3dx9_36.dll dynamically. Windows 7 Professional ships d3dcompiler_47 by default, but no version of d3dx9. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47894 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/hlsl.c | 16 ++++++++++++++-- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 3b4b7a5a42..51b1f93483 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3dcompiler_43.dll -IMPORTS = d3d9 d3dx9 user32 +IMPORTS = d3d9 user32 EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ diff --git a/dlls/d3dcompiler_43/tests/hlsl.c b/dlls/d3dcompiler_43/tests/hlsl.c index f169f681ca..8985cd51bb 100644 --- a/dlls/d3dcompiler_43/tests/hlsl.c +++ b/dlls/d3dcompiler_43/tests/hlsl.c @@ -24,6 +24,9 @@ static pD3DCompile ppD3DCompile; +static HRESULT (WINAPI *pD3DXGetShaderConstantTable)(const DWORD *byte_code, ID3DXConstantTable **constant_table); +static D3DMATRIX *(WINAPI *pD3DXMatrixOrthoLH)(D3DXMATRIX *pout, FLOAT w, FLOAT h, FLOAT zn, FLOAT zf); + struct vertex { float x, y, z; @@ -182,7 +185,7 @@ static IDirect3DPixelShader9 *compile_pixel_shader9(IDirect3DDevice9 *device, co errors ? (char *)ID3D10Blob_GetBufferPointer(errors) : ""); if (FAILED(hr)) return NULL; - hr = D3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(compiled), constants); ok(hr == D3D_OK, "Could not get constant table from compiled pixel shader\n"); hr = IDirect3DDevice9_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(compiled), &pshader); @@ -197,7 +200,7 @@ static void draw_quad_with_shader9(IDirect3DDevice9 *device, IDirect3DVertexBuff HRESULT hr; D3DXMATRIX projection_matrix; - D3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); + pD3DXMatrixOrthoLH(&projection_matrix, 2.0f, 2.0f, 0.0f, 1.0f); IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &projection_matrix); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(0, 0, 0), 1.0f, 0); @@ -641,6 +644,7 @@ START_TEST(hlsl) IDirect3DVertexDeclaration9 *vdeclaration; IDirect3DVertexBuffer9 *quad_geometry; IDirect3DVertexShader9 *vshader_passthru; + HMODULE mod; if (!load_d3dcompiler()) { @@ -648,6 +652,14 @@ START_TEST(hlsl) return; } + if (!(mod = LoadLibraryA("d3dx9_36.dll"))) + { + win_skip("Failed to load d3dx9_36.dll.\n"); + return; + } + pD3DXGetShaderConstantTable = (void *)GetProcAddress(mod, "D3DXGetShaderConstantTable"); + pD3DXMatrixOrthoLH = (void *)GetProcAddress(mod, "D3DXMatrixOrthoLH"); + device = init_d3d9(&vdeclaration, &quad_geometry, &vshader_passthru); if (!device) return; diff --git a/dlls/d3dcompiler_47/tests/Makefile.in b/dlls/d3dcompiler_47/tests/Makefile.in index a4e3798bed..401ed30b0f 100644 --- a/dlls/d3dcompiler_47/tests/Makefile.in +++ b/dlls/d3dcompiler_47/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3dcompiler_47.dll -IMPORTS = d3d9 d3dx9 user32 +IMPORTS = d3d9 user32 EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../../d3dcompiler_43/tests

1 0

Hans Leidekker : msi/tests: Avoid test failure when running as an unprivileged user.
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: 90422f9bb59d4a2e34ad9cffbb4f04b896ab7235 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90422f9bb59d4a2e34ad9cff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 3 10:06:53 2020 +0100 msi/tests: Avoid test failure when running as an unprivileged user. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3c547bf04a..3b7b11d81e 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4054,7 +4054,6 @@ static void test_appsearch(void) r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, NULL, &hkey, NULL); - ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); if (r == ERROR_ACCESS_DENIED) { skip("insufficient rights\n"); @@ -4063,6 +4062,7 @@ static void test_appsearch(void) DeleteFileA(msifile); return; } + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", sizeof("c:\\windows\\system32\\notepad.exe"));

1 0

Gabriel Ivăncescu : wined3d: Return FALSE rather than E_FAIL in wined3d_context_gl_create_wgl_ctx.
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: a6606d0dae89c4f0e6dbecc369e4cadd391355cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6606d0dae89c4f0e6dbecc3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 3 14:00:12 2020 +0200 wined3d: Return FALSE rather than E_FAIL in wined3d_context_gl_create_wgl_ctx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 95769014af..458343ce4a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2049,7 +2049,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) { ERR("Failed to retrieve the backup device context.\n"); - return E_FAIL; + return FALSE; } context_gl->dc_is_private = TRUE;

1 0

Nikolay Sivov : kernelbase: Fix a typo in weights comparison helper (Coverity).
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: ac72e61edf3e36c1b1e7bd8dfd48e338a349e06f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac72e61edf3e36c1b1e7bd8d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:03:33 2020 +0300 kernelbase: Fix a typo in weights comparison helper (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c250c97968..da69e5a1f3 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -2191,7 +2191,7 @@ static int compare_weights(int flags, const WCHAR *str1, int len1, inc_str_pos( &str1, &len1, &dpos1, &dlen1 ); skip = 1; } - if (get_table_entry( wctype_table, dstr2[dpos1] ) & (C1_PUNCT | C1_SPACE)) + if (get_table_entry( wctype_table, dstr2[dpos2] ) & (C1_PUNCT | C1_SPACE)) { inc_str_pos( &str2, &len2, &dpos2, &dlen2 ); skip = 1;

1 0

Nikolay Sivov : vbscript/tests: Add missing checks for Close() calls (Coverity).
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: e04c168c3062d3ad2a8dcf5feaa4ece26a5a2d3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04c168c3062d3ad2a8dcf5f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:09:10 2020 +0300 vbscript/tests: Add missing checks for Close() calls (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/run.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 5357ab1f12..d45416a94a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1956,7 +1956,6 @@ static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) IActiveScriptParse *parser; IActiveScript *engine; IDispatch *script_disp; - LONG ref; HRESULT hres; engine = create_and_init_script(flags, TRUE); @@ -1980,13 +1979,10 @@ static HRESULT parse_script(DWORD flags, BSTR script_str, const WCHAR *delim) hres = IActiveScriptParse_ParseScriptText(parser, script_str, NULL, NULL, delim, 0, 0, 0, NULL, NULL); - IActiveScript_Close(engine); - IDispatch_Release(script_disp); - IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + close_script(engine); - ref = IActiveScriptParse_Release(parser); - ok(!ref, "ref=%d\n", ref); return hres; } @@ -2383,7 +2379,8 @@ static void test_gc(void) SET_EXPECT(global_success_d); SET_EXPECT(global_success_i); - IActiveScript_Close(engine); + hres = IActiveScript_Close(engine); + ok(hres == S_OK, "Close failed: %08x\n", hres); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i);

1 0

Nikolay Sivov : strmbase: Fix fixed size buffer copy in JoinFilterGraph() (Coverity).
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: 4c58a2311aebdc595ea2ae0823d3d108b18b787c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c58a2311aebdc595ea2ae08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 3 16:19:52 2020 +0300 strmbase: Fix fixed size buffer copy in JoinFilterGraph() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 002bf11665..5242efe762 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -290,7 +290,7 @@ static HRESULT WINAPI filter_JoinFilterGraph(IBaseFilter *iface, IFilterGraph *p EnterCriticalSection(&This->csFilter); { if (pName) - lstrcpyW(This->filterInfo.achName, pName); + lstrcpynW(This->filterInfo.achName, pName, MAX_FILTER_NAME); else *This->filterInfo.achName = '\0'; This->filterInfo.pGraph = pGraph; /* NOTE: do NOT increase ref. count */

1 0

Piotr Caban : webservices: Fix WsWriteText test crash on Windows 10.
by Alexandre Julliard 03 Jan '20

03 Jan '20

Module: wine Branch: master Commit: 83a518214d5a76af9a74b39a8f5b07638d553178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83a518214d5a76af9a74b39a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 3 14:31:42 2020 +0100 webservices: Fix WsWriteText test crash on Windows 10. The tests crashes on my system when utf8.value.dictionary != NULL. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index afbc46b83e..70623052de 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2215,6 +2215,7 @@ static void test_WsMoveReader(void) hr = WsWriteStartElement( writer, NULL, &localname2, &ns, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + memset(&utf8, 0, sizeof(utf8)); utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; utf8.value.bytes = (BYTE *)"test"; utf8.value.length = sizeof("test") - 1;

1 0