wine-commits March 2021

2 participants
1163 discussions

Francois Gouget : testbot/TestLauncher: Report missing side-by-side dll version errors.

by Alexandre Julliard

Module: tools Branch: master Commit: a3247a05667b03596f7dac4a57b61c82f6316f22 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a3247a05667b03596f7dac4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:14:55 2021 +0200 testbot/TestLauncher: Report missing side-by-side dll version errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 9f4cdf9..5f05aeb 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -241,6 +241,14 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi */ if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) { + if (GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) + { + Skips++; + printf("%s.c:0: Tests skipped: Side-by-side dll version not found\n", + (*Subtest ? Subtest : "testlauncher")); + *Pid = 0; + return 0; + } Error("CreateProcess failed (error %lu)\n", GetLastError()); ExitProcess(1); }

3 years, 1 month

Francois Gouget : testbot/TestLauncher: Detect missing manifest critical dialogs.

by Alexandre Julliard

Module: tools Branch: master Commit: a08aff7236da1aeaa5b358ca970c1b30a7e29367 URL: https://source.winehq.org/git/tools.git/?a=commit;h=a08aff7236da1aeaa5b358c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:14:53 2021 +0200 testbot/TestLauncher: Detect missing manifest critical dialogs. These happen for side-by-side dlls when the test executable has no manifest and should be reported as a failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index 022f25c..9f4cdf9 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -139,6 +139,7 @@ static BOOL running_on_visible_desktop (void) */ const char *Subtest; +static unsigned Failures = 0; static unsigned Skips = 0; BOOL CALLBACK DumpCriticalErrorDescription(HWND hWnd, LPARAM lParam) @@ -164,6 +165,7 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) const char* TestFileName = (char*)lParam; int Count, TestFileLen; char Buffer[512]; + BOOL IsSkip = TRUE; const char* Reason; /* The window pid does not match the CreateProcess() one so it cannot be @@ -183,22 +185,31 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) Reason = NULL; if (strcmp(Buffer + TestFileLen, " - System Error") == 0) Reason = "missing dll"; + else if (strcmp(Buffer + TestFileLen, " - Unable To Locate Component") == 0) + { + /* Sadly Windows >= 7 reports this as "System Error" */ + Reason = "missing manifest for side-by-side dll"; + IsSkip = FALSE; + } else if (strcmp(Buffer + TestFileLen, " - Entry Point Not Found") == 0) Reason = "missing entry point"; else if (strcmp(Buffer + TestFileLen, " - Ordinal Not Found") == 0) Reason = "missing ordinal"; else if (strncmp(Buffer + TestFileLen, " - ", 3) == 0) - /* Old Windows version used to translate the dialog */ + /* Old Windows versions used to translate the dialog so treat any + * unrecognized critical error as a skip. + */ Reason = "unrecognized critical error"; if (Reason) { - Skips++; + IsSkip ? Skips++ : Failures++; /* An empty test unit name is allowed on the start, summary and done * lines, but not on individual failure / skip lines. */ - printf("%s.c:0: Tests skipped: %s (details below)\n", - (*Subtest ? Subtest : "testlauncher"), Reason); + printf("%s.c:0: %s: %s (details below)\n", + (*Subtest ? Subtest : "testlauncher"), + (IsSkip ? "Tests skipped" : "Test failed"), Reason); printf("| %s\n", Buffer); EnumChildWindows(TopWnd, DumpCriticalErrorDescription, (LPARAM)TopWnd); /* Leave the dialog open so it appears on screenshots */ @@ -249,9 +260,9 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi /* ...instead detect the critical error dialog that pops up */ EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); - if (Skips) + if (Skips || Failures) { - ExitCode = WAIT_OBJECT_0; + ExitCode = Failures ? Failures : WAIT_OBJECT_0; break; } @@ -280,7 +291,8 @@ DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pi if (!TerminateProcess(ProcessInformation.hProcess, 257)) Error("TerminateProcess failed (error %lu)\n", GetLastError()); } - else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) + else if (!Skips && !Failures && + !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) { Error("Could not get the child exit code (error %lu)\n", GetLastError()); ExitCode = 259; @@ -419,8 +431,8 @@ int main(int argc, char *argv[]) fflush(stdout); ExitCode = RunTest(TestExeFileName, CommandLine, TimeOut, &Pid); - if (Skips) - printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", Pid, Subtest, Skips); + if (Failures || Skips) + printf("%04lx:%s: %u tests executed (0 marked as todo, %u failures), %u skipped.\n", Pid, Subtest, Failures, Failures, Skips); printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, Pid, ExitCode, (GetTickCount() - Start) / 1000);

3 years, 1 month

Francois Gouget : testbot/TestLauncher: Add a RunTest() function.

by Alexandre Julliard

Module: tools Branch: master Commit: 6e92cb8730243ed55a27bf595d36cb631d6c45cc URL: https://source.winehq.org/git/tools.git/?a=commit;h=6e92cb8730243ed55a27bf5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:14:47 2021 +0200 testbot/TestLauncher: Add a RunTest() function. This moves running and waiting for the test executable out of main(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/TestLauncher.c | 162 +++++++++++++++++--------------- 1 file changed, 85 insertions(+), 77 deletions(-) diff --git a/testbot/src/TestLauncher/TestLauncher.c b/testbot/src/TestLauncher/TestLauncher.c index b024714..022f25c 100644 --- a/testbot/src/TestLauncher/TestLauncher.c +++ b/testbot/src/TestLauncher/TestLauncher.c @@ -208,6 +208,86 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) return TRUE; } +DWORD Start; + +DWORD RunTest(char *TestExeFileName, char* CommandLine, DWORD TimeOut, DWORD *Pid) +{ + STARTUPINFOA StartupInfo; + PROCESS_INFORMATION ProcessInformation; + DWORD ExitCode, WaitTimeOut; + + StartupInfo.cb = sizeof(STARTUPINFOA); + GetStartupInfoA(&StartupInfo); + StartupInfo.dwFlags |= STARTF_USESTDHANDLES; + StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + /* Unlike WineTest we do not have the luxury of first running the test with + * a --list argument. This means we cannot use SetErrorMode() to check + * whether there are missing dependencies as it could modify the test + * results... + */ + if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) + { + Error("CreateProcess failed (error %lu)\n", GetLastError()); + ExitProcess(1); + } + CloseHandle(ProcessInformation.hThread); + *Pid = ProcessInformation.dwProcessId; + + WaitTimeOut = 100; + ExitCode = WAIT_TIMEOUT; + while (ExitCode == WAIT_TIMEOUT) + { + DWORD Elapsed, Remaining; + + ExitCode = WaitForSingleObject(ProcessInformation.hProcess, WaitTimeOut); + Elapsed = GetTickCount() - Start; + if (ExitCode != WAIT_TIMEOUT || Elapsed > TimeOut) + break; + + /* ...instead detect the critical error dialog that pops up */ + EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); + if (Skips) + { + ExitCode = WAIT_OBJECT_0; + break; + } + + Remaining = TimeOut == INFINITE ? TimeOut : TimeOut - Elapsed; + WaitTimeOut = (Elapsed > 3000) ? Remaining : + (2 * WaitTimeOut < Remaining) ? 2 * WaitTimeOut : + Remaining; + } + + if (ExitCode != WAIT_OBJECT_0) + { + switch (ExitCode) + { + case WAIT_FAILED: + Error("Wait for child failed (error %lu)\n", GetLastError()); + break; + + case WAIT_TIMEOUT: + /* The 'exit code' on the done line identifies timeouts */ + break; + + default: + Error("Unexpected return value %lu from wait for child\n", ExitCode); + break; + } + if (!TerminateProcess(ProcessInformation.hProcess, 257)) + Error("TerminateProcess failed (error %lu)\n", GetLastError()); + } + else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) + { + Error("Could not get the child exit code (error %lu)\n", GetLastError()); + ExitCode = 259; + } + CloseHandle(ProcessInformation.hProcess); + return ExitCode; +} /* * Command line parsing and test running. @@ -216,7 +296,7 @@ BOOL CALLBACK DetectCriticalErrorDialog(HWND TopWnd, LPARAM lParam) int main(int argc, char *argv[]) { int Arg; - DWORD Start, TimeOut, WaitTimeOut; + DWORD TimeOut; BOOL UsageError; char TestExeFullName[MAX_PATH]; char *TestExeFileName; @@ -225,9 +305,7 @@ int main(int argc, char *argv[]) int TestArg; char *CommandLine, *p; int CommandLen; - STARTUPINFOA StartupInfo; - PROCESS_INFORMATION ProcessInformation; - DWORD ExitCode; + DWORD Pid, ExitCode; Name0 = p = argv[0]; while (*p != '\0') @@ -340,82 +418,12 @@ int main(int argc, char *argv[]) printf("%s:%s start -\n", TestName, Subtest); fflush(stdout); - StartupInfo.cb = sizeof(STARTUPINFOA); - GetStartupInfoA(&StartupInfo); - StartupInfo.dwFlags |= STARTF_USESTDHANDLES; - StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); - StartupInfo.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); - StartupInfo.hStdError = GetStdHandle(STD_ERROR_HANDLE); - - /* Unlike WineTest we do not have the luxury of first running the test with - * a --list argument. This means we cannot use SetErrorMode() to check - * whether there are missing dependencies as it could modify the test - * results... - */ - if (! CreateProcessA(NULL, CommandLine, NULL, NULL, TRUE, CREATE_DEFAULT_ERROR_MODE, NULL, NULL, &StartupInfo, &ProcessInformation)) - { - Error("CreateProcess failed (error %lu)\n", GetLastError()); - return 1; - } - CloseHandle(ProcessInformation.hThread); - - WaitTimeOut = 100; - ExitCode = WAIT_TIMEOUT; - while (ExitCode == WAIT_TIMEOUT) - { - DWORD Elapsed, Remaining; - - ExitCode = WaitForSingleObject(ProcessInformation.hProcess, WaitTimeOut); - Elapsed = GetTickCount() - Start; - if (ExitCode != WAIT_TIMEOUT || Elapsed > TimeOut) - break; - - /* ...instead detect the critical error dialog that pops up */ - EnumWindows(DetectCriticalErrorDialog, (LPARAM)TestExeFileName); - if (Skips) - { - ExitCode = WAIT_OBJECT_0; - break; - } - - Remaining = TimeOut == INFINITE ? TimeOut : TimeOut - Elapsed; - WaitTimeOut = (Elapsed > 3000) ? Remaining : - (2 * WaitTimeOut < Remaining) ? 2 * WaitTimeOut : - Remaining; - } - - if (ExitCode != WAIT_OBJECT_0) - { - switch (ExitCode) - { - case WAIT_FAILED: - Error("Wait for child failed (error %lu)\n", GetLastError()); - break; - - case WAIT_TIMEOUT: - /* The 'exit code' on the done line identifies timeouts */ - break; - - default: - Error("Unexpected return value %lu from wait for child\n", ExitCode); - break; - } - if (!TerminateProcess(ProcessInformation.hProcess, 257)) - Error("TerminateProcess failed (error %lu)\n", GetLastError()); - } - else if (!Skips && !GetExitCodeProcess(ProcessInformation.hProcess, &ExitCode)) - { - Error("Could not get the child exit code (error %lu)\n", GetLastError()); - ExitCode = 259; - } - CloseHandle(ProcessInformation.hProcess); - + ExitCode = RunTest(TestExeFileName, CommandLine, TimeOut, &Pid); if (Skips) - printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", ProcessInformation.dwProcessId, Subtest, Skips); + printf("%04lx:%s: 0 tests executed (0 marked as todo, 0 failures), %u skipped.\n", Pid, Subtest, Skips); printf("%s:%s:%04lx done (%ld) in %lds\n", TestName, Subtest, - ProcessInformation.dwProcessId, ExitCode, - (GetTickCount() - Start) / 1000); + Pid, ExitCode, (GetTickCount() - Start) / 1000); return 0; }

3 years, 1 month

Francois Gouget : testbot/reporttest: Add tests for the 'dll versions' block.

by Alexandre Julliard

Module: tools Branch: master Commit: ad7db22ca097738324201b2631de57a2aa18130e URL: https://source.winehq.org/git/tools.git/?a=commit;h=ad7db22ca097738324201b2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 13:13:55 2021 +0200 testbot/reporttest: Add tests for the 'dll versions' block. Exercise handling of the messages dealing with missing dlls, dll loading errors, and dll version detection errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/reporttest/report.template | 20 ++++++++++---------- testbot/src/reporttest/report.testwtbs | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 9624c90..f1dbfd6 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -198,16 +198,16 @@ Dll info: wldap32=5.1.2600.5512 wmiutils=5.1.2600.5512 wmp=11.0.5721.5280 - wpc=dll is missing - ws2_32=5.1.2600.5512 - wscript.exe=5.7.0.18066 - wshom.ocx=5.7.0.18066 - wsnmp32=5.1.2600.5512 - wtsapi32=5.1.2600.5512 - xaudio2_7=dll is missing - xcopy.exe=5.1.2600.5512 - xinput1_3=dll is missing - xmllite=1.0.1018.0 + wpc=dll is native + ws2_32=dll is a stub + wscript.exe=dll is missing + wshom.ocx=dll is missing an ordinal (1.0) + wsnmp32=dll is missing an entrypoint (version not found) + wtsapi32=dll is missing the requested side-by-side version + xaudio2_7=load error 5 + xcopy.exe=version not found + xinput1_3=version error 5 + xmllite=version not present 2 Test output: stub advapi32:cred ----- WTBS Simple test patch diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 104c8ea..7b56e13 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,12 +13,16 @@ with: ----- TestWTBS ----- -p tests.TestFailures 68 +p tests.TestFailures 70 p build.HasTask 0 a wine.log.GrepV ^Applying patch a wine.log.GrepV ^Rebuilding the +g 0 tests.report. +n 0 wpc=dll is native +n 0 xaudio2_7=load error 5 + g 0 tests.report.advapi32 n 0 crypt.c:1: Test failed: Something wrong n 0 crypt_lmhash.c:10: Test failed: Something wrong

3 years, 1 month

Francois Gouget : testbot/PatchUtils: There is no need to migrate the make_* flags.

by Alexandre Julliard

Module: tools Branch: master Commit: 049e1656923eb8685b890b0132af72cabfaab56e URL: https://source.winehq.org/git/tools.git/?a=commit;h=049e1656923eb8685b890b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 12:37:06 2021 +0200 testbot/PatchUtils: There is no need to migrate the make_* flags. They impact the build, and only the build, no matter which patchset part they appear in. This is confirmed by the old code which moved them from $Impacts to $PastImpacts and then back to $Impacts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 796457a..87e4508 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -423,10 +423,7 @@ sub GetPatchImpacts($) $Impacts->{BuildModules} = {}; # Also backup the build-related fields. - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan", - "PatchedRoot", "PatchedModules", "PatchedTests") + foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests") { $PastImpacts->{$Field} = $Impacts->{$Field}; $Impacts->{$Field} = undef; @@ -518,12 +515,6 @@ sub GetPatchImpacts($) # ... even if the patch was in previous parts if ($PastImpacts) { - foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles", - "MakeOpenGL", "MakeRequests", "MakeUnicode", - "MakeVulkan") - { - $Impacts->{$Field} ||= $PastImpacts->{$Field}; - } $Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot}; $Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules}; map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};

3 years, 1 month

Francois Gouget : testbot/WineTest: Always return the mission base name in SetupTest().

by Alexandre Julliard

Module: tools Branch: master Commit: 9713b3645eeccce1701231fe092e5bdc2fbee9a7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=9713b3645eeccce1701231f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 31 12:36:41 2021 +0200 testbot/WineTest: Always return the mission base name in SetupTest(). WineTest runs the tests even if the wineprefix creation failed so developers have as much information as possible. So it needs to know the mission base name either way. The tests will be considered to be failed anyway since the wineprefix creation failure could be caused by the patch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 498b8af..3e13637 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -71,7 +71,6 @@ sub SetupTest($$) if (defined $ErrMessage) { LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; } }

3 years, 1 month

Zebediah Figura : d3d9: Use device->stateblock_state to check for a valid vertex declaration.

by Alexandre Julliard

Module: wine Branch: master Commit: 7c62e6b169f18f4a5d5809490f8aebdb5a9375eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c62e6b169f18f4a5d580949… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:25 2021 -0500 d3d9: Use device->stateblock_state to check for a valid vertex declaration. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 3 +-- dlls/d3d9/device.c | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 03ab10ad01b..dc7c4ca3b1c 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -113,8 +113,7 @@ struct d3d9_device DWORD sysmem_ib : 1; DWORD in_destruction : 1; DWORD in_scene : 1; - DWORD has_vertex_declaration : 1; - DWORD padding : 12; + DWORD padding : 13; DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index fec631e0e67..229fc59521c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3024,7 +3024,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitive(IDirect3DDevice9Ex *iface, iface, primitive_type, start_vertex, primitive_count); wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3057,7 +3057,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitive(IDirect3DDevice9Ex *iface vertex_count, start_idx, primitive_count); wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3143,7 +3143,7 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3260,7 +3260,7 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa wined3d_mutex_lock(); - if (!device->has_vertex_declaration) + if (!device->stateblock_state->vertex_declaration) { wined3d_mutex_unlock(); WARN("Called without a valid vertex declaration set.\n"); @@ -3425,7 +3425,6 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface wined3d_mutex_lock(); wined3d_stateblock_set_vertex_declaration(device->update_state, decl_impl ? decl_impl->wined3d_declaration : NULL); - device->has_vertex_declaration = !!decl_impl; wined3d_mutex_unlock(); return D3D_OK; @@ -3548,7 +3547,6 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) } wined3d_stateblock_set_vertex_declaration(device->update_state, decl); - device->has_vertex_declaration = TRUE; wined3d_mutex_unlock(); return D3D_OK;

3 years, 1 month

Zebediah Figura : d3d11: Use wined3d_device_context_draw().

by Alexandre Julliard

Module: wine Branch: master Commit: 21c77190554390e2a0e8a618d0e1ef1c9651a2f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c77190554390e2a0e8a618… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:24 2021 -0500 d3d11: Use wined3d_device_context_draw(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5f1e52644a2..4c8aa8c854c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -589,13 +589,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexed(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext1 *iface, UINT vertex_count, UINT start_vertex_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, vertex_count %u, start_vertex_location %u.\n", iface, vertex_count, start_vertex_location); wined3d_mutex_lock(); - wined3d_device_draw_primitive(device->wined3d_device, start_vertex_location, vertex_count); + wined3d_device_context_draw(context->wined3d_context, start_vertex_location, vertex_count, 0, 0); wined3d_mutex_unlock(); } @@ -720,7 +720,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawIndexedInstanced(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11DeviceContext1 *iface, UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); TRACE("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " "start_instance_location %u.\n", @@ -728,7 +728,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstanced(ID3D11Device start_instance_location); wined3d_mutex_lock(); - wined3d_device_draw_primitive_instanced(device->wined3d_device, start_vertex_location, + wined3d_device_context_draw(context->wined3d_context, start_vertex_location, instance_vertex_count, start_instance_location, instance_count); wined3d_mutex_unlock(); }

3 years, 1 month

Zebediah Figura : wined3d: Introduce wined3d_device_context_draw().

by Alexandre Julliard

Module: wine Branch: master Commit: 08e8cd1b016ec4c04225688133850a21430392d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08e8cd1b016ec4c042256881… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:23 2021 -0500 wined3d: Introduce wined3d_device_context_draw(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a683f4096f6..71ca6740c37 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2397,6 +2397,18 @@ void CDECL wined3d_device_context_set_stream_output(struct wined3d_device_contex wined3d_buffer_decref(prev_buffer); } +void CDECL wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, + unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count) +{ + struct wined3d_state *state = context->state; + + TRACE("context %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", + context, start_vertex, vertex_count, start_instance, instance_count); + + wined3d_device_context_emit_draw(context, state->primitive_type, state->patch_vertex_count, + 0, start_vertex, vertex_count, start_instance, instance_count, false); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); @@ -4441,12 +4453,9 @@ void CDECL wined3d_device_get_primitive_type(const struct wined3d_device *device HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count) { - struct wined3d_state *state = device->cs->c.state; - TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, - state->patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); + wined3d_device_context_draw(&device->cs->c, start_vertex, vertex_count, 0, 0); return WINED3D_OK; } @@ -4454,13 +4463,10 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device, UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count) { - struct wined3d_state *state = device->cs->c.state; - TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, - 0, start_vertex, vertex_count, start_instance, instance_count, false); + wined3d_device_context_draw(&device->cs->c, start_vertex, vertex_count, start_instance, instance_count); } void CDECL wined3d_device_draw_primitive_instanced_indirect(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3b5945076d6..087a6bead13 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -166,6 +166,7 @@ @ cdecl wined3d_device_update_texture(ptr ptr ptr) @ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_context_draw(ptr long long long long) @ cdecl wined3d_device_context_dispatch(ptr long long long) @ cdecl wined3d_device_context_dispatch_indirect(ptr ptr long) @ cdecl wined3d_device_context_set_blend_state(ptr ptr ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a78590413ac..197a56d1952 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2559,6 +2559,8 @@ void __cdecl wined3d_device_context_dispatch(struct wined3d_device_context *cont unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z); void __cdecl wined3d_device_context_dispatch_indirect(struct wined3d_device_context *context, struct wined3d_buffer *buffer, unsigned int offset); +void __cdecl wined3d_device_context_draw(struct wined3d_device_context *context, unsigned int start_vertex, + unsigned int vertex_count, unsigned int start_instance, unsigned int instance_count); void __cdecl wined3d_device_context_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask); void __cdecl wined3d_device_context_set_constant_buffer(struct wined3d_device_context *context,

3 years, 1 month

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_draw().

by Alexandre Julliard

Module: wine Branch: master Commit: ebf9ca12c1e916774d0d4fafae66b8eb2d02f0e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf9ca12c1e916774d0d4faf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Mar 27 14:34:22 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_draw(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 15 ++++++++------- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 7 ++++--- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 390a97a64d3..cbc97d3614a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1046,15 +1046,16 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); } -void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, - unsigned int index_count, unsigned int start_instance, unsigned int instance_count, bool indexed) +void wined3d_device_context_emit_draw(struct wined3d_device_context *context, + enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, + bool indexed) { - const struct wined3d_d3d_info *d3d_info = &cs->c.device->adapter->d3d_info; - const struct wined3d_state *state = cs->c.state; + const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; + const struct wined3d_state *state = context->state; struct wined3d_cs_draw *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_DRAW; op->primitive_type = primitive_type; op->patch_vertex_count = patch_vertex_count; @@ -1068,7 +1069,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type pri acquire_graphics_pipeline_resources(state, indexed, d3d_info); - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7e123661cdb..a683f4096f6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4445,7 +4445,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT TRACE("device %p, start_vertex %u, vertex_count %u.\n", device, start_vertex, vertex_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, 0, 0, false); return WINED3D_OK; @@ -4459,7 +4459,7 @@ void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", device, start_vertex, vertex_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, 0, start_vertex, vertex_count, start_instance, instance_count, false); } @@ -4490,7 +4490,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic return WINED3DERR_INVALIDCALL; } - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, 0, 0, true); return WINED3D_OK; @@ -4504,7 +4504,7 @@ void CDECL wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device TRACE("device %p, start_idx %u, index_count %u, start_instance %u, instance_count %u.\n", device, start_idx, index_count, start_instance, instance_count); - wined3d_cs_emit_draw(device->cs, state->primitive_type, state->patch_vertex_count, + wined3d_device_context_emit_draw(&device->cs->c, state->primitive_type, state->patch_vertex_count, state->base_vertex_index, start_idx, index_count, start_instance, instance_count, true); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f0205a41c7e..a60c3691c82 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4735,9 +4735,6 @@ void wined3d_cs_emit_clear_unordered_access_view_uint(struct wined3d_cs *cs, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) DECLSPEC_HIDDEN; void wined3d_cs_emit_copy_uav_counter(struct wined3d_cs *cs, struct wined3d_buffer *dst_buffer, unsigned int offset, struct wined3d_unordered_access_view *uav) DECLSPEC_HIDDEN; -void wined3d_cs_emit_draw(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, - unsigned int patch_vertex_count, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, - unsigned int start_instance, unsigned int instance_count, bool indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, bool indexed) DECLSPEC_HIDDEN; @@ -4789,6 +4786,10 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); } +void wined3d_device_context_emit_draw(struct wined3d_device_context *context, + enum wined3d_primitive_type primitive_type, unsigned int patch_vertex_count, int base_vertex_idx, + unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, + bool indexed) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, struct wined3d_blend_state *state, const struct wined3d_color *blend_factor, unsigned int sample_mask) DECLSPEC_HIDDEN;

3 years, 1 month

← Newer
1
2
3
4
5
6
7
...
117
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021