January 2022 - Wine-commits

Alexandre Julliard : vkd3d-shader: Fix some DWORD/unsigned int pointer mismatches.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: vkd3d Branch: master Commit: 2d1fb5ef334a6f373a5e83f537650b84581cb6b6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2d1fb5ef334a6f373a5e83f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 11:51:34 2022 +0100 vkd3d-shader: Fix some DWORD/unsigned int pointer mismatches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9476765..be24a74 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1155,7 +1155,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in struct hlsl_type *lhs_type = lhs->data_type; struct hlsl_ir_store *store; struct hlsl_ir_expr *copy; - DWORD writemask = 0; + unsigned int writemask = 0; if (assign_op == ASSIGN_OP_SUB) { @@ -2359,7 +2359,7 @@ struct_declaration: var_modifiers struct_spec variables_def_optional ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!$3) { @@ -2449,7 +2449,7 @@ field: var_modifiers field_type variables_def ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; @@ -2619,7 +2619,7 @@ parameter: input_mods var_modifiers type any_identifier colon_attribute { struct hlsl_type *type; - DWORD modifiers = $2; + unsigned int modifiers = $2; if (!(type = apply_type_modifiers(ctx, $3, &modifiers, @2))) YYABORT; @@ -2858,7 +2858,7 @@ declaration: var_modifiers type variables_def ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT;

1 0

Alexandre Julliard : vkd3d-shader: Use LONG type with InterlockedIncrement.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: vkd3d Branch: master Commit: 7710f5deaf05b2c2c76b89fa2cf61a3f767af5bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7710f5deaf05b2c2c76b89f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 11:51:58 2022 +0100 vkd3d-shader: Use LONG type with InterlockedIncrement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 47fe3d6..ae0662b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -308,7 +308,7 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const char *suffix, const void *data, size_t size) { - static int shader_id = 0; + static LONG shader_id = 0; char filename[1024]; unsigned int id; FILE *f;

1 0

Alexandre Julliard : Update favicon.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: website Branch: master Commit: b79f87d1e7850b3b3b6254266bc0d76f5e8ac7d6 URL: https://source.winehq.org/git/website.git/?a=commit;h=b79f87d1e7850b3b3b625… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 30 13:34:28 2022 +0100 Update favicon. Extracted from oic_winelogo.svg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52088 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- favicon.ico | Bin 1150 -> 5430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/favicon.ico b/favicon.ico index 3a71334b..0f5814c9 100644 Binary files a/favicon.ico and b/favicon.ico differ

1 0

Alexandre Julliard : packaging: Remove Ubuntu 21.04.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: tools Branch: master Commit: 02d3b1e3417c821dba516c2b1f5f4ca585bb4ac9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=02d3b1e3417c821dba516c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 29 09:51:12 2022 +0100 packaging: Remove Ubuntu 21.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 186f65a..079a68a 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,10 +34,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 71844e9..b0ec672 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="34 35 buster bullseye bookworm bionic focal hirsute impish" +distros="34 35 buster bullseye bookworm bionic focal impish" dry_run= build=1 @@ -243,7 +243,6 @@ do bookworm) add_deb debian $i Debian_Testing_standard testing ;; bionic) add_deb ubuntu $i xUbuntu_18.04 ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; - hirsute) add_deb ubuntu $i xUbuntu_21.04 ;; impish) add_deb ubuntu $i xUbuntu_21.10 ;; *) echo "Unknown distro $i"; exit 1 ;; esac diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 8541204..7b8299e 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -18,7 +18,6 @@ + /ubuntu/dists + /ubuntu/dists/bionic + /ubuntu/dists/focal -+ /ubuntu/dists/hirsute + /ubuntu/dists/impish - /ubuntu/dists/* - /ubuntu/*

1 0

Francois Gouget : testbot/SetWinLocale: Take --reboot into account when checking the results.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: tools Branch: master Commit: d003d1096624d1e3c8851861051400624f4b73a8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d003d1096624d1e3c885186… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 31 15:07:10 2022 +0100 testbot/SetWinLocale: Take --reboot into account when checking the results. Don't complain about settings that are only modified after a reboot if none took place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2ff8348..6535c49 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -904,7 +904,19 @@ if ($OptUTF8) } if ($OptMUI) { - CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($OptReboot) + { + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($Settings->{PreferredUILanguagesPending}) + { + Error("PreferredUILanguagesPending should not be set for --mui $OptMUI\n"); + $Success = 0; + } + } + else + { + CheckSetting($Settings, "PreferredUILanguagesPending", $OptMUI, "for --mui $OptMUI"); + } } if ($KeyboardIds) { @@ -923,7 +935,7 @@ if ($OptSysCopy) CheckSetting($Settings, "DefCountry", $CountryId, "for --country $OptCountry"); CheckSetting($Settings, "DefCountryName", $OptCountry, "for --country $OptCountry"); } - if ($OptMUI) + if ($OptMUI and $OptReboot) { CheckSetting($Settings, "DefMachinePreferredUILanguages", $OptMUI, "for --mui $OptMUI"); } @@ -932,6 +944,13 @@ if ($OptSysCopy) CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } } +if (!$OptReboot and ($OptSystem or $OptMUI)) +{ + my @Pending; + push @Pending, "--system $OptSystem" if ($OptSystem); + push @Pending, "--mui $OptMUI" if ($OptMUI); + Warning(join(" ", "the", @Pending, "changes are still pending\n")); +} Cleanup(); exit(1) if (!$Success);

1 0

Francois Gouget : testbot/SetWinLocale: Nls:InstallLanguage is unaffected by --system.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: tools Branch: master Commit: a369e34e4e9ed61193e77c0a3d02be9581877f8e URL: https://source.winehq.org/git/tools.git/?a=commit;h=a369e34e4e9ed61193e77c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 31 15:53:08 2022 +0100 testbot/SetWinLocale: Nls:InstallLanguage is unaffected by --system. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 6535c49..18cbfc2 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -690,8 +690,8 @@ sub ShowWinSettings($) print "\n"; print "System settings:\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; - print "Nls:InstallLang (--system) = ", Value2Str($Settings->{SysInstallLang}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; + print "Nls:InstallLang = ", Value2Str($Settings->{SysInstallLang}), "\n"; print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; print "MACCP (--utf8) = ", Value2Str($Settings->{MACCP}), "\n"; print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n";

1 0

Francois Gouget : testbot/SetWinLocale: Re-set --locale if it does not stick after the reboot.
by Alexandre Julliard 31 Jan '22

31 Jan '22

Module: tools Branch: master Commit: c5fbcedc611d5fcde1fba64fcf98a4f571be480f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c5fbcedc611d5fcde1fba64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 31 16:06:32 2022 +0100 testbot/SetWinLocale: Re-set --locale if it does not stick after the reboot. On Windows 10 21H1 some process typically resets the --locale and --country some time after the login (except when they are changed through the GUI)!!! So wait for the reset to happen and set them again so they are as expected at least until the next reboot :-( Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 92 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 18cbfc2..81bb221 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -41,6 +41,8 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; +my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; @@ -499,12 +501,18 @@ if (defined $Usage) print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; print " --locale LOC Specifies the user formats (see --defaults).\n"; + print " . Windows 10 may reset this setting a few seconds after a\n"; + print " the next log in. Thus one should not expect this change to\n"; + print " persist after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; + print " . Windows 10 may reset this setting a few seconds after a\n"; + print " the next log in. Thus one should not expect this change to\n"; + print " persist after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; print " . APIs: GetUserGeoID().\n"; print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; @@ -555,9 +563,10 @@ if (defined $Usage) 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"; + print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; + print " effect after the next reboot. This will also prevent working\n"; + print " around cases where some locale changes do not stick after a\n"; + print " reboot. So this should only be used for debugging.\n"; print " --debug Show more detailed information about progress.\n"; print " --help Shows this usage message.\n"; exit 0; @@ -713,9 +722,10 @@ sub ShowWinSettings($) print "InputMethod (--keyboard) = ", Value2Str($Settings->{DefInputMethod}), "\n"; } +my $InitialSettings = GetWinSettings(); if ($OptShow) { - ShowWinSettings(GetWinSettings()); + ShowWinSettings($InitialSettings); Cleanup(); exit(0); } @@ -814,24 +824,32 @@ $OptKeyboard ||= $OptDefault; # -# Change the Windows locale +# Helper to change the Windows locales # -my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", - "$name0.ps1", "locales", $OptLocale || ".", $CountryId || ".", - $OptSystem || ".", $OptUTF8 ? "true" : "false", $OptMUI || ".", - $KeyboardIds ? $KeyboardIds->[0] : ".", - $OptSysCopy ? "true" : "false", $OptDefCopy ? "true" : "false"]; -Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); -my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); -FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); -my $Out = $TA->GetFileToString("$name0.out"); -foreach my $Line (split /\n/, $Out || "") +sub SetWinLocales($$$$$$$$) { - $Line =~ s/\r$//; - Info("$Line\n"); + my ($SysCopy, $DefCopy, $Locale, $CountryId, $System, $UTF8, $MUI, $KeyboardIds) = @_; + + my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", + "$name0.ps1", "locales", $Locale || ".", $CountryId || ".", + $System || ".", $UTF8 ? "true" : "false", $MUI || ".", + $KeyboardIds ? $KeyboardIds->[0] : ".", + $SysCopy ? "true" : "false", $DefCopy ? "true" : "false"]; + Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); + my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); + FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); + my $Out = $TA->GetFileToString("$name0.out"); + foreach my $Line (split /\n/, $Out || "") + { + $Line =~ s/\r$//; + Info("$Line\n"); + } } +SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, + $OptSystem, $OptUTF8, $OptMUI, $KeyboardIds); + # # Reboot to finalize the changes @@ -839,7 +857,7 @@ foreach my $Line (split /\n/, $Out || "") if ($OptReboot) { - $Cmd = ["shutdown.exe", "/r", "/t", "0"]; + my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows @@ -853,6 +871,44 @@ if ($OptReboot) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); } + + # Skip this check on pre-Windows 10 versions, i.e. those that don't have + # 'CountryName' and if the settings were not changed in the first place. + if ($InitialSettings->{CountryName} and + (($OptLocale and $InitialSettings->{Locale} ne $OptLocale) or + ($OptCountry and $InitialSettings->{Country} ne $CountryId))) + { + # On Windows 10 21H1 some process typically resets the --locale and + # --country some time after the login!!! + # This also happens when making the change through the Powershell's + # Set-Culture and Set-WinHomeLocation calls, but not when manually going + # through the GUI. + # So wait for the reset to happen and re-set them :-( + my $Expected = $OptLocale ? "--locale $OptLocale" : ""; + $Expected .= !$OptCountry ? "" : (($Expected ? " and " : "") . ("--country $OptCountry")); + Debug(Elapsed($Start), " Expecting $Expected to get reverted\n"); + foreach (1..30) + { + my $Reverted; + if ($OptCountry) + { + my $Nation = RegGetValue($HKCU_GEO, "Nation"); + $Reverted = "--country $Nation" if ($Nation ne $CountryId); + } + else + { + my $LocaleName = RegGetValue($HKCU_INTERNATIONAL, "LocaleName"); + $Reverted = "--locale $LocaleName" if ($LocaleName ne $OptLocale); + } + if ($Reverted) + { + Warning("$Expected got reverted to $Reverted. Setting them again but this will not stick across reboots\n"); + SetWinLocales(undef, undef, $OptLocale, $CountryId, undef, undef, undef, undef); + last; + } + sleep(2); + } + } }

1 0

CJ Silver : WWN Issue 410
by Jeremy Newman 28 Jan '22

28 Jan '22

Module: website Branch: master Commit: 02ab9dc8705e915dce027243e3cf34b398fa67f8 URL: https://source.winehq.org/git/website.git/?a=commit;h=02ab9dc8705e915dce027… Author: CJ Silver <cjsilver(a)codeweavers.com> Date: Fri Jan 28 15:46:51 2022 -0600 WWN Issue 410 --- news/en/2022012802.xml | 18 ++ wwn/en/wn20220128_410.xml | 472 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 490 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=02ab9dc8705e915dc…

1 0

Alexandre Julliard : Wine release 7.1
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: website Branch: master Commit: b7e7cc906aa85f31cc49cd5e6dc4633caee4c30d URL: https://source.winehq.org/git/website.git/?a=commit;h=b7e7cc906aa85f31cc49c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 21:29:57 2022 +0100 Wine release 7.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022012801.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2022012801.xml b/news/en/2022012801.xml new file mode 100644 index 00000000..72a10388 --- /dev/null +++ b/news/en/2022012801.xml @@ -0,0 +1,18 @@ +<news> +<date>January 28, 2022</date> +<title>Wine 7.1 Released</title> +<body> + The Wine development release 7.1 is now available. + <a href="{$root}/announce/7.1">What's new</a> in this release: +<ul> + <li>Vulkan 1.3 support.</li> + <li>A number of theming fixes.</li> + <li>WebSocket improvements.</li> + <li>Improved cursor clipping on macOS.</li> + <li>IDL compiler fixes for C++.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Rémi Bernon : windows.gaming.input: Fix printf format warnings with long types.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: ad060ae862635948c30ead218fa7a0b2853349eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad060ae862635948c30ead21… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 10:46:46 2022 +0100 windows.gaming.input: Fix printf format warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/Makefile.in | 1 - dlls/windows.gaming.input/main.c | 28 +++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index db009015e88..fab3c4e62d5 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = windows.gaming.input.dll IMPORTS = combase uuid diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index e8048ec440c..5278ec261bd 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -60,7 +60,7 @@ static inline struct gamepad_vector *impl_from_IVectorView_Gamepad(IVectorView_G static HRESULT STDMETHODCALLTYPE vector_view_gamepad_QueryInterface( IVectorView_Gamepad *iface, REFIID iid, void **out) { - TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || @@ -82,7 +82,7 @@ static ULONG STDMETHODCALLTYPE vector_view_gamepad_AddRef( { struct gamepad_vector *impl = impl_from_IVectorView_Gamepad(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); return ref; } @@ -91,7 +91,7 @@ static ULONG STDMETHODCALLTYPE vector_view_gamepad_Release( { struct gamepad_vector *impl = impl_from_IVectorView_Gamepad(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); return ref; } @@ -119,7 +119,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetTrustLevel( static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt( IVectorView_Gamepad *iface, UINT32 index, IGamepad **value) { - FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); + FIXME("iface %p, index %u, value %p stub!\n", iface, index, value); *value = NULL; return E_BOUNDS; } @@ -145,7 +145,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetMany( IVectorView_Gamepad *iface, UINT32 start_index, UINT32 items_size, IGamepad **items, UINT *value) { - FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); + FIXME("iface %p, start_index %u, items_size %u, items %p, value %p stub!\n", iface, start_index, + items_size, items, value); *value = 0; return E_BOUNDS; } @@ -186,7 +187,7 @@ static inline struct raw_game_controller_vector *impl_from_IVectorView_RawGameCo static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_QueryInterface( IVectorView_RawGameController *iface, REFIID iid, void **out) { - TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || @@ -208,7 +209,7 @@ static ULONG STDMETHODCALLTYPE vector_view_raw_game_controller_AddRef( { struct raw_game_controller_vector *impl = impl_from_IVectorView_RawGameController(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); return ref; } @@ -217,7 +218,7 @@ static ULONG STDMETHODCALLTYPE vector_view_raw_game_controller_Release( { struct raw_game_controller_vector *impl = impl_from_IVectorView_RawGameController(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); return ref; } @@ -245,7 +246,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetTrustLevel( static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetAt( IVectorView_RawGameController *iface, UINT32 index, IRawGameController **value) { - FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); + FIXME("iface %p, index %u, value %p stub!\n", iface, index, value); *value = NULL; return E_BOUNDS; } @@ -271,7 +272,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetMany( IVectorView_RawGameController *iface, UINT32 start_index, UINT32 items_size, IRawGameController **items, UINT *value) { - FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); + FIXME("iface %p, start_index %u, items_size %u, items %p, value %p stub!\n", iface, start_index, + items_size, items, value); *value = 0; return E_BOUNDS; } @@ -326,7 +328,7 @@ static HRESULT STDMETHODCALLTYPE windows_gaming_input_QueryInterface( { struct windows_gaming_input *impl = impl_from_IActivationFactory(iface); - TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || @@ -362,7 +364,7 @@ static ULONG STDMETHODCALLTYPE windows_gaming_input_AddRef( { struct windows_gaming_input *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p increasing refcount to %lu.\n", iface, ref); return ref; } @@ -371,7 +373,7 @@ static ULONG STDMETHODCALLTYPE windows_gaming_input_Release( { struct windows_gaming_input *impl = impl_from_IActivationFactory(iface); ULONG ref = InterlockedDecrement(&impl->ref); - TRACE("iface %p, ref %u.\n", iface, ref); + TRACE("iface %p decreasing refcount to %lu.\n", iface, ref); return ref; }

1 0