February 2016 - Wine-Commits

Alexandre Julliard : makefiles: Import libraries don' t need to depend on subdirectories even when there's a static lib.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 8a064a7d1226e179cdf026ab723762091c9b1260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a064a7d1226e179cdf026ab7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 17:41:17 2016 +0900 makefiles: Import libraries don't need to depend on subdirectories even when there's a static lib. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d09d91b..99faf92 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -430,7 +430,7 @@ $ac_dir/uninstall:: then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT -$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps +$ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: dummy diff --git a/configure b/configure index a17b9c9..ceb9e5e 100755 --- a/configure +++ b/configure @@ -7655,7 +7655,7 @@ fi then wine_fn_append_rule \ "__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT -$ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps +$ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps $ac_file.def: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec $ac_file.$STATIC_IMPLIBEXT: dummy

1 0

Hugh McMaster : reg: Explicitly use base 10 or base 16 with strtoulW.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: acb4e3f63a90ba0ae069fa41d930fddf09e32975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb4e3f63a90ba0ae069fa41d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:09 2016 +1100 reg: Explicitly use base 10 or base 16 with strtoulW. All Windows versions, except XP, parse the number 0123 as decimal. (XP parses 0123 as octal). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 3c98fc0..ef25fe5 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -243,7 +243,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { LPWSTR rest; DWORD val; - val = strtoulW(data, &rest, 0); + val = strtoulW(data, &rest, (data[1] == 'x') ? 16 : 10); if (*rest || data[0] == '-') { output_message(STRING_MISSING_INTEGER); break; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0077101..1958be0 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -272,8 +272,7 @@ static void test_add(void) ok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); ok(type == REG_DWORD, "got wrong type %d, expected %d\n", type, REG_DWORD); ok(size == sizeof(DWORD), "got wrong size %d, expected %d\n", size, (int)sizeof(DWORD)); - todo_wine ok(dword == 123 || broken(dword == 0123 /* WinXP */), - "got wrong data %d, expected %d\n", dword, 123); + ok(dword == 123 || broken(dword == 0123 /* WinXP */), "got wrong data %d, expected 123\n", dword); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Sebastian Lackner : kernel32: Do not inherit QT_* environment variables to Windows environment.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 4ac066cdaa3255b4c527b45ba685e30b189cb16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac066cdaa3255b4c527b45ba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 04:48:10 2016 +0100 kernel32: Do not inherit QT_* environment variables to Windows environment. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1d306a7..86333be 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -134,7 +134,8 @@ static inline BOOL is_special_env_var( const char *var ) !strncmp( var, "PWD=", sizeof("PWD=")-1 ) || !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) || - !strncmp( var, "TMP=", sizeof("TMP=")-1 )); + !strncmp( var, "TMP=", sizeof("TMP=")-1 ) || + !strncmp( var, "QT_", sizeof("QT_")-1 )); }

1 0

André Hentschel : advapi32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 4684dc2bfbf739ceae27694a4cefcdcbe6f33560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4684dc2bfbf739ceae27694a4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 15 23:14:46 2016 +0100 advapi32/tests: Use todo_wine_if() in tests. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 742ede1..881b3ec 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5210,11 +5210,8 @@ static void test_named_pipe_security(HANDLE token) ok(ret, "DuplicateHandle error %d\n", GetLastError()); access = get_obj_access(dup); - if (map[i].todo) -todo_wine - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); - else - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); + todo_wine_if (map[i].todo) + ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); }

1 0

Nikolay Sivov : dwrite: Use itemizer hint to reset invisible run glyph count.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: fca83b0915fd1087ea775496a383cfeb34e369bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca83b0915fd1087ea775496a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 16 00:59:25 2016 +0300 dwrite: Use itemizer hint to reset invisible run glyph count. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 7 +++---- dlls/dwrite/tests/layout.c | 11 +++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 164ac48..fbe1eaa 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -965,10 +965,9 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphAdvances = run->advances; run->run.glyphOffsets = run->offsets; - /* Special treatment of control script, shaping code adds normal glyphs for it, - with non-zero advances, and layout code exposes those as zero width clusters, - so we have to do it manually. */ - if (run->sa.script == Script_Common) + /* Special treatment for runs that don't produce visual output, shaping code adds normal glyphs for them, + with valid cluster map and potentially with non-zero advances; layout code exposes those as zero width clusters. */ + if (run->sa.shapes == DWRITE_SCRIPT_SHAPES_NO_VISUAL) run->run.glyphCount = 0; else run->run.glyphCount = run->glyphcount; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a6da532..0fe9151 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -33,7 +33,6 @@ static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR enusW[] = {'e','n','-','u','s',0}; static DWRITE_SCRIPT_ANALYSIS g_sa; -static DWRITE_SCRIPT_ANALYSIS g_control_sa; /* test IDWriteTextAnalysisSink */ static HRESULT WINAPI analysissink_QueryInterface(IDWriteTextAnalysisSink *iface, REFIID riid, void **obj) @@ -513,7 +512,9 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, /* see what's reported for control codes runs */ get_script_analysis(descr->string, descr->stringLength, &sa); - if (sa.script == g_control_sa.script) { + if (sa.shapes == DWRITE_SCRIPT_SHAPES_NO_VISUAL) { + UINT32 i; + /* glyphs are not reported at all for control code runs */ ok(run->glyphCount == 0, "got %u\n", run->glyphCount); ok(run->glyphAdvances != NULL, "advances array %p\n", run->glyphAdvances); @@ -523,6 +524,8 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, ok(descr->string != NULL, "got string %p\n", descr->string); ok(descr->stringLength > 0, "got string length %u\n", descr->stringLength); ok(descr->clusterMap != NULL, "clustermap %p\n", descr->clusterMap); + for (i = 0; i < descr->stringLength; i++) + ok(descr->clusterMap[i] == i, "got %u\n", descr->clusterMap[i]); } entry.kind = DRAW_GLYPHRUN; @@ -4852,7 +4855,6 @@ todo_wine START_TEST(layout) { - static const WCHAR ctrlstrW[] = {0x202a,0}; IDWriteFactory *factory; if (!(factory = create_factory())) { @@ -4860,9 +4862,6 @@ START_TEST(layout) return; } - /* actual script ids are not fixed */ - get_script_analysis(ctrlstrW, 1, &g_control_sa); - init_call_sequences(sequences, NUM_CALL_SEQUENCES); init_call_sequences(expected_seq, 1);

1 0

Hugh McMaster : reg: Fail if the data argument for REG_DWORD begins with a minus sign.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 474361ecb489fdedd78dd6be2ed20c2e031bf9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=474361ecb489fdedd78dd6be2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:08 2016 +1100 reg: Fail if the data argument for REG_DWORD begins with a minus sign. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f676e77..3c98fc0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -244,7 +244,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r LPWSTR rest; DWORD val; val = strtoulW(data, &rest, 0); - if (*rest) { + if (*rest || data[0] == '-') { output_message(STRING_MISSING_INTEGER); break; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ba9fbed..0077101 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -284,9 +284,9 @@ static void test_add(void) verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r);

1 0

Hugh McMaster : reg: Use strtoulW during conversion so we can set any value in the DWORD range.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 948888b9502537c6b872c87a994542a92987e2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948888b9502537c6b872c87a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:07 2016 +1100 reg: Use strtoulW during conversion so we can set any value in the DWORD range. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7a66753..f676e77 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -243,7 +243,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { LPWSTR rest; DWORD val; - val = strtolW(data, &rest, 0); + val = strtoulW(data, &rest, 0); if (*rest) { output_message(STRING_MISSING_INTEGER); break; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 37fc40a..ba9fbed 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -281,8 +281,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0xdeadbeef; - verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), - (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); @@ -295,8 +294,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = ~0u; - verify_reg(hkey, "dword12", REG_DWORD, &dword, sizeof(dword), - (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + verify_reg(hkey, "dword12", REG_DWORD, &dword, sizeof(dword), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg/tests: Add two more tests for REG_DWORD.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 0f42948bf1680daf4dfaca2f3abd71e7830f7621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f42948bf1680daf4dfaca2f3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:05 2016 +1100 reg/tests: Add two more tests for REG_DWORD. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4b780b0..2a96dd7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -292,6 +292,15 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = ~0u; + verify_reg(hkey, "dword12", REG_DWORD, &dword, sizeof(dword), + (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Sebastian Lackner : winegstreamer: Manually assign union variables.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 4c8125601ba8cdfdf600a8876e2c58d6fa6a3276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8125601ba8cdfdf600a8876… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 06:42:54 2016 +0100 winegstreamer: Manually assign union variables. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index c851798..96325d0 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -286,9 +286,11 @@ void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpoi gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { - struct cb_data cbdata = { QUERY_SINK, - { .query_sink_data = {pad, parent, query} } - }; + struct cb_data cbdata = { QUERY_SINK }; + + cbdata.u.query_sink_data.pad = pad; + cbdata.u.query_sink_data.parent = parent; + cbdata.u.query_sink_data.query = query; call_cb(&cbdata);

1 0

Sebastian Lackner : services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.
by Alexandre Julliard Feb. 16, 2016

Feb. 16, 2016

Module: wine Branch: master Commit: 94fb7c3b8bdb8e713dd229ad78621f91916240ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fb7c3b8bdb8e713dd229ad7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 06:02:30 2016 +0100 services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1335837..53a3846 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -631,7 +631,8 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); - if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) + if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER || + service_entry->config.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) { static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0}; WCHAR system_dir[MAX_PATH];

1 0