June 2021 - Wine-commits - list.winehq.org

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 5d2d2c3264b2d6039950b36bc5b59458b5842860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2d2c3264b2d6039950b36b… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Fri Jun 4 19:56:52 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 75 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/po/nl.po b/po/nl.po index 03a6b7a1f3e..cd8fbce0f44 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-05-20 14:10+0200\n" +"PO-Revision-Date: 2021-06-04 19:40+0200\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -4515,7 +4515,7 @@ msgstr "Pad is ongeldig.\n" #: dlls/kernel32/winerror.mc:678 msgid "Signal pending.\n" -msgstr "Signaal wachtende.\n" +msgstr "Signaal in behandeling.\n" #: dlls/kernel32/winerror.mc:683 msgid "Max system-wide thread count reached.\n" @@ -4527,7 +4527,7 @@ msgstr "Vergrendelen mislukt.\n" #: dlls/kernel32/winerror.mc:693 msgid "Resource in use.\n" -msgstr "Resource in gebruik.\n" +msgstr "Bron in gebruik.\n" #: dlls/kernel32/winerror.mc:698 msgid "Cancel violation.\n" @@ -6088,11 +6088,11 @@ msgstr "Geen systeembronnen.\n" #: dlls/kernel32/winerror.mc:2653 msgid "No non-paged system resources.\n" -msgstr "Geen nonpaged systeembronnen.\n" +msgstr "Geen niet-wisselbare systeembronnen.\n" #: dlls/kernel32/winerror.mc:2658 msgid "No paged system resources.\n" -msgstr "Geen paged systeembronnen.\n" +msgstr "Geen wisselbare systeembronnen.\n" #: dlls/kernel32/winerror.mc:2663 msgid "No working set quota.\n" @@ -6112,7 +6112,7 @@ msgstr "Menu-item niet gevonden.\n" #: dlls/kernel32/winerror.mc:2683 msgid "Invalid keyboard handle.\n" -msgstr "Ongeldige toestenbordhandle.\n" +msgstr "Ongeldige toestenbordbeschrijving.\n" #: dlls/kernel32/winerror.mc:2688 msgid "Hook type not allowed.\n" @@ -6124,15 +6124,15 @@ msgstr "Interactief windowstation vereist.\n" #: dlls/kernel32/winerror.mc:2698 msgid "Timeout.\n" -msgstr "Timeout.\n" +msgstr "Time-out.\n" #: dlls/kernel32/winerror.mc:2703 msgid "Invalid monitor handle.\n" -msgstr "Ongeldige monitorhandle.\n" +msgstr "Ongeldige monitorbeschrijving.\n" #: dlls/kernel32/winerror.mc:2708 msgid "Event log file corrupt.\n" -msgstr "Gebeurtenislogbestand corrupt.\n" +msgstr "Gebeurtenislogbestand beschadigd.\n" #: dlls/kernel32/winerror.mc:2713 msgid "Event log can't start.\n" @@ -6384,7 +6384,7 @@ msgstr "Onbekende interface.\n" #: dlls/kernel32/winerror.mc:3023 msgid "No bindings.\n" -msgstr "Geen bindings.\n" +msgstr "Geen bindingen.\n" #: dlls/kernel32/winerror.mc:3028 msgid "No protocol sequences.\n" @@ -6392,11 +6392,11 @@ msgstr "Geen protocol volgordes.\n" #: dlls/kernel32/winerror.mc:3033 msgid "Can't create endpoint.\n" -msgstr "Kan eindpunt niet creëren.\n" +msgstr "Kan eindpunt niet aanmaken.\n" #: dlls/kernel32/winerror.mc:3038 msgid "Out of resources.\n" -msgstr "Resources zijn op.\n" +msgstr "Onvoldoende bronnen.\n" #: dlls/kernel32/winerror.mc:3043 msgid "RPC server unavailable.\n" @@ -6412,15 +6412,15 @@ msgstr "Ongeldige netwerkopties.\n" #: dlls/kernel32/winerror.mc:3058 msgid "No RPC call active.\n" -msgstr "Geen RPC-call actief.\n" +msgstr "Geen RPC-oproep actief.\n" #: dlls/kernel32/winerror.mc:3063 msgid "RPC call failed.\n" -msgstr "RPC-call mislukt.\n" +msgstr "RPC-oproep mislukt.\n" #: dlls/kernel32/winerror.mc:3068 msgid "RPC call failed and didn't execute.\n" -msgstr "RPC-call mislukt en niet uitgevoerd.\n" +msgstr "RPC-oproep mislukt en niet uitgevoerd.\n" #: dlls/kernel32/winerror.mc:3073 msgid "RPC protocol error.\n" @@ -6740,23 +6740,23 @@ msgstr "Server heeft open handles.\n" #: dlls/kernel32/winerror.mc:3473 msgid "Resource data not found.\n" -msgstr "Resourcedata niet gevonden.\n" +msgstr "Brongegevens niet gevonden.\n" #: dlls/kernel32/winerror.mc:3478 msgid "Resource type not found.\n" -msgstr "Resourcetype niet gevonden.\n" +msgstr "Brontype niet gevonden.\n" #: dlls/kernel32/winerror.mc:3483 msgid "Resource name not found.\n" -msgstr "Resourcenaam niet gevonden.\n" +msgstr "Bronnaam niet gevonden.\n" #: dlls/kernel32/winerror.mc:3488 msgid "Resource language not found.\n" -msgstr "Resourcetaal niet gevonden.\n" +msgstr "Brontaal niet gevonden.\n" #: dlls/kernel32/winerror.mc:3493 msgid "Not enough quota.\n" -msgstr "Niet genoeg quota.\n" +msgstr "Onvoldoende quota.\n" #: dlls/kernel32/winerror.mc:3498 msgid "No interfaces.\n" @@ -9573,55 +9573,55 @@ msgstr "Terugspoelen" #: dlls/shdoclc/shdoclc.rc:199 msgid "Trace Tags" -msgstr "Traceer Labels" +msgstr "Markeringen" #: dlls/shdoclc/shdoclc.rc:200 msgid "Resource Failures" -msgstr "Resource Fouten" +msgstr "Bronfouten" #: dlls/shdoclc/shdoclc.rc:201 msgid "Dump Tracking Info" -msgstr "Log Tracerings Informatie" +msgstr "Traceerinformatie Dumpen" #: dlls/shdoclc/shdoclc.rc:202 msgid "Debug Break" -msgstr "Debug Onderbreking" +msgstr "Foutopsporing Onderbreking" #: dlls/shdoclc/shdoclc.rc:203 msgid "Debug View" -msgstr "Debug Beeld" +msgstr "Foutopsporingsbeeld" #: dlls/shdoclc/shdoclc.rc:204 msgid "Dump Tree" -msgstr "Log Gehele Boom" +msgstr "Boom Dumpen" #: dlls/shdoclc/shdoclc.rc:205 msgid "Dump Lines" -msgstr "Log Regels" +msgstr "Regels Dumpen" #: dlls/shdoclc/shdoclc.rc:206 msgid "Dump DisplayTree" -msgstr "Log Beeld Boom" +msgstr "BeeldBoom Dumpen" #: dlls/shdoclc/shdoclc.rc:207 msgid "Dump FormatCaches" -msgstr "Log Formaat Caches" +msgstr "FormaatCaches Dumpen" #: dlls/shdoclc/shdoclc.rc:208 msgid "Dump LayoutRects" -msgstr "Log Layout Rects" +msgstr "LayoutRects Dumpen" #: dlls/shdoclc/shdoclc.rc:209 msgid "Memory Monitor" -msgstr "Geheugen Monitor" +msgstr "Geheugenmonitor" #: dlls/shdoclc/shdoclc.rc:210 msgid "Performance Meters" -msgstr "Performance Meters" +msgstr "Prestatiemeters" #: dlls/shdoclc/shdoclc.rc:211 msgid "Save HTML" -msgstr "Sla HTML op" +msgstr "HTML Opslaan" #: dlls/shdoclc/shdoclc.rc:213 msgid "&Browse View" @@ -13810,7 +13810,7 @@ msgstr "" #: programs/net/net.rc:46 msgid "%1 %2 %3 Open resources: %4!u!\n" -msgstr "%1 %2 %3 Open resources: %4!u!\n" +msgstr "%1 %2 %3 Open bronnen: %4!u!\n" #: programs/net/net.rc:48 msgid "Paused" @@ -15263,15 +15263,14 @@ msgstr "reg: Foutieve opdrachtregel-parameters\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: De bron- en de doelsleutel kunnen niet hetzelfde zijn\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Het bestand '%1' bestaat al. Wilt u het overschrijven?" +msgstr "" +"De waarde '%1\\%2' komt al voor in de doelsleutel. Wilt u het overschrijven?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?"

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 4b46c6302495ceffa783f8ebc118cc71723b3e77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b46c6302495ceffa783f8eb… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Jun 4 21:54:49 2021 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 296 ++++++++++++++++----------------------------------------------- 1 file changed, 76 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4b46c6302495ceffa783…

1 0

Alexandre Julliard : Release 6.10.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 649385e7d47091fa25b9114668075b06d2942e2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=649385e7d47091fa25b91146… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 4 21:30:53 2021 +0200 Release 6.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 816 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 427 insertions(+), 410 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=649385e7d47091fa25b9…

1 0

Tag wine-6.10 : Alexandre Julliard : Release 6.10
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: refs/tags/wine-6.10 Tag: a935d725d0555b768d01e3978ce67bf6a373b187 URL: https://source.winehq.org/git/wine.git/?a=tag;h=a935d725d0555b768d01e3978ce… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 4 21:30:53 2021 +0200 Release 6.10

1 0

Rémi Bernon : winebus.sys: Add some buttons to HID mouse input report.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 318e5feda581e601aa0c5a7023a1749733617e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=318e5feda581e601aa0c5a70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 12:47:05 2021 +0200 winebus.sys: Add some buttons to HID mouse input report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 99f834d2f40..a572d11f822 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -476,12 +476,13 @@ static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, { TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL)) return STATUS_BUFFER_TOO_SMALL; memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + add_button_block(buffer + sizeof(REPORT_HEADER), 1, 3); + memcpy(buffer + sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS), REPORT_TAIL, sizeof(REPORT_TAIL)); buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_MOUSE;

1 0

Rémi Bernon : winebus.sys: Add some buttons to HID keyboard input report.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 001b70774f70ddcf2b956d2264201780e2c622d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=001b70774f70ddcf2b956d22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 12:47:06 2021 +0200 winebus.sys: Add some buttons to HID keyboard input report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/controller.h | 3 ++- dlls/winebus.sys/main.c | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index a941b543c08..2f4a72a94cd 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -33,7 +33,7 @@ static const BYTE REPORT_HEADER[] = { #define IDX_HEADER_USAGE 3 static const BYTE REPORT_BUTTONS[] = { - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_PAGE(1, /* placeholder */ HID_USAGE_PAGE_BUTTON), USAGE_MINIMUM(1, /* placeholder */ 1), USAGE_MAXIMUM(1, /* placeholder */ 3), LOGICAL_MINIMUM(1, 0), @@ -44,6 +44,7 @@ static const BYTE REPORT_BUTTONS[] = { REPORT_SIZE(1, 1), INPUT(1, Data|Var|Abs), }; +#define IDX_BUTTON_USAGE_PAGE 1 #define IDX_BUTTON_MIN_USAGE 3 #define IDX_BUTTON_MAX_USAGE 5 #define IDX_BUTTON_COUNT 15 diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a572d11f822..a512015d478 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -546,12 +546,14 @@ static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffe { TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL)) + *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL); + if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL)) return STATUS_BUFFER_TOO_SMALL; memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - memcpy(buffer + sizeof(REPORT_HEADER), REPORT_TAIL, sizeof(REPORT_TAIL)); + add_button_block(buffer + sizeof(REPORT_HEADER), 0, 101); + buffer[sizeof(REPORT_HEADER) + IDX_BUTTON_USAGE_PAGE] = HID_USAGE_PAGE_KEYBOARD; + memcpy(buffer + sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS), REPORT_TAIL, sizeof(REPORT_TAIL)); buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_KEYBOARD;

1 0

Francois Gouget : user32/tests: Protect OpenClipboard() from interference.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 316eec8f6658a3776d3ae147baf5ade11e536116 URL: https://source.winehq.org/git/wine.git/?a=commit;h=316eec8f6658a3776d3ae147… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 4 14:39:09 2021 +0200 user32/tests: Protect OpenClipboard() from interference. Applications using ole32's clipboard API (e.g. Radeon / QT5) end up monitoring the content of the clipboard and calling OpenClipboard() while user32:clipboard runs. This causes the test's own OpenClipboard() calls to fail. Similarly the KDE clipboard manager may query the Wine clipboard content while the test runs, causing winex11.drv to call OpenClipboard() with the same effect. So call OpenClipboard() again when it fails due to the clipboard already being open. If opening the clipboard still fails, trace who opened the clipboard, particularly the window class name to help identify the source of interference. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 111 ++++++++++++++++++++++++++---------------- 1 file changed, 70 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=316eec8f6658a3776d3a…

1 0

Francois Gouget : user32/tests: Protect GetOpenClipboardWindow() from interference.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: f58505d1db7ae7b041976ef8e1e4b6fc7a0a1d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f58505d1db7ae7b041976ef8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 4 14:39:12 2021 +0200 user32/tests: Protect GetOpenClipboardWindow() from interference. As for OpenClipboard(), if another application opened the clipboard, GetOpenClipboardWindow() will not return the expected value. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index b2075c128c2..4b95675770b 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -62,6 +62,27 @@ static BOOL open_clipboard(HWND hwnd) } } +static BOOL has_no_open_wnd(void) +{ + DWORD start = GetTickCount(); + while (1) + { + HWND clipwnd = GetOpenClipboardWindow(); + if (!clipwnd) return TRUE; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + /* See open_clipboard() */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return FALSE; + } + Sleep(15); + } +} + static DWORD WINAPI open_clipboard_thread(LPVOID arg) { HWND hWnd = arg; @@ -347,7 +368,7 @@ static void test_ClipboardOwner(void) SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); - ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); + ok( has_no_open_wnd() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); ok( !IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE available\n" ); SetLastError( 0xdeadbeef ); @@ -365,7 +386,7 @@ static void test_ClipboardOwner(void) ok( ret, "CloseClipboard error %d\n", GetLastError()); run_thread( open_and_empty_clipboard_thread, 0, __LINE__ ); - ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( has_no_open_wnd(), "wrong open window\n" ); ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); ret = open_clipboard( 0 ); @@ -386,12 +407,12 @@ static void test_ClipboardOwner(void) ok( !IsClipboardFormatAvailable( CF_WAVE ), "SetClipboardData succeeded\n" ); run_thread( open_and_empty_clipboard_thread, GetDesktopWindow(), __LINE__ ); - ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( has_no_open_wnd(), "wrong open window\n" ); ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner window %p / %p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( open_and_empty_clipboard_win_thread, 0, __LINE__ ); - ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); + ok( has_no_open_wnd(), "wrong open window\n" ); ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); }

1 0

Dmitry Timoshkov : wininet: Reset buffer size before each call to HTTP_HttpQueryInfoW.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 3b052877e46c7ae7cbedfd8f71ea58b691504dc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b052877e46c7ae7cbedfd8f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 3 17:01:06 2021 +0300 wininet: Reset buffer size before each call to HTTP_HttpQueryInfoW. Otherwise when headers contain multiple entries like WWW-Authenticate: Negotiate WWW-Authenticate: Basic realm="SAMPLE.COM" then 2nd query fails because buffer size is shorter than the header value. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c770c312ba9..eedb210cd23 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5125,6 +5125,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = TRUE; break; } + + dwBufferSize = 2048; } heap_free( host ); @@ -5153,6 +5155,8 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, loop_next = TRUE; break; } + + dwBufferSize = 2048; } if(!loop_next) {

1 0

Rémi Bernon : mmdevapi: Make MMDevEnumerator a static variable.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 4caea555afdeb13d303d8bc126df55333ec2941a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4caea555afdeb13d303d8bc1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 3 18:15:29 2021 +0200 mmdevapi: Make MMDevEnumerator a static variable. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/devenum.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index fc33cac17ec..38ae5f8962d 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -59,7 +59,6 @@ typedef struct MMDevEnumImpl LONG ref; } MMDevEnumImpl; -static MMDevEnumImpl *MMDevEnumerator; static MMDevice **MMDevice_head; static MMDevice *MMDevice_def_rec, *MMDevice_def_play; static DWORD MMDevice_count; @@ -69,6 +68,7 @@ static const IMMDeviceVtbl MMDeviceVtbl; static const IPropertyStoreVtbl MMDevPropVtbl; static const IMMEndpointVtbl MMEndpointVtbl; +static MMDevEnumImpl enumerator; static IMMDevice info_device; typedef struct MMDevColImpl @@ -860,23 +860,15 @@ static const IMMDeviceCollectionVtbl MMDevColVtbl = HRESULT MMDevEnum_Create(REFIID riid, void **ppv) { - MMDevEnumImpl *This = MMDevEnumerator; - - if (!This) + if (enumerator.ref == 0) { - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); - *ppv = NULL; - if (!This) - return E_OUTOFMEMORY; - This->ref = 1; - This->IMMDeviceEnumerator_iface.lpVtbl = &MMDevEnumVtbl; - MMDevEnumerator = This; - + enumerator.ref = 1; load_devices_from_reg(); load_driver_devices(eRender); load_driver_devices(eCapture); } - return IMMDeviceEnumerator_QueryInterface(&This->IMMDeviceEnumerator_iface, riid, ppv); + + return IMMDeviceEnumerator_QueryInterface(&enumerator.IMMDeviceEnumerator_iface, riid, ppv); } void MMDevEnum_Free(void) @@ -886,8 +878,6 @@ void MMDevEnum_Free(void) RegCloseKey(key_render); RegCloseKey(key_capture); key_render = key_capture = NULL; - HeapFree(GetProcessHeap(), 0, MMDevEnumerator); - MMDevEnumerator = NULL; } static HRESULT WINAPI MMDevEnum_QueryInterface(IMMDeviceEnumerator *iface, REFIID riid, void **ppv) @@ -920,8 +910,6 @@ static ULONG WINAPI MMDevEnum_Release(IMMDeviceEnumerator *iface) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); LONG ref = InterlockedDecrement(&This->ref); - if (!ref) - MMDevEnum_Free(); TRACE("Refcount now %i\n", ref); return ref; } @@ -1287,6 +1275,12 @@ static const IMMDeviceEnumeratorVtbl MMDevEnumVtbl = MMDevEnum_UnregisterEndpointNotificationCallback }; +static MMDevEnumImpl enumerator = +{ + {&MMDevEnumVtbl}, + 0, +}; + static HRESULT MMDevPropStore_Create(MMDevice *parent, DWORD access, IPropertyStore **ppv) { MMDevPropStore *This;

1 0