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

[PATCH 5/8 v3] msvcrt: Import log implementation from musl.
by Piotr Caban 03 Jun '21

03 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(-)

2 1

[PATCH] [website] Update German IRC translation
by Rebekka Zwing 03 Jun '21

03 Jun '21

--- 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(a)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

1 0

[PATCH v2] user32/tests: Use wine_{push,pop}_context() to simplify test_synthesized().
by Francois Gouget 03 Jun '21

03 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: Call winetest_pop_context() before break-ing out of the 2 loops. --- dlls/user32/tests/clipboard.c | 88 ++++++++++++++++++++--------------- 1 file changed, 51 insertions(+), 37 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index d75e8fc3c32..75d8334b729 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -714,10 +714,11 @@ static void test_synthesized(void) for (i = 0; i < ARRAY_SIZE(tests); i++) { + winetest_push_context("%d", i); r = OpenClipboard(NULL); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); r = EmptyClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); switch (tests[i].format) { @@ -744,45 +745,50 @@ static void test_synthesized(void) } count = CountClipboardFormats(); - ok( count == 1, "%u: count %u\n", i, count ); + ok( count == 1, "count %u\n", count ); r = CloseClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); count = CountClipboardFormats(); for (j = 0; tests[i].expected[j]; j++) { r = IsClipboardFormatAvailable( tests[i].expected[j] ); - ok( r, "%u: %04x not available\n", i, tests[i].expected[j] ); + ok( r, "%04x not available\n", tests[i].expected[j] ); } - ok( count == j, "%u: count %u instead of %u\n", i, count, j ); + ok( count == j, "count %u instead of %u\n", count, j ); r = OpenClipboard( hwnd ); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) { + winetest_push_context("%d", j); cf = EnumClipboardFormats( cf ); - ok(cf == tests[i].expected[j], "%u.%u: got %04x instead of %04x\n", - i, j, cf, tests[i].expected[j] ); - if (cf != tests[i].expected[j]) break; + ok(cf == tests[i].expected[j], "got %04x instead of %04x\n", + cf, tests[i].expected[j] ); + if (cf != tests[i].expected[j]) + { + winetest_pop_context(); + break; + } old_seq = GetClipboardSequenceNumber(); data = GetClipboardData( cf ); ok(data != NULL || broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ - "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); + "couldn't get data, cf %04x err %d\n", cf, GetLastError()); seq = GetClipboardSequenceNumber(); - ok(seq == old_seq, "sequence changed (test %d %d)\n", i, cf); + ok(seq == old_seq, "sequence changed (test %d)\n", cf); switch (cf) { case CF_LOCALE: { UINT *ptr = GlobalLock( data ); DWORD layout = LOWORD( GetKeyboardLayout(0) ); - ok( GlobalSize( data ) == sizeof(*ptr), "%u: size %lu\n", i, GlobalSize( data )); + ok( GlobalSize( data ) == sizeof(*ptr), "size %lu\n", GlobalSize( data )); ok( *ptr == layout || broken( *ptr == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )), - "%u: CF_LOCALE %04x/%04x\n", i, *ptr, layout ); + "CF_LOCALE %04x/%04x\n", *ptr, layout ); GlobalUnlock( data ); break; } @@ -794,82 +800,90 @@ static void test_synthesized(void) ok( GlobalSize( data ) == 10 * sizeof(WCHAR), "wrong len %ld\n", GlobalSize( data )); break; } + winetest_pop_context(); } if (!tests[i].expected[j]) { cf = EnumClipboardFormats( cf ); - ok(cf == 0, "%u: cf %04x\n", i, cf); + ok(cf == 0, "cf %04x\n", cf); } /* now with delayed rendering */ r = EmptyClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); SetClipboardData( tests[i].format, 0 ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); count = CountClipboardFormats(); - ok( count == 1, "%u: count %u\n", i, count ); + ok( count == 1, "count %u\n", count ); r = CloseClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); count = CountClipboardFormats(); for (j = 0; tests[i].expected[j]; j++) { r = IsClipboardFormatAvailable( tests[i].expected[j] ); - ok( r, "%u: %04x not available\n", i, tests[i].expected[j] ); + ok( r, "%04x not available\n", tests[i].expected[j] ); } - ok( count == j, "%u: count %u instead of %u\n", i, count, j ); + ok( count == j, "count %u instead of %u\n", count, j ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); r = OpenClipboard(NULL); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); cf = 0; for (j = 0; tests[i].expected[j]; j++) { + winetest_push_context("%d", j); cf = EnumClipboardFormats( cf ); - ok(cf == tests[i].expected[j], "%u.%u: got %04x instead of %04x\n", - i, j, cf, tests[i].expected[j] ); - if (cf != tests[i].expected[j]) break; + ok(cf == tests[i].expected[j], "got %04x instead of %04x\n", + cf, tests[i].expected[j] ); + if (cf != tests[i].expected[j]) + { + winetest_pop_context(); + break; + } rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); data = GetClipboardData( cf ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); if (cf == CF_LOCALE) { - ok(data != NULL, "%u: CF_LOCALE no data\n", i); - ok( !rendered, "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + ok(data != NULL, "CF_LOCALE no data\n"); + ok( !rendered, "formats %08x have been rendered\n", rendered ); } else { - ok(!data, "%u: format %04x got data %p\n", i, cf, data); + ok(!data, "format %04x got data %p\n", cf, data); ok( rendered == (1 << tests[i].format), - "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + "formats %08x have been rendered\n", rendered ); /* try to render a second time */ data = GetClipboardData( cf ); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); ok( rendered == (1 << tests[i].format), - "%u.%u: formats %08x have been rendered\n", i, j, rendered ); + "formats %08x have been rendered\n", rendered ); } + winetest_pop_context(); } if (!tests[i].expected[j]) { cf = EnumClipboardFormats( cf ); - ok(cf == 0, "%u: cf %04x\n", i, cf); + ok(cf == 0, "cf %04x\n", cf); } r = CloseClipboard(); - ok(r, "%u: gle %d\n", i, GetLastError()); + ok(r, "gle %d\n", GetLastError()); rendered = SendMessageA( hwnd, WM_USER, 0, 0 ); - ok( !rendered, "%u: formats %08x have been rendered\n", i, rendered ); + ok( !rendered, "formats %08x have been rendered\n", rendered ); + winetest_pop_context(); } r = OpenClipboard(NULL); -- 2.20.1

2 2

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

03 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> --- v2: Delay the winetest_push_context() call to avoid trouble with the lone continue statement. --- 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 75d8334b729..d4389f40a46 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -2061,6 +2061,7 @@ static void test_string_data(void) #ifdef _WIN64 if (!test_data[i].strA[0] && test_data[i].len < sizeof(WCHAR)) continue; #endif + winetest_push_context("%d", i); r = OpenClipboard( 0 ); ok( r, "gle %d\n", GetLastError() ); r = EmptyClipboard(); @@ -2073,7 +2074,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 { @@ -2082,12 +2083,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(); } } @@ -2099,53 +2101,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

2 1

[PATCH 2/3] winebuild: Don't use iretq in syscall dispatcher.
by Jacek Caban 03 Jun '21

03 Jun '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winebuild/import.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)

2 6

[PATCH] user32: debugstr_format() should not modify the last error.
by Francois Gouget 03 Jun '21

03 Jun '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes GetLastError() for EnumClipboardFormats(0xdead) for instance. --- dlls/user32/clipboard.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 2b5e3a85b5d..5176d707b8a 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -81,8 +81,11 @@ struct metafile_pict static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; + DWORD le = GetLastError(); + BOOL r = GetClipboardFormatNameW( id, buffer, 256 ); + SetLastError(le); - if (GetClipboardFormatNameW( id, buffer, 256 )) + if (r) return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) ); switch (id) -- 2.20.1

1 0

[PATCH 5/8 v2] msvcrt: Import log implementation from musl.
by Piotr Caban 03 Jun '21

03 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] winebuild: Fix an error in a comment.
by Zebediah Figura 03 Jun '21

03 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/winebuild/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 0544aa6cbe9..abe2bdae6ed 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -428,7 +428,7 @@ static void BuildCallTo16Core( int reg_func ) /* * Modify CONTEXT86 structure to contain new values * - * NOTE: We restore only EAX, EBX, EDX, EDX, EBP, and ESP. + * NOTE: We restore only EAX, EBX, ECX, EDX, EBP, and ESP. * The segment registers as well as ESI and EDI should * not be modified by a well-behaved 16-bit routine in * any case. [If necessary, we could restore them as well, -- 2.30.2

1 0

[PATCH] mfplat: Remove remaining typedef for bytestream object structure.
by Nikolay Sivov 03 Jun '21

03 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 83 ++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 47 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index b205dd2538e..5406ceb5063 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3458,7 +3458,7 @@ HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *dest, const UINT8 *buffer return hr; } -typedef struct bytestream +struct bytestream { struct attributes attributes; IMFByteStream IMFByteStream_iface; @@ -3471,11 +3471,11 @@ typedef struct bytestream DWORD capabilities; struct list pending; CRITICAL_SECTION cs; -} mfbytestream; +}; -static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +static inline struct bytestream *impl_from_IMFByteStream(IMFByteStream *iface) { - return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); + return CONTAINING_RECORD(iface, struct bytestream, IMFByteStream_iface); } static struct bytestream *impl_bytestream_from_IMFGetService(IMFGetService *iface) @@ -3773,11 +3773,9 @@ static HRESULT WINAPI bytestream_GetCapabilities(IMFByteStream *iface, DWORD *ca return S_OK; } -static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +static HRESULT WINAPI bytestream_SetLength(IMFByteStream *iface, QWORD length) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + FIXME("%p, %s\n", iface, wine_dbgstr_longlong(length)); return E_NOTIMPL; } @@ -3880,11 +3878,9 @@ static HRESULT WINAPI bytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *r return bytestream_complete_io_request(stream, ASYNC_STREAM_OP_READ, result, byte_read); } -static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +static HRESULT WINAPI bytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p, %u, %p\n", This, data, count, written); + FIXME("%p, %p, %u, %p\n", iface, data, count, written); return E_NOTIMPL; } @@ -3908,30 +3904,24 @@ static HRESULT WINAPI bytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult * return bytestream_complete_io_request(stream, ASYNC_STREAM_OP_WRITE, result, written); } -static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, +static HRESULT WINAPI bytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, DWORD flags, QWORD *current) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + FIXME("%p, %u, %s, 0x%08x, %p\n", iface, seek, wine_dbgstr_longlong(offset), flags, current); return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +static HRESULT WINAPI bytestream_Flush(IMFByteStream *iface) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); + FIXME("%p\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +static HRESULT WINAPI bytestream_Close(IMFByteStream *iface) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p\n", This); + FIXME("%p\n", iface); return E_NOTIMPL; } @@ -3956,19 +3946,19 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_Release, bytestream_GetCapabilities, bytestream_file_GetLength, - mfbytestream_SetLength, + bytestream_SetLength, bytestream_file_GetCurrentPosition, bytestream_SetCurrentPosition, bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead, - mfbytestream_Write, + bytestream_Write, bytestream_BeginWrite, bytestream_EndWrite, - mfbytestream_Seek, - mfbytestream_Flush, - mfbytestream_Close + bytestream_Seek, + bytestream_Flush, + bytestream_Close }; static HRESULT WINAPI bytestream_stream_GetLength(IMFByteStream *iface, QWORD *length) @@ -4146,35 +4136,34 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_Close, }; -static inline mfbytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) +static inline struct bytestream *impl_from_IMFByteStream_IMFAttributes(IMFAttributes *iface) { - return CONTAINING_RECORD(iface, mfbytestream, attributes.IMFAttributes_iface); + return CONTAINING_RECORD(iface, struct bytestream, attributes.IMFAttributes_iface); } -static HRESULT WINAPI mfbytestream_attributes_QueryInterface( - IMFAttributes *iface, REFIID riid, void **out) +static HRESULT WINAPI bytestream_attributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out) { - mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); - return IMFByteStream_QueryInterface(&This->IMFByteStream_iface, riid, out); + struct bytestream *stream = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_QueryInterface(&stream->IMFByteStream_iface, riid, out); } -static ULONG WINAPI mfbytestream_attributes_AddRef(IMFAttributes *iface) +static ULONG WINAPI bytestream_attributes_AddRef(IMFAttributes *iface) { - mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); - return IMFByteStream_AddRef(&This->IMFByteStream_iface); + struct bytestream *stream = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_AddRef(&stream->IMFByteStream_iface); } -static ULONG WINAPI mfbytestream_attributes_Release(IMFAttributes *iface) +static ULONG WINAPI bytestream_attributes_Release(IMFAttributes *iface) { - mfbytestream *This = impl_from_IMFByteStream_IMFAttributes(iface); - return IMFByteStream_Release(&This->IMFByteStream_iface); + struct bytestream *stream = impl_from_IMFByteStream_IMFAttributes(iface); + return IMFByteStream_Release(&stream->IMFByteStream_iface); } -static const IMFAttributesVtbl mfbytestream_attributes_vtbl = +static const IMFAttributesVtbl bytestream_attributes_vtbl = { - mfbytestream_attributes_QueryInterface, - mfbytestream_attributes_AddRef, - mfbytestream_attributes_Release, + bytestream_attributes_QueryInterface, + bytestream_attributes_AddRef, + bytestream_attributes_Release, mfattributes_GetItem, mfattributes_GetItemType, mfattributes_CompareItem, @@ -4311,7 +4300,7 @@ HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **byt } object->IMFByteStream_iface.lpVtbl = &bytestream_stream_vtbl; - object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->attributes.IMFAttributes_iface.lpVtbl = &bytestream_attributes_vtbl; object->read_callback.lpVtbl = &bytestream_stream_read_callback_vtbl; object->write_callback.lpVtbl = &bytestream_stream_write_callback_vtbl; InitializeCriticalSection(&object->cs); @@ -4478,7 +4467,7 @@ HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE open return hr; } object->IMFByteStream_iface.lpVtbl = &bytestream_file_vtbl; - object->attributes.IMFAttributes_iface.lpVtbl = &mfbytestream_attributes_vtbl; + object->attributes.IMFAttributes_iface.lpVtbl = &bytestream_attributes_vtbl; object->IMFGetService_iface.lpVtbl = &bytestream_file_getservice_vtbl; object->read_callback.lpVtbl = &bytestream_file_read_callback_vtbl; object->write_callback.lpVtbl = &bytestream_file_write_callback_vtbl; -- 2.30.2

1 0

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

03 Jun '21

1 0