wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Jacek Caban : wineandroid: Directly use ntdll for registry access.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: a121c49af20e34f5cf889d8577112c209cf0ad7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a121c49af20e34f5cf889d85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 22:09:23 2022 +0200 wineandroid: Directly use ntdll for registry access. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 2 +- dlls/wineandroid.drv/init.c | 69 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 5 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index e576b1d944b..59df461697a 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineandroid.drv -IMPORTS = user32 gdi32 advapi32 ntoskrnl win32u +IMPORTS = user32 gdi32 ntoskrnl win32u EXTRADLLFLAGS = -mcygwin diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 3daa41f28d1..dec53657ccb 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -27,6 +27,8 @@ #include <dlfcn.h> #include <link.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -84,19 +86,78 @@ void init_monitors( int width, int height ) } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ +static HKEY reg_create_key( const WCHAR *name, ULONG name_len ) +{ + UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + HANDLE ret; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, 0, NULL ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (len > ARRAY_SIZE(registry_rootW) && + !memcmp( name, registry_rootW, sizeof(registry_rootW) )) + i += ARRAY_SIZE(registry_rootW); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, 0, NULL ); + + if (attr.RootDirectory) NtClose( attr.RootDirectory ); + if (status) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } + return ret; +} + + /****************************************************************************** * set_screen_dpi */ void set_screen_dpi( DWORD dpi ) { - static const WCHAR dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s',0}; static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s',0}; + static const WCHAR dpi_key_name[] = + { + '\\','R','e','g','i','s','t','r','y', + '\\','M','a','c','h','i','n','e', + '\\','S','y','s','t','e','m', + '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', + '\\','H','a','r','d','w','a','r','e',' ','P','r','o','f','i','l','e','s', + '\\','C','u','r','r','e','n','t', + '\\','S','o','f','t','w','a','r','e', + '\\','F','o','n','t','s' + }; HKEY hkey; - if (!RegCreateKeyW( HKEY_CURRENT_CONFIG, dpi_key_name, &hkey )) + if ((hkey = reg_create_key( dpi_key_name, sizeof(dpi_key_name )))) { - RegSetValueExW( hkey, dpi_value_name, 0, REG_DWORD, (void *)&dpi, sizeof(DWORD) ); - RegCloseKey( hkey ); + UNICODE_STRING name; + RtlInitUnicodeString( &name, dpi_value_name ); + NtSetValueKey( hkey, &name, 0, REG_DWORD, &dpi, sizeof(dpi) ); + NtClose( hkey ); } }

1 0

Jacek Caban : wineandroid: Remove audio driver.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 9fe38ff57fa013a6b6294d7c2d38267d6377babd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fe38ff57fa013a6b6294d7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 21:55:56 2022 +0200 wineandroid: Remove audio driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/mmdevdrv.c | 3097 ----------------------------- dlls/wineandroid.drv/wineandroid.drv.spec | 6 - 3 files changed, 1 insertion(+), 3105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9fe38ff57fa013a6b629…

1 0

Jacek Caban : wineandroid: Don't use unicode.h.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: d08055349236e84858c944267ae636d102366ad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08055349236e84858c94426… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 21:54:54 2022 +0200 wineandroid: Don't use unicode.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/android.h | 7 +++++++ dlls/wineandroid.drv/keyboard.c | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 93e3c2201bf..a7581d1b67f 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -187,4 +187,11 @@ extern JavaVM **p_java_vm; extern jobject *p_java_object; extern unsigned short *p_java_gdt_sel; +/* string helpers */ + +static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) +{ + while (len--) *dst++ = (unsigned char)*src++; +} + #endif /* __WINE_ANDROID_H */ diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 00a55c697c6..e92079c0f59 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -32,7 +32,6 @@ #include "config.h" #include "android.h" -#include "wine/unicode.h" #include "wine/server.h" #include "wine/debug.h" @@ -802,9 +801,11 @@ INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) if (!len) { - static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; - snprintfW( buffer, size, format, vkey ); - len = strlenW( buffer ); + char name[16]; + len = sprintf( name, "Key 0x%02x", vkey ); + len = min( len + 1, size ); + ascii_to_unicode( buffer, name, len ); + if (len) buffer[--len] = 0; } TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer ));

1 0

Jacek Caban : wineandroid: Use ntdll for UTF8 conversion.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 06fed775d3e5952277884cc6bc9032149bb515fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fed775d3e5952277884cc6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 21:52:30 2022 +0200 wineandroid: Use ntdll for UTF8 conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/keyboard.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 20c6879de87..00a55c697c6 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -755,9 +755,10 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k */ INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) { - int scancode, vkey, len; + int scancode, vkey; const char *name; char key[2]; + DWORD len; scancode = (lparam >> 16) & 0x1FF; vkey = scancode_to_vkey( scancode ); @@ -795,7 +796,8 @@ INT ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) name = vkey_to_name( vkey ); } - len = MultiByteToWideChar( CP_UTF8, 0, name, -1, buffer, size ); + RtlUTF8ToUnicodeN( buffer, size * sizeof(WCHAR), &len, name, strlen( name ) + 1 ); + len /= sizeof(WCHAR); if (len) len--; if (!len)

1 0

Alexandre Julliard : ntdll/tests: Add tests for high Unicode planes.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 8d0b3b08986bdee53061e168e36c186fdf9ee11f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d0b3b08986bdee53061e168… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 14:44:20 2022 +0200 ntdll/tests: Add tests for high Unicode planes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 23 ++++++++++++++++++++++- dlls/ntdll/tests/rtlstr.c | 21 ++++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index d7380ebb1be..2c158be17b4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -342,7 +342,7 @@ static void test_RtlQueryRegistryValues(void) static void test_NtOpenKey(void) { - HANDLE key; + HANDLE key, subkey; NTSTATUS status; OBJECT_ATTRIBUTES attr; ACCESS_MASK am = KEY_READ; @@ -456,6 +456,27 @@ static void test_NtOpenKey(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_WRITE|KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status); + + /* keys are case insensitive even without OBJ_CASE_INSENSITIVE */ + InitializeObjectAttributes( &attr, &str, 0, key, 0 ); + pRtlInitUnicodeString( &str, L"\xf6\xf3\x14d\x371\xd801\xdc00" ); + status = pNtCreateKey( &subkey, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0); + ok(status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status); + pNtClose( subkey ); + pRtlInitUnicodeString( &str, L"\xd6\xd3\x14c\x370\xd801\xdc28" ); /* surrogates not supported */ + status = pNtOpenKeyEx(&subkey, KEY_ALL_ACCESS, &attr, 0); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "NtOpenKeyEx failed: 0x%08lx\n", status); + pRtlInitUnicodeString( &str, L"\xd6\xd3\x14c\x370\xd801\xdc00" ); + status = pNtOpenKeyEx(&subkey, KEY_ALL_ACCESS, &attr, 0); + ok(status == STATUS_SUCCESS, "NtOpenKeyEx failed: 0x%08lx\n", status); + + pNtDeleteKey( subkey ); + pNtClose( subkey ); + pNtClose( key ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 1bce812ff13..49f6ef65785 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -608,7 +608,7 @@ static void test_RtlUpcaseUnicodeChar(void) static void test_RtlUpcaseUnicodeString(void) { - int i; + int i, j; WCHAR ch; WCHAR upper_ch; WCHAR ascii_buf[257]; @@ -654,6 +654,25 @@ static void test_RtlUpcaseUnicodeString(void) result_str.Buffer[i], result_str.Buffer[i], upper_str.Buffer[i], upper_str.Buffer[i]); } + + /* test surrogates */ + for (i = 0x100; i < 0x1100; i++) + { + WCHAR src[512], dst[512]; + for (j = 0; j < 256; j++) + { + unsigned int ch = ((i << 8) + j) - 0x10000; + src[2 * j] = 0xd800 | (ch >> 10); + src[2 * j + 1] = 0xdc00 | (ch & 0x3ff); + } + upper_str.Length = upper_str.MaximumLength = 512 * sizeof(WCHAR); + upper_str.Buffer = src; + result_str.Length = result_str.MaximumLength = 512 * sizeof(WCHAR); + result_str.Buffer = dst; + pRtlUpcaseUnicodeString(&result_str, &upper_str, 0); + ok( !memcmp(src, dst, sizeof(dst)), + "string compare mismatch in %04x-%04x\n", i << 8, (i << 8) + 255 ); + } }

1 0

Alexandre Julliard : kernel32/tests: Add tests for high Unicode planes.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: d2c225524fb7ba19e69f2fa19f6c83f45aac0b94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2c225524fb7ba19e69f2fa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 14:40:34 2022 +0200 kernel32/tests: Add tests for high Unicode planes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 639 +++++++++++++++++++++++-------------------- 1 file changed, 346 insertions(+), 293 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2c225524fb7ba19e69f…

1 0

Alexandre Julliard : kernelbase: Add support for high Unicode planes in LCMapStringEx().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 91cd07310607b12a0b2dd7b47cf59ac566b3fc7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=91cd07310607b12a0b2dd7b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 14:38:47 2022 +0200 kernelbase: Add support for high Unicode planes in LCMapStringEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 103 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 84 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index ac4dc188345..4b00ed90408 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1992,6 +1992,36 @@ static inline WCHAR casemap( const USHORT *table, WCHAR ch ) } +static inline unsigned int casemap_high( const USHORT *table, WCHAR high, WCHAR low ) +{ + unsigned int off = table[table[256 + (high - 0xd800)] + ((low >> 5) & 0x1f)] + 2 * (low & 0x1f); + return 0x10000 + ((high - 0xd800) << 10) + (low - 0xdc00) + MAKELONG( table[off], table[off+1] ); +} + + +static inline BOOL table_has_high_planes( const USHORT *table ) +{ + return table[0] >= 0x500; +} + + +static inline int put_utf16( WCHAR *dst, int pos, int dstlen, unsigned int ch ) +{ + if (ch >= 0x10000) + { + if (pos < dstlen - 1) + { + ch -= 0x10000; + dst[pos] = 0xd800 | (ch >> 10); + dst[pos + 1] = 0xdc00 | (ch & 0x3ff); + } + return 2; + } + if (pos < dstlen) dst[pos] = ch; + return 1; +} + + static inline WORD get_char_type( DWORD type, WCHAR ch ) { const BYTE *ptr = sort.ctype_idx + ((const WORD *)sort.ctype_idx)[ch >> 8]; @@ -2008,11 +2038,37 @@ static inline void map_byterev( const WCHAR *src, int len, WCHAR *dst ) static int casemap_string( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { - int pos, ret = srclen; + if (table_has_high_planes( table )) + { + unsigned int ch; + int pos = 0; - for (pos = 0; pos < dstlen && srclen; pos++, src++, srclen--) - dst[pos] = casemap( table, *src ); - return ret; + while (srclen) + { + if (srclen > 1 && IS_SURROGATE_PAIR( src[0], src[1] )) + { + ch = casemap_high( table, src[0], src[1] ); + src += 2; + srclen -= 2; + } + else + { + ch = casemap( table, *src ); + src++; + srclen--; + } + pos += put_utf16( dst, pos, dstlen, ch ); + } + return pos; + } + else + { + int pos, ret = srclen; + + for (pos = 0; pos < dstlen && srclen; pos++, src++, srclen--) + dst[pos] = casemap( table, *src ); + return ret; + } } @@ -3912,16 +3968,29 @@ static int find_substring( const struct sortguid *sortid, DWORD flags, const WCH /* map buffer to full-width katakana */ static int map_to_fullwidth( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { - int pos; + int pos, len; - for (pos = 0; srclen; pos++, src++, srclen--) + for (pos = 0; srclen; pos++, src += len, srclen -= len) { - WCHAR wch = casemap( charmaps[CHARMAP_FULLWIDTH], *src ); + unsigned int wch = casemap( charmaps[CHARMAP_FULLWIDTH], *src ); + + len = 1; if (srclen > 1) { - switch (src[1]) + if (table_has_high_planes( charmaps[CHARMAP_FULLWIDTH] ) && IS_SURROGATE_PAIR( src[0], src[1] )) + { + len = 2; + wch = casemap_high( charmaps[CHARMAP_FULLWIDTH], src[0], src[1] ); + if (wch >= 0x10000) + { + put_utf16( dst, pos, dstlen, wch ); + pos++; + continue; + } + } + else if (src[1] == 0xff9e) /* dakuten (voiced sound) */ { - case 0xff9e: /* dakuten (voiced sound) */ + len = 2; if ((*src >= 0xff76 && *src <= 0xff84) || (*src >= 0xff8a && *src <= 0xff8e) || *src == 0x30fd) @@ -3937,22 +4006,18 @@ static int map_to_fullwidth( const USHORT *table, const WCHAR *src, int srclen, else if (*src == 0xff66) wch = 0x30fa; /* KATAKANA LETTER VO */ else - break; - src++; - srclen--; - break; - case 0xff9f: /* handakuten (semi-voiced sound) */ + len = 1; + } + else if (src[1] == 0xff9f) /* handakuten (semi-voiced sound) */ + { if (*src >= 0xff8a && *src <= 0xff8e) { wch += 2; - src++; - srclen--; + len = 2; } - break; - default: - break; } } + if (pos < dstlen) dst[pos] = table ? casemap( table, wch ) : wch; } return pos;

1 0

Alexandre Julliard : make_unicode: Add data for high Unicode planes in case mapping tables.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: b956620d816ab607e39c042896db3b16b3563795 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b956620d816ab607e39c0428… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 6 13:38:37 2022 +0200 make_unicode: Add data for high Unicode planes in case mapping tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 730506 -> 739542 bytes nls/sortdefault.nls | Bin 3357452 -> 3378116 bytes tools/make_unicode | 127 ++++++++++++++++++++++++++++++++++----------------- tools/winedump/nls.c | 32 +++++++++++++ 4 files changed, 118 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b956620d816ab607e39c…

1 0

Torge Matthies : cryptnet: Resolve object id to algorithm id when verifying OCSP response.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 16e6067dbfbf64016fc95a6723782e3596800fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e6067dbfbf64016fc95a67… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Jun 6 02:53:07 2022 +0200 cryptnet: Resolve object id to algorithm id when verifying OCSP response. Instead of only allowing the SHA256RSA algorithm. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53102 Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/cryptnet_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index e8c17407a9b..ac282f5aa82 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1918,6 +1918,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ HCRYPTPROV prov = 0; HCRYPTHASH hash = 0; HCRYPTKEY key = 0; + DWORD algid; if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); @@ -1925,7 +1926,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status))) goto done; alg = &info->SignatureInfo.SignatureAlgorithm; - if (!alg->pszObjId || strcmp(alg->pszObjId, szOID_RSA_SHA256RSA)) + if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId))) { FIXME("unhandled signature algorithm %s\n", debugstr_a(alg->pszObjId)); error = CRYPT_E_NO_REVOCATION_CHECK; @@ -1933,7 +1934,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ } if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) goto done; - if (!CryptCreateHash(prov, CALG_SHA_256, 0, 0, &hash)) goto done; + if (!CryptCreateHash(prov, algid, 0, 0, &hash)) goto done; if (!CryptHashData(hash, info->ToBeSigned.pbData, info->ToBeSigned.cbData, 0)) goto done; sig = &info->SignatureInfo.Signature;

1 0

Nikolay Sivov : d2d1: Use d3d11 constants for constant buffer description.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: cdb80abc60b621d9c10d21d14f777bcf72c1f1a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb80abc60b621d9c10d21d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 4 15:52:37 2022 +0300 d2d1: Use d3d11 constants for constant buffer description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 12aa2acc331..8f71a85a3f6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -4011,8 +4011,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, buffer_desc.ByteWidth = sizeof(struct d2d_vs_cb); buffer_desc.Usage = D3D11_USAGE_DYNAMIC; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; - buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL, @@ -4031,8 +4031,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, buffer_desc.ByteWidth = sizeof(struct d2d_ps_cb); buffer_desc.Usage = D3D11_USAGE_DYNAMIC; - buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; - buffer_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + buffer_desc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; buffer_desc.MiscFlags = 0; if (FAILED(hr = ID3D11Device1_CreateBuffer(render_target->d3d_device, &buffer_desc, NULL,

1 0

← Newer
1
...
63
64
65
66
67
68
69
...
80
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 June 2022