October 2023 - Wine-commits

Arkadiusz Hiler : winex11.drv: Send missed KEYUP events on KeymapNotify.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 2bfe81e41f93ce75139e3a6a2d0b68eb2dcb8fa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bfe81e41f93ce75139e3a6a2d0b68… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Oct 17 13:10:44 2023 +0300 winex11.drv: Send missed KEYUP events on KeymapNotify. Full focus lost / focus gained events on the Windows side are not feasible for X11's FocusIn/FocusOut events generated by keyboard grabs (see XGrabKeyboard()) that are used for example for Atl+Tab handling. Using them would degrade user's experience by causing the window to minimize or flash multiple times depending on a game/window manager combo. Because of that the programs may miss on some KEYUP events that happen during the grab, and since there are no focus changes on the Windows side the state doesn't get resynced. This change attempts to improve user experience by syncing any missed key release events that happened while the window haven't had focus on the X11 side. There's no syncing of key presses as those are more problematic because of window manager quirks, e.g. on KDE it may end up syncing the Tab press portion of Alt+Tab. Luckily missing key events for keys that were pressed and not released while the WM had the keyboard grab is not nearly as confusing as stuck keys. For Warhammer: Chaosbane, theHunter: Call of the Wild, Far Cry Primal and many other games that end up with stuck Alt after Alt+Tabbing. --- dlls/winex11.drv/event.c | 2 ++ dlls/winex11.drv/keyboard.c | 43 +++++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/mouse.c | 2 ++ dlls/winex11.drv/x11drv.h | 1 + 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 053c0e2ff47..97bec34b0ea 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -775,6 +775,8 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (is_virtual_desktop() && hwnd == NtUserGetDesktopWindow()) retry_grab_clipping_window(); if (hwnd == NtUserGetDesktopWindow()) return FALSE; + x11drv_thread_data()->keymapnotify_hwnd = hwnd; + /* when keyboard grab is released, re-apply the cursor clipping rect */ was_grabbed = keyboard_grabbed; keyboard_grabbed = event->mode == NotifyGrab || event->mode == NotifyWhileGrabbed; diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index b240b228ff0..5c7f6c37276 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1192,11 +1192,19 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) int i, j; BYTE keystate[256]; WORD vkey; + DWORD flags; + KeyCode keycode; + HWND keymapnotify_hwnd; BOOL changed = FALSE; struct { WORD vkey; + WORD scan; WORD pressed; } keys[256]; + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + keymapnotify_hwnd = thread_data->keymapnotify_hwnd; + thread_data->keymapnotify_hwnd = NULL; if (!get_async_key_state( keystate )) return FALSE; @@ -1211,11 +1219,17 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { for (j = 0; j < 8; j++) { - vkey = keyc2vkey[(i * 8) + j]; + keycode = (i * 8) + j; + vkey = keyc2vkey[keycode]; /* If multiple keys map to the same vkey, we want to report it as * pressed iff any of them are pressed. */ - if (!keys[vkey & 0xff].vkey) keys[vkey & 0xff].vkey = vkey; + if (!keys[vkey & 0xff].vkey) + { + keys[vkey & 0xff].vkey = vkey; + keys[vkey & 0xff].scan = keyc2scan[keycode] & 0xff; + } + if (event->xkeymap.key_vector[i] & (1<<j)) keys[vkey & 0xff].pressed = TRUE; } } @@ -1227,6 +1241,31 @@ BOOL X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) TRACE( "Adjusting state for vkey %#.2x. State before %#.2x\n", keys[vkey].vkey, keystate[vkey]); + /* This KeymapNotify follows a FocusIn(mode=NotifyUngrab) event, + * which is caused by a keyboard grab being released. + * See XGrabKeyboard(). + * + * We might have missed some key press/release events while the + * keyboard was grabbed, but keyboard grab doesn't generate focus + * lost / focus gained events on the Windows side, so the affected + * program is not aware that it needs to resync the keyboard state. + * + * This, for example, may cause Alt being stuck after using Alt+Tab. + * + * To work around that problem we sync any possible key releases. + * + * Syncing key presses is not feasible as window managers differ in + * event sequences, e.g. KDE performs two keyboard grabs for + * Alt+Tab, which would sync the Tab press. + */ + if (keymapnotify_hwnd && !keys[vkey].pressed) + { + TRACE( "Sending KEYUP for a modifier %#.2x\n", vkey); + flags = KEYEVENTF_KEYUP; + if (keys[vkey].vkey & 0x1000) flags |= KEYEVENTF_EXTENDEDKEY; + X11DRV_send_keyboard_input( keymapnotify_hwnd, vkey, keys[vkey].scan, flags, NtGetTickCount() ); + } + update_key_state( keystate, vkey, keys[vkey].pressed ); changed = TRUE; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 3ddcf609549..612fff9995c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1611,6 +1611,8 @@ BOOL X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); + x11drv_thread_data()->keymapnotify_hwnd = hwnd; + if (hwnd == x11drv_thread_data()->grab_hwnd) return FALSE; /* simulate a mouse motion event */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e80cb6682bf..2c15a95dfab 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -382,6 +382,7 @@ struct x11drv_thread_data XEvent *current_event; /* event currently being processed */ HWND grab_hwnd; /* window that currently grabs the mouse */ HWND last_focus; /* last window that had focus */ + HWND keymapnotify_hwnd; /* window that should receive modifier release events */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */

1 0

Dmitry Timoshkov : crypt32: Avoid truncating unicode chars.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: c2962b22838de4594b4a72212eeeb0afbbbba35a URL: https://gitlab.winehq.org/wine/wine/-/commit/c2962b22838de4594b4a72212eeeb0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 15 14:25:35 2023 +0300 crypt32: Avoid truncating unicode chars. So that strings containing Cyrillic Capital Letter ER (0x420) won't be quoted when not needed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/str.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 855e5a1c123..3426889b2dd 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -139,6 +139,11 @@ static inline BOOL is_quotable_char(WCHAR c) } } +static inline BOOL is_spaceW(WCHAR c) +{ + return c <= 0x7f && isspace((char)c); +} + static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, LPWSTR psz, DWORD csz) { @@ -195,9 +200,9 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, case CERT_RDN_BMP_STRING: case CERT_RDN_UTF8_STRING: strLen = len = pValue->cbData / sizeof(WCHAR); - if (pValue->cbData && isspace(pValue->pbData[0])) + if (strLen && is_spaceW(((LPCWSTR)pValue->pbData)[0])) needsQuotes = TRUE; - if (pValue->cbData && isspace(pValue->pbData[strLen - 1])) + if (strLen && _spaceW(((LPCWSTR)pValue->pbData)[strLen - 1])) needsQuotes = TRUE; for (i = 0; i < strLen; i++) {

1 0

Dmitry Timoshkov : crypt32/tests: Add some tests for quoted RDN values.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 1252426d71937c610d79e7c45b1a0818b7b1c524 URL: https://gitlab.winehq.org/wine/wine/-/commit/1252426d71937c610d79e7c45b1a08… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 15 18:51:35 2023 +0300 crypt32/tests: Add some tests for quoted RDN values. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/tests/str.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 9e4ca37bcd6..f86459ba236 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -23,6 +23,7 @@ #include <winbase.h> #include <winerror.h> #include <wincrypt.h> +#include <winnls.h> #include "wine/test.h" @@ -1079,8 +1080,155 @@ static void test_CertGetNameString(void) CertFreeCertificateContext(context); } +static void test_quoted_RDN(void) +{ + static const WCHAR str1[] = { '1',0x00a0,0 }; + static const WCHAR str2[] = { '1',0x3000,0 }; + static const struct + { + const WCHAR *CN; + const WCHAR *X500_CN; + } test[] = + { + { L"1", L"1" }, + { L" 1", L"\" 1\"" }, + { L"1 ", L"\"1 \"" }, + { L"\"1\"", L"\"\"\"1\"\"\"" }, + { L"\" 1 \"", L"\"\"\" 1 \"\"\"" }, + { L"\"\"\"1\"\"\"", L"\"\"\"\"\"\"\"1\"\"\"\"\"\"\"" }, + { L"1+", L"\"1+\"" }, + { L"1=", L"\"1=\"" }, + { L"1\"", L"\"1\"\"\"" }, + { L"1<", L"\"1<\"" }, + { L"1>", L"\"1>\"" }, + { L"1#", L"\"1#\"" }, + { L"1+", L"\"1+\"" }, + { L"1\t", L"\"1\t\"" }, + { L"1\r", L"\"1\r\"" }, + { L"1\n", L"\"1\n\"" }, + { str1, str1 }, + { str2, str2 }, + }; + CERT_RDN_ATTR attr; + CERT_RDN rdn; + CERT_NAME_INFO info; + CERT_NAME_BLOB blob; + BYTE *buf; + WCHAR str[256]; + DWORD size, ret, i; + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + winetest_push_context("%lu", i); + + attr.pszObjId = (LPSTR)szOID_COMMON_NAME; + attr.dwValueType = CERT_RDN_UNICODE_STRING; + attr.Value.cbData = wcslen(test[i].CN) * sizeof(WCHAR); + attr.Value.pbData = (BYTE *)test[i].CN; + rdn.cRDNAttr = 1; + rdn.rgRDNAttr = &attr; + info.cRDN = 1; + info.rgRDN = &rdn; + buf = NULL; + size = 0; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_UNICODE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx error %08lx\n", GetLastError()); + + blob.pbData = buf; + blob.cbData = size; + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, 0, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcscmp(str, test[i].X500_CN), "got %s, expected %s\n", debugstr_w(str), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_SIMPLE_NAME_STR, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcscmp(str, test[i].X500_CN), "got %s, expected %s\n", debugstr_w(str), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_OID_NAME_STR, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcsncmp(str, L"2.5.4.3=", 8), "got %s\n", debugstr_w(str)); + ok(!wcscmp(&str[8], test[i].X500_CN), "got %s, expected %s\n", debugstr_w(&str[8]), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_X500_NAME_STR, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcsncmp(str, L"CN=", 3), "got %s\n", debugstr_w(str)); + ok(!wcscmp(&str[3], test[i].X500_CN), "got %s, expected %s\n", debugstr_w(&str[3]), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_X500_NAME_STR | CERT_NAME_STR_NO_QUOTING_FLAG, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcsncmp(str, L"CN=", 3), "got %s\n", debugstr_w(str)); + todo_wine_if(i != 0 && i != 13 && i != 14) + ok(!wcscmp(&str[3], test[i].CN), "got %s, expected %s\n", debugstr_w(&str[3]), debugstr_w(test[i].CN)); + + LocalFree(buf); + + winetest_pop_context(); + } + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + winetest_push_context("%lu", i); + + attr.pszObjId = (LPSTR)szOID_COMMON_NAME; + attr.dwValueType = CERT_RDN_UTF8_STRING; + attr.Value.cbData = wcslen(test[i].CN) * sizeof(WCHAR); + attr.Value.pbData = (BYTE *)test[i].CN; + rdn.cRDNAttr = 1; + rdn.rgRDNAttr = &attr; + info.cRDN = 1; + info.rgRDN = &rdn; + buf = NULL; + size = 0; + ret = CryptEncodeObjectEx(X509_ASN_ENCODING, X509_UNICODE_NAME, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + ok(ret, "CryptEncodeObjectEx error %08lx\n", GetLastError()); + + blob.pbData = buf; + blob.cbData = size; + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, 0, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcscmp(str, test[i].X500_CN), "got %s, expected %s\n", debugstr_w(str), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_SIMPLE_NAME_STR, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcscmp(str, test[i].X500_CN), "got %s, expected %s\n", debugstr_w(str), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_OID_NAME_STR, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcsncmp(str, L"2.5.4.3=", 8), "got %s\n", debugstr_w(str)); + ok(!wcscmp(&str[8], test[i].X500_CN), "got %s, expected %s\n", debugstr_w(&str[8]), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_X500_NAME_STR, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcsncmp(str, L"CN=", 3), "got %s\n", debugstr_w(str)); + ok(!wcscmp(&str[3], test[i].X500_CN), "got %s, expected %s\n", debugstr_w(&str[3]), debugstr_w(test[i].X500_CN)); + + str[0] = 0; + ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_X500_NAME_STR | CERT_NAME_STR_NO_QUOTING_FLAG, str, ARRAY_SIZE(str)); + ok(ret, "CertNameToStr error %08lx\n", GetLastError()); + ok(!wcsncmp(str, L"CN=", 3), "got %s\n", debugstr_w(str)); + todo_wine_if(i != 0 && i != 13 && i != 14) + ok(!wcscmp(&str[3], test[i].CN), "got %s, expected %s\n", debugstr_w(&str[3]), debugstr_w(test[i].CN)); + + LocalFree(buf); + + winetest_pop_context(); + } +} + START_TEST(str) { + test_quoted_RDN(); test_CertRDNValueToStrA(); test_CertRDNValueToStrW(); test_CertNameToStrA();

1 0

Dmitry Timoshkov : crypt32: Add support for CERT_NAME_STR_NO_QUOTING_FLAG to CertNameToStr().
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: c23865d9c30ceb1c936745590b333e6aa10c1e6a URL: https://gitlab.winehq.org/wine/wine/-/commit/c23865d9c30ceb1c936745590b333e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 16 15:05:48 2023 +0300 crypt32: Add support for CERT_NAME_STR_NO_QUOTING_FLAG to CertNameToStr(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/str.c | 61 +++++++++++++++++++++++++++--------------------- dlls/crypt32/tests/str.c | 2 -- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 3426889b2dd..4507b023628 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -144,8 +144,8 @@ static inline BOOL is_spaceW(WCHAR c) return c <= 0x7f && isspace((char)c); } -static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, - PCERT_RDN_VALUE_BLOB pValue, LPWSTR psz, DWORD csz) +static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, + DWORD dwStrType, LPWSTR psz, DWORD csz) { DWORD ret = 0, len, i, strLen; BOOL needsQuotes = FALSE; @@ -165,19 +165,22 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, case CERT_RDN_VISIBLE_STRING: case CERT_RDN_GENERAL_STRING: len = pValue->cbData; - if (pValue->cbData && isspace(pValue->pbData[0])) - needsQuotes = TRUE; - if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) - needsQuotes = TRUE; - for (i = 0; i < pValue->cbData; i++) + if (!(dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG)) { - if (is_quotable_char(pValue->pbData[i])) + if (pValue->cbData && isspace(pValue->pbData[0])) needsQuotes = TRUE; - if (pValue->pbData[i] == '"') - len += 1; + if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) + needsQuotes = TRUE; + for (i = 0; i < pValue->cbData; i++) + { + if (is_quotable_char(pValue->pbData[i])) + needsQuotes = TRUE; + if (pValue->pbData[i] == '"') + len += 1; + } + if (needsQuotes) + len += 2; } - if (needsQuotes) - len += 2; if (!psz || !csz) ret = len; else @@ -189,7 +192,8 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, for (i = 0; i < pValue->cbData && ptr - psz < csz; ptr++, i++) { *ptr = pValue->pbData[i]; - if (pValue->pbData[i] == '"' && ptr - psz < csz - 1) + if (!(dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG) && + pValue->pbData[i] == '"' && ptr - psz < csz - 1) *(++ptr) = '"'; } if (needsQuotes && ptr - psz < csz) @@ -200,19 +204,22 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, case CERT_RDN_BMP_STRING: case CERT_RDN_UTF8_STRING: strLen = len = pValue->cbData / sizeof(WCHAR); - if (strLen && is_spaceW(((LPCWSTR)pValue->pbData)[0])) - needsQuotes = TRUE; - if (strLen && _spaceW(((LPCWSTR)pValue->pbData)[strLen - 1])) - needsQuotes = TRUE; - for (i = 0; i < strLen; i++) + if (!(dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG)) { - if (is_quotable_char(((LPCWSTR)pValue->pbData)[i])) + if (strLen && is_spaceW(((LPCWSTR)pValue->pbData)[0])) needsQuotes = TRUE; - if (((LPCWSTR)pValue->pbData)[i] == '"') - len += 1; + if (strLen && is_spaceW(((LPCWSTR)pValue->pbData)[strLen - 1])) + needsQuotes = TRUE; + for (i = 0; i < strLen; i++) + { + if (is_quotable_char(((LPCWSTR)pValue->pbData)[i])) + needsQuotes = TRUE; + if (((LPCWSTR)pValue->pbData)[i] == '"') + len += 1; + } + if (needsQuotes) + len += 2; } - if (needsQuotes) - len += 2; if (!psz || !csz) ret = len; else @@ -224,7 +231,8 @@ static DWORD quote_rdn_value_to_str_w(DWORD dwValueType, for (i = 0; i < strLen && ptr - psz < csz; ptr++, i++) { *ptr = ((LPCWSTR)pValue->pbData)[i]; - if (((LPCWSTR)pValue->pbData)[i] == '"' && ptr - psz < csz - 1) + if (!(dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG) && + ((LPCWSTR)pValue->pbData)[i] == '"' && ptr - psz < csz - 1) *(++ptr) = '"'; } if (needsQuotes && ptr - psz < csz) @@ -328,8 +336,7 @@ static const WCHAR indent[] = L" "; DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, const CERT_NAME_BLOB *pName, DWORD dwStrType, LPWSTR psz, DWORD csz) { - static const DWORD unsupportedFlags = CERT_NAME_STR_NO_QUOTING_FLAG | - CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG; + static const DWORD unsupportedFlags = CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG; DWORD ret = 0, bytes = 0; BOOL bRet; CERT_NAME_INFO *info; @@ -419,7 +426,7 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, } if (psz && ret + 1 == csz) break; - chars = quote_rdn_value_to_str_w(rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, + chars = quote_rdn_value_to_str_w(rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, dwStrType, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; if (j < rdn->cRDNAttr - 1) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index f86459ba236..1f65234f400 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -1163,7 +1163,6 @@ static void test_quoted_RDN(void) ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_X500_NAME_STR | CERT_NAME_STR_NO_QUOTING_FLAG, str, ARRAY_SIZE(str)); ok(ret, "CertNameToStr error %08lx\n", GetLastError()); ok(!wcsncmp(str, L"CN=", 3), "got %s\n", debugstr_w(str)); - todo_wine_if(i != 0 && i != 13 && i != 14) ok(!wcscmp(&str[3], test[i].CN), "got %s, expected %s\n", debugstr_w(&str[3]), debugstr_w(test[i].CN)); LocalFree(buf); @@ -1217,7 +1216,6 @@ static void test_quoted_RDN(void) ret = CertNameToStrW(X509_ASN_ENCODING, &blob, CERT_X500_NAME_STR | CERT_NAME_STR_NO_QUOTING_FLAG, str, ARRAY_SIZE(str)); ok(ret, "CertNameToStr error %08lx\n", GetLastError()); ok(!wcsncmp(str, L"CN=", 3), "got %s\n", debugstr_w(str)); - todo_wine_if(i != 0 && i != 13 && i != 14) ok(!wcscmp(&str[3], test[i].CN), "got %s, expected %s\n", debugstr_w(&str[3]), debugstr_w(test[i].CN)); LocalFree(buf);

1 0

Dmitry Timoshkov : cryptui: Use CertNameToStr(CERT_NAME_STR_NO_QUOTING_FLAG) to disable quoting.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 6391b8d5c99c206689c6e55a675b51086d8be821 URL: https://gitlab.winehq.org/wine/wine/-/commit/6391b8d5c99c206689c6e55a675b51… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 15 19:40:45 2023 +0300 cryptui: Use CertNameToStr(CERT_NAME_STR_NO_QUOTING_FLAG) to disable quoting. This makes the certificate selecting UI look similar to Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/cryptui/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index ee5d7037366..2bd6b0b9f6a 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -2598,14 +2598,14 @@ static WCHAR *field_format_detailed_cert_name(PCERT_NAME_BLOB name) { WCHAR *str = NULL; DWORD len = CertNameToStrW(X509_ASN_ENCODING, name, - CERT_X500_NAME_STR | CERT_NAME_STR_CRLF_FLAG, NULL, 0); + CERT_X500_NAME_STR | CERT_NAME_STR_CRLF_FLAG | CERT_NAME_STR_NO_QUOTING_FLAG, NULL, 0); if (len) { str = malloc(len * sizeof(WCHAR)); if (str) CertNameToStrW(X509_ASN_ENCODING, name, - CERT_X500_NAME_STR | CERT_NAME_STR_CRLF_FLAG, str, len); + CERT_X500_NAME_STR | CERT_NAME_STR_CRLF_FLAG | CERT_NAME_STR_NO_QUOTING_FLAG, str, len); } return str; }

1 0

Alex Henrie : win32u: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 344eee2024979f0f5ae139dba696a09732750d1b URL: https://gitlab.winehq.org/wine/wine/-/commit/344eee2024979f0f5ae139dba696a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Oct 16 23:32:53 2023 -0600 win32u: Use debugstr_fourcc instead of debugstr_an. --- dlls/win32u/freetype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index fd402758daa..6043c66bc53 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -2058,7 +2058,7 @@ static UINT freetype_get_font_data( struct gdi_font *font, UINT table, UINT offs err = pFT_Load_Sfnt_Table(ft_face, RtlUlongByteSwap(table), offset, buf, &len); if (err) { - TRACE("Can't find table %s\n", debugstr_an((char*)&table, 4)); + TRACE("Can't find table %s\n", debugstr_fourcc(table)); return GDI_ERROR; } return len; @@ -4010,7 +4010,7 @@ static UINT freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET *gs ) else { DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); - FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + FIXME("encoding %s not supported\n", debugstr_fourcc(encoding)); } return num_ranges; @@ -4175,7 +4175,7 @@ static UINT freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAIR **pai DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); ULONG n; - FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + FIXME("encoding %s not supported\n", debugstr_fourcc(encoding)); for (n = 0; n <= 65535; n++) glyph_to_char[n] = (USHORT)n; }

1 0

Zebediah Figura : wined3d: Rename buffer dirty ranges fields.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 352d04935ac891f414d11806c5e4fd369e49893d URL: https://gitlab.winehq.org/wine/wine/-/commit/352d04935ac891f414d11806c5e4fd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 14 12:51:15 2023 -0500 wined3d: Rename buffer dirty ranges fields. Make the fields names consistent with each other and with the usual scheme for field naming. --- dlls/wined3d/buffer.c | 52 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 7 ++++-- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 082d502ff98..9f162a890e3 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -70,38 +70,38 @@ static void buffer_invalidate_bo_range(struct wined3d_buffer *buffer, unsigned i goto invalidate_all; } - if (!wined3d_array_reserve((void **)&buffer->maps, &buffer->maps_size, - buffer->modified_areas + 1, sizeof(*buffer->maps))) + if (!wined3d_array_reserve((void **)&buffer->dirty_ranges, &buffer->dirty_ranges_capacity, + buffer->dirty_range_count + 1, sizeof(*buffer->dirty_ranges))) { - ERR("Failed to allocate maps array, invalidating entire buffer.\n"); + ERR("Failed to allocate dirty ranges array, invalidating entire buffer.\n"); goto invalidate_all; } - buffer->maps[buffer->modified_areas].offset = offset; - buffer->maps[buffer->modified_areas].size = size; - ++buffer->modified_areas; + buffer->dirty_ranges[buffer->dirty_range_count].offset = offset; + buffer->dirty_ranges[buffer->dirty_range_count].size = size; + ++buffer->dirty_range_count; return; invalidate_all: - buffer->modified_areas = 1; - buffer->maps[0].offset = 0; - buffer->maps[0].size = buffer->resource.size; + buffer->dirty_range_count = 1; + buffer->dirty_ranges[0].offset = 0; + buffer->dirty_ranges[0].size = buffer->resource.size; } -static inline void buffer_clear_dirty_areas(struct wined3d_buffer *This) +static inline void buffer_clear_dirty_areas(struct wined3d_buffer *buffer) { - This->modified_areas = 0; + buffer->dirty_range_count = 0; } static BOOL buffer_is_dirty(const struct wined3d_buffer *buffer) { - return !!buffer->modified_areas; + return !!buffer->dirty_range_count; } static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) { - return buffer->modified_areas == 1 - && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; + return buffer->dirty_range_count == 1 + && !buffer->dirty_ranges[0].offset && buffer->dirty_ranges[0].size == buffer->resource.size; } void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, uint32_t location) @@ -534,10 +534,10 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined return; } - for (range_idx = 0; range_idx < buffer->modified_areas; ++range_idx) + for (range_idx = 0; range_idx < buffer->dirty_range_count; ++range_idx) { - start = buffer->maps[range_idx].offset; - end = start + buffer->maps[range_idx].size; + start = buffer->dirty_ranges[range_idx].offset; + end = start + buffer->dirty_ranges[range_idx].size; memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) @@ -568,7 +568,8 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined dst.addr = NULL; src.buffer_object = NULL; src.addr = data; - wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps, WINED3D_MAP_WRITE); + wined3d_context_copy_bo_address(context, &dst, &src, + buffer->dirty_range_count, buffer->dirty_ranges, WINED3D_MAP_WRITE); heap_free(data); } @@ -657,11 +658,11 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, { uint32_t map_flags = WINED3D_MAP_WRITE; - if (buffer->modified_areas == 1 && !buffer->maps[0].offset - && buffer->maps[0].size == buffer->resource.size) + if (buffer_is_fully_dirty(buffer)) map_flags |= WINED3D_MAP_DISCARD; - wined3d_context_copy_bo_address(context, &dst, &src, buffer->modified_areas, buffer->maps, map_flags); + wined3d_context_copy_bo_address(context, &dst, &src, + buffer->dirty_range_count, buffer->dirty_ranges, map_flags); } else { @@ -776,7 +777,7 @@ static void wined3d_buffer_destroy_object(void *object) context_release(context); } heap_free(buffer->conversion_map); - heap_free(buffer->maps); + heap_free(buffer->dirty_ranges); } void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) @@ -1079,7 +1080,6 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { struct wined3d_buffer *buffer = buffer_from_resource(resource); - unsigned int range_count = buffer->modified_areas; struct wined3d_device *device = resource->device; struct wined3d_context *context; struct wined3d_bo_address addr; @@ -1112,7 +1112,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou addr.buffer_object = buffer->buffer_object; addr.addr = 0; - wined3d_context_unmap_bo_address(context, &addr, range_count, buffer->maps); + wined3d_context_unmap_bo_address(context, &addr, buffer->dirty_range_count, buffer->dirty_ranges); context_release(context); @@ -1399,7 +1399,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_OUTOFMEMORY; } - if (!(buffer->maps = heap_alloc(sizeof(*buffer->maps)))) + if (!(buffer->dirty_ranges = heap_alloc(sizeof(*buffer->dirty_ranges)))) { ERR("Out of memory.\n"); buffer_resource_unload(resource); @@ -1407,7 +1407,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; } - buffer->maps_size = 1; + buffer->dirty_ranges_capacity = 1; if (buffer->locations & WINED3D_LOCATION_DISCARDED) buffer->resource.client.addr.buffer_object = CLIENT_BO_DISCARDED; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0b72bf298e2..4506186229a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3832,8 +3832,11 @@ struct wined3d_buffer struct wined3d_bo *buffer_object; struct wined3d_bo_user bo_user; - struct wined3d_range *maps; - SIZE_T maps_size, modified_areas; + /* For buffers which are GPU accessible but for which BUFFER is not + * currently a valid location, this is a list of areas that need to be + * uploaded to BUFFER. */ + struct wined3d_range *dirty_ranges; + SIZE_T dirty_range_count, dirty_ranges_capacity; /* conversion stuff */ UINT decl_change_count, full_conversion_count;

1 0

Zebediah Figura : wined3d: Use wined3d_array_reserve() to pre-allocate the buffer dirty ranges array.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 8378a786a6d3fada09e3907018d41e1e63d54743 URL: https://gitlab.winehq.org/wine/wine/-/commit/8378a786a6d3fada09e3907018d41e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 14 12:52:12 2023 -0500 wined3d: Use wined3d_array_reserve() to pre-allocate the buffer dirty ranges array. --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9f162a890e3..2d5bbcf4d79 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1399,7 +1399,8 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_OUTOFMEMORY; } - if (!(buffer->dirty_ranges = heap_alloc(sizeof(*buffer->dirty_ranges)))) + if (!wined3d_array_reserve((void **)&buffer->dirty_ranges, + &buffer->dirty_ranges_capacity, 1, sizeof(*buffer->dirty_ranges))) { ERR("Out of memory.\n"); buffer_resource_unload(resource); @@ -1407,7 +1408,6 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d wined3d_resource_wait_idle(resource); return E_OUTOFMEMORY; } - buffer->dirty_ranges_capacity = 1; if (buffer->locations & WINED3D_LOCATION_DISCARDED) buffer->resource.client.addr.buffer_object = CLIENT_BO_DISCARDED;

1 0

Zebediah Figura : wined3d: Do not track dirty ranges for buffers without WINED3D_BUFFER_USE_BO.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 307b200363d78fbb00c3519a38b26a9f044e402e URL: https://gitlab.winehq.org/wine/wine/-/commit/307b200363d78fbb00c3519a38b26a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Oct 14 12:57:11 2023 -0500 wined3d: Do not track dirty ranges for buffers without WINED3D_BUFFER_USE_BO. Since we never upload the buffer, and may very well never invalidate the whole thing, this just results in continually increasing memory consumption. This is especially a problem for our internal push constant buffers, which are sysmem buffers that usually are never wholly invalidated, but it could also potentially be a problem for other buffers. --- dlls/wined3d/buffer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2d5bbcf4d79..57c6085c10a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -122,7 +122,7 @@ static void wined3d_buffer_invalidate_range(struct wined3d_buffer *buffer, DWORD TRACE("buffer %p, location %s, offset %u, size %u.\n", buffer, wined3d_debug_location(location), offset, size); - if (location & WINED3D_LOCATION_BUFFER) + if ((location & WINED3D_LOCATION_BUFFER) && (buffer->flags & WINED3D_BUFFER_USE_BO)) buffer_invalidate_bo_range(buffer, offset, size); buffer->locations &= ~location; @@ -1399,7 +1399,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return E_OUTOFMEMORY; } - if (!wined3d_array_reserve((void **)&buffer->dirty_ranges, + if ((buffer->flags & WINED3D_BUFFER_USE_BO) && !wined3d_array_reserve((void **)&buffer->dirty_ranges, &buffer->dirty_ranges_capacity, 1, sizeof(*buffer->dirty_ranges))) { ERR("Out of memory.\n");

1 0

Matteo Bruni : wined3d: Fix handling of system-memory GL vertex buffers.
by Alexandre Julliard 18 Oct '23

18 Oct '23

Module: wine Branch: master Commit: 333a0be42d74269f0e17366532af04c688482af2 URL: https://gitlab.winehq.org/wine/wine/-/commit/333a0be42d74269f0e17366532af04… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 7 15:51:42 2023 +0200 wined3d: Fix handling of system-memory GL vertex buffers. Fixes: c065b4fe0b3622e0c737a4c7c1c514273ad2d8a7 --- dlls/wined3d/context_gl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index a55365cdf12..b81f14a86ee 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5399,7 +5399,8 @@ void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context gl_info->gl_ops.gl.p_glTexCoordPointer(format_gl->vtx_format, format_gl->vtx_type, e->stride, get_vertex_attrib_pointer(e, state)); gl_info->gl_ops.gl.p_glEnableClientState(GL_TEXTURE_COORD_ARRAY); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5486,7 +5487,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte checkGLcall("glVertexPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_VERTEX_ARRAY); checkGLcall("glEnableClientState(GL_VERTEX_ARRAY)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } /* Normals */ @@ -5509,7 +5511,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte checkGLcall("glNormalPointer(...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_NORMAL_ARRAY); checkGLcall("glEnableClientState(GL_NORMAL_ARRAY)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5538,7 +5541,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte checkGLcall("glColorPointer(4, GL_UNSIGNED_BYTE, ...)"); gl_info->gl_ops.gl.p_glEnableClientState(GL_COLOR_ARRAY); checkGLcall("glEnableClientState(GL_COLOR_ARRAY)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5602,7 +5606,8 @@ static void wined3d_context_gl_load_vertex_data(struct wined3d_context_gl *conte } gl_info->gl_ops.gl.p_glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); checkGLcall("glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); - wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); + if (bo) + wined3d_buffer_validate_user(state->streams[e->stream_idx].buffer); } else { @@ -5703,8 +5708,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c format_gl = wined3d_format_gl(element->format); stream = &state->streams[element->stream_idx]; - wined3d_buffer_validate_user(stream->buffer); - if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { @@ -5738,6 +5741,9 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c checkGLcall("glBindBuffer"); current_bo = bo; } + if (bo) + wined3d_buffer_validate_user(stream->buffer); + /* Use the VBO to find out if a vertex buffer exists, not the vb * pointer. vb can point to a user pointer data blob. In that case * current_bo will be 0. If there is a vertex buffer but no vbo we

1 0