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

Re: [PATCH 0/1] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil.

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/opengl32/wgl.c: > count = wglDescribePixelFormat( hdc, 0, 0, NULL ); > if (!count) return 0; > > + cDepthBits = ppfd->cDepthBits; > + if (ppfd->dwFlags & PFD_DEPTH_DONTCARE) cDepthBits = 0; > + else if (ppfd->cStencilBits && cDepthBits <= 16) > + { > + /* Even if, e. g., depth 16, stencil 8 is available Window / AMD may return 24x8 (and not 16x0). > + * Adjust to 24 as 24x8 is universally available and we won't end up without stencil. */ > + cDepthBits = 24; > + } > + So, as I mentioned to you privately before, this seems very ad-hoc i.e. I'd expect ChoosePixelFormat() generally, or at least usually, to return a pixel format with stencil bits when the PFD explicitly asks for it. I'd like to see more evidence that's not the case and an improved test (or comment, if it can't be properly shown in a Wine test) to back it up. Also nitpick, typo "Window". -- https://gitlab.winehq.org/wine/wine/-/merge_requests/132#note_2294

June 17, 2022

Re: [PATCH 0/1] MR132: opengl32: Don't prioritize low bit depth formats with non-matching stencil.

by Matteo Bruni (＠Mystral)

Matteo Bruni (@Mystral) commented about dlls/opengl32/tests/opengl.c: > + > + pfd.cDepthBits = 16; > + pfd.cStencilBits = 8; > + ok( test_pfd(&pfd, &ret_fmt), "depth 16, stencil 8 failed.\n" ); > + ok( ret_fmt.cDepthBits >= 16, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); > + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); > + pfd.cDepthBits = 0; > + pfd.cStencilBits = 0; > + > + pfd.cDepthBits = 8; > + pfd.cStencilBits = 8; > + ok( test_pfd(&pfd, &ret_fmt), "depth 8, stencil 8 failed.\n" ); > + ok( ret_fmt.cDepthBits >= 16, "Got unexpected cDepthBits %u.\n", ret_fmt.cDepthBits ); > + ok( ret_fmt.cStencilBits == 8, "Got unexpected cStencilBits %u.\n", ret_fmt.cStencilBits ); > + pfd.cDepthBits = 0; > + pfd.cStencilBits = 0; I have tweaked / extended the tests a little further, see [gl-depth-stencil.txt](/uploads/4ae59fc98d8067d7babb524984574df7/gl-depth-stencil.txt). I only tested that on Nvidia for now, curious if they also pass with AMD with those changes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/132#note_2293

June 17, 2022

Re: [PATCH v4 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.

by Alex Henrie (＠alexhenrie)

Sorry for the noise. I did test the previous version of the patch before I sent it, but unfortunately my initial test run did not catch the fact that the long names were too big for the buffer variable. I have now fixed the problem. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/252#note_2291

June 17, 2022

[PATCH v4 1/1] shell32/tests: Add tests for Program Manager name sanitization.

by Alex Henrie

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 72 +++++++++++++++++++++++++++++++- 1 file changed, 71 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5d532f9222f..cb1ff8ddb9f 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -23,7 +23,7 @@ * functionality * - Todo: Handle CommonGroupFlag * Better AddItem Tests (Lots of parameters to test) - * Tests for Invalid Characters in Names / Invalid Parameters + * Tests for invalid parameters */ #include <stdio.h> @@ -425,6 +425,75 @@ static void test_request_groups(DWORD instance, HCONV hconv) FindClose(hfind); } +static void test_name_sanitization(DWORD instance, HCONV hConv) +{ + static const char original_name[] = "\x01\x1F !#$%&'*+,-./:;<=>?@[\\]^`{|}~\x7F\xFF"; + static const char sanitized_name[] = "__ !#$%&'_+,-.__;_=__@[_]^`{_}~\x7F\xFF"; + char buf[128]; + UINT error; + + if (0) /* the directory isn't deleted on windows < 7 */ + { + error = dde_execute(instance, hConv, "[CreateGroup(\" \")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(check_exists(" "), "directory not created\n"); + ok(!check_window_exists(" "), "window should not exist\n"); + + error = dde_execute(instance, hConv, "[DeleteGroup(\" \")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists(" "), "directory should not exist\n"); + } + + if (0) /* these calls will actually delete the start menu */ + { + error = dde_execute(instance, hConv, "[DeleteGroup(\"\")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists("../Programs"), "directory should not exist\n"); + + error = dde_execute(instance, hConv, "[DeleteGroup(\"..\")]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + ok(!check_exists("../../Start Menu"), "directory should not exist\n"); + } + + sprintf(buf, "[CreateGroup(\"Group%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + todo_wine ok(check_exists(buf), "directory not created\n"); + if (!check_exists(buf)) return; + ok(check_window_exists(buf), "window not created\n"); + + sprintf(buf, "[ShowGroup(\"Group%s\", 0)]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + ok(check_window_exists(buf), "window not created\n"); + + sprintf(buf, "[AddItem(notepad,\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link not created\n"); + + sprintf(buf, "[ReplaceItem(\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link should still exist\n"); + + sprintf(buf, "[DeleteItem(\"Notepad%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %#x\n", error); + sprintf(buf, "Group%s/Notepad%s.lnk", sanitized_name, sanitized_name); + ok(check_exists(buf), "link should still exist\n"); + + sprintf(buf, "[DeleteGroup(\"Group%s\")]", original_name); + error = dde_execute(instance, hConv, buf); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %#x\n", error); + sprintf(buf, "Group%s", sanitized_name); + ok(!check_exists(buf), "directory should not exist\n"); +} + START_TEST(progman_dde) { DWORD instance = 0; @@ -479,6 +548,7 @@ START_TEST(progman_dde) /* Run Tests */ test_progman_dde2(instance, hConv); + test_name_sanitization(instance, hConv); /* Cleanup & Exit */ ret = DdeDisconnect(hConv); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/252

June 17, 2022

[PATCH v4 0/1] MR252: shell32/tests: Add tests for Program Manager name sanitization.

by Alex Henrie (＠alexhenrie)

Split from https://gitlab.winehq.org/wine/wine/-/merge_requests/23 -- v4: shell32/tests: Add tests for Program Manager name sanitization. https://gitlab.winehq.org/wine/wine/-/merge_requests/252

June 17, 2022

[PATCH v2 1/1] riched20: Commit and repaint after changing TextFont properties.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53170 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3d88b8a65b0..b34276e77eb 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -805,6 +805,8 @@ static HRESULT set_textfont_prop(ITextFontImpl *font, enum textfont_prop_id prop cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_UpdateRepaint( services->editor, FALSE ); return S_OK; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/267

June 17, 2022

[PATCH v2 0/1] MR267: riched20: Commit and repaint after changing TextFont properties. (#53170)

by Jinoh Kang (＠iamahuman)

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: riched20: Commit and repaint after changing TextFont properties. https://gitlab.winehq.org/wine/wine/-/merge_requests/267

June 17, 2022

Re: [PATCH 0/5] MR257: d3dx: Add support for ID3DX10ThreadPump parameter in D3DX10CreateTexture* functions

by Matteo Bruni (＠Mystral)

Any particular reason the new test isn't inside the for loop right above so to check every test_image[] with the thread pump? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/257#note_2286

June 17, 2022

[PATCH v2 1/1] riched20: Commit and repaint after the SetFont method is called.

by Jinoh Kang

From: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53169 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/richole.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3d88b8a65b0..feb83c16854 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -647,6 +647,8 @@ static void textrange_set_font(ITextRange *range, ITextFont *font) cursor_from_char_ofs( services->editor, start, &from ); cursor_from_char_ofs( services->editor, end, &to ); ME_SetCharFormat( services->editor, &from, &to, &fmt ); + ME_CommitUndo( services->editor ); + ME_UpdateRepaint( services->editor, FALSE ); } } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/268

June 17, 2022

[PATCH v2 0/1] MR268: riched20: Commit and repaint after the SetFont method is called. (#53169)

by Jinoh Kang (＠iamahuman)

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v2: riched20: Commit and repaint after the SetFont method is called. https://gitlab.winehq.org/wine/wine/-/merge_requests/268

June 17, 2022