December 2019 - Wine-Devel - list.winehq.org

Re: [PATCH 1/4] user32/listbox: Scroll to specified caret index.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61861 Your paranoid android. === debian10 (32 bit Chinese:China report) === user32: clipboard.c:1168: Test failed: OpenClipboard failed: 5 clipboard.c:1170: Test failed: EmptyClipboard failed: 1418 clipboard.c:1172: Test failed: CloseClipboard failed: 1418 clipboard.c:1174: Test failed: sequence diff 0 clipboard.c:1017: Test failed: wait failed clipboard.c:1174: Test failed: WM_DRAWCLIPBOARD not received clipboard.c:1174: Test failed: WM_CLIPBOARDUPDATE not received clipboard.c:1199: Test failed: WM_DESTROYCLIPBOARD received

Dec. 11, 2019

[PATCH 4/4] comctl32/listbox: Update caret index on LB_SETSEL.

by Nikolay Sivov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 4 ++++ dlls/comctl32/tests/listbox.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 2b8c2ba086..f9b4e0aeaf 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2858,7 +2858,11 @@ static LRESULT CALLBACK LISTBOX_WindowProc( HWND hwnd, UINT msg, WPARAM wParam, case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); if (ret != LB_ERR && wParam) + { descr->anchor_item = lParam; + if (lParam != -1) + LISTBOX_SetCaretIndex( descr, lParam, TRUE ); + } return ret; case LB_SETCURSEL: diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index a3769423ee..4d44137e4d 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -707,16 +707,22 @@ static void test_LB_SETSEL(void) ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); @@ -731,16 +737,22 @@ static void test_LB_SETSEL(void) ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); } -- 2.24.0

Dec. 11, 2019

[PATCH 3/4] comctl32/listbox: Scroll to specified caret index.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 0d6dcd6a0b..2b8c2ba086 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1462,19 +1462,23 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) */ static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + BOOL focus_changed = descr->focus_item != index; - TRACE("old focus %d, index %d\n", oldfocus, index); + TRACE("old focus %d, index %d\n", descr->focus_item, index); if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; - if (index == oldfocus) return LB_OKAY; - LISTBOX_DrawFocusRect( descr, FALSE ); - descr->focus_item = index; + if (focus_changed) + { + LISTBOX_DrawFocusRect( descr, FALSE ); + descr->focus_item = index; + } LISTBOX_MakeItemVisible( descr, index, fully_visible ); - LISTBOX_DrawFocusRect( descr, TRUE ); + + if (focus_changed) + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; } -- 2.24.0

Dec. 11, 2019

[PATCH 2/4] user32/listbox: Update caret index on LB_SETSEL.

by Nikolay Sivov

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47459 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 4 ++++ dlls/user32/tests/listbox.c | 16 ++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 95f6a23a28..65b052eb62 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2963,7 +2963,11 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); if (ret != LB_ERR && wParam) + { descr->anchor_item = lParam; + if (lParam != -1) + LISTBOX_SetCaretIndex( descr, lParam, TRUE ); + } return ret; case LB_SETCURSEL: diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 9f6f45990f..cd372f8ac5 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -583,21 +583,29 @@ static void test_LB_SETSEL(void) ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); @@ -607,21 +615,29 @@ static void test_LB_SETSEL(void) ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == -1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 0); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 0, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 0, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, TRUE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); ret = SendMessageA(list, LB_SETSEL, FALSE, 1); ok(ret == 0, "Unexpected return value %d.\n", ret); ret = SendMessageA(list, LB_GETANCHORINDEX, 0, 0); ok(ret == 1, "Unexpected anchor index %d.\n", ret); + ret = SendMessageA(list, LB_GETCARETINDEX, 0, 0); + ok(ret == 1, "Unexpected caret index %d.\n", ret); DestroyWindow(list); } -- 2.24.0

Dec. 11, 2019

[PATCH 1/4] user32/listbox: Scroll to specified caret index.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3949610e50..95f6a23a28 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1473,19 +1473,23 @@ static void LISTBOX_MakeItemVisible( LB_DESCR *descr, INT index, BOOL fully ) */ static LRESULT LISTBOX_SetCaretIndex( LB_DESCR *descr, INT index, BOOL fully_visible ) { - INT oldfocus = descr->focus_item; + BOOL focus_changed = descr->focus_item != index; - TRACE("old focus %d, index %d\n", oldfocus, index); + TRACE("old focus %d, index %d\n", descr->focus_item, index); if (descr->style & LBS_NOSEL) return LB_ERR; if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; - if (index == oldfocus) return LB_OKAY; - LISTBOX_DrawFocusRect( descr, FALSE ); - descr->focus_item = index; + if (focus_changed) + { + LISTBOX_DrawFocusRect( descr, FALSE ); + descr->focus_item = index; + } LISTBOX_MakeItemVisible( descr, index, fully_visible ); - LISTBOX_DrawFocusRect( descr, TRUE ); + + if (focus_changed) + LISTBOX_DrawFocusRect( descr, TRUE ); return LB_OKAY; } -- 2.24.0

Dec. 11, 2019

Re: Suppressing Wine prefix configuration message window?

by Sebastian M. Ernst

Am 11.12.19 um 11:44 schrieb Dmitry Timoshkov: > Now, after seeing what precisely you're trying to do, I have to say > that my suggestion should not be used in your scenario. Disabling > updates is only appropriate for fully initialized prefixes. Perhaps > adding new switch '-q[uite]' or '-nobanner' to wineboot would better > match your needs. Yes, correct, this is what I was hoping to find.

Dec. 11, 2019

Re: Suppressing Wine prefix configuration message window?

by Dmitry Timoshkov

"Sebastian M. Ernst" <ernst(a)pleiszenburg.de> wrote: > > 'echo disable >~/.wine/.update-timestamp' should do the trick, however > > that basically disables the prefix updates. > > Thanks Dmitry. I tested it - it works and does not show the > configuration window. Though, my newly generated prefix looks relatively > empty compared to what I am used to. It's missing a lot of stuff in > drive_c (?). > > user(a)comp:~/Desktop/test5> ls > user(a)comp:~/Desktop/test5> export WINEPREFIX=$(pwd)/DEMO > user(a)comp:~/Desktop/test5> mkdir -p $WINEPREFIX > user(a)comp:~/Desktop/test5> ls > DEMO > user(a)comp:~/Desktop/test5> ls $WINEPREFIX > user(a)comp:~/Desktop/test5> echo disable > $WINEPREFIX/.update-timestamp > user(a)comp:~/Desktop/test5> ls -a $WINEPREFIX > . .. .update-timestamp > user(a)comp:~/Desktop/test5> wine wineboot -i Now, after seeing what precisely you're trying to do, I have to say that my suggestion should not be used in your scenario. Disabling updates is only appropriate for fully initialized prefixes. Perhaps adding new switch '-q[uite]' or '-nobanner' to wineboot would better match your needs. -- Dmitry.

Dec. 11, 2019

Re: Suppressing Wine prefix configuration message window?

by Sebastian M. Ernst

Am 11.12.19 um 11:19 schrieb Dmitry Timoshkov: > 'echo disable >~/.wine/.update-timestamp' should do the trick, however > that basically disables the prefix updates. Thanks Dmitry. I tested it - it works and does not show the configuration window. Though, my newly generated prefix looks relatively empty compared to what I am used to. It's missing a lot of stuff in drive_c (?). user(a)comp:~/Desktop/test5> ls user(a)comp:~/Desktop/test5> export WINEPREFIX=$(pwd)/DEMO user(a)comp:~/Desktop/test5> mkdir -p $WINEPREFIX user(a)comp:~/Desktop/test5> ls DEMO user(a)comp:~/Desktop/test5> ls $WINEPREFIX user(a)comp:~/Desktop/test5> echo disable > $WINEPREFIX/.update-timestamp user(a)comp:~/Desktop/test5> ls -a $WINEPREFIX . .. .update-timestamp user(a)comp:~/Desktop/test5> wine wineboot -i user(a)comp:~/Desktop/test5> find -H $WINEPREFIX /home/user/Desktop/test5/DEMO /home/user/Desktop/test5/DEMO/user.reg /home/user/Desktop/test5/DEMO/dosdevices /home/user/Desktop/test5/DEMO/dosdevices/c: /home/user/Desktop/test5/DEMO/dosdevices/z: /home/user/Desktop/test5/DEMO/system.reg /home/user/Desktop/test5/DEMO/.update-timestamp /home/user/Desktop/test5/DEMO/drive_c /home/user/Desktop/test5/DEMO/drive_c/users /home/user/Desktop/test5/DEMO/drive_c/users/user /home/user/Desktop/test5/DEMO/drive_c/users/user/Local Settings /home/user/Desktop/test5/DEMO/drive_c/users/user/Local Settings/Application Data /home/user/Desktop/test5/DEMO/drive_c/users/user/Desktop /home/user/Desktop/test5/DEMO/drive_c/users/user/Application Data /home/user/Desktop/test5/DEMO/drive_c/windows /home/user/Desktop/test5/DEMO/drive_c/windows/system32 /home/user/Desktop/test5/DEMO/drive_c/windows/syswow64 /home/user/Desktop/test5/DEMO/drive_c/windows/win.ini

Dec. 11, 2019

Re: Suppressing Wine prefix configuration message window?

by Dmitry Timoshkov

"Sebastian M. Ernst" <ernst(a)pleiszenburg.de> wrote: > whenever I use `wine` in a new prefix or intentionally initialize a new > prefix with `wine wineboot -i`, a configuration message window pops up > for a few seconds (see attachment: "the configuration of Wine in ... is > being updated, please wait ..."). I am heavily using Wine in shell > scripts with new prefixes being generated by those scripts on a regular > basis. In environments with X, this message window therefore becomes > sort of annoying. I'd like to "deactivate" it though I have not found a > simple / clean option. The best bad approach I found in forums is to > install a virtual X frame-buffer and to point Wine to its DISPAY. > > Is there anything possibly undocumented - an option, a switch or an > environment variable - that would allow me to do what I want? 'echo disable >~/.wine/.update-timestamp' should do the trick, however that basically disables the prefix updates. -- Dmitry.

Dec. 11, 2019

[PATCH v2 2/2] shell32/tests: Add PathResolve tests.

by Gijs Vermeulen

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 119 +++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 262714a9f3..4ea2ef14cd 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -99,6 +99,7 @@ static HRESULT (WINAPI *pSHSetKnownFolderPath)(REFKNOWNFOLDERID, DWORD, HANDLE, static HRESULT (WINAPI *pSHGetFolderPathEx)(REFKNOWNFOLDERID, DWORD, HANDLE, LPWSTR, DWORD); static BOOL (WINAPI *pPathYetAnotherMakeUniqueName)(PWSTR, PCWSTR, PCWSTR, PCWSTR); static HRESULT (WINAPI *pSHGetKnownFolderIDList)(REFKNOWNFOLDERID, DWORD, HANDLE, PIDLIST_ABSOLUTE*); +static BOOL (WINAPI *pPathResolve)(PWSTR, PZPCWSTR, UINT); static DLLVERSIONINFO shellVersion = { 0 }; static LPMALLOC pMalloc; @@ -207,6 +208,7 @@ static void loadShell32(void) GET_PROC(SHGetMalloc) GET_PROC(PathYetAnotherMakeUniqueName) GET_PROC(SHGetKnownFolderIDList) + GET_PROC(PathResolve); ok(pSHGetMalloc != NULL, "shell32 is missing SHGetMalloc\n"); if (pSHGetMalloc) @@ -2864,6 +2866,122 @@ if (0) { /* crashes on native */ ILFree(pidl); } +static void test_PathResolve(void) +{ + WCHAR testfile[MAX_PATH], testfile_lnk[MAX_PATH], regedit_in_testdir[MAX_PATH], regedit_cmd[MAX_PATH]; + WCHAR tempdir[MAX_PATH], path[MAX_PATH]; + const WCHAR *dirs[2] = { tempdir, NULL }; + HANDLE file, file2; + BOOL ret; + int i; + struct { + const WCHAR *path; + UINT flags; + BOOL expected; + const WCHAR *expected_path; + } tests[] = { + /* no flags */ + { L"test", 0, FALSE, L"test" }, + { L"C:\\test", 0, TRUE, L"C:\\test" }, + { L"regedit", 0, FALSE, L"regedit" }, + { testfile, 0, TRUE, testfile }, + + /* PRF_VERIFYEXISTS */ + { L"test", PRF_VERIFYEXISTS, TRUE, testfile_lnk }, + { L"C:\\test", PRF_VERIFYEXISTS, FALSE, L"C:\\test" }, + /* common extensions are tried even if PRF_TRYPROGRAMEXTENSIONS isn't passed */ + /* directories in dirs parameter are always searched first even if PRF_FIRSTDIRDEF isn't passed */ + { L"regedit", PRF_VERIFYEXISTS, TRUE, regedit_cmd }, + /* .dll is not tried */ + { L"bcrypt", PRF_VERIFYEXISTS, FALSE, L"bcrypt" }, + { testfile, PRF_VERIFYEXISTS, TRUE, testfile_lnk }, + { regedit_in_testdir, PRF_VERIFYEXISTS, TRUE, regedit_cmd }, + + /* PRF_FIRSTDIRDEF */ + { L"regedit", PRF_FIRSTDIRDEF, FALSE, L"regedit" }, + + /* RF_VERIFYEXISTS | PRF_FIRSTDIRDEF */ + { L"regedit", PRF_VERIFYEXISTS | PRF_FIRSTDIRDEF, TRUE, regedit_cmd }, + + /* PRF_DONTFINDLNK */ + { testfile, PRF_DONTFINDLNK, TRUE, testfile }, + { regedit_in_testdir, PRF_DONTFINDLNK, TRUE, regedit_in_testdir }, + + /* RF_VERIFYEXISTS | PRF_DONTFINDLNK */ + { testfile, PRF_VERIFYEXISTS | PRF_DONTFINDLNK, FALSE, testfile }, + /* cmd is also ignored when passing PRF_VERIFYEXISTS | PRF_DONTFINDLNK */ + { regedit_in_testdir, PRF_VERIFYEXISTS | PRF_DONTFINDLNK, FALSE, regedit_in_testdir }, + + /* PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE */ + /* only PRF_VERIFYEXISTS matters*/ + { L"test", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, testfile_lnk }, + { L"C:\\test", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, FALSE, L"C:\\test" }, + { L"regedit", PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, regedit_cmd }, + { testfile, PRF_VERIFYEXISTS | PRF_REQUIREABSOLUTE, TRUE, testfile_lnk }, + + /* PRF_TRYPROGRAMEXTENSIONS */ + { L"test", PRF_TRYPROGRAMEXTENSIONS, TRUE, testfile_lnk}, + { L"C:\\test", PRF_TRYPROGRAMEXTENSIONS, FALSE, L"C:\\test" }, + { L"regedit", PRF_TRYPROGRAMEXTENSIONS, TRUE, regedit_cmd }, + /* .dll is not tried */ + { L"bcrypt", PRF_TRYPROGRAMEXTENSIONS, FALSE, L"bcrypt" }, + { testfile, PRF_TRYPROGRAMEXTENSIONS, TRUE, testfile_lnk }, + { regedit_in_testdir, PRF_TRYPROGRAMEXTENSIONS, TRUE, regedit_cmd }, + + /* PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK */ + { testfile, PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK, FALSE, testfile }, + /* cmd is also ignored when passing PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK */ + { regedit_in_testdir, PRF_TRYPROGRAMEXTENSIONS | PRF_DONTFINDLNK, FALSE, regedit_in_testdir } + }; + + if (!pPathResolve) + { + win_skip("PathResolve not available\n"); + return; + } + + GetTempPathW(MAX_PATH, tempdir); + + lstrcpyW(testfile, tempdir); + lstrcatW(testfile, L"test"); + lstrcpyW(testfile_lnk, testfile); + lstrcatW(testfile_lnk, L".lnk"); + + file = CreateFileW(testfile_lnk, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file != INVALID_HANDLE_VALUE, "got %p\n", file); + + lstrcpyW(regedit_in_testdir, tempdir); + lstrcatW(regedit_in_testdir, L"regedit"); + lstrcpyW(regedit_cmd, regedit_in_testdir); + lstrcatW(regedit_cmd, L".cmd"); + + file2 = CreateFileW(regedit_cmd, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(file2 != INVALID_HANDLE_VALUE, "got %p\n", file); + + /* show that resolving regedit with NULL dirs returns regedit.exe */ + lstrcpyW(path, L"regedit"); + ret = pPathResolve(path, NULL, PRF_VERIFYEXISTS); + ok(ret, "resolving regedit failed unexpectedly\n"); + ok(!lstrcmpiW(path, L"C:\\windows\\regedit.exe") || !lstrcmpiW(path, L"C:\\windows\\system32\\regedit.exe"), + "unexpected path %s\n", wine_dbgstr_w(path)); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + lstrcpyW(path, tests[i].path); + + if (!tests[i].expected) SetLastError(0xdeadbeef); + ret = pPathResolve(path, dirs, tests[i].flags); + ok(ret == tests[i].expected, "test %d: expected %d, got %d\n", i, tests[i].expected, ret); + ok(!lstrcmpiW(path, tests[i].expected_path), + "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); + if (!tests[i].expected) + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + } + + CloseHandle(file); + CloseHandle(file2); +} + START_TEST(shellpath) { if (!init()) return; @@ -2894,5 +3012,6 @@ START_TEST(shellpath) test_DoEnvironmentSubst(); test_PathYetAnotherMakeUniqueName(); test_SHGetKnownFolderIDList(); + test_PathResolve(); } } -- 2.24.0

Dec. 11, 2019

[PATCH v2 1/2] shell32: Implement PathResolve.

by Gijs Vermeulen

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48082 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/shell32/shellpath.c | 69 ++++++++++++++++++++++++++++++++++------ include/shlobj.h | 3 +- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 06be794812..b6350ea060 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -684,27 +684,78 @@ BOOL WINAPI PathQualifyAW(LPCVOID pszPath) return PathQualifyA(pszPath); } -static BOOL PathResolveA(LPSTR path, LPCSTR *paths, DWORD flags) +BOOL WINAPI PathFindOnPathExA(LPSTR,LPCSTR *,DWORD); +BOOL WINAPI PathFindOnPathExW(LPWSTR,LPCWSTR *,DWORD); +BOOL WINAPI PathFileExistsDefExtA(LPSTR,DWORD); +BOOL WINAPI PathFileExistsDefExtW(LPWSTR,DWORD); + +static BOOL PathResolveA(char *path, const char **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_a(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecA(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_a(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsA(path)) + { + if (PathFindOnPathExA(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtA(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameA(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameA(path, MAX_PATH, path, NULL); + + return TRUE; } -static BOOL PathResolveW(LPWSTR path, LPCWSTR *paths, DWORD flags) +static BOOL PathResolveW(WCHAR *path, const WCHAR **dirs, DWORD flags) { - FIXME("(%s,%p,0x%08x),stub!\n", debugstr_w(path), paths, flags); - return FALSE; + BOOL is_file_spec = PathIsFileSpecW(path); + DWORD dwWhich = flags & PRF_DONTFINDLNK ? 0xf : 0xff; + + TRACE("(%s,%p,0x%08x)\n", debugstr_w(path), dirs, flags); + + if (flags & PRF_VERIFYEXISTS && !PathFileExistsW(path)) + { + if (PathFindOnPathExW(path, dirs, dwWhich)) + return TRUE; + if (PathFileExistsDefExtW(path, dwWhich)) + return TRUE; + if (!is_file_spec) GetFullPathNameW(path, MAX_PATH, path, NULL); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + if (is_file_spec) + { + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; + } + + GetFullPathNameW(path, MAX_PATH, path, NULL); + + return TRUE; } /************************************************************************* * PathResolve [SHELL32.51] */ -BOOL WINAPI PathResolveAW(LPVOID path, LPCVOID *paths, DWORD flags) +BOOL WINAPI PathResolveAW(void *path, const void **paths, DWORD flags) { if (SHELL_OsIsUnicode()) - return PathResolveW(path, (LPCWSTR*)paths, flags); + return PathResolveW(path, (const WCHAR **)paths, flags); else - return PathResolveA(path, (LPCSTR*)paths, flags); + return PathResolveA(path, (const char **)paths, flags); } /************************************************************************* diff --git a/include/shlobj.h b/include/shlobj.h index 9a7741a193..bc1150bf91 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1752,10 +1752,9 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *); /* PathResolve flags */ #define PRF_VERIFYEXISTS 0x01 -#define PRF_EXECUTABLE 0x02 #define PRF_TRYPROGRAMEXTENSIONS 0x03 #define PRF_FIRSTDIRDEF 0x04 -#define PRF_DONTFINDLINK 0x08 +#define PRF_DONTFINDLNK 0x08 #define PRF_REQUIREABSOLUTE 0x10 VOID WINAPI PathGetShortPath(LPWSTR pszPath); -- 2.24.0

Dec. 11, 2019

Suppressing Wine prefix configuration message window?

by Sebastian M. Ernst

Hi all, whenever I use `wine` in a new prefix or intentionally initialize a new prefix with `wine wineboot -i`, a configuration message window pops up for a few seconds (see attachment: "the configuration of Wine in ... is being updated, please wait ..."). I am heavily using Wine in shell scripts with new prefixes being generated by those scripts on a regular basis. In environments with X, this message window therefore becomes sort of annoying. I'd like to "deactivate" it though I have not found a simple / clean option. The best bad approach I found in forums is to install a virtual X frame-buffer and to point Wine to its DISPAY. Is there anything possibly undocumented - an option, a switch or an environment variable - that would allow me to do what I want? Regards, Sebastian

Dec. 11, 2019

[PATCH vkd3d] vkd3d/tests: Enable on vkd3d the tests for ID3D12CommandQueue::Wait().

by Conor McCarthy

The Wait() implementation was added some time ago and these tests succeed. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 323ef23..f17fe2a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31426,12 +31426,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); - if (!vkd3d_test_platform_is_windows()) - { - skip("Wait() is not implemented yet.\n"); /* FIXME */ - goto skip_tests; - } - /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -31507,7 +31501,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); -skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7); -- 2.24.0

Dec. 11, 2019

[PATCH v2 6/6] qedit/samplegrabber: Use strmbase sink connection methods.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/samplegrabber.c | 74 ++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index c65ab9caa70..91b8d9dce64 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -446,49 +446,6 @@ SampleGrabber_IMemInputPin_ReceiveCanBlock(IMemInputPin *iface) return This->memOutput ? IMemInputPin_ReceiveCanBlock(This->memOutput) : S_OK; } -/* IPin - input pin */ -static HRESULT WINAPI -SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_MEDIA_TYPE *type) -{ - SG_Impl *filter = CONTAINING_RECORD(iface, SG_Impl, sink.pin.IPin_iface); - - TRACE("filter %p, connector %p, type %p.\n", filter, connector, type); - - if (!connector) - return E_POINTER; - if (filter->sink.pin.peer) - return VFW_E_ALREADY_CONNECTED; - if (filter->filter.state != State_Stopped) - return VFW_E_NOT_STOPPED; - if (type) { - TRACE("Media type: %s/%s ssize: %u format: %s (%u bytes)\n", - debugstr_guid(&type->majortype), debugstr_guid(&type->subtype), - type->lSampleSize, - debugstr_guid(&type->formattype), type->cbFormat); - if (!IsEqualGUID(&type->formattype, &FORMAT_None) && - !IsEqualGUID(&type->formattype, &GUID_NULL) && - !type->pbFormat) - return VFW_E_INVALIDMEDIATYPE; - if (!IsEqualGUID(&filter->mtype.majortype,&GUID_NULL) && - !IsEqualGUID(&filter->mtype.majortype,&type->majortype)) - return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&filter->mtype.subtype,&MEDIASUBTYPE_None) && - !IsEqualGUID(&filter->mtype.subtype,&type->subtype)) - return VFW_E_TYPE_NOT_ACCEPTED; - if (!IsEqualGUID(&filter->mtype.formattype,&GUID_NULL) && - !IsEqualGUID(&filter->mtype.formattype,&FORMAT_None) && - !IsEqualGUID(&filter->mtype.formattype,&type->formattype)) - return VFW_E_TYPE_NOT_ACCEPTED; - - FreeMediaType(&filter->mtype); - CopyMediaType(&filter->mtype, type); - CopyMediaType(&filter->sink.pin.mt, type); - } - IPin_AddRef(filter->sink.pin.peer = connector); - - return S_OK; -} - static const ISampleGrabberVtbl ISampleGrabber_VTable = { SampleGrabber_ISampleGrabber_QueryInterface, @@ -522,7 +479,7 @@ static const IPinVtbl sink_vtbl = BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - SampleGrabber_In_IPin_ReceiveConnection, + BaseInputPinImpl_ReceiveConnection, BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, @@ -574,11 +531,40 @@ static HRESULT sample_grabber_sink_get_media_type(struct strmbase_pin *iface, return VFW_S_NO_MORE_ITEMS; } +static HRESULT sample_grabber_sink_connect(struct strmbase_sink *iface, + IPin *peer, const AM_MEDIA_TYPE *mt) +{ + SG_Impl *filter = impl_from_sink_pin(&iface->pin); + + if (!IsEqualGUID(&mt->formattype, &FORMAT_None) + && !IsEqualGUID(&mt->formattype, &GUID_NULL) && !mt->pbFormat) + return VFW_E_INVALIDMEDIATYPE; + + if (!IsEqualGUID(&filter->mtype.majortype, &GUID_NULL) + && !IsEqualGUID(&filter->mtype.majortype, &mt->majortype)) + return VFW_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&filter->mtype.subtype,&MEDIASUBTYPE_None) + && !IsEqualGUID(&filter->mtype.subtype, &mt->subtype)) + return VFW_E_TYPE_NOT_ACCEPTED; + + if (!IsEqualGUID(&filter->mtype.formattype, &GUID_NULL) + && !IsEqualGUID(&filter->mtype.formattype, &FORMAT_None) + && !IsEqualGUID(&filter->mtype.formattype, &mt->formattype)) + return VFW_E_TYPE_NOT_ACCEPTED; + + FreeMediaType(&filter->mtype); + CopyMediaType(&filter->mtype, mt); + + return S_OK; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_interface = sample_grabber_sink_query_interface, .base.pin_query_accept = sample_grabber_sink_query_accept, .base.pin_get_media_type = sample_grabber_sink_get_media_type, + .sink_connect = sample_grabber_sink_connect, }; static inline SG_Impl *impl_from_source_pin(struct strmbase_pin *iface) -- 2.24.0

Dec. 11, 2019

[PATCH v2 5/6] qcap/avico: Use base sink connection methods.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avico.c | 58 ++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index f822d4e4616..ecda162be86 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -272,52 +272,13 @@ static const IPersistPropertyBagVtbl PersistPropertyBagVtbl = { AVICompressorPropertyBag_Save }; -static inline AVICompressor *impl_from_IPin(IPin *iface) -{ - return impl_from_strmbase_filter(CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface)->filter); -} - -static HRESULT WINAPI AVICompressorIn_ReceiveConnection(IPin *iface, - IPin *pConnector, const AM_MEDIA_TYPE *pmt) -{ - AVICompressor *This = impl_from_IPin(iface); - HRESULT hres; - - TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pConnector, pmt); - - hres = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); - if(FAILED(hres)) - return hres; - - hres = fill_format_info(This, (VIDEOINFOHEADER*)pmt->pbFormat); - if(FAILED(hres)) - BaseInputPinImpl_Disconnect(iface); - return hres; -} - -static HRESULT WINAPI AVICompressorIn_Disconnect(IPin *iface) -{ - AVICompressor *This = impl_from_IPin(iface); - HRESULT hres; - - TRACE("(%p)\n", This); - - hres = BaseInputPinImpl_Disconnect(iface); - if(FAILED(hres)) - return hres; - - heap_free(This->videoinfo); - This->videoinfo = NULL; - return S_OK; -} - static const IPinVtbl AVICompressorInputPinVtbl = { BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - AVICompressorIn_ReceiveConnection, - AVICompressorIn_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo, @@ -465,12 +426,27 @@ static HRESULT WINAPI AVICompressorIn_Receive(struct strmbase_sink *base, IMedia return hres; } +static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) +{ + AVICompressor *filter = impl_from_strmbase_pin(&iface->pin); + return fill_format_info(filter, (VIDEOINFOHEADER *)mt->pbFormat); +} + +static void sink_disconnect(struct strmbase_sink *iface) +{ + AVICompressor *filter = impl_from_strmbase_pin(&iface->pin); + heap_free(filter->videoinfo); + filter->videoinfo = NULL; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, .base.pin_query_interface = sink_query_interface, .pfnReceive = AVICompressorIn_Receive, + .sink_connect = sink_connect, + .sink_disconnect = sink_disconnect, }; static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt) -- 2.24.0

Dec. 11, 2019

[PATCH v2 4/6] winegstreamer: Use base sink connection methods.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 182 ++++++++++++++-------------------- 1 file changed, 74 insertions(+), 108 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 589a7b7af17..fb60d69e2ac 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1343,6 +1343,11 @@ static const struct strmbase_filter_ops filter_ops = .filter_wait_state = gstdemux_wait_state, }; +static inline struct gstdemux *impl_from_strmbase_sink(struct strmbase_sink *iface) +{ + return CONTAINING_RECORD(iface, struct gstdemux, sink); +} + static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Stream)) @@ -1350,10 +1355,71 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE return S_FALSE; } +static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) +{ + struct gstdemux *filter = impl_from_strmbase_sink(iface); + IMemAllocator *allocator = NULL; + ALLOCATOR_PROPERTIES props; + HRESULT hr = S_OK; + + mark_wine_thread(); + + props.cBuffers = 8; + props.cbBuffer = 16384; + props.cbAlign = 1; + props.cbPrefix = 0; + + filter->reader = NULL; + filter->alloc = NULL; + if (FAILED(hr = IPin_QueryInterface(peer, &IID_IAsyncReader, (void **)&filter->reader))) + return hr; + + if (FAILED(hr = GST_Connect(filter, peer, &props))) + goto err; + + /* Some applications depend on IAsyncReader::RequestAllocator() passing a + * non-NULL preferred allocator. */ + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, + &IID_IMemAllocator, (void **)&allocator); + if (FAILED(hr)) + goto err; + hr = IAsyncReader_RequestAllocator(filter->reader, allocator, &props, &filter->alloc); + IMemAllocator_Release(allocator); + if (FAILED(hr)) + { + WARN("Failed to get allocator, hr %#x.\n", hr); + goto err; + } + + if (FAILED(hr = IMemAllocator_Commit(filter->alloc))) + { + WARN("Failed to commit allocator, hr %#x.\n", hr); + goto err; + } + + return S_OK; +err: + GST_RemoveOutputPins(filter); + IAsyncReader_Release(filter->reader); + return hr; +} + +static void gstdemux_sink_disconnect(struct strmbase_sink *iface) +{ + struct gstdemux *filter = impl_from_strmbase_sink(iface); + + mark_wine_thread(); + + IMemAllocator_Decommit(filter->alloc); + GST_RemoveOutputPins(filter); +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, + .sink_connect = gstdemux_sink_connect, + .sink_disconnect = gstdemux_sink_disconnect, }; static BOOL gstdecoder_init_gst(struct gstdemux *filter) @@ -1901,112 +1967,6 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) return S_OK; } -static inline struct gstdemux *impl_from_sink_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, struct gstdemux, sink.pin.IPin_iface); -} - -static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) -{ - struct gstdemux *filter = impl_from_sink_IPin(iface); - PIN_DIRECTION pindirReceive; - HRESULT hr = S_OK; - - TRACE("filter %p, peer %p, mt %p.\n", filter, pReceivePin, pmt); - strmbase_dump_media_type(pmt); - - mark_wine_thread(); - - EnterCriticalSection(&filter->filter.csFilter); - if (!filter->sink.pin.peer) - { - ALLOCATOR_PROPERTIES props; - IMemAllocator *pAlloc = NULL; - - props.cBuffers = 8; - props.cbBuffer = 16384; - props.cbAlign = 1; - props.cbPrefix = 0; - - if (IPin_QueryAccept(iface, pmt) != S_OK) - hr = VFW_E_TYPE_NOT_ACCEPTED; - - if (SUCCEEDED(hr)) { - IPin_QueryDirection(pReceivePin, &pindirReceive); - if (pindirReceive != PINDIR_OUTPUT) { - ERR("Can't connect from non-output pin\n"); - hr = VFW_E_INVALID_DIRECTION; - } - } - - filter->reader = NULL; - filter->alloc = NULL; - if (SUCCEEDED(hr)) - hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&filter->reader); - if (SUCCEEDED(hr)) - hr = GST_Connect(filter, pReceivePin, &props); - - /* A certain IAsyncReader::RequestAllocator expects to be passed - non-NULL preferred allocator */ - if (SUCCEEDED(hr)) - hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC, - &IID_IMemAllocator, (LPVOID *)&pAlloc); - if (SUCCEEDED(hr)) { - hr = IAsyncReader_RequestAllocator(filter->reader, pAlloc, &props, &filter->alloc); - if (FAILED(hr)) - WARN("Can't get an allocator, got %08x\n", hr); - } - if (pAlloc) - IMemAllocator_Release(pAlloc); - if (SUCCEEDED(hr)) { - CopyMediaType(&filter->sink.pin.mt, pmt); - filter->sink.pin.peer = pReceivePin; - IPin_AddRef(pReceivePin); - hr = IMemAllocator_Commit(filter->alloc); - } else { - GST_RemoveOutputPins(filter); - if (filter->reader) - IAsyncReader_Release(filter->reader); - filter->reader = NULL; - if (filter->alloc) - IMemAllocator_Release(filter->alloc); - filter->alloc = NULL; - } - TRACE("Size: %i\n", props.cbBuffer); - } else - hr = VFW_E_ALREADY_CONNECTED; - LeaveCriticalSection(&filter->filter.csFilter); - return hr; -} - -static HRESULT WINAPI GSTInPin_Disconnect(IPin *iface) -{ - struct gstdemux *filter = impl_from_sink_IPin(iface); - HRESULT hr; - FILTER_STATE state; - - TRACE("filter %p.\n", filter); - - mark_wine_thread(); - - hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state); - EnterCriticalSection(&filter->filter.csFilter); - if (filter->sink.pin.peer) - { - if (SUCCEEDED(hr) && state == State_Stopped) { - IMemAllocator_Decommit(filter->alloc); - IPin_Disconnect(filter->sink.pin.peer); - IPin_Release(filter->sink.pin.peer); - filter->sink.pin.peer = NULL; - hr = GST_RemoveOutputPins(filter); - } else - hr = VFW_E_NOT_STOPPED; - } else - hr = S_FALSE; - LeaveCriticalSection(&filter->filter.csFilter); - return hr; -} - static HRESULT WINAPI GSTInPin_EndOfStream(IPin *iface) { FIXME("iface %p, stub!\n", iface); @@ -2040,8 +2000,8 @@ static const IPinVtbl GST_InputPin_Vtbl = { BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - GSTInPin_ReceiveConnection, - GSTInPin_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo, @@ -2220,6 +2180,8 @@ static const struct strmbase_sink_ops wave_parser_sink_ops = { .base.pin_query_accept = wave_parser_sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, + .sink_connect = gstdemux_sink_connect, + .sink_disconnect = gstdemux_sink_disconnect, }; static BOOL wave_parser_init_gst(struct gstdemux *filter) @@ -2322,6 +2284,8 @@ static const struct strmbase_sink_ops avi_splitter_sink_ops = { .base.pin_query_accept = avi_splitter_sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, + .sink_connect = gstdemux_sink_connect, + .sink_disconnect = gstdemux_sink_disconnect, }; static BOOL avi_splitter_init_gst(struct gstdemux *filter) @@ -2430,6 +2394,8 @@ static const struct strmbase_sink_ops mpeg_splitter_sink_ops = { .base.pin_query_accept = mpeg_splitter_sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, + .sink_connect = gstdemux_sink_connect, + .sink_disconnect = gstdemux_sink_disconnect, }; static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) -- 2.24.0

Dec. 11, 2019

[PATCH v2 3/6] winegstreamer: Store the sink as a strmbase_sink structure.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 83 ++++++++++++++--------------------- 1 file changed, 34 insertions(+), 49 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7d0313d7ce..589a7b7af17 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -52,7 +52,7 @@ struct gstdemux struct strmbase_filter filter; IAMStreamSelect IAMStreamSelect_iface; - struct strmbase_pin sink; + struct strmbase_sink sink; IAsyncReader *reader; IMemAllocator *alloc; struct gstdemux_source **ppPins; @@ -1184,7 +1184,7 @@ static struct strmbase_pin *gstdemux_get_pin(struct strmbase_filter *base, unsig struct gstdemux *filter = impl_from_strmbase_filter(base); if (!index) - return &filter->sink; + return &filter->sink.pin; else if (index <= filter->cStreams) return &filter->ppPins[index - 1]->pin.pin; return NULL; @@ -1199,28 +1199,27 @@ static void gstdemux_destroy(struct strmbase_filter *iface) CloseHandle(filter->duration_event); /* Don't need to clean up output pins, disconnecting input pin will do that */ - if (filter->sink.peer) + if (filter->sink.pin.peer) { - hr = IPin_Disconnect(filter->sink.peer); + hr = IPin_Disconnect(filter->sink.pin.peer); assert(hr == S_OK); - hr = IPin_Disconnect(&filter->sink.IPin_iface); + hr = IPin_Disconnect(&filter->sink.pin.IPin_iface); assert(hr == S_OK); } - FreeMediaType(&filter->sink.mt); if (filter->alloc) IMemAllocator_Release(filter->alloc); filter->alloc = NULL; if (filter->reader) IAsyncReader_Release(filter->reader); filter->reader = NULL; - filter->sink.IPin_iface.lpVtbl = NULL; if (filter->bus) { gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); gst_object_unref(filter->bus); } + strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); heap_free(filter); } @@ -1351,10 +1350,10 @@ static HRESULT sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE return S_FALSE; } -static const BasePinFuncTable sink_ops = +static const struct strmbase_sink_ops sink_ops = { - .pin_query_accept = sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; static BOOL gstdecoder_init_gst(struct gstdemux *filter) @@ -1437,13 +1436,10 @@ IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *outer, HRESULT *phr) } strmbase_filter_init(&object->filter, outer, &CLSID_Gstreamer_Splitter, &filter_ops); + strmbase_sink_init(&object->sink, &GST_InputPin_Vtbl, &object->filter, + wcsInputPinName, &sink_ops, NULL); object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); - object->sink.dir = PINDIR_INPUT; - object->sink.filter = &object->filter; - lstrcpynW(object->sink.name, wcsInputPinName, ARRAY_SIZE(object->sink.name)); - object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; - object->sink.pFuncsTable = &sink_ops; object->init_gst = gstdecoder_init_gst; *phr = S_OK; @@ -1907,7 +1903,7 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) static inline struct gstdemux *impl_from_sink_IPin(IPin *iface) { - return CONTAINING_RECORD(iface, struct gstdemux, sink.IPin_iface); + return CONTAINING_RECORD(iface, struct gstdemux, sink.pin.IPin_iface); } static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) @@ -1922,7 +1918,7 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, mark_wine_thread(); EnterCriticalSection(&filter->filter.csFilter); - if (!filter->sink.peer) + if (!filter->sink.pin.peer) { ALLOCATOR_PROPERTIES props; IMemAllocator *pAlloc = NULL; @@ -1963,8 +1959,8 @@ static HRESULT WINAPI GSTInPin_ReceiveConnection(IPin *iface, IPin *pReceivePin, if (pAlloc) IMemAllocator_Release(pAlloc); if (SUCCEEDED(hr)) { - CopyMediaType(&filter->sink.mt, pmt); - filter->sink.peer = pReceivePin; + CopyMediaType(&filter->sink.pin.mt, pmt); + filter->sink.pin.peer = pReceivePin; IPin_AddRef(pReceivePin); hr = IMemAllocator_Commit(filter->alloc); } else { @@ -1995,13 +1991,13 @@ static HRESULT WINAPI GSTInPin_Disconnect(IPin *iface) hr = IBaseFilter_GetState(&filter->filter.IBaseFilter_iface, INFINITE, &state); EnterCriticalSection(&filter->filter.csFilter); - if (filter->sink.peer) + if (filter->sink.pin.peer) { if (SUCCEEDED(hr) && state == State_Stopped) { IMemAllocator_Decommit(filter->alloc); - IPin_Disconnect(filter->sink.peer); - IPin_Release(filter->sink.peer); - filter->sink.peer = NULL; + IPin_Disconnect(filter->sink.pin.peer); + IPin_Release(filter->sink.pin.peer); + filter->sink.pin.peer = NULL; hr = GST_RemoveOutputPins(filter); } else hr = VFW_E_NOT_STOPPED; @@ -2220,10 +2216,10 @@ static HRESULT wave_parser_sink_query_accept(struct strmbase_pin *iface, const A return S_FALSE; } -static const BasePinFuncTable wave_parser_sink_ops = +static const struct strmbase_sink_ops wave_parser_sink_ops = { - .pin_query_accept = wave_parser_sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = wave_parser_sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; static BOOL wave_parser_init_gst(struct gstdemux *filter) @@ -2305,12 +2301,8 @@ IUnknown * CALLBACK wave_parser_create(IUnknown *outer, HRESULT *phr) } strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); - - object->sink.dir = PINDIR_INPUT; - object->sink.filter = &object->filter; - lstrcpynW(object->sink.name, sink_name, ARRAY_SIZE(object->sink.name)); - object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; - object->sink.pFuncsTable = &wave_parser_sink_ops; + strmbase_sink_init(&object->sink, &GST_InputPin_Vtbl, &object->filter, + sink_name, &wave_parser_sink_ops, NULL); object->init_gst = wave_parser_init_gst; *phr = S_OK; @@ -2326,10 +2318,10 @@ static HRESULT avi_splitter_sink_query_accept(struct strmbase_pin *iface, const return S_FALSE; } -static const BasePinFuncTable avi_splitter_sink_ops = +static const struct strmbase_sink_ops avi_splitter_sink_ops = { - .pin_query_accept = avi_splitter_sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = avi_splitter_sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; static BOOL avi_splitter_init_gst(struct gstdemux *filter) @@ -2411,13 +2403,9 @@ IUnknown * CALLBACK avi_splitter_create(IUnknown *outer, HRESULT *phr) } strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); - + strmbase_sink_init(&object->sink, &GST_InputPin_Vtbl, &object->filter, + sink_name, &avi_splitter_sink_ops, NULL); object->no_more_pads_event = CreateEventW(NULL, FALSE, FALSE, NULL); - object->sink.dir = PINDIR_INPUT; - object->sink.filter = &object->filter; - lstrcpynW(object->sink.name, sink_name, ARRAY_SIZE(object->sink.name)); - object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; - object->sink.pFuncsTable = &avi_splitter_sink_ops; object->init_gst = avi_splitter_init_gst; *phr = S_OK; @@ -2438,10 +2426,10 @@ static HRESULT mpeg_splitter_sink_query_accept(struct strmbase_pin *iface, const return S_FALSE; } -static const BasePinFuncTable mpeg_splitter_sink_ops = +static const struct strmbase_sink_ops mpeg_splitter_sink_ops = { - .pin_query_accept = mpeg_splitter_sink_query_accept, - .pin_get_media_type = strmbase_pin_get_media_type, + .base.pin_query_accept = mpeg_splitter_sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, }; static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) @@ -2549,14 +2537,11 @@ IUnknown * CALLBACK mpeg_splitter_create(IUnknown *outer, HRESULT *phr) } strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); + strmbase_sink_init(&object->sink, &GST_InputPin_Vtbl, &object->filter, + sink_name, &mpeg_splitter_sink_ops, NULL); object->IAMStreamSelect_iface.lpVtbl = &stream_select_vtbl; object->duration_event = CreateEventW(NULL, FALSE, FALSE, NULL); - object->sink.dir = PINDIR_INPUT; - object->sink.filter = &object->filter; - lstrcpynW(object->sink.name, sink_name, ARRAY_SIZE(object->sink.name)); - object->sink.IPin_iface.lpVtbl = &GST_InputPin_Vtbl; - object->sink.pFuncsTable = &mpeg_splitter_sink_ops; object->init_gst = mpeg_splitter_init_gst; *phr = S_OK; -- 2.24.0

Dec. 11, 2019

[PATCH v2 2/6] qcap/avimux: Use strmbase sink connection methods.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/avimux.c | 71 ++++++++++++++++------------------------------ 1 file changed, 25 insertions(+), 46 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 63e98e8877b..c17d91322bf 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1410,41 +1410,15 @@ static HRESULT WINAPI AviMuxIn_Receive(struct strmbase_sink *base, IMediaSample return hr; } -static const struct strmbase_sink_ops sink_ops = -{ - .base.pin_query_interface = sink_query_interface, - .base.pin_query_accept = sink_query_accept, - .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnReceive = AviMuxIn_Receive, -}; - -static inline AviMux* impl_from_in_IPin(IPin *iface) +static HRESULT avi_mux_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *pmt) { - struct strmbase_pin *pin = CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface); - return impl_from_strmbase_filter(pin->filter); -} - -static inline AviMuxIn* AviMuxIn_from_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, AviMuxIn, pin.pin.IPin_iface); -} - -static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, - IPin *pConnector, const AM_MEDIA_TYPE *pmt) -{ - AviMux *This = impl_from_in_IPin(iface); - AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); + AviMuxIn *avimuxin = impl_sink_from_strmbase_pin(&iface->pin); + AviMux *This = impl_from_strmbase_filter(iface->pin.filter); HRESULT hr; - TRACE("pin %p, pConnector %p, pmt %p.\n", avimuxin, pConnector, pmt); - if(!pmt) return E_POINTER; - hr = BaseInputPinImpl_ReceiveConnection(iface, pConnector, pmt); - if(FAILED(hr)) - return hr; - if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Video) && IsEqualIID(&pmt->formattype, &FORMAT_VideoInfo)) { ALLOCATOR_PROPERTIES req, act; @@ -1468,10 +1442,8 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, hr = IMemAllocator_SetProperties(avimuxin->samples_allocator, &req, &act); if(SUCCEEDED(hr)) hr = IMemAllocator_Commit(avimuxin->samples_allocator); - if(FAILED(hr)) { - BaseInputPinImpl_Disconnect(iface); + if (FAILED(hr)) return hr; - } size = pmt->cbFormat - FIELD_OFFSET(VIDEOINFOHEADER, bmiHeader); avimuxin->strf = CoTaskMemAlloc(sizeof(RIFFCHUNK) + ALIGN(FIELD_OFFSET(BITMAPINFO, bmiColors[vih->bmiHeader.biClrUsed]))); @@ -1489,23 +1461,15 @@ static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, return create_input_pin(This); } -static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) +static void avi_mux_sink_disconnect(struct strmbase_sink *iface) { - AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); + AviMuxIn *avimuxin = impl_sink_from_strmbase_pin(&iface->pin); IMediaSample **prev, *cur; - HRESULT hr; - - TRACE("pin %p.\n", avimuxin); - - hr = BaseInputPinImpl_Disconnect(iface); - if(FAILED(hr)) - return hr; IMemAllocator_Decommit(avimuxin->samples_allocator); while(avimuxin->samples_head) { cur = avimuxin->samples_head; - hr = IMediaSample_GetPointer(cur, (BYTE**)&prev); - if(FAILED(hr)) + if (FAILED(IMediaSample_GetPointer(cur, (BYTE **)&prev))) break; prev--; @@ -1518,7 +1482,22 @@ static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) } CoTaskMemFree(avimuxin->strf); avimuxin->strf = NULL; - return hr; +} + +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = sink_query_interface, + .base.pin_query_accept = sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnReceive = AviMuxIn_Receive, + .sink_connect = avi_mux_sink_connect, + .sink_disconnect = avi_mux_sink_disconnect, +}; + +static inline AviMux* impl_from_in_IPin(IPin *iface) +{ + struct strmbase_pin *pin = CONTAINING_RECORD(iface, struct strmbase_pin, IPin_iface); + return impl_from_strmbase_filter(pin->filter); } static const IPinVtbl AviMuxIn_PinVtbl = { @@ -1526,8 +1505,8 @@ static const IPinVtbl AviMuxIn_PinVtbl = { BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect, - AviMuxIn_ReceiveConnection, - AviMuxIn_Disconnect, + BaseInputPinImpl_ReceiveConnection, + BaseInputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo, -- 2.24.0

Dec. 11, 2019

[PATCH v2 1/6] strmbase: Check for a NULL media type in IPin::ReceiveConnection().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/pin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 5255a6c7b0b..3dd00b27ccc 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -633,6 +633,9 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); strmbase_dump_media_type(pmt); + if (!pmt) + return E_POINTER; + EnterCriticalSection(&This->pin.filter->csFilter); { if (This->pin.filter->state != State_Stopped) -- 2.24.0

Dec. 11, 2019

[PATCH v2 5/5] d3d9: Stop setting the device state when setting the default ZENABLE state.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 48c40f9969..65330deeaf 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1020,8 +1020,6 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->auto_mipmaps = 0; wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, - !!swapchain_desc.enable_auto_depth_stencil); device_reset_viewport_state(device); } @@ -4645,8 +4643,6 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_stateblock_set_render_state(device->state, WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_ZENABLE, !!swapchain_desc->enable_auto_depth_stencil); device_reset_viewport_state(device); if (FAILED(hr = d3d9_device_get_swapchains(device))) -- 2.24.0

Dec. 11, 2019

[PATCH v2 4/5] d3d9: Stop setting the device state in d3d9_device_SetRenderState().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d949fd89b2..48c40f9969 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2303,22 +2303,11 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi D3DRENDERSTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - struct wined3d_color factor; TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); wined3d_stateblock_set_render_state(device->update_state, state, value); - if (!device->recording) - { - if (state == D3DRS_BLENDFACTOR) - { - wined3d_color_from_d3dcolor(&factor, value); - wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); - } - else - wined3d_device_set_render_state(device->wined3d_device, state, value); - } if (state == D3DRS_POINTSIZE && value == WINED3D_RESZ_CODE) wined3d_device_resolve_depth_buffer(device->wined3d_device); wined3d_mutex_unlock(); -- 2.24.0

Dec. 11, 2019

[PATCH v2 3/5] d3d9: Handle multisample depth resolve in d3d9_device_SetRenderState().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Expose a common helper in wined3d to be used for d3d9 and d3d8, and also move the check for format support to d3d9_CheckDeviceFormat(). dlls/d3d9/device.c | 2 ++ dlls/d3d9/directx.c | 14 ++++++++++++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index be9c2a9d5a..d949fd89b2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2319,6 +2319,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi else wined3d_device_set_render_state(device->wined3d_device, state, value); } + if (state == D3DRS_POINTSIZE && value == WINED3D_RESZ_CODE) + wined3d_device_resolve_depth_buffer(device->wined3d_device); wined3d_mutex_unlock(); return D3D_OK; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 1d3754adf8..d7fb30729d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -289,8 +289,18 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, } wined3d_mutex_lock(); - hr = wined3d_check_device_format(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(adapter_format), - usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); + if ((enum wined3d_format_id)format == WINED3DFMT_RESZ) + { + DWORD levels; + hr = wined3d_check_device_multisample_type(d3d9->wined3d, adapter, device_type, + WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NONE, &levels); + if (SUCCEEDED(hr) && !levels) + hr = D3DERR_NOTAVAILABLE; + } + else + hr = wined3d_check_device_format(d3d9->wined3d, adapter, device_type, + wined3dformat_from_d3dformat(adapter_format), usage, bind_flags, + wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index acc915eb55..74dc21046b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1784,7 +1784,7 @@ void CDECL wined3d_device_get_viewports(const struct wined3d_device *device, uns *viewport_count = device->state.viewport_count; } -static void resolve_depth_buffer(struct wined3d_device *device) +void CDECL wined3d_device_resolve_depth_buffer(struct wined3d_device *device) { const struct wined3d_state *state = &device->state; struct wined3d_rendertarget_view *src_view; @@ -1883,7 +1883,7 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) { TRACE("RESZ multisampled depth buffer resolve triggered.\n"); - resolve_depth_buffer(device); + wined3d_device_resolve_depth_buffer(device); } } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8ef442c72..f42d2762c5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -126,6 +126,7 @@ @ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) +@ cdecl wined3d_device_resolve_depth_buffer(ptr) @ cdecl wined3d_device_resolve_sub_resource(ptr ptr long ptr long long) @ cdecl wined3d_device_set_base_vertex_index(ptr long) @ cdecl wined3d_device_set_blend_state(ptr ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8951f92d14..218e5e99f1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2435,6 +2435,7 @@ void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device); HRESULT __cdecl wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state); +void __cdecl wined3d_device_resolve_depth_buffer(struct wined3d_device *device); void __cdecl wined3d_device_resolve_sub_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, unsigned int dst_sub_resource_idx, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, -- 2.24.0

Dec. 11, 2019

[PATCH v2 2/5] d3d9: Apply the device state before executing a draw call.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 82fba25ce7..be9c2a9d5a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1821,6 +1821,7 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); rtv = d3d9_surface_acquire_rendertarget_view(surface_impl); hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, rtv, rect, WINED3DCLEAR_TARGET, &c, 0.0f, 0); @@ -2071,6 +2072,7 @@ static HRESULT WINAPI d3d9_device_Clear(IDirect3DDevice9Ex *iface, DWORD rect_co wined3d_color_from_d3dcolor(&c, color); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); @@ -2654,6 +2656,7 @@ static HRESULT WINAPI d3d9_device_ValidateDevice(IDirect3DDevice9Ex *iface, DWOR TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_validate_device(device->wined3d_device, pass_count); wined3d_mutex_unlock(); @@ -2885,6 +2888,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, 0, start_vertex, vertex_count); d3d9_generate_auto_mipmaps(device); @@ -2917,6 +2921,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface WARN("Called without a valid vertex declaration set.\n"); return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); index_count = vertex_count_from_primitive_count(primitive_type, primitive_count); d3d9_device_upload_sysmem_vertex_buffers(device, base_vertex_idx, min_vertex_idx, vertex_count); d3d9_device_upload_sysmem_index_buffer(device, start_idx, index_count); @@ -3003,6 +3008,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, size); if (FAILED(hr)) goto done; @@ -3119,6 +3125,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; } + wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = d3d9_device_prepare_vertex_buffer(device, vtx_size); if (FAILED(hr)) goto done; @@ -3203,6 +3210,8 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); + wined3d_device_apply_stateblock(device->wined3d_device, device->state); + /* Note that an alternative approach would be to simply create these * buffers with WINED3D_RESOURCE_ACCESS_MAP_R and update them here like we * do for draws. In some regards that would be easier, but it seems less -- 2.24.0

Dec. 11, 2019

[PATCH v2 1/5] wined3d: Introduce wined3d_device_apply_stateblock().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: Push all shader constants in one call, and make use of stateblock changed-state tracking for all other states, as per Matteo's suggestion. dlls/wined3d/device.c | 116 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 118 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8913420724..acc915eb55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3829,6 +3829,122 @@ struct wined3d_texture * CDECL wined3d_device_get_texture(const struct wined3d_d return device->state.textures[stage]; } +void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, + struct wined3d_stateblock *stateblock) +{ + const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const struct wined3d_stateblock_state *state = &stateblock->stateblock_state; + unsigned int i, j; + + TRACE("device %p, stateblock %p.\n", device, stateblock); + + if (stateblock->changed.vertexShader) + wined3d_device_set_vertex_shader(device, state->vs); + if (stateblock->changed.pixelShader) + wined3d_device_set_pixel_shader(device, state->ps); + + wined3d_device_set_vs_consts_f(device, 0, d3d_info->limits.vs_uniform_count, state->vs_consts_f); + wined3d_device_set_vs_consts_b(device, 0, WINED3D_MAX_CONSTS_B, state->vs_consts_b); + wined3d_device_set_vs_consts_i(device, 0, WINED3D_MAX_CONSTS_I, state->vs_consts_i); + wined3d_device_set_ps_consts_f(device, 0, d3d_info->limits.ps_uniform_count, state->ps_consts_f); + wined3d_device_set_ps_consts_b(device, 0, WINED3D_MAX_CONSTS_B, state->ps_consts_b); + wined3d_device_set_ps_consts_i(device, 0, WINED3D_MAX_CONSTS_I, state->ps_consts_i); + + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); + } + } + + for (i = 0; i < ARRAY_SIZE(state->rs); ++i) + { + if (stateblock->changed.renderState[i >> 5] & (1u << (i & 0x1f))) + { + if (i == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, state->rs[i]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, i, state->rs[i]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->texture_states); ++i) + { + for (j = 0; j < ARRAY_SIZE(state->texture_states[i]); ++j) + { + if (stateblock->changed.textureState[i] & (1u << j)) + wined3d_device_set_texture_stage_state(device, i, j, state->texture_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->sampler_states); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + for (j = 0; j < ARRAY_SIZE(state->sampler_states[j]); ++j) + { + if (stateblock->changed.samplerState[i] & (1 << j)) + wined3d_device_set_sampler_state(device, stage, j, state->sampler_states[i][j]); + } + } + + for (i = 0; i < ARRAY_SIZE(state->transforms); ++i) + { + if (stateblock->changed.transform[i >> 5] & (1u << (i & 0x1f))) + wined3d_device_set_transform(device, i, &state->transforms[i]); + } + + if (stateblock->changed.indices) + wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_set_base_vertex_index(device, state->base_vertex_index); + if (stateblock->changed.vertexDecl) + wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + if (stateblock->changed.material) + wined3d_device_set_material(device, &state->material); + if (stateblock->changed.viewport) + wined3d_device_set_viewports(device, 1, &state->viewport); + if (stateblock->changed.scissorRect) + wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (stateblock->changed.streamSource & (1u << i)) + wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); + if (stateblock->changed.streamFreq & (1u << i)) + wined3d_device_set_stream_source_freq(device, i, + state->streams[i].frequency | state->streams[i].flags); + } + + for (i = 0; i < ARRAY_SIZE(state->textures); ++i) + { + DWORD stage = i; + if (stage >= WINED3D_MAX_FRAGMENT_SAMPLERS) + stage += WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS; + if (stateblock->changed.textures & (1u << i)) + wined3d_device_set_texture(device, stage, state->textures[i]); + } + + for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + { + if (stateblock->changed.clipplane & (1u << i)) + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + } + + memset(&stateblock->changed, 0, sizeof(stateblock->changed)); + + TRACE("Applied stateblock %p.\n", stateblock); +} + HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps) { TRACE("device %p, caps %p.\n", device, caps); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e03c57055b..c8ef442c72 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -37,6 +37,7 @@ @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) +@ cdecl wined3d_device_apply_stateblock(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) @ cdecl wined3d_device_clear(ptr long ptr long ptr float long) @ cdecl wined3d_device_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index db88e11032..8951f92d14 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2288,6 +2288,7 @@ struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buf ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); +void __cdecl wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_clear(struct wined3d_device *device, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float z, DWORD stencil); -- 2.24.0

Dec. 11, 2019

Re: [PATCH 3/5] winegstreamer: Use base sink connection methods.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=61839 Your paranoid android. === debian10 (32 bit report) === qcap: Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x7def8d37). Report errors: qcap:qcap crashed (c0000005) === debian10 (32 bit Chinese:China report) === qcap: Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x7e16cd37). Report errors: qcap:qcap crashed (c0000005) === debian10 (32 bit WoW report) === qcap: Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x7e04cd37). Report errors: qcap:qcap crashed (c0000005) === debian10 (64 bit WoW report) === qcap: Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x7e040d37). Report errors: qcap:qcap crashed (c0000005)

Dec. 11, 2019