wine-commits August 2023

wine-commits@winehq.org

1 participants
667 discussions

Jactry Zeng : mshtml: Call UrlUnescapeW() with URL_UNESCAPE_AS_UTF8 in is_gecko_path().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: a3068d7bd90b7dd224ba234059e9b018c187b328 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3068d7bd90b7dd224ba234059e9b0… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Aug 9 01:55:21 2022 -0500 mshtml: Call UrlUnescapeW() with URL_UNESCAPE_AS_UTF8 in is_gecko_path(). This fixes an issue when the path includes non-ASCII characters. --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 21ddb3cb38f..4154fa711f7 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1297,7 +1297,7 @@ BOOL is_gecko_path(const char *path) *ptr = '/'; } - UrlUnescapeW(buf, NULL, NULL, URL_UNESCAPE_INPLACE); + UrlUnescapeW(buf, NULL, NULL, URL_UNESCAPE_INPLACE | URL_UNESCAPE_AS_UTF8); buf[gecko_path_len] = 0; ret = !wcsicmp(buf, gecko_path);

1 0

Jactry Zeng : shlwapi/tests: Test UrlUnescapeW() with URL_UNESCAPE_AS_UTF8.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 9cef334800848bf910734eabbe88c2f141e05189 URL: https://gitlab.winehq.org/wine/wine/-/commit/9cef334800848bf910734eabbe88c2… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 8 23:05:04 2022 -0500 shlwapi/tests: Test UrlUnescapeW() with URL_UNESCAPE_AS_UTF8. --- dlls/shlwapi/tests/url.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3690bc1686c..160f7696cc2 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -28,6 +28,7 @@ #include "shlwapi.h" #include "wininet.h" #include "intshcut.h" +#include "winternl.h" static const char* TEST_URL_1 = "http://www.winehq.org/tests?date=10/10/1923"; static const char* TEST_URL_2 = "http://localhost:8080/tests%2e.html?date=Mon%2010/10/1923"; @@ -418,7 +419,20 @@ static struct { L"file://fo%20o%5Ca/bar", L"file://fo o\\a/bar" }, { L"file://%24%25foobar", L"file://$%foobar" }, { L"file:///C:/Program Files", L"file:///C:/Program Files" }, + { L"file:///C:/Program Files", L"file:///C:/Program Files", URL_UNESCAPE_AS_UTF8 }, { L"file:///C:/Program%20Files", L"file:///C:/Program Files" }, + { L"file:///C:/Program%20Files", L"file:///C:/Program Files", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%E4%B8%AD%E6%96%87/bar", L"file://foo/\xe4\xb8\xad\xe6\x96\x87/bar" }, /* with 3 btyes utf-8 */ + { L"file://foo/%E4%B8%AD%E6%96%87/bar", L"file://foo/\x4e2d\x6587/bar", URL_UNESCAPE_AS_UTF8 }, + /* mix corrupt and good utf-8 */ + { L"file://foo/%E4%AD%E6%96%87/bar", L"file://foo/\xfffd\x6587/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%F0%9F%8D%B7/bar", L"file://foo/\xf0\x9f\x8d\xb7/bar" }, /* with 4 btyes utf-8 */ + { L"file://foo/%F0%9F%8D%B7/bar", L"file://foo/\xd83c\xdf77/bar", URL_UNESCAPE_AS_UTF8 }, + /* non-escaped chars between multi-byte escaped chars */ + { L"file://foo/%E4%B8%ADabc%E6%96%87/bar", L"file://foo/\x4e2d""abc""\x6587/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%E4B8%AD/bar", L"file://foo/\xfffd""B8\xfffd/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%E4%G8%AD/bar", L"file://foo/\xfffd""%G8\xfffd/bar", URL_UNESCAPE_AS_UTF8 }, + { L"file://foo/%G4%B8%AD/bar", L"file://foo/%G4\xfffd\xfffd/bar", URL_UNESCAPE_AS_UTF8 }, }; static const struct { @@ -1406,6 +1420,7 @@ static void test_UrlUnescape(void) WCHAR urlW[INTERNET_MAX_URL_LENGTH], bufferW[INTERNET_MAX_URL_LENGTH]; CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; DWORD dwEscaped, unescaped; + BOOL utf8_support = TRUE; static char inplace[] = "file:///C:/Program%20Files"; static char another_inplace[] = "file:///C:/Program%20Files"; static const char expected[] = "file:///C:/Program Files"; @@ -1429,8 +1444,21 @@ static void test_UrlUnescape(void) ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); } + unescaped = INTERNET_MAX_URL_LENGTH; + lstrcpyW(urlW, L"%F0%9F%8D%B7"); + res = UrlUnescapeW(urlW, NULL, &unescaped, URL_UNESCAPE_AS_UTF8 | URL_UNESCAPE_INPLACE); + ok(res == S_OK, "Got %#lx.\n", res); + if (!wcscmp(urlW, L"\xf0\x9f\x8d\xb7")) + { + utf8_support = FALSE; + win_skip("Skip URL_UNESCAPE_AS_UTF8 tests for pre-win7 systems.\n"); + } + for (i = 0; i < ARRAYSIZE(TEST_URL_UNESCAPEW); i++) { + if (TEST_URL_UNESCAPEW[i].flags & URL_UNESCAPE_AS_UTF8 && !utf8_support) + continue; + lstrcpyW(urlW, TEST_URL_UNESCAPEW[i].url); memset(bufferW, 0xff, sizeof(bufferW));

1 0

Jactry Zeng : kernelbase: Implement URL_UNESCAPE_AS_UTF8 for UrlUnescapeW().
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: d482010042fbc5aa0198a0f3777c02f9c443f5dd URL: https://gitlab.winehq.org/wine/wine/-/commit/d482010042fbc5aa0198a0f3777c02… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Aug 8 23:04:34 2022 -0500 kernelbase: Implement URL_UNESCAPE_AS_UTF8 for UrlUnescapeW(). --- dlls/kernelbase/path.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 7eda9bd483c..40ddf840045 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2907,11 +2907,26 @@ HRESULT WINAPI UrlUnescapeA(char *url, char *unescaped, DWORD *unescaped_len, DW return hr; } +static int get_utf8_len(unsigned char code) +{ + if (code < 0x80) + return 1; + else if ((code & 0xe0) == 0xc0) + return 2; + else if ((code & 0xf0) == 0xe0) + return 3; + else if ((code & 0xf8) == 0xf0) + return 4; + return 0; +} + HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, DWORD flags) { + WCHAR *dst, next, utf16_buf[4]; BOOL stop_unescaping = FALSE; + int utf8_len, utf16_len, i; const WCHAR *src; - WCHAR *dst, next; + char utf8_buf[4]; DWORD needed; HRESULT hr; @@ -2930,6 +2945,7 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, for (src = url, needed = 0; *src; src++, needed++) { + utf16_len = 0; if (flags & URL_DONT_UNESCAPE_EXTRA_INFO && (*src == '#' || *src == '?')) { stop_unescaping = TRUE; @@ -2939,17 +2955,53 @@ HRESULT WINAPI UrlUnescapeW(WCHAR *url, WCHAR *unescaped, DWORD *unescaped_len, { INT ih; WCHAR buf[5] = L"0x"; + memcpy(buf + 2, src + 1, 2*sizeof(WCHAR)); buf[4] = 0; StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); - next = (WCHAR) ih; src += 2; /* Advance to end of escape */ + + if (flags & URL_UNESCAPE_AS_UTF8) + { + utf8_buf[0] = ih; + utf8_len = get_utf8_len(ih); + for (i = 1; i < utf8_len && *(src + 1) == '%' && *(src + 2) && *(src + 3); i++) + { + memcpy(buf + 2, src + 2, 2 * sizeof(WCHAR)); + StrToIntExW(buf, STIF_SUPPORT_HEX, &ih); + /* Check if it is a valid continuation byte. */ + if ((ih & 0xc0) == 0x80) + { + utf8_buf[i] = ih; + src += 3; + } + else + break; + } + + utf16_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, + utf8_buf, i, utf16_buf, ARRAYSIZE(utf16_buf)); + if (utf16_len) + needed += utf16_len - 1; + else + next = 0xfffd; + } + else + next = (WCHAR) ih; } else next = *src; if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len) - *dst++ = next; + { + if (utf16_len) + { + memcpy(dst, utf16_buf, utf16_len * sizeof(*utf16_buf)); + dst += utf16_len; + } + else + *dst++ = next; + } } if (flags & URL_UNESCAPE_INPLACE || needed < *unescaped_len)

1 0

Jactry Zeng : shlwapi/tests: Test UrlUnescapeW() with independent data.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 75d0ab083906db13257e8f08ca5c6bae2ebc8917 URL: https://gitlab.winehq.org/wine/wine/-/commit/75d0ab083906db13257e8f08ca5c6b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Aug 5 02:34:25 2022 -0500 shlwapi/tests: Test UrlUnescapeW() with independent data. --- dlls/shlwapi/tests/url.c | 71 ++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 6870de4ee5f..3690bc1686c 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -407,7 +407,19 @@ static struct { {"file://%24%25foobar", "file://$%foobar"} }; -/* ################ */ +static struct +{ + const WCHAR *url; + const WCHAR *expect; + DWORD flags; +} TEST_URL_UNESCAPEW[] = +{ + { L"file://foo/bar", L"file://foo/bar" }, + { L"file://fo%20o%5Ca/bar", L"file://fo o\\a/bar" }, + { L"file://%24%25foobar", L"file://$%foobar" }, + { L"file:///C:/Program Files", L"file:///C:/Program Files" }, + { L"file:///C:/Program%20Files", L"file:///C:/Program Files" }, +}; static const struct { const char *path; @@ -1391,17 +1403,14 @@ static void test_UrlIs(void) static void test_UrlUnescape(void) { + WCHAR urlW[INTERNET_MAX_URL_LENGTH], bufferW[INTERNET_MAX_URL_LENGTH]; CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; - WCHAR ret_urlW[INTERNET_MAX_URL_LENGTH]; - WCHAR *urlW, *expected_urlW; - DWORD dwEscaped; - size_t i; + DWORD dwEscaped, unescaped; static char inplace[] = "file:///C:/Program%20Files"; static char another_inplace[] = "file:///C:/Program%20Files"; static const char expected[] = "file:///C:/Program Files"; - static WCHAR inplaceW[] = L"file:///C:/Program Files"; - static WCHAR another_inplaceW[] = L"file:///C:/Program%20Files"; HRESULT res; + int i; for (i = 0; i < ARRAY_SIZE(TEST_URL_UNESCAPE); i++) { dwEscaped=INTERNET_MAX_URL_LENGTH; @@ -1418,21 +1427,30 @@ static void test_UrlUnescape(void) "UrlUnescapeA returned 0x%lx (expected E_INVALIDARG) for \"%s\"\n", res, TEST_URL_UNESCAPE[i].url); ok(strcmp(szReturnUrl,"")==0, "Expected empty string\n"); + } - dwEscaped = INTERNET_MAX_URL_LENGTH; - urlW = GetWideString(TEST_URL_UNESCAPE[i].url); - expected_urlW = GetWideString(TEST_URL_UNESCAPE[i].expect); - res = UrlUnescapeW(urlW, ret_urlW, &dwEscaped, 0); - ok(res == S_OK, - "UrlUnescapeW returned 0x%lx (expected S_OK) for \"%s\"\n", - res, TEST_URL_UNESCAPE[i].url); - - WideCharToMultiByte(CP_ACP,0,ret_urlW,-1,szReturnUrl,INTERNET_MAX_URL_LENGTH,0,0); - ok(lstrcmpW(ret_urlW, expected_urlW)==0, - "Expected \"%s\", but got \"%s\" from \"%s\" flags %08lx\n", - TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url, 0L); - FreeWideString(urlW); - FreeWideString(expected_urlW); + for (i = 0; i < ARRAYSIZE(TEST_URL_UNESCAPEW); i++) + { + lstrcpyW(urlW, TEST_URL_UNESCAPEW[i].url); + + memset(bufferW, 0xff, sizeof(bufferW)); + unescaped = INTERNET_MAX_URL_LENGTH; + res = UrlUnescapeW(urlW, bufferW, &unescaped, TEST_URL_UNESCAPEW[i].flags); + ok(res == S_OK, "[%d]: returned %#lx.\n", i, res); + ok(unescaped == wcslen(TEST_URL_UNESCAPEW[i].expect), "[%d]: got unescaped %ld.\n", i, unescaped); + ok(!wcscmp(bufferW, TEST_URL_UNESCAPEW[i].expect), "[%d]: got result %s.\n", i, debugstr_w(bufferW)); + + /* Test with URL_UNESCAPE_INPLACE */ + unescaped = INTERNET_MAX_URL_LENGTH; + res = UrlUnescapeW(urlW, NULL, &unescaped, TEST_URL_UNESCAPEW[i].flags | URL_UNESCAPE_INPLACE); + ok(res == S_OK, "[%d]: returned %#lx.\n", i, res); + ok(unescaped == INTERNET_MAX_URL_LENGTH, "[%d]: got unescaped %ld.\n", i, unescaped); + ok(!wcscmp(urlW, TEST_URL_UNESCAPEW[i].expect), "[%d]: got result %s.\n", i, debugstr_w(urlW)); + + lstrcpyW(urlW, TEST_URL_UNESCAPEW[i].url); + unescaped = wcslen(TEST_URL_UNESCAPEW[i].expect) - 1; + res = UrlUnescapeW(urlW, bufferW, &unescaped, TEST_URL_UNESCAPEW[i].flags); + ok(res == E_POINTER, "[%d]: returned %#lx.\n", i, res); } dwEscaped = sizeof(inplace); @@ -1445,17 +1463,6 @@ static void test_UrlUnescape(void) res = UrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%lx (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); - - dwEscaped = sizeof(inplaceW); - res = UrlUnescapeW(inplaceW, NULL, &dwEscaped, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%lx (expected S_OK)\n", res); - ok(dwEscaped == 50, "got %ld expected 50\n", dwEscaped); - - /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ - res = UrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); - ok(res == S_OK, "UrlUnescapeW returned 0x%lx (expected S_OK)\n", res); - - ok(lstrlenW(another_inplaceW) == 24, "got %d expected 24\n", lstrlenW(another_inplaceW)); } static const struct parse_url_test_t {

1 0

Biswapriyo Nath : include: Add windows.ui.xaml.hosting.desktopwindowxamlsource.idl file.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 24e7055f1d3268a9f50cff2e9e40242ca187b540 URL: https://gitlab.winehq.org/wine/wine/-/commit/24e7055f1d3268a9f50cff2e9e4024… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 28 11:40:27 2023 +0300 include: Add windows.ui.xaml.hosting.desktopwindowxamlsource.idl file. --- include/Makefile.in | 1 + ...ows.ui.xaml.hosting.desktopwindowxamlsource.idl | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 708fd55367a..54b4ab5925e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -857,6 +857,7 @@ SOURCES = \ windows.ui.core.idl \ windows.ui.idl \ windows.ui.viewmanagement.idl \ + windows.ui.xaml.hosting.desktopwindowxamlsource.idl \ windowscontracts.idl \ windowsx.h \ wine/afd.h \ diff --git a/include/windows.ui.xaml.hosting.desktopwindowxamlsource.idl b/include/windows.ui.xaml.hosting.desktopwindowxamlsource.idl new file mode 100644 index 00000000000..fe726ac6f70 --- /dev/null +++ b/include/windows.ui.xaml.hosting.desktopwindowxamlsource.idl @@ -0,0 +1,42 @@ +/* + * Copyright (C) 2023 Biswapriyo Nath + * + * 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 + */ + +import "oaidl.idl"; + +[ + object, + uuid(3cbcf1bf-2f76-4e9c-96ab-e84b37972554), + local, + pointer_default(unique) +] +interface IDesktopWindowXamlSourceNative : IUnknown +{ + HRESULT AttachToWindow([in] HWND parent_wnd); + [propget] HRESULT WindowHandle([out, retval] HWND *wnd); +} + +[ + object, + uuid(e3dcd8c7-3057-4692-99c3-7b7720afda31), + local, + pointer_default(unique) +] +interface IDesktopWindowXamlSourceNative2 : IDesktopWindowXamlSourceNative +{ + HRESULT PreTranslateMessage([in] const MSG *message, [out, retval] BOOL *result); +}

1 0

Biswapriyo Nath : include: Add xamlom.idl file.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 624c5870e7283abf818e6fd996f1c4433b0731a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/624c5870e7283abf818e6fd996f1c4… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Jul 28 11:32:10 2023 +0300 include: Add xamlom.idl file. --- include/Makefile.in | 1 + include/xamlom.idl | 347 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 348 insertions(+)

1 0

Biswapriyo Nath : include: Add IXAudio2Extension in xaudio2.idl.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: a34267e87e6c21e13c13204ecf63b73bcca75e85 URL: https://gitlab.winehq.org/wine/wine/-/commit/a34267e87e6c21e13c13204ecf63b7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 4 21:42:39 2023 +0530 include: Add IXAudio2Extension in xaudio2.idl. Required for rpcs3 project. --- include/xaudio2.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 277fc450469..b07c562914b 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -572,6 +572,18 @@ interface IXAudio2 : IUnknown [in, defaultvalue(NULL)] void* pReserved); } +[ + object, + local, + uuid(84ac29bb-d619-44d2-b197-e4acf7df3ed6) +] +interface IXAudio2Extension : IUnknown +{ + void GetProcessingQuantum(UINT32 *quantum_numerator, UINT32 *quantum_denominator); + + void GetProcessor(XAUDIO2_PROCESSOR *processor); +} + const UINT32 XAUDIO2_DEBUG_ENGINE = 0x00000001; const UINT32 XAUDIO2_VOICE_NOPITCH = 0x00000002; const UINT32 XAUDIO2_VOICE_NOSRC = 0x00000004;

1 0

Maxim Karasev : whoami: Refactor and add more commands.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: aa3beb88b346cd74568157d5c10a464a6995c7c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa3beb88b346cd74568157d5c10a46… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Mon Jul 24 22:15:34 2023 +0300 whoami: Refactor and add more commands. Particularly it implements '/logonid' and '/user' options, as well as adds stubs for '/upn' and '/fqdn'. --- programs/whoami/Makefile.in | 2 +- programs/whoami/main.c | 267 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 239 insertions(+), 30 deletions(-) diff --git a/programs/whoami/Makefile.in b/programs/whoami/Makefile.in index 4898a96f456..5be08c702a8 100644 --- a/programs/whoami/Makefile.in +++ b/programs/whoami/Makefile.in @@ -1,5 +1,5 @@ MODULE = whoami.exe -IMPORTS = secur32 +IMPORTS = secur32 advapi32 EXTRADLLFLAGS = -mconsole -municode diff --git a/programs/whoami/main.c b/programs/whoami/main.c index 7e93de998ef..c98a553d32d 100644 --- a/programs/whoami/main.c +++ b/programs/whoami/main.c @@ -1,5 +1,6 @@ /* * Copyright 2020 Brendan Shanks for CodeWeavers + * Copyright 2023 Maxim Karasev <mxkrsv(a)etersoft.ru> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,9 +17,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WIN32_LEAN_AND_MEAN #define SECURITY_WIN32 #include <windows.h> #include <security.h> +#include <sddl.h> +#include <stdarg.h> #include "wine/debug.h" @@ -27,67 +31,272 @@ WINE_DEFAULT_DEBUG_CHANNEL(whoami); static int output_write(const WCHAR* str, int len) { DWORD count; + + if (len < 0) + len = wcslen(str); + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL)) { DWORD lenA; - char* strA; + char *strA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall * back to WriteFile() with OEM code page. */ - lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, - NULL, 0, NULL, NULL); - strA = HeapAlloc(GetProcessHeap(), 0, lenA); + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); + strA = malloc(lenA); if (!strA) return 0; - WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, - NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); - HeapFree(GetProcessHeap(), 0, strA); + free(strA); } return count; } -int __cdecl wmain(int argc, WCHAR *argv[]) +static WCHAR *get_user_name(EXTENDED_NAME_FORMAT name_format) { - WCHAR *buf = NULL; ULONG size = 0; - BOOL result; + WCHAR *ret; - if (argc > 1) + if (GetUserNameExW(name_format, NULL, &size) || GetLastError() != ERROR_MORE_DATA) + return NULL; + + ret = malloc(size * sizeof(WCHAR)); + if (!ret) + return NULL; + + if (!GetUserNameExW(name_format, ret, &size)) { - int i; + free(ret); + return NULL; + } + + return ret; +} + +static void *get_token(TOKEN_INFORMATION_CLASS token_type) +{ + HANDLE token_handle; + void *ret; + /* GetTokenInformation wants a dword-aligned buffer */ + ULONG ret_size = sizeof(DWORD) * 256; + ULONG token_size; + + ret = malloc(ret_size); + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token_handle)) + return NULL; - WINE_FIXME("unsupported arguments:"); - for (i = 0; i < argc; i++) - WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); - WINE_FIXME("\n"); + if (!GetTokenInformation(token_handle, token_type, ret, ret_size, &token_size)) + { + CloseHandle(token_handle); + return NULL; + } + + CloseHandle(token_handle); + return ret; +} + +static SID *get_process_sid(void) +{ + ULONG user_sid_len; + TOKEN_USER *token_user; + SID *ret; + + token_user = get_token(TokenUser); + if (!token_user) + return NULL; + + user_sid_len = GetLengthSid(token_user->User.Sid); + ret = malloc(user_sid_len); + if (!ret) + { + free(token_user); + return NULL; } - result = GetUserNameExW(NameSamCompatible, NULL, &size); - if (result || GetLastError() != ERROR_MORE_DATA) + if (!CopySid(user_sid_len, ret, token_user->User.Sid)) { - WINE_ERR("GetUserNameExW failed, result %d, error %ld\n", result, GetLastError()); + free(token_user); + free(ret); + return NULL; + } + + free(token_user); + return ret; +} + +static SID *get_logon_sid(void) +{ + TOKEN_GROUPS *token_groups; + DWORD group_token_len; + DWORD i; + SID *ret; + + token_groups = get_token(TokenGroups); + if (!token_groups) + return NULL; + + for (i = 0; i < token_groups->GroupCount; i++) + { + if ((token_groups->Groups[i].Attributes & SE_GROUP_LOGON_ID) == SE_GROUP_LOGON_ID) + { + group_token_len = GetLengthSid(token_groups->Groups[i].Sid); + ret = malloc(group_token_len); + if (!ret) + { + free(token_groups); + return NULL; + } + + if (!CopySid(group_token_len, ret, token_groups->Groups[i].Sid)) + { + free(token_groups); + free(ret); + return NULL; + } + + free(token_groups); + return ret; + } + } + + free(token_groups); + return NULL; +} + +static int simple(EXTENDED_NAME_FORMAT name_format) +{ + WCHAR *name; + + name = get_user_name(name_format); + if (!name) + { + ERR("get_user_name failed\n"); return 1; } - buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); - if (!buf) + output_write(name, -1); + output_write(L"\n", 1); + + free(name); + + return 0; +} + +static int logon_id(void) +{ + PSID sid; + WCHAR *sid_string; + + sid = get_logon_sid(); + if (!sid) { - WINE_ERR("Memory allocation failed\n"); + ERR("get_logon_sid failed\n"); return 1; } - result = GetUserNameExW(NameSamCompatible, buf, &size); - if (result) + if (!ConvertSidToStringSidW(sid, &sid_string)) { - output_write(buf, size); - output_write(L"\r\n", 2); + ERR("ConvertSidToStringSidW failed, error %ld\n", GetLastError()); + return 1; + } + + output_write(sid_string, -1); + output_write(L"\n", 1); + + free(sid); + LocalFree(sid_string); + + return 0; +} + +static int user(void) +{ + PSID sid; + WCHAR *name; + WCHAR *sid_string; + ULONG i; + + name = get_user_name(NameSamCompatible); + if (!name) + { + ERR("get_user_name failed\n"); + return 1; + } + + sid = get_process_sid(); + if (!sid) + { + ERR("get_process_sid failed\n"); + return 1; } - else - WINE_ERR("GetUserNameExW failed, error %ld\n", GetLastError()); - HeapFree(GetProcessHeap(), 0, buf); + if (!ConvertSidToStringSidW(sid, &sid_string)) + { + ERR("ConvertSidToStringSidW failed, error %ld\n", GetLastError()); + return 1; + } + + output_write(L"\nUSER INFORMATION\n----------------\n\n", -1); + output_write(L"User Name", -1); + for (i = 0; i <= max(wcslen(name), wcslen(L"User Name")) - wcslen(L"User Name"); i++) + output_write(L" ", 1); + output_write(L"SID\n", -1); + + for (i = 0; i < wcslen(name); i++) + output_write(L"=", 1); + output_write(L" ", 1); + for (i = 0; i < wcslen(sid_string); i++) + output_write(L"=", 1); + output_write(L"\n", 1); + + output_write(name, -1); + output_write(L" ", 1); + output_write(sid_string, -1); + output_write(L"\n", 1); + + free(name); + free(sid); + LocalFree(sid_string); + return 0; } + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + if (argv[1] == NULL) + { + + return simple(NameSamCompatible); + } + else + { + wcslwr(argv[1]); + + if (!wcscmp(argv[1], L"/upn")) + { + /* Not implemented as of now, therefore fails */ + return simple(NameUserPrincipal); + } + else if (!wcscmp(argv[1], L"/fqdn")) + { + /* Not implemented as of now, therefore fails */ + return simple(NameFullyQualifiedDN); + } + else if (!wcscmp(argv[1], L"/logonid")) + { + return logon_id(); + } + else if (!wcscmp(argv[1], L"/user")) + { + return user(); + } + else + { + FIXME("stub\n"); + return 0; + } + } +}

1 0

Maxim Karasev : secur32: Add stub message for unimplemented name types in GetUserNameExW.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 5abe9de59fdc88a8c742f313f35cb175c60da98e URL: https://gitlab.winehq.org/wine/wine/-/commit/5abe9de59fdc88a8c742f313f35cb1… Author: Maxim Karasev <mxkrsv(a)etersoft.ru> Date: Wed Aug 2 20:42:07 2023 +0300 secur32: Add stub message for unimplemented name types in GetUserNameExW. --- dlls/secur32/secur32.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 46a80c9a76c..bb723e90004 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1140,6 +1140,7 @@ BOOLEAN WINAPI GetUserNameExW( case NameCanonicalEx: case NameServicePrincipal: case NameDnsDomain: + FIXME("NameFormat %d not implemented\n", NameFormat); SetLastError(ERROR_NONE_MAPPED); return FALSE;

1 0

Paul Gofman : opengl32: Skip debug callback messages called from native thread.
by Alexandre Julliard 14 Aug '23

14 Aug '23

Module: wine Branch: master Commit: 51b671532715bd2a0486a2c7ddf23134d81ba688 URL: https://gitlab.winehq.org/wine/wine/-/commit/51b671532715bd2a0486a2c7ddf231… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Aug 11 17:57:29 2023 -0600 opengl32: Skip debug callback messages called from native thread. --- dlls/opengl32/unix_wgl.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index cf819e96df2..4cf12893541 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -903,8 +903,15 @@ static void gl_debug_message_callback( GLenum source, GLenum type, GLuint id, GL }; void *ret_ptr; ULONG ret_len; - struct wgl_handle *ptr = (struct wgl_handle *)userParam; + + if (!NtCurrentTeb()) + { + fprintf( stderr, "msg:gl_debug_message_callback called from native thread, severity %#x, message \"%.*s\".\n", + severity, length, message ); + return; + } + if (!(params.user_callback = ptr->u.context->debug_callback)) return; params.user_data = ptr->u.context->debug_user;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2023