February 2022 - Wine-commits

Nikolay Sivov : t2embed: Fix long types warnings.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 5bb957fa30a33ce4846b882183ff1e3524dfa47d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bb957fa30a33ce4846b8821… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 22:47:45 2022 +0300 t2embed: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/Makefile.in | 1 - dlls/t2embed/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index d9fc7e97bf6..afda2511913 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = t2embed.dll IMPORTLIB = t2embed IMPORTS = gdi32 advapi32 diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index f79d4d69eb5..c4ceec13e7a 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -34,7 +34,7 @@ LONG WINAPI TTLoadEmbeddedFont(HANDLE *phFontReference, ULONG ulFlags, LPVOID lpvReadStream, LPWSTR szWinFamilyName, LPSTR szMacFamilyName, TTLOADINFO *pTTLoadInfo) { - FIXME("(%p 0x%08x %p 0x%08x %p %p %p %s %s %p) stub\n", phFontReference, + FIXME("%p, %#lx, %p, %lu, %p, %p, %p, %s, %s, %p stub\n", phFontReference, ulFlags, pulPrivStatus, ulPrivs, pulStatus, lpfnReadFromStream, lpvReadStream, debugstr_w(szWinFamilyName), szMacFamilyName, pTTLoadInfo); @@ -47,7 +47,7 @@ LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivS USHORT *pusCharCodeSet, USHORT usCharCodeCount, USHORT usLanguage, TTEMBEDINFO *pTTEmbedInfo) { - FIXME("(%p 0x%08x 0x%08x %p %p %p %p %p %u %u %p) stub\n", hDC, + FIXME("%p, %#lx, %lu, %p, %p, %p, %p, %p, %u, %u, %p stub\n", hDC, ulFlags, ulCharSet, pulPrivStatus, pulStatus, lpfnWriteToStream, lpvWriteStream, pusCharCodeSet, usCharCodeCount, usLanguage, pTTEmbedInfo); @@ -87,7 +87,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) *status = EMBED_INSTALLABLE; } - TRACE("fsType 0x%04x, status %u\n", fsType, *status); + TRACE("fsType 0x%04x, status %lu\n", fsType, *status); return E_NONE; } @@ -163,6 +163,6 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) LONG WINAPI TTDeleteEmbeddedFont(HANDLE hFontReference, ULONG flags, ULONG *status) { - FIXME("(%p 0x%08x %p) stub\n", hFontReference, flags, status); + FIXME("%p, %#lx, %p stub\n", hFontReference, flags, status); return E_API_NOTIMPL; }

1 0

Esme Povirk : mscoree: Fix a misleading parameter name.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 8184e86a67344cb20b001b34b5bff7402adaaf57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8184e86a67344cb20b001b34… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Feb 1 15:56:21 2022 -0600 mscoree: Fix a misleading parameter name. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 6 +++--- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index afb5a104ca7..923680a931e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1716,7 +1716,7 @@ end: #define CHARS_IN_GUID 39 -HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) +HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) { static const WCHAR wszFileSlash[] = L"file:///"; static const WCHAR wszCLSIDSlash[] = L"CLSID\\"; @@ -1739,7 +1739,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) DWORD dwBufLen = 350; lstrcpyW(path, wszCLSIDSlash); - StringFromGUID2(riid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); + StringFromGUID2(clsid, path + lstrlenW(wszCLSIDSlash), CHARS_IN_GUID); lstrcatW(path, wszInprocServer32); TRACE("Registry key: %s\n", debugstr_w(path)); @@ -1832,7 +1832,7 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) } else { - if (!try_create_registration_free_com(riid, classname, ARRAY_SIZE(classname), filename, ARRAY_SIZE(filename))) + if (!try_create_registration_free_com(clsid, classname, ARRAY_SIZE(classname), filename, ARRAY_SIZE(filename))) return CLASS_E_CLASSNOTAVAILABLE; TRACE("classname (%s)\n", debugstr_w(classname)); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 2e72ea5370b..67b37482c5a 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -212,7 +212,7 @@ HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, LPCWSTR pwzVersion, R extern HRESULT CorDebug_Create(ICLRRuntimeHost *runtimehost, IUnknown** ppUnk) DECLSPEC_HIDDEN; -extern HRESULT create_monodata(REFIID riid, LPVOID *ppObj) DECLSPEC_HIDDEN; +extern HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) DECLSPEC_HIDDEN; extern HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int path_length) DECLSPEC_HIDDEN;

1 0

Esme Povirk : mscoree: Add support for unmanaged classes in .NET Framework.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 14d37f3fb3ade45a9d9320b96e3c4d6fd4002f0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d37f3fb3ade45a9d9320b9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Feb 1 15:56:22 2022 -0600 mscoree: Add support for unmanaged classes in .NET Framework. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 923680a931e..3b23ce33e40 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1747,6 +1747,52 @@ HRESULT create_monodata(REFCLSID clsid, LPVOID *ppObj) res = RegOpenKeyExW(HKEY_CLASSES_ROOT, path, 0, KEY_READ, &key); if (res != ERROR_FILE_NOT_FOUND) { + res = RegOpenKeyExW( key, L"Server", 0, KEY_READ, &subkey ); + if (res == ERROR_SUCCESS) + { + /* Not a managed class, just chain through LoadLibraryShim */ + HMODULE module; + HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID*); + IClassFactory *classfactory; + + dwBufLen = ARRAY_SIZE( filename ); + res = RegGetValueW( subkey, NULL, NULL, RRF_RT_REG_SZ, NULL, filename, &dwBufLen ); + + RegCloseKey( subkey ); + + if (res != ERROR_SUCCESS) + { + WARN("Can't read default value from Server subkey.\n"); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + hr = LoadLibraryShim( filename, L"v4.0.30319", NULL, &module); + if (FAILED(hr)) + { + WARN("Can't load %s.\n", debugstr_w(filename)); + goto cleanup; + } + + pDllGetClassObject = (void*)GetProcAddress( module, "DllGetClassObject" ); + if (!pDllGetClassObject) + { + WARN("Can't get DllGetClassObject from %s.\n", debugstr_w(filename)); + hr = CLASS_E_CLASSNOTAVAILABLE; + goto cleanup; + } + + hr = pDllGetClassObject( clsid, &IID_IClassFactory, (void**)&classfactory ); + if (SUCCEEDED(hr)) + { + hr = IClassFactory_CreateInstance( classfactory, NULL, &IID_IUnknown, ppObj ); + + IClassFactory_Release( classfactory ); + } + + goto cleanup; + } + res = RegGetValueW( key, NULL, L"Class", RRF_RT_REG_SZ, NULL, classname, &dwBufLen); if(res != ERROR_SUCCESS) {

1 0

Esme Povirk : diasymreader: Stub ISymUnmanagedWriter.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: c1dc46aba1e0a54185d09d8ecd9eb1d2afd30786 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1dc46aba1e0a54185d09d8e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Feb 1 15:56:23 2022 -0600 diasymreader: Stub ISymUnmanagedWriter. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/Makefile.in | 4 +- dlls/diasymreader/diasymreader_private.h | 23 +++ dlls/diasymreader/main.c | 147 ++++++++++++++- dlls/diasymreader/writer.c | 303 +++++++++++++++++++++++++++++++ 4 files changed, 474 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1dc46aba1e0a54185d0…

1 0

Francois Gouget : testbot/SetWinLocale: Add support for UTF-8 system locales.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: tools Branch: master Commit: b54eb03341e74bb02e0d894d2b01e95d3f9a9aa4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b54eb03341e74bb02e0d894… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 2 15:05:02 2022 +0100 testbot/SetWinLocale: Add support for UTF-8 system locales. Unicode-only locales, such as Hindi (India), can only be used as a system locale if activating Windows 10's beta support for the UTF-8 code page. In such cases the Powershell's Set-WinSystemLocale API automatically and unconditionally sets the ACP&co code pages to UTF-8. In contrast intl.cpl has no support for UTF-8 (or for explicitly modifying the code pages) and refuses to use a Unicode-only system locale. So to keep a consistent SetWinLocale behavior, reset the system locale to en-US if it requires UTF-8 support and the --utf8 option was not specified. Also note that UTF-8 is only supported on Windows 10+ and that forcing UTF-8 through the registry makes Windows unbootable. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 11 ++++++++++- testbot/bin/SetWinLocale.ps1 | 30 ++++++++++++++++++++++++------ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 9f89280..78c8384 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -524,6 +524,9 @@ if (defined $Usage) print " --system SYS Specifies the system locale (see --defaults).\n"; print " . This requires elevated privileges.\n"; print " . Only takes effect after a reboot.\n"; + print " . Windows only allows using a Unicode-only locale (such as\n"; + print " hi-IN) as the system locale when setting the code pages to\n"; + print " UTF-8.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID(), GetThreadLocale().\n"; @@ -841,7 +844,7 @@ sub SetWinLocales($$$$$$$$) my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", "$name0.ps1", "locales", $Locale || ".", $CountryId || ".", - $System || ".", $UTF8 ? "true" : "false", $MUI || ".", + $System || ".", $UTF8 ? "force" : "no", $MUI || ".", $KeyboardIds ? $KeyboardIds->[0] : ".", $SysCopy ? "true" : "false", $DefCopy ? "true" : "false", $OptUseIntl ? "true" : "false"]; @@ -853,6 +856,12 @@ sub SetWinLocales($$$$$$$$) { $Line =~ s/\r$//; Info("$Line\n"); + if ($Line eq "Setting the system locale to en-US instead") + { + # For the final checks + $OptSystem = "en-US"; + $LCIDSystem = "0409"; + } } } diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index 00e9a1a..2ab286d 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -190,7 +190,7 @@ function SetCodePages($Value) $SWC_Success = $True -function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [bool]$UTF8, [string]$MUI, [string]$KeyboardId, [bool]$SysCopy, [bool]$DefCopy) +function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [string]$UTF8, [string]$MUI, [string]$KeyboardId, [bool]$SysCopy, [bool]$DefCopy) { $Cmd = Get-Command Set-Culture -ErrorAction SilentlyContinue if ($Cmd -eq $null) { @@ -201,8 +201,22 @@ function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [bo if ($Locale) { Set-Culture $Locale } if ($CountryId) { Set-WinHomeLocation $CountryId } - if ($System) { Set-WinSystemLocale $System } - if ($UTF8) { SetCodePages(65001) } + if ($System) + { + Set-WinSystemLocale $System + $ACP = Get-ItemProperty -Path $HKLM_CODE_PAGE -Name "ACP" -ErrorAction SilentlyContinue + if ($ACP.ACP -eq "65001") + { + Write-Output "$System is a UTF-8 system locale" + if ($UTF8 -eq "no") + { + Write-Output "Setting the system locale to en-US instead" + Set-WinSystemLocale "en-US" + } + $UTF8 = "" + } + } + if ($UTF8 -eq "force") { SetCodePages(65001) } if ($MUI) { Set-WinUILanguageOverride $MUI } if ($KeyboardId) { Set-WinDefaultInputMethodOverride $KeyboardId } if ($SysCopy -or $DefCopy) @@ -253,7 +267,7 @@ function SetLocales($Argv) $Locale = GetStringArg($Argv[1]) $CountryId = GetStringArg($Argv[2]) $System = GetStringArg($Argv[3]) - $UTF8 = $Argv[4] -eq "true" + $UTF8 = GetStringArg($Argv[4]) $MUI = GetStringArg($Argv[5]) $KeyboardId = GetStringArg($Argv[6]) $SysCopy = $Argv[7] -ne "false" @@ -272,7 +286,7 @@ function SetLocales($Argv) RunIntlCpl "$Name0.xml" Remove-Item -Path "$Name0.xml" - if ($UTF8) { SetCodePages(65001) } + if ($UTF8 -eq "force") { SetCodePages(65001) } exit 0 } @@ -298,7 +312,11 @@ function ShowUsage() Write-Output " LOCALE Is the BCP-47 locale to use for formats, date and time." Write-Output " COUNTRYID Is the numerical country code." Write-Output " SYSTEM Is the BCP-47 locale to use as the system locale." - Write-Output " UTF8 If set to 'true' the code pages will be changed to UTF-8." + Write-Output " UTF8 If set to 'force' the code pages will be changed to UTF-8" + Write-Output " regardless of the system locale." + Write-Output " If set to 'allow' the code pages will be set to match the system" + Write-Output " locale even if that implies using UTF-8. This is the default." + Write-Output " If set to 'no' Unicode-only locales will be replaced with en-US." Write-Output " MUI Is the BCP-47 locale to use for the display language." Write-Output " KEYBOARDID Is the keyboard identifier to set as the default." Write-Output " SYSCOPY If 'true' the locale settings will be copied to the system accounts"

1 0

Francois Gouget : testbot/SetWinLocale: Windows may use an alternate display language.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: tools Branch: master Commit: 476e2f95aab9e8c677a08e5a665532f6a1923831 URL: https://source.winehq.org/git/tools.git/?a=commit;h=476e2f95aab9e8c677a08e5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 2 15:05:05 2022 +0100 testbot/SetWinLocale: Windows may use an alternate display language. For instance intl.cpl fails to set it to en-CA while the Powershell APIs automatically convert it to en-GB. Take this into account before checking that the locale modifications succeeded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 7 +++++++ testbot/bin/SetWinLocale.ps1 | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 78c8384..0d4c305 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -543,6 +543,9 @@ if (defined $Usage) print " Set-WinSystemLocale for the relevant locales.\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; print " . Only takes effect after a log out + log in.\n"; + print " . Windows sometimes uses a different locale string. For\n"; + print " instance setting the display language to English (Canada) sets\n"; + print " this to en-GB instead of en-CA.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; print " display language.\n"; print " . APIs: GetSystemPreferredUILanguages() (--sys-copy case),\n"; @@ -862,6 +865,10 @@ sub SetWinLocales($$$$$$$$) $OptSystem = "en-US"; $LCIDSystem = "0409"; } + elsif ($Line =~ /^Windows uses (.*) for the MUI language/) + { + $OptMUI = $1; # for the final check + } } } diff --git a/testbot/bin/SetWinLocale.ps1 b/testbot/bin/SetWinLocale.ps1 index 2ab286d..ed8fa29 100644 --- a/testbot/bin/SetWinLocale.ps1 +++ b/testbot/bin/SetWinLocale.ps1 @@ -189,6 +189,7 @@ function SetCodePages($Value) } $SWC_Success = $True +$SWC_MUI = $null function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [string]$UTF8, [string]$MUI, [string]$KeyboardId, [bool]$SysCopy, [bool]$DefCopy) { @@ -217,7 +218,16 @@ function SetWinCulture([string]$Locale, [string]$CountryId, [string]$System, [st } } if ($UTF8 -eq "force") { SetCodePages(65001) } - if ($MUI) { Set-WinUILanguageOverride $MUI } + if ($MUI) + { + Set-WinUILanguageOverride $MUI + $WinMUI = Get-ItemProperty -Path $HKCU_DESKTOP -Name "PreferredUILanguagesPending" -ErrorAction SilentlyContinue + $global:SWC_MUI = $WinMUI.PreferredUILanguagesPending + if ($SWC_MUI -ne $MUI) + { + Write-Output "Windows uses $SWC_MUI for the MUI language instead of $MUI" + } + } if ($KeyboardId) { Set-WinDefaultInputMethodOverride $KeyboardId } if ($SysCopy -or $DefCopy) { @@ -282,7 +292,8 @@ function SetLocales($Argv) Write-Output "Falling back to intl.cpl" } - WriteIntlCplConfig $Locale $CountryId $System $MUI $KeyboardId $SysCopy $DefCopy >"$Name0.xml" + if ($SWC_MUI -eq $null) { $global:SWC_MUI = $MUI } + WriteIntlCplConfig $Locale $CountryId $System $SWC_MUI $KeyboardId $SysCopy $DefCopy >"$Name0.xml" RunIntlCpl "$Name0.xml" Remove-Item -Path "$Name0.xml"

1 0

Francois Gouget : testbot/testagentd: Avoid wildcards when cleaning up object files.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: tools Branch: master Commit: 9fa7158c1747ff7dcd1b10e2e5533b3b1d5e11fe URL: https://source.winehq.org/git/tools.git/?a=commit;h=9fa7158c1747ff7dcd1b10e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 2 15:08:33 2022 +0100 testbot/testagentd: Avoid wildcards when cleaning up object files. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/Makefile | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index b2f9e82..7808af2 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -8,16 +8,20 @@ build: $(builddir)/testagentd windows: TestAgentd.exe -$(builddir)/testagentd: testagentd.o platform_unix.o - $(CC) -o $@ testagentd.o platform_unix.o +UNIX_SOURCES = testagentd.c platform_unix.c + +$(builddir)/testagentd: $(UNIX_SOURCES:.c=.o) + $(CC) -o $@ $(UNIX_SOURCES:.c=.o) strip $@ .c.o: $(CC) -Wall -g -c -o $@ $< -TestAgentd.exe: testagentd.obj platform_windows.obj - $(CROSSCC32) -o $@ testagentd.obj platform_windows.obj -lws2_32 +WIN_SOURCES = testagentd.c platform_windows.c + +TestAgentd.exe: $(WIN_SOURCES:.c=.obj) + $(CROSSCC32) -o $@ $(WIN_SOURCES:.c=.obj) -lws2_32 $(CROSSSTRIP32) $@ .SUFFIXES: .obj @@ -28,6 +32,7 @@ testagentd.o testagentd.obj: platform.h platform_unix.o: platform.h list.h platform_windows.obj: platform.h list.h + iso: winetestbot.iso winetestbot.iso: TestAgentd.exe @@ -41,6 +46,7 @@ winetestbot.iso: TestAgentd.exe clean: - rm -f *.obj *.o + rm -f $(UNIX_SOURCES:.c=.o) + rm -f $(WIN_SOURCES:.c=.obj) rm -f TestAgentd.exe rm -f winetestbot.iso

1 0

Francois Gouget : testbot/LibvirtTool: Tweak some sleep traces.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: tools Branch: master Commit: f5b1846ab4819f4e74df4fe6c7fa35e67a4e128c URL: https://source.winehq.org/git/tools.git/?a=commit;h=f5b1846ab4819f4e74df4fe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 2 15:08:44 2022 +0100 testbot/LibvirtTool: Tweak some sleep traces. Show the sleep time and make them more consistent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 70dfd34..1488344 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -552,7 +552,7 @@ sub CreateSnapshot($$) if ($SleepAfterBoot != 0) { - Debug(Elapsed($Start), " Sleeping for the $SnapshotName snapshot\n"); + Debug(Elapsed($Start), " Sleeping ${SleepAfterBoot}s for the $SnapshotName snapshot\n"); LogMsg "Letting $VMKey settle down for the $SnapshotName snapshot\n"; sleep($SleepAfterBoot); } @@ -601,7 +601,7 @@ sub Revert() } if ($ExtraTimeout) { - Debug(Elapsed($Start), " Extend the $VMKey revert deadline by $ExtraTimeout\n"); + Debug(Elapsed($Start), " Extending the $VMKey revert deadline by ${ExtraTimeout}s\n"); my $Deadline = $VM->ChildDeadline || (time() + $VMToolTimeout); $VM->ChildDeadline($Deadline + $ExtraTimeout); $VM->Save();

1 0

Francois Gouget : testbot/LibvirtTool: Don't wait for the reboot after SetWinLocale.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: tools Branch: master Commit: 13f273e7c4a97bedeb550c698dc8be9cf835e269 URL: https://source.winehq.org/git/tools.git/?a=commit;h=13f273e7c4a97bedeb550c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 2 15:08:58 2022 +0100 testbot/LibvirtTool: Don't wait for the reboot after SetWinLocale. SetWinLocale already waits for Windows to be ready to check that the locales changed as expected. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 1488344..b186e19 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -680,21 +680,6 @@ sub Revert() FatalError("Could not set the $VMKey locale to $SetLocale\n"); } - Debug(Elapsed($Start), " Wait for the $VMKey locale-setting reboot to complete\n"); - LogMsg "Wait for the $VMKey locale-setting reboot to complete\n"; - while (1) - { - my $TA = $VM->GetAgent(); - my $Count = $TA->GetProperties("start.count"); - $TA->Disconnect(); - - # SetupTestAgentd() has reset start.count to zero. - # It will only change after the reboot. - last if (defined $Count and $Count != 0); - - sleep(1); - } - $DomainSnapshot .= "-$SetLocale"; CreateSnapshot($Domain, $DomainSnapshot); }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Cast round() input to float.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: vkd3d Branch: master Commit: 22d8b0a03307659c46c1d3a801566b0305f6da7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22d8b0a03307659c46c1d3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 2 13:46:13 2022 +0100 vkd3d-shader/hlsl: Cast round() input to float. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 19 ++++++++++++++++++- tests/round.shader_test | 13 +++++++++++++ tests/shader_runner.c | 8 ++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index be24a74..8d7b124 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1570,6 +1570,18 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static struct hlsl_ir_node *intrinsic_float_convert_arg(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct hlsl_ir_node *arg, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = arg->data_type; + + if (type->base_type == HLSL_TYPE_FLOAT || type->base_type == HLSL_TYPE_HALF) + return arg; + + type = hlsl_get_numeric_type(ctx, type->type, HLSL_TYPE_FLOAT, type->dimx, type->dimy); + return add_implicit_conversion(ctx, params->instrs, arg, type, loc); +} + static bool intrinsic_abs(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -1675,7 +1687,12 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, static bool intrinsic_round(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, params->args[0], loc); + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ROUND, arg, loc); } static bool intrinsic_saturate(struct hlsl_ctx *ctx, diff --git a/tests/round.shader_test b/tests/round.shader_test index d8eb11b..cc5a697 100644 --- a/tests/round.shader_test +++ b/tests/round.shader_test @@ -24,3 +24,16 @@ float4 main(uniform float4 u) : sv_target uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (6.0, 8.0, 0.0, 3.0) 4 + + + +[pixel shader] +float4 main(uniform int4 u) : sv_target +{ + return round(u); +} + +[test] +uniform 0 int4 -1 0 2 10 +draw quad +probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 5af4628..558d074 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -368,6 +368,14 @@ static void parse_test_directive(struct shader_context *context, const char *lin fatal_error("Malformed float constant '%s'.\n", line); set_uniforms(context, offset, 1, &f); } + else if (match_string(line, "int4", &line)) + { + int v[4]; + + if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) + fatal_error("Malformed int4 constant '%s'.\n", line); + set_uniforms(context, offset, 4, v); + } else if (match_string(line, "int", &line)) { int i;

1 0