January 2022 - Wine-Commits

Alex Henrie : comctl32/tests: Drop tooltips test workarounds for Windows <= 2000.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: 414123d5da30adfe34cbd2c36bbdc263503e589c URL: https://source.winehq.org/git/wine.git/?a=commit;h=414123d5da30adfe34cbd2c3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jan 4 23:30:12 2022 -0700 comctl32/tests: Drop tooltips test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 639d51f7c28..4483e6f3fa3 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -55,8 +55,7 @@ static void test_create_tooltip(BOOL is_v6) style = GetWindowLongA(hwnd, GWL_STYLE); exp_style = 0x7fffffff | WS_POPUP; exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); - ok(style == exp_style || broken(style == (exp_style | WS_BORDER)), /* nt4 */ - "wrong style %08x/%08x\n", style, exp_style); + ok(style == exp_style, "wrong style %08x/%08x\n", style, exp_style); DestroyWindow(hwnd); @@ -243,8 +242,7 @@ static void test_customdraw(void) { if (CD_Stages) { /* Check CustomDraw results */ - ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls || - broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */ + ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls, "%d: CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages, expectedResults[iterationNumber].ExpectedCalls); } @@ -503,14 +501,11 @@ todo_wine todo_wine ok(!r, "Adding the tool to the tooltip succeeded!\n"); - if (0) /* crashes on NT4 */ - { - toolinfoW.hwnd = NULL; - toolinfoW.uId = 0x1234ABCD; - toolinfoW.lpszText = bufW; - SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); - ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); - } + toolinfoW.hwnd = NULL; + toolinfoW.uId = 0x1234ABCD; + toolinfoW.lpszText = bufW; + SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); + ok(toolinfoW.lpszText[0] == 0, "lpszText should be an empty string\n"); /* text with embedded tabs */ toolinfoA.cbSize = sizeof(TTTOOLINFOA); @@ -571,9 +566,7 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xaaaaaaaa; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0x1abe11ed == ti.lParam || - broken(0x1abe11ed != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0x1abe11ed, got %lx\n", ti.lParam); + ok(0x1abe11ed == ti.lParam, "Expected 0x1abe11ed, got %lx\n", ti.lParam); tiW.cbSize = TTTOOLINFOW_V2_SIZE; tiW.hwnd = NULL; @@ -582,9 +575,7 @@ static void test_ttm_gettoolinfo(void) tiW.lpszText = NULL; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); - ok(0x1abe11ed == tiW.lParam || - broken(0x1abe11ed != tiW.lParam), /* comctl32 < 5.81 */ - "Expected 0x1abe11ed, got %lx\n", tiW.lParam); + ok(0x1abe11ed == tiW.lParam, "Expected 0x1abe11ed, got %lx\n", tiW.lParam); ti.cbSize = TTTOOLINFOA_V2_SIZE; ti.uId = 0x1234ABCD; @@ -595,9 +586,7 @@ static void test_ttm_gettoolinfo(void) ti.lParam = 0xdeadbeef; r = SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&ti); ok(r, "Getting tooltip info failed\n"); - ok(0x55555555 == ti.lParam || - broken(0x55555555 != ti.lParam), /* comctl32 < 5.81 */ - "Expected 0x55555555, got %lx\n", ti.lParam); + ok(0x55555555 == ti.lParam, "Expected 0x55555555, got %lx\n", ti.lParam); DestroyWindow(hwnd); @@ -854,9 +843,7 @@ static void test_longtextW(void) toolinfoW.lpszText = bufW; SendMessageW(hwnd, TTM_GETTEXTW, 0, (LPARAM)&toolinfoW); textlen = lstrlenW(toolinfoW.lpszText); - ok(textlen == lenW || - broken(textlen == 0 && toolinfoW.lpszText == NULL), /* nt4, kb186177 */ - "lpszText has %d chars\n", textlen); + ok(textlen == lenW, "lpszText has %d chars\n", textlen); } DestroyWindow(hwnd);

1 0

Huw Davies : iphlpapi: Always populate the friendly name.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: c1bbfe17a5e542a989c1831b18f1f4f36cf00b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1bbfe17a5e542a989c1831b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 5 12:55:19 2022 +0000 iphlpapi: Always populate the friendly name. The GAA_FLAG_SKIP_FRIENDLY_NAME flag is essentially ignored. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48084 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 11 ++++------- dlls/iphlpapi/tests/iphlpapi.c | 8 +++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 15c4f067105..c94f869c9f9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1221,7 +1221,7 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if (err) return err; needed = count * (sizeof(*aa) + ((CHARS_IN_GUID + 1) & ~1) + sizeof(stat->descr.String)); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) needed += count * sizeof(rw->alias.String); + needed += count * sizeof(rw->alias.String); /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ aa = heap_alloc_zero( needed ); if (!aa) @@ -1243,12 +1243,9 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(stat[i].descr.String), &stat[i].descr ); aa[i].Description = (WCHAR *)str_ptr; str_ptr += sizeof(stat[i].descr.String); - if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) - { - if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); - aa[i].FriendlyName = (WCHAR *)str_ptr; - str_ptr += sizeof(rw[i].alias.String); - } + if_counted_string_copy( (WCHAR *)str_ptr, ARRAY_SIZE(rw[i].alias.String), &rw[i].alias ); + aa[i].FriendlyName = (WCHAR *)str_ptr; + str_ptr += sizeof(rw[i].alias.String); aa[i].PhysicalAddressLength = rw[i].phys_addr.Length; if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; memcpy( aa[i].PhysicalAddress, rw[i].phys_addr.Address, aa[i].PhysicalAddressLength ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 2adacd36b48..12da629c30c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1580,6 +1580,12 @@ static void test_GetAdaptersAddresses(void) ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); if (ret != ERROR_BUFFER_OVERFLOW) return; + /* GAA_FLAG_SKIP_FRIENDLY_NAME is ignored */ + osize = 0x7fffffff; + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, NULL, &osize); + ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %u\n", ret); + ok(osize == size, "expected %d, got %d\n", size, osize); + ptr = HeapAlloc(GetProcessHeap(), 0, size); ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &size); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); @@ -1589,7 +1595,7 @@ static void test_GetAdaptersAddresses(void) size *= 2; osize = size; ptr = HeapAlloc(GetProcessHeap(), 0, osize); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ptr, &osize); ok(!ret, "expected ERROR_SUCCESS got %u\n", ret); ok(osize == size, "expected %d, got %d\n", size, osize);

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: 2bb3e58cd793a0067210c905752a382414c809e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bb3e58cd793a0067210c905… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jan 5 02:06:22 2022 -0600 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 249 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 207 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bb3e58cd793a0067210…

1 0

Jacek Caban : mshtml: Remove duplicate check in get_top_window.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: wine Branch: master Commit: d202e4a3864c1f15730e3e3c63e2928e6171c2cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d202e4a3864c1f15730e3e3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 5 00:15:55 2022 +0100 mshtml: Remove duplicate check in get_top_window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49174 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 635b046ea39..389552c3088 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -85,7 +85,7 @@ void get_top_window(HTMLOuterWindow *window, HTMLOuterWindow **ret) { HTMLOuterWindow *iter; - for(iter = window; iter->parent && iter->parent; iter = iter->parent); + for(iter = window; iter->parent; iter = iter->parent); *ret = iter; }

1 0

Francois Gouget : testbot/SetwinLocale: Tweak the --country checks and conversion.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: tools Branch: master Commit: 11d12f958aa52c65e8c08971e5ba3cd7963a7559 URL: https://source.winehq.org/git/tools.git/?a=commit;h=11d12f958aa52c65e8c0897… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 5 16:40:47 2022 +0100 testbot/SetwinLocale: Tweak the --country checks and conversion. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 521f0f9..2f72253 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -397,19 +397,19 @@ if (!defined $Usage) $OptLocale ||= $OptDefault; $OptSystem ||= $OptDefault; $OptMUI ||= $OptDefault; - if (!defined $OptCountry and defined $OptDefault and - $OptDefault =~ /-([A-Z]{2})$/) + + if (!$OptCountry and ($OptDefault || "") =~ /-([A-Z]{2})$/) { $OptCountry = $1; } - if (defined $OptCountry) + if ($OptCountry) { - if (!exists $Countries{$OptCountry}) + $CountryId = $Countries{$OptCountry}; + if (!defined $CountryId) { Error("unknown country '$OptCountry'\n"); $Usage = 2; } - $CountryId = $Countries{$OptCountry}; } if (!$OptLocale and !$OptSystem and !$OptMUI and !$OptKeyboard and

1 0

Francois Gouget : testbot/SetWinLocale: Also show the user's languages list.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: tools Branch: master Commit: f15ba53e06994c1e2a4c305238bc713157bef919 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f15ba53e06994c1e2a4c305… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 5 16:39:15 2022 +0100 testbot/SetWinLocale: Also show the user's languages list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index e611966..f1d1336 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -551,7 +551,9 @@ sub GetWinSettings($) } if (($OptKeyboard || $OptDefault) or $All) { - $Settings->{InputMethod} = RegGetValue($HKCU_USER_PROFILE, "InputMethodOverride"); + my $Values = RegGetValues($HKCU_USER_PROFILE, "*"); + $Settings->{InputMethod} = $Values->{InputMethodOverride}; + $Settings->{Languages} = $Values->{Languages}; } if ($OptMUI or $All) { @@ -582,6 +584,7 @@ sub ShowWinSettings($) print "Geo:Nation (--country) = ", Value2Str($Settings->{Country}), "\n"; print "Geo:Name (--country) = ", Value2Str($Settings->{CountryName}), "\n"; print "InputMethod (--keyboard) = ", Value2Str($Settings->{InputMethod}), "\n"; + print "Languages = ", Value2Str($Settings->{Languages}), "\n"; print "PreferredUILanguages (--mui) = ", Value2Str($Settings->{PreferredUILanguages}), "\n"; print " ...Pending (--mui) = ", Value2Str($Settings->{PreferredUILanguagesPending}), "\n"; print " Previous... (--mui) = ", Value2Str($Settings->{PreviousPreferredUILanguages}), "\n";

1 0

Francois Gouget : testbot/SetWinLocale: Fix the usage message and add Powershell information.
by Alexandre Julliard Jan. 5, 2022

Jan. 5, 2022

Module: tools Branch: master Commit: 3e46b3b7bf7c9aabdb71ba640b2dc27c7dc4f720 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3e46b3b7bf7c9aabdb71ba6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jan 5 16:40:32 2022 +0100 testbot/SetWinLocale: Fix the usage message and add Powershell information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index f1d1336..521f0f9 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -432,41 +432,46 @@ if (defined $Usage) Error("try '$name0 --help' for more information\n"); exit $Usage; } - print "or $name0 [options] --show HOSTNAME\n"; - print "or $name0 [options] [--default LOC] [--locale USR] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; + print "Usage: $name0 [options] --show HOSTNAME\n"; + print "or $name0 [options] [--default DEF] [--locale LOC] [--system SYS] [--mui MUI] [--keyboard KBD] [--country CTY] HOSTNAME\n"; print "\n"; print "Sets the locale of the specified Windows machine.\n"; print "\n"; print "Where:\n"; print " HOSTNAME Work on the specified Windows host (must be running TestAgentd).\n"; print " --show Show the locale settings of the specified host and exit.\n"; - print " --default LOC Use this Windows locale as the default for the other options.\n"; + print " --default DEF Use this Windows locale as the default for the other options.\n"; print " The locale must be in a form suitable for Windows' intl.cpl\n"; print " control panel module, that is roughly ll-CC where ll is an\n"; print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; - print " --locale USR Specifies the user formats (see --defaults).\n"; + print " --locale LOC Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; + print " . Powershell: Set-Culture LOC\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; print " . APIs: GetSystemDefaultLCID().\n"; + print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --mui MUI Specifies the display language (see --defaults).\n"; print " . Only takes effect after a log out + log in.\n"; print " . Windows 10 GUI: Time & language -> Language -> Windows\n"; print " display language.\n"; print " . APIs: GetSystemPreferredUILanguages(),\n"; print " GetUserDefaultUILanguage(), GetThreadUILanguage().\n"; + print " . Powershell: Set-WinUILanguageOverride -Language MUI\n"; print " --keyboard KBD Specifies the keyboard layout (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Language -> Keyboard ->\n"; print " Override for default input method.\n"; + print " . Powershell: Set-WinDefaultInputMethodOverride -InputTip KBD-ID\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; print " . APIs: GetUserGeoID().\n"; + print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; print " effect after the next reboot.\n"; print " --debug Show more detailed information about progress.\n";

1 0

Huw Davies : winemac: Don't try to update when the window is closing.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: 6bb537c8b0c5a178665ef0b8c1f38d9c746d9c3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bb537c8b0c5a178665ef0b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jan 4 14:35:03 2022 +0000 winemac: Don't try to update when the window is closing. This can happen after the window surface has been destroyed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52231 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index d04961f8251..9a8bbb5e255 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -36,6 +36,7 @@ BOOL pendingOrderOut; BOOL savedVisibleState; BOOL drawnSinceShown; + BOOL closing; WineWindow* latentParentWindow; NSMutableArray* latentChildWindows; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d0672b7fb06..10524e4b3a2 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -381,6 +381,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi @property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; @property (readwrite, nonatomic) BOOL drawnSinceShown; +(a)property (readwrite, nonatomic) BOOL closing; @property (readwrite, getter=isFakingClose, nonatomic) BOOL fakingClose; @property (retain, nonatomic) NSWindow* latentParentWindow; @@ -492,7 +493,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi if ([window contentView] != self) return; - if (!window.surface || !window.surface_mutex) + if (window.closing || !window.surface || !window.surface_mutex) return; pthread_mutex_lock(window.surface_mutex); @@ -941,7 +942,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi static WineWindow* causing_becomeKeyWindow; - @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; + @synthesize disabled, noActivate, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; @synthesize surface, surface_mutex; @synthesize shapeChangedSinceLastDraw; @@ -3232,6 +3233,7 @@ void macdrv_destroy_cocoa_window(macdrv_window w) WineWindow* window = (WineWindow*)w; OnMainThread(^{ + window.closing = TRUE; [window doOrderOut]; [window close]; });

1 0

Masanori Kakura : winealsa.drv: Fix a typo in TRACE() message.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: c2b366f4c4fe0e6b73ea1201a0fee989e45adbf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b366f4c4fe0e6b73ea1201… Author: Masanori Kakura <kakurasan(a)gmail.com> Date: Tue Jan 4 22:09:40 2022 +0900 winealsa.drv: Fix a typo in TRACE() message. Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index a4d76a30fdf..e61dae12860 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -789,7 +789,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("Unable to create output port\n"); MidiOutDev[wDevID].port_out = -1; } else { - TRACE("Outport port %d created successfully\n", port_out); + TRACE("Output port %d created successfully\n", port_out); MidiOutDev[wDevID].port_out = port_out; /* Connect our app port to the device port */

1 0

Eric Pouech : po: Some more French translations.
by Alexandre Julliard Jan. 4, 2022

Jan. 4, 2022

Module: wine Branch: master Commit: df6071381b81399d4324e5e38d8c971ce62ff6d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df6071381b81399d4324e5e3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jan 4 16:12:57 2022 +0100 po: Some more French translations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/po/fr.po b/po/fr.po index eb34ca3ac83..d6622d392ab 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3999,11 +3999,11 @@ msgstr "" #: dlls/jscript/jscript.rc:75 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "Impossible de redéfinir une propriété qui n'est pas configurable '|'" #: dlls/jscript/jscript.rc:76 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "Impossible de modifier une propriété qui est protégée en écriture '|'" #: dlls/jscript/jscript.rc:77 msgid "'this' is not a Map object" @@ -7641,10 +7641,8 @@ msgid "Unsupported thinning.\n" msgstr "Type non pris en charge.\n" #: dlls/mferror/mferror.mc:207 -#, fuzzy -#| msgid "Request not supported.\n" msgid "Reversing is not supported.\n" -msgstr "Demande non prise en charge.\n" +msgstr "Le sens à rebours n'est pas pris en charge.\n" #: dlls/mferror/mferror.mc:214 #, fuzzy @@ -7741,14 +7739,12 @@ msgid "Property is not empty.\n" msgstr "La propriété n'est pas vide.\n" #: dlls/mferror/mferror.mc:375 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Vector property is not allowed.\n" -msgstr "Type de point d'entrée non autorisé.\n" +msgstr "La propriété vecteur n'est pas autorisée.\n" #: dlls/mferror/mferror.mc:382 msgid "Vector property is required.\n" -msgstr "" +msgstr "La propriété vecteur est requise.\n" #: dlls/mferror/mferror.mc:389 msgid "Operation was cancelled.\n" @@ -7798,7 +7794,7 @@ msgstr "La fin du flux de média a été atteinte.\n" #: dlls/mferror/mferror.mc:459 msgid "Shutdown() was called.\n" -msgstr "" +msgstr "Shutdown() a été appélé.\n" #: dlls/mferror/mferror.mc:466 msgid "Media stream has no duration set.\n" @@ -12236,6 +12232,7 @@ msgstr "La fonction spécifiée n'a pas été trouvée dans la DLL" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" msgstr "" +"La variable utilise un type d'automatisation non pris en charge dans VBScript" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" @@ -12348,7 +12345,7 @@ msgstr "Ce certificat comporte au moins un problème de sécurité indéterminé #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Date de début de validité" #: dlls/wininet/wininet.rc:37 msgid "Security Protocol" @@ -12410,7 +12407,7 @@ msgstr "La tentative de connexion au serveur a échoué.\n" #: dlls/wininet/winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "La connexion avec le serveur a été perdue.\n" #: dlls/wininet/winineterror.mc:76 msgid "" @@ -14590,7 +14587,7 @@ msgstr "Adresse IPv6" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Suffixe DNS principal" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information" @@ -16810,7 +16807,7 @@ msgstr "" #: programs/regedit/regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Développe ou réduit le nœud sélectionné" #: programs/regedit/regedit.rc:231 msgid "Collapse"

1 0