May 2021 - Wine-Commits - list.winehq.org

Francois Gouget : winetest/build-patterns: Show Potentially obsolete bugs.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: tools Branch: master Commit: 0ef48b83ac84f3a59ed5521b24d5a7a8d1dcde17 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0ef48b83ac84f3a59ed5521… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 19 03:15:13 2021 +0200 winetest/build-patterns: Show Potentially obsolete bugs. Bugs related to a test that has no failure are likely to be out of date, except if they are related to memory issues. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 52 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index aacbb52..e3174b2 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1200,16 +1200,29 @@ sub write_pattern($$$) print $html "<div class='testtext'>$test->{desc}</div>\n" if (defined $test->{desc}); - print $html "<div class='test'>\n"; - write_newmodes_line($html, $test) if (%{$test->{newmodes}}); + my $has_pattern; + if (%{$test->{newmodes}}) + { + $has_pattern = 1; + print $html "<div class='test'>\n"; + write_newmodes_line($html, $test); + } foreach my $reportdir (@sortedreports) { next if (!$pagereports->{$reportdir}); next if (!$test->{testreports}->{$reportdir}->{failed}); + if (!$has_pattern) + { + $has_pattern = 1; + print $html "<div class='test'>\n"; + } write_pattern_line($html, $test, $reportdir); } - write_commits($html, $test) if (%{$test->{commits}}); - print $html "</div>\n"; + if ($has_pattern) + { + write_commits($html, $test) if (%{$test->{commits}}); + print $html "</div>\n"; + } } sub write_patterns_list($$$$) @@ -1290,12 +1303,20 @@ EOF old => {title => "Old failures", desc => "look like they are fixed: they had no failure in the most recent $patternbuilds builds but that may also just be a lucky streak.", testnames => []}, + oldbugs => {title => "Potentially obsolete bugs", + desc => "have related bugs but no failure whatsoever. Maybe the bugs can be closed.", + testnames => []}, + membugs => {title => "Memory bugs", + desc => "have no failures but have potential memory bugs (leaks, overflow, uninitialized data, etc). These may be out of date or may cause failures later on.", + testnames => []}, + ); foreach my $testname (sort keys %tests) { my $test = $tests{$testname}; $test->{colors} = {}; $test->{commits} = {}; + $test->{newmodes} = {}; # The regression commits may only impact the results in Wine. # Add them even if only reporting on the Windows results. @@ -1343,10 +1364,26 @@ EOF $test->{colors}->{$status} = undef; } } - next if ($last == -1); # no report had a pattern of interest next if ($testname eq "0"); + if ($last == -1 and !$subpage) + { + # This test has no failure but maybe it has bugs? + my $listid; + foreach my $bug (@{$test->{bugs}}) + { + if ($bug->{desc} =~ /(?:invalid (?:read|write)|leak|uninitialized|use after free|valgrind)/) + { + $listid ||= "membugs"; + } + else + { + $listid = "oldbugs"; + } + } + push @{$lists{$listid}->{testnames}}, $testname if ($listid); + } + next if ($last == -1); # no report had a pattern of interest - $test->{newmodes} = {}; foreach my $status (keys %$newfailures) { next if ($oldfailures->{$status}); @@ -1399,7 +1436,8 @@ EOF <p>The patterns are grouped according to the likelyhood that they contain new failures:</p> <ul>"; - my @listids = ("summary", "recent", "newmode", "regular", "old"); + my @listids = ("summary", "recent", "newmode", "regular", "old", + "oldbugs", "membugs"); my ($prevunit, $nolist) = ("", 1); foreach my $listid (@listids) {

1 0

Zhiyi Zhang : user32: Optimize getting primary monitor rectangle with GetSystemMetrics().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: ab431c70b4537ce62ead8d79939d801932327159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab431c70b4537ce62ead8d79… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 18 17:11:10 2021 +0800 user32: Optimize getting primary monitor rectangle with GetSystemMetrics(). This saves calls to GetMonitorInfo() and return from EnumDisplayMonitors() immediately after the primary monitor is found. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7dc2a8df645..ab1c5af0c1b 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -371,6 +371,27 @@ RECT get_virtual_screen_rect(void) return info.virtual_rect; } +static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + RECT *primary_rect = (RECT *)lp; + + if (!rect->top && !rect->left && rect->right && rect->bottom) + { + *primary_rect = *rect; + return FALSE; + } + + return TRUE; +} + +static RECT get_primary_monitor_rect(void) +{ + RECT rect = {0}; + + EnumDisplayMonitors( 0, NULL, get_primary_monitor_proc, (LPARAM)&rect ); + return rect; +} + static BOOL CALLBACK get_monitor_count_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { INT *count = (INT *)lp; @@ -2510,6 +2531,7 @@ INT WINAPI GetSystemMetrics( INT index ) NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; + RECT rect; UINT ret; HDC hdc; @@ -2715,11 +2737,11 @@ INT WINAPI GetSystemMetrics( INT index ) case SM_MOUSEWHEELPRESENT: return 1; case SM_CXSCREEN: - get_monitors_info( &info ); - return info.primary_rect.right - info.primary_rect.left; + rect = get_primary_monitor_rect(); + return rect.right - rect.left; case SM_CYSCREEN: - get_monitors_info( &info ); - return info.primary_rect.bottom - info.primary_rect.top; + rect = get_primary_monitor_rect(); + return rect.bottom - rect.top; case SM_XVIRTUALSCREEN: get_monitors_info( &info ); return info.virtual_rect.left;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 573d451b806ccae9633cc2b4e66a527b4cfdb1e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=573d451b806ccae9633cc2b4… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue May 18 12:47:54 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 69 +++++++++++++++------------------------------------------------- 1 file changed, 16 insertions(+), 53 deletions(-) diff --git a/po/lt.po b/po/lt.po index 48fe76a4878..78c128b31a6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-05-13 19:49+0300\n" +"PO-Revision-Date: 2021-05-18 12:44+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14232,17 +14232,6 @@ msgid "Icons (*.ico)" msgstr "Piktogramos (*.ico)" #: programs/reg/reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | EXPORT | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -14258,7 +14247,7 @@ msgstr "" " REG [operacija] [parametrai]\n" "\n" "Palaikomos operacijos:\n" -" ADD | DELETE | EXPORT | IMPORT | QUERY\n" +" ADD | COPY | DELETE | EXPORT | IMPORT | QUERY\n" "\n" "Pagalbai apie specifinę operaciją, įrašykite:\n" " REG [operacija] /?\n" @@ -14733,35 +14722,6 @@ msgid "reg: Unable to access or create the specified registry key\n" msgstr "reg: Nepavyko prieiti prie ar sukurti nurodyto registro rakto\n" #: programs/reg/reg.rc:202 -#, fuzzy -#| msgid "" -#| "REG EXPORT <key> <file> [/y]\n" -#| "\n" -#| " Exports a specified registry key (including all subkeys and values)\n" -#| " to a file.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to export.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " <file>\n" -#| " The name and path of the registry file that will be created.\n" -#| " This file must have a .reg extension.\n" -#| "\n" -#| " /y\n" -#| " Overwrite <file> without prompting for confirmation.\n" -#| "\n" msgid "" "REG COPY <key1> <key2> [/s] [/f]\n" "\n" @@ -14795,14 +14755,15 @@ msgid "" "<key2>.\n" "\n" msgstr "" -"REG EXPORT <raktas> <failas> [/y]\n" +"REG COPY <raktas1> <raktas2> [/s] [/f]\n" "\n" -" Eksportuoja nurodytą registro raktą (įskaitant visus porakčius ir " -"reikšmes)\n" -" į failą\n" +" Kopijuoja nurodyto registro rakto turinį į kitą vietą\n" +" Standartiškai ši operacija kopijuoja tik registro reikšmes. Naudokite\n" +" [/s] rekursyviai nukopijuoti visus porakčius ir reikšmes.\n" "\n" -" <raktas>\n" -" Registro raktas eksportui.\n" +" <raktas1>,<raktas2>\n" +" Registro raktai nurodantys duomenų šaltinį (<raktas1>) ir\n" +" paskirtį (<raktas2>). Jei <raktas2> neegzistuoja, jis bus sukurtas.\n" "\n" " Formatas: ŠAKNIS\\Poraktis\n" "\n" @@ -14816,12 +14777,14 @@ msgstr "" "\n" " Poraktis: Pilnas kelias iki registro rakto po nurodytu ŠAKNIES raktu.\n" "\n" -" <failas>\n" -" Registro failo, kuris bus sukurtas, pavadinimas ir kelias.\n" -" Failas privalo turėti plėtinį .reg.\n" +" /s\n" +" Kopijuoti visus porakčius ir reikšmes iš <raktas1> į <raktas2>.\n" "\n" -" /y\n" -" Perrašyti <failas> be patvirtinimo klausimo.\n" +" /f\n" +" Perrašyti visus registro duomenis rakte <raktas2> be patvirtinimo " +"klausimo.\n" +" Šis parametras nemodifikuoja porakčių ir reikšmių, kurie yra tik " +"<raktas2>.\n" "\n" #: programs/regedit/regedit.rc:34

1 0

Piotr Caban : msvcrt: Import remquof implementation from musl.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 8a2f7c731fcf5bf21449f1cd8eadad8305472621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2f7c731fcf5bf21449f1cd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:09:07 2021 +0200 msvcrt: Import remquof implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 --------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 -- 6 files changed, 77 insertions(+), 23 deletions(-) diff --git a/configure b/configure index b243f0280f5..0ec898ca762 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log2f \ remainder \ remainderf \ - remquof \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index 8942a3eefc2..72db35563e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log2f \ remainder \ remainderf \ - remquof \ tgamma \ tgammaf ) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f4c5c69fc4b..ae3b9aa76e6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5581,12 +5581,86 @@ end: /********************************************************************* * remquof (MSVCR120.@) + * + * Copied from musl: src/math/remquof.c */ float CDECL remquof(float x, float y, int *quo) { - if(!isfinite(x)) *_errno() = EDOM; - if(isnan(y) || y==0.0f) *_errno() = EDOM; - return unix_funcs->remquof( x, y, quo ); + UINT32 uxi = *(UINT32*)&x; + UINT32 uyi = *(UINT32*)&y; + int ex = uxi >> 23 & 0xff; + int ey = uyi >> 23 & 0xff; + int sx = uxi >> 31; + int sy = uyi>> 31; + UINT32 q, i; + + *quo = 0; + if (y == 0 || isinf(x)) *_errno() = EDOM; + if (uyi << 1 == 0 || isnan(y) || ex == 0xff) + return (x * y) / (x * y); + if (uxi << 1 == 0) + return x; + + /* normalize x and y */ + if (!ex) { + for (i = uxi << 9; i >> 31 == 0; ex--, i <<= 1); + uxi <<= -ex + 1; + } else { + uxi &= -1U >> 9; + uxi |= 1U << 23; + } + if (!ey) { + for (i = uyi << 9; i >> 31 == 0; ey--, i <<= 1); + uyi <<= -ey + 1; + } else { + uyi &= -1U >> 9; + uyi |= 1U << 23; + } + + q = 0; + if (ex < ey) { + if (ex + 1 == ey) + goto end; + return x; + } + + /* x mod y */ + for (; ex > ey; ex--) { + i = uxi - uyi; + if (i >> 31 == 0) { + uxi = i; + q++; + } + uxi <<= 1; + q <<= 1; + } + i = uxi - uyi; + if (i >> 31 == 0) { + uxi = i; + q++; + } + if (uxi == 0) + ex = -30; + else + for (; uxi >> 23 == 0; uxi <<= 1, ex--); +end: + /* scale result and decide between |x| and |x|-|y| */ + if (ex > 0) { + uxi -= 1U << 23; + uxi |= (UINT32)ex << 23; + } else { + uxi >>= -ex + 1; + } + x = *(float*)&uxi; + if (sy) + y = -y; + if (ex == ey || (ex + 1 == ey && (2 * x > y || (2 * x == y && q % 2)))) { + x -= y; + q++; + } + q &= 0x7fffffff; + *quo = sx ^ sy ? -(int)q : (int)q; + return sx ? -x : x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 05d8c2bd83a..cd22d36acb4 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -501,19 +501,6 @@ static float CDECL unix_remainderf(float x, float y) #endif } -/********************************************************************* - * remquof - */ -static float CDECL unix_remquof(float x, float y, int *quo) -{ -#ifdef HAVE_REMQUOF - return remquof(x, y, quo); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * sin */ @@ -649,7 +636,6 @@ static const struct unix_funcs funcs = unix_powf, unix_remainder, unix_remainderf, - unix_remquof, unix_sin, unix_sinf, unix_sinh, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 9f91c097d71..f71ceea1cab 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -66,7 +66,6 @@ struct unix_funcs float (CDECL *powf)(float x, float y); double (CDECL *remainder)(double x, double y); float (CDECL *remainderf)(float x, float y); - float (CDECL *remquof)(float x, float y, int *quo); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); double (CDECL *sinh)(double x); diff --git a/include/config.h.in b/include/config.h.in index 7d0c5e934e6..1d54a041ce2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -636,9 +636,6 @@ /* Define to 1 if you have the `remainderf' function. */ #undef HAVE_REMAINDERF -/* Define to 1 if you have the `remquof' function. */ -#undef HAVE_REMQUOF - /* Define to 1 if the system has the type `request_sense'. */ #undef HAVE_REQUEST_SENSE

1 0

Derek Lesho : winevulkan: Specify which structures to ignore in STRUCT_CHAIN_CONVERSIONS.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 0c74c809c7acf73cfce2418bb5d8fe18567ec648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c74c809c7acf73cfce2418b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon May 17 16:00:58 2021 -0400 winevulkan: Specify which structures to ignore in STRUCT_CHAIN_CONVERSIONS. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 22 +++++++++++++--------- dlls/winevulkan/vulkan_thunks.c | 2 -- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 135fd5cf06a..26023fd5fd6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -256,10 +256,11 @@ FUNCTION_OVERRIDES = { "vkDebugMarkerSetObjectTagEXT" : {"dispatch": True, "driver" : False, "thunk" : ThunkType.PRIVATE}, } -STRUCT_CHAIN_CONVERSIONS = [ - "VkDeviceCreateInfo", - "VkInstanceCreateInfo", -] +STRUCT_CHAIN_CONVERSIONS = { + # Ignore to not confuse host loader. + "VkDeviceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO"], + "VkInstanceCreateInfo": ["VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO"], +} class Direction(Enum): @@ -2417,9 +2418,10 @@ class FreeFunction(object): class StructChainConversionFunction(object): - def __init__(self, direction, struct): + def __init__(self, direction, struct, ignores): self.direction = direction self.struct = struct + self.ignores = ignores self.type = struct.name self.name = "convert_{0}_struct_chain".format(self.type) @@ -2444,9 +2446,8 @@ class StructChainConversionFunction(object): body += " switch (in_header->sType)\n" body += " {\n" - # Ignore to not confuse host loader. - body += " case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO:\n" - body += " case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO:\n" + for i in self.ignores: + body += " case {0}:\n".format(i) body += " break;\n\n" for e in self.struct.struct_extensions: @@ -2455,6 +2456,9 @@ class StructChainConversionFunction(object): stype = next(x for x in e.members if x.name == "sType") + if stype.values in self.ignores: + continue + body += " case {0}:\n".format(stype.values) body += " {\n" @@ -2604,7 +2608,7 @@ class VkGenerator(object): for struct in self.registry.structs: if struct.name in STRUCT_CHAIN_CONVERSIONS: - self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct)) + self.struct_chain_conversions.append(StructChainConversionFunction(Direction.INPUT, struct, STRUCT_CHAIN_CONVERSIONS[struct.name])) self.struct_chain_conversions.append(FreeStructChainFunction(struct)) # Once we decide to support pNext chains conversion everywhere, move this under get_conversions for e in struct.struct_extensions: diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index c0dbbe2b8b8..edb4bfd55da 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -2641,7 +2641,6 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea switch (in_header->sType) { case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: - case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEVICE_GENERATED_COMMANDS_FEATURES_NV: @@ -4264,7 +4263,6 @@ VkResult convert_VkInstanceCreateInfo_struct_chain(const void *pNext, VkInstance { switch (in_header->sType) { - case VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO: case VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO: break;

1 0

Zhiyi Zhang : user32: Optimize getting monitor count with GetSystemMetrics().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: d7cd5587df5c0dfc6a5b0b9586b0feee28ee0de8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7cd5587df5c0dfc6a5b0b95… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 18 17:11:02 2021 +0800 user32: Optimize getting monitor count with GetSystemMetrics(). This saves calls to GetMonitorInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0b4dbfc2d78..7dc2a8df645 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -371,6 +371,22 @@ RECT get_virtual_screen_rect(void) return info.virtual_rect; } +static BOOL CALLBACK get_monitor_count_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) +{ + INT *count = (INT *)lp; + + ++(*count); + return TRUE; +} + +static INT get_monitor_count(void) +{ + INT count = 0; + + EnumDisplayMonitors( 0, NULL, get_monitor_count_proc, (LPARAM)&count ); + return count; +} + static BOOL get_primary_adapter(WCHAR *name) { DISPLAY_DEVICEW dd; @@ -2717,8 +2733,7 @@ INT WINAPI GetSystemMetrics( INT index ) get_monitors_info( &info ); return info.virtual_rect.bottom - info.virtual_rect.top; case SM_CMONITORS: - get_monitors_info( &info ); - return info.count; + return get_monitor_count(); case SM_SAMEDISPLAYFORMAT: return 1; case SM_IMMENABLED:

1 0

Zhiyi Zhang : user32: Use get_primary_monitor_rect() helper.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 9b2f59cb94d5aa7b8fbe4e0373d933a630b51dc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b2f59cb94d5aa7b8fbe4e03… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 18 17:11:25 2021 +0800 user32: Use get_primary_monitor_rect() helper. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 16 +++++++--------- dlls/user32/sysparams.c | 6 ++---- dlls/user32/user_private.h | 1 + dlls/user32/win.c | 3 +-- dlls/user32/winpos.c | 7 ++++--- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ba0292c8f88..b4e3579f5e8 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -195,17 +195,15 @@ static void update_mouse_coords( INPUT *input ) if (input->u.mi.dwFlags & MOUSEEVENTF_ABSOLUTE) { DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + RECT rc; + if (input->u.mi.dwFlags & MOUSEEVENTF_VIRTUALDESK) - { - RECT rc = get_virtual_screen_rect(); - input->u.mi.dx = rc.left + ((input->u.mi.dx * (rc.right - rc.left)) >> 16); - input->u.mi.dy = rc.top + ((input->u.mi.dy * (rc.bottom - rc.top)) >> 16); - } + rc = get_virtual_screen_rect(); else - { - input->u.mi.dx = (input->u.mi.dx * GetSystemMetrics( SM_CXSCREEN )) >> 16; - input->u.mi.dy = (input->u.mi.dy * GetSystemMetrics( SM_CYSCREEN )) >> 16; - } + rc = get_primary_monitor_rect(); + + input->u.mi.dx = rc.left + ((input->u.mi.dx * (rc.right - rc.left)) >> 16); + input->u.mi.dy = rc.top + ((input->u.mi.dy * (rc.bottom - rc.top)) >> 16); SetThreadDpiAwarenessContext( context ); } else diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3d0cb2a6566..015db0db50e 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -366,7 +366,7 @@ static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT return TRUE; } -static RECT get_primary_monitor_rect(void) +RECT get_primary_monitor_rect(void) { RECT rect = {0}; @@ -1818,9 +1818,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, spi_idx = SPI_SETWORKAREA_IDX; if (!spi_loaded[spi_idx]) { - SetRect( &work_area, 0, 0, - GetSystemMetrics( SM_CXSCREEN ), - GetSystemMetrics( SM_CYSCREEN ) ); + work_area = get_primary_monitor_rect(); EnumDisplayMonitors( 0, NULL, enum_monitors, (LPARAM)&work_area ); spi_loaded[spi_idx] = TRUE; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 974d18be482..82cf376ef54 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -261,6 +261,7 @@ extern void update_window_state( HWND hwnd ) DECLSPEC_HIDDEN; extern void wait_graphics_driver_ready(void) DECLSPEC_HIDDEN; extern void *get_hook_proc( void *proc, const WCHAR *module, HMODULE *free_module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; +extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 680defc2071..86a1f50ca77 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -855,8 +855,7 @@ BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWind } else { - rect.right = GetSystemMetrics(SM_CXSCREEN); - rect.bottom = GetSystemMetrics(SM_CYSCREEN); + rect = get_primary_monitor_rect(); } if (rectWindow) *rectWindow = rect; if (rectClient) *rectClient = rect; diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index de5d50d4c3a..5a2b8ccdfe8 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -740,7 +740,7 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) { - RECT rc_work; + RECT rc_work, rc_primary; MONITORINFO mon_info; mon_info.cbSize = sizeof(mon_info); @@ -754,8 +754,9 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) rc_work = mon_info.rcWork; } - if (MinMax.ptMaxSize.x == GetSystemMetrics(SM_CXSCREEN) + 2 * xinc && - MinMax.ptMaxSize.y == GetSystemMetrics(SM_CYSCREEN) + 2 * yinc) + rc_primary = get_primary_monitor_rect(); + if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && + MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc) { MinMax.ptMaxSize.x = (rc_work.right - rc_work.left) + 2 * xinc; MinMax.ptMaxSize.y = (rc_work.bottom - rc_work.top) + 2 * yinc;

1 0

Zhiyi Zhang : user32: Add a cache for EnumDisplayDevicesW().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 095bdc6c43ea8ccb8d301b6fcf05baa776481bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=095bdc6c43ea8ccb8d301b6f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 18 17:14:18 2021 +0800 user32: Add a cache for EnumDisplayDevicesW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 313 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 218 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=095bdc6c43ea8ccb8d30…

1 0

Piotr Caban : msvcrt: Import fmod implementation from musl.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 2e8cfcf5b5e58566615812af0bab602f3bf7c654 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e8cfcf5b5e58566615812af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:08:17 2021 +0200 msvcrt: Import fmod implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 -------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 61 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index f2caa81712b..d71a7108b5d 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1266,12 +1266,70 @@ double CDECL exp( double x ) /********************************************************************* * fmod (MSVCRT.@) + * + * Copied from musl: src/math/fmod.c */ double CDECL fmod( double x, double y ) { - double ret = unix_funcs->fmod( x, y ); - if (!isfinite(x) || !isfinite(y)) return math_error(_DOMAIN, "fmod", x, y, ret); - return ret; + UINT64 xi = *(UINT64*)&x; + UINT64 yi = *(UINT64*)&y; + int ex = xi >> 52 & 0x7ff; + int ey = yi >> 52 & 0x7ff; + int sx = xi >> 63; + UINT64 i; + + if (isinf(x)) return math_error(_DOMAIN, "fmod", x, y, (x * y) / (x * y)); + if (yi << 1 == 0 || isnan(y) || ex == 0x7ff) + return (x * y) / (x * y); + if (xi << 1 <= yi << 1) { + if (xi << 1 == yi << 1) + return 0 * x; + return x; + } + + /* normalize x and y */ + if (!ex) { + for (i = xi << 12; i >> 63 == 0; ex--, i <<= 1); + xi <<= -ex + 1; + } else { + xi &= -1ULL >> 12; + xi |= 1ULL << 52; + } + if (!ey) { + for (i = yi << 12; i >> 63 == 0; ey--, i <<= 1); + yi <<= -ey + 1; + } else { + yi &= -1ULL >> 12; + yi |= 1ULL << 52; + } + + /* x mod y */ + for (; ex > ey; ex--) { + i = xi - yi; + if (i >> 63 == 0) { + if (i == 0) + return 0 * x; + xi = i; + } + xi <<= 1; + } + i = xi - yi; + if (i >> 63 == 0) { + if (i == 0) + return 0 * x; + xi = i; + } + for (; xi >> 52 == 0; xi <<= 1, ex--); + + /* scale result */ + if (ex > 0) { + xi -= 1ULL << 52; + xi |= (UINT64)ex << 52; + } else { + xi >>= -ex + 1; + } + xi |= (UINT64)sx << 63; + return *(double*)ξ } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index d7e368d1b37..69ce6bb027e 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -297,14 +297,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * fmod - */ -static double CDECL unix_fmod( double x, double y ) -{ - return fmod( x, y ); -} - /********************************************************************* * fmodf */ @@ -673,7 +665,6 @@ static const struct unix_funcs funcs = unix_expm1f, unix_fma, unix_fmaf, - unix_fmod, unix_fmodf, unix_frexp, unix_frexpf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index b8c18b1e2a5..c1cd2c60d29 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -45,7 +45,6 @@ struct unix_funcs float (CDECL *expm1f)(float x); double (CDECL *fma)(double x, double y, double z); float (CDECL *fmaf)(float x, float y, float z); - double (CDECL *fmod)(double x, double y); float (CDECL *fmodf)(float x, float y); double (CDECL *frexp)(double x, int *exp); float (CDECL *frexpf)(float x, int *exp);

1 0

Piotr Caban : msvcrt: Import modff implementation from musl.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 29e99741d94517b1b17b300a0c7b85a1c0806a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29e99741d94517b1b17b300a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:08:44 2021 +0200 msvcrt: Import modff implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a860dfc3d2b..fab505abfb5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -922,10 +922,40 @@ float CDECL frexpf( float x, int *exp ) /********************************************************************* * modff (MSVCRT.@) + * + * Copied from musl: src/math/modff.c */ float CDECL modff( float x, float *iptr ) { - return unix_funcs->modff( x, iptr ); + union {float f; UINT32 i;} u = {x}; + UINT32 mask; + int e = (u.i >> 23 & 0xff) - 0x7f; + + /* no fractional part */ + if (e >= 23) { + *iptr = x; + if (e == 0x80 && u.i << 9 != 0) { /* nan */ + return x; + } + u.i &= 0x80000000; + return u.f; + } + /* no integral part */ + if (e < 0) { + u.i &= 0x80000000; + *iptr = u.f; + return x; + } + + mask = 0x007fffff >> e; + if ((u.i & mask) == 0) { + *iptr = x; + u.i &= 0x80000000; + return u.f; + } + u.i &= ~mask; + *iptr = u.f; + return x - u.f; } #endif diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 2a3d8ed4090..62c6a5ae189 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -459,14 +459,6 @@ static float CDECL unix_logbf( float x ) return logbf( x ); } -/********************************************************************* - * modff - */ -static float CDECL unix_modff( float x, float *iptr ) -{ - return modff( x, iptr ); -} - /********************************************************************* * pow */ @@ -666,7 +658,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_logb, unix_logbf, - unix_modff, unix_pow, unix_powf, unix_remainder, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 080c9da9d08..69f4e02f321 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -62,7 +62,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *logb)(double x); float (CDECL *logbf)(float x); - float (CDECL *modff)(float x, float *iptr); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); double (CDECL *remainder)(double x, double y);

1 0