October 2020 - Wine-Commits

Martin Storsjo : ntdll: Unwind to the LR register if no unwind info is available.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: df794f342500f1b4bfd988f292302afa890354c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df794f342500f1b4bfd988f2… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 5 12:16:39 2020 +0300 ntdll: Unwind to the LR register if no unwind info is available. Try to keep the behaviour from ea9f47a767c2 of erroring out if unwinding ends up out of bounds (with pc==lr, where setting pc to lr doesn't progress the unwind), but support unwinding from functions without unwind info. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index eb451603fe..c9f44e92d3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -197,8 +197,16 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } else { - WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); - return STATUS_INVALID_DISPOSITION; + status = context->Pc != context->u.s.Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + WARN( "exception data not found in %s for %p, LR %p, status %x\n", + debugstr_w(module->BaseDllName.Buffer), (void*) context->Pc, + (void*) context->u.s.Lr, status ); + dispatch->EstablisherFrame = context->Sp; + dispatch->LanguageHandler = NULL; + context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return status; } dispatch->EstablisherFrame = context->u.s.Fp;

1 0

Rémi Bernon : include: Split objidl.idl to objidlbase.idl.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 6e09636f68c30d0452db3268e366a4c26301f826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e09636f68c30d0452db3268… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:13 2020 +0200 include: Split objidl.idl to objidlbase.idl. Windows SDKs use #include here to import one into the other, so we do the same. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/objidl.idl | 1217 ++---------------------------------------------- include/objidlbase.idl | 1198 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1227 insertions(+), 1189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e09636f68c30d0452db…

1 0

Daniel Lehman : tzres: Add North Korea Time Zone.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: a486680a2b008d18da1a321b3ed2a921312bce69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a486680a2b008d18da1a321b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Oct 4 16:22:37 2020 -0700 tzres: Add North Korea Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 14 +++++ po/ar.po | 142 ++++++++++++++++++++++++++++----------------------- po/ast.po | 142 ++++++++++++++++++++++++++++----------------------- po/bg.po | 138 ++++++++++++++++++++++++++----------------------- po/ca.po | 142 ++++++++++++++++++++++++++++----------------------- po/cs.po | 142 ++++++++++++++++++++++++++++----------------------- po/da.po | 142 ++++++++++++++++++++++++++++----------------------- po/de.po | 142 ++++++++++++++++++++++++++++----------------------- po/el.po | 138 ++++++++++++++++++++++++++----------------------- po/en.po | 138 ++++++++++++++++++++++++++----------------------- po/en_US.po | 138 ++++++++++++++++++++++++++----------------------- po/eo.po | 142 ++++++++++++++++++++++++++++----------------------- po/es.po | 142 ++++++++++++++++++++++++++++----------------------- po/fa.po | 140 +++++++++++++++++++++++++++----------------------- po/fi.po | 142 ++++++++++++++++++++++++++++----------------------- po/fr.po | 142 ++++++++++++++++++++++++++++----------------------- po/he.po | 142 ++++++++++++++++++++++++++++----------------------- po/hi.po | 138 ++++++++++++++++++++++++++----------------------- po/hr.po | 142 ++++++++++++++++++++++++++++----------------------- po/hu.po | 142 ++++++++++++++++++++++++++++----------------------- po/it.po | 142 ++++++++++++++++++++++++++++----------------------- po/ja.po | 142 ++++++++++++++++++++++++++++----------------------- po/ko.po | 142 ++++++++++++++++++++++++++++----------------------- po/lt.po | 142 ++++++++++++++++++++++++++++----------------------- po/ml.po | 138 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 142 ++++++++++++++++++++++++++++----------------------- po/nl.po | 142 ++++++++++++++++++++++++++++----------------------- po/or.po | 138 ++++++++++++++++++++++++++----------------------- po/pa.po | 138 ++++++++++++++++++++++++++----------------------- po/pl.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 142 ++++++++++++++++++++++++++++----------------------- po/rm.po | 138 ++++++++++++++++++++++++++----------------------- po/ro.po | 142 ++++++++++++++++++++++++++++----------------------- po/ru.po | 138 ++++++++++++++++++++++++++----------------------- po/si.po | 142 ++++++++++++++++++++++++++++----------------------- po/sk.po | 142 ++++++++++++++++++++++++++++----------------------- po/sl.po | 142 ++++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 141 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 141 +++++++++++++++++++++++++++----------------------- po/sv.po | 142 ++++++++++++++++++++++++++++----------------------- po/ta.po | 138 ++++++++++++++++++++++++++----------------------- po/te.po | 138 ++++++++++++++++++++++++++----------------------- po/th.po | 140 +++++++++++++++++++++++++++----------------------- po/tr.po | 142 ++++++++++++++++++++++++++++----------------------- po/uk.po | 138 ++++++++++++++++++++++++++----------------------- po/wa.po | 140 +++++++++++++++++++++++++++----------------------- po/wine.pot | 138 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 142 ++++++++++++++++++++++++++++----------------------- po/zh_TW.po | 142 ++++++++++++++++++++++++++++----------------------- 51 files changed, 3725 insertions(+), 3185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a486680a2b008d18da1a…

1 0

Matteo Bruni : winex11: Add DriverDate registry property to display adapters.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: bd27af974a21085cd0dc78b37b715bbcc3cfab69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd27af974a21085cd0dc78b3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 1 11:01:11 2020 +0200 winex11: Add DriverDate registry property to display adapters. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 47e4733dba..cf55a5c1fb 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -51,6 +51,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; +static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -107,6 +108,7 @@ static const WCHAR monitor_instance_fmtW[] = { static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; +static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -403,14 +405,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; + SYSTEMTIME systemtime; WCHAR bufferW[1024]; + FILETIME filetime; HKEY hkey = NULL; GUID guid; LUID luid; INT written; DWORD size; BOOL ret = FALSE; - FILETIME filetime; TRACE("GPU id:0x%s name:%s.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name)); @@ -468,6 +471,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + GetSystemTime(&systemtime); + sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); + if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */

1 0

Rémi Bernon : include: Add IAgileObject to objidlbase.idl.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: cdf013b9b984e4d161b7a3ae27adde366969eee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf013b9b984e4d161b7a3ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:14 2020 +0200 include: Add IAgileObject to objidlbase.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objidlbase.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/objidlbase.idl b/include/objidlbase.idl index 7f649dd005..6449be8417 100644 --- a/include/objidlbase.idl +++ b/include/objidlbase.idl @@ -83,6 +83,15 @@ interface IMarshal : IUnknown [in] DWORD dwReserved); } +[ + local, + object, + uuid(94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90) +] +interface IAgileObject : IUnknown +{ +} + [ local, object,

1 0

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

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

Oct. 5, 2020

Module: wine Branch: master Commit: dea1fceb71117d449356c45e9fb547a044a8cea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea1fceb71117d449356c45e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:21 2020 +0200 msdmo/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/msdmo/tests/msdmo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index b1b2f544ce..41e6d57d2e 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -41,7 +41,6 @@ static const char *guid_to_string(const GUID *guid) static void test_DMOUnregister(void) { static char buffer[200]; - static const WCHAR testdmoW[] = {'t','e','s','t','d','m','o',0}; HRESULT hr; hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); @@ -51,10 +50,10 @@ static void test_DMOUnregister(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); /* can't register for all categories */ - hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_NULL, 0, 0, NULL, 0, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = DMORegister(testdmoW, &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 0, NULL, 0, NULL); if (hr != S_OK) { win_skip("Failed to register DMO. Probably user doesn't have persmissions to do so.\n"); return;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 796cd56faf3384dab41be23967766d01e45dd7f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=796cd56faf3384dab41be239… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:17 2020 +0200 mciwave: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciwave/mciwave.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 78f26c2672..13dd927cd4 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -1683,15 +1683,11 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l if (wmw == NULL) { ret = MCIERR_INVALID_DEVICE_ID; } else { - static const WCHAR wszAudio [] = {'W','i','n','e','\'','s',' ','a','u','d','i','o',' ','p','l','a','y','e','r',0}; - static const WCHAR wszWaveIn [] = {'W','i','n','e',' ','W','a','v','e',' ','I','n',0}; - static const WCHAR wszWaveOut[] = {'W','i','n','e',' ','W','a','v','e',' ','O','u','t',0}; - switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { - case MCI_INFO_PRODUCT: str = wszAudio; break; + case MCI_INFO_PRODUCT: str = L"Wine's audio player"; break; case MCI_INFO_FILE: str = wmw->lpFileName; break; - case MCI_WAVE_INPUT: str = wszWaveIn; break; - case MCI_WAVE_OUTPUT: str = wszWaveOut; break; + case MCI_WAVE_INPUT: str = L"Wine Wave In"; break; + case MCI_WAVE_OUTPUT: str = L"Wine Wave Out"; break; default: WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_KEYWORD; @@ -1699,10 +1695,9 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l } 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 : xolehlp: Use wide-char string literals.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: eede9959edb5a91ada6651a10ca6ba257e213c63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eede9959edb5a91ada6651a1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:30 2020 +0200 xolehlp: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xolehlp/xolehlp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 4baf31f260..29b3024445 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -657,11 +657,10 @@ static BOOL is_local_machineA( const CHAR *server ) } static BOOL is_local_machineW( const WCHAR *server ) { - static const WCHAR dotW[] = {'.',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = ARRAY_SIZE( buffer ); - if (!server || !wcscmp( server, dotW )) return TRUE; + if (!server || !wcscmp( server, L"." )) return TRUE; if (GetComputerNameW( buffer, &len ) && !wcsicmp( server, buffer )) return TRUE; return FALSE; }

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: f6e7f00010195966c022ca7456fdd4e3952cac82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6e7f00010195966c022ca74… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:29 2020 +0200 xinput1_3: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index bb719ed56c..8aea638a8d 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -243,12 +243,11 @@ void HID_find_gamepads(xinput_controller *devices) while (SetupDiEnumDeviceInterfaces(device_info_set, NULL, &hid_guid, idx++, &interface_data)) { - static const WCHAR ig[] = {'I','G','_',0}; if (!SetupDiGetDeviceInterfaceDetailW(device_info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) continue; - if (!wcsstr(data->DevicePath, ig)) + if (!wcsstr(data->DevicePath, L"IG_")) continue; open_device_idx = -1;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: b72440fa2e1016681cbfcebcdc4792b6ced3eb53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b72440fa2e1016681cbfcebc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:24 2020 +0200 propsys: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys_main.c | 12 +++--------- dlls/propsys/propvar.c | 21 ++++++--------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 75963d7b6c..91ebc62127 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -280,12 +280,6 @@ HRESULT WINAPI PSRefreshPropertySchema(void) HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch) { - static const WCHAR guid_fmtW[] = {'{','%','0','8','X','-','%','0','4','X','-', - '%','0','4','X','-','%','0','2','X','%','0','2','X','-', - '%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - static const WCHAR pid_fmtW[] = {'%','u',0}; - WCHAR pidW[PKEY_PIDSTR_MAX + 1]; LPWSTR p = psz; int len; @@ -305,8 +299,8 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch return E_NOT_SUFFICIENT_BUFFER; } - swprintf(psz, cch, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, - pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], + swprintf(psz, cch, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", pkey->fmtid.Data1, + pkey->fmtid.Data2, pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1], pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4], pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]); @@ -315,7 +309,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = ' '; cch -= GUIDSTRING_MAX - 1 + 1; - len = swprintf(pidW, ARRAY_SIZE(pidW), pid_fmtW, pkey->pid); + len = swprintf(pidW, ARRAY_SIZE(pidW), L"%u", pkey->pid); if (cch >= len + 1) { diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index dcfee2b0cc..ae08cd1d8d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -245,10 +245,6 @@ HRESULT WINAPI PropVariantToUInt64(REFPROPVARIANT propvarIn, ULONGLONG *ret) HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) { - static const WCHAR trueW[] = {'t','r','u','e',0}; - static const WCHAR falseW[] = {'f','a','l','s','e',0}; - static const WCHAR true2W[] = {'#','T','R','U','E','#',0}; - static const WCHAR false2W[] = {'#','F','A','L','S','E','#',0}; LONGLONG res; HRESULT hr; @@ -267,13 +263,13 @@ HRESULT WINAPI PropVariantToBoolean(REFPROPVARIANT propvarIn, BOOL *ret) if (!propvarIn->u.pwszVal) return DISP_E_TYPEMISMATCH; - if (!lstrcmpiW(propvarIn->u.pwszVal, trueW) || !lstrcmpW(propvarIn->u.pwszVal, true2W)) + if (!lstrcmpiW(propvarIn->u.pwszVal, L"true") || !lstrcmpW(propvarIn->u.pwszVal, L"#TRUE#")) { *ret = TRUE; return S_OK; } - if (!lstrcmpiW(propvarIn->u.pwszVal, falseW) || !lstrcmpW(propvarIn->u.pwszVal, false2W)) + if (!lstrcmpiW(propvarIn->u.pwszVal, L"false") || !lstrcmpW(propvarIn->u.pwszVal, L"#FALSE#")) { *ret = FALSE; return S_OK; @@ -406,11 +402,10 @@ HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret) PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault) { - static const WCHAR str_empty[] = {0}; if (propvarIn->vt == VT_BSTR) { if (propvarIn->u.bstrVal == NULL) - return str_empty; + return L""; return propvarIn->u.bstrVal; } @@ -580,13 +575,9 @@ HRESULT WINAPI PropVariantChangeType(PROPVARIANT *ppropvarDest, REFPROPVARIANT p static void PROPVAR_GUIDToWSTR(REFGUID guid, WCHAR *str) { - static const WCHAR format[] = {'{','%','0','8','X','-','%','0','4','X','-','%','0','4','X', - '-','%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','}',0}; - - swprintf(str, 39, format, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + swprintf(str, 39, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, + guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); } HRESULT WINAPI InitPropVariantFromGUIDAsString(REFGUID guid, PROPVARIANT *ppropvar)

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: bbb00dce7ee0f14a6e6a157c880b0228eddc17cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbb00dce7ee0f14a6e6a157c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:23 2020 +0200 netcfgx/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/netcfgx/tests/netcfgx.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/netcfgx/tests/netcfgx.c b/dlls/netcfgx/tests/netcfgx.c index fda39f5773..31558f44f4 100644 --- a/dlls/netcfgx/tests/netcfgx.c +++ b/dlls/netcfgx/tests/netcfgx.c @@ -25,8 +25,6 @@ static void create_configuration(void) { - static const WCHAR tcpipW[] = {'M','S','_','T','C','P','I','P',0}; - static const WCHAR myclient[] = {'M','Y',' ','C','L','I','E','N','T',0}; HRESULT hr; INetCfg *config = NULL; INetCfgLock *netlock = NULL; @@ -40,7 +38,7 @@ static void create_configuration(void) hr = INetCfg_QueryInterface(config, &IID_INetCfgLock, (LPVOID*)&netlock); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); ok(hr == S_OK || hr == E_ACCESSDENIED /* Not run as admin */, "got 0x%08x\n", hr); if(hr == S_OK) @@ -55,10 +53,10 @@ static void create_configuration(void) ok(hr == S_OK, "got 0x%08x\n", hr); /* AcquireWriteLock needs to be run before Initialize */ - hr = INetCfgLock_AcquireWriteLock(netlock, 5000, myclient, &client); + hr = INetCfgLock_AcquireWriteLock(netlock, 5000, L"MY CLIENT", &client); todo_wine ok(hr == NETCFG_E_ALREADY_INITIALIZED || hr == E_ACCESSDENIED, "got 0x%08x\n", hr); - hr = INetCfg_FindComponent(config, tcpipW, &component); + hr = INetCfg_FindComponent(config, L"MS_TCPIP", &component); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) {

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 2c209ccb0bbe7109a0c5d47cf0653ee0ac9bf78f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c209ccb0bbe7109a0c5d47c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:22 2020 +0200 msg711.acm: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msg711.acm/msg711.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/msg711.acm/msg711.c b/dlls/msg711.acm/msg711.c index 6909494e29..7478bfd92a 100644 --- a/dlls/msg711.acm/msg711.c +++ b/dlls/msg711.acm/msg711.c @@ -675,10 +675,6 @@ static LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szALaw[]={'A','-','L','a','w',0}; - static const WCHAR szULaw[]={'U','-','L','a','w',0}; - switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -712,19 +708,19 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); - lstrcpyW(aftd->szFormatTag, szPcm); + lstrcpyW(aftd->szFormatTag, L"PCM"); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_ALAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats); - lstrcpyW(aftd->szFormatTag, szALaw); + lstrcpyW(aftd->szFormatTag, L"A-Law"); break; case 2: aftd->dwFormatTag = WAVE_FORMAT_MULAW; aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats); - lstrcpyW(aftd->szFormatTag, szULaw); + lstrcpyW(aftd->szFormatTag, L"U-Law"); break; } return MMSYSERR_NOERROR;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 69e612c51253ef27796fe4f16263f432dd7ae2a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69e612c51253ef27796fe4f1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:14 2020 +0200 mciavi32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/info.c | 9 +++------ dlls/mciavi32/mciavi.c | 3 +-- dlls/mciavi32/wnd.c | 13 ++++--------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index d516c4d4b0..d603912954 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -190,8 +190,6 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) LPCWSTR str = 0; WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret = 0; - static const WCHAR wszAviPlayer[] = {'W','i','n','e','\'','s',' ','A','V','I',' ','p','l','a','y','e','r',0}; - static const WCHAR wszVersion[] = {'1','.','1',0}; if (lpParms == NULL || lpParms->lpstrReturn == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -203,9 +201,9 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) EnterCriticalSection(&wma->cs); if (dwFlags & MCI_INFO_PRODUCT) - str = wszAviPlayer; + str = L"Wine's AVI player"; else if (dwFlags & MCI_INFO_VERSION) - str = wszVersion; + str = L"1.1"; else if (dwFlags & MCI_INFO_FILE) str = wma->lpFileName; else { @@ -213,9 +211,8 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) ret = MCIERR_UNRECOGNIZED_COMMAND; } if (!ret) { - WCHAR zero = 0; /* Only mciwave, mciseq and mcicda set dwRetSize (since NT). */ - lstrcpynW(lpParms->lpstrReturn, str ? str : &zero, lpParms->dwRetSize); + lstrcpynW(lpParms->lpstrReturn, str ? str : L"", lpParms->dwRetSize); } LeaveCriticalSection(&wma->cs); return ret; diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index d8df240826..7a1657f79e 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -71,7 +71,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) { WINE_MCIAVI* wma; - static const WCHAR mciAviWStr[] = {'M','C','I','A','V','I',0}; TRACE("%s, %p\n", debugstr_w(str), modp); @@ -88,7 +87,7 @@ static DWORD MCIAVI_drvOpen(LPCWSTR str, LPMCI_OPEN_DRIVER_PARMSW modp) wma->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": WINE_MCIAVI.cs"); wma->hStopEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wma->wDevID = modp->wDeviceID; - wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, mciAviWStr, 0); + wma->wCommandTable = mciLoadCommandResource(MCIAVI_hInstance, L"MCIAVI", 0); wma->dwStatus = MCI_MODE_NOT_READY; modp->wCustomCommandTable = wma->wCommandTable; modp->wType = MCI_DEVTYPE_DIGITAL_VIDEO; diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index c9da9ec5c4..d48dbb1357 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi); -static const WCHAR mciaviW[] = {'M','C','I','A','V','I',0}; - static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam); @@ -87,7 +85,7 @@ static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA BOOL MCIAVI_UnregisterClass(void) { - return UnregisterClassW(mciaviW, MCIAVI_hInstance); + return UnregisterClassW(L"MCIAVI", MCIAVI_hInstance); } BOOL MCIAVI_RegisterClass(void) @@ -101,7 +99,7 @@ BOOL MCIAVI_RegisterClass(void) wndClass.hInstance = MCIAVI_hInstance; wndClass.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); - wndClass.lpszClassName = mciaviW; + wndClass.lpszClassName = L"MCIAVI"; if (RegisterClassW(&wndClass)) return TRUE; if (GetLastError() == ERROR_CLASS_ALREADY_EXISTS) return TRUE; @@ -111,7 +109,6 @@ BOOL MCIAVI_RegisterClass(void) BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpParms) { - static const WCHAR captionW[] = {'W','i','n','e',' ','M','C','I','-','A','V','I',' ','p','l','a','y','e','r',0}; HWND hParent = 0; DWORD dwStyle = WS_OVERLAPPEDWINDOW; RECT rc; @@ -135,10 +132,8 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM rc.left = rc.top = CW_USEDEFAULT; } - wma->hWnd = CreateWindowW(mciaviW, captionW, - dwStyle, rc.left, rc.top, - rc.right, rc.bottom, - hParent, 0, MCIAVI_hInstance, + wma->hWnd = CreateWindowW(L"MCIAVI", L"Wine MCI-AVI player", dwStyle, rc.left, rc.top, + rc.right, rc.bottom, hParent, 0, MCIAVI_hInstance, ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd;

1 0

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

Oct. 5, 2020

Module: wine Branch: master Commit: 1d17d8d4712c34ed186db6205f3316374b9c274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d17d8d4712c34ed186db620… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:11 2020 +0200 explorerframe: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 12 ++++-------- dlls/explorerframe/tests/nstc.c | 17 +++++------------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 37e1a553a4..0abaded85a 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -75,8 +75,6 @@ static const DWORD unsupported_styles2 = NSTCS2_INTERRUPTNOTIFICATIONS | NSTCS2_SHOWNULLSPACEMENU | NSTCS2_DISPLAYPADDING | NSTCS2_DISPLAYPINNEDONLY | NTSCS2_NOSINGLETONAUTOEXPAND | NTSCS2_NEVERINSERTNONENUMERATED; -static const WCHAR thispropW[] = {'P','R','O','P','_','T','H','I','S',0}; - static inline NSTC2Impl *impl_from_INameSpaceTreeControl2(INameSpaceTreeControl2 *iface) { return CONTAINING_RECORD(iface, NSTC2Impl, INameSpaceTreeControl2_iface); @@ -510,7 +508,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)tv_wndproc); if(This->tv_oldwndproc) - SetPropW(This->hwnd_tv, thispropW, This); + SetPropW(This->hwnd_tv, L"PROP_THIS", This); return TRUE; } @@ -534,7 +532,7 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) if(This->tv_oldwndproc) { SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)This->tv_oldwndproc); - RemovePropW(This->hwnd_tv, thispropW); + RemovePropW(This->hwnd_tv, L"PROP_THIS"); } INameSpaceTreeControl2_RemoveAllRoots(&This->INameSpaceTreeControl2_iface); @@ -762,7 +760,7 @@ static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lP static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { - NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, thispropW); + NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, L"PROP_THIS"); switch(uMessage) { case WM_KEYDOWN: @@ -879,9 +877,7 @@ static HRESULT WINAPI NSTC2_fnInitialize(INameSpaceTreeControl2* iface, DWORD window_style, window_ex_style; INITCOMMONCONTROLSEX icex; RECT rc; - static const WCHAR NSTC2_CLASS_NAME[] = - {'N','a','m','e','s','p','a','c','e','T','r','e','e', - 'C','o','n','t','r','o','l',0}; + static const WCHAR NSTC2_CLASS_NAME[] = L"NamespaceTreeControl"; TRACE("%p (%p, %p, %x)\n", This, hwndParent, prc, nstcsFlags); diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index a48e3affef..6433b69ebf 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -781,13 +781,6 @@ static void test_basics(void) int cbstate; WCHAR curdirW[MAX_PATH]; WCHAR buf[MAX_PATH]; - static const WCHAR testdirW[] = {'t','e','s','t','d','i','r',0}; - static const WCHAR testdir2W[] = - {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','2',0}; - static const WCHAR test1W[] = - {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; - static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; - static const WCHAR randomW[] = {'_','_','h','e','l','l','o',0}; /* These should exist on platforms supporting the NSTC */ ok(pSHCreateShellItem != NULL, "No SHCreateShellItem.\n"); @@ -827,19 +820,19 @@ static void test_basics(void) lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, testdirW); + lstrcatW(buf, L"testdir"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitestdir); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, testdir2W); + lstrcatW(buf, L"testdir\\testdir2"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitestdir2); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; lstrcpyW(buf, curdirW); myPathAddBackslashW(buf); - lstrcatW(buf, test1W); + lstrcatW(buf, L"testdir\\test1.txt"); hr = pSHCreateItemFromParsingName(buf, NULL, &IID_IShellItem, (void**)&psitest1); ok(hr == S_OK, "Got 0x%08x\n", hr); if(FAILED(hr)) goto cleanup; @@ -1725,9 +1718,9 @@ static void test_basics(void) { hr = INameSpaceTreeControl_SetTheme(pnstc, NULL); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl_SetTheme(pnstc, explorerW); + hr = INameSpaceTreeControl_SetTheme(pnstc, L"Explorer"); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl_SetTheme(pnstc, randomW); + hr = INameSpaceTreeControl_SetTheme(pnstc, L"__hello"); ok(hr == S_OK, "Got 0x%08x\n", hr); }

1 0

Henri Verbeet : include: Update the d3d12 headers from vkd3d.
by Alexandre Julliard Oct. 5, 2020

Oct. 5, 2020

Module: wine Branch: master Commit: 32e07a38095771463c372feac3183947ce69acb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32e07a38095771463c372fea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sat Oct 3 15:07:57 2020 +0330 include: Update the d3d12 headers from vkd3d. This corresponds to vkd3d as of commit ec6fe1cc9dd31ed17d5c9818632ce9ab83d6c441. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d12.idl | 390 ++++++++++++++++++++++++++++++++++++++++++++- include/d3d12sdklayers.idl | 13 ++ 2 files changed, 399 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32e07a38095771463c37…

1 0