- wine-devel - winehq.org

[PATCH 2/3] msado15/tests: Add Field tests
by Alistair Leslie-Hughes 07 Jun '21

07 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index e097239910d..16faefef550 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -271,6 +271,13 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == S_OK, "got %08x\n", hr ); + count = -1; + hr = Fields_get_Count( fields, &count ); + todo_wine ok( !count, "got %d\n", count ); + + hr = Field_get_Name(field, &name); + todo_wine ok( hr == MAKE_ADO_HRESULT( adErrObjectNotSet ), "got %08x\n", hr ); + state = -1; hr = _Recordset_get_State( recordset, &state ); ok( hr == S_OK, "got %08x\n", hr ); @@ -639,6 +646,9 @@ static void test_Fields(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + hr = _Recordset_QueryInterface( recordset, &IID_Fields, (void **)&fields ); + ok( hr == E_NOINTERFACE, "got %08x\n", hr ); + hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.30.2

2 1

[PATCH 1/3] msado15/test: Remove Reference count tests
by Alistair Leslie-Hughes 07 Jun '21

07 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/tests/msado15.c | 80 ++---------------------------------- 1 file changed, 4 insertions(+), 76 deletions(-) diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index b5f1b70dedd..e097239910d 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -43,24 +43,6 @@ static BOOL is_eof( _Recordset *recordset ) return eof == VARIANT_TRUE; } -static LONG get_refs_field( Field *field ) -{ - Field_AddRef( field ); - return Field_Release( field ); -} - -static LONG get_refs_fields( Fields *fields ) -{ - Fields_AddRef( fields ); - return Fields_Release( fields ); -} - -static LONG get_refs_recordset( _Recordset *recordset ) -{ - _Recordset_AddRef( recordset ); - return _Recordset_Release( recordset ); -} - static void test_Recordset(void) { _Recordset *recordset; @@ -70,7 +52,7 @@ static void test_Recordset(void) Field *field; Properties *props; Property *prop; - LONG refs, count, state; + LONG count, state; VARIANT missing, val, index; CursorLocationEnum location; CursorTypeEnum cursor; @@ -89,39 +71,15 @@ static void test_Recordset(void) errorinfo = NULL; hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); - /* handing out fields object increases recordset refcount */ - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); - - /* releasing fields object decreases recordset refcount, but fields refcount doesn't drop to zero */ - Fields_Release( fields ); - refs = get_refs_recordset( recordset ); - ok( refs == 1, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); - /* calling get_Fields again returns the same object with the same refcount and increases recordset refcount */ + /* calling get_Fields again returns the same object */ hr = _Recordset_get_Fields( recordset, &fields2 ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields2 ); - ok( refs == 1, "got %d\n", refs ); ok( fields2 == fields, "expected same object\n" ); - refs = Fields_Release( fields2 ); - ok( refs == 1, "got %d\n", refs ); count = -1; hr = Fields_get_Count( fields2, &count ); @@ -131,12 +89,7 @@ static void test_Recordset(void) hr = _Recordset_Close( recordset ); ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); - refs = _Recordset_Release( recordset ); - ok( !refs, "got %d\n", refs ); - - /* fields object still has a reference */ - refs = Fields_Release( fields2 ); - ok( refs == 1, "got %d\n", refs ); + Fields_Release( fields2 ); hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); @@ -678,7 +631,7 @@ static void test_Fields(void) Field *field, *field2; VARIANT val, index; BSTR name; - LONG refs, count, size; + LONG count, size; DataTypeEnum type; FieldAttributeEnum attrs; HRESULT hr; @@ -693,11 +646,7 @@ static void test_Fields(void) errorinfo = NULL; hr = Fields_QueryInterface( fields, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_fields( fields ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); count = -1; hr = Fields_get_Count( fields, &count ); @@ -727,29 +676,12 @@ static void test_Fields(void) name = SysAllocString( L"field" ); V_VT( &index ) = VT_BSTR; V_BSTR( &index ) = name; - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); hr = Fields_get_Item( fields, index, &field ); - ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_field( field ); - ok( refs == 1, "got %d\n", refs ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); /* calling get_Item again returns the same object and adds reference */ hr = Fields_get_Item( fields, index, &field2 ); ok( hr == S_OK, "got %08x\n", hr ); ok( field2 == field, "expected same object\n" ); - refs = get_refs_field( field2 ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_recordset( recordset ); - ok( refs == 2, "got %d\n", refs ); - refs = get_refs_fields( fields ); - ok( refs == 1, "got %d\n", refs ); Field_Release( field2 ); SysFreeString( name ); @@ -757,11 +689,7 @@ static void test_Fields(void) errorinfo = NULL; hr = Field_QueryInterface( field, &IID_ISupportErrorInfo, (void **)&errorinfo ); ok( hr == S_OK, "got %08x\n", hr ); - refs = get_refs_field( field ); - ok( refs == 2, "got %d\n", refs ); if (errorinfo) ISupportErrorInfo_Release( errorinfo ); - refs = get_refs_field( field ); - ok( refs == 1, "got %d\n", refs ); /* verify values set with _Append */ hr = Field_get_Name( field, &name ); -- 2.30.2

2 1

[PATCH] [website] Update German IRC translation (try 3)
by Rebekka Zwing 07 Jun '21

07 Jun '21

Signed-off-by: Rebekka Zwing <rebekka.zwing(a)ok.de> --- Thanks Julian for your suggestions! templates/de/irc.template | 120 +++++++++++++++++++++++++++++++++----- 1 file changed, 107 insertions(+), 13 deletions(-) diff --git a/templates/de/irc.template b/templates/de/irc.template index 9a52b52b..064d1eee 100644 --- a/templates/de/irc.template +++ b/templates/de/irc.template @@ -1,20 +1,114 @@ - - + -<h1 class="title">Live Support Chat</h1> +<h1 class="title">Live Community Chat</h1> -<p>Auf <a href="http://www.freenode.net">Freenode.net</a> gibt es einen IRC-Kanal für Wine. -Du kannst den Chatroom mit einem IRC-Programm wie z.B. <a href="http://www.xchat.org/">X-Chat</a> -betreten. Verwende folgende Einstellungen:</p> +<p>Auf <a href="https://libera.chat/">Libera.Chat</a> gibt es mehrere +IRC-Kanäle für Wine. Den Chatraum kannst du mit einem IRC-Programm betreten, z.B. +<a href="https://hexchat.github.io/">HexChat</a>. Nutze folgende Einstellungen:</p> <blockquote> - <b>Server:</b> irc.freenode.net<br> - <b>Port:</b> 6667<br> - <b>Channel:</b> #winehq<br> + <b>Server:</b> irc.libera.chat<br> + <b>Port:</b> 6697<br> + <b>TLS:</b> AN </blockquote> -<p>Wenn du Firefox oder einen anderen Browser nutzt der IRC-Urls unterstütz, kannst du den Chat -betreten indem du auf <a href="irc://irc.freenode.net/winehq">irc://irc.freenode.net/winehq</a> -klickst.</p> +<p>Welchen Kanal du wählen solltest hängt davon ab, +welches Thema du erörtern möchtest:</p> -<p> </p> +<blockquote> + <b>#winehq:</b> Unterstützung und Hilfe von anderen Benutzern beim Ausführen von Wine <br> + <b>#crossover:</b> Benutzer-Support und Hilfe beim Ausführen von Crossover <br> + <b>#winehackers:</b> Entwicklung und andere Möglichkeiten um einen Beitrag für Wine zu leisten<br> + <b>#winehq-social:</b> Ungezwungene, andere Themen betreffende Chats, mit verschiedenen Community Mitgliedern<br> +</blockquote> + +<p>Benutzer eines Browsers (z.B. Firefox), der IRC-URLs unterstützt, +können an einem Chat teilnehmen indem sie ihn anklicken:</p> +<ul> + <li><a href="irc://irc.libera.chat/winehq">#winehq</a></li> + <li><a href="irc://irc.libera.chat/crossover">#crossover</a></li> + <li><a href="irc://irc.libera.chat/winehackers">#winehackers</a></li> + <li><a href="irc://irc.libera.chat/winehq-social">#winehq-social</a></li> +</ul> + +<p>Damit Diskussionen so fokussiert und hilfreich wie möglich bleiben, versuche +deine Fragen zu recherchieren, bevor du jemanden im IRC danach fragst. Das +<a href="https://wiki.winehq.org/FAQ">Wine FAQ</a>, +<a href="//appdb.winehq.org">AppDB</a>, und die +<a href="//www.winehq.org/download">Downloadseite</a> sind gute +Optionen, um deine Frage vielleicht selbst zu beantworten.</p> + +<h2>IRC-Regeln und -Strafen</h2> + +<p> Abgesehen davon, dass man sich nicht beleidigend oder offensichtlich Rücksichtslos +verhalten soll, gibt es ein Paar einfache Regeln, die jeder auf dem IRC Channel einzuhalten hat. +In den meisten Fällen, wird ein erster Regelbruch als Versehen aufgefasst und es wird eine +Verwarnung geben. Nachdem du deine Warnungen allerdings aufgebraucht hast, wirst du aus dem Kanal +geworfen.</p> + +<p>Wenn du zu oft rausgeworfen wurdest und weiterhin Regeln brichst, wirst du +für zwei Stunden vom Kanal verbannt. Jegliche Probleme danach +führen zu einer endgültigen Verbannung, welche nur durch einen Einspruch gekippt +werden kann. Wenn du einen Rauswurf anfechten möchtest, gehe auf <b>#winehq-social</b> +(oder auf die <a href="mailto:wine-devel@winehq.org">Wine-Devel Mailingliste</a>, wenn du +von <b>#winehq-social</b> verbannt wurdest), und erkläre warum du glaubst, dass dies passiert +ist und warum die Verbannung aufgehoben werden sollte.</p> + +<table class="table"> +<thead> + <tr class="black inverse small"> + <th>Regel</th> + <th>Erläuterung</th> + <th>Verwarnungen</th> + <th>Rauswürfe</th> + </tr> +</thead> +<tbody> + <tr + <td>Bitte nicht spammen.</td> + <td></td> + <td>1</td> + <td>2</td> + </tr> + <tr> + <td>Nutze ein Pastebin, um mehr als eine oder zwei Zeilen zu schicken.</td> + <td></td> + <td>0</td> + <td>5</td> + </tr> + <tr> + <td>Schreibe im passenden Kanal.</td> + <td>Wenn du unsicher bist, frage bei <b>#winehq</b> welcher Kanal der richtige ist.</td> + <td>2</td> + <td>3</td> + </tr> + <tr> + <td>Nur Wine und Crossover Kanäle werden in diesem Fall + unterstützt.</td> + <td>Sidenet, WineDoors, Cedega, IEs4Linux, etc. werden <b>nicht</b> + unterstützt.</td> + <td>2</td> + <td>1</td> + </tr> + <tr> + <td>Bevor du nach Hilfe fragst bei <b>#winehq</b>, überprüfe, ob du die + neueste Version von Wine nutzt.</td> + <td>Wenn du dir unsicher bist, führe <tt>wine --version</tt> in der Befehlszeile aus, um + deine Version zu ermitteln</td> + <td>3</td> + <td>1</td> + </tr> + <tr> + <td>Bitte warte, bis du an der Reihe bist.</td> + <td></td> + <td>3</td> + <td>1</td> + </tr> + <tr> + <td>Diskutiere <b>nicht</b> über Raubkopien.</td> + <td></td> + <td>1</td> + <td>1</td> + </tr> +</tbody> +</table> -- 2.17.1 -- www.Ok.de - die kostenlose E-Mail Adresse

2 1

[PATCH resend 1/4] include: Add IN6_PKTINFO
by Alex Henrie 07 Jun '21

07 Jun '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/ws2ipdef.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index fc465804962..4e1ec373f71 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -177,6 +177,11 @@ typedef struct WS(in_pktinfo) { UINT ipi_ifindex; } IN_PKTINFO, *PIN_PKTINFO; +typedef struct WS(in6_pktinfo) { + IN6_ADDR ipi6_addr; + ULONG ipi6_ifindex; +} IN6_PKTINFO, *PIN6_PKTINFO; + #ifndef USE_WS_PREFIX #define IPV6_OPTIONS 1 #define IPV6_HDRINCL 2 -- 2.31.1

1 3

[PATCH 1/2] strmbase: Leave critical section when waiting for the renderer state change.
by Anton Baskanov 07 Jun '21

07 Jun '21

Sometimes streaming thread gets stuck in IPin::EndOfStream trying to acquire the filter critical section for more than 1 second, causing intermittent test failures. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/strmbase/renderer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 01fabfc98de..150d712806a 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -290,10 +290,14 @@ static HRESULT renderer_cleanup_stream(struct strmbase_filter *iface) static HRESULT renderer_wait_state(struct strmbase_filter *iface, DWORD timeout) { struct strmbase_renderer *filter = impl_from_strmbase_filter(iface); + HRESULT hr = S_OK; + LeaveCriticalSection(&filter->filter.filter_cs); if (WaitForSingleObject(filter->state_event, timeout) == WAIT_TIMEOUT) - return VFW_S_STATE_INTERMEDIATE; - return S_OK; + hr = VFW_S_STATE_INTERMEDIATE; + EnterCriticalSection(&filter->filter.filter_cs); + + return hr; } static const struct strmbase_filter_ops filter_ops = -- 2.25.1

2 3

[PATCH] winex11.drv: Avoid race condition in X11 error handling.
by Torge Matthies 06 Jun '21

06 Jun '21

The err_callback* globals need to be protected from being overwritten before X11DRV_check_error is called, otherwise no or the wrong error handler might be called. This problem was aready encountered when using some patches [1] that use this error handling in frequently executed code paths. [1] https://github.com/rbernon/wine/commits/bug/17123/v3 Signed-off-by: Torge Matthies <openglfreak(a)googlemail.com> --- dlls/winex11.drv/x11drv_main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9ec4c7a98f6..2fac560556b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -108,6 +108,15 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION x11drv_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION x11drv_error_section; +static CRITICAL_SECTION_DEBUG x11drv_error_section_debug = +{ + 0, 0, &x11drv_error_section, + { &x11drv_error_section_debug.ProcessLocksList, &x11drv_error_section_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": x11drv_error_section") } +}; +static CRITICAL_SECTION x11drv_error_section = { &x11drv_error_section_debug, -1, 0, 0, 0, 0 }; + struct d3dkmt_vidpn_source { D3DKMT_VIDPNSOURCEOWNER_TYPE type; /* VidPN source owner type */ @@ -256,6 +265,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) */ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) { + EnterCriticalSection( &x11drv_error_section ); err_callback = callback; err_callback_display = display; err_callback_arg = arg; @@ -272,8 +282,10 @@ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void */ int X11DRV_check_error(void) { + int res = err_callback_result; err_callback = NULL; - return err_callback_result; + LeaveCriticalSection( &x11drv_error_section ); + return res; } -- 2.32.0

1 0

[PATCH] wininet/tests: Fix an InternetQueryOptionA/W mixup in test_secure_connection().
by Francois Gouget 06 Jun '21

06 Jun '21

The point of the test is to prove that InternetQueryOptionW() can be called on a request obtained with HttpOpenRequestA() and still returns ANSI strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The validity of this test is a bit questionable due to failures on Windows 10 1709+. But these failures are caused by interference from urlmon:url so it cannot be dismissed outright (see bug 51227). https://bugs.winehq.org/show_bug.cgi?id=51227 --- dlls/wininet/tests/http.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a5f5215f584..d4845188d39 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6734,7 +6734,7 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); /* Querying the same option through InternetQueryOptionW still results in - * ASCII strings being returned. + * ANSI strings being returned. */ size = 0; ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, @@ -6742,7 +6742,7 @@ static void test_secure_connection(void) ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); ok(size == sizeof(INTERNET_CERTIFICATE_INFOW), "size = %d\n", size); certificate_structW = HeapAlloc(GetProcessHeap(), 0, size); - ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, + ret = InternetQueryOptionW(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, certificate_structW, &size); certificate_structA = (INTERNET_CERTIFICATE_INFOA *)certificate_structW; ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); -- 2.20.1

2 1

[PATCH] urlmon/tests: Fix a typo in a comment.
by Francois Gouget 06 Jun '21

06 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 88f660d2d54..69ec00476ff 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -4102,7 +4102,7 @@ START_TEST(url) trace("asynchronous https test...\n"); test_BindToStorage(HTTPS_TEST, 0, TYMED_ISTREAM); }else { - win_skip("Skipping https testt\n"); + win_skip("Skipping https tests\n"); } bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; -- 2.20.1

2 1

[PATCH] server: the owner of a securable object should have all the standard access rights
by Damjan Jovanovic 06 Jun '21

06 Jun '21

Cygwin fork() fails in NtCreateSymbolicLinkObject(). We successfully create the link but then fail to alloc_handle() with STATUS_ACCESS_DENIED, because the requested access rights exceed what the owner is allowed. Allow it more. Thank you to Dmitry Timoshkov for debugging the security details from alloc_handle() onwards. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48891 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/advapi32/tests/security.c | 19 +++++++++++++++++-- server/token.c | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-)

1 0

[PATCH] ntdll: Allow loading of native libraries for Win16.
by Roman Pišl 05 Jun '21

05 Jun '21

This change allows to load Win16 modules with override set to native from the prefix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51224 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/ntdll/loader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f3a37d4e8a6..d8e009cdf8d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2828,12 +2828,6 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con status = STATUS_SUCCESS; goto done; } - /* 16-bit files can't be loaded from the prefix */ - if (libname[0] && libname[1] && !wcscmp( libname + wcslen(libname) - 2, L"16" )) - { - status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); - goto done; - } } } @@ -2842,6 +2836,12 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con else if (!(status = RtlDosPathNameToNtPathName_U_WithStatus( libname, nt_name, NULL, NULL ))) status = open_dll_file( nt_name, pwm, mapping, image_info, id ); + /* 16-bit files can't be loaded from the prefix */ + if (status && libname[0] && libname[1] && !wcscmp( libname + wcslen(libname) - 2, L"16" ) && !contains_path( libname )) + { + status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); + } + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT; done: -- 2.20.1

1 0

[PATCH] qcap:fix the bug which camera device can't be released correctly.
by luoriyuhui21＠163.com 05 Jun '21

05 Jun '21

From: Keming Liang <liangkeming(a)kylinos.cn> Signed-off-by: Keming Liang <liangkeming(a)kylinos.cn> --- dlls/qcap/qcap_private.h | 1 + dlls/qcap/v4l.c | 8 ++++++++ dlls/qcap/vfwcapture.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 104dba6a649..22dcecf40fd 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -44,6 +44,7 @@ struct video_capture_funcs { struct video_capture_device *(CDECL *create)(USHORT index); void (CDECL *destroy)(struct video_capture_device *device); + void (CDECL *close)(struct video_capture_device *device); HRESULT (CDECL *check_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); HRESULT (CDECL *set_format)(struct video_capture_device *device, const AM_MEDIA_TYPE *mt); void (CDECL *get_format)(struct video_capture_device *device, AM_MEDIA_TYPE *mt, VIDEOINFOHEADER *format); diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ccc06194b99..8102be50aec 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -118,6 +118,13 @@ static int xioctl(int fd, int request, void * arg) return r; } +static void CDECL v4l_device_close(struct video_capture_device *device) +{ + if (device->fd != -1) + video_close(device->fd); + device->fd = -1; +} + static void CDECL v4l_device_destroy(struct video_capture_device *device) { if (device->fd != -1) @@ -552,6 +559,7 @@ error: const struct video_capture_funcs v4l_funcs = { .create = v4l_device_create, + .close = v4l_device_close, .destroy = v4l_device_destroy, .check_format = v4l_device_check_format, .set_format = v4l_device_set_format, diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 48401344ac4..155cfda20ba 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -254,6 +254,9 @@ static HRESULT vfw_capture_cleanup_stream(struct strmbase_filter *iface) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) ERR("Failed to decommit allocator, hr %#x.\n", hr); + if (filter->init) + capture_funcs->close(filter->device); + return S_OK; } -- 2.25.1

3 3

[PATCH] po: Update on Brazilian Portuguese
by Roberto Pungartnik 05 Jun '21

05 Jun '21

1 0

Wine staging 6.10 release
by Alistair Leslie-Hughes 05 Jun '21

05 Jun '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.10 (571 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * d3d11/tests: Add a couple of extra tests for SRV/RTV conflict. * wined3d: Check for SRV/RTV binding conflicts per wined3d_state. * d3d11/tests: Add some tests for Map() on deferred contexts. * d3d11/tests: Add some tests for UpdateSubresource() on a deferred context. * user32: AddInternalGetWindowIcon stub. * shell32: Fix copying of files when using a context menu. * wtsapi32: Partial implementation of WTSEnumerateProcessesW. * wined3d: Store the framebuffer state inline in struct wined3d_cs_clear. * d3d11: Implement ID3D11Device::CreateDeferredContext(). * d3d11: Implement ID3D11Device1::CreateDeferredContext1(). * wined3d: Keep a list of acquired resources in struct wined3d_deferred_context. * d3d11: Implement ID3D11DeviceContext::ClearState() using a single CS op. * d3d11: Implement ID3D11DeviceContext::FinishCommandList(). * wined3d: Implement restoring context in wined3d_deferred_context_record_command_list(). * d3d11: Implement ID3D11DeviceContext::ExecuteCommandList(). * server: Add extra data bytes to be added after hardware_msg_data. * server: Add HID reports count / length to rawinput union. * server: Add HID reports support in GetRawInputBuffer. * server: Implement WM_INPUT / RIM_TYPEHID message dispatch. * ws2_32: Reuse old async ws2_async_io structures if possible. Added: * [49905] wscript: return TRUE for /d and /u stub switches * [51120] wbemdisp: Support DISPATCH_METHOD in ISWbemObject Invoke. * [39463] vbscript: Support looping of data from WMI * [51199] Add missing api-ms-win-core-psapi forwards * [51221] dpnet: Impelment IDirectPlay8Server EnumServiceProviders. Updated: * wined3d-CSMT_Main * d3d11-Deferred_Context * windows.networking.connectivity-new-dll Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] configure: Always warn on missing GStreamer if --with-gstreamer was specified.
by Zebediah Figura 04 Jun '21

04 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 425f3541d94..3fcd1036b79 100644 --- a/configure.ac +++ b/configure.ac @@ -1622,8 +1622,11 @@ then ac_glib2_broken=yes WINE_NOTICE([glib-2.0 pkgconfig configuration is for the wrong architecture, winegstreamer won't be built.])])])]) fi -WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes -a "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes ], - [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +if test "x$with_gstreamer" = xyes -o "x$ac_cv_header_QuickTime_ImageCompression_h" != xyes +then + WINE_NOTICE_WITH(gstreamer,[test "x$ac_glib2_broken" != xyes -a "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" != xyes], + [gstreamer-1.0 base plugins ${notice_platform}development files not found, GStreamer won't be supported.]) +fi test "x$ac_cv_lib_gstreamer_1_0_gst_pad_new" = xyes || enable_winegstreamer=${enable_winegstreamer:-no} dnl **** Check for ALSA 1.x **** -- 2.30.2

2 2

[PATCH v2 4/4] quartz: Notify EC_USERABORT event when closing video window.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/window.c | 11 +++++++++++ 4 files changed, 17 insertions(+), 6 deletions(-)

2 1

[PATCH v2 3/4] quartz: Hide video window on WM_CLOSE.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

In v2, - Merge two patches into one. - Use IVideoWindow::put_Visible to hide the video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 4 ++-- dlls/quartz/tests/vmr7.c | 4 ++-- dlls/quartz/tests/vmr9.c | 4 ++-- dlls/quartz/window.c | 10 +++++++++- 4 files changed, 15 insertions(+), 7 deletions(-)

2 1

[PATCH v2 2/4] quartz/tests: Test the close button of the video window.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

In v2, refactor the tests to add sample delivery tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 98 ++++++++++++++++++++++++++-- dlls/quartz/tests/vmr7.c | 105 ++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 100 ++++++++++++++++++++++++++-- 3 files changed, 295 insertions(+), 8 deletions(-)

3 2

[PATCH v2 1/4] quartz/tests: Introduce commit_allocator helper in vmr7.c.
by Akihiro Sagawa 04 Jun '21

04 Jun '21

New in v2 patch. The function exists in vmr9.c since 3cad37a64b90c31db0d0b71cb49e46d760b0a90d. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-)

2 1

[PATCH v2 1/4] ws2_32: Use getifaddrs() and if_nametoindex() directly in interface_bind().
by Zebediah Figura 04 Jun '21

04 Jun '21

In order to avoid accessing iphlpapi. We will need to move this code to ntdll or the server, but we can't access iphlpapi from either. Even accessing a lower-level interface (i.e. ndis) is hard—we have no good way to enumerate ndis devices from either (without duplicating large parts of setupapi). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- In terms of ws2_32 complexity, this code paths seems no more complex, or even simpler. However, it omits the fallback path using SIOCGIFCON, making getifaddrs() a hard requirement for UDP binding. I don't know what if anything this risks losing support for, but current versions of all major operating systems seem to support it (BSD, Linux, Mac, Android), and we're gated on IP_BOUND_IF or IP_UNICAST_IF anyway. v2: Intentionally link to and call the iphlpapi if_nametoindex(), which is a simple wrapper around libc anyway, by redefining the unix version. Eventually this code will be moved out of ws2_32 and this step will be unnecessary. dlls/ws2_32/socket.c | 79 ++++++++++++++++++++---------------- dlls/ws2_32/ws2_32_private.h | 8 ++++ 2 files changed, 51 insertions(+), 36 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfe5ab186ee..ad2e3a1d683 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1975,62 +1975,65 @@ static int WINAPI WS2_WSARecvMsg( SOCKET s, LPWSAMSG msg, LPDWORD lpNumberOfByte */ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) { +#if defined(HAVE_GETIFADDRS) && (defined(IP_BOUND_IF) || defined(LINUX_BOUND_IF)) struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; in_addr_t bind_addr = in_sock->sin_addr.s_addr; - PIP_ADAPTER_INFO adapters = NULL, adapter; + struct ifaddrs *ifaddrs, *ifaddr; + unsigned int index; BOOL ret = FALSE; - DWORD adap_size; int enable = 1; if (bind_addr == htonl(INADDR_ANY) || bind_addr == htonl(INADDR_LOOPBACK)) return FALSE; /* Not binding to a network adapter, special interface binding unnecessary. */ if (_get_fd_type(fd) != SOCK_DGRAM) return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ - if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) - goto cleanup; - adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); - if (adapters == NULL || GetAdaptersInfo(adapters, &adap_size) != NO_ERROR) - goto cleanup; - /* Search the IPv4 adapter list for the appropriate binding interface */ - for (adapter = adapters; adapter != NULL; adapter = adapter->Next) - { - in_addr_t adapter_addr = (in_addr_t) inet_addr(adapter->IpAddressList.IpAddress.String); - if (bind_addr == adapter_addr) + if (getifaddrs( &ifaddrs ) < 0) return FALSE; + + for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next) + { + if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET + && ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr == bind_addr) { + index = if_nametoindex( ifaddr->ifa_name ); + if (!index) + { + ERR( "Unable to look up interface index for %s: %s\n", ifaddr->ifa_name, strerror( errno ) ); + continue; + } + #if defined(IP_BOUND_IF) /* IP_BOUND_IF sets both the incoming and outgoing restriction at once */ - if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &adapter->Index, sizeof(adapter->Index)) != 0) + if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index)) != 0) goto cleanup; ret = TRUE; #elif defined(LINUX_BOUND_IF) - in_addr_t ifindex = (in_addr_t) htonl(adapter->Index); - struct interface_filter specific_interface_filter; - struct sock_fprog filter_prog; + { + in_addr_t ifindex = (in_addr_t) htonl(index); + struct interface_filter specific_interface_filter; + struct sock_fprog filter_prog; - if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) - goto cleanup; /* Failed to suggest egress interface */ - specific_interface_filter = generic_interface_filter; - specific_interface_filter.iface_rule.k = adapter->Index; - specific_interface_filter.ip_rule.k = htonl(adapter_addr); - filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); - filter_prog.filter = (struct sock_filter *) &specific_interface_filter; - if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) - goto cleanup; /* Failed to specify incoming packet filter */ - ret = TRUE; -#else - FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " - "receiving broadcast packets will not work on socket %04lx.\n", s); + if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) + goto cleanup; /* Failed to suggest egress interface */ + specific_interface_filter = generic_interface_filter; + specific_interface_filter.iface_rule.k = index; + specific_interface_filter.ip_rule.k = htonl(bind_addr); + filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); + filter_prog.filter = (struct sock_filter *) &specific_interface_filter; + if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) + goto cleanup; /* Failed to specify incoming packet filter */ + ret = TRUE; + } #endif if (ret) { EnterCriticalSection(&cs_if_addr_cache); - if (if_addr_cache_size <= adapter->Index) + if (if_addr_cache_size <= index) { unsigned int new_size; in_addr_t *new; - new_size = max(if_addr_cache_size * 2, adapter->Index + 1); + new_size = max(if_addr_cache_size * 2, index + 1); if (!(new = heap_realloc(if_addr_cache, sizeof(*if_addr_cache) * new_size))) { ERR("No memory.\n"); @@ -2043,10 +2046,10 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if_addr_cache = new; if_addr_cache_size = new_size; } - if (if_addr_cache[adapter->Index] && if_addr_cache[adapter->Index] != adapter_addr) - WARN("Adapter addr for iface index %u has changed.\n", adapter->Index); + if (if_addr_cache[index] && if_addr_cache[index] != bind_addr) + WARN("Adapter addr for iface index %u has changed.\n", index); - if_addr_cache[adapter->Index] = adapter_addr; + if_addr_cache[index] = bind_addr; LeaveCriticalSection(&cs_if_addr_cache); } break; @@ -2054,15 +2057,19 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) } /* Will soon be switching to INADDR_ANY: permit address reuse */ if (ret && setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable)) == 0) - TRACE("Socket %04lx bound to interface index %d\n", s, adapter->Index); + TRACE("Socket %04lx bound to interface index %d\n", s, index); else ret = FALSE; cleanup: if(!ret) ERR("Failed to bind to interface, receiving broadcast packets will not work on socket %04lx.\n", s); - HeapFree(GetProcessHeap(), 0, adapters); + freeifaddrs( ifaddrs ); return ret; +#else + FIXME( "Broadcast packets on interface-bound sockets are not currently supported on this platform.\n" ); + return FALSE; +#endif } /*********************************************************************** diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 527dbe903b4..c27c697a8b6 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -83,11 +83,18 @@ # include <resolv.h> #endif #ifdef HAVE_NET_IF_H +# define if_indextoname unix_if_indextoname +# define if_nametoindex unix_if_nametoindex # include <net/if.h> +# undef if_indextoname +# undef if_nametoindex #endif #ifdef HAVE_LINUX_FILTER_H # include <linux/filter.h> #endif +#ifdef HAVE_IFADDRS_H +# include <ifaddrs.h> +#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> @@ -144,6 +151,7 @@ #include "winnt.h" #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" +#include "netioapi.h" #include "ip2string.h" #include "wine/afd.h" #include "wine/server.h" -- 2.30.2

2 5

[PATCH] comctl32: Avoid gcc 11 maybe-uninitialized warning
by Andrew Eikum 04 Jun '21

04 Jun '21

dlls/comctl32/monthcal.c:1783:19: warning: ‘htinfo.uHit’ may be used uninitialized [-Wmaybe-uninitialized] Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/comctl32/monthcal.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c0bec07f477..70ea604d2c7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1799,6 +1799,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; htinfo.st = st_null; + htinfo.uHit = 0; /* we should preserve passed fields if hit area doesn't need them */ if (lpht->cbSize == sizeof(MCHITTESTINFO)) -- 2.31.1

1 0

[PATCH] advapi32/tests: Avoid gcc 11 misleading-indentation warning.
by Andrew Eikum 04 Jun '21

04 Jun '21

dlls/advapi32/tests/cred.c:809:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] include/wine/test.h:116:32: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/advapi32/tests/cred.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 01e2a5efa33..854f5a92b1f 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -809,7 +809,7 @@ START_TEST(cred) else test_generic(); - trace("domain password:\n"); + trace("domain password:\n"); if (persists[CRED_TYPE_DOMAIN_PASSWORD] == CRED_PERSIST_NONE) skip("CRED_TYPE_DOMAIN_PASSWORD credentials are not supported or are disabled. Skipping\n"); else -- 2.31.1

1 0

[PATCH v2] dsound: Notify DSBPN_OFFSETSTOP earlier.
by Hiroki Awata 04 Jun '21

04 Jun '21

Some games may not receive the DSBPN_OFFSETSTOP event and get stuck if CloseHandle is called immediately after IDirectSoundBuffer::Stop. To solve this problem, IDirectSoundBuffer::Stop will immediately notify the DSBPN_OFFSETSTOP event. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41292 Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/dsound/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index fafa6fc6015..8cbcd8f9fc5 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -317,9 +317,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_Stop(IDirectSoundBuffer8 *iface) AcquireSRWLockExclusive(&This->lock); - if (This->state == STATE_PLAYING) - This->state = STATE_STOPPING; - else if (This->state == STATE_STARTING) + if (This->state == STATE_PLAYING || This->state == STATE_STARTING) { This->state = STATE_STOPPED; DSOUND_CheckEvent(This, 0, 0); -- 2.27.0

3 2

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 04 Jun '21

04 Jun '21

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 296 ++++++++++++++----------------------------------------- 1 file changed, 76 insertions(+), 220 deletions(-) diff --git a/po/fi.po b/po/fi.po index ab6598e2848..da6cebf66a6 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6961,24 +6961,16 @@ msgid "Resource is not currently available.\n" msgstr "Resurssi ei ole nyt saatavilla.\n" #: dlls/localspl/localspl.rc:37 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:38 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Small" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:39 -#, fuzzy -#| msgid "&Table" msgid "Tabloid" -msgstr "&Taulukko" +msgstr "" #: dlls/localspl/localspl.rc:40 msgid "Ledger" @@ -6989,51 +6981,36 @@ msgid "Legal" msgstr "" #: dlls/localspl/localspl.rc:42 -#, fuzzy -#| msgid "State" msgid "Statement" -msgstr "Tila" +msgstr "" #: dlls/localspl/localspl.rc:43 -#, fuzzy -#| msgid "&Execute..." msgid "Executive" -msgstr "Suo&rita..." +msgstr "" #: dlls/localspl/localspl.rc:44 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A3" -msgstr "A" +msgstr "A3" #: dlls/localspl/localspl.rc:45 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A4" -msgstr "A" +msgstr "A4" #: dlls/localspl/localspl.rc:46 -#, fuzzy -#| msgid "Small" msgid "A4 Small" -msgstr "Pieni" +msgstr "" #: dlls/localspl/localspl.rc:47 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A5" -msgstr "A" +msgstr "A5" #: dlls/localspl/localspl.rc:48 msgid "B4 (JIS)" -msgstr "" +msgstr "B4 (JIS)" #: dlls/localspl/localspl.rc:49 msgid "B5 (JIS)" -msgstr "" +msgstr "B5 (JIS)" #: dlls/localspl/localspl.rc:50 msgid "Folio" @@ -7052,10 +7029,8 @@ msgid "11x17" msgstr "" #: dlls/localspl/localspl.rc:54 -#, fuzzy -#| msgid "Notepad" msgid "Note" -msgstr "Muistio" +msgstr "" #: dlls/localspl/localspl.rc:55 msgid "Envelope #9" @@ -7095,51 +7070,47 @@ msgstr "" #: dlls/localspl/localspl.rc:64 msgid "Envelope C5" -msgstr "" +msgstr "C5-kirjekuori" #: dlls/localspl/localspl.rc:65 msgid "Envelope C3" -msgstr "" +msgstr "C3-kirjekuori" #: dlls/localspl/localspl.rc:66 msgid "Envelope C4" -msgstr "" +msgstr "C4-kirjekuori" #: dlls/localspl/localspl.rc:67 msgid "Envelope C6" -msgstr "" +msgstr "C6-kirjekuori" #: dlls/localspl/localspl.rc:68 msgid "Envelope C65" -msgstr "" +msgstr "C65-kirjekuori" #: dlls/localspl/localspl.rc:69 msgid "Envelope B4" -msgstr "" +msgstr "B4-kirjekuori" #: dlls/localspl/localspl.rc:70 msgid "Envelope B5" -msgstr "" +msgstr "B5-kirjekuori" #: dlls/localspl/localspl.rc:71 msgid "Envelope B6" -msgstr "" +msgstr "B6-kirjekuori" #: dlls/localspl/localspl.rc:72 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "Envelope" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:73 msgid "Envelope Monarch" -msgstr "" +msgstr "Monarch-kirjekuori" #: dlls/localspl/localspl.rc:74 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "6 3/4 Envelope" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:75 msgid "US Std Fanfold" @@ -7155,13 +7126,11 @@ msgstr "" #: dlls/localspl/localspl.rc:78 msgid "B4 (ISO)" -msgstr "" +msgstr "B4 (ISO)" #: dlls/localspl/localspl.rc:79 -#, fuzzy -#| msgid "Japanese" msgid "Japanese Postcard" -msgstr "Japanilainen" +msgstr "Japanilainen postikortti" #: dlls/localspl/localspl.rc:80 msgid "9x11" @@ -7180,11 +7149,8 @@ msgid "Envelope Invite" msgstr "" #: dlls/localspl/localspl.rc:84 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Extra" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:85 msgid "Legal Extra" @@ -7195,24 +7161,16 @@ msgid "Tabloid Extra" msgstr "" #: dlls/localspl/localspl.rc:87 -#, fuzzy -#| msgid "E&xtras" msgid "A4 Extra" -msgstr "&Ekstrat" +msgstr "" #: dlls/localspl/localspl.rc:88 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "Letter Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:89 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A4 Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:90 msgid "Letter Extra Transverse" @@ -7227,56 +7185,40 @@ msgid "Super B" msgstr "" #: dlls/localspl/localspl.rc:93 -#, fuzzy -#| msgctxt "Drive letter" -#| msgid "Letter" msgid "Letter Plus" -msgstr "Kirjain" +msgstr "" #: dlls/localspl/localspl.rc:94 msgid "A4 Plus" msgstr "" #: dlls/localspl/localspl.rc:95 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A5 Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:96 msgid "B5 (JIS) Transverse" msgstr "" #: dlls/localspl/localspl.rc:97 -#, fuzzy -#| msgid "E&xtras" msgid "A3 Extra" -msgstr "&Ekstrat" +msgstr "" #: dlls/localspl/localspl.rc:98 -#, fuzzy -#| msgid "E&xtras" msgid "A5 Extra" -msgstr "&Ekstrat" +msgstr "" #: dlls/localspl/localspl.rc:99 msgid "B5 (ISO) Extra" msgstr "" #: dlls/localspl/localspl.rc:100 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A2" -msgstr "A" +msgstr "A2" #: dlls/localspl/localspl.rc:101 -#, fuzzy -#| msgctxt "object state" -#| msgid "traversed" msgid "A3 Transverse" -msgstr "läpikäyty" +msgstr "" #: dlls/localspl/localspl.rc:102 msgid "A3 Extra Transverse" @@ -7287,11 +7229,8 @@ msgid "Japanese Double Postcard" msgstr "" #: dlls/localspl/localspl.rc:104 -#, fuzzy -#| msgctxt "All key" -#| msgid "A" msgid "A6" -msgstr "A" +msgstr "A6" #: dlls/localspl/localspl.rc:105 msgid "Japanese Envelope Kaku #2" @@ -7363,7 +7302,7 @@ msgstr "" #: dlls/localspl/localspl.rc:122 msgid "B6 (JIS)" -msgstr "" +msgstr "B6 (JIS)" #: dlls/localspl/localspl.rc:123 msgid "B6 (JIS) Rotated" @@ -7394,64 +7333,44 @@ msgid "PRC 32K(Big)" msgstr "" #: dlls/localspl/localspl.rc:130 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:131 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:132 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:133 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:134 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:135 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:136 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:137 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:138 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:139 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:140 msgid "PRC 16K Rotated" @@ -7466,64 +7385,44 @@ msgid "PRC 32K(Big) Rotated" msgstr "" #: dlls/localspl/localspl.rc:143 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #1 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:144 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #2 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:145 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #3 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:146 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #4 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:147 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #5 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:148 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #6 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:149 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #7 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:150 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #8 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:151 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #9 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:152 -#, fuzzy -#| msgid "PKCS 7 Enveloped" msgid "PRC Envelope #10 Rotated" -msgstr "PKCS 7, kääritty" +msgstr "" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -14789,17 +14688,6 @@ msgid "Type \"REG /?\" for help.\n" msgstr "Komento \"REG /?\" näyttää ohjeen.\n" #: 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" @@ -14815,7 +14703,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, EXPORT, IMPORT, QUERY\n" +" ADD, COPY, DELETE, EXPORT, IMPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -14917,35 +14805,6 @@ msgstr "" "\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" @@ -14979,12 +14838,15 @@ msgid "" "<key2>.\n" "\n" msgstr "" -"REG EXPORT <avain> <tiedosto> [/y]\n" +"REG COPY <avain1> <avain2> [/s] [/f]\n" "\n" -" Vie rekisteriavaimen (mukaan lukien aliavaimet ja arvot) tiedostoon.\n" +" Kopioi rekisteriavaimen sisällön toiseen sijaintiin.\n" +" Yleensä tämä kopioi vain arvot. Parametrilla [/s] voi kopioida\n" +" rekursiivisesti myös aliavainten sisällön.\n" "\n" -" <avain>\n" -" Vietävä rekisteriavain.\n" +" <avain1>, <avain2>\n" +" Rekisteriavaimet, kopioinnin lähde (<avain1>) ja kohde (<avain2>).\n" +" Näistä <avain2> luodaan, jos sitä ei vielä ole rekisterissä.\n" "\n" " Muoto: JUURI\\Aliavain\n" "\n" @@ -14998,12 +14860,12 @@ msgstr "" "\n" " Aliavain: Rekisteriavaimen koko polku JUURI-avaimen alla.\n" "\n" -" <tiedosto>\n" -" Luotavan rekisteritiedoston nimi ja polku. Tiedostonimen tulee olla\n" -" .reg-päätteinen.\n" +" /s\n" +" Kopioi kaikki aliavaimet ja arvot <avain1>:stä to <avain2>:een.\n" "\n" -" /y\n" -" Ylikirjoita tiedosto kysymättä vahvistusta.\n" +" /f\n" +" Ylikirjoita tiedot <avain2>:ssa kysymättä vahvistusta.\n" +" Asetus ei muuta aliavaimia ja arvoja, jotka ovat vain <avain2>:ssa.\n" "\n" #: programs/reg/reg.rc:92 @@ -15253,18 +15115,16 @@ msgid "reg: Invalid option [%1]. " msgstr "reg: Valitsin [%1] ei kelpaa. " #: programs/reg/reg.rc:122 -#, fuzzy -#| msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" msgid "reg: The option [/d] must be followed by a valid numeric value\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo heksadesimaaliarvo\n" +msgstr "reg: Valitsimen [/d] jälkeen täytyy tulla lukuarvo\n" #: programs/reg/reg.rc:123 msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo heksadesimaaliarvo\n" +msgstr "reg: Valitsimen [/d] jälkeen täytyy tulla heksadesimaaliarvo\n" #: programs/reg/reg.rc:136 msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "reg: Valitsinta [/d] täytyy seurata kelpo merkkijono\n" +msgstr "reg: Valitsimen [/d] jälkeen täytyy tulla merkkijono\n" #: programs/reg/reg.rc:124 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" @@ -15284,15 +15144,13 @@ msgstr "reg: Komentoriviparametrit eivät kelpaa\n" #: programs/reg/reg.rc:204 msgid "reg: The source and destination keys cannot be the same\n" -msgstr "" +msgstr "reg: Lähde ja kohde eivät voi olla sama avain\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 "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" +msgstr "Kohdeavaimessa on jo arvo '%1\\%2'. Haluatko korvata sen?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?" @@ -15307,10 +15165,8 @@ msgid "Are you sure you want to delete the registry key '%1'?" msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1'?" #: programs/reg/reg.rc:137 -#, fuzzy -#| msgid "regedit: Unable to delete the registry key '%1'.\n" msgid "reg: Unable to delete all registry values in '%1'\n" -msgstr "regedit: Rekisteriavainta '%1' ei voida poistaa.\n" +msgstr "reg: Kaikkia rekisteriarvoja kohteessa '%1' ei voida poistaa.\n" #: programs/reg/reg.rc:173 msgid "The file '%1' already exists. Do you want to overwrite it?" -- 2.31.1

1 0

[PATCH] vcomp: Implement omp_get_num_procs().
by Gijs Vermeulen 04 Jun '21

04 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50041 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/vcomp/main.c | 6 ++++-- dlls/vcomp/tests/vcomp.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 90caac83750..30bc2c63501 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -43,6 +43,7 @@ static DWORD vcomp_context_tls = TLS_OUT_OF_INDEXES; static HMODULE vcomp_module; static int vcomp_max_threads; static int vcomp_num_threads; +static int vcomp_num_procs; static BOOL vcomp_nested_fork = FALSE; static RTL_CRITICAL_SECTION vcomp_section; @@ -1001,8 +1002,8 @@ int CDECL omp_get_nested(void) int CDECL omp_get_num_procs(void) { - TRACE("stub\n"); - return 1; + TRACE("\n"); + return vcomp_num_procs; } int CDECL omp_get_num_threads(void) @@ -1843,6 +1844,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) vcomp_module = instance; vcomp_max_threads = sysinfo.dwNumberOfProcessors; vcomp_num_threads = sysinfo.dwNumberOfProcessors; + vcomp_num_procs = sysinfo.dwNumberOfProcessors; break; } diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 478bb5d7cfe..16008d17728 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -117,6 +117,7 @@ static void (CDECL *pomp_destroy_lock)(omp_lock_t *lock); static void (CDECL *pomp_destroy_nest_lock)(omp_nest_lock_t *lock); static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); +static int (CDECL *pomp_get_num_procs)(void); static int (CDECL *pomp_get_num_threads)(void); static int (CDECL *pomp_get_thread_num)(void); static int (CDECL *pomp_in_parallel)(void); @@ -352,6 +353,7 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(omp_destroy_nest_lock); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); + VCOMP_GET_PROC(omp_get_num_procs); VCOMP_GET_PROC(omp_get_num_threads); VCOMP_GET_PROC(omp_get_thread_num); VCOMP_GET_PROC(omp_in_parallel); @@ -2209,11 +2211,24 @@ static void test_reduction_float_double(void) } } +static void test_omp_get_num_procs(void) +{ + SYSTEM_INFO sysinfo; + int num_procs; + + num_procs = pomp_get_num_procs(); + ok(num_procs > 0, "expected non-zero num_procs\n"); + GetSystemInfo(&sysinfo); + ok(sysinfo.dwNumberOfProcessors > 0, "expected non-zero dwNumberOfProcessors\n"); + ok(num_procs == sysinfo.dwNumberOfProcessors, "got dwNumberOfProcessors %d num_procs %d\n", sysinfo.dwNumberOfProcessors, num_procs); +} + START_TEST(vcomp) { if (!init_vcomp()) return; + test_omp_get_num_procs(); test_omp_get_num_threads(FALSE); test_omp_get_num_threads(TRUE); test_vcomp_fork(); -- 2.31.1

1 0

[PATCH] po: Update Dutch translation
by Floris Renaud 04 Jun '21

04 Jun '21

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- 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'?" -- 2.32.0.rc2

1 0

[PATCH 1/5] ws2_32/tests: Add more tests for sockets that cannot be accepted into.
by Zebediah Figura 04 Jun '21

04 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f165742fe45..592baa806c3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6402,6 +6402,7 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; @@ -6525,6 +6526,61 @@ todo_wine closesocket(connector); closesocket(acceptor); + /* A UDP socket cannot be accepted into. */ + + acceptor = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + + /* A bound socket cannot be accepted into. */ + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + iret = bind(acceptor, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!iret, "got error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + + /* A connected socket cannot be accepted into. */ + + tcp_socketpair(&acceptor, &acceptor2); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor2, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + closesocket(acceptor2); + + /* Pass an insufficient local address size. */ + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError()); -- 2.30.2

3 10

[PATCH v12 1/2] mountmgr.sys: Introduce StorageDeviceSeekPenaltyProperty
by David Koolhoven 04 Jun '21

04 Jun '21

Allows programs which demand support for StorageDeviceSeekPenaltyProperty to function. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51065 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> --- v12: Fixed whitespace. --- dlls/mountmgr.sys/device.c | 17 +++++++++++++++++ include/ntddstor.h | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 04e8fe3c0f5..3c412354429 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1894,6 +1894,23 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp ) break; } + case StorageDeviceSeekPenaltyProperty: + { + DEVICE_SEEK_PENALTY_DESCRIPTOR *descriptor; + FIXME( "Faking StorageDeviceSeekPenaltyProperty data with no penalty\n" ); + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR)) { + status = STATUS_INVALID_PARAMETER; + break; + } + memset( irp->AssociatedIrp.SystemBuffer, 0, sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR) ); + descriptor = irp->AssociatedIrp.SystemBuffer; + descriptor->Version = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + descriptor->Size = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + descriptor->IncursSeekPenalty = FALSE; + status = STATUS_SUCCESS; + irp->IoStatus.Information = sizeof(DEVICE_SEEK_PENALTY_DESCRIPTOR); + break; + } default: FIXME( "Unsupported property %#x\n", query->PropertyId ); status = STATUS_NOT_SUPPORTED; diff --git a/include/ntddstor.h b/include/ntddstor.h index b8c4bb73b0d..836def413fe 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -214,7 +214,8 @@ typedef enum _STORAGE_QUERY_TYPE { typedef enum _STORAGE_PROPERTY_ID { StorageDeviceProperty = 0, - StorageAdapterProperty + StorageAdapterProperty = 1, + StorageDeviceSeekPenaltyProperty = 7, } STORAGE_PROPERTY_ID, *PSTORAGE_PROPERTY_ID; typedef struct _STORAGE_PROPERTY_QUERY { @@ -272,6 +273,12 @@ typedef struct _STORAGE_ADAPTER_DESCRIPTOR { USHORT BusMinorVersion; } STORAGE_ADAPTER_DESCRIPTOR, *PSTORAGE_ADAPTER_DESCRIPTOR; +typedef struct _DEVICE_SEEK_PENALTY_DESCRIPTOR { + ULONG Version; + ULONG Size; + BOOLEAN IncursSeekPenalty; +} DEVICE_SEEK_PENALTY_DESCRIPTOR, *PDEVICE_SEEK_PENALTY_DESCRIPTOR; + #ifdef __cplusplus } #endif -- 2.19.1

1 1

[PATCH 10/10] msvcrt: Import lgammaf implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 259 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 226 insertions(+), 49 deletions(-)

1 0

[PATCH 09/10] msvcrt: Import lgamma implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 196 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 195 insertions(+), 17 deletions(-)

1 0

[PATCH 08/10] msvcrt: Import log2 implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 247 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 13 --- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 244 insertions(+), 18 deletions(-)

1 0

[PATCH 07/10] msvcrt: Import log2f implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 83 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 13 ------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 80 insertions(+), 18 deletions(-)

1 0

[PATCH 06/10] msvcrt: Import log10f implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 60 ++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 56 insertions(+), 14 deletions(-)

1 0

[PATCH 05/10] msvcrt: Import log10 implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 80 ++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ----- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 76 insertions(+), 14 deletions(-)

1 0

[PATCH 04/10] msvcrt: Import log1pf implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 66 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 13 --------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 63 insertions(+), 18 deletions(-)

1 0

[PATCH 03/10] msvcrt: Import log1p implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 70 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 13 -------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 67 insertions(+), 18 deletions(-)

1 0

[PATCH 02/10] msvcrt: Import logf implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 78 ++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 ----- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 74 insertions(+), 14 deletions(-)

1 0

[PATCH 01/10] msvcrt: Import log implementation from musl.
by Piotr Caban 04 Jun '21

04 Jun '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 370 +++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 - dlls/msvcrt/unixlib.h | 1 - 3 files changed, 366 insertions(+), 14 deletions(-)

1 0

[PATCH v3 1/3] mmdevapi: Make MMDevEnumerator a static variable.
by Rémi Bernon 04 Jun '21

04 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Keep enumerator refcounting, as there are tests checking it. 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; -- 2.31.0

2 5

[PATCH 1/2] user32/tests: Protect OpenClipboard() from interference.
by Francois Gouget 04 Jun '21

04 Jun '21

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> --- This patchset should fix all the failures on cw-rx460 and cw-gtx560. It will also fix most failures in Wine + KDE. --- dlls/user32/tests/clipboard.c | 111 +++++++++++++++++++++------------- 1 file changed, 70 insertions(+), 41 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d4389f40a46..b2075c128c2 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -33,10 +33,39 @@ static BOOL (WINAPI *pGetUpdatedClipboardFormats)( UINT *formats, UINT count, UI static int thread_from_line; static char *argv0; +static BOOL open_clipboard(HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + static DWORD WINAPI open_clipboard_thread(LPVOID arg) { HWND hWnd = arg; - ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(open_clipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); return 0; } @@ -52,7 +81,7 @@ static DWORD WINAPI empty_clipboard_thread(LPVOID arg) static DWORD WINAPI open_and_empty_clipboard_thread(LPVOID arg) { HWND hWnd = arg; - ok(OpenClipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(open_clipboard(hWnd), "%u: OpenClipboard failed\n", thread_from_line); ok(EmptyClipboard(), "%u: EmptyClipboard failed\n", thread_from_line ); return 0; } @@ -60,7 +89,7 @@ static DWORD WINAPI open_and_empty_clipboard_thread(LPVOID arg) static DWORD WINAPI open_and_empty_clipboard_win_thread(LPVOID arg) { HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL ); - ok(OpenClipboard(hwnd), "%u: OpenClipboard failed\n", thread_from_line); + ok(open_clipboard(hwnd), "%u: OpenClipboard failed\n", thread_from_line); ok(EmptyClipboard(), "%u: EmptyClipboard failed\n", thread_from_line ); return 0; } @@ -126,7 +155,7 @@ static void grab_clipboard_process( int arg ) BOOL ret; SetLastError( 0xdeadbeef ); - ret = OpenClipboard( 0 ); + ret = open_clipboard( 0 ); ok( ret, "OpenClipboard failed\n" ); ret = EmptyClipboard(); ok( ret, "EmptyClipboard failed\n" ); @@ -243,14 +272,14 @@ static void test_ClipboardOwner(void) ok(GetLastError() == ERROR_CLIPBOARD_NOT_OPEN || broken(GetLastError() == 0xdeadbeef), /* wow64 */ "wrong error %u\n", GetLastError()); - ok(OpenClipboard(0), "OpenClipboard failed\n"); + ok(open_clipboard(0), "OpenClipboard failed\n"); ok(!GetClipboardOwner(), "clipboard should still be not owned\n"); ok(!OpenClipboard(hWnd1), "OpenClipboard should fail since clipboard already opened\n"); - ok(OpenClipboard(0), "OpenClipboard again failed\n"); + ok(open_clipboard(0), "OpenClipboard again failed\n"); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); - ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); + ok(open_clipboard(hWnd1), "OpenClipboard failed\n"); run_thread( open_clipboard_thread, hWnd1, __LINE__ ); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); @@ -258,7 +287,7 @@ static void test_ClipboardOwner(void) ok( !GetClipboardData( CF_WAVE ), "CF_WAVE data available\n" ); run_process( "set_clipboard_data 0" ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); - ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); + ok(open_clipboard(hWnd1), "OpenClipboard failed\n"); SetLastError(0xdeadbeef); ret = OpenClipboard(hWnd2); @@ -286,7 +315,7 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should still be owned\n"); /* any window will do, even from a different process */ - ret = OpenClipboard( GetDesktopWindow() ); + ret = open_clipboard( GetDesktopWindow() ); ok( ret, "OpenClipboard error %d\n", GetLastError()); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); @@ -299,7 +328,7 @@ static void test_ClipboardOwner(void) ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); - ret = OpenClipboard( hWnd1 ); + ret = open_clipboard( hWnd1 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); @@ -326,7 +355,7 @@ static void test_ClipboardOwner(void) ok( !ret, "CloseClipboard succeeded\n" ); ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); - ret = OpenClipboard( 0 ); + ret = open_clipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); @@ -339,7 +368,7 @@ static void test_ClipboardOwner(void) ok( !GetOpenClipboardWindow(), "wrong open window %p\n", GetOpenClipboardWindow() ); ok( !GetClipboardOwner(), "wrong owner window %p\n", GetClipboardOwner() ); - ret = OpenClipboard( 0 ); + ret = open_clipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); @@ -429,7 +458,7 @@ static void test_RegisterClipboardFormatA(void) trace("%04x: %s\n", format_id, len ? buf : ""); } - ret = OpenClipboard(0); + ret = open_clipboard(0); ok( ret, "OpenClipboard error %d\n", GetLastError()); /* try some invalid/unregistered formats */ @@ -611,7 +640,7 @@ static void test_synthesized(void) htext = create_textA(); emf = create_emf(); - r = OpenClipboard(NULL); + r = open_clipboard(NULL); ok(r, "gle %d\n", GetLastError()); r = EmptyClipboard(); ok(r, "gle %d\n", GetLastError()); @@ -637,7 +666,7 @@ static void test_synthesized(void) r = IsClipboardFormatAvailable( CF_METAFILEPICT ); ok( r, "CF_METAFILEPICT not available err %d\n", GetLastError()); - r = OpenClipboard(NULL); + r = open_clipboard(NULL); ok(r, "gle %d\n", GetLastError()); cf = EnumClipboardFormats(0); ok(cf == CF_TEXT, "cf %08x\n", cf); @@ -679,7 +708,7 @@ static void test_synthesized(void) r = CloseClipboard(); ok(r, "gle %d\n", GetLastError()); - r = OpenClipboard( NULL ); + r = open_clipboard( NULL ); ok(r, "gle %d\n", GetLastError()); SetLastError( 0xdeadbeef ); cf = EnumClipboardFormats(0); @@ -715,7 +744,7 @@ static void test_synthesized(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { winetest_push_context("%d", i); - r = OpenClipboard(NULL); + r = open_clipboard(NULL); ok(r, "gle %d\n", GetLastError()); r = EmptyClipboard(); ok(r, "gle %d\n", GetLastError()); @@ -758,7 +787,7 @@ static void test_synthesized(void) } ok( count == j, "count %u instead of %u\n", count, j ); - r = OpenClipboard( hwnd ); + r = open_clipboard( hwnd ); ok(r, "gle %d\n", GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) @@ -838,7 +867,7 @@ static void test_synthesized(void) rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); ok( !rendered, "formats %08x have been rendered\n", rendered ); - r = OpenClipboard(NULL); + r = open_clipboard(NULL); ok(r, "gle %d\n", GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) @@ -886,7 +915,7 @@ static void test_synthesized(void) winetest_pop_context(); } - r = OpenClipboard(NULL); + r = open_clipboard(NULL); ok(r, "gle %d\n", GetLastError()); r = EmptyClipboard(); ok(r, "gle %d\n", GetLastError()); @@ -1005,7 +1034,7 @@ static void get_clipboard_data_process(void) HANDLE data; BOOL r; - r = OpenClipboard(0); + r = open_clipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); data = GetClipboardData( CF_UNICODETEXT ); ok( data != NULL, "GetClipboardData failed: %d\n", GetLastError()); @@ -1101,7 +1130,7 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !r, "OpenClipboard succeeded\n" ); ok( GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "wrong error %u\n", GetLastError() ); - r = OpenClipboard(win); + r = open_clipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); check_messages(win, 0, 0, 0, 0, 0); @@ -1142,7 +1171,7 @@ static DWORD WINAPI clipboard_thread(void *param) check_messages(win, 2, 1, 1, 0, 0); - r = OpenClipboard(win); + r = open_clipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); check_messages(win, 0, 0, 0, 0, 0); @@ -1172,7 +1201,7 @@ static DWORD WINAPI clipboard_thread(void *param) /* no synthesized format, so CloseClipboard doesn't change the sequence */ check_messages(win, 0, 1, 1, 0, 0); - r = OpenClipboard(win); + r = open_clipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); @@ -1180,7 +1209,7 @@ static DWORD WINAPI clipboard_thread(void *param) check_messages(win, 0, 0, 0, 0, 0); formats = CountClipboardFormats(); - r = OpenClipboard(0); + r = open_clipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); @@ -1191,7 +1220,7 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); - r = OpenClipboard(win); + r = open_clipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); check_messages(win, 1, 0, 0, 0, 0); @@ -1214,7 +1243,7 @@ static DWORD WINAPI clipboard_thread(void *param) } check_messages(win, 1, 1, 1, 0, 0); - r = OpenClipboard(0); + r = open_clipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); check_messages(win, 1, 0, 0, 0, 0); @@ -1237,7 +1266,7 @@ static DWORD WINAPI clipboard_thread(void *param) } check_messages(win, 2, 1, 1, 0, 0); - r = OpenClipboard(0); + r = open_clipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); check_messages(win, 1, 0, 0, 0, 0); @@ -1251,7 +1280,7 @@ static DWORD WINAPI clipboard_thread(void *param) if (cross_thread) { - r = OpenClipboard( win ); + r = open_clipboard( win ); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); @@ -1395,7 +1424,7 @@ static void test_handles( HWND hwnd ) /* discarded handles can't be GlobalLock'ed */ ok( is_freed( empty_moveable ), "expected free mem %p\n", empty_moveable ); - r = OpenClipboard( hwnd ); + r = open_clipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -1513,7 +1542,7 @@ static void test_handles( HWND hwnd ) ok( is_moveable( hmoveable ), "expected moveable mem %p\n", hmoveable ); ok( is_fixed( empty_fixed ), "expected fixed mem %p\n", empty_fixed ); - r = OpenClipboard( hwnd ); + r = open_clipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); /* and now they are freed, unless we are the owner */ @@ -1638,7 +1667,7 @@ static DWORD WINAPI test_handles_thread2( void *arg ) HANDLE h; char *ptr; - r = OpenClipboard( 0 ); + r = open_clipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); h = GetClipboardData( CF_TEXT ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); @@ -1693,7 +1722,7 @@ static void test_handles_process( const char *str ) BYTE buffer[1024]; format_id = RegisterClipboardFormatA( "my_cool_clipboard_format" ); - r = OpenClipboard( 0 ); + r = open_clipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); h = GetClipboardData( CF_TEXT ); ok( is_fixed( h ), "expected fixed mem %p\n", h ); @@ -1782,7 +1811,7 @@ static void test_handles_process_dib( const char *str ) BOOL r; HANDLE h; - r = OpenClipboard( 0 ); + r = open_clipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); h = GetClipboardData( CF_BITMAP ); ok( !GetObjectType( h ), "expected invalid object %p\n", h ); @@ -1811,7 +1840,7 @@ static void test_data_handles(void) bitmap2 = CreateBitmap( 10, 10, 1, 1, NULL ); palette = CreatePalette( &logpalette ); - r = OpenClipboard( hwnd ); + r = open_clipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -1847,7 +1876,7 @@ static void test_data_handles(void) run_thread( test_handles_thread2, 0, __LINE__ ); run_process( "handles test" ); - r = OpenClipboard( hwnd ); + r = open_clipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); h = GetClipboardData( CF_TEXT ); ok( is_moveable( h ), "expected moveable mem %p\n", h ); @@ -1891,7 +1920,7 @@ static void test_data_handles(void) bmi.bmiHeader.biBitCount = 32; bitmap = CreateDIBSection( 0, &bmi, DIB_RGB_COLORS, &bits, 0, 0 ); - r = OpenClipboard( hwnd ); + r = open_clipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -1903,7 +1932,7 @@ static void test_data_handles(void) run_process( "handles_dib dummy" ); - r = OpenClipboard( hwnd ); + r = open_clipboard( hwnd ); ok( r, "gle %d\n", GetLastError() ); ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap ); r = EmptyClipboard(); @@ -1945,7 +1974,7 @@ static void test_GetUpdatedClipboardFormats(void) ok( r, "gle %d\n", GetLastError() ); ok( !count, "wrong count %u\n", count ); - r = OpenClipboard( 0 ); + r = open_clipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -2062,7 +2091,7 @@ static void test_string_data(void) if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR)) continue; #endif winetest_push_context("%d", i); - r = OpenClipboard( 0 ); + r = open_clipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); ok( r, "gle %d\n", GetLastError() ); @@ -2102,7 +2131,7 @@ static void test_string_data_process( int i ) WCHAR bufferW[12]; winetest_push_context("%d", i); - r = OpenClipboard( 0 ); + r = open_clipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); if (test_data[i].strA[0]) { -- 2.20.1

1 1

[PATCH] [website] Update German IRC translation (try 2)
by Rebekka Zwing 04 Jun '21

04 Jun '21

Signed-off-by: Rebekka Zwing <rebekka.zwing(a)ok.de> --- templates/de/irc.template | 119 +++++++++++++++++++++++++++++++++----- 1 file changed, 106 insertions(+), 13 deletions(-) diff --git a/templates/de/irc.template b/templates/de/irc.template index 9a52b52b..8155b4b8 100644 --- a/templates/de/irc.template +++ b/templates/de/irc.template @@ -1,20 +1,113 @@ - - + -<h1 class="title">Live Support Chat</h1> +<h1 class="title">Live Community Chat</h1> -<p>Auf <a href="http://www.freenode.net">Freenode.net</a> gibt es einen IRC-Kanal für Wine. -Du kannst den Chatroom mit einem IRC-Programm wie z.B. <a href="http://www.xchat.org/">X-Chat</a> -betreten. Verwende folgende Einstellungen:</p> +<p>Auf <a href="https://libera.chat/">Libera.Chat</a> gibt es mehrere IRC +Kanäle für Wine. Den Chatraum kannst du mit einem ICR Programm betreten, z.B. +<a href="https://hexchat.github.io/">HexChat</a>. Nutze folgende Einstellungen:</p> <blockquote> - <b>Server:</b> irc.freenode.net<br> - <b>Port:</b> 6667<br> - <b>Channel:</b> #winehq<br> + <b>Server:</b> irc.libera.chat<br> + <b>Port:</b> 6697<br> + <b>TLS:</b> AN </blockquote> -<p>Wenn du Firefox oder einen anderen Browser nutzt der IRC-Urls unterstütz, kannst du den Chat -betreten indem du auf <a href="irc://irc.freenode.net/winehq">irc://irc.freenode.net/winehq</a> -klickst.</p> +<p>Welchen Kanal du wählen solltest hängt davon ab, welches Thema du erörtern möchtest:</p> -<p> </p> +<blockquote> + <b>#winehq:</b> Benutzer Support und Hilfe beim Ausführen von Wine <br> + <b>#crossover:</b> Benutzer Support und Hilfe beim Ausführen von Crossover <br> + <b>#winehackers:</b> Entwicklung und andere Optionen um einen Beitrag für Wine zu leisten<br> + <b>#winehq-social:</b> Ungezwungene,andere Themen betreffende Chats, mit verschiedenen Community Mitgliedern<br> +</blockquote> + +<p>Diejenigen die Firefox oder einen anderen Browser benutzen, welcher IRC URLs unterstützt, können an einem Chat teilnehmen +indem sie ihn anklicken:</p> +<ul> + <li><a href="irc://irc.libera.chat/winehq">#winehq</a></li> + <li><a href="irc://irc.libera.chat/crossover">#crossover</a></li> + <li><a href="irc://irc.libera.chat/winehackers">#winehackers</a></li> + <li><a href="irc://irc.libera.chat/winehq-social">#winehq-social</a></li> +</ul> + +<p>Damit Diskussionen fokusiert und so hilfreich wie möglich bleiben, versuche +deine Fragen zu recherchieren, bevor du jemanden im IRC danach fragst. Das +<a href="https://wiki.winehq.org/FAQ">Wine FAQ</a>, +<a href="//appdb.winehq.org">AppDB</a>, und die +<a href="//www.winehq.org/download">Download Seite</a> sind alles gute +Optionen, um deine Frage vielleicht selbst zu beantworten.</p> + +<h2>IRC Regeln und Strafen</h2> + +<p> Abgesehen daovn, dass man sich nicht beleidigend oder offensichtlich Rücksichtslos verhalten soll, +gibt es ein Paar einfache Regeln, die jeder auf dem IRC Channel einzuhalten hat. In den meisten +Fällen, wird ein erster Regelbruch als Versehen aufgefasst und es wird eine Verwarnung +geben. Nachdem du deine Warnungen allerdings aufgebraucht hast, wirst du aus dem Kanal +geworfen.</p> + +<p>Wenn du zu oft rausgeworfen wurdest und weiterhin Regeln brichst, wirst du +für zwei Stunden vom Kanal verbannt. Jegliche Probleme danach +führen zu einer endgültigen Verbannung, welche nur durch einen Einspruch gekippt werden kann. Wenn du +einen Rauswurf anfechten möchtest, gehe auf <b>#winehq-social</b> (oder auf +<a href="mailto:wine-devel@winehq.org">wine-devel mailing list</a> wenn du +von <b>#winehq-social</b>) verbannt wurdest, und erkläre warum du glaubst, dass dies passiert +ist und warum die Verbannung aufgehoben werden sollte.</p> + +<table class="table"> +<thead> + <tr class="black inverse small"> + <th>Regel</th> + <th>Erläuterung</th> + <th>Verwarnungen</th> + <th>Rauswürfe</th> + </tr> +</thead> +<tbody> + <tr + <td>Bitte nicht spammen.</td> + <td></td> + <td>1</td> + <td>2</td> + </tr> + <tr> + <td>Nutze ein pastebin um mehr als eine oder zwei Zeilen zu schicken.</td> + <td></td> + <td>0</td> + <td>5</td> + </tr> + <tr> + <td>Schreibe im passenden Kanal.</td> + <td>Wenn du unsicher bist frage bei <b>#winehq</b> welcher Kanal der richtige ist.</td> + <td>2</td> + <td>3</td> + </tr> + <tr> + <td>Nur Wine und Crossover Kanäle werden in diesem Fall + unterstützt.</td> + <td>Sidenet, WineDoors, Cedega, IEs4Linux, etc. werden <b>nicht</b> + unterstützt.</td> + <td>2</td> + <td>1</td> + </tr> + <tr> + <td>Bevor du nach Hilfe fragst bei <b>#winehq</b>, überprüfe, ob du die + neueste Version von Wine nutzt.</td> + <td>Wenn du dir unsicher bist, installiere <tt>wine --version</tt> in der Befehlszeile, um + deine Version zu ermitteln</td> + <td>3</td> + <td>1</td> + </tr> + <tr> + <td>Bitte warte, bis du an der Reihe bist.</td> + <td></td> + <td>3</td> + <td>1</td> + </tr> + <tr> + <td>Diskutiere <b>nicht</b> über Raubkopien.</td> + <td></td> + <td>1</td> + <td>1</td> + </tr> +</tbody> +</table> -- 2.17.1 -- www.Ok.de - die kostenlose E-Mail Adresse

2 1

[PATCH 1/2] winebus.sys: Add some buttons to HID mouse input report.
by Rémi Bernon 04 Jun '21

04 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- 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; -- 2.31.0

1 1

[PATCH 1/5] hidclass.sys: Use msvcrt allocation functions.
by Rémi Bernon 04 Jun '21

04 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/buffer.c | 23 ++++++++++++----------- dlls/hidclass.sys/descriptor.c | 18 +++++++++--------- dlls/hidclass.sys/device.c | 23 ++++++++++++----------- dlls/hidclass.sys/pnp.c | 13 +++++++------ 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/dlls/hidclass.sys/buffer.c b/dlls/hidclass.sys/buffer.c index eccc3ed0c4e..5d15d44ffea 100644 --- a/dlls/hidclass.sys/buffer.c +++ b/dlls/hidclass.sys/buffer.c @@ -18,6 +18,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #define NONAMELESSUNION #include "hid.h" @@ -50,26 +51,26 @@ struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) TRACE("Create Ring Buffer with buffer size %i\n",buffer_size); - ring = HeapAlloc(GetProcessHeap(), 0, sizeof(*ring)); + ring = malloc(sizeof(*ring)); if (!ring) return NULL; ring->start = ring->end = 0; ring->size = BASE_BUFFER_SIZE; ring->buffer_size = buffer_size; ring->pointer_alloc = 2; - ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(UINT) * ring->pointer_alloc); + ring->pointers = malloc(sizeof(UINT) * ring->pointer_alloc); if (!ring->pointers) { - HeapFree(GetProcessHeap(), 0, ring); + free(ring); return NULL; } for (i = 0; i < ring->pointer_alloc; i++) ring->pointers[i] = POINTER_UNUSED; - ring->buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size * ring->size); + ring->buffer = malloc(buffer_size * ring->size); if (!ring->buffer) { - HeapFree(GetProcessHeap(), 0, ring->pointers); - HeapFree(GetProcessHeap(), 0, ring); + free(ring->pointers); + free(ring); return NULL; } InitializeCriticalSection(&ring->lock); @@ -79,11 +80,11 @@ struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) void RingBuffer_Destroy(struct ReportRingBuffer *ring) { - HeapFree(GetProcessHeap(), 0, ring->buffer); - HeapFree(GetProcessHeap(), 0, ring->pointers); + free(ring->buffer); + free(ring->pointers); ring->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&ring->lock); - HeapFree(GetProcessHeap(), 0, ring); + free(ring); } UINT RingBuffer_GetBufferSize(struct ReportRingBuffer *ring) @@ -113,13 +114,13 @@ NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *ring, UINT size) if (ring->pointers[i] != POINTER_UNUSED) ring->pointers[i] = 0; } - new_buffer = HeapAlloc(GetProcessHeap(), 0, ring->buffer_size * size); + new_buffer = malloc(ring->buffer_size * size); if (!new_buffer) { LeaveCriticalSection(&ring->lock); return STATUS_NO_MEMORY; } - HeapFree(GetProcessHeap(), 0, ring->buffer); + free(ring->buffer); ring->buffer = new_buffer; ring->size = size; LeaveCriticalSection(&ring->lock); diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index c02988494fd..ab92540994a 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -507,7 +507,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l case TAG_MAIN_FEATURE: for (j = 0; j < caps->ReportCount; j++) { - feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); + feature = calloc(1, sizeof(*feature)); list_add_tail(&collection->features, &feature->entry); if (bTag == TAG_MAIN_INPUT) feature->type = HidP_Input; @@ -532,7 +532,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_MAIN_COLLECTION: { - struct collection *subcollection = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct collection)); + struct collection *subcollection = calloc(1, sizeof(struct collection)); list_add_tail(&collection->collections, &subcollection->entry); subcollection->parent = collection; /* Only set our collection once... @@ -598,7 +598,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_GLOBAL_PUSH: { - struct caps_stack *saved = HeapAlloc(GetProcessHeap(), 0, sizeof(*saved)); + struct caps_stack *saved = malloc(sizeof(*saved)); saved->caps = *caps; TRACE("Push\n"); list_add_tail(stack, &saved->entry); @@ -615,7 +615,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l saved = LIST_ENTRY(tail, struct caps_stack, entry); *caps = saved->caps; list_remove(tail); - HeapFree(GetProcessHeap(), 0, saved); + free(saved); } else ERR("Pop but no stack!\n"); @@ -928,7 +928,7 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_coll nodes_offset = size; size += node_count * sizeof(WINE_HID_LINK_COLLECTION_NODE); - data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + data = calloc(1, size); data->magic = HID_MAGIC; data->dwSize = size; data->caps.Usage = base_collection->caps.u.NotRange.Usage; @@ -953,9 +953,9 @@ static void free_collection(struct collection *collection) LIST_FOR_EACH_ENTRY_SAFE(fentry, fnext, &collection->features, struct feature, entry) { list_remove(&fentry->entry); - HeapFree(GetProcessHeap(), 0, fentry); + free(fentry); } - HeapFree(GetProcessHeap(), 0, collection); + free(collection); } WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) @@ -983,7 +983,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) list_init(&caps_stack); - base = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*base)); + base = calloc(1, sizeof(*base)); base->index = 1; list_init(&base->features); list_init(&base->collections); @@ -1001,7 +1001,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) LIST_FOR_EACH_ENTRY_SAFE(entry, cursor, &caps_stack, struct caps_stack, entry) { list_remove(&entry->entry); - HeapFree(GetProcessHeap(), 0, entry); + free(entry); } } diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 4d031ffcaa0..e2ca635833d 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "hid.h" @@ -115,7 +116,7 @@ static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet data_size = offsetof(RAWINPUT, data.hid.bRawData) + packet->reportBufferLen; if (!(id = ext->u.pdo.preparsed_data->reports[0].reportID)) data_size += 1; - if (!(rawinput = HeapAlloc(GetProcessHeap(), 0, data_size))) + if (!(rawinput = malloc(data_size))) { ERR("Failed to allocate rawinput data!\n"); return; @@ -138,7 +139,7 @@ static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet input.u.hi.wParamL = 0; __wine_send_input(0, &input, rawinput); - HeapFree(GetProcessHeap(), 0, rawinput); + free(rawinput); } static void HID_Device_processQueue(DEVICE_OBJECT *device) @@ -148,7 +149,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) UINT buffer_size = RingBuffer_GetBufferSize(ext->u.pdo.ring_buffer); HID_XFER_PACKET *packet; - packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); + packet = malloc(buffer_size); while((irp = pop_irp_from_queue(ext))) { @@ -174,7 +175,7 @@ static void HID_Device_processQueue(DEVICE_OBJECT *device) } IoCompleteRequest( irp, IO_NO_INCREMENT ); } - HeapFree(GetProcessHeap(), 0, packet); + free(packet); } static DWORD CALLBACK hid_device_thread(void *args) @@ -189,7 +190,7 @@ static DWORD CALLBACK hid_device_thread(void *args) BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; USHORT report_size = ext->u.pdo.preparsed_data->caps.InputReportByteLength; - packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet) + report_size); + packet = malloc(sizeof(*packet) + report_size); packet->reportBuffer = (BYTE *)packet + sizeof(*packet); if (ext->u.pdo.information.Polled) @@ -347,7 +348,7 @@ static NTSTATUS HID_get_feature(BASE_DEVICE_EXTENSION *ext, IRP *irp) TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; - packet = HeapAlloc(GetProcessHeap(), 0, len); + packet = malloc(len); packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; packet->reportBuffer = ((BYTE*)packet) + sizeof(*packet); packet->reportId = out_buffer[0]; @@ -367,7 +368,7 @@ static NTSTATUS HID_get_feature(BASE_DEVICE_EXTENSION *ext, IRP *irp) TRACE_(hid_report)("Result 0x%x get %li bytes\n", rc, irp->IoStatus.Information); - HeapFree(GetProcessHeap(), 0, packet); + free(packet); return rc; } @@ -496,7 +497,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); ULONG out_length; - packet = HeapAlloc(GetProcessHeap(), 0, packet_size); + packet = malloc(packet_size); if (ext->u.pdo.preparsed_data->reports[0].reportID) packet->reportId = buffer[0]; @@ -514,7 +515,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) else irp->IoStatus.Information = 0; irp->IoStatus.u.Status = rc; - HeapFree(GetProcessHeap(), 0, packet); + free(packet); break; } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: @@ -578,7 +579,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); int ptr = -1; - packet = HeapAlloc(GetProcessHeap(), 0, buffer_size); + packet = malloc(buffer_size); ptr = PtrToUlong( irp->Tail.Overlay.OriginalFileObject->FsContext ); irp->IoStatus.Information = 0; @@ -639,7 +640,7 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) IoCompleteRequest(irp, IO_NO_INCREMENT); } } - HeapFree(GetProcessHeap(), 0, packet); + free(packet); return rc; } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index b5862a01593..f372f8ffdf5 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -21,6 +21,7 @@ #define NONAMELESSUNION #include <unistd.h> #include <stdarg.h> +#include <stdlib.h> #include "initguid.h" #include "hid.h" #include "devguid.h" @@ -239,19 +240,19 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) return; } - reportDescriptor = HeapAlloc(GetProcessHeap(), 0, descriptor.DescriptorList[i].wReportLength); + reportDescriptor = malloc(descriptor.DescriptorList[i].wReportLength); status = call_minidriver(IOCTL_HID_GET_REPORT_DESCRIPTOR, fdo, NULL, 0, reportDescriptor, descriptor.DescriptorList[i].wReportLength); if (status != STATUS_SUCCESS) { ERR("Cannot get Report Descriptor(%x)\n",status); - HeapFree(GetProcessHeap(), 0, reportDescriptor); + free(reportDescriptor); IoDeleteDevice(child_pdo); return; } pdo_ext->u.pdo.preparsed_data = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[i].wReportLength); - HeapFree(GetProcessHeap(), 0, reportDescriptor); + free(reportDescriptor); if (!pdo_ext->u.pdo.preparsed_data) { ERR("Cannot parse Report Descriptor\n"); @@ -475,7 +476,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) } CloseHandle(ext->u.pdo.halt_event); - HeapFree(GetProcessHeap(), 0, ext->u.pdo.preparsed_data); + free(ext->u.pdo.preparsed_data); if (ext->u.pdo.ring_buffer) RingBuffer_Destroy(ext->u.pdo.ring_buffer); @@ -561,7 +562,7 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) if (md->DriverUnload) md->DriverUnload(md->minidriver.DriverObject); list_remove(&md->entry); - HeapFree(GetProcessHeap(), 0, md); + free(md); } } @@ -569,7 +570,7 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) { minidriver *driver; - if (!(driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*driver)))) + if (!(driver = calloc(1, sizeof(*driver)))) return STATUS_NO_MEMORY; driver->DriverUnload = registration->DriverObject->DriverUnload; -- 2.31.0

2 6

[PATCH] rsaenh: Fix a typo in a comment.
by Haoyang Chen 04 Jun '21

04 Jun '21

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/rsaenh/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 705419526fe..a4deb80b0e1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2695,7 +2695,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, pbData[*pdwDataLen-1] <= *pdwDataLen) { BOOL padOkay = TRUE; - /* check that every bad byte has the same value */ + /* check that every pad byte has the same value */ for (i = 1; padOkay && i < pbData[*pdwDataLen-1]; i++) if (pbData[*pdwDataLen - i - 1] != pbData[*pdwDataLen - 1]) padOkay = FALSE; -- 2.20.1

1 0

[PATCH 1/4] user32/tests: Use winetest contexts to simplify test_string().
by Francois Gouget 04 Jun '21

04 Jun '21

This ensures all traces have the relevant context information, in particular the OpenClipboard() checks, and simplifies the ok() calls. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 36 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d75e8fc3c32..878b9c66427 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2043,6 +2043,7 @@ static void test_string_data(void) for (i = 0; i < ARRAY_SIZE(test_data); i++) { + winetest_push_context("%d", i); /* 1-byte Unicode strings crash on Win64 */ #ifdef _WIN64 if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR)) continue; @@ -2059,7 +2060,7 @@ static void test_string_data(void) memcpy( bufferA, test_data[i].strA, test_data[i].len ); bufferA[test_data[i].len - 1] = 0; ok( !memcmp( data, bufferA, test_data[i].len ), - "%u: wrong data %.*s\n", i, test_data[i].len, (char *)data ); + "wrong data %.*s\n", test_data[i].len, (char *)data ); } else { @@ -2068,12 +2069,13 @@ static void test_string_data(void) memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; ok( !memcmp( data, bufferW, test_data[i].len ), - "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); + "wrong data %s\n", wine_dbgstr_wn( data, (test_data[i].len + 1) / sizeof(WCHAR) )); } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); sprintf( cmd, "string_data %u", i ); run_process( cmd ); + winetest_pop_context(); } } @@ -2085,53 +2087,55 @@ static void test_string_data_process( int i ) char bufferA[12]; WCHAR bufferW[12]; + winetest_push_context("%d", i); r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); if (test_data[i].strA[0]) { data = GetClipboardData( CF_TEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); - ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferA, test_data[i].strA, test_data[i].len ); bufferA[test_data[i].len - 1] = 0; - ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + ok( !memcmp( data, bufferA, len ), "wrong data %.*s\n", len, (char *)data ); data = GetClipboardData( CF_UNICODETEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); len2 = MultiByteToWideChar( CP_ACP, 0, bufferA, test_data[i].len, bufferW, ARRAY_SIZE(bufferW) ); - ok( len == len2 * sizeof(WCHAR), "%u: wrong size %u / %u\n", i, len, len2 ); - ok( !memcmp( data, bufferW, len ), "%u: wrong data %s\n", i, wine_dbgstr_wn( data, len2 )); + ok( len == len2 * sizeof(WCHAR), "wrong size %u / %u\n", len, len2 ); + ok( !memcmp( data, bufferW, len ), "wrong data %s\n", wine_dbgstr_wn( data, len2 )); } else { data = GetClipboardData( CF_UNICODETEXT ); - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); - ok( len == test_data[i].len, "%u: wrong size %u / %u\n", i, len, test_data[i].len ); + ok( len == test_data[i].len, "wrong size %u / %u\n", len, test_data[i].len ); memcpy( bufferW, test_data[i].strW, test_data[i].len ); bufferW[(test_data[i].len + 1) / sizeof(WCHAR) - 1] = 0; ok( !memcmp( data, bufferW, len ), - "%u: wrong data %s\n", i, wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); + "wrong data %s\n", wine_dbgstr_wn( data, (len + 1) / sizeof(WCHAR) )); data = GetClipboardData( CF_TEXT ); if (test_data[i].len >= sizeof(WCHAR)) { - ok( data != 0, "%u: could not get data\n", i ); + ok( data != 0, "could not get data\n" ); len = GlobalSize( data ); len2 = WideCharToMultiByte( CP_ACP, 0, bufferW, test_data[i].len / sizeof(WCHAR), bufferA, ARRAY_SIZE(bufferA), NULL, NULL ); bufferA[len2 - 1] = 0; - ok( len == len2, "%u: wrong size %u / %u\n", i, len, len2 ); - ok( !memcmp( data, bufferA, len ), "%u: wrong data %.*s\n", i, len, (char *)data ); + ok( len == len2, "wrong size %u / %u\n", len, len2 ); + ok( !memcmp( data, bufferA, len ), "wrong data %.*s\n", len, (char *)data ); } else { - ok( !data, "%u: got data for empty string\n", i ); - ok( IsClipboardFormatAvailable( CF_TEXT ), "%u: text not available\n", i ); + ok( !data, "got data for empty string\n" ); + ok( IsClipboardFormatAvailable( CF_TEXT ), "text not available\n" ); } } r = CloseClipboard(); ok( r, "gle %d\n", GetLastError() ); + winetest_pop_context(); } START_TEST(clipboard) -- 2.20.1

3 10

[PATCH] winegstreamer: Improve reported supported rates values for the media source.
by Nikolay Sivov 04 Jun '21

04 Jun '21

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Supersedes 207103 and 207104. dlls/mfplat/tests/mfplat.c | 61 +++++++++++++++++++++++++++++++ dlls/winegstreamer/media_source.c | 17 ++++----- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ae9bd60c6df..7f049aa90bb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -655,12 +655,15 @@ static void test_source_resolver(void) IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; + IMFGetService *get_service; + IMFRateSupport *rate_support; WCHAR pathW[MAX_PATH]; int i, sample_count; WCHAR *filename; PROPVARIANT var; HRESULT hr; GUID guid; + float rate; if (!pMFCreateSourceResolver) { @@ -766,6 +769,62 @@ static void test_source_resolver(void) check_interface(mediasource, &IID_IMFGetService, TRUE); check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + + hr = IMFMediaSource_QueryInterface(mediasource, &IID_IMFGetService, (void**)&get_service); + ok(hr == S_OK, "Failed to get service interface, hr %#x.\n", hr); + + hr = IMFGetService_GetService(get_service, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void**)&rate_support); + ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1e6f + 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == 1e6f + 1.0f || broken(rate == 1e6f) /* Win7 */, "Unexpected %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f - 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f - 1.0f || broken(rate == -1e6f) /* Win7 */, "Unexpected rate %f.\n", rate); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); @@ -879,6 +938,8 @@ todo_wine hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFRateSupport_Release(rate_support); + IMFGetService_Release(get_service); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e153c8e9161..cb8fa12c2ce 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,7 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = 0.0f; return S_OK; } @@ -942,21 +942,20 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f; return S_OK; } -static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) +static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_rate) { - const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate); - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + if (nearest_rate) + *nearest_rate = rate; - if (nearest_support_rate) - *nearest_support_rate = supported_rate; - - return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate >= -1e6f && rate <= 1e6f ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl = -- 2.30.2

1 0

[PATCH v2] msxml3/tests: add some regex tests
by Damjan Jovanovic 04 Jun '21

04 Jun '21

Adds tests for all non-standard escape sequences used by MSXML I could find, such as "\$" (bug 29685), "\uNNNN" (bug 43581) and 13 others. A patch to libxml2 implementing all those sequences is already available: https://gitlab.gnome.org/GNOME/libxml2/-/merge_requests/116 Try 2 also tests MSXML40 where available (earlier versions can't be tested as they don't support XSD schemas), calls the function "test_regex()", and tests how the \uNNNN escape sequence handles non-BMP characters in surrogate pairs. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/msxml3/tests/schema.c | 154 +++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+)

2 1

[PATCH] winegstreamer: Fix assert condition.
by Nikolay Sivov 04 Jun '21

04 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Count can potentially reach 6, there is 5 raw types + 1 base type. dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e153c8e9161..d3d156fc9cb 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -832,7 +832,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) type_count = 1; } - assert(type_count < ARRAY_SIZE(stream_types)); + assert(type_count <= ARRAY_SIZE(stream_types)); if (!type_count) { -- 2.30.2

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 04 Jun '21

04 Jun '21

1 0

[PATCH] ntdll: Fix a file descriptor leak.
by Robin Ebert 03 Jun '21

03 Jun '21

Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index cfc5780b082..a157aa1ede6 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1252,7 +1252,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (in_size < sizeof(*params)) { - return STATUS_BUFFER_TOO_SMALL; + status = STATUS_BUFFER_TOO_SMALL; break; } -- 2.20.1

1 0

[PATCH v2 1/6] ntoskrnl.exe/tests: Silent a todo_wine failing test after a while.
by Rémi Bernon 03 Jun '21

03 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Fix spurious failures first. * Don't try NULL preparsed data, it crashes old windows versions. * Squash new HidP_Get*Caps tests together, add a few more with specific caps lookup. dlls/ntoskrnl.exe/tests/driver_hid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 44ec1b09526..79b3e708752 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -103,6 +103,7 @@ static const unsigned char report_descriptor[] = static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { + static int test_failed = 0; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; const ULONG out_size = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -176,7 +177,7 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_READ_REPORT: ok(!in_size, "got input size %u\n", in_size); - todo_wine ok(out_size == 2, "got output size %u\n", out_size); + if (test_failed++ < 10) todo_wine ok(out_size == 2, "got output size %u\n", out_size); ret = STATUS_NOT_IMPLEMENTED; break; -- 2.31.0

3 25

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel