October 2020 - Wine-Commits

Martin Storsjo : ntdll: Restore the original Lr value when unwinding through raise_func_trampoline on arm64.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: dcf3874e005f864a87205bb7da7ac4bda24a81b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf3874e005f864a87205bb7… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 5 12:16:40 2020 +0300 ntdll: Restore the original Lr value when unwinding through raise_func_trampoline on arm64. When a signal is raised in a leaf function (that hasn't backed up the Lr register itself), we need to restore both Pc and Lr separately. This doesn't seem to be possible via libunwind, so add a special case unwinding rule for this function. As we have a special case for the function, we could also just as well skip normal dwarf unwinding for this function altogether and just restore the full context from the stack. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 62 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index e08d6a2ee1..3beef729dc 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -157,6 +157,7 @@ static inline struct arm64_thread_data *arm64_thread_data(void) return (struct arm64_thread_data *)ntdll_get_thread_data()->cpu_data; } +extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher ); /*********************************************************************** * unwind_builtin_dll @@ -276,6 +277,17 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + if (info.start_ip == (unw_word_t)raise_func_trampoline) { + /* raise_func_trampoline has a full CONTEXT stored on the stack; + * restore the original Lr value from there. The function we unwind + * to might be a leaf function that hasn't backed up its own original + * Lr value on the stack. + * We could also just restore the full context here without doing + * unw_step at all. */ + const CONTEXT *next_ctx = (const CONTEXT *) dispatch->EstablisherFrame; + context->u.s.Lr = next_ctx->u.s.Lr; + } + TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); @@ -573,20 +585,49 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } -extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher, void *sp ); +/* Note, unwind_builtin_dll above has hardcoded assumptions on how this + * function stores things on the stack; if modified, modify that one in + * sync as well. */ __ASM_GLOBAL_FUNC( raise_func_trampoline, - __ASM_CFI(".cfi_signal_frame\n\t") - "stp x29, x30, [sp, #-0x20]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 32\n\t") - __ASM_CFI(".cfi_offset 29, -32\n\t") - __ASM_CFI(".cfi_offset 30, -24\n\t") + "stp x29, x30, [sp, #-0x30]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 48\n\t") + __ASM_CFI(".cfi_offset 29, -48\n\t") + __ASM_CFI(".cfi_offset 30, -40\n\t") + "stp x0, x1, [sp, #0x10]\n\t" + "str x2, [sp, #0x20]\n\t" "mov x29, sp\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") - "str x3, [sp, 0x10]\n\t" __ASM_CFI(".cfi_remember_state\n\t") - __ASM_CFI(".cfi_escape 0x0f,0x03,0x8d,0x10,0x06\n\t") /* CFA */ - __ASM_CFI(".cfi_escape 0x10,0x1d,0x02,0x8d,0x00\n\t") /* x29 */ - __ASM_CFI(".cfi_escape 0x10,0x1e,0x02,0x8d,0x08\n\t") /* x30 */ + + /* Memcpy the context onto the stack */ + "sub sp, sp, #0x390\n\t" + "mov x0, sp\n\t" + "mov x2, #0x390\n\t" + "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_CFI(".cfi_def_cfa 31, 0\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x04,0x8f,0x80,0x02,0x06\n\t") /* CFA, DW_OP_breg31 + 0x100, DW_OP_deref */ + __ASM_CFI(".cfi_escape 0x10,0x13,0x03,0x8f,0xa0,0x01\n\t") /* x19, DW_OP_breg31 + 0xA0 */ + __ASM_CFI(".cfi_escape 0x10,0x14,0x03,0x8f,0xa8,0x01\n\t") /* x20 */ + __ASM_CFI(".cfi_escape 0x10,0x15,0x03,0x8f,0xb0,0x01\n\t") /* x21 */ + __ASM_CFI(".cfi_escape 0x10,0x16,0x03,0x8f,0xb8,0x01\n\t") /* x22 */ + __ASM_CFI(".cfi_escape 0x10,0x17,0x03,0x8f,0xc0,0x01\n\t") /* x23 */ + __ASM_CFI(".cfi_escape 0x10,0x18,0x03,0x8f,0xc8,0x01\n\t") /* x24 */ + __ASM_CFI(".cfi_escape 0x10,0x19,0x03,0x8f,0xd0,0x01\n\t") /* x25 */ + __ASM_CFI(".cfi_escape 0x10,0x1a,0x03,0x8f,0xd8,0x01\n\t") /* x26 */ + __ASM_CFI(".cfi_escape 0x10,0x1b,0x03,0x8f,0xe0,0x01\n\t") /* x27 */ + __ASM_CFI(".cfi_escape 0x10,0x1c,0x03,0x8f,0xe8,0x01\n\t") /* x28 */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x03,0x8f,0xf0,0x01\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x03,0x8f,0x88,0x02\n\t") /* x30 = pc */ + __ASM_CFI(".cfi_escape 0x10,0x48,0x03,0x8f,0x90,0x03\n\t") /* d8 */ + __ASM_CFI(".cfi_escape 0x10,0x49,0x03,0x8f,0x98,0x03\n\t") /* d9 */ + __ASM_CFI(".cfi_escape 0x10,0x4a,0x03,0x8f,0xa0,0x03\n\t") /* d10 */ + __ASM_CFI(".cfi_escape 0x10,0x4b,0x03,0x8f,0xa8,0x03\n\t") /* d11 */ + __ASM_CFI(".cfi_escape 0x10,0x4c,0x03,0x8f,0xb0,0x03\n\t") /* d12 */ + __ASM_CFI(".cfi_escape 0x10,0x4d,0x03,0x8f,0xb8,0x03\n\t") /* d13 */ + __ASM_CFI(".cfi_escape 0x10,0x4e,0x03,0x8f,0xc0,0x03\n\t") /* d14 */ + __ASM_CFI(".cfi_escape 0x10,0x4f,0x03,0x8f,0xc8,0x03\n\t") /* d15 */ + "ldp x0, x1, [x29, #0x10]\n\t" + "ldr x2, [x29, #0x20]\n\t" "blr x2\n\t" __ASM_CFI(".cfi_restore_state\n\t") "brk #1") @@ -625,7 +666,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) stack->rec = *rec; stack->context = context; - REGn_sig(3, sigcontext) = SP_sig(sigcontext); /* original stack pointer, fourth arg for raise_func_trampoline */ SP_sig(sigcontext) = (ULONG_PTR)stack; LR_sig(sigcontext) = PC_sig(sigcontext); PC_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline;

1 0

Michael Stefaniuc : combase/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 4c4ac8a98714264857a2fd63ed543c27cdceb0b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c4ac8a98714264857a2fd63… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:48 2020 +0200 combase/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/roapi.c | 8 +++----- dlls/combase/tests/string.c | 17 ++++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index eef00fcc8b..6180ad24d6 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -60,9 +60,6 @@ static BOOL init_functions(void) static void test_ActivationFactories(void) { - static const WCHAR xmldocumentW[] = { 'W','i','n','d','o','w','s','.','D','a','t','a','.','X','m','l','.', - 'D','o','m','.','X','m','l','D','o','c','u','m','e','n','t',0 }; - static const WCHAR nonexistW[] = { 'D','o','e','s','.','N','o','t','.','E','x','i','s','t',0 }; HRESULT hr; HSTRING str, str2; IActivationFactory *factory = NULL; @@ -74,10 +71,11 @@ static void test_ActivationFactories(void) return; } - hr = pWindowsCreateString(xmldocumentW, ARRAY_SIZE(xmldocumentW) - 1, &str); + hr = pWindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument", + ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str); ok(hr == S_OK, "got %08x\n", hr); - hr = pWindowsCreateString(nonexistW, ARRAY_SIZE(nonexistW) - 1, &str2); + hr = pWindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str2); ok(hr == S_OK, "got %08x\n", hr); hr = pRoInitialize(RO_INIT_MULTITHREADED); diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 04d0f3e3a5..a84973ff56 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -101,12 +101,11 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, ok_(__FILE__, line)(memcmp(ptr, content, sizeof(*content) * length) == 0, "Incorrect string content\n"); } -static const WCHAR input_string[] = { 'a', 'b', 'c', 'd', 'e', 'f', '\0', '\0' }; -static const WCHAR input_string1[] = { 'a', 'b', 'c', '\0' }; -static const WCHAR input_string2[] = { 'd', 'e', 'f', '\0' }; -static const WCHAR input_empty_string[] = { '\0' }; -static const WCHAR input_embed_null[] = { 'a', '\0', 'c', '\0', 'e', 'f', '\0' }; -static const WCHAR output_substring[] = { 'c', 'd', 'e', 'f', '\0' }; +static const WCHAR input_string[] = L"abcdef\0"; +static const WCHAR input_string1[] = L"abc"; +static const WCHAR input_string2[] = L"def"; +static const WCHAR input_embed_null[] = L"a\0c\0ef"; +static const WCHAR output_substring[] = L"cdef"; static void test_create_delete(void) { @@ -147,7 +146,7 @@ static void test_create_delete(void) ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); /* Test an empty string */ - ok(pWindowsCreateString(input_empty_string, 0, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateString(L"", 0, &str) == S_OK, "Failed to create string\n"); ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); @@ -155,7 +154,7 @@ static void test_create_delete(void) ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); - ok(pWindowsCreateStringReference(input_empty_string, 0, &header, &str) == S_OK, "Failed to create string\n"); + ok(pWindowsCreateStringReference(L"", 0, &header, &str) == S_OK, "Failed to create string\n"); ok(str == NULL, "Empty string not a null string\n"); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); @@ -230,7 +229,7 @@ static void test_string_buffer(void) ok(ptr != NULL, "Empty string didn't return a buffer pointer\n"); ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n"); ok(str == NULL, "Empty string isn't a null string\n"); - check_string(str, input_empty_string, 0, FALSE); + check_string(str, L"", 0, FALSE); ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n"); ok(pWindowsDeleteStringBuffer(NULL) == S_OK, "Failed to delete null string buffer\n");

1 0

Michael Stefaniuc : combase: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: e2ac51d89e052f0f8704cdd2d1df91fb5c30455b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ac51d89e052f0f8704cdd2… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 30 23:14:47 2020 +0200 combase: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/roapi.c | 12 ++++-------- dlls/combase/rpc.c | 3 +-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c index 94b79ff3cf..53da979d68 100644 --- a/dlls/combase/roapi.c +++ b/dlls/combase/roapi.c @@ -39,11 +39,6 @@ static const char *debugstr_hstring(HSTRING hstr) static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) { - static const WCHAR classkeyW[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','R','u','n','t','i','m','e','\\', - 'A','c','t','i','v','a','t','a','b','l','e','C','l','a','s','s','I','d',0}; - static const WCHAR dllpathW[] = {'D','l','l','P','a','t','h',0}; HKEY hkey_root, hkey_class; DWORD type, size; HRESULT hr; @@ -52,7 +47,8 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) *out = NULL; /* load class registry key */ - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, classkeyW, 0, KEY_READ, &hkey_root)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\WindowsRuntime\\ActivatableClassId", + 0, KEY_READ, &hkey_root)) return REGDB_E_READREGDB; if (RegOpenKeyExW(hkey_root, classid, 0, KEY_READ, &hkey_class)) { @@ -63,7 +59,7 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) RegCloseKey(hkey_root); /* load (and expand) DllPath registry value */ - if (RegQueryValueExW(hkey_class, dllpathW, NULL, &type, NULL, &size)) + if (RegQueryValueExW(hkey_class, L"DllPath", NULL, &type, NULL, &size)) { hr = REGDB_E_READREGDB; goto done; @@ -78,7 +74,7 @@ static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out) hr = E_OUTOFMEMORY; goto done; } - if (RegQueryValueExW(hkey_class, dllpathW, NULL, NULL, (BYTE *)buf, &size)) + if (RegQueryValueExW(hkey_class, L"DllPath", NULL, NULL, (BYTE *)buf, &size)) { hr = REGDB_E_READREGDB; goto done; diff --git a/dlls/combase/rpc.c b/dlls/combase/rpc.c index c4bc8983a2..55450ad7f1 100644 --- a/dlls/combase/rpc.c +++ b/dlls/combase/rpc.c @@ -77,8 +77,7 @@ struct registered_if static inline void get_rpc_endpoint(LPWSTR endpoint, const OXID *oxid) { /* FIXME: should get endpoint from rpcss */ - static const WCHAR wszEndpointFormat[] = {'\\','p','i','p','e','\\','O','L','E','_','%','0','8','l','x','%','0','8','l','x',0}; - wsprintfW(endpoint, wszEndpointFormat, (DWORD)(*oxid >> 32),(DWORD)*oxid); + wsprintfW(endpoint, L"\\pipe\\OLE_%08lx%08lx", (DWORD)(*oxid >> 32), (DWORD)*oxid); } typedef struct

1 0

Michael Stefaniuc : wiaservc: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 144d898fbaf716c536c8fec1ad45321485165316 URL: https://source.winehq.org/git/wine.git/?a=commit;h=144d898fbaf716c536c8fec1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:28 2020 +0200 wiaservc: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/service.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wiaservc/service.c b/dlls/wiaservc/service.c index c1cdb83e60..524181f72a 100644 --- a/dlls/wiaservc/service.c +++ b/dlls/wiaservc/service.c @@ -107,7 +107,6 @@ StartCount(void) VOID WINAPI ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) { - static const WCHAR stisvc_nameW[] = {'s','t','i','s','v','c',0}; TRACE("(%d, %p)\n", dwArgc, lpszArgv); stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); @@ -116,7 +115,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) return; } - status_handle = RegisterServiceCtrlHandlerExW(stisvc_nameW, ServiceHandler, NULL); + status_handle = RegisterServiceCtrlHandlerExW(L"stisvc", ServiceHandler, NULL); if (!status_handle) { ERR("failed to register handler: %u\n", GetLastError()); return;

1 0

Michael Stefaniuc : virtdisk/tests: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 153dcacfc8be4d4cc966c4bdd874d82173abacff URL: https://source.winehq.org/git/wine.git/?a=commit;h=153dcacfc8be4d4cc966c4bd… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:27 2020 +0200 virtdisk/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/virtdisk/tests/virtdisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/virtdisk/tests/virtdisk.c b/dlls/virtdisk/tests/virtdisk.c index 23d070574a..34118e532b 100644 --- a/dlls/virtdisk/tests/virtdisk.c +++ b/dlls/virtdisk/tests/virtdisk.c @@ -55,7 +55,7 @@ static void test_OpenVirtualDisk(void) HANDLE handle; VIRTUAL_STORAGE_TYPE stgtype; OPEN_VIRTUAL_DISK_PARAMETERS param; - static const WCHAR vdisk[] = {'t','e','s','t','.','v','h','d',0}; + static const WCHAR vdisk[] = L"test.vhd"; ret = pOpenVirtualDisk(NULL, NULL, VIRTUAL_DISK_ACCESS_NONE, OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS, NULL, &handle); ok(ret == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", ret);

1 0

Michael Stefaniuc : msacm32.drv: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 60eb0d4ba735958d65384ab0515fbf0b3b4d640f URL: https://source.winehq.org/git/wine.git/?a=commit;h=60eb0d4ba735958d65384ab0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:20 2020 +0200 msacm32.drv: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32.drv/wavemap.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index 75d1a60c71..bb51e2235c 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -493,8 +493,6 @@ static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveCaps, DWORD dwParam2) { - static const WCHAR name[] = {'W','i','n','e',' ','w','a','v','e',' ','o','u','t',' ','m','a','p','p','e','r',0}; - TRACE("(%04x %p %p %08x)\n",wDevID, wom, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ @@ -511,7 +509,7 @@ static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveC woc.wMid = 0x00FF; woc.wPid = 0x0001; woc.vDriverVersion = 0x0332; - lstrcpyW(woc.szPname, name); + lstrcpyW(woc.szPname, L"Wine wave out mapper"); woc.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 | @@ -1063,11 +1061,10 @@ static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCa /* otherwise, return caps of mapper itself */ if (wDevID == (UINT)-1 || wDevID == (UINT16)-1) { WAVEINCAPSW wic; - static const WCHAR init[] = {'W','i','n','e',' ','w','a','v','e',' ','i','n',' ','m','a','p','p','e','r',0}; wic.wMid = 0x00FF; wic.wPid = 0x0001; wic.vDriverVersion = 0x0001; - lstrcpyW(wic.szPname, init); + lstrcpyW(wic.szPname, L"Wine wave in mapper"); wic.dwFormats = WAVE_FORMAT_96M08 | WAVE_FORMAT_96S08 | WAVE_FORMAT_96M16 | WAVE_FORMAT_96S16 | WAVE_FORMAT_48M08 | WAVE_FORMAT_48S08 | WAVE_FORMAT_48M16 | WAVE_FORMAT_48S16 |

1 0

Michael Stefaniuc : mlang: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 250e6d9f8c417341e498ba35ad7938ec93d21a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=250e6d9f8c417341e498ba35… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:19 2020 +0200 mlang: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e3582cca2d..62e9947fb7 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -392,8 +392,6 @@ static const MIME_CP_INFO vietnamese_cp[] = "windows-1258", "windows-1258", "windows-1258" } }; -static const WCHAR asciiW[] = {'a','s','c','i','i',0}; - static const MIME_CP_INFO western_cp[] = { { "IBM EBCDIC (US-Canada)", @@ -446,7 +444,7 @@ static const MIME_CP_INFO western_cp[] = 20127, MIMECONTF_MAILNEWS | MIMECONTF_IMPORT | MIMECONTF_EXPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_VALID | MIMECONTF_VALID_NLS | MIMECONTF_MIME_LATEST, - "us-ascii", "us-ascii", "us-ascii", asciiW }, + "us-ascii", "us-ascii", "us-ascii", L"ascii" }, { "Western European (ISO)", 28591, MIMECONTF_MAILNEWS | MIMECONTF_BROWSER | MIMECONTF_IMPORT | MIMECONTF_SAVABLE_MAILNEWS | MIMECONTF_SAVABLE_BROWSER | @@ -3934,14 +3932,7 @@ static BOOL register_codepages(void) WCHAR buf[32]; LSTATUS status; - static const WCHAR db_key_nameW[] = { - 'M','I','M','E', - '\\','D','a','t','a','b','a','s','e', - '\\','C','o','d','e','p','a','g','e',0}; - static const WCHAR familyW[] = {'F','a','m','i','l','y',0}; - static const WCHAR formatW[] = {'%','u',0}; - - status = RegCreateKeyW(HKEY_CLASSES_ROOT, db_key_nameW, &db_key); + status = RegCreateKeyW(HKEY_CLASSES_ROOT, L"MIME\\Database\\Codepage", &db_key); if (status != ERROR_SUCCESS) return FALSE; @@ -3949,7 +3940,7 @@ static BOOL register_codepages(void) { for (info = family->mime_cp_info; info < family->mime_cp_info + family->number_of_cp; info++) { - swprintf(buf, ARRAY_SIZE(buf), formatW, info->cp); + swprintf(buf, ARRAY_SIZE(buf), L"%u", info->cp); status = RegCreateKeyW(db_key, buf, &key); if (status != ERROR_SUCCESS) continue; @@ -3966,7 +3957,7 @@ static BOOL register_codepages(void) } else { - RegSetValueExW(key, familyW, 0, REG_DWORD, (BYTE*)&family->family_codepage, + RegSetValueExW(key, L"Family", 0, REG_DWORD, (BYTE*)&family->family_codepage, sizeof(family->family_codepage)); }

1 0

Michael Stefaniuc : midimap: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 4c9e8c67880471e0cd9f840e6e85c9428b2dc77c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c9e8c67880471e0cd9f840e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:18 2020 +0200 midimap: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/midimap/midimap.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index d15e3d76b9..86e4289d89 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -220,9 +220,8 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) size = sizeof(out); if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { - static const WCHAR cs[] = {'C','u','r','r','e','n','t','S','c','h','e','m','e',0}; size = sizeof(buffer); - if (!RegQueryValueExW(hKey, cs, 0, &type, (void*)buffer, &size)) + if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) { if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) ret = MIDIMAP_LoadSettingsDefault(mom, NULL); @@ -234,9 +233,8 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) } if (ret == 2) { - static const WCHAR ci[] = {'C','u','r','r','e','n','t','I','n','s','t','r','u','m','e','n','t',0}; size = sizeof(buffer); - if (!RegQueryValueExW(hKey, ci, 0, &type, (void*)buffer, &size) && *buffer) + if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) { ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } @@ -470,8 +468,7 @@ static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiC { static const MIDIOUTCAPSW mappercaps = { 0x00FF, 0x0001, 0x0100, /* Manufacturer and Product ID */ - {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}, - MOD_MAPPER, 0, 0, 0xFFFF, + L"Wine midi mapper", MOD_MAPPER, 0, 0, 0xFFFF, /* Native returns volume caps of underlying device + MIDICAPS_STREAM */ MIDICAPS_VOLUME|MIDICAPS_LRVOLUME }; @@ -552,7 +549,6 @@ DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, */ static LRESULT MIDIMAP_drvOpen(void) { - static const WCHAR throughportW[] = {'M','i','d','i',' ','T','h','r','o','u','g','h',0}; MIDIOUTCAPSW moc; unsigned dev, i; BOOL found_valid_port = FALSE; @@ -574,7 +570,7 @@ static LRESULT MIDIMAP_drvOpen(void) midiOutPorts[dev].lpbPatch = NULL; for (i = 0; i < 16; i++) midiOutPorts[dev].aChn[i] = i; - if (wcsncmp(midiOutPorts[dev].name, throughportW, lstrlenW(throughportW)) != 0) + if (wcsncmp(midiOutPorts[dev].name, L"Midi Through", lstrlenW(L"Midi Through")) != 0) found_valid_port = TRUE; } else

1 0

Michael Stefaniuc : mciseq: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 21dca0a2d07dcdea7e43ebbb63dd80970ddd40aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=21dca0a2d07dcdea7e43ebbb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:16 2020 +0200 mciseq: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciseq/mcimidi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 8c52730b15..33f9fde42c 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -1509,7 +1509,6 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp { LPCWSTR str = 0; DWORD ret = 0; - static const WCHAR wszMidiSeq[] = {'W','i','n','e','\'','s',' ','M','I','D','I',' ','s','e','q','u','e','n','c','e','r',0}; TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); @@ -1519,7 +1518,7 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { - case MCI_INFO_PRODUCT: str = wszMidiSeq; break; + case MCI_INFO_PRODUCT: str = L"Wine's MIDI sequencer"; break; case MCI_INFO_FILE: str = wmm->lpstrElementName; break; case MCI_INFO_COPYRIGHT: str = wmm->lpstrCopyright; break; case MCI_INFO_NAME: str = wmm->lpstrName; break; @@ -1529,10 +1528,9 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp } if (!ret) { if (lpParms->dwRetSize) { - WCHAR zero = 0; /* FIXME? Since NT, mciwave, mciseq and mcicda set dwRetSize * to the number of characters written, excluding \0. */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } else ret = MCIERR_PARAM_OVERFLOW; } if (MMSYSERR_NOERROR==ret && (dwFlags & MCI_NOTIFY))

1 0

Michael Stefaniuc : mcicda: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 1d5e028ef47c2112e86be7620792394401656beb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d5e028ef47c2112e86be762… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:15 2020 +0200 mcicda: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mcicda/mcicda.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index e23ba5a2d6..ea7e2a6261 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -665,15 +665,13 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); if (dwFlags & MCI_INFO_PRODUCT) { - static const WCHAR wszAudioCd[] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','C','D',0}; - str = wszAudioCd; + str = L"Wine's audio CD"; } else if (dwFlags & MCI_INFO_MEDIA_UPC) { ret = MCIERR_NO_IDENTITY; } else if (dwFlags & MCI_INFO_MEDIA_IDENTITY) { DWORD res = 0; CDROM_TOC toc; DWORD br; - static const WCHAR wszLu[] = {'%','l','u',0}; if (!device_io(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { @@ -681,7 +679,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) } res = CDROM_Audio_GetSerial(&toc); - swprintf(buffer, ARRAY_SIZE(buffer), wszLu, res); + swprintf(buffer, ARRAY_SIZE(buffer), L"%lu", res); str = buffer; } else { WARN("Don't know this info command (%u)\n", dwFlags);

1 0