- Wine-Devel - list.winehq.org

[PATCH] vbscript: Use wide-char string literals.
by Michael Stefaniuc Nov. 16, 2020

Nov. 16, 2020

Signed-off-by: Michael Stefaniuc <mstefani(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; -- 2.26.2

2 1

[PATCH] gdi32: fix another font->base_font regression
by Rafał Mużyło Nov. 16, 2020

Nov. 16, 2020

This regression has pretty much the same reason as the other recent one. Simply reverting to the properly working code. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

2 1

[PATCH] msi: Use the global is_wow64 variable in custom_start_server().
by Zebediah Figura Nov. 16, 2020

Nov. 16, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- 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); -- 2.29.2

2 3

[PATCH] ws2_32: Read protocol table from a file
by Alex Henrie Nov. 16, 2020

Nov. 16, 2020

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- I intend to extend read_protocol_table and parse_next_protocol to read and parse the services file as well, since the file formats are nearly identical. --- dlls/ws2_32/protocols.tsv | 39 +++++++++ dlls/ws2_32/socket.c | 163 ++++++++++++++++++++++++++++++-------- dlls/ws2_32/version.rc | 3 + loader/wine.inf.in | 12 ++- 4 files changed, 181 insertions(+), 36 deletions(-) create mode 100644 dlls/ws2_32/protocols.tsv diff --git a/dlls/ws2_32/protocols.tsv b/dlls/ws2_32/protocols.tsv new file mode 100644 index 00000000000..288bd739f15 --- /dev/null +++ b/dlls/ws2_32/protocols.tsv @@ -0,0 +1,39 @@ +# Table of Internet protocols +# +# Copyright (c) 2020 The Wine Project +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +# Format: <name> <number> [<alias>...] + +ip 0 IP +icmp 1 ICMP +ggp 3 GGP +tcp 6 TCP +egp 8 EGP +pup 12 PUP +udp 17 UDP +hmp 20 HMP +xns-idp 22 XNS-IDP +rdp 27 RDP +ipv6 41 IPv6 +ipv6-route 43 IPv6-Route +ipv6-frag 44 IPv6-Frag +esp 50 ESP +ah 51 AH +ipv6-icmp 58 IPv6-ICMP +ipv6-nonxt 59 IPv6-NoNxt +ipv6-opts 60 IPv6-Opts +rvd 66 RVD diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3efa4ebd64f..81f4a998e50 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -182,6 +182,8 @@ #define FILE_USE_FILE_POINTER_POSITION ((LONGLONG)-2) +#define MAX_NAMES 4 + WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -6310,28 +6312,112 @@ struct WS_hostent* WINAPI WS_gethostbyname(const char* name) } -static const struct { int prot; const char *names[3]; } protocols[] = -{ - { 0, { "ip", "IP" }}, - { 1, { "icmp", "ICMP" }}, - { 3, { "ggp", "GGP" }}, - { 6, { "tcp", "TCP" }}, - { 8, { "egp", "EGP" }}, - { 12, { "pup", "PUP" }}, - { 17, { "udp", "UDP" }}, - { 20, { "hmp", "HMP" }}, - { 22, { "xns-idp", "XNS-IDP" }}, - { 27, { "rdp", "RDP" }}, - { 41, { "ipv6", "IPv6" }}, - { 43, { "ipv6-route", "IPv6-Route" }}, - { 44, { "ipv6-frag", "IPv6-Frag" }}, - { 50, { "esp", "ESP" }}, - { 51, { "ah", "AH" }}, - { 58, { "ipv6-icmp", "IPv6-ICMP" }}, - { 59, { "ipv6-nonxt", "IPv6-NoNxt" }}, - { 60, { "ipv6-opts", "IPv6-Opts" }}, - { 66, { "rvd", "RVD" }}, -}; +static char * read_protocol_table(void) +{ + static const WCHAR drivers_etc_protocol[] = {'\\','d','r','i','v','e','r','s', + '\\','e','t','c', + '\\','p','r','o','t','o','c','o','l',0}; + WCHAR table_path[MAX_PATH]; + HANDLE table_file; + DWORD table_len, bytes_read; + BOOL ret; + char *table_text; + + GetSystemDirectoryW(table_path, ARRAY_SIZE(table_path)); + lstrcatW(table_path, drivers_etc_protocol); + + table_file = CreateFileW(table_path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (table_file == INVALID_HANDLE_VALUE) + return NULL; + + table_len = GetFileSize(table_file, NULL); + if (!table_len) + { + CloseHandle(table_file); + return NULL; + } + + table_text = HeapAlloc(GetProcessHeap(), 0, table_len + 1); + if (!table_text) + { + CloseHandle(table_file); + return NULL; + } + + ret = ReadFile(table_file, table_text, table_len, &bytes_read, NULL); + if (!ret || bytes_read != table_len) + { + CloseHandle(table_file); + HeapFree(GetProcessHeap(), 0, table_text); + return NULL; + } + + CloseHandle(table_file); + table_text[table_len] = 0; + return table_text; +} + +static char * get_field(char *line) +{ + char *field; + /* ignore sequences of whitespace between fields */ + while ((field = strtok(line, " \t\r"))) + { + if (field[0]) + break; + } + return field; +} + +static char * parse_next_protocol(char *current_line, int *number, char *names[MAX_NAMES]) +{ + char *next_line; + char *comment; + int i; + + while (current_line) + { + next_line = strchr(current_line, '\n'); + if (next_line) + { + next_line[0] = 0; + next_line++; + } + + comment = strchr(current_line, '#'); + if (comment) + *comment = 0; + + names[0] = get_field(current_line); + if (!names[0]) + { + /* this line is empty, all whitespace, or a comment */ + current_line = next_line; + continue; + } + + names[1] = get_field(NULL); + if (!names[1]) + { + /* lines that only have one field are ignored too */ + current_line = next_line; + continue; + } + /* if the second field is not actually a number, it is treated as 0 */ + *number = atoi(names[1]); + + for (i = 1;; i++) + { + names[i] = (i == MAX_NAMES - 1 ? NULL : get_field(NULL)); + if (!names[i]) break; + } + + return next_line; + } + + return NULL; +} /*********************************************************************** * getprotobyname (WS2_32.53) @@ -6339,21 +6425,31 @@ static const struct { int prot; const char *names[3]; } protocols[] = struct WS_protoent* WINAPI WS_getprotobyname(const char* name) { struct WS_protoent* retval = NULL; + char *table_text = read_protocol_table(); + char *current_line = table_text; + int row_number; + char *row_names[MAX_NAMES]; unsigned int i; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + while ((current_line = parse_next_protocol( current_line, &row_number, row_names ))) { - if (_strnicmp( protocols[i].names[0], name, -1 )) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); - break; + for (i = 0; row_names[i]; i++) + { + if (!_strnicmp( row_names[i], name, -1 )) + { + retval = WS_create_pe( row_names[0], (char **)row_names + 1, row_number ); + goto found; + } + } } if (!retval) { WARN( "protocol %s not found\n", debugstr_a(name) ); SetLastError(WSANO_DATA); } +found: TRACE( "%s ret %p\n", debugstr_a(name), retval ); + if (table_text) HeapFree( GetProcessHeap(), 0, table_text ); return retval; } @@ -6364,13 +6460,15 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) struct WS_protoent* WINAPI WS_getprotobynumber(int number) { struct WS_protoent* retval = NULL; - unsigned int i; + char *table_text = read_protocol_table(); + char *current_line = table_text; + int row_number; + char *row_names[MAX_NAMES]; - for (i = 0; i < ARRAY_SIZE(protocols); i++) + while ((current_line = parse_next_protocol( current_line, &row_number, row_names ))) { - if (protocols[i].prot != number) continue; - retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, - protocols[i].prot ); + if (row_number != number) continue; + retval = WS_create_pe( row_names[0], (char **)row_names + 1, row_number ); break; } if (!retval) @@ -6379,6 +6477,7 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) SetLastError(WSANO_DATA); } TRACE("%i ret %p\n", number, retval); + if (table_text) HeapFree( GetProcessHeap(), 0, table_text ); return retval; } diff --git a/dlls/ws2_32/version.rc b/dlls/ws2_32/version.rc index 52dbb1b2c48..a68f9885805 100644 --- a/dlls/ws2_32/version.rc +++ b/dlls/ws2_32/version.rc @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +/* @makedep: protocols.tsv */ +1 WINE_DATA_FILE protocols.tsv + #define WINE_FILEDESCRIPTION_STR "Wine core dll" #define WINE_FILENAME_STR "ws2_32.dll" #define WINE_FILEVERSION 5,1,2600,5512 diff --git a/loader/wine.inf.in b/loader/wine.inf.in index de62b90fa35..6c6c9ee14e3 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -30,7 +30,7 @@ signature="$CHICAGO$" RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -54,7 +54,7 @@ AddReg=\ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin32,FakeDlls UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -80,7 +80,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -107,7 +107,7 @@ RegisterDlls=RegisterDllsSection WineFakeDlls=FakeDllsWin64,FakeDlls WinePreInstall=Wow64 UpdateInis=SystemIni -CopyFiles=ColorFiles,InfFiles,NlsFiles,SortFiles +CopyFiles=ColorFiles,EtcFiles,InfFiles,NlsFiles,SortFiles AddReg=\ Classes,\ ContentIndex,\ @@ -4073,6 +4073,9 @@ HKLM,Software\Wine\LicenseInformation,"Shell-PremiumInBoxGames-Chess-EnableGame" [ColorFiles] srgb color space profile.icm,"@mscms.dll,-1" +[EtcFiles] +protocol,"@ws2_32.dll,-1" + [InfFiles] winebus.inf,"@winebus.sys,-1" winehid.inf,"@winehid.sys,-1" @@ -4161,6 +4164,7 @@ SortFiles = nls [DestinationDirs] ColorFiles = 23 +EtcFiles = 12,etc InfFiles = 17 NlsFiles = 11 SortFiles = 10,globalization\sorting -- 2.29.2

2 2

[PATCH] winex11.drv: Adjust the priority of NoRes display settings handler to 1.
by Zhiyi Zhang Nov. 16, 2020

Nov. 16, 2020

A display settings handler with a priority of 0 can not be properly registered due to how X11DRV_Settings_SetHandler() is implemented. Fix a regression introduced by 9c99d9bceba34559a32f1e5906a6fcbcf91b0004. Spotted by Torge Matthies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50135 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 0fa5bcf6294..9a43231f34d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -168,7 +168,7 @@ void X11DRV_Settings_Init(void) depths = screen_bpp == 32 ? depths_32 : depths_24; nores_handler.name = "NoRes"; - nores_handler.priority = 0; + nores_handler.priority = 1; nores_handler.get_id = nores_get_id; nores_handler.get_modes = nores_get_modes; nores_handler.free_modes = nores_free_modes; -- 2.27.0

1 0

Question about wide-char string literals
by Alex Henrie Nov. 15, 2020

Nov. 15, 2020

Hello everyone, Currently the WineHQ Wiki's "Developer Hints" page says that L-strings are only allowed in the source code of PE modules [1] (although the "Code Hygiene" page still says that they are not allowed at all [2]). However, if MinGW is not installed, Wine's build system will compile that same source code with L-strings as an SO module and it works thanks to the -fshort-wchar compiler flag. So what's stopping us from using -fshort-wchar and L-strings everywhere? -Alex [1] https://wiki.winehq.org/Developer_Hints#Using_only_C89-compliant_code [2] https://wiki.winehq.org/Code_Hygiene#Constants_as_Character_Arrays

2 4

[PATCH v2 1/2] d3dx10/tests: Add tests for D3DX10GetImageInfoFromResource{A, W}().
by Ziqing Hui Nov. 15, 2020

Nov. 15, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Use ok() after CopyFile. * Replace FILE_ATTRIBUTE_ARCHIVE with FILE_ATTRIBUTE_NORMAL dlls/d3dx10_43/tests/d3dx10.c | 75 +++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+)

1 0

[PATCH v4 1/2] amstream/tests: Add comments to AMDirectDrawStream::CompletionStatus tests.
by Anton Baskanov Nov. 15, 2020

Nov. 15, 2020

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/tests/amstream.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index da5ef8f56a1..6b1a9e4575f 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -7951,12 +7951,14 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &stream_sample2); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Initial status is S_OK. */ hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_WAIT, INFINITE); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Update changes the status to MS_S_PENDING. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -7966,6 +7968,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_WAIT, 100); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + /* Each Receive call changes the status of one queued sample to S_OK in the same order Update was called. */ hr = IDirectDrawStreamSample_Update(stream_sample2, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -7996,6 +7999,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_NOUPDATEOK removes the sample from the queue and changes the status to MS_S_NOUPDATE. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8020,6 +8024,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_ABORT removes the sample from the queue and changes the status to MS_S_NOUPDATE. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8044,18 +8049,21 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample2, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_WAIT has no effect when combined with COMPSTAT_NOUPDATEOK. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK | COMPSTAT_WAIT, INFINITE); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* COMPSTAT_WAIT has no effect when combined with COMPSTAT_ABORT. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_ABORT | COMPSTAT_WAIT, INFINITE); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* EndOfStream changes the status of the queued samples to MS_S_ENDOFSTREAM. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8068,6 +8076,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_WAIT, INFINITE); ok(hr == MS_S_ENDOFSTREAM, "Got hr %#x.\n", hr); + /* Update after EndOfStream changes the status to MS_S_ENDOFSTREAM. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_ENDOFSTREAM, "Got hr %#x.\n", hr); @@ -8082,18 +8091,22 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Continuous update can be canceled by COMPSTAT_NOUPDATEOK. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* Continuous update can be canceled by COMPSTAT_ABORT. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_ABORT, 0); ok(hr == MS_S_NOUPDATE, "Got hr %#x.\n", hr); + /* If a sample is in countinuous update mode, when Receive is called it's status remains MS_S_PENDING + * and the sample is moved to the end of the queue. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8136,6 +8149,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, COMPSTAT_NOUPDATEOK, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* In continuous update mode, flushing does not affect the status. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8151,6 +8165,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + /* In continuous update mode, stopping and running the stream does not affect the status. */ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -8163,6 +8178,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + /* In continuous update mode, EndOfStream changes the status to MS_S_ENDOFSTREAM. */ hr = IPin_EndOfStream(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -8174,6 +8190,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* COMPSTAT_WAIT resets the sample to the non-continuous update mode. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8189,6 +8206,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* In continuous update mode, CompletionStatus with COMPSTAT_WAIT returns when Receive is called. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC | SSUPDATE_CONTINUOUS, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8216,6 +8234,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* CompletionStatus with COMPSTAT_WAIT returns when Receive is called. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8235,6 +8254,7 @@ static void test_ddrawstreamsample_completion_status(void) ok(!WaitForSingleObject(thread, 2000), "Wait timed out.\n"); CloseHandle(thread); + /* CompletionStatus with COMPSTAT_WAIT returns when EndOfStream is called. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8256,6 +8276,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Stopping and running the stream does not affect the status and does not remove the sample from the queue. */ hr = IDirectDrawStreamSample_Update(stream_sample1, SSUPDATE_ASYNC, NULL, NULL, 0); ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); @@ -8277,6 +8298,7 @@ static void test_ddrawstreamsample_completion_status(void) hr = IDirectDrawStreamSample_CompletionStatus(stream_sample1, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* When the stream is stopped Update does not change the status. */ hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.17.1

2 3

[PATCH 2/2] inetcpl.cpl: Use wide-char string literals.
by Michael Stefaniuc Nov. 15, 2020

Nov. 15, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 37 +++++++++++++--------------------- dlls/inetcpl.cpl/general.c | 19 +++++++---------- 2 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index 04e26ead6a7..4327c33b420 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -31,16 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); -static const WCHAR auto_config_url[] = {'A','u','t','o','C','o','n','f','i','g','U','R','L',0}; -static const WCHAR internet_settings[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; -static const WCHAR proxy_enable[] = {'P','r','o','x','y','E','n','a','b','l','e',0}; -static const WCHAR proxy_server[] = {'P','r','o','x','y','S','e','r','v','e','r',0}; -static const WCHAR connections[] = {'C','o','n','n','e','c','t','i','o','n','s',0}; -static const WCHAR default_connection_settings[] = {'D','e','f','a','u','l','t', - 'C','o','n','n','e','c','t','i','o','n','S','e','t','t','i','n','g','s',0}; +static const WCHAR internet_settings[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"; static BOOL initdialog_done; @@ -71,7 +62,7 @@ static DWORD create_connection_settings(BOOL manual_proxy, const WCHAR *proxy_se DWORD pac_url_len; size += sizeof(DWORD); - if(proxy_server) + if(L"ProxyServer") { proxy_server_len = WideCharToMultiByte(CP_UTF8, 0, proxy_server, -1, NULL, 0, NULL, NULL); @@ -139,26 +130,26 @@ static void connections_on_initdialog(HWND hwnd) return; size = sizeof(enabled); - res = RegQueryValueExW(hkey, proxy_enable, NULL, &type, (BYTE*)&enabled, &size); + res = RegQueryValueExW(hkey, L"ProxyEnable", NULL, &type, (BYTE*)&enabled, &size); if(res || type != REG_DWORD) enabled = 0; size = sizeof(address); - res = RegQueryValueExW(hkey, proxy_server, NULL, &type, (BYTE*)address, &size); + res = RegQueryValueExW(hkey, L"ProxyServer", NULL, &type, (BYTE*)address, &size); if(res || type != REG_SZ) address[0] = 0; size = sizeof(pac_url); - res = RegQueryValueExW(hkey, auto_config_url, NULL, &type, (BYTE*)pac_url, &size); + res = RegQueryValueExW(hkey, L"AutoConfigURL", NULL, &type, (BYTE*)pac_url, &size); if(res || type != REG_SZ) pac_url[0] = 0; - res = RegOpenKeyW(hkey, connections, &con); + res = RegOpenKeyW(hkey, L"Connections", &con); RegCloseKey(hkey); if(!res) { connection_settings *settings = NULL; size = 0; - while((res = RegQueryValueExW(con, default_connection_settings, NULL, &type, + while((res = RegQueryValueExW(con, L"DefaultConnectionSettings", NULL, &type, (BYTE*)settings, &size)) == ERROR_MORE_DATA || !settings) { connection_settings *new_settings = heap_realloc(settings, size); @@ -264,7 +255,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) return FALSE; use_proxy = IsDlgButtonChecked(hwnd, IDC_USE_PROXY_SERVER); - res = RegSetValueExW(hkey, proxy_enable, 0, REG_DWORD, + res = RegSetValueExW(hkey, L"ProxyEnable", 0, REG_DWORD, (BYTE*)&use_proxy, sizeof(use_proxy)); if(res) { @@ -286,12 +277,12 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) proxy[proxy_len] = 0; } - res = RegSetValueExW(hkey, proxy_server, 0, REG_SZ, + res = RegSetValueExW(hkey, L"ProxyServer", 0, REG_SZ, (BYTE*)proxy, (proxy_len+port_len)*sizeof(WCHAR)); } else { - res = RegDeleteValueW(hkey, proxy_server); + res = RegDeleteValueW(hkey, L"ProxyServer"); if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -308,12 +299,12 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) if(!pac_script_len) use_pac_script = FALSE; if(use_pac_script) { - res = RegSetValueExW(hkey, auto_config_url, 0, REG_SZ, + res = RegSetValueExW(hkey, L"AutoConfigURL", 0, REG_SZ, (BYTE*)pac_script, pac_script_len*sizeof(WCHAR)); } else { - res = RegDeleteValueW(hkey, auto_config_url); + res = RegDeleteValueW(hkey, L"AutoConfigURL"); if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; } @@ -326,7 +317,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) use_wpad = IsDlgButtonChecked(hwnd, IDC_USE_WPAD); - res = RegCreateKeyExW(hkey, connections, 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); + res = RegCreateKeyExW(hkey, L"Connections", 0, NULL, 0, KEY_WRITE, NULL, &con, NULL); RegCloseKey(hkey); if(res) return FALSE; @@ -339,7 +330,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) return FALSE; } - res = RegSetValueExW(con, default_connection_settings, 0, REG_BINARY, + res = RegSetValueExW(con, L"DefaultConnectionSettings", 0, REG_BINARY, (BYTE*)default_connection, size); heap_free(default_connection); RegCloseKey(con); diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index b9fbf1eb0ae..53e2d1d4fca 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -33,14 +33,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); - -static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; -static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; -static const WCHAR default_page[] = {'D','e','f','a','u','l','t','_','P','a','g','e','_','U','R','L',0}; -static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', - 'M','a','i','n',0}; +static const WCHAR reg_ie_main[] = L"Software\\Microsoft\\Internet Explorer\\Main"; /* list of unimplemented buttons */ static DWORD disabled_general_buttons[] = {IDC_HOME_CURRENT, @@ -188,13 +181,14 @@ static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) break; case MAKEWPARAM(IDC_HOME_BLANK, BN_CLICKED): - SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, L"about:blank"); break; case MAKEWPARAM(IDC_HOME_DEFAULT, BN_CLICKED): len = sizeof(buffer); type = REG_SZ; - res = SHRegGetUSValueW(reg_ie_main, default_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + res = SHRegGetUSValueW(reg_ie_main, L"Default_Page_URL", &type, buffer, &len, FALSE, + (BYTE *)L"about:blank", sizeof(L"about:blank")); if (!res && (type == REG_SZ)) SetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer); break; @@ -235,7 +229,8 @@ static VOID general_on_initdialog(HWND hwnd) *buffer = 0; len = sizeof(buffer); type = REG_SZ; - res = SHRegGetUSValueW(reg_ie_main, start_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + res = SHRegGetUSValueW(reg_ie_main, L"Start Page", &type, buffer, &len, FALSE, + (BYTE *)L"about:blank", sizeof(L"about:blank")); if (!res && (type == REG_SZ)) { @@ -281,7 +276,7 @@ static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) res = RegOpenKeyW(HKEY_CURRENT_USER, reg_ie_main, &hkey); if (!res) { - res = RegSetValueExW(hkey, start_page, 0, REG_SZ, (const BYTE *)parsed, + res = RegSetValueExW(hkey, L"Start Page", 0, REG_SZ, (const BYTE *)parsed, (lstrlenW(parsed) + 1) * sizeof(WCHAR)); RegCloseKey(hkey); return !res; -- 2.26.2

1 0

[PATCH 1/2] inetcpl.cpl: Trace the actual AutoConfigURL and not the value name.
by Michael Stefaniuc Nov. 15, 2020

Nov. 15, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Current code always prints "AutoConfigURL = AutoConfigURL". 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) { -- 2.26.2

1 0