January 2022 - Wine-Commits

Nikolay Sivov : mfmediaengine: Handle shutdown state in GetBuffered().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: a4890ac799a01c6fddad6d210ec6f1e2489cb450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4890ac799a01c6fddad6d21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 10:17:12 2022 +0300 mfmediaengine: Handle shutdown state in GetBuffered(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 6 +++++- dlls/mfmediaengine/tests/mfmediaengine.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 490d1630e95..91f1224f4b0 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1525,8 +1525,12 @@ static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngineEx *iface, IMFMedia return hr; EnterCriticalSection(&engine->cs); - if (!isnan(engine->duration)) + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!isnan(engine->duration)) hr = IMFMediaTimeRange_AddRange(*range, 0.0, engine->duration); + LeaveCriticalSection(&engine->cs); return hr; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 388af4b1877..6e201893b0c 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -341,7 +341,6 @@ static void test_Shutdown(void) ok(state == 100, "Unexpected state %d.\n", state); hr = IMFMediaEngine_GetBuffered(media_engine, &time_range); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaEngine_Load(media_engine);

1 0

Alexandre Julliard : vkd3d: Replace atomic_add_fetch() by InterlockedAdd().
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

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

Alexandre Julliard : vkd3d: Always use _BitScanReverse on Windows.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

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

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

Jan. 28, 2022

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

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

Jan. 28, 2022

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: Add --sys-copy and --def-copy options.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

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

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

Jan. 27, 2022

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

Fabian Maurer : oledb32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: ad2dc608c0b427a9a7d007a2c519e771516b70f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad2dc608c0b427a9a7d007a2… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:18:05 2022 +0100 oledb32/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/oledb32/tests/convert.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 8ec64d40ae5..0d888e834e3 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -358,7 +358,7 @@ static void test_converttoi1(void) dst_len = dst = 0x12; *(int *)src = 0x4321cafe; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -492,7 +492,7 @@ todo_wine hr = IDataConvert_DataConvert(convert, DBTYPE_UI1, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(dst)) || dst_len == 0x12 /* W2K+ */, "got %ld\n", dst_len); ok(dst == 0x12, "got %08x\n", dst); @@ -507,7 +507,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -516,7 +516,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0x12abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -602,7 +602,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -611,7 +611,7 @@ todo_wine dst_len = dst = 0x12; *(DWORD*)src = 0x12abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI1, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -669,7 +669,7 @@ static void test_converttoi2(void) dst_len = dst = 0x1234; *(int *)src = 0x4321cafe; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -811,14 +811,14 @@ todo_wine hr = IDataConvert_DataConvert(convert, DBTYPE_UI2, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(dst)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len); ok(dst == 0x1234, "got %08x\n", dst); dst_len = dst = 0x1234; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -827,7 +827,7 @@ todo_wine dst_len = dst = 0x1234; *(DWORD*)src = 0x1234abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -914,7 +914,7 @@ todo_wine dst_len = dst = 0x1234; *(DWORD*)src = 0xabcd1234; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -923,7 +923,7 @@ todo_wine dst_len = dst = 0x1234; *(DWORD*)src = 0x1234abcd; hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_UI2, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); -todo_wine + todo_wine ok(hr == DB_E_DATAOVERFLOW, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); ok(dst_len == sizeof(dst), "got %ld\n", dst_len); @@ -1132,7 +1132,7 @@ static void test_converttoi4(void) hr = IDataConvert_DataConvert(convert, DBTYPE_UI4, DBTYPE_I4, 0, &dst_len, src, &i4, sizeof(i4), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); ok(dst_status == DBSTATUS_E_DATAOVERFLOW, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(i4)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len); ok(i4 == 0x12345678, "got %08x\n", i4); @@ -2817,9 +2817,9 @@ static void test_converttoui4(void) dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_UI4, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); -todo_wine + todo_wine ok(dst_status == DBSTATUS_E_SIGNMISMATCH, "got %08x\n", dst_status); -todo_wine + todo_wine ok(broken(dst_len == sizeof(dst)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len); ok(dst == 0x12345678, "got %08x\n", dst); @@ -3056,9 +3056,9 @@ static void test_converttoui8(void) dst_len = 0x1234; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_UI8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == DB_E_ERRORSOCCURRED, "got %08x\n", hr); -todo_wine + todo_wine ok(dst_status == DBSTATUS_E_SIGNMISMATCH, "got %08x\n", dst_status); -todo_wine + todo_wine ok(dst_len == 0x1234, "got %ld\n", dst_len); ok(dst.QuadPart == 0xcc, "got %d\n", (int)dst.QuadPart);

1 0

Fabian Maurer : opcservices/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: f3f8619fab8036ee78220c7a722eb00bc4c532a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3f8619fab8036ee78220c7a… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:18:06 2022 +0100 opcservices/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/opcservices/tests/opcservices.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index cd683b0a206..59cd3b5df30 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -635,7 +635,7 @@ static void test_rel_part_uri(void) hr = IOpcPartUri_GetRawUri(rel_uri, &str); ok(SUCCEEDED(hr), "Failed to get rel uri, hr %#x.\n", hr); - todo_wine_if(i == 3 || i == 4 || i == 8 || i == 9) + todo_wine_if(i == 3 || i == 4 || i == 8 || i == 9) ok(!lstrcmpW(str, rel_uriW), "%u: unexpected rel uri %s, expected %s.\n", i, wine_dbgstr_w(str), wine_dbgstr_w(rel_uriW)); SysFreeString(str); @@ -1136,7 +1136,7 @@ static void test_combine_uri(void) hr = IOpcPartUri_GetRawUri(combined_uri, &str); ok(SUCCEEDED(hr), "%u: failed to get raw uri, hr %#x.\n", i, hr); - todo_wine_if(i == 2 || i == 3) + todo_wine_if(i == 2 || i == 3) ok(!lstrcmpW(str, combinedW), "%u: unexpected uri %s.\n", i, wine_dbgstr_w(str)); SysFreeString(str); @@ -1190,7 +1190,7 @@ static void test_create_part_uri(void) hr = IOpcPartUri_GetRawUri(part_uri, &str); ok(SUCCEEDED(hr), "Failed to get raw uri, hr %#x.\n", hr); - todo_wine_if(i == 1 || i == 2 || i == 4) + todo_wine_if(i == 1 || i == 2 || i == 4) ok(!lstrcmpW(str, rawW), "%u: unexpected raw uri %s.\n", i, wine_dbgstr_w(str)); SysFreeString(str); @@ -1200,7 +1200,7 @@ static void test_create_part_uri(void) ret = FALSE; hr = IOpcPartUri_IsEqual(part_uri, uri, &ret); ok(SUCCEEDED(hr), "IsEqual failed, hr %#x.\n", hr); - todo_wine_if(i == 1 || i == 2 || i == 4) + todo_wine_if(i == 1 || i == 2 || i == 4) ok(!!ret, "%u: unexpected result %d.\n", i, ret); IOpcPartUri_Release(part_uri);

1 0

Fabian Maurer : msvfw32/tests: Avoid "misleading indentation" warnings.
by Alexandre Julliard Jan. 27, 2022

Jan. 27, 2022

Module: wine Branch: master Commit: d8b37d6628a6a808007ba547d51ff6deedb2b775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8b37d6628a6a808007ba547… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Thu Jan 27 20:16:11 2022 +0100 msvfw32/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/msvfw32/tests/msvfw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvfw32/tests/msvfw.c b/dlls/msvfw32/tests/msvfw.c index def78f02e9d..07ff7e3694c 100644 --- a/dlls/msvfw32/tests/msvfw.c +++ b/dlls/msvfw32/tests/msvfw.c @@ -477,7 +477,7 @@ static void test_ICInfo(void) ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); /* Drivers installed after msvfw32 is loaded are not enumerated. */ -todo_wine + todo_wine ok(!ICInfo(test_type, 0, &info), "Expected failure.\n"); ret = ICRemove(test_type, test_handler, 0); @@ -505,7 +505,7 @@ todo_wine ok(!lstrcmpW(info.szDriver, L"bogus"), "Got unexpected driver %s.\n", wine_dbgstr_w(info.szDriver)); /* Drivers installed after msvfw32 is loaded are not enumerated. */ -todo_wine + todo_wine ok(!ICInfo(test_type, 0, &info), "Expected failure.\n"); ret = WritePrivateProfileStringA("drivers32", "wine.test", NULL, "system.ini");

1 0