February 2020 - Wine-Commits

Rémi Bernon : setupapi/tests: Fix some format-overflow warnings.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 1bd961219198e5c6e3ac33fffd29eb281f10448f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bd961219198e5c6e3ac33ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:29 2020 +0100 setupapi/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 2 +- dlls/setupapi/tests/install.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index dcfe5cd231..a9ac0d849f 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2315,7 +2315,7 @@ static void test_get_actual_section(void) static void test_driver_list(void) { - char inf_dir[MAX_PATH], inf_path[MAX_PATH], inf_path2[MAX_PATH]; + char inf_dir[MAX_PATH], inf_path[MAX_PATH + 10], inf_path2[MAX_PATH + 10]; static const char hardware_id[] = "bogus_hardware_id\0"; static const char compat_id[] = "bogus_compat_id\0"; SP_DEVINSTALL_PARAMS_A params = {sizeof(params)}; diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 8a2f9eec35..c085b724b5 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -348,7 +348,7 @@ static void ok_registry(BOOL expectsuccess) static void test_cmdline(void) { static const char infwithspaces[] = "test file.inf"; - char path[MAX_PATH]; + char path[MAX_PATH + 16]; BOOL ret; create_inf_file(inffile, cmdline_inf); @@ -384,7 +384,7 @@ static void test_registry(void) { HKEY key; LONG res; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; BOOL ret; /* First create a registry structure we would like to be deleted */ @@ -414,7 +414,7 @@ static void test_registry(void) static void test_install_from(void) { - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HINF infhandle; HKEY key; LONG res; @@ -454,7 +454,7 @@ static void test_install_from(void) static void test_install_svc_from(void) { char inf[2048]; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HINF infhandle; BOOL ret; SC_HANDLE scm_handle, svc_handle; @@ -614,7 +614,7 @@ static void test_driver_install(void) HANDLE handle; SC_HANDLE scm_handle, svc_handle; BOOL ret; - char path[MAX_PATH], windir[MAX_PATH], driver[MAX_PATH]; + char path[MAX_PATH + 9], windir[MAX_PATH], driver[MAX_PATH]; DWORD attrs; /* Minimal stuff needed */ static const char *inf = @@ -683,7 +683,7 @@ static void test_driver_install(void) static void test_profile_items(void) { - char path[MAX_PATH], commonprogs[MAX_PATH]; + char path[MAX_PATH + 22], commonprogs[MAX_PATH]; static const char *inf = "[Version]\n" @@ -965,7 +965,7 @@ static const char dirid_inf[] = "[Version]\n" static void check_dirid(int dirid, LPCSTR expected) { char buffer[sizeof(dirid_inf)+11]; - char path[MAX_PATH], actual[MAX_PATH]; + char path[MAX_PATH + 9], actual[MAX_PATH]; LONG ret; DWORD size, type; HKEY key; @@ -1045,7 +1045,7 @@ static void test_install_files_queue(void) "[DestinationDirs]\n" "files_section=40000,dst\n"; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HSPFILEQ queue; void *context; HINF hinf; @@ -1367,7 +1367,7 @@ static void test_install_file(void) "[DestinationDirs]\n" "DefaultDestDir=40000,dst\n"; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; INFCONTEXT infctx; HINF hinf; BOOL ret; @@ -1466,7 +1466,7 @@ static void test_need_media(void) "DefaultDestDir=40000,dst\n"; SP_FILE_COPY_PARAMS_A copy_params = {sizeof(copy_params)}; - char path[MAX_PATH]; + char path[MAX_PATH + 9]; HSPFILEQ queue; HINF hinf; BOOL ret;

1 0

Rémi Bernon : kernel32/tests: Fix some format-overflow warnings.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: c2b81e8dfddf26dd4c939079286378c1b4aa92a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b81e8dfddf26dd4c939079… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:26 2020 +0100 kernel32/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 14 +++++++------- dlls/kernel32/tests/path.c | 14 +++++++------- dlls/kernel32/tests/process.c | 34 +++++++++++++++++----------------- dlls/kernel32/tests/toolhelp.c | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2b81e8dfddf26dd4c93…

1 0

Nikolay Sivov : dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace().
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 6ee109c5aab14ef7382b69a92862cd740ffd0ef2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ee109c5aab14ef7382b69a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:24:59 2020 +0300 dwrite: Add partial implementation for IDWriteFontFaceReference1::CreateFontFace(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 16 ++++++++++++++-- dlls/dwrite/tests/font.c | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 353282bbd4..bd969a8fa6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -6493,9 +6493,21 @@ static HRESULT WINAPI fontfacereference_EnqueueFileFragmentDownloadRequest(IDWri static HRESULT WINAPI fontfacereference1_CreateFontFace(IDWriteFontFaceReference1 *iface, IDWriteFontFace5 **fontface) { - FIXME("%p, %p.\n", iface, fontface); + struct dwrite_fontfacereference *reference = impl_from_IDWriteFontFaceReference1(iface); + IDWriteFontFace3 *fontface3; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, fontface); + + /* FIXME: created instance should likely respect given axis. */ + if (SUCCEEDED(hr = IDWriteFontFaceReference1_CreateFontFaceWithSimulations(iface, reference->simulations, + &fontface3))) + { + hr = IDWriteFontFace3_QueryInterface(fontface3, &IID_IDWriteFontFace5, (void **)fontface); + IDWriteFontFace3_Release(fontface3); + } + + return hr; } static UINT32 WINAPI fontfacereference1_GetFontAxisValueCount(IDWriteFontFaceReference1 *iface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d21326f7c9..38a7b4f3f8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9633,6 +9633,10 @@ static void test_font_resource(void) ok(hr == S_OK, "Failed to get axis values, hr %#x.\n", hr); ok(axis_values[0].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT, "Unexpected axis tag.\n"); + hr = IDWriteFontFaceReference1_CreateFontFace(reference, &fontface5); + ok(hr == S_OK, "Failed to create a font face, hr %#x.\n", hr); + IDWriteFontFace5_Release(fontface5); + IDWriteFontFaceReference1_Release(reference); IDWriteFontFile_Release(fontfile);

1 0

Akihiro Sagawa : gdi32: Fix function names in comments.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: bf06e25f6a79aa993d6bd43a31795ce83f8fd04e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf06e25f6a79aa993d6bd43a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Feb 11 19:57:56 2020 +0900 gdi32: Fix function names in comments. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 2 +- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/path.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 804fef18f9..1625193971 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -919,9 +919,9 @@ static const struct gdi_dc_funcs emfpath_driver = NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ + NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ NULL, /* pSetDCPenColor */ - NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 03bd097af2..3ed093701d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -9249,9 +9249,9 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ + NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ NULL, /* pSetDCPenColor */ - NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */ diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 7d51388a4e..8ecf9bf8e6 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -2217,9 +2217,9 @@ const struct gdi_dc_funcs path_driver = NULL, /* pSetArcDirection */ NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ + NULL, /* pSetBoundsRect */ NULL, /* pSetDCBrushColor */ NULL, /* pSetDCPenColor */ - NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBitsToDevice */ NULL, /* pSetDeviceClipping */ NULL, /* pSetDeviceGammaRamp */

1 0

Nikolay Sivov : crypt32: Fix CryptBinaryToStringW() to return required length properly.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 3d69d71e9e7d1cebf285b581674999768284e780 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d69d71e9e7d1cebf285b581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 11 12:25:40 2020 +0300 crypt32: Fix CryptBinaryToStringW() to return required length properly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 11 +++++++---- dlls/crypt32/tests/base64.c | 5 +---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index 221b452d7e..73619421ab 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -490,16 +490,19 @@ static BOOL BinaryToHexW(const BYTE *bin, DWORD nbin, DWORD flags, LPWSTR str, D needed = 2; needed += nbin * 2 + 1; + + if (!str) + { + *nstr = needed; + return TRUE; + } + if (needed > *nstr) { SetLastError(ERROR_MORE_DATA); return FALSE; } - *nstr = needed; - if (!str) - return TRUE; - while (nbin--) { *str++ = hex[(*bin >> 4) & 0xf]; diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 874f8e432d..7b9f4c1077 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -366,10 +366,8 @@ static void test_CryptBinaryToString(void) /* Systems that don't support HEXRAW format convert to BASE64 instead - 3 bytes in -> 4 chars + crlf + 1 null out. */ strLen = 0; ret = CryptBinaryToStringW(input, 3, CRYPT_STRING_HEXRAW, NULL, &strLen); -todo_wine { ok(ret, "Failed to get string length.\n"); ok(strLen == 9 || broken(strLen == 7), "Unexpected string length %d.\n", strLen); -} if (strLen == 7) { win_skip("CryptBinaryToString(HEXRAW) not supported\n"); @@ -383,10 +381,9 @@ todo_wine { { strLen = 0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen); -todo_wine { ok(ret, "CryptBinaryToStringW failed: %d\n", GetLastError()); ok(strLen > 0, "Unexpected string length.\n"); -} + strLen = ~0; ret = CryptBinaryToStringW(input, sizeof(input), CRYPT_STRING_HEXRAW|flags[i], NULL, &strLen);

1 0

Rémi Bernon : advpack/tests: Fix some format-overflow warnings.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: ba0d2ba21752503604334d87f052cd22fd83a907 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba0d2ba21752503604334d87… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:24 2020 +0100 advpack/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/tests/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index 1851dc16f0..135a09f97d 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -101,7 +101,7 @@ static void test_AddDelBackupEntry(void) { BOOL ret; HRESULT res; - CHAR path[MAX_PATH]; + CHAR path[MAX_PATH + 13]; CHAR windir[MAX_PATH]; lstrcpyA(path, CURR_DIR);

1 0

Rémi Bernon : advapi32/tests: Fix some format-overflow warnings.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 56a83c585aeb071af29824399e22db5cdce0318a URL: https://source.winehq.org/git/wine.git/?a=commit;h=56a83c585aeb071af2982439… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:23 2020 +0100 advapi32/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 484167656f..43d9738627 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -195,7 +195,7 @@ static void test_create_delete_svc(void) SC_HANDLE scm_handle, svc_handle1, svc_handle2; CHAR username[UNLEN + 1], domain[MAX_PATH]; DWORD user_size = UNLEN + 1; - CHAR account[UNLEN + 3]; + CHAR account[MAX_PATH + UNLEN + 1]; static const CHAR servicename [] = "winetest_create_delete"; static const CHAR pathname [] = "we_dont_care.exe"; static const CHAR empty [] = "";

1 0

Michael Stefaniuc : ieframe/tests: Get rid of a2bstr() and strcmp_wa().
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 1be1e8329e6b42356df2b98009e643b77c2442a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1be1e8329e6b42356df2b980… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 11 13:25:29 2020 +0100 ieframe/tests: Get rid of a2bstr() and strcmp_wa(). 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/ieframe/tests/webbrowser.c | 104 +++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1be1e8329e6b42356df2…

1 0

Francois Gouget : tests: Restore the colon in the test summary line.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: 20a7f77df6c7e38bd473ad18fa979f762eb5bce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a7f77df6c7e38bd473ad18… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 11 14:22:57 2020 +0100 tests: Restore the colon in the test summary line. Adjust the silenced tests line to match. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index edaf89bcca..7a5606a1ec 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -550,10 +550,10 @@ static int run_test( const char *name ) if (winetest_debug) { if (muted_todo_successes || muted_skipped || muted_traces) - printf( "%04x:%s Silenced %d todos, %d skips and %d traces.\n", + printf( "%04x:%s: Silenced %d todos, %d skips and %d traces.\n", GetCurrentProcessId(), test->name, muted_todo_successes, muted_skipped, muted_traces); - printf( "%04x:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", GetCurrentProcessId(), test->name, successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures,

1 0

Jacek Caban : makedep: Use -mno-cygwin for linking modules with no sources.
by Alexandre Julliard Feb. 11, 2020

Feb. 11, 2020

Module: wine Branch: master Commit: a592c1ed08f7c8211cd58e0c0a0d4865ed5af256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a592c1ed08f7c8211cd58e0c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 12:46:46 2020 +0100 makedep: Use -mno-cygwin for linking modules with no sources. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index a819cffca9..1d9a1b5a59 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4253,10 +4253,16 @@ static void load_sources( struct makefile *make ) add_generated_sources( make ); + if (!make->use_msvcrt && !has_object_file( make )) + { + strarray_add( &make->extradllflags, "-mno-cygwin" ); + make->use_msvcrt = 1; + } + LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); - if (crosstarget) make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); + make->is_cross = crosstarget && make->use_msvcrt; if (make->is_cross) {

1 0