November 2020 - Wine-Commits

Michael Stefaniuc : vbscript: Use wide-char string literals.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: ca5bc488d97478b9a3310b3150156d4e2f9581b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca5bc488d97478b9a3310b31… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:20 2020 +0100 vbscript: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 7 ++----- dlls/vbscript/global.c | 52 +++++++++++++++++------------------------------- dlls/vbscript/interp.c | 4 +--- dlls/vbscript/lex.c | 3 +-- dlls/vbscript/vbregexp.c | 3 +-- 5 files changed, 23 insertions(+), 46 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 5c298ebe99a..0d1960d8ca1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1674,9 +1674,6 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) unsigned i; HRESULT hres; - static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; - static const WCHAR class_terminateW[] = {'c','l','a','s','s','_','t','e','r','m','i','n','a','t','e',0}; - if(lookup_dim_decls(ctx, class_decl->name) || lookup_funcs_name(ctx, class_decl->name) || lookup_const_decls(ctx, class_decl->name, FALSE) || lookup_class_name(ctx, class_decl->name)) { FIXME("%s: redefinition\n", debugstr_w(class_decl->name)); @@ -1722,14 +1719,14 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) } } - if(!wcsicmp(class_initializeW, func_decl->name)) { + if(!wcsicmp(L"class_initialize", func_decl->name)) { if(func_decl->type != FUNC_SUB) { FIXME("class initializer is not sub\n"); return E_FAIL; } class_desc->class_initialize_id = i; - }else if(!wcsicmp(class_terminateW, func_decl->name)) { + }else if(!wcsicmp(L"class_terminate", func_decl->name)) { if(func_decl->type != FUNC_SUB) { FIXME("class terminator is not sub\n"); return E_FAIL; diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 18504a43b9a..feab156c7b4 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -37,9 +37,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}}; -static const WCHAR emptyW[] = {0}; -static const WCHAR vbscriptW[] = {'V','B','S','c','r','i','p','t',0}; - #define BP_GET 1 #define BP_GETPUT 2 @@ -600,21 +597,21 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR o if(orig_title && *orig_title) { WCHAR *ptr; - title = title_buf = heap_alloc(sizeof(vbscriptW) + (lstrlenW(orig_title)+2)*sizeof(WCHAR)); + title = title_buf = heap_alloc(sizeof(L"VBScript") + (lstrlenW(orig_title)+2)*sizeof(WCHAR)); if(!title) return E_OUTOFMEMORY; - memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); - ptr = title_buf + ARRAY_SIZE(vbscriptW)-1; + memcpy(title_buf, L"VBScript", sizeof(L"VBScript")); + ptr = title_buf + ARRAY_SIZE(L"VBScript")-1; *ptr++ = ':'; *ptr++ = ' '; lstrcpyW(ptr, orig_title); }else { - title = vbscriptW; + title = L"VBScript"; } }else { - title = orig_title ? orig_title : emptyW; + title = orig_title ? orig_title : L""; } hres = IActiveScriptSiteWindow_GetWindow(acts_window, &hwnd); @@ -2203,19 +2200,6 @@ static HRESULT Global_DatePart(BuiltinDisp *This, VARIANT *arg, unsigned args_cn static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - static const WCHAR ByteW[] = {'B', 'y', 't', 'e', 0}; - static const WCHAR IntegerW[] = {'I', 'n', 't', 'e', 'g', 'e', 'r', 0}; - static const WCHAR LongW[] = {'L', 'o', 'n', 'g', 0}; - static const WCHAR SingleW[] = {'S', 'i', 'n', 'g', 'l', 'e', 0}; - static const WCHAR DoubleW[] = {'D', 'o', 'u', 'b', 'l', 'e', 0}; - static const WCHAR CurrencyW[] = {'C', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 0}; - static const WCHAR DecimalW[] = {'D', 'e', 'c', 'i', 'm', 'a', 'l', 0}; - static const WCHAR DateW[] = {'D', 'a', 't', 'e', 0}; - static const WCHAR StringW[] = {'S', 't', 'r', 'i', 'n', 'g', 0}; - static const WCHAR BooleanW[] = {'B', 'o', 'o', 'l', 'e', 'a', 'n', 0}; - static const WCHAR EmptyW[] = {'E', 'm', 'p', 't', 'y', 0}; - static const WCHAR NullW[] = {'N', 'u', 'l', 'l', 0}; - TRACE("(%s)\n", debugstr_variant(arg)); assert(args_cnt == 1); @@ -2225,29 +2209,29 @@ static HRESULT Global_TypeName(BuiltinDisp *This, VARIANT *arg, unsigned args_cn switch(V_VT(arg)) { case VT_UI1: - return return_string(res, ByteW); + return return_string(res, L"Byte"); case VT_I2: - return return_string(res, IntegerW); + return return_string(res, L"Integer"); case VT_I4: - return return_string(res, LongW); + return return_string(res, L"Long"); case VT_R4: - return return_string(res, SingleW); + return return_string(res, L"Single"); case VT_R8: - return return_string(res, DoubleW); + return return_string(res, L"Double"); case VT_CY: - return return_string(res, CurrencyW); + return return_string(res, L"Currency"); case VT_DECIMAL: - return return_string(res, DecimalW); + return return_string(res, L"Decimal"); case VT_DATE: - return return_string(res, DateW); + return return_string(res, L"Date"); case VT_BSTR: - return return_string(res, StringW); + return return_string(res, L"String"); case VT_BOOL: - return return_string(res, BooleanW); + return return_string(res, L"Boolean"); case VT_EMPTY: - return return_string(res, EmptyW); + return return_string(res, L"Empty"); case VT_NULL: - return return_string(res, NullW); + return return_string(res, L"Null"); default: FIXME("arg %s not supported\n", debugstr_variant(arg)); return E_NOTIMPL; @@ -2665,7 +2649,7 @@ static HRESULT Global_ScriptEngine(BuiltinDisp *This, VARIANT *arg, unsigned arg assert(args_cnt == 0); - return return_string(res, vbscriptW); + return return_string(res, L"VBScript"); } static HRESULT Global_ScriptEngineMajorVersion(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 40d1e961ccb..560d3b16e69 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1127,11 +1127,9 @@ static HRESULT interp_new(exec_ctx_t *ctx) VARIANT v; HRESULT hres; - static const WCHAR regexpW[] = {'r','e','g','e','x','p',0}; - TRACE("%s\n", debugstr_w(arg)); - if(!wcsicmp(arg, regexpW)) { + if(!wcsicmp(arg, L"regexp")) { V_VT(&v) = VT_DISPATCH; hres = create_regexp(&V_DISPATCH(&v)); if(FAILED(hres)) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 251374d90e6..e98ed98e194 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -337,8 +337,7 @@ static void skip_spaces(parser_ctx_t *ctx) static int comment_line(parser_ctx_t *ctx) { - static const WCHAR newlineW[] = {'\n','\r',0}; - ctx->ptr = wcspbrk(ctx->ptr, newlineW); + ctx->ptr = wcspbrk(ctx->ptr, L"\n\r"); if(ctx->ptr) ctx->ptr++; else diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 49046bc7810..ddaadb0ce3f 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -52,10 +52,9 @@ static HRESULT init_regexp_typeinfo(regexp_tid_t tid) HRESULT hres; if(!typelib) { - static const WCHAR vbscript_dll3W[] = {'v','b','s','c','r','i','p','t','.','d','l','l','\\','3',0}; ITypeLib *tl; - hres = LoadTypeLib(vbscript_dll3W, &tl); + hres = LoadTypeLib(L"vbscript.dll\\3", &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); return hres;

1 0

Zebediah Figura : msi: Use the global is_wow64 variable in custom_start_server().
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 12ae1f8528b18d0df018680747429be29fca7ea4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12ae1f8528b18d0df0186807… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 18:28:13 2020 -0600 msi: Use the global is_wow64 variable in custom_start_server(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 508d2edb5cf..b3ac7327d94 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -582,7 +582,6 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) WCHAR buffer[24]; void *cookie; HANDLE pipe; - BOOL wow64; if ((arch == SCS_32BIT_BINARY && package->custom_server_32_process) || (arch == SCS_64BIT_BINARY && package->custom_server_64_process)) @@ -595,17 +594,14 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) if (pipe == INVALID_HANDLE_VALUE) ERR("Failed to create custom action client pipe: %u\n", GetLastError()); - if (!IsWow64Process(GetCurrentProcess(), &wow64)) - wow64 = FALSE; - - if ((sizeof(void *) == 8 || wow64) && arch == SCS_32BIT_BINARY) + if ((sizeof(void *) == 8 || is_wow64) && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\\msiexec.exe")); else GetSystemDirectoryW(path, MAX_PATH - ARRAY_SIZE(L"\\msiexec.exe")); lstrcatW(path, L"\\msiexec.exe"); swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s -Embedding %d", path, GetCurrentProcessId()); - if (wow64 && arch == SCS_64BIT_BINARY) + if (is_wow64 && arch == SCS_64BIT_BINARY) { Wow64DisableWow64FsRedirection(&cookie); CreateProcessW(path, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);

1 0

Zebediah Figura : quartz: Don't stop the filter in IFilterGraph::RemoveFilter().
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: d19aac6edb9e65f9280f8ae51082e5a0b75c0257 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19aac6edb9e65f9280f8ae5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 11:04:34 2020 -0600 quartz: Don't stop the filter in IFilterGraph::RemoveFilter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 ----- dlls/quartz/tests/filtergraph.c | 6 ++---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index b7f15695a6d..872b355cd35 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -720,11 +720,6 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte } TRACE("Removing filter %s.\n", debugstr_w(entry->name)); - IBaseFilter_GetState(pFilter, 0, &state); - if (state == State_Running) - IBaseFilter_Pause(pFilter); - if (state != State_Stopped) - IBaseFilter_Stop(pFilter); hr = IBaseFilter_EnumPins(pFilter, &penumpins); if (SUCCEEDED(hr)) { diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2e1a8b7ad66..b0f287e7fe2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3721,14 +3721,12 @@ todo_wine hr = IFilterGraph2_RemoveFilter(graph, &dummy.IBaseFilter_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); hr = IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, L"dummy"); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); + ok(dummy.state == State_Paused, "Got state %#x.\n", dummy.state); - if (dummy.state == State_Stopped) - dummy.expect_stop_prev = State_Stopped; hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Stopped);

1 0

Zebediah Figura : msi/tests: Test the "VersionNT" property.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 990fc66274d68b915df62005ab93792129612fc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=990fc66274d68b915df62005… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 15 18:28:14 2020 -0600 msi/tests: Test the "VersionNT" property. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f8bf431883b..3b98d9ef111 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5735,6 +5735,9 @@ static void test_installprops(void) GetNativeSystemInfo(&si); + sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion()))); + check_prop(hpkg, "VersionNT", buf, 1); + if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { sprintf(buf, "%d", si.wProcessorLevel);

1 0

Anton Baskanov : amstream: Wait for presentation time in AMDirectDrawStream::Receive.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: b2148c2fffd61cc7a58f9c8ca2d7fff28e4f41b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2148c2fffd61cc7a58f9c8c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Nov 12 01:45:54 2020 +0700 amstream: Wait for presentation time in AMDirectDrawStream::Receive. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 22 +++- dlls/amstream/tests/amstream.c | 280 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 301 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2148c2fffd61cc7a58f…

1 0

Michael Stefaniuc : mstask: Use wide-char string literals.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 5d066f4f7a12ff2d0c80164ff2b5ccd81edb63d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d066f4f7a12ff2d0c80164f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:13 2020 +0100 mstask: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 10 ++++------ dlls/mstask/task_scheduler.c | 15 +++++---------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index a15e0164b43..398cefc58e4 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1617,8 +1617,8 @@ static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str) static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR task_name, BOOL remember) { - static WCHAR authorW[] = { 'W','i','n','e',0 }; - static WCHAR commentW[] = { 'C','r','e','a','t','e','d',' ','b','y',' ','W','i','n','e',0 }; + static WCHAR authorW[] = L"Wine"; + static WCHAR commentW[] = L"Created by Wine"; FIXDLEN_DATA fixed; WORD word, user_data_size = 0; HANDLE hfile; @@ -1883,8 +1883,6 @@ static const IPersistFileVtbl MSTASK_IPersistFileVtbl = HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) { - static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; - static const WCHAR jobW[] = { '.','j','o','b',0 }; TaskImpl *This; WCHAR task_name[MAX_PATH]; ITaskDefinition *taskdef; @@ -1896,9 +1894,9 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); - lstrcatW(task_name, tasksW); + lstrcatW(task_name, L"\\Tasks\\"); lstrcatW(task_name, name); - lstrcatW(task_name, jobW); + lstrcatW(task_name, L".job"); hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 54ca3609ff4..12eeae3565c 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -124,7 +124,6 @@ static inline BOOL is_file(const WIN32_FIND_DATAW *data) static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPWSTR **names, ULONG *fetched) { - static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\','*',0 }; EnumWorkItemsImpl *This = impl_from_IEnumWorkItems(iface); WCHAR path[MAX_PATH]; WIN32_FIND_DATAW data; @@ -146,7 +145,7 @@ static HRESULT WINAPI EnumWorkItems_Next(IEnumWorkItems *iface, ULONG count, LPW if (This->handle == INVALID_HANDLE_VALUE) { GetWindowsDirectoryW(path, MAX_PATH); - lstrcatW(path, tasksW); + lstrcatW(path, L"\\Tasks\\*"); This->handle = FindFirstFileW(path, &data); if (This->handle == INVALID_HANDLE_VALUE) return S_FALSE; @@ -417,8 +416,6 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Activate(ITaskScheduler *iface, static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWSTR name) { - static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; - static const WCHAR jobW[] = { '.','j','o','b',0 }; WCHAR task_name[MAX_PATH]; TRACE("%p, %s\n", iface, debugstr_w(name)); @@ -426,9 +423,9 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWST if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); - lstrcatW(task_name, tasksW); + lstrcatW(task_name, L"\\Tasks\\"); lstrcatW(task_name, name); - lstrcatW(task_name, jobW); + lstrcatW(task_name, L".job"); if (!DeleteFileW(task_name)) return HRESULT_FROM_WIN32(GetLastError()); @@ -459,8 +456,6 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, LPCWSTR name, IScheduledWorkItem *item) { - static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; - static const WCHAR jobW[] = { '.','j','o','b',0 }; WCHAR task_name[MAX_PATH]; IPersistFile *pfile; HRESULT hr; @@ -470,9 +465,9 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, L if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); - lstrcatW(task_name, tasksW); + lstrcatW(task_name, L"\\Tasks\\"); lstrcatW(task_name, name); - lstrcatW(task_name, jobW); + lstrcatW(task_name, L".job"); hr = IScheduledWorkItem_QueryInterface(item, &IID_IPersistFile, (void **)&pfile); if (hr == S_OK)

1 0

Michael Stefaniuc : inetcpl.cpl: Trace the actual AutoConfigURL and not the value name.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: f5f95e22c61ec988c23becf0680d7c432db9dde4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f95e22c61ec988c23becf0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:22 2020 +0100 inetcpl.cpl: Trace the actual AutoConfigURL and not the value name. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index c24374fd2a5..04e26ead6a7 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -184,7 +184,7 @@ static void connections_on_initdialog(HWND hwnd) TRACE("ProxyEnable = %x\n", enabled); TRACE("ProxyServer = %s\n", wine_dbgstr_w(address)); - TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(auto_config_url)); + TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(pac_url)); if(enabled) {

1 0

Michael Stefaniuc : mscms: Use wide-char string literals.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: e32d62df4385c69d0140bbbc586381d5d3bca93b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32d62df4385c69d0140bbbc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:18 2020 +0100 mscms: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/profile.c | 8 +++----- dlls/mscms/tests/profile.c | 15 +++++---------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index bc7f200006b..26a2eacd597 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -615,7 +615,6 @@ BOOL WINAPI GetStandardColorSpaceProfileW( PCWSTR machine, DWORD id, PWSTR profi static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) { - static const WCHAR slash[] = {'\\',0}; BOOL ret; PROFILE profile; WCHAR path[MAX_PATH]; @@ -628,13 +627,13 @@ static BOOL header_from_file( LPCWSTR file, PPROFILEHEADER header ) WARN( "Can't retrieve color directory\n" ); return FALSE; } - if (size + sizeof(slash) + sizeof(WCHAR) * lstrlenW( file ) > sizeof(path)) + if (size + sizeof(L"\\") + sizeof(WCHAR) * lstrlenW( file ) > sizeof(path)) { WARN( "Filename too long\n" ); return FALSE; } - lstrcatW( path, slash ); + lstrcatW( path, L"\\" ); lstrcatW( path, file ); profile.dwType = PROFILE_FILENAME; @@ -1058,7 +1057,6 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) { WCHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - static const WCHAR slash[] = { '\\', 0 }; TRACE( "( %s )\n", debugstr_w(profile) ); @@ -1068,7 +1066,7 @@ BOOL WINAPI InstallColorProfileW( PCWSTR machine, PCWSTR profile ) basename( profile, base ); - lstrcatW( dest, slash ); + lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); /* Is source equal to destination? */ diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 15a0533145d..063ea22420d 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -102,7 +102,7 @@ static BOOL init_function_ptrs( void ) } static const char machine[] = "dummy"; -static const WCHAR machineW[] = { 'd','u','m','m','y',0 }; +static const WCHAR machineW[] = L"dummy"; /* To do any real functionality testing with this suite you need a copy of * the freely distributable standard RGB color space profile. It comes @@ -119,12 +119,9 @@ static const char profile2[] = "\\spool\\drivers\\color\\srgb color space profile.icm"; static const WCHAR profile1W[] = -{ '\\','c','o','l','o','r','\\','s','r','g','b',' ','c','o','l','o','r',' ', - 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; +L"\\color\\srgb color space profile.icm"; static const WCHAR profile2W[] = -{ '\\','s','p','o','o','l','\\','d','r','i','v','e','r','s','\\', - 'c','o','l','o','r','\\','s','r','g','b',' ','c','o','l','o','r',' ', - 's','p','a','c','e',' ','p','r','o','f','i','l','e','.','i','c','m',0 }; +L"\\spool\\drivers\\color\\srgb color space profile.icm"; static BOOL have_color_profile; @@ -832,7 +829,6 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi { WCHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - WCHAR slash[] = { '\\', 0 }; HANDLE handle; SetLastError(0xdeadbeef); @@ -849,7 +845,7 @@ static void test_InstallColorProfileW( WCHAR *standardprofileW, WCHAR *testprofi MSCMS_basenameW( testprofileW, base ); - lstrcatW( dest, slash ); + lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); /* Check if the profile is really there */ @@ -1210,7 +1206,6 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) WCHAR dest[MAX_PATH], base[MAX_PATH]; char destA[MAX_PATH]; DWORD size = sizeof(dest); - WCHAR slash[] = { '\\', 0 }; HANDLE handle; int bytes_copied; @@ -1228,7 +1223,7 @@ static void test_UninstallColorProfileW( WCHAR *testprofileW ) MSCMS_basenameW( testprofileW, base ); - lstrcatW( dest, slash ); + lstrcatW( dest, L"\\" ); lstrcatW( dest, base ); ret = pUninstallColorProfileW( NULL, dest, TRUE );

1 0

Michael Stefaniuc : gdi32/uniscribe: Use wide-char string literals.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 236fa496daf3ebcb43bc2c06bb62b1a048951feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=236fa496daf3ebcb43bc2c06… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:12 2020 +0100 gdi32/uniscribe: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/uniscribe/usp10.c | 259 ++++++++++++++----------------------------- 1 file changed, 86 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=236fa496daf3ebcb43bc…

1 0

Michael Stefaniuc : mscms/tests: Inline a simple string.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: d8b26261e95df69f7b677c415dd712d9bef37c1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8b26261e95df69f7b677c41… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:19 2020 +0100 mscms/tests: Inline a simple string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 063ea22420d..be4eaa66c00 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -772,7 +772,6 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile { CHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - CHAR slash[] = "\\"; HANDLE handle; SetLastError(0xdeadbeef); @@ -789,7 +788,7 @@ static void test_InstallColorProfileA( char *standardprofile, char *testprofile MSCMS_basenameA( testprofile, base ); - lstrcatA( dest, slash ); + lstrcatA( dest, "\\" ); lstrcatA( dest, base ); /* Check if the profile is really there */ @@ -1157,7 +1156,6 @@ static void test_UninstallColorProfileA( char *testprofile ) { CHAR dest[MAX_PATH], base[MAX_PATH]; DWORD size = sizeof(dest); - CHAR slash[] = "\\"; HANDLE handle; SetLastError(0xdeadbeef); @@ -1174,7 +1172,7 @@ static void test_UninstallColorProfileA( char *testprofile ) MSCMS_basenameA( testprofile, base ); - lstrcatA( dest, slash ); + lstrcatA( dest, "\\" ); lstrcatA( dest, base ); ret = pUninstallColorProfileA( NULL, dest, TRUE );

1 0