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

[PATCH] wined3d: Use NULL instead of casting 0.
by Francois Gouget June 10, 2021

June 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wined3d/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 81f5ba7d0d7..cdfc14c0cb0 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -101,7 +101,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context_gl *context GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */ - GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)0)); + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, NULL)); GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)sizeof(query->map_ptr[0]))); GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); checkGLcall("queue query result"); -- 2.20.1

2 1

[PATCH] reg/tests: Test how values are overwritten when copying
by Hugh McMaster June 10, 2021

June 10, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/copy.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 2604d54b639..763135c2a0f 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -577,6 +577,44 @@ static void test_copy_key_class(void) delete_key(HKEY_CURRENT_USER, KEY_BASE); } +static void test_copy_overwrite(void) +{ + HKEY hkey; + DWORD r, dword; + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_value(hkey, "Wine1", REG_SZ, "def", 4); + dword = 0x5; + add_value(hkey, "Wine2", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "Wine3", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(hkey, "Wine4", REG_MULTI_SZ, "Line1\0Line2\0Line3\0", 19); + close_key(hkey); + + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_value(hkey, "Wine1", REG_SZ, "abc", 4); + verify_reg_nonexist(hkey, "Wine2"); + add_value(hkey, "Wine3", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14); + dword = 0x1; + add_value(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, NULL, REG_SZ, "Constant value", 15); + close_key(hkey); + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); + verify_reg(hkey, "Wine1", REG_SZ, "def", 4, 0); + dword = 0x5; + verify_reg(hkey, "Wine2", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine3", REG_BINARY, "\x11\x22\x33\x44", 4, 0); + verify_reg(hkey, "Wine4", REG_MULTI_SZ, "Line1\0Line2\0Line3\0", 19, 0); + verify_reg(hkey, NULL, REG_SZ, "Constant value", 15, 0); + close_key(hkey); + + delete_key(HKEY_CURRENT_USER, COPY_SRC); + delete_key(HKEY_CURRENT_USER, KEY_BASE); +} + START_TEST(copy) { DWORD r; @@ -597,4 +635,5 @@ START_TEST(copy) test_copy_slashes(); test_copy_escaped_null_values(); test_copy_key_class(); + test_copy_overwrite(); } -- 2.32.0

1 0

[PATCH] widl: Use NULL instead of casting 0.
by Francois Gouget June 10, 2021

June 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- tools/widl/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index cce880bbf66..32dd7528c2f 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -157,7 +157,7 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned /* Call the real server function */ if (is_context_handle(ret_type)) { - print_server("__frame->_RetVal = NDRSContextUnmarshall((char*)0, _pRpcMessage->DataRepresentation);\n"); + print_server("__frame->_RetVal = NDRSContextUnmarshall(NULL, _pRpcMessage->DataRepresentation);\n"); print_server("*(("); write_type_decl(server, type_function_get_ret(func->declspec.type), NULL); fprintf(server, "*)NDRSContextValue(__frame->_RetVal)) = "); -- 2.20.1

1 0

[PATCH] gdi32/tests: Add a context to the testJustification() failure message.
by Francois Gouget June 10, 2021

June 10, 2021

It is called in three places so this allows identifying which one failed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- All context strings are unique which is the most important part. But I'm open to changing them if other values would be more descriptive. --- dlls/gdi32/tests/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 6bd9c8e941f..19076eab3a5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2381,7 +2381,7 @@ static void test_GetOutlineTextMetrics(void) ReleaseDC(0, hdc); } -static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) +static void testJustification(const char *context, HDC hdc, PCSTR str, RECT *clientArea) { INT y, breakCount, @@ -2452,8 +2452,8 @@ static void testJustification(HDC hdc, PCSTR str, RECT *clientArea) /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ ok(error[e].GetTextExtentExPointWWidth == areaWidth, - "GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", - error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); + "%s: GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", + context, error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); } } @@ -2496,7 +2496,7 @@ static void test_SetTextJustification(void) hfont = create_font("Times New Roman", &lf); SelectObject(hdc, hfont); - testJustification(hdc, testText, &clientArea); + testJustification("default", hdc, testText, &clientArea); if (!pGetTextExtentExPointI) goto done; GetGlyphIndicesA( hdc, "A ", 2, indices, 0 ); @@ -2533,7 +2533,7 @@ static void test_SetTextJustification(void) SetWindowExtEx( hdc, 2, 2, NULL ); GetClientRect( hwnd, &clientArea ); DPtoLP( hdc, (POINT *)&clientArea, 2 ); - testJustification(hdc, testText, &clientArea); + testJustification("2x2", hdc, testText, &clientArea); GetTextExtentPoint32A(hdc, "A", 1, &expect); for (i = 0; i < 10; i++) @@ -2555,7 +2555,7 @@ static void test_SetTextJustification(void) SetViewportExtEx( hdc, 3, 3, NULL ); GetClientRect( hwnd, &clientArea ); DPtoLP( hdc, (POINT *)&clientArea, 2 ); - testJustification(hdc, testText, &clientArea); + testJustification("3x3", hdc, testText, &clientArea); GetTextExtentPoint32A(hdc, "A", 1, &expect); for (i = 0; i < 10; i++) -- 2.20.1

2 1

[PATCH] gdi32/tests: Use a winetest context for test_font_metrics().
by Francois Gouget June 10, 2021

June 10, 2021

test_font_metrics() is called from many places and it is important to know where it was called from to diagnose failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- All context strings are unique which is the most important part. But I'm open to changing them if other values would be more descriptive. --- dlls/gdi32/tests/font.c | 45 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ffb400ba838..6bd9c8e941f 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -299,7 +299,8 @@ static void compare_tm(const TEXTMETRICA *tm, const TEXTMETRICA *otm) ok(tm->tmCharSet == otm->tmCharSet, "tmCharSet %d != %d\n", tm->tmCharSet, otm->tmCharSet); } -static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, +static void test_font_metrics(const char *context, + HDC hdc, HFONT hfont, LONG lfHeight, LONG lfWidth, const char *test_str, INT test_str_len, const TEXTMETRICA *tm_orig, const SIZE *size_orig, INT width_of_A_orig, @@ -315,6 +316,7 @@ static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, if (!hfont) return; + if (context) winetest_push_context(context); ok(GetCurrentObject(hdc, OBJ_FONT) == hfont, "hfont should be selected\n"); GetObjectA(hfont, sizeof(lf), &lf); @@ -389,6 +391,7 @@ if (0) /* these metrics are scaled too, but with rounding errors */ GetCharWidthA(hdc, 'A', 'A', &width_of_A); ok(near_match(width_of_A, width_of_A_orig * scale_x), "width A %d != %d\n", width_of_A, width_of_A_orig * scale_x); + if (context) winetest_pop_context(); } /* Test how GDI scales bitmap font metrics */ @@ -430,7 +433,7 @@ static void test_bitmap_font(void) bitmap_lf.lfWidth = 4; hfont = create_font("bitmap", &bitmap_lf); old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, 0, 4, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); + test_font_metrics("bitmap", hdc, hfont, 0, 4, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -453,7 +456,9 @@ static void test_bitmap_font(void) else if(scale == 2 && nearest_height - i == (height_orig / 4)) continue; else if(scale == 2 && nearest_height - i > (height_orig / 4 - 1)) scale--; old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); + winetest_push_context("height %i", i); + test_font_metrics(NULL, hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); + winetest_pop_context(); SelectObject(hdc, old_hfont); DeleteObject(hfont); } @@ -463,7 +468,7 @@ static void test_bitmap_font(void) bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); + test_font_metrics("bitmap 3x2", hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -472,7 +477,7 @@ static void test_bitmap_font(void) bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); + test_font_metrics("bitmap 3x3", hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -513,7 +518,7 @@ static void test_outline_font(void) ok(GetTextExtentPoint32A(hdc, test_str, sizeof(test_str), &size_orig), "GetTextExtentPoint32A failed\n"); ok(GetCharWidthA(hdc, 'A', 'A', &width_orig), "GetCharWidthA failed\n"); - test_font_metrics(hdc, hfont, lf.lfHeight, otm.otmTextMetrics.tmAveCharWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("outline", hdc, hfont, lf.lfHeight, otm.otmTextMetrics.tmAveCharWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -537,7 +542,7 @@ static void test_outline_font(void) lf.lfWidth = lfWidth * 3; hfont = create_font("3x2", &lf); old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 3, 2); + test_font_metrics("outline 3x2", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 3, 2); SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -546,7 +551,7 @@ static void test_outline_font(void) lf.lfWidth = lfWidth * 3; hfont = create_font("3x3", &lf); old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 3, 3); + test_font_metrics("outline 3x3", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 3, 3); SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -555,7 +560,7 @@ static void test_outline_font(void) lf.lfWidth = lfWidth * 1; hfont = create_font("1x1", &lf); old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("outline 1x1", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); SelectObject(hdc, old_hfont); DeleteObject(hfont); @@ -564,7 +569,7 @@ static void test_outline_font(void) lf.lfWidth = 0; hfont = create_font("1x1", &lf); old_hfont = SelectObject(hdc, hfont); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("outline 1x0", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); @@ -587,12 +592,12 @@ static void test_outline_font(void) */ hdc_2 = CreateCompatibleDC(0); old_hfont_2 = SelectObject(hdc_2, hfont); - test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("dc2.base", hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); SetMapMode(hdc, MM_ANISOTROPIC); /* font metrics on another DC should be unchanged */ - test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("dc2.aniso", hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* test restrictions of compatibility mode GM_COMPATIBLE */ /* part 1: rescaling only X should not change font scaling on screen. @@ -600,24 +605,24 @@ static void test_outline_font(void) appears as X scaling of 2 that no one requested. */ SetWindowExtEx(hdc, 100, 100, NULL); SetViewportExtEx(hdc, 50, 100, NULL); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); + test_font_metrics("xscaling", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); /* font metrics on another DC should be unchanged */ - test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("dc2.xscaling", hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* part 2: rescaling only Y should change font scaling. As also X is scaled by a factor of 2, but this is not requested by the DC transformation, we get a scaling factor of 2 in the X coordinate. */ SetViewportExtEx(hdc, 100, 200, NULL); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); + test_font_metrics("yscaling", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); /* font metrics on another DC should be unchanged */ - test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("dc2.yscaling", hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* restore scaling */ SetMapMode(hdc, MM_TEXT); /* font metrics on another DC should be unchanged */ - test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("dc2.text", hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); SelectObject(hdc_2, old_hfont_2); DeleteDC(hdc_2); @@ -642,7 +647,7 @@ static void test_outline_font(void) ret = SetWorldTransform(hdc, &xform); ok(ret, "SetWorldTransform error %u\n", GetLastError()); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("xform", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); @@ -669,7 +674,7 @@ static void test_outline_font(void) ret = SetMapMode(hdc, MM_LOMETRIC); ok(ret == MM_TEXT, "expected MM_TEXT, got %d, error %u\n", ret, GetLastError()); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("lometric", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); @@ -694,7 +699,7 @@ static void test_outline_font(void) ret = SetMapMode(hdc, MM_TEXT); ok(ret == MM_LOMETRIC, "expected MM_LOMETRIC, got %d, error %u\n", ret, GetLastError()); - test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + test_font_metrics("text", hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); -- 2.20.1

1 0

[PATCH] [website] Update German IRC translation (try 4)
by Rebekka Zwing June 10, 2021

June 10, 2021

Signed-off-by: Rebekka Zwing <rebekka.zwing(a)ok.de> --- Thanks Julian for the hopefully final 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..2195005f 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 IRC 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(a)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 werden in den jeweiligen Kanälen + 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 auf <b>#winehq</b> nach Hilfe fragst, ü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

3 2

[v2 PATCH 1/3] d2d1: Cache sampler state objects at device context.
by Nikolay Sivov June 10, 2021

June 10, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/brush.c | 49 ++++++++++++++-------------------------- dlls/d2d1/d2d1_private.h | 14 ++++++++++-- dlls/d2d1/device.c | 17 +++++++++++--- 3 files changed, 43 insertions(+), 37 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 07d2e26a143..76276bafc7a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -859,8 +859,6 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush1 *iface if (!refcount) { - if (brush->u.bitmap.sampler_state) - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); if (brush->u.bitmap.bitmap) ID2D1Bitmap1_Release(&brush->u.bitmap.bitmap->ID2D1Bitmap1_iface); d2d_brush_destroy(brush); @@ -924,11 +922,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeX(ID2D1BitmapBrush1 TRACE("iface %p, mode %#x.\n", iface, mode); brush->u.bitmap.extend_mode_x = mode; - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush1 *iface, D2D1_EXTEND_MODE mode) @@ -938,11 +931,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush1 TRACE("iface %p, mode %#x.\n", iface, mode); brush->u.bitmap.extend_mode_y = mode; - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush1 *iface, @@ -963,11 +951,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapB } brush->u.bitmap.interpolation_mode = d2d1_1_interp_mode_from_d2d1(mode); - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush1 *iface, ID2D1Bitmap *bitmap) @@ -1051,11 +1034,6 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode1(ID2D1Bitmap } brush->u.bitmap.interpolation_mode = mode; - if (brush->u.bitmap.sampler_state) - { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); - brush->u.bitmap.sampler_state = NULL; - } } static D2D1_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode1(ID2D1BitmapBrush1 *iface) @@ -1292,12 +1270,20 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_b return hr; } -static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) +static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) { + ID3D10SamplerState **sampler_state; HRESULT hr; - ID3D10Device_PSSetShaderResources(device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); - if (!brush->u.bitmap.sampler_state) + ID3D10Device_PSSetShaderResources(context->d3d_device, brush_idx, 1, &brush->u.bitmap.bitmap->srv); + + sampler_state = &context->sampler_states + [brush->u.bitmap.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [brush->u.bitmap.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] + [brush->u.bitmap.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; + + if (!*sampler_state) { D3D10_SAMPLER_DESC sampler_desc; @@ -1318,14 +1304,13 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, ID3D10Device *device, sampler_desc.MinLOD = 0.0f; sampler_desc.MaxLOD = 0.0f; - if (FAILED(hr = ID3D10Device_CreateSamplerState(device, - &sampler_desc, &brush->u.bitmap.sampler_state))) + if (FAILED(hr = ID3D10Device_CreateSamplerState(context->d3d_device, &sampler_desc, sampler_state))) ERR("Failed to create sampler state, hr %#x.\n", hr); } - ID3D10Device_PSSetSamplers(device, brush_idx, 1, &brush->u.bitmap.sampler_state); + ID3D10Device_PSSetSamplers(context->d3d_device, brush_idx, 1, sampler_state); } -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) { switch (brush->type) { @@ -1333,15 +1318,15 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, uns break; case D2D_BRUSH_TYPE_LINEAR: - d2d_gradient_bind(brush->u.linear.gradient, device, brush_idx); + d2d_gradient_bind(brush->u.linear.gradient, context->d3d_device, brush_idx); break; case D2D_BRUSH_TYPE_RADIAL: - d2d_gradient_bind(brush->u.radial.gradient, device, brush_idx); + d2d_gradient_bind(brush->u.radial.gradient, context->d3d_device, brush_idx); break; case D2D_BRUSH_TYPE_BITMAP: - d2d_brush_bind_bitmap(brush, device, brush_idx); + d2d_brush_bind_bitmap(brush, context, brush_idx); break; default: diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 199439b4616..64bc10a4895 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -126,6 +126,12 @@ struct d2d_device_context_ops HRESULT (*device_context_present)(IUnknown *outer_unknown); }; +enum d2d_device_context_sampler_limits +{ + D2D_SAMPLER_INTERPOLATION_MODE_COUNT = 2, + D2D_SAMPLER_EXTEND_MODE_COUNT = 3, +}; + struct d2d_device_context { ID2D1DeviceContext ID2D1DeviceContext_iface; @@ -149,6 +155,10 @@ struct d2d_device_context ID3D10Buffer *vb; ID3D10RasterizerState *rs; ID3D10BlendState *bs; + ID3D10SamplerState *sampler_states + [D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [D2D_SAMPLER_EXTEND_MODE_COUNT] + [D2D_SAMPLER_EXTEND_MODE_COUNT]; struct d2d_error_state error; D2D1_DRAWING_STATE_DESCRIPTION1 drawing_state; @@ -287,7 +297,6 @@ struct d2d_brush D2D1_EXTEND_MODE extend_mode_x; D2D1_EXTEND_MODE extend_mode_y; D2D1_INTERPOLATION_MODE interpolation_mode; - ID3D10SamplerState *sampler_state; } bitmap; } u; }; @@ -303,7 +312,8 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES1 *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) DECLSPEC_HIDDEN; -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device, unsigned int brush_idx) DECLSPEC_HIDDEN; +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) DECLSPEC_HIDDEN; HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_brush *opacity_brush, BOOL outline, BOOL is_arc, struct d2d_device_context *render_target, ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 23ce03dce5e..0c89e802510 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -176,10 +176,10 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en if (brush) { ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); - d2d_brush_bind_resources(brush, device, 0); + d2d_brush_bind_resources(brush, render_target, 0); } if (opacity_brush) - d2d_brush_bind_resources(opacity_brush, device, 1); + d2d_brush_bind_resources(opacity_brush, render_target, 1); if (ib) ID3D10Device_DrawIndexed(device, index_count, 0, 0); @@ -254,7 +254,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) if (!refcount) { - unsigned int i; + unsigned int i, j, k; d2d_clip_stack_cleanup(&context->clip_stack); IDWriteRenderingParams_Release(context->default_text_rendering_params); @@ -271,6 +271,17 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) ID3D10VertexShader_Release(context->shape_resources[i].vs); ID3D10InputLayout_Release(context->shape_resources[i].il); } + for (i = 0; i < D2D_SAMPLER_INTERPOLATION_MODE_COUNT; ++i) + { + for (j = 0; j < D2D_SAMPLER_EXTEND_MODE_COUNT; ++j) + { + for (k = 0; k < D2D_SAMPLER_EXTEND_MODE_COUNT; ++k) + { + if (context->sampler_states[i][j][k]) + ID3D10SamplerState_Release(context->sampler_states[i][j][k]); + } + } + } context->stateblock->lpVtbl->Release(context->stateblock); if (context->target) ID2D1Bitmap1_Release(&context->target->ID2D1Bitmap1_iface); -- 2.30.2

1 2

[PATCH 1/2] user32/tests: Preserve the initial GetLastError() value for test_ClipboardOwner().
by Francois Gouget June 10, 2021

June 10, 2021

One of the tests expects GetLastError() to still return 0xdeadbeef after has_no_open_wnd(), which would not be the case if another process did open the clipboard. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 5071008a0ab..5951fc3247f 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -65,6 +65,7 @@ static BOOL open_clipboard(HWND hwnd) static BOOL has_no_open_wnd(void) { DWORD start = GetTickCount(); + DWORD le = GetLastError(); while (1) { HWND clipwnd = GetOpenClipboardWindow(); @@ -72,7 +73,7 @@ static BOOL has_no_open_wnd(void) if (GetTickCount() - start > 100) { char classname[256]; - DWORD le = GetLastError(); + le = GetLastError(); /* See open_clipboard() */ GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); trace("%p (%s) opened the clipboard\n", clipwnd, classname); @@ -80,6 +81,7 @@ static BOOL has_no_open_wnd(void) return FALSE; } Sleep(15); + SetLastError(le); } } -- 2.20.1

1 1

[PATCH 4/4] d3dx10/tests: Add code for generating test data.
by Ziqing Hui June 10, 2021

June 10, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- The frame data in [PATCH 2/4] generated by the code here. dlls/d3dx10_43/tests/d3dx10.c | 53 +++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)

2 1

[PATCH 3/4] d3dx10/tests: Test frame data for created texture.
by Ziqing Hui June 10, 2021

June 10, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 208 ++++++++++++++++++++++++++++++++++ 1 file changed, 208 insertions(+)

2 1