- Wine-Devel - list.winehq.org

[PATCH 3/5] dssenh: Implement CPAcquireContext and CPReleaseContext.
by Hans Leidekker Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dssenh/Makefile.in | 1 + dlls/dssenh/main.c | 256 ++++++++++++++++++++++++++++++++++++- dlls/dssenh/tests/dssenh.c | 42 ++++++ 3 files changed, 297 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 8015768f99..67b0d6a141 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,4 +1,5 @@ MODULE = dssenh.dll +IMPORTS = bcrypt crypt32 advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 3d5e8d97d6..ea082b29e3 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -22,23 +22,275 @@ #include "windef.h" #include "winbase.h" #include "wincrypt.h" +#include "winreg.h" +#include "bcrypt.h" #include "objbase.h" #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/heap.h" static HINSTANCE instance; WINE_DEFAULT_DEBUG_CHANNEL(dssenh); +#define MAGIC_KEY (('K' << 24) | ('E' << 16) | ('Y' << 8) | '0') +struct key +{ + DWORD magic; + DWORD algid; + DWORD flags; + BCRYPT_ALG_HANDLE alg_handle; + BCRYPT_KEY_HANDLE handle; +}; + +#define MAGIC_CONTAINER (('C' << 24) | ('O' << 16) | ('N' << 8) | 'T') +struct container +{ + DWORD magic; + DWORD flags; + struct key *exch_key; + struct key *sign_key; + char name[MAX_PATH]; +}; + +static const char dss_path_fmt[] = "Software\\Wine\\Crypto\\DSS\\%s"; + +static BOOL create_container_regkey( struct container *container, REGSAM sam, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, container->name ); + + if (container->flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegCreateKeyExA( rootkey, path, 0, NULL, REG_OPTION_NON_VOLATILE, sam, NULL, hkey, NULL ); +} + +static struct container *create_key_container( const char *name, DWORD flags ) +{ + struct container *ret; + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + ret->magic = MAGIC_CONTAINER; + ret->flags = flags; + if (name) strcpy( ret->name, name ); + + if (!(flags & CRYPT_VERIFYCONTEXT)) + { + HKEY hkey; + if (create_container_regkey( ret, KEY_WRITE, &hkey )) RegCloseKey( hkey ); + } + return ret; +} + +static BOOL open_container_regkey( const char *name, DWORD flags, REGSAM access, HKEY *hkey ) +{ + char path[sizeof(dss_path_fmt) + MAX_PATH]; + HKEY rootkey; + + sprintf( path, dss_path_fmt, name ); + + if (flags & CRYPT_MACHINE_KEYSET) + rootkey = HKEY_LOCAL_MACHINE; + else + rootkey = HKEY_CURRENT_USER; + + /* @@ Wine registry key: HKLM\Software\Wine\Crypto\DSS */ + /* @@ Wine registry key: HKCU\Software\Wine\Crypto\DSS */ + return !RegOpenKeyExA( rootkey, path, 0, access, hkey ); +} + +static const WCHAR *map_keyspec_to_keypair_name( DWORD keyspec ) +{ + const WCHAR *name; + + switch (keyspec) + { + case AT_KEYEXCHANGE: + name = L"KeyExchangeKeyPair"; + break; + case AT_SIGNATURE: + name = L"SignatureKeyPair"; + break; + default: + ERR( "invalid key spec %u\n", keyspec ); + return NULL; + } + return name; +} + +static struct key *create_key( ALG_ID algid, DWORD flags ) +{ + struct key *ret; + const WCHAR *alg; + + switch (algid) + { + case AT_SIGNATURE: + case CALG_DSS_SIGN: + alg = BCRYPT_DSA_ALGORITHM; + break; + + default: + FIXME( "unhandled algorithm %08x\n", algid ); + return NULL; + } + + if (!(ret = heap_alloc_zero( sizeof(*ret) ))) return NULL; + + ret->magic = MAGIC_KEY; + ret->algid = algid; + ret->flags = flags; + if (BCryptOpenAlgorithmProvider( &ret->alg_handle, alg, MS_PRIMITIVE_PROVIDER, 0 )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +static void destroy_key( struct key *key ) +{ + if (!key) return; + BCryptDestroyKey( key->handle ); + BCryptCloseAlgorithmProvider( key->alg_handle, 0 ); + key->magic = 0; + heap_free( key ); +} + +static struct key *import_key( DWORD keyspec, BYTE *data, DWORD len ) +{ + struct key *ret; + + if (!(ret = create_key( keyspec, 0 ))) return NULL; + + if (BCryptImportKeyPair( ret->alg_handle, NULL, LEGACY_DSA_V2_PRIVATE_BLOB, &ret->handle, data, len, 0 )) + { + WARN( "failed to import key\n" ); + destroy_key( ret ); + return NULL; + } + return ret; +} + +static struct key *read_key( HKEY hkey, DWORD keyspec, DWORD flags ) +{ + const WCHAR *value; + DWORD type, len; + BYTE *data; + DATA_BLOB blob_in, blob_out; + struct key *ret = NULL; + + if (!(value = map_keyspec_to_keypair_name( keyspec ))) return NULL; + if (RegQueryValueExW( hkey, value, 0, &type, NULL, &len )) return NULL; + if (!(data = heap_alloc( len ))) return NULL; + + if (!RegQueryValueExW( hkey, value, 0, &type, data, &len )) + { + blob_in.pbData = data; + blob_in.cbData = len; + if (CryptUnprotectData( &blob_in, NULL, NULL, NULL, NULL, flags, &blob_out )) + { + ret = import_key( keyspec, blob_out.pbData, blob_out.cbData ); + LocalFree( blob_out.pbData ); + } + } + + heap_free( data ); + return ret; +} + +static void destroy_container( struct container *container ) +{ + if (!container) return; + destroy_key( container->exch_key ); + destroy_key( container->sign_key ); + container->magic = 0; + heap_free( container ); +} + +static struct container *read_key_container( const char *name, DWORD flags ) +{ + DWORD protect_flags = (flags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0; + struct container *ret; + HKEY hkey; + + if (!open_container_regkey( name, flags, KEY_READ, &hkey )) return NULL; + + if ((ret = create_key_container( name, flags ))) + { + ret->exch_key = read_key( hkey, AT_SIGNATURE, protect_flags ); + ret->sign_key = read_key( hkey, AT_KEYEXCHANGE, protect_flags ); + } + + RegCloseKey( hkey ); + return ret; +} + BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags, PVTableProvStruc vtable ) { - return FALSE; + struct container *ret; + char name[MAX_PATH]; + + TRACE( "%p, %s, %08x, %p\n", ret_prov, debugstr_a(container), flags, vtable ); + + if (container && *container) + { + if (lstrlenA( container ) >= sizeof(name)) return FALSE; + lstrcpyA( name, container ); + } + else + { + DWORD len = sizeof(name); + if (!GetUserNameA( name, &len )) return FALSE; + } + + switch (flags) + { + case 0: + ret = read_key_container( name, flags ); + break; + + case CRYPT_NEWKEYSET: + if ((ret = read_key_container( name, flags ))) + { + heap_free( ret ); + SetLastError( NTE_EXISTS ); + return FALSE; + } + ret = create_key_container( name, flags ); + break; + + case CRYPT_VERIFYCONTEXT: + ret = create_key_container( "", flags ); + break; + + default: + FIXME( "unsupported flags %08x\n", flags ); + return FALSE; + } + + if (!ret) return FALSE; + *ret_prov = (HCRYPTPROV)ret; + return TRUE; } BOOL WINAPI CPReleaseContext( HCRYPTPROV hprov, DWORD flags ) { - return FALSE; + struct container *container = (struct container *)hprov; + + TRACE( "%p, %08x\n", (void *)hprov, flags ); + + if (container->magic != MAGIC_CONTAINER) return FALSE; + destroy_container( container ); + return TRUE; } BOOL WINAPI CPGenKey( HCRYPTPROV hprov, ALG_ID algid, DWORD flags, HCRYPTKEY *ret_key ) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index c88fcd1466..d549b985d6 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -323,6 +323,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t static void test_keylength(void) { HCRYPTPROV hProv = 0; + HCRYPTKEY key; BOOL result; /* acquire base dss provider */ @@ -335,6 +336,17 @@ static void test_keylength(void) } ok(result, "Expected no errors.\n"); + result = CryptGenKey(hProv, AT_SIGNATURE, 0, &key); + todo_wine ok(result, "Expected no errors.\n"); + if (!result) + { + skip("skipping key length tests\n"); + return; + } + + result = CryptDestroyKey(key); + ok(result, "Expected no errors.\n"); + /* perform keylength tests */ test_keylength_array(hProv, baseDSS_keylength, ARRAY_SIZE(baseDSS_keylength)); @@ -434,6 +446,11 @@ static void test_hash(const struct hash_test *tests, int testLen) /* test algid hash */ result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + if (!result) + { + skip("skipping hash tests\n"); + return; + } ok(result, "Expected creation of a hash.\n"); result = CryptHashData(hHash, data, dataLen, 0); @@ -588,6 +605,11 @@ static void test_data_encryption(const struct encrypt_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping encryption tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -673,6 +695,11 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) SetLastError(0xdeadbeef); result = CryptCreateHash(hProv, CALG_MD5, 0, 0, &hHash); + if (!result) + { + skip("skipping ciper modes tests\n"); + return; + } ok(result, "Expected creation of a MD5 hash for key derivation.\n"); result = CryptHashData(hHash, (BYTE *)dataToHash, sizeof(dataToHash), 0); @@ -831,6 +858,11 @@ static void test_signhash_array(HCRYPTPROV hProv, const struct signature_test *t /* Get a private key of array specified ALG_ID */ result = CryptImportKey(hProv, tests[i].privateKey, tests[i].keyLen, 0, 0, &privKey); + if (!result) + { + skip("skipping sign tests\n"); + return; + } ok(result, "Failed to imported key, got %x\n", GetLastError()); /* Create hash object and add data for signature 1 */ @@ -1084,6 +1116,11 @@ static void test_keyExchange_baseDSS(HCRYPTPROV hProv, const struct keyExchange_ /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(!result && GetLastError() == NTE_BAD_ALGID, "Expected NTE_BAD_ALGID, got %x\n", GetLastError()); @@ -1233,6 +1270,11 @@ static void test_keyExchange_dssDH(HCRYPTPROV hProv, const struct keyExchange_te /* Generate key exchange keys for user1 and user2 */ result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey1); + if (!result) + { + skip("skipping key exchange tests\n"); + return; + } ok(result, "Failed to generate a key for user1, got %x\n", GetLastError()); result = CryptGenKey(hProv, tests[i].algid, 512 << 16 | CRYPT_PREGEN, &privKey2); -- 2.28.0

4 3

[PATCH] bcrypt/tests: Use wide-char string literals.
by Michael Stefaniuc Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 7fdc0ac7fb2..d499ce65a65 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -99,33 +99,20 @@ static void test_BCryptGenRandom(void) static void test_BCryptGetFipsAlgorithmMode(void) { - static const WCHAR policyKeyVistaW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'L','s','a','\\', - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; - static const WCHAR policyValueVistaW[] = {'E','n','a','b','l','e','d',0}; - static const WCHAR policyKeyXPW[] = { - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'L','s','a',0}; - static const WCHAR policyValueXPW[] = { - 'F','I','P','S','A','l','g','o','r','i','t','h','m','P','o','l','i','c','y',0}; HKEY hkey = NULL; BOOLEAN expected; BOOLEAN enabled; DWORD value, count[2] = {sizeof(value), sizeof(value)}; NTSTATUS ret; - if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyVistaW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueVistaW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"Enabled", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } - else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, policyKeyXPW, &hkey) == ERROR_SUCCESS && - RegQueryValueExW(hkey, policyValueXPW, NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) + else if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Control\\Lsa", &hkey) == ERROR_SUCCESS && + RegQueryValueExW(hkey, L"FIPSAlgorithmPolicy", NULL, NULL, (void *)&value, &count[0]) == ERROR_SUCCESS) { expected = !!value; } @@ -2173,13 +2160,12 @@ static void test_ECDH(void) static void test_BCryptEnumContextFunctions(void) { - static const WCHAR sslW[] = {'S','S','L',0}; CRYPT_CONTEXT_FUNCTIONS *buffer; NTSTATUS status; ULONG buflen; buffer = NULL; - status = pBCryptEnumContextFunctions( CRYPT_LOCAL, sslW, NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); + status = pBCryptEnumContextFunctions( CRYPT_LOCAL, L"SSL", NCRYPT_SCHANNEL_INTERFACE, &buflen, &buffer ); todo_wine ok( status == STATUS_SUCCESS, "got %08x\n", status); if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); } -- 2.26.2

2 1

[PATCH] msiexec: Use wide-char string literals.
by Michael Stefaniuc Oct. 8, 2020

Oct. 8, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.c | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 17d4bf87cdd..2bc0ba9bbef 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -46,19 +46,6 @@ struct string_list WCHAR str[1]; }; -static const WCHAR ActionAdmin[] = { - 'A','C','T','I','O','N','=','A','D','M','I','N',0 }; -static const WCHAR RemoveAll[] = { - 'R','E','M','O','V','E','=','A','L','L',0 }; - -static const WCHAR InstallRunOnce[] = { - 'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','s','t','a','l','l','e','r','\\', - 'R','u','n','O','n','c','e','E','n','t','r','i','e','s',0}; - static void ShowUsage(int ExitCode) { WCHAR msiexec_version[40]; @@ -339,8 +326,6 @@ static DWORD DoDllUnregisterServer(LPCWSTR DllName) static DWORD DoRegServer(void) { - static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; - static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c',' ','/','V',0}; SC_HANDLE scm, service; WCHAR path[MAX_PATH+12]; DWORD len, ret = 0; @@ -351,8 +336,8 @@ static DWORD DoRegServer(void) return 1; } len = GetSystemDirectoryW(path, MAX_PATH); - lstrcpyW(path + len, msiexecW); - if ((service = CreateServiceW(scm, msiserverW, msiserverW, GENERIC_ALL, + lstrcpyW(path + len, L"\\msiexec /V"); + if ((service = CreateServiceW(scm, L"MSIServer", L"MSIServer", GENERIC_ALL, SERVICE_WIN32_SHARE_PROCESS, SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL, path, NULL, NULL, NULL, NULL, NULL))) { @@ -369,7 +354,6 @@ static DWORD DoRegServer(void) static DWORD DoUnregServer(void) { - static const WCHAR msiserverW[] = {'M','S','I','S','e','r','v','e','r',0}; SC_HANDLE scm, service; DWORD ret = 0; @@ -378,7 +362,7 @@ static DWORD DoUnregServer(void) fprintf(stderr, "Failed to open service control manager\n"); return 1; } - if ((service = OpenServiceW(scm, msiserverW, DELETE))) + if ((service = OpenServiceW(scm, L"MSIServer", DELETE))) { if (!DeleteService(service)) { @@ -409,7 +393,6 @@ static DWORD CALLBACK custom_action_thread(void *arg) static int custom_action_server(const WCHAR *arg) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; GUID guid, *thread_guid; DWORD64 thread64; WCHAR buffer[24]; @@ -425,7 +408,7 @@ static int custom_action_server(const WCHAR *arg) return 1; } - swprintf(buffer, ARRAY_SIZE(buffer), pipe_name, client_pid, sizeof(void *) * 8); + swprintf(buffer, ARRAY_SIZE(buffer), L"\\\\.\\pipe\\msica_%x_%d", client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { @@ -577,7 +560,8 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg WCHAR *buf; BOOL ret = FALSE; - r = RegOpenKeyW(HKEY_LOCAL_MACHINE, InstallRunOnce, &hkey); + r = RegOpenKeyW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Installer\\RunOnceEntries", &hkey); if(r != ERROR_SUCCESS) return FALSE; r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); @@ -700,7 +684,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ShowUsage(1); WINE_TRACE("argvW[%d] = %s\n", i, wine_dbgstr_w(argvW[i])); PackageName = argvW[i]; - StringListAppend(&property_list, ActionAdmin); + StringListAppend(&property_list, L"ACTION=ADMIN"); WINE_FIXME("Administrative installs are not currently supported\n"); } else if(msi_option_prefix(argvW[i], "f")) @@ -783,7 +767,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine PackageName = argvW[i]; } WINE_TRACE("PackageName = %s\n", wine_dbgstr_w(PackageName)); - StringListAppend(&property_list, RemoveAll); + StringListAppend(&property_list, L"REMOVE=ALL"); } else if(msi_option_prefix(argvW[i], "j")) { @@ -996,11 +980,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine } else if(msi_option_equal(argvW[i], "passive")) { - static const WCHAR rebootpromptW[] = - {'R','E','B','O','O','T','P','R','O','M','P','T','=','"','S','"',0}; - InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY|INSTALLUILEVEL_HIDECANCEL; - StringListAppend(&property_list, rebootpromptW); + StringListAppend(&property_list, L"REBOOTPROMPT=\"S\""); } else if(msi_option_equal(argvW[i], "y")) { -- 2.26.2

2 1

[PATCH] rundll32: Use wide-char string literals.
by Michael Stefaniuc Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/rundll32/rundll32.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/programs/rundll32/rundll32.c b/programs/rundll32/rundll32.c index d1caefc2e25..09a382ef910 100644 --- a/programs/rundll32/rundll32.c +++ b/programs/rundll32/rundll32.c @@ -83,20 +83,14 @@ static void call_entry_point( void *func, HWND hwnd, HINSTANCE inst, void *cmdli } #endif -/* - * Control_RunDLL needs to have a window. So lets make us a very - * simple window class. - */ -static const WCHAR szTitle[] = {'r','u','n','d','l','l','3','2',0}; -static const WCHAR szWindowClass[] = {'c','l','a','s','s','_','r','u','n','d','l','l','3','2',0}; -static const WCHAR kernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; -static const WCHAR shell32[] = {'s','h','e','l','l','3','2','.','d','l','l',0}; - static HINSTANCE16 (WINAPI *pLoadLibrary16)(LPCSTR libname); static FARPROC16 (WINAPI *pGetProcAddress16)(HMODULE16 hModule, LPCSTR name); static void (WINAPI *pRunDLL_CallEntry16)( FARPROC proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ); +/* + * Control_RunDLL needs to have a window. So lets make us a very simple window class. + */ static ATOM register_class(void) { WNDCLASSEXW wcex; @@ -112,7 +106,7 @@ static ATOM register_class(void) wcex.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.lpszMenuName = NULL; - wcex.lpszClassName = szWindowClass; + wcex.lpszClassName = L"class_rundll32"; wcex.hIconSm = NULL; return RegisterClassExW(&wcex); @@ -127,7 +121,7 @@ static HINSTANCE16 load_dll16( LPCWSTR dll ) if (dllA) { WideCharToMultiByte( CP_ACP, 0, dll, -1, dllA, len, NULL, NULL ); - pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)35 ); + pLoadLibrary16 = (void *)GetProcAddress( GetModuleHandleW(L"kernel32.dll"), (LPCSTR)35 ); if (pLoadLibrary16) ret = pLoadLibrary16( dllA ); HeapFree( GetProcessHeap(), 0, dllA ); } @@ -143,7 +137,7 @@ static FARPROC16 get_entry_point16( HINSTANCE16 inst, LPCWSTR entry ) if (entryA) { WideCharToMultiByte( CP_ACP, 0, entry, -1, entryA, len, NULL, NULL ); - pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleW(kernel32), (LPCSTR)37 ); + pGetProcAddress16 = (void *)GetProcAddress( GetModuleHandleW(L"kernel32.dll"), (LPCSTR)37 ); if (pGetProcAddress16) ret = pGetProcAddress16( inst, entryA ); HeapFree( GetProcessHeap(), 0, entryA ); } @@ -289,8 +283,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine /* Initialize the rundll32 class */ register_class(); - hWnd = CreateWindowW(szWindowClass, szTitle, - WS_OVERLAPPEDWINDOW|WS_VISIBLE, + hWnd = CreateWindowW(L"class_rundll32", L"rundll32", WS_OVERLAPPEDWINDOW|WS_VISIBLE, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, NULL, NULL); /* Get the dll name and API EntryPoint */ @@ -359,7 +352,7 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE hOldInstance, LPWSTR szCmdLine if (win16) { - HMODULE shell = LoadLibraryW( shell32 ); + HMODULE shell = LoadLibraryW( L"shell32.dll" ); if (shell) pRunDLL_CallEntry16 = (void *)GetProcAddress( shell, (LPCSTR)122 ); if (pRunDLL_CallEntry16) pRunDLL_CallEntry16( entry_point, hWnd, instance, cmdline, info.wShowWindow ); -- 2.26.2

1 0

[PATCH] progman: Use wide-char string literals.
by Michael Stefaniuc Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/progman/progman.h | 8 ++++---- programs/progman/string.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 8fd823ac7db..cc9b301354b 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -190,10 +190,10 @@ VOID DIALOG_Execute(void); VOID STRING_LoadMenus(VOID); /* Class names */ -extern WCHAR STRING_MAIN_WIN_CLASS_NAME[]; -extern WCHAR STRING_MDI_WIN_CLASS_NAME[]; -extern WCHAR STRING_GROUP_WIN_CLASS_NAME[]; -extern WCHAR STRING_PROGRAM_WIN_CLASS_NAME[]; +extern const WCHAR STRING_MAIN_WIN_CLASS_NAME[]; +extern const WCHAR STRING_MDI_WIN_CLASS_NAME[]; +extern const WCHAR STRING_GROUP_WIN_CLASS_NAME[]; +extern const WCHAR STRING_PROGRAM_WIN_CLASS_NAME[]; /* Resource names */ #define IDD_MAIN 1 diff --git a/programs/progman/string.c b/programs/progman/string.c index fb27b54a55c..6a78bf3a988 100644 --- a/programs/progman/string.c +++ b/programs/progman/string.c @@ -26,10 +26,10 @@ /* Class names */ -WCHAR STRING_MAIN_WIN_CLASS_NAME[] = {'P','M','M','a','i','n',0}; -WCHAR STRING_MDI_WIN_CLASS_NAME[] = {'M','D','I','C','L','I','E','N','T',0}; -WCHAR STRING_GROUP_WIN_CLASS_NAME[] = {'P','M','G','r','o','u','p',0}; -WCHAR STRING_PROGRAM_WIN_CLASS_NAME[] = {'P','M','P','r','o','g','r','a','m',0}; +const WCHAR STRING_MAIN_WIN_CLASS_NAME[] = L"PMMain"; +const WCHAR STRING_MDI_WIN_CLASS_NAME[] = L"MDICLIENT"; +const WCHAR STRING_GROUP_WIN_CLASS_NAME[] = L"PMGroup"; +const WCHAR STRING_PROGRAM_WIN_CLASS_NAME[] = L"PMProgram"; VOID STRING_LoadMenus(VOID) { -- 2.26.2

1 0

[PATCH] regsvr32: Use wide-char string literals.
by Michael Stefaniuc Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regsvr32/regsvr32.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 730f1fef3dd..be21ac17953 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -114,9 +114,7 @@ static LPCWSTR find_arg_start(LPCWSTR cmdline) static void reexec_self(void) { /* restart current process as 32-bit or 64-bit with same command line */ - static const WCHAR exe_name[] = {'\\','r','e','g','s','v','r','3','2','.','e','x','e',0}; #ifndef _WIN64 - static const WCHAR sysnative[] = {'\\','S','y','s','N','a','t','i','v','e',0}; BOOL wow64; #endif WCHAR systemdir[MAX_PATH]; @@ -138,16 +136,16 @@ static void reexec_self(void) } GetWindowsDirectoryW(systemdir, MAX_PATH); - wcscat(systemdir, sysnative); + wcscat(systemdir, L"\\SysNative"); #endif args = find_arg_start(GetCommandLineW()); cmdline = HeapAlloc(GetProcessHeap(), 0, - (wcslen(systemdir)+wcslen(exe_name)+wcslen(args)+1)*sizeof(WCHAR)); + (wcslen(systemdir)+wcslen(L"\regsvr32.exe")+wcslen(args)+1)*sizeof(WCHAR)); wcscpy(cmdline, systemdir); - wcscat(cmdline, exe_name); + wcscat(cmdline, L"\regsvr32.exe"); wcscat(cmdline, args); si.cb = sizeof(si); -- 2.26.2

1 0

[PATCH] avifil32: Use wide-char string literals.
by Michael Stefaniuc Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/avifil32/api.c | 19 ++++++------------- dlls/avifil32/avifile.c | 7 ++----- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index a7f84ba3bce..5a9985424e7 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -994,11 +994,7 @@ HRESULT WINAPI AVIBuildFilterA(LPSTR szFilter, LONG cbFilter, BOOL fSaving) */ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) { - static const WCHAR all_files[] = { '*','.','*',0,0 }; - static const WCHAR szClsid[] = {'C','L','S','I','D',0}; - static const WCHAR szExtensionFmt[] = {';','*','.','%','s',0}; - static const WCHAR szAVIFileExtensions[] = - {'A','V','I','F','i','l','e','\\','E','x','t','e','n','s','i','o','n','s',0}; + static const WCHAR all_files[] = L"*.*\0"; AVIFilter *lp; WCHAR szAllFiles[40]; @@ -1030,7 +1026,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) * First filter is named "All multimedia files" and its filter is a * collection of all possible extensions except "*.*". */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szAVIFileExtensions, &hKey) != ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, L"AVIFile\\Extensions", &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } @@ -1065,7 +1061,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) } /* append extension to the filter */ - wsprintfW(szValue, szExtensionFmt, szFileExt); + wsprintfW(szValue, L";*.%s", szFileExt); if (lp[i].szExtensions[0] == 0) lstrcatW(lp[i].szExtensions, szValue + 1); else @@ -1080,7 +1076,7 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) RegCloseKey(hKey); /* 2. get descriptions for the CLSIDs and fill out szFilter */ - if (RegOpenKeyW(HKEY_CLASSES_ROOT, szClsid, &hKey) != ERROR_SUCCESS) { + if (RegOpenKeyW(HKEY_CLASSES_ROOT, L"CLSID", &hKey) != ERROR_SUCCESS) { HeapFree(GetProcessHeap(), 0, lp); return AVIERR_ERROR; } @@ -1254,9 +1250,6 @@ static BOOL AVISaveOptionsFmtChoose(HWND hWnd) static void AVISaveOptionsUpdate(HWND hWnd) { - static const WCHAR szVideoFmt[]={'%','l','d','x','%','l','d','x','%','d',0}; - static const WCHAR szAudioFmt[]={'%','s',' ','%','s',0}; - WCHAR szFormat[128]; AVISTREAMINFOW sInfo; LPVOID lpFormat; @@ -1283,7 +1276,7 @@ static void AVISaveOptionsUpdate(HWND hWnd) LPBITMAPINFOHEADER lpbi = lpFormat; ICINFO icinfo; - wsprintfW(szFormat, szVideoFmt, lpbi->biWidth, + wsprintfW(szFormat, L"%ldx%ldx%d", lpbi->biWidth, lpbi->biHeight, lpbi->biBitCount); if (lpbi->biCompression != BI_RGB) { @@ -1320,7 +1313,7 @@ static void AVISaveOptionsUpdate(HWND hWnd) if (acmFormatTagDetailsW(NULL, &aftd, ACM_FORMATTAGDETAILSF_FORMATTAG) == S_OK) { if (acmFormatDetailsW(NULL,&afd,ACM_FORMATDETAILSF_FORMAT) == S_OK) - wsprintfW(szFormat, szAudioFmt, afd.szFormat, aftd.szFormatTag); + wsprintfW(szFormat, L"%s %s", afd.szFormat, aftd.szFormatTag); } } } diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index f3cf484d91f..b1654daa690 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1714,9 +1714,6 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) break; case ckidSTREAMHEADER: { - static const WCHAR streamTypeFmt[] = {'%','4','.','4','h','s',0}; - static const WCHAR streamNameFmt[] = {'%','s',' ','%','s',' ','#','%','d',0}; - AVIStreamHeader streamHdr; WCHAR szType[25]; UINT count; @@ -1754,7 +1751,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) else if (streamHdr.fccType == streamtypeAUDIO) LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, ARRAY_SIZE(szType)); else - wsprintfW(szType, streamTypeFmt, (char*)&streamHdr.fccType); + wsprintfW(szType, L"%4.4hs", (char*)&streamHdr.fccType); /* get count of this streamtype up to this stream */ count = 0; @@ -1766,7 +1763,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName)); /* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */ - wsprintfW(pStream->sInfo.szName, streamNameFmt, + wsprintfW(pStream->sInfo.szName, L"%s %s #%d", AVIFILE_BasenameW(This->szFileName), szType, count); } break; -- 2.26.2

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras Oct. 7, 2020

Oct. 7, 2020

2 1

[PATCH] gdi32: Allow any mode passed to SetBkMode().
by Jeff Smith Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- Testing revealed that SetBkMode() does not treat 'invalid' values as one might assume. Discovered this when working on another issue. Note that fixing this to match Windows simplifies one of the tests for that bug. dlls/gdi32/dc.c | 12 ++---------- dlls/gdi32/tests/dc.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 230f1949e8d..0bac9c27d16 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1598,20 +1598,12 @@ INT WINAPI SetBkMode( HDC hdc, INT mode ) INT ret = 0; DC *dc; - if ((mode <= 0) || (mode > BKMODE_LAST)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } if ((dc = get_dc_ptr( hdc ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetBkMode ); mode = physdev->funcs->pSetBkMode( physdev, mode ); - if (mode) - { - ret = dc->backgroundMode; - dc->backgroundMode = mode; - } + ret = dc->backgroundMode; + dc->backgroundMode = mode; release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b4a89b213d2..ce9fca1653f 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -40,7 +40,7 @@ static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); COLORREF color; - int extra; + int extra, mode; ok( hdc != NULL, "CreateDC failed\n" ); color = SetBkColor( hdc, 0x12345678 ); @@ -81,6 +81,23 @@ static void test_dc_values(void) extra = GetTextCharacterExtra( hdc ); ok( extra == 123, "initial extra %d\n", extra ); + mode = SetBkMode( hdc, TRANSPARENT ); + ok( mode == OPAQUE, "initial mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == TRANSPARENT, "wrong mode %08x\n", mode ); + mode = SetBkMode( hdc, OPAQUE ); + ok( mode == TRANSPARENT, "wrong mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == OPAQUE, "wrong mode %08x\n", mode ); + mode = SetBkMode( hdc, 0 ); + ok( mode == OPAQUE, "wrong mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == 0, "wrong mode %08x\n", mode ); + mode = SetBkMode( hdc, BKMODE_LAST + 1 ); + ok( mode == 0, "wrong mode %08x\n", mode ); + mode = GetBkMode( hdc ); + ok( mode == BKMODE_LAST + 1, "wrong mode %08x\n", mode ); + DeleteDC( hdc ); } -- 2.23.0

3 4

[PATCH v2 5/5] amstream: Reference the multimedia stream in ddraw stream sample.
by Anton Baskanov Oct. 7, 2020

Oct. 7, 2020

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/ddrawstream.c | 6 ++++++ dlls/amstream/tests/amstream.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ea99d4915e..5e6e1555d7c 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -70,6 +70,7 @@ struct ddraw_sample IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; struct ddraw_stream *parent; + IMultiMediaStream *mmstream; IDirectDrawSurface *surface; RECT rect; STREAM_TIME start_time; @@ -1462,6 +1463,8 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) --sample->parent->sample_refs; LeaveCriticalSection(&sample->parent->cs); + if (sample->mmstream) + IMultiMediaStream_Release(sample->mmstream); IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); if (sample->surface) @@ -1678,8 +1681,11 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = parent; + object->mmstream = parent->parent; InitializeConditionVariable(&object->update_cv); IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); + if (object->mmstream) + IMultiMediaStream_AddRef(object->mmstream); ++parent->sample_refs; if (surface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 285dc0f0547..9dda5882a4f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6904,9 +6904,11 @@ static void test_ddrawstream_create_sample(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + EXPECT_REF(mmstream, 1); EXPECT_REF(stream, 3); hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(mmstream, 2); EXPECT_REF(stream, 4); hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL); -- 2.17.1

2 1