November 2022 - Wine-commits

Saulius Krasuckas : ntdll: Check __WINE_PE_BUILD instead of compiler macros.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 1267fe6f5869708f1e92838c4c7c15a16560cefb URL: https://gitlab.winehq.org/wine/wine/-/commit/1267fe6f5869708f1e92838c4c7c15… Author: Saulius Krasuckas <saulius2(a)ar-fi.lt> Date: Tue Mar 1 02:42:05 2022 +0200 ntdll: Check __WINE_PE_BUILD instead of compiler macros. Fixes compilation on Cygwin, undeclared identifiers: _alldiv, _allmul, _allrem, _aulldiv, _aullrem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52607 Signed-off-by: Saulius Krasuckas <saulius2(a)ar-fi.lt> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f72978ad0751159c00283406856b0c02d2b3cfca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/large_int.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index 20ffd646a3e..b38074158c8 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -520,7 +520,7 @@ NTSTATUS WINAPI RtlInt64ToUnicodeString( #ifdef __i386__ /* those builtin functions use stdcall calling convention, but compilers reference them without stdcall declarations */ -#if defined(__MINGW32__) || defined(_MSC_VER) +#ifdef __WINE_PE_BUILD LONGLONG WINAPI _alldiv( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_alldiv")); LONGLONG WINAPI _allmul( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allmul")); LONGLONG WINAPI _allrem( LONGLONG a, LONGLONG b ) asm(__ASM_NAME("_allrem"));

1 0

Alex Henrie : tzres: Inform translators of 31-character limit.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 5e4bc7e1a147ce8d2b08867c0628c89434624dcd URL: https://gitlab.winehq.org/wine/wine/-/commit/5e4bc7e1a147ce8d2b08867c0628c8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Mar 4 10:17:52 2022 -0700 tzres: Inform translators of 31-character limit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51619 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1485bec414f5ad5218c1f2785e672f7583fc4f7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/tzres/tzres.rc | 556 ++++++++++++------------ po/ar.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ast.po | 702 ++++++++++++++++++++++++++---- po/bg.po | 268 ++++++++++++ po/ca.po | 392 +++++++++++++++++ po/cs.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/da.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/de.po | 276 ++++++++++++ po/el.po | 268 ++++++++++++ po/en.po | 268 ++++++++++++ po/en_US.po | 268 ++++++++++++ po/eo.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/es.po | 563 ++++++++++++++++++++++-- po/fa.po | 847 ++++++++++++++++++++++++++++--------- po/fi.po | 306 ++++++++++++++ po/fr.po | 1152 ++++++++++++++++++++++++++++++++++++++++++-------- po/he.po | 1028 +++++++++++++++++++++++++++++++++++--------- po/hi.po | 268 ++++++++++++ po/hr.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/hu.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/it.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ja.po | 268 ++++++++++++ po/ko.po | 268 ++++++++++++ po/lt.po | 366 ++++++++++++++++ po/ml.po | 268 ++++++++++++ po/nb_NO.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/nl.po | 302 +++++++++++++ po/or.po | 268 ++++++++++++ po/pa.po | 268 ++++++++++++ po/pl.po | 344 +++++++++++++++ po/pt_BR.po | 376 ++++++++++++++++ po/pt_PT.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/rm.po | 268 ++++++++++++ po/ro.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ru.po | 840 +++++++++++++++++++++++++++++++----- po/si.po | 330 +++++++++++++++ po/sk.po | 1024 +++++++++++++++++++++++++++++++++++--------- po/sl.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 855 ++++++++++++++++++++++++++++--------- po/sr_RS(a)latin.po | 855 ++++++++++++++++++++++++++++--------- po/sv.po | 1012 ++++++++++++++++++++++++++++++++++++-------- po/ta.po | 268 ++++++++++++ po/te.po | 268 ++++++++++++ po/th.po | 847 ++++++++++++++++++++++++++++--------- po/tr.po | 300 +++++++++++++ po/uk.po | 370 ++++++++++++++++ po/wa.po | 847 ++++++++++++++++++++++++++++--------- po/wine.pot | 268 ++++++++++++ po/zh_CN.po | 268 ++++++++++++ po/zh_TW.po | 268 ++++++++++++ 50 files changed, 25640 insertions(+), 4270 deletions(-)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 42471b50852e7883fe79c536391fe53d7e641d95 URL: https://gitlab.winehq.org/wine/wine/-/commit/42471b50852e7883fe79c536391fe5… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Mar 8 09:53:15 2022 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d8937c0719eed4c65805a91a4ff2e5e154319482) Conflicts: po/lt.po Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/lt.po | 200 ++++++++++++++++----------------------------------------------- 1 file changed, 51 insertions(+), 149 deletions(-)

1 0

Floris Renaud : po: Update Dutch Translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 9a47a5af8756be499e5cb3d250ad19ce3b8e15eb URL: https://gitlab.winehq.org/wine/wine/-/commit/9a47a5af8756be499e5cb3d250ad19… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Mar 8 13:48:00 2022 +0100 po: Update Dutch Translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 44bce619ef6b4c182a83c2be894f986a09b9ed24) Conflicts: po/nl.po Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/nl.po | 72 +++++++++++++++++----------------------------------------------- 1 file changed, 19 insertions(+), 53 deletions(-) diff --git a/po/nl.po b/po/nl.po index 7b54d5ac396..6c95206e857 100644 --- a/po/nl.po +++ b/po/nl.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-12-22 10:00+0100\n" +"PO-Revision-Date: 2022-03-08 13:40+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -10562,11 +10562,9 @@ msgid "(UTC+13:00) Nuku'alofa" msgstr "(UTC+13:00) Nuku'alofa" #: dlls/tzres/tzres.rc:240 -#, fuzzy -#| msgid "Mountain Standard Time (Mexico)" msgctxt "maximum 31 characters" msgid "Mountain Standard Time (Mexico)" -msgstr "Mountain Standaard Tijd (Mexico)" +msgstr "Mountain St. Tijd (Mexico)" #: dlls/tzres/tzres.rc:241 msgctxt "maximum 31 characters" @@ -10634,16 +10632,14 @@ msgid "(UTC+10:30) Lord Howe Island" msgstr "(UTC+10:30) Lord Howe-eiland" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "Arabic Standard Time" msgctxt "maximum 31 characters" msgid "Arabic Standard Time" -msgstr "Arabisch Schiereiland Standaard Tijd" +msgstr "Arab. Schiereiland St. Tijd" #: dlls/tzres/tzres.rc:49 msgctxt "maximum 31 characters" msgid "Arabic Daylight Time" -msgstr "Arabisch Schiereiland Zomertijd" +msgstr "Arab. Schiereiland Zomertijd" #: dlls/tzres/tzres.rc:50 msgid "(UTC+03:00) Baghdad" @@ -10957,18 +10953,14 @@ msgid "(UTC-03:00) City of Buenos Aires" msgstr "(UTC-03:00) Buenos Aires (stad)" #: dlls/tzres/tzres.rc:378 -#, fuzzy -#| msgid "Turks And Caicos Standard Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Standard Time" -msgstr "Turks- en Caicoseilanden Standaard Tijd" +msgstr "Turks en Caicos Standaard Tijd" #: dlls/tzres/tzres.rc:379 -#, fuzzy -#| msgid "Turks And Caicos Daylight Time" msgctxt "maximum 31 characters" msgid "Turks And Caicos Daylight Time" -msgstr "Turks- en Caicoseilanden Zomertijd" +msgstr "Turks en Caicos Zomertijd" #: dlls/tzres/tzres.rc:380 msgid "(UTC-05:00) Turks and Caicos" @@ -11208,11 +11200,9 @@ msgid "(UTC+10:00) Canberra, Melbourne, Sydney" msgstr "(UTC+10:00) Canberra, Melbourne, Sydney" #: dlls/tzres/tzres.rc:246 -#, fuzzy -#| msgid "N. Central Asia Standard Time" msgctxt "maximum 31 characters" msgid "N. Central Asia Standard Time" -msgstr "Noordcentraal-Azië Standaard Tijd" +msgstr "Noordcentraal-Azië St. Tijd" #: dlls/tzres/tzres.rc:247 msgctxt "maximum 31 characters" @@ -11429,11 +11419,9 @@ msgid "(UTC+02:00) Harare, Pretoria" msgstr "(UTC+02:00) Harare, Pretoria" #: dlls/tzres/tzres.rc:96 -#, fuzzy -#| msgid "Cen. Australia Standard Time" msgctxt "maximum 31 characters" msgid "Cen. Australia Standard Time" -msgstr "Centraal Australië Standaard Tijd" +msgstr "Centraal Australië St. Tijd" #: dlls/tzres/tzres.rc:97 msgctxt "maximum 31 characters" @@ -11496,11 +11484,9 @@ msgid "(UTC+09:00) Yakutsk" msgstr "(UTC+09:00) Yakutsk" #: dlls/tzres/tzres.rc:309 -#, fuzzy -#| msgid "SA Eastern Standard Time" msgctxt "maximum 31 characters" msgid "SA Eastern Standard Time" -msgstr "Zuid-Amerika Oost Standaard Tijd" +msgstr "Zuid-Amerika Oost St. Tijd" #: dlls/tzres/tzres.rc:310 msgctxt "maximum 31 characters" @@ -11568,11 +11554,9 @@ msgid "(UTC+03:00) Moscow, St. Petersburg" msgstr "(UTC+03:00) Moskou, Sint-Petersburg" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Aus Central W. Standard Time" msgctxt "maximum 31 characters" msgid "Aus Central W. Standard Time" -msgstr "W-Centraal Australië Standaard Tijd" +msgstr "W-Centraal Australië St. Tijd" #: dlls/tzres/tzres.rc:64 msgctxt "maximum 31 characters" @@ -11621,18 +11605,14 @@ msgid "(UTC+12:00) Anadyr, Petropavlovsk-Kamchatsky" msgstr "(UTC+12:00) Anadyr, Petropavlovsk-Kamtsjatski" #: dlls/tzres/tzres.rc:435 -#, fuzzy -#| msgid "West Bank Standard Time" msgctxt "maximum 31 characters" msgid "West Bank Standard Time" -msgstr "Westelijke Jordaanoever Standaard Tijd" +msgstr "W. Jordaanoever Standaard Tijd" #: dlls/tzres/tzres.rc:436 -#, fuzzy -#| msgid "West Bank Daylight Time" msgctxt "maximum 31 characters" msgid "West Bank Daylight Time" -msgstr "Westelijke Jordaanoever Zomertijd" +msgstr "W. Jordaanoever Zomertijd" #: dlls/tzres/tzres.rc:437 msgid "(UTC+02:00) Gaza, Hebron" @@ -11653,11 +11633,9 @@ msgid "(UTC+02:00) Damascus" msgstr "(UTC+02:00) Damascus" #: dlls/tzres/tzres.rc:60 -#, fuzzy -#| msgid "AUS Central Standard Time" msgctxt "maximum 31 characters" msgid "AUS Central Standard Time" -msgstr "Centraal-Australië Standaard Tijd" +msgstr "Centraal-Australië St. Tijd" #: dlls/tzres/tzres.rc:61 msgctxt "maximum 31 characters" @@ -11739,11 +11717,9 @@ msgid "(UTC+06:00) Dhaka" msgstr "(UTC+06:00) Dhaka" #: dlls/tzres/tzres.rc:312 -#, fuzzy -#| msgid "SA Pacific Standard Time" msgctxt "maximum 31 characters" msgid "SA Pacific Standard Time" -msgstr "Zuid-Amerika West Standaard Tijd" +msgstr "Zuid-Amerika West St. Tijd" #: dlls/tzres/tzres.rc:313 msgctxt "maximum 31 characters" @@ -11965,11 +11941,9 @@ msgid "(UTC+06:00) Omsk" msgstr "(UTC+06:00) Omsk" #: dlls/tzres/tzres.rc:105 -#, fuzzy -#| msgid "Central Brazilian Standard Time" msgctxt "maximum 31 characters" msgid "Central Brazilian Standard Time" -msgstr "Centraal Brazilië Standaard Tijd" +msgstr "Centraal Brazilië St. Tijd" #: dlls/tzres/tzres.rc:106 msgctxt "maximum 31 characters" @@ -11995,11 +11969,9 @@ msgid "(UTC+03:00) Minsk" msgstr "(UTC+03:00) Minsk" #: dlls/tzres/tzres.rc:315 -#, fuzzy -#| msgid "SA Western Standard Time" msgctxt "maximum 31 characters" msgid "SA Western Standard Time" -msgstr "Zuid-Amerika West Standaard Tijd" +msgstr "Zuid-Amerika West St. Tijd" #: dlls/tzres/tzres.rc:316 msgctxt "maximum 31 characters" @@ -12174,11 +12146,9 @@ msgid "(UTC+02:00) Helsinki, Kyiv, Riga, Sofia, Tallinn, Vilnius" msgstr "(UTC+02:00) Helsinki, Kiev, Riga, Sofia, Tallinn, Vilnius" #: dlls/tzres/tzres.rc:144 -#, fuzzy -#| msgid "E. South America Standard Time" msgctxt "maximum 31 characters" msgid "E. South America Standard Time" -msgstr "Oost Zuid-Amerika Standaard Tijd" +msgstr "Oost Zuid-Amerika St. Tijd" #: dlls/tzres/tzres.rc:145 msgctxt "maximum 31 characters" @@ -12204,11 +12174,9 @@ msgid "(UTC+11:00) Solomon Is., New Caledonia" msgstr "(UTC+11:00) Salomonseilanden, Nieuw-Caledonië" #: dlls/tzres/tzres.rc:423 -#, fuzzy -#| msgid "W. Central Africa Standard Time" msgctxt "maximum 31 characters" msgid "W. Central Africa Standard Time" -msgstr "West Centraal-Afrika Standaard Tijd" +msgstr "West Centraal-Afrika St. Tijd" #: dlls/tzres/tzres.rc:424 msgctxt "maximum 31 characters" @@ -12220,11 +12188,9 @@ msgid "(UTC+01:00) West Central Africa" msgstr "(UTC+01:00) West Centraal-Afrika" #: dlls/tzres/tzres.rc:276 -#, fuzzy -#| msgid "Pacific SA Standard Time" msgctxt "maximum 31 characters" msgid "Pacific SA Standard Time" -msgstr "Pacific Zuid-Amerika Stand. Tijd" +msgstr "Pacific Zuid-Amerika St. Tijd" #: dlls/tzres/tzres.rc:277 msgctxt "maximum 31 characters"

1 0

Francois Gouget : po: Fix the French translation of 'code page'.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: a01c14ac61bf4c20e57bbaeba46a856027d9611c URL: https://gitlab.winehq.org/wine/wine/-/commit/a01c14ac61bf4c20e57bbaeba46a85… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:54:39 2022 +0100 po: Fix the French translation of 'code page'. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80845f8f5f8272cdb62c4eb50988d5e1f9b34f13) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index a7c63aeba17..eeff91cc5fd 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14156,11 +14156,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "Code de pages actif : %1!u!\n" +msgstr "Page de code active : %1!u!\n" #: programs/chcp.com/chcp.rc:29 msgid "Invalid code page\n" -msgstr "Code de pages invalide.\n" +msgstr "Page de code invalide\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -14175,12 +14175,12 @@ msgid "" msgstr "" "CHCP [nombre]\n" "\n" -" Modifie ou affiche le code de pages de la console actif.\n" +" Modifie ou affiche la page de code de la console active.\n" "\n" -" nombre Le code de pages de la console à activer.\n" +" nombre La page de code de la console à activer.\n" "\n" -" Lancer CHCP sans nombre en paramètre pour afficher le code de pages actif " -"de la console.\n" +" Lancer CHCP sans nombre en paramètre pour afficher la page de code de la " +"console active.\n" "\n" #: programs/clock/clock.rc:32

1 0

Francois Gouget : po: Fix backslash duplication in a French translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: be09a31b9a9269ae0cd744ced822be485904b1f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/be09a31b9a9269ae0cd744ced822be… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:55:01 2022 +0100 po: Fix backslash duplication in a French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a1a94dfd81418cefa28da6da0fc3b6c44c2a530a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index eeff91cc5fd..758e1fdcf4b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16958,7 +16958,7 @@ msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" msgstr "" -"La valeur de registre « %1\\\\%2 » existe déjà. Voulez-vous la remplacer ?" +"La valeur de registre « %1\\%2 » existe déjà. Voulez-vous la remplacer ?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?"

1 0

Francois Gouget : po: Remove a space before a linefeed in the French translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e54b61503f286cb1c4d00ebb189b07a169b1d335 URL: https://gitlab.winehq.org/wine/wine/-/commit/e54b61503f286cb1c4d00ebb189b07… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:55:40 2022 +0100 po: Remove a space before a linefeed in the French translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8be5ec578a859df5e04eb957b3773a10ceda961d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 758e1fdcf4b..b16585ee732 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16812,7 +16812,7 @@ msgstr "" "REG IMPORT <fichier>\n" "\n" " Importe des clés et leurs valeurs à partir d'un fichier vers le registre.\n" -" \n" +"\n" " <fichier>\n" " Le chemin d'accès et le nom du fichier à importer.\n" "\n"

1 0

Francois Gouget : po: Remove spaces before linefeeds in the Spanish translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: dead5e63a50b23a4bbd6f75d116d53d97635fe74 URL: https://gitlab.winehq.org/wine/wine/-/commit/dead5e63a50b23a4bbd6f75d116d53… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:56:31 2022 +0100 po: Remove spaces before linefeeds in the Spanish translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c390852e3f46c567b3ac8f57ed80922a61d7c840) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/es.po b/po/es.po index 90dad319e39..b6033b3b2b6 100644 --- a/po/es.po +++ b/po/es.po @@ -17328,7 +17328,7 @@ msgid "" msgstr "" "Utilidad de registro de DLL de Wine\n" "\n" -"Proporciona servicios de registro de DLL. \n" +"Proporciona servicios de registro de DLL.\n" "\n" #: programs/regsvr32/regsvr32.rc:41 @@ -17350,7 +17350,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: cambio no válido o no reconocido [%1] \n" +"regsvr32: cambio no válido o no reconocido [%1]\n" "\n" #: programs/regsvr32/regsvr32.rc:43

1 0

Francois Gouget : po: Remove a space before a linefeed in the Chinese translation.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 3422dd5915b07f8cf1e6da3657a9b5ad8f109e3f URL: https://gitlab.winehq.org/wine/wine/-/commit/3422dd5915b07f8cf1e6da3657a9b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 15 15:57:00 2022 +0100 po: Remove a space before a linefeed in the Chinese translation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1f9a15688726adead1b2f5e8fa6b9045c629b21c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 61de7d3ffb3..66fc13f88a2 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -13898,7 +13898,7 @@ msgstr "" "\n" "语法: MKLINK [options] link_name target\n" "\n" -"选项: \n" +"选项:\n" "/d 创建目录符号链接。\n" "/h 创建硬链接。\n" "/j 创建目录结。\n"

1 0

Piotr Caban : ucrtbase: Add support for r-value demangling in unDName.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e61cba4644e8d4f0c01cbaad52b49d3e8dcfb14a URL: https://gitlab.winehq.org/wine/wine/-/commit/e61cba4644e8d4f0c01cbaad52b49d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 7 17:44:46 2022 +0100 ucrtbase: Add support for r-value demangling in unDName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44202 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a656a8b64459845dd68ea4aa43639b06f452193b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/undname.c | 6 ++++++ dlls/ucrtbase/tests/cpp.c | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 88782158bf4..c7016a11b51 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -450,6 +450,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, case 'R': str_modif = str_printf(sym, " *%s volatile", ptr_modif); break; case 'S': str_modif = str_printf(sym, " *%s const volatile", ptr_modif); break; case '?': str_modif = ""; break; + case '$': str_modif = str_printf(sym, " &&%s", ptr_modif); break; default: return FALSE; } @@ -1028,6 +1029,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; ct->left = str_printf(sym, "%s %s", ct->left, ptr); } + else if (*sym->current == 'Q') + { + sym->current++; + if (!get_modified_type(ct, sym, pmt_ref, '$', in_args)) goto done; + } break; } break; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 163e1968069..77b06e7cd42 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -52,7 +52,7 @@ static int (CDECL *p___std_type_info_compare)(const type_info140*, const type_in static const char* (CDECL *p___std_type_info_name)(type_info140*, SLIST_HEADER*); static void (CDECL *p___std_type_info_destroy_list)(SLIST_HEADER*); static size_t (CDECL *p___std_type_info_hash)(type_info140*); - +static char* (__cdecl *p___unDName)(char*,const char*,int,void*,void*,unsigned short int); static BOOL init(void) { @@ -72,6 +72,7 @@ static BOOL init(void) p___std_type_info_name = (void*)GetProcAddress(module, "__std_type_info_name"); p___std_type_info_destroy_list = (void*)GetProcAddress(module, "__std_type_info_destroy_list"); p___std_type_info_hash = (void*)GetProcAddress(module, "__std_type_info_hash"); + p___unDName = (void*)GetProcAddress(module, "__unDName"); return TRUE; } @@ -189,9 +190,27 @@ static void test___std_type_info(void) ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); } +static void test___unDName(void) +{ + char *name; + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); +} + START_TEST(cpp) { if (!init()) return; test___std_exception(); test___std_type_info(); + test___unDName(); }

1 0