January 2022 - Wine-commits

Nikolay Sivov : mfmediaengine: Improve AddRange() behavior for intersecting ranges.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 9b17bd175403ed790026a0858a31eeb896ce6cf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b17bd175403ed790026a085… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:14 2022 +0300 mfmediaengine: Improve AddRange() behavior for intersecting ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 28 ++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 101 +++++++++++++++++++++++++++---- 2 files changed, 115 insertions(+), 14 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 84d7677a328..4b5a3f83446 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -653,13 +653,35 @@ static BOOL WINAPI time_range_ContainsTime(IMFMediaTimeRange *iface, double time static HRESULT WINAPI time_range_AddRange(IMFMediaTimeRange *iface, double start, double end) { struct time_range *range = impl_from_IMFMediaTimeRange(iface); + struct range *c; + size_t i; TRACE("%p, %.8e, %.8e.\n", iface, start, end); - if (range->count) + for (i = 0; i < range->count; ++i) { - FIXME("Range merging is not implemented.\n"); - return E_NOTIMPL; + c = &range->ranges[i]; + + /* New range is fully contained within existing one. */ + if (c->start <= start && c->end >= end) + return S_OK; + + /* New range fully contains existing one. */ + if (c->start >= start && c->end <= end) + { + c->start = start; + c->end = end; + return S_OK; + } + + /* Merge if ranges intersect. */ + if ((start >= c->start && start <= c->end) || + (end >= c->start && end <= c->end)) + { + c->start = min(c->start, start); + c->end = max(c->end, end); + return S_OK; + } } if (!mf_array_reserve((void **)&range->ranges, &range->capacity, range->count + 1, sizeof(*range->ranges))) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 00690b25ebe..d5a118677e5 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -729,7 +729,6 @@ static void test_time_range(void) ok(end == 1.0, "Unexpected end %.e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 2.0, 3.0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); count = IMFMediaTimeRange_GetLength(range); @@ -737,49 +736,129 @@ todo_wine hr = IMFMediaTimeRange_GetStart(range, 0, &start); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(end == 3.0, "Unexpected end %.8e.\n", end); hr = IMFMediaTimeRange_AddRange(range, 10.0, 9.0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); count = IMFMediaTimeRange_GetLength(range); -todo_wine ok(count == 2, "Unexpected range count.\n"); hr = IMFMediaTimeRange_GetStart(range, 0, &start); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(start == 2.0, "Unexpected start %.8e.\n", start); hr = IMFMediaTimeRange_GetEnd(range, 0, &end); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(end == 3.0, "Unexpected end %.8e.\n", end); start = 0.0; hr = IMFMediaTimeRange_GetStart(range, 1, &start); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(start == 10.0, "Unexpected start %.8e.\n", start); -} + hr = IMFMediaTimeRange_GetEnd(range, 1, &end); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(end == 9.0, "Unexpected end %.8e.\n", end); -} + + hr = IMFMediaTimeRange_AddRange(range, 2.0, 9.1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 2, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 9.1, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_GetStart(range, 1, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 10.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 1, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 9.0, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 8.5, 2.5); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 2, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 2.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 9.1, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 20.0, 20.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 3, "Unexpected range count.\n"); + hr = IMFMediaTimeRange_Clear(range); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); count = IMFMediaTimeRange_GetLength(range); ok(!count, "Unexpected range count.\n"); + /* Intersect */ + hr = IMFMediaTimeRange_AddRange(range, 5.0, 10.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTimeRange_AddRange(range, 6.0, 12.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 5.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 12.0, "Unexpected end %.8e.\n", end); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_AddRange(range, 4.0, 6.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 4.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 12.0, "Unexpected end %.8e.\n", end); + + hr = IMFMediaTimeRange_AddRange(range, 5.0, 3.0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IMFMediaTimeRange_GetLength(range); + ok(count == 1, "Unexpected range count.\n"); + + hr = IMFMediaTimeRange_GetStart(range, 0, &start); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(start == 4.0, "Unexpected start %.8e.\n", start); + + hr = IMFMediaTimeRange_GetEnd(range, 0, &end); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(end == 12.0, "Unexpected end %.8e.\n", end); + IMFMediaTimeRange_Release(range); }

1 0

Alexandre Julliard : vkd3d: Always use _BitScanReverse on Windows.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: vkd3d Branch: master Commit: ab3aa96e1fc1a75b2b1f202030adb85380ee348d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ab3aa96e1fc1a75b2b1f202… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 16:49:57 2022 +0100 vkd3d: Always use _BitScanReverse on Windows. Use ULONG instead of unsigned long for non-Mingw msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/private/vkd3d_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index b7ce9ae..d22c26c 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -88,10 +88,10 @@ static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { -#ifdef _MSC_VER +#ifdef _WIN32 /* _BitScanReverse returns the index of the highest set bit, * unlike clz which is 31 - index. */ - unsigned long result; + ULONG result; _BitScanReverse(&result, x); return (unsigned int)result; #elif defined(HAVE_BUILTIN_CLZ)

1 0

Alexandre Julliard : vkd3d: Replace atomic_add_fetch() by InterlockedAdd().
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: vkd3d Branch: master Commit: beafa0914ecc89e6b0617db43469640dc92d3255 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=beafa0914ecc89e6b0617db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 16:50:37 2022 +0100 vkd3d: Replace atomic_add_fetch() by InterlockedAdd(). By analogy with InterlockedIncrement. It avoids the need for a configure check on Windows platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/private/vkd3d_common.h | 13 ++++--------- libs/vkd3d/command.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index d22c26c..1e19758 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -201,6 +201,10 @@ static inline LONG InterlockedIncrement(LONG volatile *x) { return __sync_add_and_fetch(x, 1); } +static inline LONG InterlockedAdd(LONG volatile *x, LONG val) +{ + return __sync_add_and_fetch(x, val); +} # else # error "InterlockedIncrement() not implemented for this platform" # endif /* HAVE_SYNC_ADD_AND_FETCH */ @@ -215,15 +219,6 @@ static inline LONG InterlockedDecrement(LONG volatile *x) # endif #endif /* _WIN32 */ -#if HAVE_SYNC_ADD_AND_FETCH -# define atomic_add_fetch(ptr, val) __sync_add_and_fetch(ptr, val) -#elif defined(_MSC_VER) -/* InterlockedAdd returns value after increment, like add_and_fetch. */ -# define atomic_add_fetch(ptr, val) InterlockedAdd(ptr, val) -#else -# error "atomic_add_fetch() not implemented for this platform" -#endif /* HAVE_SYNC_ADD_AND_FETCH */ - static inline void vkd3d_parse_version(const char *version, int *major, int *minor) { *major = atoi(version); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2cf1eba..f1ec6be 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -288,7 +288,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s LONG count; int rc; - if (!(count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + if (!(count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) return; WARN("Waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -299,7 +299,7 @@ static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, s return; } - while ((count = atomic_add_fetch(&fence->pending_worker_operation_count, 0))) + while ((count = InterlockedAdd(&fence->pending_worker_operation_count, 0))) { TRACE("Still waiting for %u pending fence operations (fence %p).\n", count, fence); @@ -410,7 +410,7 @@ static void *vkd3d_fence_worker_main(void *arg) { vkd3d_wait_for_gpu_fences(worker); - if (!worker->fence_count || atomic_add_fetch(&worker->enqueued_fence_count, 0)) + if (!worker->fence_count || InterlockedAdd(&worker->enqueued_fence_count, 0)) { if ((rc = pthread_mutex_lock(&worker->mutex))) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 136b020..d21cd41 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -192,7 +192,7 @@ struct vkd3d_fence_worker bool should_exit; bool pending_fence_destruction; - size_t enqueued_fence_count; + LONG enqueued_fence_count; struct vkd3d_enqueued_fence { VkFence vk_fence;

1 0

Francois Gouget : testbot/SetWinLocale: Add --sys-copy and --def-copy options.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: tools Branch: master Commit: 913994dc5faf3af4efcd3ee5facfb3ef313778c7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=913994dc5faf3af4efcd3ee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 28 18:31:13 2022 +0100 testbot/SetWinLocale: Add --sys-copy and --def-copy options. These provide control over copying the new locale to the system and default user accounts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 94 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 86 insertions(+), 8 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index fa5f90c..e544a58 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -310,7 +310,7 @@ sub CheckLocale($$) return undef; } -my ($OptHostName, $OptShow, $OptReboot); +my ($OptHostName, $OptShow, $OptSysCopy, $OptDefCopy, $OptReboot); my ($OptDefault, $OptLocale, $OptCountry, $OptSystem, $OptUTF8, $OptMUI, $OptKeyboard); while (@ARGV) { @@ -323,6 +323,22 @@ while (@ARGV) { $OptShow = 1; } + elsif ($Arg eq "--sys-copy") + { + $OptSysCopy = 1; + } + elsif ($Arg eq "--no-sys-copy") + { + $OptSysCopy = 0; + } + elsif ($Arg eq "--def-copy") + { + $OptDefCopy = 1; + } + elsif ($Arg eq "--no-def-copy") + { + $OptDefCopy = 0; + } elsif ($Arg eq "--reboot") { if (defined $OptReboot and !$OptReboot) @@ -426,13 +442,32 @@ if (!defined $Usage) } } - if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and - !$OptCountry and !$OptUTF8 and !$OptShow) + if (!$OptLocale and !$OptCountry and !$OptSystem and !$OptUTF8 and + !$OptMUI and !$OptKeyboard and !defined $OptSysCopy and + !defined $OptDefCopy) + { + if (!$OptShow) + { + Error("you must specify at least one locale to change\n"); + $Usage = 2; + } + if (defined $OptReboot) + { + Error("--(no-)reboot can only be used when changing a locale\n"); + $Usage = 2; + } + } + if ($OptShow and ($OptLocale or $OptCountry or $OptSystem or $OptUTF8 or + $OptMUI or $OptKeyboard or defined $OptSysCopy or + defined $OptDefCopy or defined $OptReboot)) { - Error("you must specify at least one locale to change\n"); + Error("--show and the locale options are mutually incompatible\n"); $Usage = 2; } + $OptSysCopy = 1 if (!defined $OptSysCopy); + $OptDefCopy = 1 if (!defined $OptDefCopy); + # Two settings only take effect after a reboot: # - System locale changes. # - Display language changes only require a log out + log in but that cannot @@ -447,7 +482,7 @@ if (defined $Usage) exit $Usage; } print "Usage: $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-reboot] HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--country CTY] [--system SYS] [--utf8] [--mui MUI] [--keyboard KBD] [--no-sys-copy] [--no-def-copy] [--no-reboot] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; @@ -490,13 +525,32 @@ if (defined $Usage) print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; print " display language.\n"; - print " . APIs: GetSystemPreferredUILanguages(),\n"; + print " . APIs: GetSystemPreferredUILanguages() (--sys-copy case),\n"; print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; print " . Powershell: Set-WinUILanguageOverride -Language MUI\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; + print " --sys-copy Copy the current locales (--locale --country --mui --keyboard)\n"; + print " to the system accounts (System/LocalSystem, NT Authority) and\n"; + print " in particular the one used by the logon screen. This is the\n"; + print " default.\n"; + print " . This requires elevated privileges.\n"; + print " . Windows 10 GUI: Time & language -> Language -> Administrative\n"; + print " language settings -> Copy Settings -> Welcome Screen and\n"; + print " system accounts.\n"; + print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -WelcomeScreen \$True\n"; + print " . Intl.cpl: CopySettingsToSystemAcct='true'\n"; + print " --no-sys-copy Do not copy the current locale to the system accounts such as\n"; + print " the one used by the logon screen.\n"; + print " --def-copy Copy the current locales (--locale --country --mui --keyboard)\n"; + print " to the default user account. This is the default.\n"; + print " . Windows 10 GUI: Time & language -> Language -> Administrative\n"; + print " language settings -> Copy Settings -> New user accounts.\n"; + print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -NewUser \$True\n"; + print " . Intl.cpl: CopySettingsToDefaultUserAcct='true'\n"; + print " --no-def-copy Do not copy the current locales to the default user account.\n"; print " --no-reboot Do not reboot Windows. Some locale changes only take effect\n"; print " after a reboot so this option should only be used for\n"; print " debugging.\n"; @@ -652,7 +706,7 @@ sub ShowWinSettings($) print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n"; print "\n"; - print ".DEFAULT account:\n"; + print ".DEFAULT account (see --sys-copy):\n"; # Locale used for the date and time in the logon screen print "Locale (--locale) = ", Value2Str($Settings->{DefLocale}), "\n"; print "LocaleName (--locale) = ", Value2Str($Settings->{DefLocaleName}), "\n"; @@ -772,11 +826,13 @@ $OptKeyboard ||= $OptDefault; # Generate the intl.cpl configuration # +my $CopyToSys = $OptSysCopy ? "true" : "false"; +my $CopyToDef = $OptDefCopy ? "true" : "false"; my @Config = ( # intl.cpl does not want single quotes on that one line! "<gs:GlobalizationServices xmlns:gs=\"urn:longhornGlobalizationUnattend\">", " <gs:UserList>", - " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='true' CopySettingsToSystemAcct='true'/>", + " <gs:User UserID='Current' CopySettingsToDefaultUserAcct='$CopyToDef' CopySettingsToSystemAcct='$CopyToSys'/>", " </gs:UserList>", ); if (defined $CountryId) @@ -952,6 +1008,28 @@ if ($KeyboardIds) CheckSetting($Settings, "InputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } +if ($OptSysCopy) +{ + if ($OptLocale) + { + CheckSetting($Settings, "DefLocale", "0000$LCIDLocale", "for --locale $OptLocale", 1); + CheckSetting($Settings, "DefLocaleName", $OptLocale, "for --locale $OptLocale"); + } + if ($OptCountry) + { + CheckSetting($Settings, "DefCountry", $CountryId, "for --country $OptCountry"); + CheckSetting($Settings, "DefCountryName", $OptCountry, "for --country $OptCountry"); + } + if ($OptMUI) + { + CheckSetting($Settings, "DefMachinePreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + } + if ($KeyboardIds) + { + CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); + } +} + Cleanup(); exit(1) if (!$Success); Debug(Elapsed($Start), " All done!\n");

1 0

Francois Gouget : testbot/SetWinLocale: Use the Powershell script to run intl.cpl.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: tools Branch: master Commit: 6f3c3bb8e6c04947bfb7e00393ff2107b4f7ed0d URL: https://source.winehq.org/git/tools.git/?a=commit;h=6f3c3bb8e6c04947bfb7e00… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 28 18:31:16 2022 +0100 testbot/SetWinLocale: Use the Powershell script to run intl.cpl. Also use RunAndWait() to simplify the code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 42 ++++++++---------------------------------- testbot/bin/SetWinLocale.ps1 | 29 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e544a58..b8908e6 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -79,7 +79,7 @@ sub Cleanup() } else { - $TA->Rm("$name0.out", "$name0.ps1"); + $TA->Rm("$name0.out", "$name0.ps1", "$name0.xml"); } } @@ -876,44 +876,18 @@ push @Config, "</gs:GlobalizationServices>"; # Change the Windows locale using intl.cpl # -Debug(Elapsed($Start), join("\n", " Sending the configuration file\nlocales.xml:", @Config, "")); +Debug(Elapsed($Start), join("\n", " Sending the configuration file\n$name0.xml:", @Config, "")); -if (!$TA->SendFileFromString(join("\r\n", @Config, ""), "locales.xml", 0)) +if (!$TA->SendFileFromString(join("\r\n", @Config, ""), "$name0.xml", 0)) { FatalError("could not send the configuration file:", $TA->GetLastError(), "\n"); } -# For some reason this only works when run from a batch script! -Debug(Elapsed($Start), " Sending the batch file\n"); -my $Cmd = 'control.exe intl.cpl,,/f:"locales.xml"'; -if (!$TA->SendFileFromString($Cmd, "script.bat", $TestAgent::SENDFILE_EXE)) -{ - FatalError("could not send the batch file:", $TA->GetLastError(), "\n"); -} - -Debug(Elapsed($Start), " Running intl.cpl\n"); -my $Pid = $TA->Run(["./script.bat"], 0); -if (!$Pid) -{ - FatalError("failed to run intl.cpl\n"); -} - -# Unfortunately the control.exe and/or intl.cpl exit code is unusable so -# there is no way to check for errors -Debug(Elapsed($Start), " Waiting for intl.cpl\n"); -if (!defined $TA->Wait($Pid, 120)) -{ - FatalError("could not run intl.cpl: ", $TA->GetLastError(), "\n"); -} - -if ($Debug) -{ - print STDERR "Not deleting script.bat and locales.xml\n"; -} -else -{ - $TA->Rm("script.bat", "locales.xml"); -} +my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", + "$name0.ps1", "locales", "$name0.xml"]; +Debug(Elapsed($Start), " Running ", join(" ", @$Cmd), "\n"); +my $Ret = $TA->RunAndWait($Cmd, 0, 120); +FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); # diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index 702b330..b893755 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -1,4 +1,4 @@ -# Shows the Windows locale settings +# Shows or sets the Windows locale settings # # Copyright 2022 Francois Gouget # @@ -104,6 +104,27 @@ function ShowSettings() } +# +# Modify the Windows locales settings +# + +function SetLocales($Argv) +{ + $XmlFile = $Argv[1] + $IntlArg = 'intl.cpl,,/f:"' + $XmlFile + '"' + Write-Output "Running: control.exe $IntlArg" + control.exe $IntlArg + # intl.cpl executes asynchronously which means that: + # - The exit code cannot be used to check for failures. + # - The configuration file should not be removed too early. + # - Further locale modifications (e.g. setting the code pages) should only + # be done after intl.cpl is done to avoid races. + # So 'wait' for intl.cpl to be done by introducing an arbitrary pause. + Start-Sleep 2 + exit 0 +} + + # # Main # @@ -111,17 +132,21 @@ function ShowSettings() function ShowUsage() { Write-Output "Usage: $Name0 settings" + Write-Output "or $Name0 locales XMLFILE" Write-Output "or $Name0 -?" Write-Output "" - Write-Output "Shows the Windows locales." + Write-Output "Shows or modifies the Windows locales." Write-Output "" Write-Output "Where:" Write-Output " settings Show the current Windows locale settings." + Write-Output " locales Modifies the locales by passing the $Name0.xml file to intl.cpl." + Write-Output " XMLFILE The filename of the intl.cpl XML configuration." Write-Output " -? Shows this help message." } $Action = $args[0] if ($Action -eq "settings") { ShowSettings } +if ($Action -eq "locales") { SetLocales $args } $Rc = 0 if ($Action -and $Action -ne "-?" -and $Action -ne "-h" -and $Action -ne "help") {

1 0

Francois Gouget : testbot/SetWinLocale: Move the intl.cpl code to Powershell.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: tools Branch: master Commit: 648477b382e3642811360c60e0ebdbea5d36d5da URL: https://source.winehq.org/git/tools.git/?a=commit;h=648477b382e3642811360c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 28 18:31:20 2022 +0100 testbot/SetWinLocale: Move the intl.cpl code to Powershell. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 103 +++++--------------------------- testbot/bin/SetWinLocale.ps1 | 136 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=648477b382e36428113…

1 0

Alexandre Julliard : makefiles: Disable printf format warnings for non-PE msvcrt modules.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 26a3472b340f01288b3fa4b98a4e8f363b62b135 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26a3472b340f01288b3fa4b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 18:47:25 2022 +0100 makefiles: Disable printf format warnings for non-PE msvcrt modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 ++++++++++++++++++++++++++++ configure.ac | 3 ++- tools/makedep.c | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7760e43b8e9..bcefc8e3247 100755 --- a/configure +++ b/configure @@ -19467,6 +19467,34 @@ printf "%s\n" "$ac_cv_cflags__fshort_wchar" >&6; } if test "x$ac_cv_cflags__fshort_wchar" = xyes then : MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar" +fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-format" >&5 +printf %s "checking whether the compiler supports -Wno-format... " >&6; } +if test ${ac_cv_cflags__Wno_format+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-format" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_cflags__Wno_format=yes +else $as_nop + ac_cv_cflags__Wno_format=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_format" >&5 +printf "%s\n" "$ac_cv_cflags__Wno_format" >&6; } +if test "x$ac_cv_cflags__Wno_format" = xyes +then : + MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format" fi ;; esac diff --git a/configure.ac b/configure.ac index 181047ef0d8..0aad012060e 100644 --- a/configure.ac +++ b/configure.ac @@ -1880,7 +1880,8 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= WINE_TRY_CFLAGS([-Wl,-delayload,autoconftest.dll],[AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])]) ;; *) MSVCRTFLAGS="-D_WIN32" WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) - WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; + WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) + WINE_TRY_CFLAGS([-Wno-format],[MSVCRTFLAGS="$MSVCRTFLAGS -Wno-format"]) ;; esac case $host_cpu in diff --git a/tools/makedep.c b/tools/makedep.c index 5dc0a97fdb3..4172720fbf0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3027,6 +3027,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output( "%s.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s$(CC) -c -o $@ %s", cmd_prefix( "CC" ), source->filename ); output_filenames( defines ); + output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); if (make->sharedlib || (source->file->flags & FLAG_C_UNIX)) { output_filenames( unix_dllflags ); @@ -3038,7 +3039,6 @@ static void output_source_default( struct makefile *make, struct incl_file *sour if (!*dll_ext && make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); } - output_filenames( make->extlib ? extra_cflags_extlib : extra_cflags ); output_filenames( cpp_flags ); output_filename( "$(CFLAGS)" ); output( "\n" );

1 0

Fabian Maurer : dxva2/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: ab76f35595c6e531f630a966483901d7d38d02b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab76f35595c6e531f630a966… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:15:56 2022 +0100 dxva2/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 5de39fe1360..d94299f0c78 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -356,7 +356,7 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) + todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n");

1 0

Fabian Maurer : evr/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 892007d2e4852368d0f09dd9610a88a85dde5ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=892007d2e4852368d0f09dd9… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:15:57 2022 +0100 evr/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 046a7e4db59..acbb2b1869a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -645,15 +645,15 @@ static void test_default_mixer(void) ok(color == 0x121212, "Unexpected color %#x.\n", color); hr = IMFVideoProcessor_GetFilteringRange(processor, DXVA2_DetailFilterChromaLevel, &range); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetFilteringValue(processor, DXVA2_DetailFilterChromaLevel, &dxva_value); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); IMFVideoProcessor_Release(processor); @@ -1284,11 +1284,11 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorCaps(processor, (GUID *)&DXVA2_VideoProcSoftwareDevice, &caps); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); @@ -1300,7 +1300,7 @@ todo_wine IMFMediaType_Release(media_type); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); @@ -1313,11 +1313,11 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetVideoProcessorMode(processor, &guid); -todo_wine + todo_wine ok(hr == S_FALSE, "Unexpected hr %#x.\n", hr); hr = IMFVideoProcessor_GetAvailableVideoProcessorModes(processor, &count, &guids); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) CoTaskMemFree(guids); @@ -2263,21 +2263,21 @@ static void test_presenter_quality_control(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMaximumDropMode(qa_limits, &mode); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ok(mode == MF_DROP_MODE_NONE, "Unexpected mode %d.\n", mode); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, NULL); -todo_wine + todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IMFQualityAdviseLimits_GetMinimumQualityLevel(qa_limits, &level); -todo_wine + todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ok(level == MF_QUALITY_NORMAL, "Unexpected level %d.\n", level);

1 0

Fabian Maurer : hlink/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: ca87f03a66e8fc29117ce8fde9ba97c8112ba928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca87f03a66e8fc29117ce8fd… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:00 2022 +0100 hlink/tests: Avoid "misleading indentation" warnings. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hlink/tests/hlink.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index c905093bd86..1d2c530b52d 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -2364,9 +2364,9 @@ if (0) { /* these currently open a browser window on wine */ CHECK_CALLED(IsSystemMoniker); CHECK_CALLED(GetDisplayName); CHECK_CALLED(HBC_GetObject); -todo_wine + todo_wine CHECK_CALLED(BindStatusCallback_GetBindInfo); -todo_wine + todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); todo_wine { @@ -2374,15 +2374,15 @@ todo_wine { CHECK_CALLED(BindStatusCallback_OnObjectAvailable); } CHECK_CALLED(HT_QueryInterface_IHlinkTarget); -todo_wine + todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); -todo_wine + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); -todo_wine + todo_wine CHECK_CALLED(HT_GetFriendlyName); -todo_wine + todo_wine CHECK_CALLED(BindStatusCallback_OnStopBinding); ok(bind_callback_refs == 1, "Got unexpected refcount %d.\n", bind_callback_refs); @@ -2400,7 +2400,7 @@ todo_wine CHECK_CALLED(IsSystemMoniker); CHECK_CALLED(GetDisplayName); CHECK_CALLED(HBC_GetObject); -todo_wine + todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); @@ -2425,13 +2425,13 @@ todo_wine (IUnknown *)&HlinkTarget); ok(hres == S_OK, "Got hr %#x.\n", hres); CHECK_CALLED(HT_QueryInterface_IHlinkTarget); -todo_wine + todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); -todo_wine + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); -todo_wine + todo_wine CHECK_CALLED(HT_GetFriendlyName); hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext); @@ -2456,10 +2456,10 @@ todo_wine ok(hres == MK_S_ASYNCHRONOUS, "Navigate failed: %#x\n", hres); CHECK_CALLED(IsSystemMoniker); CHECK_CALLED(GetDisplayName); -todo_wine + todo_wine CHECK_CALLED(BindStatusCallback_GetBindInfo); CHECK_CALLED(HBC_GetObject); -todo_wine + todo_wine CHECK_CALLED(Reduce); CHECK_CALLED(BindToObject); @@ -2491,13 +2491,13 @@ todo_wine ok(hres == S_OK, "Got hr %#x.\n", hres); CHECK_CALLED(BindStatusCallback_OnObjectAvailable); CHECK_CALLED(HT_QueryInterface_IHlinkTarget); -todo_wine + todo_wine CHECK_CALLED(HT_GetBrowseContext); CHECK_CALLED(HT_SetBrowseContext); -todo_wine + todo_wine CHECK_CALLED(HBC_QueryInterface_IHlinkHistory); CHECK_CALLED(HT_Navigate); -todo_wine + todo_wine CHECK_CALLED(HT_GetFriendlyName); hres = IHlink_Navigate(hlink, 0, pbc, NULL, &HlinkBrowseContext);

1 0