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

Re: [PATCH 3/3] wined3d: Don't initialize system memory for buffers.

by Henri Verbeet

On Wed, 26 Jan 2022 at 17:45, Zebediah Figura (she/her) <zfigura(a)codeweavers.com> wrote: > Of course, although this motivated the patch, it seems like a good idea > regardless. In most cases we don't want SYSMEM for buffer objects, > especially for newer d3d versions, and we should avoid the overhead of > allocating it and keeping it around. > Yes. > It may also be that we want to translate D3DVBCAPS_WRITEONLY into > ~WINED3D_RESOURCE_ACCESS_MAP_R. My limited understanding is that this > doesn't contradict test_vb_writeonly() per se, but rather would only be > a bad idea performance-wise if ddraw applications rely on reading from > such mapped buffers in critical paths. I don't know whether that's the case. > Right, as far as I understand D3DVBCAPS_WRITEONLY, like D3DUSAGE_WRITEONLY in later D3D versions, mostly just affects caching of the mapped memory, somewhat like VK_MEMORY_PROPERTY_HOST_CACHED_BIT in Vulkan. > I left off using it for buffers because it wasn't clear to me that it > was necessary. Thus far we had only found evidence that it was necessary > for textures (and perhaps just swapchain textures?) > I think these were non-swapchain textures in the application that originally motivated clearing textures on creation.

Jan. 27, 2022

Re: [PATCH vkd3d v2] build: Disable crosstests as well if tests are disabled.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- I don't completely understand why there are both BUILD_CROSSTESTS and HAVE_CROSSTEST (maybe one is for automake and the other for autoconf?), but after all if it's not confusing, it's not autotools. And at least it actually seems to block crosstest compilation this time. Il 26/01/22 18:35, Zebediah Figura ha scritto: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > v2: Actually disable them in the makefile. > > Makefile.am | 10 ++++++++++ > configure.ac | 9 +++++---- > 2 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 3b2e7d718..3c3858e8b 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -381,6 +381,9 @@ CLEANFILES += include/private/vkd3d_version.h > dummy-vkd3d-version: > > ## Cross-compile tests > + > +if BUILD_CROSSTESTS > + > cross_implibs = crosslibs/d3d12 > CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include > CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 > @@ -440,6 +443,13 @@ else > crosstest64: > endif > > +else > + > +crosstest32: > +crosstest64: > + > +endif # BUILD_CROSSTESTS > + > .PHONY: crosstest crosstest32 crosstest64 > crosstest: crosstest32 crosstest64 > > diff --git a/configure.ac b/configure.ac > index d296dfd4b..b13858d2d 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -143,13 +143,14 @@ AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"]) > AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"]) > AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"]) > AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"]) > +AM_CONDITIONAL([BUILD_CROSSTESTS], > + [test "x$enable_tests" != "xno" -a $ "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno" $]) > > AC_CONFIG_FILES([Makefile]) > AC_OUTPUT > > dnl Output configuration summary > -AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], > - [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) > +AM_COND_IF([BUILD_CROSSTESTS],[HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) > AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) > > AS_ECHO([" > @@ -166,6 +167,6 @@ AS_ECHO([" > Building documentation: ${HAVE_DOCS} > > Building crosstests: ${HAVE_CROSSTEST}"]) > -AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) > -AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) > +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) > +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) > AS_ECHO([])

Jan. 27, 2022

[tools 2/2] testbot/SetWinLocale: Take keyboard layouts preference order into account.

by Francois Gouget

See for instance the Armenian locale (hy). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 654ec46a41..f725e30fd7 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -661,13 +661,17 @@ sub GetWinKeyboardIds($) } # Look for the locale's keyboard id(s). + my %WinLayouts; foreach my $VName (keys %$Values) { - next if ($VName !~ /^[0-9A-F]{4}:/); - $WinKeyboardIds{$Locale} = [$VName]; - last; + # The value is the keyboard layout's preference order + $WinLayouts{hex($Values->{$VName})} = $VName if ($VName =~ /^[0-9A-F]{4}:/); + } + $WinKeyboardIds{$Locale} = %WinLayouts ? [] : $Keyboards{$Locale}; + foreach my $Index (sort { $a cmp $b } keys %WinLayouts) + { + push @{$WinKeyboardIds{$Locale}}, $WinLayouts{$Index}; } - $WinKeyboardIds{$Locale} ||= $Keyboards{$Locale}; if (!$WinKeyboardIds{$Locale}) { FatalError("could not find the $Locale LCID and keyboard ids. Maybe the locale is not installed?\n"); -- 2.30.2

Jan. 27, 2022

[tools 1/2] testbot/SetWinLocale: Better identify the User Profile locale key.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 42a106b77d..654ec46a41 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -170,6 +170,7 @@ my %Countries = ( "ZA" => 209, # South Africa ); +# Map the locale identifier to the Windows keyboard id my %Keyboards = ( "af-ZA" => ["0436:00000409"], # Afrikaans - South Africa "ar-EG" => ["0c01:00000401"], # Arabic - Egypt @@ -253,6 +254,13 @@ my %Keyboards = ( "zh-TW" => ["0404:00000404"], # Chinese - Taiwan ); +# Some Windows locale names are different and do not match the usual format +my %LocaleInfoKeys = ( + "mn-CN" => "mn-Mong", + "mn-MN" => "mn-Mong-MN", + "zh-CN" => "zh-Hans-CN", +); + # # Command line processing @@ -642,15 +650,17 @@ sub GetWinKeyboardIds($) { my ($Locale) = @_; - # Look for that locale's keyboard id. - # Its first component is the locale's LCID. - my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Locale", "*:*"); + # The locale information is sometimes stored in a key with a non-standard + # name, despite the standard locale name being used everywhere else! + my $Key = $LocaleInfoKeys{$Locale} || $Locale; + my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Key", "*:*"); if (!%$Values) { - my $Lang = $Locale; - $Lang =~ s/-.*$//; - $Values = RegGetValues("$HKCU_USER_PROFILE\\$Lang", "*:*"); + $Key =~ s/-.*$//; + $Values = RegGetValues("$HKCU_USER_PROFILE\\$Key", "*:*"); } + + # Look for the locale's keyboard id(s). foreach my $VName (keys %$Values) { next if ($VName !~ /^[0-9A-F]{4}:/); @@ -663,6 +673,7 @@ sub GetWinKeyboardIds($) FatalError("could not find the $Locale LCID and keyboard ids. Maybe the locale is not installed?\n"); } + # The first component of the keyboard id is the locale's LCID. my $WinLCID = uc($WinKeyboardIds{$Locale}->[0]); $WinLCID =~ s/:.*$//; $WinLCIDs{$Locale} = $WinLCID; -- 2.30.2

Jan. 27, 2022

[PATCH 2/2] setupapi/tests: Add some service installation flags tests.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe this should show that patches 224469 and 224464 are the right thing to do if we want the services to be started after their initial registration, when initializing a prefix. Otherwise I don't see what's wrong in the 224469, 224465, 224464 series. dlls/setupapi/tests/install.c | 188 ++++++++++++++++++++++++++++------ 1 file changed, 157 insertions(+), 31 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 758a0761037..44b7d09d1e5 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -609,13 +609,26 @@ static void test_install_svc_from(void) /* TODO: Test the Flags */ } -static void test_driver_install(void) +static void test_service_install(const char *executable, const char *argument) { - HANDLE handle; + struct + { + const char *add_service_flags; + const char *service_type; + const char *start_type; + DWORD expect_start_error; + } tests[] = + { + {.add_service_flags = "", .service_type = "1", .start_type = "4", .expect_start_error = ERROR_SERVICE_DISABLED}, + {.add_service_flags = "", .service_type = "0x10", .start_type = "2", .expect_start_error = 0}, + {.add_service_flags = "0x800", .service_type = "0x10", .start_type = "2", .expect_start_error = ERROR_SERVICE_ALREADY_RUNNING}, + }; + SC_HANDLE scm_handle, svc_handle; + SERVICE_STATUS status; BOOL ret; char path[MAX_PATH + 9], windir[MAX_PATH], driver[MAX_PATH]; - DWORD attrs; + DWORD i, attrs; /* Minimal stuff needed */ static const char *inf = "[Version]\n" @@ -625,14 +638,15 @@ static void test_driver_install(void) "[DefaultInstall]\n" "CopyFiles=Winetest.DriverFiles\n" "[DefaultInstall.Services]\n" - "AddService=Winetest,,Winetest.Service\n" + "AddService=Winetest,%s,Winetest.Service\n" "[Winetest.Service]\n" - "ServiceBinary=%12%\\winetest.sys\n" - "ServiceType=1\n" - "StartType=4\n" + "ServiceBinary=%%12%%\\winetest.sys %s service\n" + "ServiceType=%s\n" + "StartType=%s\n" "ErrorControl=1\n" "[Winetest.DriverFiles]\n" "winetest.sys"; + char buffer[1024]; /* Bail out if we don't have enough rights */ SetLastError(0xdeadbeef); @@ -649,36 +663,70 @@ static void test_driver_install(void) lstrcpyA(driver, windir); lstrcatA(driver, "\\system32\\drivers\\winetest.sys"); - /* Create a dummy driver file */ - handle = CreateFileA("winetest.sys", GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - CloseHandle(handle); + ret = CopyFileA(executable, "winetest.sys", TRUE); + ok(ret, "CopyFileA failed, error %u\n", GetLastError()); - create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); - run_cmdline("DefaultInstall", 128, path); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("%u", i); - /* Driver should have been installed */ - attrs = GetFileAttributesA(driver); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected driver to exist\n"); + sprintf(buffer, inf, tests[i].add_service_flags, argument, tests[i].service_type, tests[i].start_type); + create_inf_file(inffile, buffer); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); - scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + /* Driver should have been installed */ + attrs = GetFileAttributesA(driver); + ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected driver to exist\n"); - /* Open the service to see if it's really there */ - svc_handle = OpenServiceA(scm_handle, "Winetest", DELETE); - ok(svc_handle != NULL, "Service was not created\n"); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); - SetLastError(0xdeadbeef); - ret = DeleteService(svc_handle); - ok(ret, "Service could not be deleted : %d\n", GetLastError()); + /* Open the service to see if it's really there */ + svc_handle = OpenServiceA(scm_handle, "Winetest", SERVICE_START|SERVICE_STOP|SERVICE_QUERY_STATUS|DELETE); + ok(svc_handle != NULL, "Service was not created\n"); - CloseServiceHandle(svc_handle); - CloseServiceHandle(scm_handle); + ret = StartServiceA(svc_handle, 0, NULL); + if (!tests[i].expect_start_error) + ok(ret, "StartServiceA failed, error %u\n", GetLastError()); + else + { + ok(!ret, "StartServiceA succeeded\n"); + ok(GetLastError() == tests[i].expect_start_error, "got error %u\n", GetLastError()); + } + + ret = QueryServiceStatus(svc_handle, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); + while (status.dwCurrentState == SERVICE_START_PENDING) + { + Sleep(100); + ret = QueryServiceStatus(svc_handle, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); + } + + ret = ControlService(svc_handle, SERVICE_CONTROL_STOP, &status); + while (status.dwCurrentState == SERVICE_STOP_PENDING) + { + Sleep(100); + ret = QueryServiceStatus(svc_handle, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); + } + ok(status.dwCurrentState == SERVICE_STOPPED, "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + ok(ret, "Service could not be deleted : %d\n", GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); + + /* File cleanup */ + DeleteFileA(inffile); + DeleteFileA(driver); + + winetest_pop_context(); + } - /* File cleanup */ - DeleteFileA(inffile); DeleteFileA("winetest.sys"); - DeleteFileA(driver); } static void test_profile_items(void) @@ -2132,11 +2180,89 @@ static void test_register_dlls(void) ok(ret, "Failed to delete test DLL, error %u.\n", GetLastError()); } +static WCHAR service_name[] = L"Wine Test Service"; +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + trace( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + trace( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + trace( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( L"Wine Test Service", service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + trace( "service stopped\n" ); +} + START_TEST(install) { - char temp_path[MAX_PATH], prev_path[MAX_PATH]; + char temp_path[MAX_PATH], prev_path[MAX_PATH], path[MAX_PATH]; + char **argv; DWORD len; + int argc; + argc = winetest_get_mainargs(&argv); + if (argc > 2 && !strcmp( argv[2], "service" )) + { + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { service_name, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return; + } + + GetFullPathNameA(argv[0], ARRAY_SIZE(path), path, NULL); GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path); @@ -2154,7 +2280,7 @@ START_TEST(install) test_registry(); test_install_from(); test_install_svc_from(); - test_driver_install(); + test_service_install(path, argv[1]); test_dirid(); test_install_files_queue(); test_need_media(); -- 2.34.1

Jan. 27, 2022

[PATCH 1/2] setupapi/tests: Add possible test_need_media results for Win10.

by Rémi Bernon

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- PATCH 1 is maybe a bit dubious and could possibly be skipped, I couldn't figure why the copies are sometimes skipped on Win10, and sometimes not. The tests are often failing on the testbot and I just wanted to have them pass for PATCH 2. dlls/setupapi/tests/install.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index c085b724b59..758a0761037 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1120,7 +1120,7 @@ static void test_install_files_queue(void) ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); } -static unsigned int got_need_media, got_copy_error; +static unsigned int got_need_media, got_copy_error, got_start_copy; static unsigned int testmode; static UINT WINAPI need_media_cb(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) @@ -1332,6 +1332,7 @@ static UINT WINAPI need_media_newpath_cb(void *context, UINT message, UINT_PTR p else return FILEOP_SKIP; } + else if (message == SPFILENOTIFY_STARTCOPY) got_start_copy++; return SetupDefaultQueueCallbackA(context, message, param1, param2); } @@ -1901,7 +1902,7 @@ static void test_need_media(void) ok(delete_file("dst/three.txt"), "Destination file should exist.\n"); testmode = 6; - got_need_media = got_copy_error = 0; + got_need_media = got_copy_error = got_start_copy = 0; queue = SetupOpenFileQueue(); ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); copy_params.QueueHandle = queue; @@ -1915,9 +1916,10 @@ static void test_need_media(void) run_queue(queue, need_media_newpath_cb); ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media); ok(!got_copy_error, "Got %u copy errors.\n", got_copy_error); - ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + if (got_start_copy) ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + else ok(!file_exists("dst/one.txt"), "Destination file should not exist.\n"); - got_need_media = got_copy_error = 0; + got_need_media = got_copy_error = got_start_copy = 0; queue = SetupOpenFileQueue(); ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); copy_params.LayoutInf = hinf; @@ -1928,7 +1930,8 @@ static void test_need_media(void) run_queue(queue, need_media_newpath_cb); ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media); ok(!got_copy_error, "Got %u copy errors.\n", got_copy_error); - ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + if (got_start_copy) ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + else ok(!file_exists("dst/one.txt"), "Destination file should not exist.\n"); } else SetupCloseFileQueue(queue); @@ -1963,7 +1966,7 @@ static void test_close_queue(void) SetupTermDefaultQueueCallback(context); } -static unsigned int got_start_copy, start_copy_ret; +static unsigned int start_copy_ret; static UINT WINAPI start_copy_cb(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) { -- 2.34.1

Jan. 27, 2022

Re: [RFC PATCH 1/6] server: Allow calling async_handoff() with status code STATUS_ALERTED.

by Jacek Caban

On 1/27/22 00:52, Zebediah Figura (she/her) wrote: > On 1/23/22 11:29, Jinoh Kang wrote: >> +static int async_add_queue( struct object *obj, struct >> wait_queue_entry *entry ) >> +{ >> + struct async *async = (struct async *)obj; >> + assert( obj->ops == &async_ops ); >> + >> + if (!async->pending && async->terminated && async->alerted) >> + { >> + /* The client has failed to complete synchronously (e.g. >> EWOULDBLOCK). >> + * Restart the async as fully fledged asynchronous I/O, where >> + * the completion port notification and APC call will be >> triggered >> + * appropriately. */ >> + async->pending = 1; >> + >> + /* Unset the signaled flag if the client wants to block on >> this async. */ >> + if (async->blocking) async->signaled = 0; >> + >> + async_set_result( obj, STATUS_PENDING, 0 ); /* kick it off */ >> + } >> + >> + return add_queue( obj, entry ); >> +} >> + > > I'll admit, this kind of thing is why I didn't really want to have to > try to optimize 3 server calls into 2. Asyncs are already really > complicated, in terms of the many paths they can take, and it seems > like no matter what we do they're going to get worse. Did you consider moving whole sock_send() and try_send() to server? We could then have a proper and reliable queue in server socket object and client could just do a regular generic server ioctl. (I didn't really follow closely the conversation, so sorry if I missed something). Thanks, Jacek

Jan. 27, 2022

Re: [PATCH v3 5/5] wdscore: Add stubs for WdsSetupLogMessage[AW].

by Mohamad Al-Jaf

Just realized that I didn't add the first argument in WdsSetupLogMessage. It's supposed to have 11 arguments, not 10. I'll submit a revision. Sorry about that. On Thu, Jan 27, 2022 at 12:32 AM Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> wrote: > Required by the Windows MediaCreationTool21H2. > > Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> > --- > v3: - Rebase patch > - Fix unknown argument names > I changed unknown5 to src after I saw the debug output but got > distracted trying to see if I could figure out the other parameters > and forgot to rename them. > --- > dlls/wdscore/main.c | 28 ++++++++++++++++++++++++++++ > dlls/wdscore/wdscore.spec | 4 ++-- > dlls/wdscore/wdscore_internal.h | 27 +++++++++++++++++++++++++++ > 3 files changed, 57 insertions(+), 2 deletions(-) > > diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c > index 3bd5eed8ec5..bda01772d9f 100644 > --- a/dlls/wdscore/main.c > +++ b/dlls/wdscore/main.c > @@ -74,3 +74,31 @@ LPVOID WINAPI ConstructPartialMsgVW( WdsLogLevel level, > LPCWSTR msg, va_list arg > FIXME( "%u %s - stub\n", level, debugstr_w(msg) ); > return NULL; > } > + > + > +/*********************************************************************** > + * WdsSetupLogMessageA (wdscore.@) > + */ > +HRESULT WINAPI WdsSetupLogMessageA( WdsLogSource log, LPCSTR unknown1, > LPCSTR unknown2, > + ULONG unknown3, LPCSTR unknown4, > LPCSTR src, > + void* ip, ULONG unknown5, void* > unknown6, UINT unknown7 ) > +{ > + FIXME( "%u, %s, %s, %u, %s, %s, %p, %u, %p, %u - stub\n", log, > debugstr_a(unknown1), > + debugstr_a(unknown2), unknown3, debugstr_a(unknown4), > debugstr_a(src), > + ip, unknown5, unknown6, unknown7 ); > + return S_OK; > +} > + > + > +/*********************************************************************** > + * WdsSetupLogMessageW (wdscore.@) > + */ > +HRESULT WINAPI WdsSetupLogMessageW( WdsLogSource log, LPCWSTR unknown1, > LPCWSTR unknown2, > + ULONG unknown3, LPCWSTR unknown4, > LPCWSTR src, > + void* ip, ULONG unknown5, void* > unknown6, UINT unknown7 ) > +{ > + FIXME( "%u, %s, %s, %u, %s, %s, %p, %u, %p, %u - stub\n", log, > debugstr_w(unknown1), > + debugstr_w(unknown2), unknown3, debugstr_w(unknown4), > debugstr_w(src), > + ip, unknown5, unknown6, unknown7 ); > + return S_OK; > +} > diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec > index b14778001a8..18de37d1ed7 100644 > --- a/dlls/wdscore/wdscore.spec > +++ b/dlls/wdscore/wdscore.spec > @@ -150,8 +150,8 @@ > @ stub WdsSetUILanguage > @ stub WdsSetupLogDestroy > @ stub WdsSetupLogInit > -@ stub WdsSetupLogMessageA > -@ stub WdsSetupLogMessageW > +@ stdcall WdsSetupLogMessageA(long str str long str str ptr long ptr long) > +@ stdcall WdsSetupLogMessageW(long wstr wstr long wstr wstr ptr long ptr > long) > @ stub WdsSubscribeEx > @ stub WdsTerminate > @ stub WdsUnlockExecutionGroup > diff --git a/dlls/wdscore/wdscore_internal.h > b/dlls/wdscore/wdscore_internal.h > index b5cbe3c8c25..f029023f8ce 100644 > --- a/dlls/wdscore/wdscore_internal.h > +++ b/dlls/wdscore/wdscore_internal.h > @@ -19,6 +19,33 @@ > #ifndef __WDSCORE_INTERNAL_H > #define __WDSCORE_INTERNAL_H > > +typedef enum _WdsLogSource { > + WdsLogSourceDPX = 0x1000000, > + WdsLogSourceCBS = 0x2000000, > + WdsLogSourceCSI = 0x1800000, > + WdsLogSourceSXS = 0x2800000, > + WdsLogSourceCMI = 0x3000000, > + WdsLogSourceDEPLOY = 0x4000000, > + WdsLogSourceDU = 0x5000000, > + WdsLogSourceIBS = 0x6000000, > + WdsLogSourceIBSLIB = 0x6400000, > + WdsLogSourceDIAG = 0x7000000, > + WdsLogSourceDIAGER = 0x7400000, > + WdsLogSourceMIG = 0x8000000, > + WdsLogSourceHWARE = 0x8400000, > + WdsLogSourceMIGUI = 0x8800000, > + WdsLogSourceUI = 0xA000000, > + WdsLogSourceCONX = 0xA400000, > + WdsLogSourceMOUPG = 0xA800000, > + WdsLogSourceWDS = 0xB000000, > + WdsLogSourceDISM = 0xB800000, > + WdsLogSourcePANTHR = 0x9000000, > + WdsLogSourceWINPE = 0xC000000, > + WdsLogSourceSP = 0xC800000, > + WdsLogSourceLIB = 0xD000000, > + WdsLogSourceTOOL = 0xE000000 > +} WdsLogSource; > + > typedef enum _WdsLogLevel { > WdsLogLevelAssert = 0x0000000, > WdsLogLevelFatalError = 0x1000000, > -- > 2.35.0 > >

Jan. 27, 2022

Re: [PATCH v3 2/5] mf/tests: Add some WMA decoder GetOutputStreamInfo tests.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 27, 2022

Re: [PATCH v3 1/5] mf/tests: Add some WMA decoder GetInputStreamInfo tests.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 27, 2022