February 2023 - Wine-commits

Michael Stefaniuc : ntdll/tests: Remove some Vista broken broken(<constant>) calls.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: c1fb8fe23e2772bba86e58e8f254e6aa08d89989 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1fb8fe23e2772bba86e58e8f254e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 7 19:30:35 2023 +0100 ntdll/tests: Remove some Vista broken broken(<constant>) calls. One of them still needs a broken() for some Win8 machines. --- dlls/ntdll/tests/info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 192f6be7ce9..cf074076c96 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -199,7 +199,7 @@ static void test_query_basic(void) "info is different\n" ); } #else - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), /* vista */ + ok( status == STATUS_INVALID_INFO_CLASS || broken(status == STATUS_SUCCESS), /* some Win8 */ "got %08lx\n", status); status = pRtlGetNativeSystemInformation( SystemNativeBasicInformation, &sbi3, sizeof(sbi3), &ReturnLength ); ok( !status || status == STATUS_INFO_LENGTH_MISMATCH || @@ -3219,9 +3219,9 @@ static void test_ThreadEnableAlignmentFaultFixup(void) dummy = 0; status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG), NULL ); - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); + ok( status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); status = NtQueryInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, 1, NULL ); - ok( status == STATUS_INVALID_INFO_CLASS || broken(STATUS_NOT_IMPLEMENTED), "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); + ok( status == STATUS_INVALID_INFO_CLASS, "Expected STATUS_INVALID_INFO_CLASS, got %08lx\n", status ); dummy = 1; status = pNtSetInformationThread( GetCurrentThread(), ThreadEnableAlignmentFaultFixup, &dummy, sizeof(ULONG) );

1 0

Brendan Shanks : loader: In macOS preloader, fix an environment variable sometimes being lost.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 36bb7175c14c887d8ebd73958fa69987181c1eb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/36bb7175c14c887d8ebd73958fa699… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Feb 6 16:02:50 2023 -0800 loader: In macOS preloader, fix an environment variable sometimes being lost. --- loader/preloader_mac.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 5df185d0960..ce7a14e17ae 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -619,25 +619,22 @@ static inline void get_dyld_func( const char *name, void **func ) static void fixup_stack( void *stack ) { int *pargc; - char **argv, **env, **apple, **apple_end; + char **argv, **env_new; + static char dummyvar[] = "WINEPRELOADERDUMMYVAR=1"; pargc = stack; argv = (char **)pargc + 1; - env = &argv[*pargc-1] + 2; - - apple = env; - while (*apple) - apple++; - apple++; - - apple_end = apple; - while (*apple_end) - apple_end++; - apple_end++; - /* decrement argc, and move all the data between &argv[1] and apple_end down to start at &argv[0] */ + /* decrement argc, and "remove" argv[0] */ *pargc = *pargc - 1; - memmove(&argv[0], &argv[1], (char *)apple_end - (char *)&argv[1]); + memmove( &argv[0], &argv[1], (*pargc + 1) * sizeof(char *) ); + + env_new = &argv[*pargc-1] + 2; + /* In the launched binary on some OSes, _NSGetEnviron() returns + * the original 'environ' pointer, so env_new[0] would be ignored. + * Put a dummy variable in env_new[0], so nothing is lost in this case. + */ + env_new[0] = dummyvar; } static void set_program_vars( void *stack, void *mod )

1 0

Huw Davies : rpcrt4/tests: Remove a failing test.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: fc6af061faf1dadeb4193a91a0d7145d10bbb54f URL: https://gitlab.winehq.org/wine/wine/-/commit/fc6af061faf1dadeb4193a91a0d714… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 16 07:53:10 2023 +0000 rpcrt4/tests: Remove a failing test. --- dlls/rpcrt4/tests/rpc.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index a4653fd603f..2a3d43cfc2d 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -158,41 +158,27 @@ static void test_UuidFromString(void) static void test_DceErrorInqTextA(void) { char bufferInvalid [1024]; - char buffer [1024]; /* The required size is not documented but would - * appear to be 256. - */ + char buffer [1024]; DWORD dwCount; + RPC_STATUS status; dwCount = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, ARRAY_SIZE(bufferInvalid), NULL); + ok(dwCount, "Cannot set up for DceErrorInqText\n"); - /* A random sample of DceErrorInqText */ /* 0 is success */ - ok ((DceErrorInqTextA (0, (unsigned char*)buffer) == RPC_S_OK), - "DceErrorInqTextA(0...)\n"); - /* A real RPC_S error */ - ok ((DceErrorInqTextA (RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer) == RPC_S_OK), - "DceErrorInqTextA(valid...)\n"); + status = DceErrorInqTextA(0, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); - if (dwCount) - { - /* A message for which FormatMessage should fail - * which should return RPC_S_OK and the - * fixed "not valid" message - */ - ok ((DceErrorInqTextA (35, (unsigned char*)buffer) == RPC_S_OK && - strcmp (buffer, bufferInvalid) == 0), - "DceErrorInqTextA(unformattable...)\n"); - /* One for which FormatMessage should succeed but - * DceErrorInqText should "fail" - * 3814 is generally quite a long message - */ - ok ((DceErrorInqTextA (3814, (unsigned char*)buffer) == RPC_S_OK && - strcmp (buffer, bufferInvalid) == 0), - "DceErrorInqTextA(deviation...)\n"); - } - else - ok (0, "Cannot set up for DceErrorInqText\n"); + /* A real RPC_S error */ + status = DceErrorInqTextA(RPC_S_INVALID_STRING_UUID, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); + + /* A message for which FormatMessage should fail which should return RPC_S_OK and the + * fixed "not valid" message */ + status = DceErrorInqTextA(35, (unsigned char*)buffer); + ok(status == RPC_S_OK, "got %lx\n", status); + ok(!strcmp(buffer, bufferInvalid), "got %s vs %s\n", wine_dbgstr_a(buffer), wine_dbgstr_a(bufferInvalid)); } static RPC_DISPATCH_FUNCTION IFoo_table[] =

1 0

Zebediah Figura : setupapi/tests: Add tests for FLG_ADDREG_APPEND.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: d7c8279c08c25e2afddb33184522386e928d5497 URL: https://gitlab.winehq.org/wine/wine/-/commit/d7c8279c08c25e2afddb3318452238… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 19:24:26 2023 -0600 setupapi/tests: Add tests for FLG_ADDREG_APPEND. --- dlls/setupapi/tests/install.c | 100 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 2bbcbec88dc..0334450dfce 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2297,6 +2297,105 @@ static void test_rename(void) ok(ret, "Failed to delete directory, error %lu.\n", GetLastError()); } +static void test_append_reg(void) +{ + static const char inf_data[] = "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "AddReg=reg_section\n" + "[reg_section]\n" + "HKCU,Software\\winetest_setupapi,value,0x10008,\"data\"\n"; + + void *context = SetupInitDefaultQueueCallbackEx(NULL, INVALID_HANDLE_VALUE, 0, 0, 0); + char path[MAX_PATH]; + DWORD type, size; + char value[20]; + HINF hinf; + BOOL ret; + HKEY key; + LONG l; + + create_inf_file("test.inf", inf_data); + sprintf(path, "%s\\test.inf", CURR_DIR); + hinf = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "Failed to open INF file, error %#lx.\n", GetLastError()); + + /* Key doesn't exist yet. */ + + RegDeleteKeyA(HKEY_CURRENT_USER, "winetest_setupapi"); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#lx.\n", GetLastError()); + + l = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\winetest_setupapi", &key); + ok(!l, "Got error %lu.\n", l); + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + todo_wine ok(!l, "Got error %lu.\n", l); + if (!l) + { + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "data\0", size), "Got data %s.\n", debugstr_an(value, size)); + } + + /* Key exists and already has a value. */ + + l = RegSetValueExA(key, "value", 0, REG_MULTI_SZ, (const BYTE *)"foo\0bar\0", sizeof("foo\0bar\0")); + ok(!l, "Got error %lu.\n", l); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#lx.\n", GetLastError()); + + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + ok(!l, "Got error %lu.\n", l); + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("foo\0bar\0data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "foo\0bar\0data\0", size), "Got data %s.\n", debugstr_an(value, size)); + + /* Key exists and already has the value to be added. */ + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + ok(ret, "Failed to install, error %#lx.\n", GetLastError()); + + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + ok(!l, "Got error %lu.\n", l); + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("foo\0bar\0data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "foo\0bar\0data\0", size), "Got data %s.\n", debugstr_an(value, size)); + + /* Key exists and already has a value of the wrong type. */ + + l = RegSetValueExA(key, "value", 0, REG_SZ, (const BYTE *)"string", sizeof("string")); + ok(!l, "Got error %lu.\n", l); + + ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, + NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); + todo_wine ok(!ret, "Expected failure.\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); + + size = sizeof(value); + l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); + ok(!l, "Got error %lu.\n", l); + ok(type == REG_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("string"), "Got size %lu.\n", size); + ok(!memcmp(value, "string", size), "Got data %s.\n", debugstr_an(value, size)); + + RegCloseKey(key); + + l = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\winetest_setupapi"); + ok(!l, "Got error %lu.\n", l); + + SetupCloseInfFile(hinf); + ret = DeleteFileA("test.inf"); + ok(ret, "Failed to delete INF file, error %lu.\n", GetLastError()); +} + static WCHAR service_name[] = L"Wine Test Service"; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; @@ -2406,6 +2505,7 @@ START_TEST(install) test_start_copy(); test_register_dlls(); test_rename(); + test_append_reg(); UnhookWindowsHookEx(hhook);

1 0

Zebediah Figura : setupapi: Fail installation when trying to append to a registry value of the wrong type.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 0ab56b88dfdca442ab0820eacc14f6397f628924 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ab56b88dfdca442ab0820eacc14f6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 19:36:49 2023 -0600 setupapi: Fail installation when trying to append to a registry value of the wrong type. --- dlls/setupapi/install.c | 29 ++++++++++++++++++++++------- dlls/setupapi/tests/install.c | 4 ++-- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 532ac6c36a6..435918e815e 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdbool.h> #define COBJMACROS @@ -227,17 +228,26 @@ static HKEY get_root_key( const WCHAR *name, HKEY def_root ) * * Append a multisz string to a multisz registry value. */ -static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *strings, +static bool append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *strings, DWORD str_size ) { DWORD size, type, total; WCHAR *buffer, *p; - if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return; - if (type != REG_MULTI_SZ) return; + if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return true; + if (type != REG_MULTI_SZ) + { + WARN( "value %s exists but has wrong type %#lx\n", debugstr_w(value), type ); + SetLastError( ERROR_INVALID_DATA ); + return false; + } - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size + str_size) * sizeof(WCHAR) ))) return; - if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) goto done; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, (size + str_size) * sizeof(WCHAR) ))) return false; + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &size )) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return false; + } /* compare each string against all the existing ones */ total = size; @@ -261,8 +271,9 @@ static void append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s TRACE( "setting value %s to %s\n", debugstr_w(value), debugstr_w(buffer) ); RegSetValueExW( hkey, value, 0, REG_MULTI_SZ, (BYTE *)buffer, total ); } - done: + HeapFree( GetProcessHeap(), 0, buffer ); + return true; } @@ -374,7 +385,11 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context if (flags & FLG_ADDREG_APPEND) { if (!str) return TRUE; - append_multi_sz_value( hkey, value, str, size ); + if (!append_multi_sz_value( hkey, value, str, size )) + { + HeapFree( GetProcessHeap(), 0, str ); + return FALSE; + } HeapFree( GetProcessHeap(), 0, str ); return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 0334450dfce..10c93482ece 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2376,8 +2376,8 @@ static void test_append_reg(void) ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_REGISTRY, NULL, "C:\\", 0, SetupDefaultQueueCallbackA, context, NULL, NULL); - todo_wine ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_DATA, "Got error %#lx.\n", GetLastError()); size = sizeof(value); l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size);

1 0

Zebediah Figura : setupapi: Create the registry value if it doesn't exist in append_multi_sz_value().
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: 38e36e8fdaf6dc682ce5af7b5b00cb795fffd967 URL: https://gitlab.winehq.org/wine/wine/-/commit/38e36e8fdaf6dc682ce5af7b5b00cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 19:43:08 2023 -0600 setupapi: Create the registry value if it doesn't exist in append_multi_sz_value(). --- dlls/setupapi/install.c | 21 ++++++++++++++++++++- dlls/setupapi/tests/install.c | 11 ++++------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 435918e815e..8a28bfcc4e1 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -233,8 +233,27 @@ static bool append_multi_sz_value( HKEY hkey, const WCHAR *value, const WCHAR *s { DWORD size, type, total; WCHAR *buffer, *p; + LONG ret; + + if ((ret = RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ))) + { + if (ret != ERROR_FILE_NOT_FOUND) + { + ERR( "failed to query value %s, error %lu\n", debugstr_w(value), ret ); + SetLastError( ret ); + return false; + } + + if ((ret = RegSetValueExW( hkey, value, 0, REG_MULTI_SZ, (BYTE *)strings, str_size * sizeof(WCHAR) ))) + { + ERR( "failed to set value %s, error %lu\n", debugstr_w(value), ret ); + SetLastError( ret ); + return false; + } + + return true; + } - if (RegQueryValueExW( hkey, value, NULL, &type, NULL, &size )) return true; if (type != REG_MULTI_SZ) { WARN( "value %s exists but has wrong type %#lx\n", debugstr_w(value), type ); diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 10c93482ece..318f1294210 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -2332,13 +2332,10 @@ static void test_append_reg(void) ok(!l, "Got error %lu.\n", l); size = sizeof(value); l = RegQueryValueExA(key, "value", NULL, &type, (BYTE *)value, &size); - todo_wine ok(!l, "Got error %lu.\n", l); - if (!l) - { - ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); - ok(size == sizeof("data\0"), "Got size %lu.\n", size); - ok(!memcmp(value, "data\0", size), "Got data %s.\n", debugstr_an(value, size)); - } + ok(!l, "Got error %lu.\n", l); + ok(type == REG_MULTI_SZ, "Got type %#lx.\n", type); + ok(size == sizeof("data\0"), "Got size %lu.\n", size); + ok(!memcmp(value, "data\0", size), "Got data %s.\n", debugstr_an(value, size)); /* Key exists and already has a value. */

1 0

Zebediah Figura : wine.inf: Always use FLG_ADDREG_APPEND for SvcHost entries.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: c08310a8822ecb0829c5967e6892525eec61f46c URL: https://gitlab.winehq.org/wine/wine/-/commit/c08310a8822ecb0829c5967e689252… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 6 20:08:30 2023 -0600 wine.inf: Always use FLG_ADDREG_APPEND for SvcHost entries. Now that FLG_ADDREG_APPEND is changed to correctly create the value if it doesn't exist, this is safe, and less error-prone when adding new services. --- loader/wine.inf.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3c9cb9bc6dc..58013064753 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2370,15 +2370,15 @@ ErrorControl=1 [BITSServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\qmgr.dll" -HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010000,"BITS" +HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"BITS" [EventLogServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wevtsvc.dll" -HKLM,%CurrentVersionNT%\SvcHost,"LocalServiceNetworkRestricted",0x00010000,"EventLog" +HKLM,%CurrentVersionNT%\SvcHost,"LocalServiceNetworkRestricted",0x00010008,"EventLog" [StiServiceKeys] HKR,Parameters,"ServiceDll",,"%11%\wiaservc.dll" -HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010000,"StiSvc" +HKLM,%CurrentVersionNT%\SvcHost,"imgsvc",0x00010008,"StiSvc" [PlugPlayService] Description="Enables automatic configuration of devices"

1 0

Zebediah Figura : scardsvr: Add stub service.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: wine Branch: master Commit: aff181e6d9c352182ef44e917af47c8be8571d3b URL: https://gitlab.winehq.org/wine/wine/-/commit/aff181e6d9c352182ef44e917af47c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jan 29 16:07:51 2023 -0600 scardsvr: Add stub service. The Rutoken driver installer tries to start this service, and fails if it doesn't exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54396 --- configure | 2 ++ configure.ac | 1 + dlls/scardsvr/Makefile.in | 5 +++ dlls/scardsvr/scardsvr.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ dlls/scardsvr/scardsvr.spec | 3 ++ loader/wine.inf.in | 17 +++++++++ 6 files changed, 116 insertions(+) diff --git a/configure b/configure index 759a59410df..25bffe3c8eb 100755 --- a/configure +++ b/configure @@ -1358,6 +1358,7 @@ enable_sane_ds enable_sapi enable_sas enable_scarddlg +enable_scardsvr enable_sccbase enable_schannel enable_schedsvc @@ -21590,6 +21591,7 @@ wine_fn_config_makefile dlls/sapi enable_sapi wine_fn_config_makefile dlls/sapi/tests enable_tests wine_fn_config_makefile dlls/sas enable_sas wine_fn_config_makefile dlls/scarddlg enable_scarddlg +wine_fn_config_makefile dlls/scardsvr enable_scardsvr wine_fn_config_makefile dlls/sccbase enable_sccbase wine_fn_config_makefile dlls/schannel enable_schannel wine_fn_config_makefile dlls/schannel/tests enable_tests diff --git a/configure.ac b/configure.ac index 2b0e0eaccff..8a6d21702cc 100644 --- a/configure.ac +++ b/configure.ac @@ -2961,6 +2961,7 @@ WINE_CONFIG_MAKEFILE(dlls/sapi) WINE_CONFIG_MAKEFILE(dlls/sapi/tests) WINE_CONFIG_MAKEFILE(dlls/sas) WINE_CONFIG_MAKEFILE(dlls/scarddlg) +WINE_CONFIG_MAKEFILE(dlls/scardsvr) WINE_CONFIG_MAKEFILE(dlls/sccbase) WINE_CONFIG_MAKEFILE(dlls/schannel) WINE_CONFIG_MAKEFILE(dlls/schannel/tests) diff --git a/dlls/scardsvr/Makefile.in b/dlls/scardsvr/Makefile.in new file mode 100644 index 00000000000..c89e86c17d8 --- /dev/null +++ b/dlls/scardsvr/Makefile.in @@ -0,0 +1,5 @@ +MODULE = scardsvr.dll +IMPORTS = advapi32 + +C_SRCS = \ + scardsvr.c diff --git a/dlls/scardsvr/scardsvr.c b/dlls/scardsvr/scardsvr.c new file mode 100644 index 00000000000..5c4e26f5362 --- /dev/null +++ b/dlls/scardsvr/scardsvr.c @@ -0,0 +1,88 @@ +/* + * Smart card service + * + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winsvc.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winscard); + +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler(DWORD ctrl, DWORD event_type, void *event_data, void *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 ERROR_SUCCESS; + + default: + FIXME("Got unknown control %#lx.\n", ctrl); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(service_handle, &status); + return ERROR_SUCCESS; + } +} + +void WINAPI CalaisMain(DWORD argc, WCHAR **argv) +{ + SERVICE_STATUS status; + + TRACE("Starting service.\n"); + + stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); + + if (!(service_handle = RegisterServiceCtrlHandlerExW(L"scardsvr", service_handler, NULL))) + 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"); +} diff --git a/dlls/scardsvr/scardsvr.spec b/dlls/scardsvr/scardsvr.spec new file mode 100644 index 00000000000..c33a1aa6569 --- /dev/null +++ b/dlls/scardsvr/scardsvr.spec @@ -0,0 +1,3 @@ +@ stdcall -private CalaisMain(long ptr) +@ stub InitSmartCardService +# @ stub SvchostPushServiceGlobals diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 58013064753..a306b07dc26 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -171,6 +171,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -190,6 +191,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -209,6 +211,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -228,6 +231,7 @@ AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService +AddService=scardsvr,0,ScardSvrService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices @@ -2321,6 +2325,19 @@ ServiceType=32 StartType=3 ErrorControl=1 +[ScardSvrService] +AddReg=ScardSvrServiceKeys +DisplayName="Smart card server" +ServiceBinary="%11%\svchost.exe -k netsvcs" +ServiceType=32 +StartType=3 +ErrorControl=1 + +[ScardSvrServiceKeys] +HKR,Parameters,"ServiceDll",,"%11%\scardsvr.dll" +HKR,Parameters,"ServiceMain",,"CalaisMain" +HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"scardsvr" + [SpoolerService] AddReg=SpoolerServiceKeys Description="Loads files to memory for later printing"

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename 'component_count' arguments to 'reg_size'.
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: vkd3d Branch: master Commit: 0ecac994d013be040d3cae48f430397fbf9828b3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ecac994d013be040d3cae48f4303… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Feb 6 12:05:32 2023 -0300 vkd3d-shader/hlsl: Rename 'component_count' arguments to 'reg_size'. component_count will be used in the next patch for the actual number of components of the type and not its register size. --- libs/vkd3d-shader/hlsl_codegen.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 308e3dae..1ccb006d 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2131,7 +2131,7 @@ struct liveness }; static unsigned int get_available_writemask(struct liveness *liveness, - unsigned int first_write, unsigned int component_idx, unsigned int component_count) + unsigned int first_write, unsigned int component_idx, unsigned int reg_size) { unsigned int i, writemask = 0, count = 0; @@ -2140,7 +2140,7 @@ static unsigned int get_available_writemask(struct liveness *liveness, if (liveness->regs[component_idx + i].last_read <= first_write) { writemask |= 1u << i; - if (++count == component_count) + if (++count == reg_size) return writemask; } } @@ -2161,21 +2161,21 @@ static bool resize_liveness(struct hlsl_ctx *ctx, struct liveness *liveness, siz } static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct liveness *liveness, - unsigned int first_write, unsigned int last_read, unsigned int component_count) + unsigned int first_write, unsigned int last_read, unsigned int reg_size) { unsigned int component_idx, writemask, i; struct hlsl_reg ret = {0}; for (component_idx = 0; component_idx < liveness->size; component_idx += 4) { - if ((writemask = get_available_writemask(liveness, first_write, component_idx, component_count))) + if ((writemask = get_available_writemask(liveness, first_write, component_idx, reg_size))) break; } if (component_idx == liveness->size) { if (!resize_liveness(ctx, liveness, component_idx + 4)) return ret; - writemask = (1u << component_count) - 1; + writemask = (1u << reg_size) - 1; } for (i = 0; i < 4; ++i) { @@ -2190,11 +2190,11 @@ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct liveness * } static bool is_range_available(struct liveness *liveness, unsigned int first_write, - unsigned int component_idx, unsigned int component_count) + unsigned int component_idx, unsigned int reg_size) { unsigned int i; - for (i = 0; i < component_count; i += 4) + for (i = 0; i < reg_size; i += 4) { if (!get_available_writemask(liveness, first_write, component_idx + i, 4)) return false; @@ -2203,7 +2203,7 @@ static bool is_range_available(struct liveness *liveness, unsigned int first_wri } static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liveness, - unsigned int first_write, unsigned int last_read, unsigned int component_count) + unsigned int first_write, unsigned int last_read, unsigned int reg_size) { unsigned int i, component_idx; struct hlsl_reg ret = {0}; @@ -2211,17 +2211,17 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv for (component_idx = 0; component_idx < liveness->size; component_idx += 4) { if (is_range_available(liveness, first_write, component_idx, - min(component_count, liveness->size - component_idx))) + min(reg_size, liveness->size - component_idx))) break; } - if (!resize_liveness(ctx, liveness, component_idx + component_count)) + if (!resize_liveness(ctx, liveness, component_idx + reg_size)) return ret; - for (i = 0; i < component_count; ++i) + for (i = 0; i < reg_size; ++i) liveness->regs[component_idx + i].last_read = last_read; ret.id = component_idx / 4; ret.allocated = true; - liveness->reg_count = max(liveness->reg_count, ret.id + align(component_count, 4)); + liveness->reg_count = max(liveness->reg_count, ret.id + align(reg_size, 4)); return ret; }

1 0

Francisco Casas : vkd3d-shader/hlsl: Expect component count in allocate_register().
by Alexandre Julliard 08 Feb '23

08 Feb '23

Module: vkd3d Branch: master Commit: 6b4a4c4c6dfecdd417fad282461f6f2ccb29345d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6b4a4c4c6dfecdd417fad282461f6… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Feb 6 13:17:32 2023 -0300 vkd3d-shader/hlsl: Expect component count in allocate_register(). This in order to set the correct writemasks for SM1 registers. --- libs/vkd3d-shader/hlsl_codegen.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 1ccb006d..83b4c6b6 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2160,12 +2160,18 @@ static bool resize_liveness(struct hlsl_ctx *ctx, struct liveness *liveness, siz return true; } +/* reg_size is the number of register components to be reserved, while component_count is the number + * of components for the register's writemask. In SM1, floats and vectors allocate the whole + * register, even if they don't use it completely. */ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct liveness *liveness, - unsigned int first_write, unsigned int last_read, unsigned int reg_size) + unsigned int first_write, unsigned int last_read, unsigned int reg_size, + unsigned int component_count) { unsigned int component_idx, writemask, i; struct hlsl_reg ret = {0}; + assert(component_count <= reg_size); + for (component_idx = 0; component_idx < liveness->size; component_idx += 4) { if ((writemask = get_available_writemask(liveness, first_write, component_idx, reg_size))) @@ -2183,7 +2189,7 @@ static struct hlsl_reg allocate_register(struct hlsl_ctx *ctx, struct liveness * liveness->regs[component_idx + i].last_read = last_read; } ret.id = component_idx / 4; - ret.writemask = writemask; + ret.writemask = hlsl_combine_writemasks(writemask, (1u << component_count) - 1); ret.allocated = true; liveness->reg_count = max(liveness->reg_count, ret.id + 1); return ret; @@ -2253,7 +2259,7 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir var->last_read, var->data_type->reg_size); else var->reg = allocate_register(ctx, liveness, var->first_write, - var->last_read, var->data_type->reg_size); + var->last_read, var->data_type->reg_size, var->data_type->reg_size); TRACE("Allocated %s to %s (liveness %u-%u).\n", var->name, debug_register('r', var->reg, var->data_type), var->first_write, var->last_read); } @@ -2272,7 +2278,7 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_bl instr->last_read, instr->data_type->reg_size); else instr->reg = allocate_register(ctx, liveness, instr->index, - instr->last_read, instr->data_type->reg_size); + instr->last_read, instr->data_type->reg_size, instr->data_type->reg_size); TRACE("Allocated anonymous expression @%u to %s (liveness %u-%u).\n", instr->index, debug_register('r', instr->reg, instr->data_type), instr->index, instr->last_read); } @@ -2335,7 +2341,7 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct hlsl_b if (reg_size > 4) constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size); else - constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, reg_size); + constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, reg_size, reg_size); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, @@ -2435,10 +2441,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, &liveness, 1, UINT_MAX, var->data_type->reg_size); else - { - var->reg = allocate_register(ctx, &liveness, 1, UINT_MAX, 4); - var->reg.writemask = (1u << var->data_type->reg_size) - 1; - } + var->reg = allocate_register(ctx, &liveness, 1, UINT_MAX, 4, var->data_type->reg_size); TRACE("Allocated %s to %s.\n", var->name, debug_register('c', var->reg, var->data_type)); } }

1 0