April 2021 - Wine-devel - list.winehq.org

[PATCH v2 1/4] advapi32/tests: Check that registry time zone records have a display name.
by Giovanni Mascellani 12 Apr '21

12 Apr '21

While the display name is not a member of TIME_ZONE_INFORMATION, it is still available in the registry. In English it corresponds to the comments preceding groups of time zones in Unicode CLDR's windowsZones.xml[1]. [1] https://github.com/unicode-org/cldr/blob/master/common/supplemental/windows… Windows UI shows the display name in the time zone selection control panel. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/advapi32/tests/registry.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 534982565d9..66382876fa5 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4014,6 +4014,7 @@ static void test_EnumDynamicTimeZoneInformation(void) HKEY key, subkey; WCHAR name[32]; WCHAR keyname[128]; + WCHAR displayname[128]; WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; @@ -4095,6 +4096,14 @@ static void test_EnumDynamicTimeZoneInformation(void) ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); + + size = sizeof(displayname); + memset(displayname, 0, sizeof(displayname)); + if (pRegLoadMUIStringW) + status = pRegLoadMUIStringW(subkey, L"MUI_Display", displayname, size, &size, 0, sysdir); + else + status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, displayname, &size); + todo_wine ok(status == ERROR_SUCCESS, "status %d displayname %s\n", status, wine_dbgstr_w(displayname)); } else { -- 2.31.0

1 3

[PATCH 1/3] comctl32/tests: Enable some ComboEx tests on version 6.
by Nikolay Sivov 12 Apr '21

12 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/combo.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 63470a50ff7..4102191e2f6 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1391,6 +1391,11 @@ START_TEST(combo) return; } + test_comboex(); + test_comboex_CB_GETLBTEXT(); + test_comboex_WM_WINDOWPOSCHANGING(); + test_comboex_get_set_item(); + /* ComboBox control tests. */ test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); -- 2.30.2

1 2

[tools 1/2] winetest: Move the scripts documentation to the usage message.
by Francois Gouget 12 Apr '21

12 Apr '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-index | 34 +++++++++++++++------- winetest/dissect | 69 +++++++++++++++++++++++++------------------- winetest/gather | 60 +++++++++++++++++++++----------------- 3 files changed, 95 insertions(+), 68 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 94453f4ab..01533c4d4 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -1,6 +1,7 @@ #!/usr/bin/perl # # Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> +# Copyright 2014-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,9 +16,6 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program creates the global index of all the builds for which we have -# WineTest result data. use strict; use warnings; @@ -175,14 +173,28 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--help]\n"; - print "\n"; - print "Processes the build summaries to generate the global index.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--help] + +Processes the build summaries to generate the global index and per-test +index pages. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --help Shows this usage message. + +Actions: + $name0 should be called after the gather script has updated all the builds. + +Generated files: + \$workdir/data/index.html + \$workdir/data/tests/TEST:UNIT.html + +Exit: + 0 - success + 2 - usage error +EOF exit 0; } diff --git a/winetest/dissect b/winetest/dissect index 43b2754f0..d6ce316d9 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -2,7 +2,7 @@ # # Copyright (C) 2004 Ferenc Wagner # Copyright (C) 2008 Alexandre Julliard -# Copyright (C) 2017, 2019 Francois Gouget +# Copyright (C) 2008-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -17,25 +17,6 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program looks for a WineTest report file matching queue/rep*/report, -# takes it apart in its directory while also creating summary.txt. If an error -# occurs the directory is renamed to errXXXXX to avoid future attempts at -# processing this report. -# If everything goes flawlessly the whole directory is renamed (based on the -# information learned in the process) to data/BUILD/VERSION_TAG_DIGIT -# where DIGIT is for resolving name clashes and data/BUILD/outdated is -# created to signal the change in the given build. -# -# To test this script: -# - Put a test report in queue/rep1/report -# - Run ./dissect -# - Examine the result in data/ -# -# Exit: 0 - successfully processed a report, call again -# 1 - failed to process a report, call again -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong use strict; use warnings; @@ -183,16 +164,44 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--update REPORT] [--help]\n"; - print "\n"; - print "Processes a test report to generate the corresponding HTML files.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --update REPORT Updates the HTML files of the specified test report. Note that\n"; - print " it must have already been moved into place.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--update REPORT] [--help] + +Processes a test report to generate the corresponding HTML files. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --update REPORT Updates the HTML files of the specified test report. Note + that it must have already been moved into place. + --help Shows this usage message. + +Actions: + $name0 looks for a WineTest report file matching queue/rep*/report, + takes it apart in its directory while also creating summary.txt. If an error + occurs the directory is renamed to errXXXXX to avoid future attempts at + processing this report. + + If everything goes flawlessly the whole directory is renamed (based on the + information learned in the process) to data/BUILD/PLATFORM_TAG_DIGIT + where DIGIT is for resolving name clashes and data/BUILD/outdated is + created to signal the change in the given build. + +Generated files: + \$workdir/queue/errXXXXX/error + \$workdir/queue/errXXXXX/summary.txt + or + \$workdir/data/BUILD/outdated + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/summary.txt + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/report.html + \$workdir/data/BUILD/PLATFORM_TAG_DIGIT/TEST:UNIT.html + +Exit: + 0 - successfully processed a report, call again + 1 - failed to process a report, call again + 2 - there was nothing to do or usage error + 3 - fatal error, something went utterly wrong +EOF exit 0; } diff --git a/winetest/gather b/winetest/gather index 79bea91de..1a61b0c13 100755 --- a/winetest/gather +++ b/winetest/gather @@ -1,6 +1,7 @@ #!/usr/bin/perl # # Copyright (C) 2004 Ferenc Wagner +# Copyright (C) 2008-2021 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,24 +16,6 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# This program looks for builds that have received new reports. These are -# identified by the presence of a file matching data/*/outdated. -# It then creates an index.html file in the same directory and removes the -# outdated file. -# -# It is thus intended to run as a second stage invoked by the winetest.cron -# script. Races and concurrency problems must be dealt with on that higher -# level. -# -# To test this script: -# - After running dissect, run ./gather -# - Examine the result in data/ -# -# Exit: 0 - successfully processed a build, call again -# 1 - should not happen -# 2 - there was nothing to do -# 3 - fatal error, something went utterly wrong use strict; use warnings; @@ -265,15 +248,38 @@ if (defined $usage) error("try '$name0 --help' for more information\n"); exit $usage; } - print "Usage: $name0 [--workdir DIR] [--update BUILDDIR] [--help]\n"; - print "\n"; - print "Processes a build's report summaries to create the build's index files.\n"; - print "\n"; - print "Where:\n"; - print " --workdir DIR Specifies the directory containing the winetest website\n"; - print " files.\n"; - print " --update BUILDDIR Updates the HTML files of the specified build directory.\n"; - print " --help Shows this usage message.\n"; + print <<EOF; +Usage: $name0 [--workdir DIR] [--update BUILD] [--help] + +Identifies one build that received new reports and updates its summary and +HTML index files. + +Where: + --workdir DIR Specifies the directory containing the winetest website + files. Can be omitted if set in winetest.conf. + --update BUILD Forcefully refreshes the specified build directory. + BUILD should be a full path. If an outdated file is + present, it is removed. + --help Shows this usage message. + +Actions: + The build to process is identified by the presence of the data/*/outdated + file generated by the dissect script. That file is removed after all + processing is done. It is up to the caller to invoke $name0 as many times as + necessary and to deal with any concurrency issues. + +Generated files: + \$workdir/data/BUILD/summary.txt + \$workdir/data/BUILD/total.txt + \$workdir/data/BUILD/index.html + \$workdir/data/BUILD/index_GROUP.html + +Exit: + 0 - successfully processed a build, call again + 1 - should not happen + 2 - there was nothing to do or usage error + 3 - fatal error, something went utterly wrong +EOF exit 0; } -- 2.20.1

1 1

[PATCH] po: Remove duplicate line in Dutch translation
by Hugh McMaster 12 Apr '21

12 Apr '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- po/nl.po | 1 - 1 file changed, 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index e5ea842cfea..b212ed1736e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14785,7 +14785,6 @@ msgid "" " Access the registry using the 64-bit view.\n" "\n" msgstr "" -" /reg:32\n" " /reg:32\n" " Open de 32-bits weergave van het register.\n" "\n" -- 2.31.0

1 0

[PATCH] include: Remove duplicated ComboEx item mask flags.
by Nikolay Sivov 12 Apr '21

12 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/commctrl.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 5614f64a979..41abceb0138 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4417,14 +4417,6 @@ static const WCHAR WC_COMBOBOXEXW[] = { 'C','o','m','b','o', #endif #define WC_COMBOBOXEX WINELIB_NAME_AW(WC_COMBOBOXEX) -#define CBEIF_TEXT 0x00000001 -#define CBEIF_IMAGE 0x00000002 -#define CBEIF_SELECTEDIMAGE 0x00000004 -#define CBEIF_OVERLAY 0x00000008 -#define CBEIF_INDENT 0x00000010 -#define CBEIF_LPARAM 0x00000020 -#define CBEIF_DI_SETITEM 0x10000000 - #define CBEM_INSERTITEMA (WM_USER+1) #define CBEM_INSERTITEMW (WM_USER+11) #define CBEM_INSERTITEM WINELIB_NAME_AW(CBEM_INSERTITEM) -- 2.30.2

1 0

[PATCH 1/2] cmd: Use terminated strings in WCMD_ReadAndParseLine().
by Gijs Vermeulen 12 Apr '21

12 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48486 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- programs/cmd/wcmdmain.c | 42 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index dd7d14e50e5..2260ed9da35 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1813,11 +1813,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE CMD_LIST *lastEntry = NULL; CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ - static const WCHAR remCmd[] = {'r','e','m'}; - static const WCHAR forCmd[] = {'f','o','r'}; - static const WCHAR ifCmd[] = {'i','f'}; - static const WCHAR ifElse[] = {'e','l','s','e'}; - static const WCHAR setCmd[] = {'s','e','t'}; BOOL inOneLine = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; @@ -1870,10 +1865,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Show prompt before batch line IF echo is on and in batch program */ if (context && echo_mode && *curPos && (*curPos != '@')) { - static const WCHAR echoDot[] = {'e','c','h','o','.'}; - static const WCHAR echoCol[] = {'e','c','h','o',':'}; - static const WCHAR echoSlash[] = {'e','c','h','o','/'}; - const DWORD len = ARRAY_SIZE(echoDot); + const DWORD len = ARRAY_SIZE(L"echo.") - 1; DWORD curr_size = lstrlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(TRUE); @@ -1881,11 +1873,11 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - curPos, min_len, echoDot, len) != CSTR_EQUAL + curPos, min_len, L"echo.", len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - curPos, min_len, echoCol, len) != CSTR_EQUAL + curPos, min_len, L"echo:", len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - curPos, min_len, echoSlash, len) != CSTR_EQUAL) + curPos, min_len, L"echo/", len) != CSTR_EQUAL) { WCMD_output_asis(L" "); } @@ -1921,13 +1913,11 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Certain commands need special handling */ if (curStringLen == 0 && curCopyTo == curString) { - static const WCHAR forDO[] = {'d','o'}; - /* If command starts with 'rem ' or identifies a label, ignore any &&, ( etc. */ - if (WCMD_keyword_ws_found(remCmd, ARRAY_SIZE(remCmd), curPos) || *curPos == ':') { + if (WCMD_keyword_ws_found(L"rem", ARRAY_SIZE(L"rem") - 1, curPos) || *curPos == ':') { inOneLine = TRUE; - } else if (WCMD_keyword_ws_found(forCmd, ARRAY_SIZE(forCmd), curPos)) { + } else if (WCMD_keyword_ws_found(L"for", ARRAY_SIZE(L"for") - 1, curPos)) { inFor = TRUE; /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this @@ -1935,14 +1925,14 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE should suffice for now. To be able to handle ('s in the condition part take as much as evaluate_if_condition would take and skip parsing it here. */ - } else if (WCMD_keyword_ws_found(ifCmd, ARRAY_SIZE(ifCmd), curPos)) { + } else if (WCMD_keyword_ws_found(L"if", ARRAY_SIZE(L"if") - 1, curPos)) { int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR *p, *command; inIf = TRUE; - p = curPos+(ARRAY_SIZE(ifCmd)); + p = curPos+(ARRAY_SIZE(L"if") - 1); while (*p == ' ' || *p == '\t') p++; WCMD_parse (p, quals, param1, param2); @@ -1960,11 +1950,11 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curPos+=if_condition_len; } - if (WCMD_keyword_ws_found(setCmd, ARRAY_SIZE(setCmd), curPos)) + if (WCMD_keyword_ws_found(L"set", ARRAY_SIZE(L"set") - 1, curPos)) ignoreBracket = TRUE; - } else if (WCMD_keyword_ws_found(ifElse, ARRAY_SIZE(ifElse), curPos)) { - const int keyw_len = ARRAY_SIZE(ifElse) + 1; + } else if (WCMD_keyword_ws_found(L"else", ARRAY_SIZE(L"else") - 1, curPos)) { + const int keyw_len = ARRAY_SIZE(L"else"); inElse = TRUE; lastWasElse = TRUE; onlyWhiteSpace = TRUE; @@ -1985,8 +1975,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* In a for loop, the DO command will follow a close bracket followed by whitespace, followed by DO, ie closeBracket inserts a NULL entry, curLen is then 0, and all whitespace is skipped */ - } else if (inFor && WCMD_keyword_ws_found(forDO, ARRAY_SIZE(forDO), curPos)) { - const int keyw_len = ARRAY_SIZE(forDO) + 1; + } else if (inFor && WCMD_keyword_ws_found(L"do", ARRAY_SIZE(L"do") - 1, curPos)) { + const int keyw_len = ARRAY_SIZE(L"do"); WINE_TRACE("Found 'DO '\n"); lastWasDo = TRUE; onlyWhiteSpace = TRUE; @@ -1999,12 +1989,10 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Special handling for the 'FOR' command */ if (inFor && lastWasWhiteSpace) { - static const WCHAR forIN[] = {'i','n'}; - WINE_TRACE("Found 'FOR ', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); - if (WCMD_keyword_ws_found(forIN, ARRAY_SIZE(forIN), curPos)) { - const int keyw_len = ARRAY_SIZE(forIN) + 1; + if (WCMD_keyword_ws_found(L"in", ARRAY_SIZE(L"in") - 1, curPos)) { + const int keyw_len = ARRAY_SIZE(L"in"); WINE_TRACE("Found 'IN '\n"); lastWasIn = TRUE; onlyWhiteSpace = TRUE; -- 2.31.1

1 1

[PATCH] ws2_32: Implement GetHostNameW.
by Hans Leidekker 11 Apr '21

11 Apr '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49286 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 30 ++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 29 +++++++++++++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/winsock2.h | 1 + 4 files changed, 61 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4f26d6475aa..262171ebab0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7224,6 +7224,36 @@ int WINAPI WS_gethostname(char *name, int namelen) return 0; } +/*********************************************************************** + * GetHostNameW (WS2_32.@) + */ +int WINAPI GetHostNameW(WCHAR *name, int namelen) +{ + char buf[256]; + int len; + + TRACE("name %p, len %d\n", name, namelen); + + if (!name) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + if (gethostname(buf, sizeof(buf))) + { + SetLastError(wsaErrno()); + return SOCKET_ERROR; + } + + if ((len = MultiByteToWideChar(CP_ACP, 0, buf, -1, NULL, 0)) > namelen) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + MultiByteToWideChar(CP_ACP, 0, buf, -1, name, namelen); + return 0; +} /* ------------------------------------- Windows sockets extensions -- * * * diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cedbf423d97..5a1a271b099 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4323,6 +4323,34 @@ static void test_gethostname(void) ok(he != NULL, "gethostbyname(\"%s\") failed: %d\n", name, WSAGetLastError()); } +static void test_GetHostNameW(void) +{ + WCHAR name[256]; + int ret, len; + + WSASetLastError(0xdeadbeef); + ret = GetHostNameW(NULL, 256); + ok(ret == -1, "GetHostNameW() returned %d\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "GetHostNameW with null buffer " + "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); + + ret = GetHostNameW(name, sizeof(name)); + ok(ret == 0, "GetHostNameW() call failed: %d\n", WSAGetLastError()); + + len = wcslen(name); + WSASetLastError(0xdeadbeef); + wcscpy(name, L"deadbeef"); + ret = GetHostNameW(name, len); + ok(ret == -1, "GetHostNameW() returned %d\n", ret); + ok(!wcscmp(name, L"deadbeef"), "name changed unexpected!\n"); + ok(WSAGetLastError() == WSAEFAULT, "GetHostNameW with insufficient length " + "failed with %d, expected %d\n", WSAGetLastError(), WSAEFAULT); + + len++; + ret = GetHostNameW(name, len); + ok(ret == 0, "GetHostNameW() call failed: %d\n", WSAGetLastError()); +} + static void test_inet_addr(void) { u_long addr; @@ -10631,6 +10659,7 @@ START_TEST( sock ) test_gethostbyname(); test_gethostbyname_hack(); test_gethostname(); + test_GetHostNameW(); test_WSASendMsg(); test_WSASendTo(); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 87e0bdfa2f0..29545165a48 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -57,6 +57,7 @@ @ stdcall GetAddrInfoExOverlappedResult(ptr) @ stdcall GetAddrInfoExW(wstr wstr long ptr ptr ptr ptr ptr ptr ptr) @ stdcall GetAddrInfoW(wstr wstr ptr ptr) +@ stdcall GetHostNameW(ptr long) @ stdcall GetNameInfoW(ptr long ptr long ptr long long) @ stdcall InetNtopW(long ptr ptr long) @ stdcall InetPtonW(long wstr ptr) diff --git a/include/winsock2.h b/include/winsock2.h index e8d033976f4..1935c99ad40 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -695,6 +695,7 @@ typedef SOCKET (WINAPI *LPFN_SOCKET)(int,int,int); * "Winsock2 Function Typedefs" section below. */ #if WS_API_PROTOTYPES +int WINAPI GetHostNameW(WCHAR *, int); SOCKET WINAPI WSAAccept(SOCKET,struct WS(sockaddr)*,LPINT,LPCONDITIONPROC,DWORD_PTR); INT WINAPI WSAAddressToStringA(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOA,LPSTR,LPDWORD); INT WINAPI WSAAddressToStringW(LPSOCKADDR,DWORD,LPWSAPROTOCOL_INFOW,LPWSTR,LPDWORD); -- 2.30.2

1 0

[PATCH] programs/sc: Fix typos in CLI arguments parsing.
by Nikolay Sivov 11 Apr '21

11 Apr '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixes regressions from 8e9b9da0f8896f819312ce3c693d2fbc0fe6b19e. programs/sc/sc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index a20813b8cd5..02b476957d6 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -82,7 +82,7 @@ static BOOL parse_create_params( int argc, const WCHAR *argv[], struct create_pa if (!wcsicmp( argv[i + 1], L"rec" )) cp->type = SERVICE_RECOGNIZER_DRIVER; if (!wcsicmp( argv[i + 1], L"interact" )) cp->type |= SERVICE_INTERACTIVE_PROCESS; } - if (!wcsicmp( argv[i], L"start="L"start" ) && i < argc - 1) + if (!wcsicmp( argv[i], L"start=" ) && i < argc - 1) { if (!wcsicmp( argv[i + 1], L"boot" )) cp->start = SERVICE_BOOT_START; if (!wcsicmp( argv[i + 1], L"system" )) cp->start = SERVICE_SYSTEM_START; @@ -134,7 +134,7 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f { if (!wcsicmp( p, L"run" )) fa->lpsaActions[i].Type = SC_ACTION_RUN_COMMAND; else if (!wcsicmp( p, L"restart" )) fa->lpsaActions[i].Type = SC_ACTION_RESTART; - else if (!wcsicmp( p, L"reboot="L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; + else if (!wcsicmp( p, L"reboot" )) fa->lpsaActions[i].Type = SC_ACTION_REBOOT; else fa->lpsaActions[i].Type = SC_ACTION_NONE; p += lstrlenW( p ) + 1; @@ -159,7 +159,7 @@ static BOOL parse_failure_params( int argc, const WCHAR *argv[], SERVICE_FAILURE for (i = 0; i < argc; i++) { if (!wcsicmp( argv[i], L"reset=" ) && i < argc - 1) fa->dwResetPeriod = wcstol( argv[i + 1], NULL, 10 ); - if (!wcsicmp( argv[i], L"reboot="L"reboot" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; + if (!wcsicmp( argv[i], L"reboot=" ) && i < argc - 1) fa->lpRebootMsg = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"command=" ) && i < argc - 1) fa->lpCommand = (WCHAR *)argv[i + 1]; if (!wcsicmp( argv[i], L"actions=" )) { @@ -264,7 +264,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } - else if (!wcsicmp( argv[1], L"start="L"start" )) + else if (!wcsicmp( argv[1], L"start" )) { service = OpenServiceW( manager, argv[2], SERVICE_START ); if (service) -- 2.30.2

1 0

Wine-Staging release 6.6
by Zebediah Figura 11 Apr '21

11 Apr '21

The Wine-Staging development release 6.6 is now available. Summary since last release: * Rebased to upstream Wine 6.6. 674 patches are applied to upstream Wine. Patches removed from Wine-Staging since the last release: * ntdll: NtQuerySystemInformation support SystemCodeIntegrityInformation * ntdll: Report SegDs to be identical to SegSs on x86_64. * winex11.drv/mouse: Use root-relative coordinates for events, if possible Patches added: * None. Patches otherwise updated: * server-Key_State has been replaced with modified patches by Rémi Bernon. * user32-rawinput-mouse, user32-rawinput-mouse-experimental, and user32-rawinput-hid have been replaced with new versions from Rémi Bernon. Note that user32-rawinput-mouse now applies on top of user32-rawinput-hid, rather than the reverse. Binary packages for various distributions will be available from: https://www.winehq.org/download As always, if you find a bug, please report it via https://bugs.winehq.org. ἔρρωσθε, Zebediah Figura

1 0

[PATCH] rasapi32: Update spec file.
by Gijs Vermeulen 11 Apr '21

11 Apr '21

File version: 10.0.19041.450 (Windows 10). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50851 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- I left RasClearLinkStatistics uncommented as that is the one mentioned in the linked bug. dlls/rasapi32/rasapi32.spec | 77 +++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index e8a28a8814e..90ebcbce072 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -1,5 +1,32 @@ +# @ stub DDMComputeLuid +# @ stub DDMFreeDialingParam +# @ stub DDMFreePhonebookContext +# @ stub DDMFreeRemoteEndpoint +# @ stub DDMGetAddressesFromPhonebook +# @ stub DDMGetEapInfo +# @ stub DDMGetEapUserIdentityW +# @ stub DDMGetPhoneBookContext +# @ stub DDMGetPhonebookInfo +# @ stub DDMGetProtocolStartParams +# @ stub DDMGetRasDialParams +# @ stub DDMGetRasDialingParams +# @ stub DDMGetTunnelEndpoints +# @ stub DDMRasPbkEntryCleanup +# @ stub DDMUpdateProtocolConfigInfoFromEntry +# @ stub DwCloneEntry +# @ stub DwEnumEntryDetails +# @ stub DwEnumEntryDetailsEx +# @ stub DwRasUninitialize +# @ stub GetAutoTriggerProfileInfo +# @ stub IsActiveAutoTriggerConnection +# @ stub IsActiveAutoTriggerConnectionEx +# @ stub RasAutoDialSharedConnection @ stub RasAutodialAddressToNetwork @ stub RasAutodialEntryToNetwork +@ stub RasClearConnectionStatistics +# @ stub RasClearLinkStatistics +# @ stub RasCompleteDialMachineCleanup +# @ stub RasConfigUserProxySettingsW @ stdcall RasConnectionNotificationA(ptr long long) @ stdcall RasConnectionNotificationW(ptr long long) @ stdcall RasCreatePhonebookEntryA(long str) @@ -23,6 +50,10 @@ @ stdcall RasEnumEntriesA(str str ptr ptr ptr) @ stdcall RasEnumEntriesW(wstr wstr ptr ptr ptr) @ stub RasEnumEntriesWow +# @ stub RasFreeEapUserIdentityA +# @ stub RasFreeEapUserIdentityW +# @ stub RasFreeEntryAdvancedProperties +# @ stub RasGetAutoTriggerConnectStatus @ stdcall RasGetAutodialAddressA(str ptr ptr ptr ptr) @ stdcall RasGetAutodialAddressW(wstr ptr ptr ptr ptr) @ stdcall RasGetAutodialEnableA(long ptr) @@ -33,13 +64,22 @@ @ stdcall RasGetConnectStatusA(ptr ptr) @ stdcall RasGetConnectStatusW(ptr ptr) @ stub RasGetConnectStatusWow +# @ stub RasGetConnectionErrorStringW @ stdcall RasGetConnectionStatistics(ptr ptr) @ stub RasGetCountryInfoA @ stub RasGetCountryInfoW @ stub RasGetCredentialsA @ stub RasGetCredentialsW +# @ stub RasGetCustomAuthDataA +# @ stub RasGetCustomAuthDataW +# @ stub RasGetEapUserDataA +# @ stub RasGetEapUserDataW +# @ stub RasGetEapUserIdentityA +# @ stub RasGetEapUserIdentityW +# @ stub RasGetEntryAdvancedProperties @ stdcall RasGetEntryDialParamsA(str ptr ptr) @ stdcall RasGetEntryDialParamsW(wstr ptr ptr) +# @ stub RasGetEntryHrasconnW @ stdcall RasGetEntryPropertiesA(str str ptr ptr ptr ptr) @ stdcall RasGetEntryPropertiesW(wstr wstr ptr ptr ptr ptr) @ stdcall RasGetErrorStringA(long ptr long) @@ -47,17 +87,39 @@ @ stub RasGetErrorStringWow @ stub RasGetHport @ stdcall RasGetLinkStatistics(ptr long ptr) +# @ stub RasGetNapStatus +# @ stub RasGetPCscf +# @ stub RasGetPbkPath @ stdcall RasGetProjectionInfoA(ptr ptr ptr ptr) +# @ stub RasGetProjectionInfoEx @ stdcall RasGetProjectionInfoW(ptr ptr ptr ptr) @ stub RasGetSubEntryHandleA @ stub RasGetSubEntryHandleW @ stub RasGetSubEntryPropertiesA @ stub RasGetSubEntryPropertiesW +# @ stub RasHandleTriggerConnDisconnect @ stdcall RasHangUpA(long) @ stdcall RasHangUpW(long) @ stub RasHangUpWow +# @ stub RasInvokeEapUI +# @ stub RasIsPublicPhonebook +# @ stub RasIsSharedConnection +# @ stub RasNQMStateEnteredNotification +# @ stub RasQueryRedialOnLinkFailure +# @ stub RasQuerySharedAutoDial +# @ stub RasQuerySharedConnection +# @ stub RasRegisterEntryChangeNotification @ stdcall RasRenameEntryA(str str str) @ stdcall RasRenameEntryW(wstr wstr wstr) +# @ stub RasRestoreDefaultLegacyProxySettings +# @ stub RasScriptExecute +# @ stub RasScriptGetIpAddress +# @ stub RasScriptInit +# @ stub RasScriptReceive +# @ stub RasScriptSend +# @ stub RasScriptTerm +# @ stub RasSetAutoTriggerProfile +# @ stub RasSetAutoTriggerProfileEx @ stdcall RasSetAutodialAddressA(str long ptr long long) @ stdcall RasSetAutodialAddressW(wstr long ptr long long) @ stdcall RasSetAutodialEnableA(long long) @@ -68,15 +130,30 @@ @ stub RasSetCredentialsW @ stdcall RasSetCustomAuthDataA(str str ptr long) @ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) +# @ stub RasSetEapUserDataA +# @ stub RasSetEapUserDataAEx +# @ stub RasSetEapUserDataW +# @ stub RasSetEapUserDataWEx +# @ stub RasSetEntryAdvancedProperties @ stdcall RasSetEntryDialParamsA(str ptr long) @ stdcall RasSetEntryDialParamsW(wstr ptr long) @ stdcall RasSetEntryPropertiesA(str str ptr long ptr long) @ stdcall RasSetEntryPropertiesW(wstr wstr ptr long ptr long) @ stub RasSetOldPassword +# @ stub RasSetPerConnectionProxy +# @ stub RasSetSharedAutoDial @ stdcall RasSetSubEntryPropertiesA(str str long ptr long ptr long) @ stdcall RasSetSubEntryPropertiesW(wstr wstr long ptr long ptr long) +# @ stub RasTriggerConnection +# @ stub RasTriggerConnectionEx +# @ stub RasTriggerDisconnection +# @ stub RasTriggerDisconnectionEx +# @ stub RasUnregisterEntryChangeNotification +# @ stub RasUpdateConnection @ stdcall RasValidateEntryNameA(str str) @ stdcall RasValidateEntryNameW(wstr wstr) +# stub @ RasWriteSharedPbkOptions +# stub @ UnInitializeRAS 500 stub RnaEngineRequest 501 stub DialEngineRequest -- 2.31.1

1 0