- wine-devel - winehq.org

[PATCH 2/2] kernel32: Split A/W implementation of {Get,Write}PrivateProfileString().
by Jactry Zeng 30 Apr '19

30 Apr '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/kernel32/profile.c | 126 +++++++++++++++++++--------------- dlls/kernel32/tests/profile.c | 109 ++++++++++++++++++++++++++--- 2 files changed, 169 insertions(+), 66 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 462d64e5f0..3defaf6bef 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -68,6 +68,7 @@ typedef struct WCHAR *filename; FILETIME LastWriteTime; ENCODING encoding; + BOOL is_unicode; } PROFILE; @@ -149,7 +150,7 @@ static inline void PROFILE_WriteMarker(HANDLE hFile, ENCODING encoding) } } -static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING encoding) +static void PROFILE_WriteLine(HANDLE hFile, WCHAR *szLine, int len, ENCODING encoding, BOOL is_unicode) { char * write_buffer; int write_buffer_len; @@ -160,10 +161,10 @@ static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING e switch (encoding) { case ENCODING_ANSI: - write_buffer_len = WideCharToMultiByte(CP_ACP, 0, szLine, len, NULL, 0, NULL, NULL); + write_buffer_len = WideCharToMultiByte(is_unicode ? CP_ACP : 1252, 0, szLine, len, NULL, 0, NULL, NULL); write_buffer = HeapAlloc(GetProcessHeap(), 0, write_buffer_len); if (!write_buffer) return; - len = WideCharToMultiByte(CP_ACP, 0, szLine, len, write_buffer, write_buffer_len, NULL, NULL); + len = WideCharToMultiByte(is_unicode ? CP_ACP : 1252, 0, szLine, len, write_buffer, write_buffer_len, NULL, NULL); WriteFile(hFile, write_buffer, len, &dwBytesWritten, NULL); HeapFree(GetProcessHeap(), 0, write_buffer); break; @@ -192,7 +193,7 @@ static void PROFILE_WriteLine( HANDLE hFile, WCHAR * szLine, int len, ENCODING e * * Save a profile tree to a file. */ -static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING encoding ) +static void PROFILE_Save(HANDLE hFile, const PROFILESECTION *section, ENCODING encoding, BOOL is_unicode) { PROFILEKEY *key; WCHAR *buffer, *p; @@ -238,7 +239,7 @@ static void PROFILE_Save( HANDLE hFile, const PROFILESECTION *section, ENCODING *p++ = '\r'; *p++ = '\n'; } - PROFILE_WriteLine( hFile, buffer, len, encoding ); + PROFILE_WriteLine(hFile, buffer, len, encoding, is_unicode); HeapFree(GetProcessHeap(), 0, buffer); } } @@ -305,7 +306,7 @@ static inline ENCODING PROFILE_DetectTextEncoding(const void * buffer, int * len * * Load a profile tree from a file. */ -static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) +static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING *pEncoding, BOOL is_unicode) { void *buffer_base, *pBuffer; WCHAR * szFile; @@ -343,14 +344,14 @@ static PROFILESECTION *PROFILE_Load(HANDLE hFile, ENCODING * pEncoding) case ENCODING_ANSI: TRACE("ANSI encoding\n"); - len = MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, NULL, 0); + len = MultiByteToWideChar(is_unicode ? CP_ACP : 1252, 0, pBuffer, dwFileSize, NULL, 0); szFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (!szFile) { HeapFree(GetProcessHeap(), 0, buffer_base); return NULL; } - MultiByteToWideChar(CP_ACP, 0, pBuffer, dwFileSize, szFile, len); + MultiByteToWideChar(is_unicode ? CP_ACP : 1252, 0, pBuffer, dwFileSize, szFile, len); szEnd = szFile + len; break; case ENCODING_UTF8: @@ -678,7 +679,7 @@ static BOOL PROFILE_FlushFile(void) } TRACE("Saving %s\n", debugstr_w(CurProfile->filename)); - PROFILE_Save( hFile, CurProfile->section, CurProfile->encoding ); + PROFILE_Save(hFile, CurProfile->section, CurProfile->encoding, CurProfile->is_unicode); if(GetFileTime(hFile, NULL, NULL, &LastWriteTime)) CurProfile->LastWriteTime=LastWriteTime; CloseHandle( hFile ); @@ -729,7 +730,7 @@ static BOOL is_not_current(FILETIME * ft) * * Open a profile file, checking the cached file first. */ -static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) +static BOOL PROFILE_Open(LPCWSTR filename, BOOL write_access, BOOL is_unicode) { WCHAR buffer[MAX_PATH]; HANDLE hFile = INVALID_HANDLE_VALUE; @@ -750,6 +751,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) MRUProfile[i]->section=NULL; MRUProfile[i]->filename=NULL; MRUProfile[i]->encoding=ENCODING_ANSI; + MRUProfile[i]->is_unicode = is_unicode; ZeroMemory(&MRUProfile[i]->LastWriteTime, sizeof(FILETIME)); } @@ -786,7 +788,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) for(i=0;i<N_CACHED_PROFILES;i++) { - if ((MRUProfile[i]->filename && !strcmpiW( buffer, MRUProfile[i]->filename ))) + if ((MRUProfile[i]->filename && !strcmpiW(buffer, MRUProfile[i]->filename) && + (MRUProfile[i]->is_unicode == is_unicode))) { TRACE("MRU Filename: %s, new filename: %s\n", debugstr_w(MRUProfile[i]->filename), debugstr_w(buffer)); if(i) @@ -810,7 +813,7 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) TRACE("(%s): already opened, needs refreshing (mru=%d)\n", debugstr_w(buffer), i); PROFILE_Free(CurProfile->section); - CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); + CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding, CurProfile->is_unicode); CurProfile->LastWriteTime = LastWriteTime; } CloseHandle(hFile); @@ -840,7 +843,8 @@ static BOOL PROFILE_Open( LPCWSTR filename, BOOL write_access ) if (hFile != INVALID_HANDLE_VALUE) { - CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding); + CurProfile->is_unicode = is_unicode; + CurProfile->section = PROFILE_Load(hFile, &CurProfile->encoding, CurProfile->is_unicode); GetFileTime(hFile, NULL, NULL, &CurProfile->LastWriteTime); CloseHandle(hFile); } @@ -1062,6 +1066,19 @@ static BOOL PROFILE_SetString( LPCWSTR section_name, LPCWSTR key_name, return TRUE; } +static LPWSTR c2w(LPCSTR string) +{ + INT lenW; + LPWSTR stringW = NULL; + + if (!string) + return stringW; + + lenW = MultiByteToWideChar(1252, 0, string, -1, NULL, 0); + if ((stringW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)))) + MultiByteToWideChar(1252, 0, string, -1, stringW, lenW); + return stringW; +} /********************* API functions **********************************/ @@ -1083,13 +1100,13 @@ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) } static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, - LPWSTR buffer, UINT len, LPCWSTR filename) + LPWSTR buffer, UINT len, LPCWSTR filename, BOOL is_unicode) { int ret; LPWSTR defval_tmp = NULL; - TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_w(section), debugstr_w(entry), - debugstr_w(def_val), buffer, len, debugstr_w(filename)); + TRACE("(%s, %s, %s, %p, %u, %s, %d)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(def_val), buffer, len, debugstr_w(filename), is_unicode); /* strip any trailing ' ' of def_val. */ if (def_val) @@ -1112,7 +1129,7 @@ static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR de RtlEnterCriticalSection(&PROFILE_CritSect); - if (PROFILE_Open(filename, FALSE)) + if (PROFILE_Open(filename, FALSE, is_unicode)) { if (section == NULL) ret = PROFILE_GetSectionNames(buffer, len); @@ -1145,7 +1162,7 @@ INT WINAPI GetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry, UINT len, LPCWSTR filename) { return get_private_profile_string(section, entry, def_val, buffer, - len, filename); + len, filename, TRUE); } /*********************************************************************** @@ -1155,39 +1172,35 @@ INT WINAPI GetPrivateProfileStringA(LPCSTR section, LPCSTR entry, LPCSTR def_val, LPSTR buffer, UINT len, LPCSTR filename) { - UNICODE_STRING sectionW, entryW, def_valW, filenameW; - LPWSTR bufferW; + UNICODE_STRING filenameW; + LPWSTR bufferW, sectionW, entryW, def_valW; INT retW, ret = 0; bufferW = buffer ? HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)) : NULL; - if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section); - else sectionW.Buffer = NULL; - if (entry) RtlCreateUnicodeStringFromAsciiz(&entryW, entry); - else entryW.Buffer = NULL; - if (def_val) RtlCreateUnicodeStringFromAsciiz(&def_valW, def_val); - else def_valW.Buffer = NULL; + sectionW = c2w(section); + entryW = c2w(entry); + def_valW = c2w(def_val); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = get_private_profile_string(sectionW.Buffer, entryW.Buffer, - def_valW.Buffer, bufferW, len, - filenameW.Buffer); + retW = get_private_profile_string(sectionW, entryW, def_valW, bufferW, len, + filenameW.Buffer, FALSE); if (len && buffer) { if (retW) { - ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW, buffer, len - 1, NULL, NULL); + ret = WideCharToMultiByte(1252, 0, bufferW, retW, buffer, len - 1, NULL, NULL); if (!ret) ret = len - 1; } buffer[ret] = 0; } - RtlFreeUnicodeString(&sectionW); - RtlFreeUnicodeString(&entryW); - RtlFreeUnicodeString(&def_valW); RtlFreeUnicodeString(&filenameW); HeapFree(GetProcessHeap(), 0, bufferW); + HeapFree(GetProcessHeap(), 0, sectionW); + HeapFree(GetProcessHeap(), 0, entryW); + HeapFree(GetProcessHeap(), 0, def_valW); return ret; } @@ -1298,7 +1311,7 @@ INT WINAPI GetPrivateProfileSectionW( LPCWSTR section, LPWSTR buffer, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) + if (PROFILE_Open(filename, FALSE, TRUE)) ret = PROFILE_GetSection(CurProfile->section, section, buffer, len, TRUE); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1369,23 +1382,23 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) } static BOOL write_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR string, - LPCWSTR filename) + LPCWSTR filename, BOOL is_unicode) { BOOL ret = FALSE; - TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), - debugstr_w(string), debugstr_w(filename)); + TRACE("(%s, %s, %s, %s, %d)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(string), debugstr_w(filename), is_unicode); RtlEnterCriticalSection(&PROFILE_CritSect); if (!section && !entry && !string) /* documented "file flush" case */ { - if (!filename || PROFILE_Open(filename, TRUE)) + if (!filename || PROFILE_Open(filename, TRUE, is_unicode)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open(filename, TRUE)) + else if (PROFILE_Open(filename, TRUE, is_unicode)) { if (!section) { SetLastError(ERROR_FILE_NOT_FOUND); @@ -1406,7 +1419,7 @@ BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, LPCWSTR string, LPCWSTR filename) { return write_private_profile_string(section, entry, string, - filename); + filename, TRUE); } /*********************************************************************** @@ -1415,23 +1428,22 @@ BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR entry, LPCSTR string, LPCSTR filename ) { - UNICODE_STRING sectionW, entryW, stringW, filenameW; + UNICODE_STRING filenameW; + LPWSTR sectionW, entryW, stringW; BOOL ret; - if (section) RtlCreateUnicodeStringFromAsciiz(&sectionW, section); - else sectionW.Buffer = NULL; - if (entry) RtlCreateUnicodeStringFromAsciiz(&entryW, entry); - else entryW.Buffer = NULL; - if (string) RtlCreateUnicodeStringFromAsciiz(&stringW, string); - else stringW.Buffer = NULL; + sectionW = c2w(section); + entryW = c2w(entry); + stringW = c2w(string); if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - ret = write_private_profile_string(sectionW.Buffer, entryW.Buffer, - stringW.Buffer, filenameW.Buffer); - RtlFreeUnicodeString(&sectionW); - RtlFreeUnicodeString(&entryW); - RtlFreeUnicodeString(&stringW); + ret = write_private_profile_string(sectionW, entryW, stringW, + filenameW.Buffer, FALSE); + + HeapFree(GetProcessHeap(), 0, sectionW); + HeapFree(GetProcessHeap(), 0, entryW); + HeapFree(GetProcessHeap(), 0, stringW); RtlFreeUnicodeString(&filenameW); return ret; } @@ -1449,12 +1461,12 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, if (!section && !string) { - if (!filename || PROFILE_Open( filename, TRUE )) + if (!filename || PROFILE_Open(filename, TRUE, TRUE)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename, TRUE )) { + else if (PROFILE_Open(filename, TRUE, TRUE)) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); } else { @@ -1576,7 +1588,7 @@ DWORD WINAPI GetPrivateProfileSectionNamesW( LPWSTR buffer, DWORD size, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) + if (PROFILE_Open(filename, FALSE, TRUE)) ret = PROFILE_GetSectionNames(buffer, size); RtlLeaveCriticalSection( &PROFILE_CritSect ); @@ -1631,7 +1643,7 @@ BOOL WINAPI GetPrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, FALSE )) { + if (PROFILE_Open(filename, FALSE, TRUE)) { PROFILEKEY *k = PROFILE_Find ( &CurProfile->section, section, key, FALSE, FALSE); if (k) { TRACE("value (at %p): %s\n", k->value, debugstr_w(k->value)); @@ -1751,7 +1763,7 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, RtlEnterCriticalSection( &PROFILE_CritSect ); - if (PROFILE_Open( filename, TRUE )) { + if (PROFILE_Open(filename, TRUE, TRUE)) { ret = PROFILE_SetString( section, key, outstring, FALSE); if (ret) ret = PROFILE_FlushFile(); } diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 8a0089bb1b..761817cb9c 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -592,7 +592,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri empty string and check for modification */ CHAR emptystr[MAX_PATH] = ""; LPSTR tempfile; - + WCHAR bufW[MAX_PATH], expected_valW[MAX_PATH]; + static const WCHAR section_schineseW[] = {0xe6,0xae,0xb5,0x31,0}; + static const WCHAR name5W[] = {'n','a','m','e','5',0}; + static const WCHAR filenameW[] = {'.','\\','w','i','n','e','t','e','s','t','.','i','n','i',0}; + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + static const WCHAR expected_val_enW[] = {0x00e9,0x2026,0x2019,'.',0}; static const char filename[] = ".\\winetest.ini"; trace("test_GetPrivateProfileStringA: %s\n", descript); @@ -620,12 +625,12 @@ static void test_GetPrivateProfileString(const char *content, const char *descri lstrcpyA(buf, "kumquat"); ret = GetPrivateProfileStringA(NULL, "name1", "default", buf, MAX_PATH, filename); - ok(ret == 18 || - broken(ret == 19), /* Win9x and WinME */ - "Expected 18, got %d\n", ret); - len = lstrlenA("section1") + sizeof(CHAR) + lstrlenA("section2") + 2 * sizeof(CHAR); - ok(!memcmp(buf, "section1\0section2\0\0", len), - "Expected \"section1\\0section2\\0\\0\", got \"%s\"\n", buf); + ok(ret == 23 || + broken(ret == 24), /* Win9x and WinME */ + "Expected 23, got %d\n", ret); + len = lstrlenA("section1") + lstrlenA("section2") + lstrlenA("\xe6\xae\xb5\x31") + 4 * sizeof(CHAR); + ok(!memcmp(buf, "section1\0section2\0\xe6\xae\xb5\x31\0\0", len), + "Expected \"section1\\0section2\\0\xe6\xae\xb5\x31\\0\\0\", got \"%s\"\n", buf); /* lpAppName is empty */ memset(buf, 0xc, sizeof(buf)); @@ -827,6 +832,59 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(ret == 0, "Expected 0, got %d\n", ret); ok(!lstrcmpA(buf, ""), "Expected \"\", got \"%s\"\n", buf); + memset(buf, 0xc, sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "name5", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "\xe9\x85\x92\x2e"), + "Expected \"\xe9\x85\x92\x2e\", got \"%s\"\n", buf); + + memset(buf, 0xc,sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "\xe5\xa7\x93", "default", + buf, MAX_PATH, filename); + ok(ret == 4, "Expected 4, got %d\n", ret); + ok(!lstrcmpA(buf, "\xe6\x9b\xbe\x2e"), + "Expected \"\xe6\x9b\xbe\x2e\", got \"%s\"\n", buf); + + memset(buf, 0xc, sizeof(buf)); + lstrcpyA(buf, "kumquat"); + ret = GetPrivateProfileStringA("\xe6\xae\xb5\x31", "name6", "default", + buf, MAX_PATH, filename); + ok(ret == 7, "Expected 7, got %d\n", ret); + ok(!lstrcmpA(buf, "\xd7\x99\xd7\x99\xd7\x9f\x2e"), + "Expected \"\xd7\x99\xd7\x99\xd7\x9f\x2e\", got \"%s\"\n", buf); + + + memset(bufW, 0xc, sizeof(bufW)); + ret = GetPrivateProfileStringW(section_schineseW, name5W, defaultW, + bufW, MAX_PATH, filenameW); + switch (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale()))) + { + case LANG_CHINESE: + case LANG_HEBREW: + case LANG_JAPANESE: + trace("on Chinese, Hebrew or Japanese system.\n"); + lstrcpyW(expected_valW, defaultW); + len = lstrlenW(expected_valW); + ok(ret == len, "Expected %d, got %d\n", len, ret); + ok(!lstrcmpW(bufW, expected_valW), "Expected \"%s\", got \"%s\"\n", + wine_dbgstr_w(expected_valW), wine_dbgstr_w(bufW)); + break; + case LANG_ENGLISH: + case LANG_FRENCH: + trace("on English or French system.\n"); + lstrcpyW(expected_valW, expected_val_enW); + len = lstrlenW(expected_valW); + ok(ret == len, "Expected %d, got %d\n", len, ret); + ok(!lstrcmpW(bufW, expected_valW), "Expected \"%s\", got \"%s\"\n", + wine_dbgstr_w(expected_valW), wine_dbgstr_w(bufW)); + break; + default: + skip("Unknown system language.\n"); + } + /* lpAppName is NULL, not enough room for final section name */ memset(buf, 0xc,sizeof(buf)); lstrcpyA(buf, "kumquat"); @@ -1171,6 +1229,31 @@ static void test_WritePrivateProfileString(void) "key1=string1" /* 14 bytes */ , 59)), "File doesn't match\n"); DeleteFileA(path); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n"; + GetTempFileNameA(temp, "wine", 0, path); + ret = WritePrivateProfileStringA("section1", "name", "\xe9\x85\x92\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n" + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n"; + ret = WritePrivateProfileStringA("section1", "\xe5\xa7\x93", "\xe6\x9b\xbe\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + data = "[section1]\r\n" + "name=\xe9\x85\x92\x2e\r\n" + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n" + "[\xe6\xae\xb5\x31]\r\n" + "name2=\xe6\x9b\xbe\x2e\r\n"; + ret = WritePrivateProfileStringA("\xe6\xae\xb5\x31", "name2", "\xe6\x9b\xbe\x2e", path); + ok(ret == TRUE, "Expected TRUE, got %d\n", ret); + ok(check_file_data(path, data), "File doesn't match\n"); + + DeleteFileA(path); } START_TEST(profile) @@ -1189,7 +1272,11 @@ START_TEST(profile) "name2=\"val2\"\r\n" "name3\r\n" "name4=a\r\n" - "[section2]\r\n", + "[section2]\r\n" + "[\xe6\xae\xb5\x31]\r\n" /* Simplified Chinese in UTF-8 */ + "name5=\xe9\x85\x92\x2e\r\n" /* Simplified Chinese in UTF-8 */ + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r\n" /* Simplified Chinese in UTF-8 */ + "name6=\xd7\x99\xd7\x99\xd7\x9f\x2e\r\n", /* Hebrew in UTF-8 */ "CR+LF"); test_GetPrivateProfileString( "[section1]\r" @@ -1197,7 +1284,11 @@ START_TEST(profile) "name2=\"val2\"\r" "name3\r" "name4=a\r" - "[section2]\r", + "[section2]\r" + "[\xe6\xae\xb5\x31]\r" /* Simplified Chinese in UTF-8 */ + "name5=\xe9\x85\x92\x2e\r" /* Simplified Chinese in UTF-8 */ + "\xe5\xa7\x93=\xe6\x9b\xbe\x2e\r" /* Simplified Chinese in UTF-8 */ + "name6=\xd7\x99\xd7\x99\xd7\x9f\x2e\r", /* Hebrew in UTF-8 */ "CR only"); test_WritePrivateProfileString(); } -- 2.20.1

2 3

[PATCH 1/2] kernel32: Move implementation of {Get,Write}PrivateProfileStringW() to helper.
by Jactry Zeng 30 Apr '19

30 Apr '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/kernel32/profile.c | 97 ++++++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 39 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index 027693e5da..462d64e5f0 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1082,17 +1082,13 @@ UINT WINAPI GetProfileIntW( LPCWSTR section, LPCWSTR entry, INT def_val ) return GetPrivateProfileIntW( section, entry, def_val, wininiW ); } -/*********************************************************************** - * GetPrivateProfileStringW (KERNEL32.@) - */ -INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, - LPCWSTR def_val, LPWSTR buffer, - UINT len, LPCWSTR filename ) +static int get_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR def_val, + LPWSTR buffer, UINT len, LPCWSTR filename) { - int ret; - LPWSTR defval_tmp = NULL; + int ret; + LPWSTR defval_tmp = NULL; - TRACE("%s,%s,%s,%p,%u,%s\n", debugstr_w(section), debugstr_w(entry), + TRACE("(%s, %s, %s, %p, %u, %s)\n", debugstr_w(section), debugstr_w(entry), debugstr_w(def_val), buffer, len, debugstr_w(filename)); /* strip any trailing ' ' of def_val. */ @@ -1114,22 +1110,25 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, } } - RtlEnterCriticalSection( &PROFILE_CritSect ); + RtlEnterCriticalSection(&PROFILE_CritSect); - if (PROFILE_Open( filename, FALSE )) { - if (section == NULL) + if (PROFILE_Open(filename, FALSE)) + { + if (section == NULL) ret = PROFILE_GetSectionNames(buffer, len); - else - /* PROFILE_GetString can handle the 'entry == NULL' case */ - ret = PROFILE_GetString( section, entry, def_val, buffer, len ); - } else if (buffer && def_val) { - lstrcpynW( buffer, def_val, len ); - ret = strlenW( buffer ); + else + /* PROFILE_GetString can handle the 'entry == NULL' case */ + ret = PROFILE_GetString(section, entry, def_val, buffer, len); + } + else if (buffer && def_val) + { + lstrcpynW(buffer, def_val, len); + ret = strlenW(buffer); } else - ret = 0; + ret = 0; - RtlLeaveCriticalSection( &PROFILE_CritSect ); + RtlLeaveCriticalSection(&PROFILE_CritSect); HeapFree(GetProcessHeap(), 0, defval_tmp); @@ -1138,12 +1137,23 @@ INT WINAPI GetPrivateProfileStringW( LPCWSTR section, LPCWSTR entry, return ret; } +/*********************************************************************** + * GetPrivateProfileStringW (KERNEL32.@) + */ +INT WINAPI GetPrivateProfileStringW(LPCWSTR section, LPCWSTR entry, + LPCWSTR def_val, LPWSTR buffer, + UINT len, LPCWSTR filename) +{ + return get_private_profile_string(section, entry, def_val, buffer, + len, filename); +} + /*********************************************************************** * GetPrivateProfileStringA (KERNEL32.@) */ -INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, - LPCSTR def_val, LPSTR buffer, - UINT len, LPCSTR filename ) +INT WINAPI GetPrivateProfileStringA(LPCSTR section, LPCSTR entry, + LPCSTR def_val, LPSTR buffer, + UINT len, LPCSTR filename) { UNICODE_STRING sectionW, entryW, def_valW, filenameW; LPWSTR bufferW; @@ -1159,9 +1169,9 @@ INT WINAPI GetPrivateProfileStringA( LPCSTR section, LPCSTR entry, if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - retW = GetPrivateProfileStringW( sectionW.Buffer, entryW.Buffer, - def_valW.Buffer, bufferW, len, - filenameW.Buffer); + retW = get_private_profile_string(sectionW.Buffer, entryW.Buffer, + def_valW.Buffer, bufferW, len, + filenameW.Buffer); if (len && buffer) { if (retW) @@ -1358,38 +1368,47 @@ INT WINAPI GetProfileSectionW( LPCWSTR section, LPWSTR buffer, DWORD len ) return GetPrivateProfileSectionW( section, buffer, len, wininiW ); } - -/*********************************************************************** - * WritePrivateProfileStringW (KERNEL32.@) - */ -BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, - LPCWSTR string, LPCWSTR filename ) +static BOOL write_private_profile_string(LPCWSTR section, LPCWSTR entry, LPCWSTR string, + LPCWSTR filename) { BOOL ret = FALSE; - RtlEnterCriticalSection( &PROFILE_CritSect ); + TRACE("(%s, %s, %s, %s)\n", debugstr_w(section), debugstr_w(entry), + debugstr_w(string), debugstr_w(filename)); + + RtlEnterCriticalSection(&PROFILE_CritSect); if (!section && !entry && !string) /* documented "file flush" case */ { - if (!filename || PROFILE_Open( filename, TRUE )) + if (!filename || PROFILE_Open(filename, TRUE)) { if (CurProfile) PROFILE_ReleaseFile(); /* always return FALSE in this case */ } } - else if (PROFILE_Open( filename, TRUE )) + else if (PROFILE_Open(filename, TRUE)) { if (!section) { SetLastError(ERROR_FILE_NOT_FOUND); } else { - ret = PROFILE_SetString( section, entry, string, FALSE); + ret = PROFILE_SetString(section, entry, string, FALSE); if (ret) ret = PROFILE_FlushFile(); } } - RtlLeaveCriticalSection( &PROFILE_CritSect ); + RtlLeaveCriticalSection(&PROFILE_CritSect); return ret; } +/*********************************************************************** + * WritePrivateProfileStringW (KERNEL32.@) + */ +BOOL WINAPI WritePrivateProfileStringW(LPCWSTR section, LPCWSTR entry, + LPCWSTR string, LPCWSTR filename) +{ + return write_private_profile_string(section, entry, string, + filename); +} + /*********************************************************************** * WritePrivateProfileStringA (KERNEL32.@) */ @@ -1408,8 +1427,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WritePrivateProfileStringA( LPCSTR section, LPCSTR if (filename) RtlCreateUnicodeStringFromAsciiz(&filenameW, filename); else filenameW.Buffer = NULL; - ret = WritePrivateProfileStringW(sectionW.Buffer, entryW.Buffer, - stringW.Buffer, filenameW.Buffer); + ret = write_private_profile_string(sectionW.Buffer, entryW.Buffer, + stringW.Buffer, filenameW.Buffer); RtlFreeUnicodeString(&sectionW); RtlFreeUnicodeString(&entryW); RtlFreeUnicodeString(&stringW); -- 2.20.1

2 1

[PATCH v2] server: Add __pad member to pe_image_info_t and zero struct.
by Jefferson Carpenter 30 Apr '19

30 Apr '19

1 0

[PATCH] makefiles: Build with -fno-PIC on i386.
by Zebediah Figura 30 Apr '19

30 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37540 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47027 Many applications attempt to hook or copy native API calls, using methods sophisticated enough to recognize any sequence of x86 instructions, but not enough to recognize and account for a GOT register load. Most such cases only care to insert a JMP instruction in the first five bytes, and so are satisfied by adding the hot-patch prefix. However, the madCodeHook 3.x engine attempts to copy the first 15 bytes, and some copy-protection schemes will try to copy the whole function. Building with -fno-PIC on i386, as is the default behaviour for Visual Studio compiled applications, and likely for Windows libraries as well, fixes those applications, and also stops us once and for all wasting time debugging and individually applying DECLSPEC_HOTPATCH. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure.ac | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 8de9d3723e..a200e73a2f 100644 --- a/configure.ac +++ b/configure.ac @@ -924,31 +924,36 @@ case $host_os in ;; *) - DLLFLAGS="$DLLFLAGS -fPIC" + case $host_cpu in + *i[[3456789]]86*) + DLLFLAGS="$DLLFLAGS -fno-PIC" ;; + *) + DLLFLAGS="$DLLFLAGS -fPIC" ;; + esac AC_CACHE_CHECK([whether we can build a GNU style ELF dll], ac_cv_c_dll_gnuelf, - [WINE_TRY_SHLIB_FLAGS([-fPIC -shared -Wl,-Bsymbolic], + [WINE_TRY_SHLIB_FLAGS([$DLLFLAGS -shared -Wl,-Bsymbolic], ac_cv_c_dll_gnuelf="yes",ac_cv_c_dll_gnuelf="no")]) if test "$ac_cv_c_dll_gnuelf" = "yes" then LIBWINE_LDFLAGS="-shared" - WINE_TRY_CFLAGS([-fPIC -shared -Wl,-soname,confest.so.1], + WINE_TRY_CFLAGS([$DLLFLAGS -shared -Wl,-soname,confest.so.1], [LIBWINE_LDFLAGS="-shared -Wl,-soname,libwine.so.$libwine_soversion"], - [WINE_TRY_CFLAGS([-fPIC -shared -Wl,-h,confest.so.1], + [WINE_TRY_CFLAGS([$DLLFLAGS -shared -Wl,-h,confest.so.1], [LIBWINE_LDFLAGS="-shared -Wl,-h,libwine.so.$libwine_soversion"])]) echo '{ global: *; };' >conftest.map - WINE_TRY_CFLAGS([-fPIC -shared -Wl,--version-script=conftest.map], + WINE_TRY_CFLAGS([$DLLFLAGS -shared -Wl,--version-script=conftest.map], [LIBWINE_LDFLAGS="$LIBWINE_LDFLAGS -Wl,--version-script=\$(srcdir)/wine.map"]) rm -f conftest.map - WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic], + WINE_TRY_CFLAGS([$DLLFLAGS -Wl,--export-dynamic], [WINELOADER_LDFLAGS="-Wl,--export-dynamic"]) WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c400000" - WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib], + WINE_TRY_CFLAGS([$DLLFLAGS -Wl,--rpath,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"], - [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib], + [WINE_TRY_CFLAGS([$DLLFLAGS -Wl,-R,\$ORIGIN/../lib], [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`" LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])]) -- 2.21.0

1 0

[PATCH v3 1/3] wrc: Support Asturian
by Alex Henrie 30 Apr '19

30 Apr '19

From: Enol Puente <enolp(a)softastur.org> Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winnt.rh | 1 + tools/wmc/po.c | 2 ++ tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 4 files changed, 6 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 8a8064a25f..bf10c50c63 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -82,6 +82,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ@latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ@cyrillic" }, diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 913a918a69..3f5affd49f 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ@latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ@cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5533a531f1..a1e07b85b2 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -457,6 +457,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 }, -- 2.21.0

1 0

[PATCH] shell32: Implement NewMenu with new folder item.
by Vijay Kiran Kamuju 30 Apr '19

30 Apr '19

From: Michael Müller <michael(a)fds-team.de> v2: Added and Correct tests Use IContextMenu3 for all IContextMenu* interfaces. Use heap_alloc/free functions v3: Correct header issue when compiling i386 (var_arg) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24812 From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32_classes.idl | 5 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellnew.c | 498 +++++++++++++++++++++++++++++++ dlls/shell32/shellole.c | 1 + dlls/shell32/tests/shlview.c | 9 +- 6 files changed, 514 insertions(+), 1 deletion(-) create mode 100644 dlls/shell32/shellnew.c diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 20365b96fb..0fbc86ecf9 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -32,6 +32,7 @@ C_SRCS = \ shelldispatch.c \ shellitem.c \ shelllink.c \ + shellnew.c \ shellole.c \ shellord.c \ shellpath.c \ diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index 6ed497fea5..60de627be3 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -80,6 +80,11 @@ coclass KnownFolderManager { interface IKnownFolderManager; } uuid(4657278a-411b-11d2-839a-00c04fd918d0) ] coclass DragDropHelper { interface IDropTargetHelper; } +[ + threading(apartment), + uuid(d969a300-e7ff-11d0-a93b-00a0c90f2719) +] coclass NewMenu { interface IShellExtInit; } + [ threading(apartment), uuid(00bb2763-6a77-11d0-a535-00c04fd7d062) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 11a96309e8..6d6da97f11 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -103,6 +103,7 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput) DECLSPEC_HIDDEN; HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT WINAPI KnownFolderManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI NewMenu_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellnew.c b/dlls/shell32/shellnew.c new file mode 100644 index 0000000000..89be091e03 --- /dev/null +++ b/dlls/shell32/shellnew.c @@ -0,0 +1,498 @@ +/* + * Copyright 2015 Michael Müller + * + * 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 + */ +#include "config.h" + +#define COBJMACROS +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "winreg.h" + +#include "winuser.h" +#include "wingdi.h" +#include "shlobj.h" +#include "undocshell.h" + +#include "pidl.h" +#include "shell32_main.h" +#include "shlguid.h" +#include "shlwapi.h" +#include "shresdef.h" +#include "shellfolder.h" + +#include "wine/heap.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shell); + +typedef struct +{ + IShellExtInit IShellExtInit_iface; + IContextMenu3 IContextMenu3_iface; + IObjectWithSite IObjectWithSite_iface; + + LONG ref; + IUnknown *site; + LPITEMIDLIST pidl; + HICON icon_folder; + + UINT folder_cmd; +} NewMenuImpl; + +static inline NewMenuImpl *impl_from_IShellExtInit(IShellExtInit *iface) +{ + return CONTAINING_RECORD(iface, NewMenuImpl, IShellExtInit_iface); +} + +static inline NewMenuImpl *impl_from_IContextMenu3(IContextMenu3 *iface) +{ + return CONTAINING_RECORD(iface, NewMenuImpl, IContextMenu3_iface); +} + +static inline NewMenuImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) +{ + return CONTAINING_RECORD(iface, NewMenuImpl, IObjectWithSite_iface); +} + +static HRESULT WINAPI +NewMenu_ExtInit_QueryInterface(IShellExtInit *iface, REFIID riid, void **ppv) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + TRACE("(%p)->(%s)\n", This, debugstr_guid(riid)); + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IShellExtInit)) + { + *ppv = &This->IShellExtInit_iface; + } + else if (IsEqualIID(riid, &IID_IObjectWithSite)) + { + *ppv = &This->IObjectWithSite_iface; + } + else if (IsEqualIID(riid, &IID_IContextMenu) || + IsEqualIID(riid, &IID_IContextMenu2) || + IsEqualIID(riid, &IID_IContextMenu3)) + { + *ppv = &This->IContextMenu3_iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + TRACE("-- Interface: (%p)->(%p)\n", ppv, *ppv); + return S_OK; + } + + ERR("-- Interface: E_NOINTERFACE for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI +NewMenu_ExtInit_AddRef(IShellExtInit *iface) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), refcount=%i\n", iface, ref); + + return ref; +} + +static ULONG WINAPI +NewMenu_ExtInit_Release(IShellExtInit *iface) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), refcount=%i\n", iface, ref); + + if (!ref) + { + if (This->site) IUnknown_Release(This->site); + if (This->pidl) ILFree(This->pidl); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI +NewMenu_ExtInit_Initialize(IShellExtInit *iface, LPCITEMIDLIST pidl, IDataObject *obj, HKEY key) +{ + NewMenuImpl *This = impl_from_IShellExtInit(iface); + + TRACE("(%p)->(%p, %p, %p)\n", This, pidl, obj, key ); + + if (!pidl) + return E_FAIL; + + if (This->pidl) ILFree(This->pidl); + This->pidl = ILClone(pidl); + This->icon_folder = LoadImageW(shell32_hInstance, (LPCWSTR)MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_SHARED); + + return S_OK; +} + +static const IShellExtInitVtbl eivt = +{ + NewMenu_ExtInit_QueryInterface, + NewMenu_ExtInit_AddRef, + NewMenu_ExtInit_Release, + NewMenu_ExtInit_Initialize +}; + + +static HRESULT WINAPI +NewMenu_ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppv) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + return NewMenu_ExtInit_QueryInterface(&This->IShellExtInit_iface, riid, ppv); +} + +static ULONG WINAPI +NewMenu_ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + return NewMenu_ExtInit_AddRef(&This->IShellExtInit_iface); +} + +static ULONG WINAPI +NewMenu_ObjectWithSite_Release(IObjectWithSite *iface) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + return NewMenu_ExtInit_Release(&This->IShellExtInit_iface); +} + +static HRESULT WINAPI +NewMenu_ObjectWithSite_GetSite(IObjectWithSite *iface, REFIID iid, void **ppv) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), ppv); + + if (!This->site) + return E_FAIL; + + return IUnknown_QueryInterface(This->site, iid, ppv); +} + +static HRESULT WINAPI +NewMenu_ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *punk) +{ + NewMenuImpl *This = impl_from_IObjectWithSite(iface); + + TRACE("(%p)->(%p)\n", This, punk); + + if (punk) + IUnknown_AddRef(punk); + + if (This->site) + IUnknown_Release(This->site); + + This->site = punk; + return S_OK; +} + +static const IObjectWithSiteVtbl owsvt = +{ + NewMenu_ObjectWithSite_QueryInterface, + NewMenu_ObjectWithSite_AddRef, + NewMenu_ObjectWithSite_Release, + NewMenu_ObjectWithSite_SetSite, + NewMenu_ObjectWithSite_GetSite, +}; + + +static HRESULT WINAPI +NewMenu_ContextMenu3_QueryInterface(IContextMenu3 *iface, REFIID riid, void **ppv) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + return NewMenu_ExtInit_QueryInterface(&This->IShellExtInit_iface, riid, ppv); +} + +static ULONG WINAPI +NewMenu_ContextMenu3_AddRef(IContextMenu3 *iface) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + return NewMenu_ExtInit_AddRef(&This->IShellExtInit_iface); +} + +static ULONG WINAPI +NewMenu_ContextMenu3_Release(IContextMenu3 *iface) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + return NewMenu_ExtInit_Release(&This->IShellExtInit_iface); +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_GetCommandString(IContextMenu3 *iface, UINT_PTR cmd, UINT type, + UINT *reserved, LPSTR name, UINT max_len) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + + FIXME("(%p)->(%lu %u %p %p %u): stub\n", This, cmd, type, reserved, name, max_len); + + return E_NOTIMPL; +} + +static HRESULT create_folder(NewMenuImpl *This, IShellView *view) +{ + IFolderView *folder_view = NULL; + IShellFolder *desktop = NULL; + IShellFolder *parent = NULL; + ISFHelper *helper = NULL; + LPITEMIDLIST pidl = NULL; + WCHAR nameW[MAX_PATH]; + HRESULT hr; + + if (view) + { + hr = IShellView_QueryInterface(view, &IID_IFolderView, (void **)&folder_view); + if (FAILED(hr)) return hr; + + hr = IFolderView_GetFolder(folder_view, &IID_IShellFolder, (void **)&parent); + if (FAILED(hr)) goto out; + } + else + { + hr = SHGetDesktopFolder(&desktop); + if (FAILED(hr)) goto out; + + hr = IShellFolder_BindToObject(desktop, This->pidl, NULL, &IID_IShellFolder, (void **)&parent); + if (FAILED(hr)) goto out; + } + + IShellFolder_QueryInterface(parent, &IID_ISFHelper, (void **)&helper); + if (FAILED(hr)) goto out; + + hr = ISFHelper_GetUniqueName(helper, nameW, MAX_PATH); + if (FAILED(hr)) goto out; + + hr = ISFHelper_AddFolder(helper, 0, nameW, &pidl); + if (FAILED(hr)) goto out; + + if (view) + { + IShellView_SelectItem(view, pidl, SVSI_DESELECTOTHERS | SVSI_EDIT | + SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_SELECT); + } + +out: + if (pidl) SHFree(pidl); + if (helper) ISFHelper_Release(helper); + if (parent) IShellFolder_Release(parent); + if (desktop) IShellFolder_Release(desktop); + if (folder_view) IFolderView_Release(folder_view); + return hr; +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_InvokeCommand(IContextMenu3 *iface, LPCMINVOKECOMMANDINFO info) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + IShellBrowser *browser; + IShellView *view = NULL; + HRESULT hr = E_FAIL; + + TRACE("(%p)->(%p)\n", This, info); + + /* New Folder */ + if (info->lpVerb == 0) + { + if ((browser = (IShellBrowser *)SendMessageA(info->hwnd, CWM_GETISHELLBROWSER, 0, 0))) + { + if (FAILED(IShellBrowser_QueryActiveShellView(browser, &view))) + view = NULL; + } + hr = create_folder(This, view); + if (view) IShellView_Release(view); + } + + return hr; +} + +static UINT insert_new_menu_items(NewMenuImpl *This, HMENU menu, UINT pos, UINT cmd_first, UINT cmd_last) +{ + MENUITEMINFOW item; + WCHAR buffer[256]; + + memset(&item, 0, sizeof(item)); + item.cbSize = sizeof(item); + + if (cmd_first > cmd_last) + return cmd_first; + + /* FIXME: on windows it is only 'Folder' not 'New Folder' */ + if (!LoadStringW(shell32_hInstance, IDS_NEWFOLDER, buffer, sizeof(buffer) / sizeof(WCHAR))) + buffer[0] = 0; + + item.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; + item.dwTypeData = buffer; + item.cch = strlenW(buffer); + item.wID = cmd_first; + item.hbmpItem = HBMMENU_CALLBACK; + if (InsertMenuItemW(menu, pos, TRUE, &item)) + { + This->folder_cmd = cmd_first++; + pos++; + } + + return cmd_first; +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_QueryContextMenu(IContextMenu3 *iface, HMENU menu, UINT index, + UINT cmd_first, UINT cmd_last, UINT flags) +{ + static WCHAR newW[] = {'N','e','w',0}; + NewMenuImpl *This = impl_from_IContextMenu3(iface); + MENUITEMINFOW item; + HMENU submenu; + UINT id; + + TRACE("(%p)->(%p, %u, %u, %u, %u)\n", This, + menu, index, cmd_first, cmd_last, flags ); + + if (!This->pidl) + return E_FAIL; + + submenu = CreateMenu(); + if (!submenu) return E_FAIL; + + id = insert_new_menu_items(This, submenu, 0, cmd_first, cmd_last); + + memset(&item, 0, sizeof(item)); + item.cbSize = sizeof(item); + item.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE | MIIM_SUBMENU; + item.fType = MFT_STRING; + item.wID = -1; + item.dwTypeData = newW; /* FIXME: load from resource file */ + item.cch = strlenW(newW); + item.fState = MFS_ENABLED; + item.hSubMenu = submenu; + + if (!InsertMenuItemW(menu, index, TRUE, &item)) + return E_FAIL; + + return MAKE_HRESULT(SEVERITY_SUCCESS, 0, id); +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_HandleMenuMsg2(IContextMenu3 *iface, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *result) +{ + NewMenuImpl *This = impl_from_IContextMenu3(iface); + + TRACE("(%p)->(%u, %lx, %lx, %p)\n", This, uMsg, wParam, lParam, result); + + switch (uMsg) + { + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; + if (!mis || mis->CtlType != ODT_MENU) + break; + + if (This->folder_cmd == mis->itemID) + { + mis->itemWidth = GetSystemMetrics(SM_CXSMICON); + mis->itemHeight = GetSystemMetrics(SM_CYSMICON); + } + + if (result) *result = TRUE; + break; + } + + case WM_DRAWITEM: + { + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; + HICON icon = 0; + UINT x, y; + + if (!dis || dis->CtlType != ODT_MENU) + break; + + if (This->folder_cmd == dis->itemID) + icon = This->icon_folder; + + if (!icon) + break; + + x = (dis->rcItem.right - dis->rcItem.left - GetSystemMetrics(SM_CXSMICON)) / 2; + y = (dis->rcItem.bottom - dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2; + DrawStateW(dis->hDC, NULL, NULL, (LPARAM)icon, 0, x, y, 0, 0, DST_ICON | DSS_NORMAL); + + if (result) *result = TRUE; + break; + } + } + + return S_OK; +} + +static HRESULT WINAPI +NewMenu_ContextMenu3_HandleMenuMsg(IContextMenu3 *iface, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + return NewMenu_ContextMenu3_HandleMenuMsg2(iface, uMsg, wParam, lParam, NULL); +} + +static const IContextMenu3Vtbl cmvt3 = +{ + NewMenu_ContextMenu3_QueryInterface, + NewMenu_ContextMenu3_AddRef, + NewMenu_ContextMenu3_Release, + NewMenu_ContextMenu3_QueryContextMenu, + NewMenu_ContextMenu3_InvokeCommand, + NewMenu_ContextMenu3_GetCommandString, + NewMenu_ContextMenu3_HandleMenuMsg, + NewMenu_ContextMenu3_HandleMenuMsg2 +}; + +HRESULT WINAPI NewMenu_Constructor(IUnknown *outer, REFIID riid, void **obj) +{ + NewMenuImpl *menu; + HRESULT hr; + + TRACE("outer=%p riid=%s\n", outer, debugstr_guid(riid)); + + *obj = NULL; + + if (outer) + return CLASS_E_NOAGGREGATION; + + menu = heap_alloc_zero(sizeof(NewMenuImpl)); + if (!menu) return E_OUTOFMEMORY; + + menu->ref = 1; + menu->IShellExtInit_iface.lpVtbl = &eivt; + menu->IContextMenu3_iface.lpVtbl = &cmvt3; + menu->IObjectWithSite_iface.lpVtbl = &owsvt; + + TRACE("(%p)\n", menu); + + hr = IShellExtInit_QueryInterface(&menu->IShellExtInit_iface, riid, obj); + IShellExtInit_Release(&menu->IShellExtInit_iface); + return hr; +} diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3fe96801aa..649e6460cf 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -89,6 +89,7 @@ static const struct { {&CLSID_Shell, IShellDispatch_Constructor}, {&CLSID_DestinationList, CustomDestinationList_Constructor}, {&CLSID_ShellImageDataFactory, ShellImageDataFactory_Constructor}, + {&CLSID_NewMenu, NewMenu_Constructor}, {NULL, NULL} }; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d44..dbb24d9356 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1479,7 +1479,6 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); -todo_wine ok(hr == S_OK, "Failed to create NewMenu object, hr %#x.\n", hr); if (hr != S_OK) { @@ -1491,6 +1490,14 @@ todo_wine ok(hr == S_OK, "Failed to get IShellExtInit, hr %#x.\n", hr); IUnknown_Release(unk2); + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu, (void **)&unk2); + ok(hr == S_OK, "Failed to get IContextMenu, hr %#x.\n", hr); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu2, (void **)&unk2); + ok(hr == S_OK, "Failed to get IContextMenu2, hr %#x.\n", hr); + IUnknown_Release(unk2); + hr = IUnknown_QueryInterface(unk, &IID_IContextMenu3, (void **)&unk2); ok(hr == S_OK, "Failed to get IContextMenu3, hr %#x.\n", hr); IUnknown_Release(unk2); -- 2.21.0

2 2

[PATCH] server: Implement token elevation information.
by Vijay Kiran Kamuju 29 Apr '19

29 Apr '19

From: Michael Müller <michael(a)fds-team.de> From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ntdll/nt.c | 16 ++++++++++++---- server/protocol.def | 8 ++++++++ server/token.c | 22 +++++++++++++++++++--- 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index d03c0a122f..a17ee7b55f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -566,18 +566,26 @@ NTSTATUS WINAPI NtQueryInformationToken( SERVER_END_REQ; break; case TokenElevationType: + SERVER_START_REQ( get_token_elevation_type ) { TOKEN_ELEVATION_TYPE *elevation_type = tokeninfo; - FIXME("QueryInformationToken( ..., TokenElevationType, ...) semi-stub\n"); - *elevation_type = TokenElevationTypeFull; + req->handle = wine_server_obj_handle( token ); + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + *elevation_type = reply->elevation; } + SERVER_END_REQ; break; case TokenElevation: + SERVER_START_REQ( get_token_elevation_type ) { TOKEN_ELEVATION *elevation = tokeninfo; - FIXME("QueryInformationToken( ..., TokenElevation, ...) semi-stub\n"); - elevation->TokenIsElevated = TRUE; + req->handle = wine_server_obj_handle( token ); + status = wine_server_call( req ); + if (status == STATUS_SUCCESS) + elevation->TokenIsElevated = (reply->elevation == TokenElevationTypeFull); } + SERVER_END_REQ; break; case TokenSessionId: { diff --git a/server/protocol.def b/server/protocol.def index 21008d7a87..d253354722 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3704,6 +3704,14 @@ struct handle_info @END +/* Get elevation level of token */ +@REQ(get_token_elevation_type) + obj_handle_t handle; /* handle to the object */ +@REPLY + unsigned int elevation; /* elevation level */ +@END + + /* Create I/O completion port */ @REQ(create_completion) unsigned int access; /* desired access to a port */ diff --git a/server/token.c b/server/token.c index e0f28c6da6..c27463aa8a 100644 --- a/server/token.c +++ b/server/token.c @@ -112,6 +112,7 @@ struct token ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ int impersonation_level; /* impersonation level this token is capable of if non-primary token */ + TOKEN_ELEVATION_TYPE elevation; /* elevation level */ }; struct privilege @@ -541,7 +542,7 @@ static struct token *create_token( unsigned primary, const SID *user, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, const luid_t *modified_id, - int impersonation_level ) + int impersonation_level, TOKEN_ELEVATION_TYPE elevation ) { struct token *token = alloc_object( &token_ops ); if (token) @@ -563,6 +564,7 @@ static struct token *create_token( unsigned primary, const SID *user, token->impersonation_level = impersonation_level; token->default_dacl = NULL; token->primary_group = NULL; + token->elevation = elevation; /* copy user */ token->user = memdup( user, security_sid_len( user )); @@ -650,7 +652,8 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, token = create_token( primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl, src_token->source, modified_id, - impersonation_level ); + impersonation_level, + src_token->elevation ); if (!token) return token; /* copy groups */ @@ -847,7 +850,7 @@ struct token *token_create_admin( void ) static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; token = create_token( TRUE, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), admin_privs, ARRAY_SIZE( admin_privs ), default_dacl, - admin_source, NULL, -1 ); + admin_source, NULL, -1, TokenElevationTypeFull ); /* we really need a primary group */ assert( token->primary_group ); } @@ -1556,6 +1559,19 @@ DECL_HANDLER(get_token_statistics) } } +DECL_HANDLER(get_token_elevation_type) +{ + struct token *token; + + if ((token = (struct token *)get_handle_obj( current->process, req->handle, + TOKEN_QUERY, + &token_ops ))) + { + reply->elevation = token->elevation; + release_object( token ); + } +} + DECL_HANDLER(get_token_default_dacl) { struct token *token; -- 2.21.0

1 0

[PATCH v3] dinput: Don't return unsupported interfaces.
by Alistair Leslie-Hughes 29 Apr '19

29 Apr '19

Supersedes 163790. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/dinput_main.c | 50 ++++++++++++++++----------------------------- dlls/dinput/tests/dinput.c | 21 ++++--------------- dlls/dinput8/tests/dinput.c | 28 ++++++++----------------- 3 files changed, 30 insertions(+), 69 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 1b2020c..e32ccae 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -566,53 +566,39 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE if (!riid || !ppobj) return E_POINTER; + *ppobj = NULL; + +#if DIRECTINPUT_VERSION == 0x0700 if (IsEqualGUID( &IID_IUnknown, riid ) || - IsEqualGUID( &IID_IDirectInputA, riid ) || - IsEqualGUID( &IID_IDirectInput2A, riid ) || - IsEqualGUID( &IID_IDirectInput7A, riid )) - { + IsEqualGUID( &IID_IDirectInputA, riid ) || + IsEqualGUID( &IID_IDirectInput2A, riid ) || + IsEqualGUID( &IID_IDirectInput7A, riid )) *ppobj = &This->IDirectInput7A_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - - return DI_OK; - } - - if (IsEqualGUID( &IID_IDirectInputW, riid ) || - IsEqualGUID( &IID_IDirectInput2W, riid ) || - IsEqualGUID( &IID_IDirectInput7W, riid )) - { + else if (IsEqualGUID( &IID_IDirectInputW, riid ) || + IsEqualGUID( &IID_IDirectInput2W, riid ) || + IsEqualGUID( &IID_IDirectInput7W, riid )) *ppobj = &This->IDirectInput7W_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; - } - - if (IsEqualGUID( &IID_IDirectInput8A, riid )) - { +#else + if (IsEqualGUID( &IID_IUnknown, riid ) || + IsEqualGUID( &IID_IDirectInput8A, riid )) *ppobj = &This->IDirectInput8A_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - - return DI_OK; - } - if (IsEqualGUID( &IID_IDirectInput8W, riid )) - { + else if (IsEqualGUID( &IID_IDirectInput8W, riid )) *ppobj = &This->IDirectInput8W_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; - } +#endif if (IsEqualGUID( &IID_IDirectInputJoyConfig8, riid )) - { *ppobj = &This->IDirectInputJoyConfig8_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); + if(*ppobj) + { + IUnknown_AddRef( (IUnknown*)*ppobj ); return DI_OK; } - FIXME( "Unsupported interface: %s\n", debugstr_guid(riid)); - *ppobj = NULL; + WARN( "Unsupported interface: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 23b20d2..6451241 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -272,11 +272,10 @@ static void test_QueryInterface(void) static const struct { REFIID riid; - int test_todo; } no_interface_list[] = { - {&IID_IDirectInput8A, 1}, - {&IID_IDirectInput8W, 1}, + {&IID_IDirectInput8A}, + {&IID_IDirectInput8W}, {&IID_IDirectInputDeviceA}, {&IID_IDirectInputDeviceW}, {&IID_IDirectInputDevice2A}, @@ -324,20 +323,8 @@ static void test_QueryInterface(void) { pUnk = (void *)0xdeadbeef; hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); - if (no_interface_list[i].test_todo) - { - todo_wine - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - todo_wine - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - - if (pUnk) IUnknown_Release(pUnk); - } - else - { - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } IDirectInput_Release(pDI); diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index 28b1bd5..d87f997 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -225,15 +225,14 @@ static void test_QueryInterface(void) static const struct { REFIID riid; - int test_todo; } no_interface_list[] = { - {&IID_IDirectInputA, 1}, - {&IID_IDirectInputW, 1}, - {&IID_IDirectInput2A, 1}, - {&IID_IDirectInput2W, 1}, - {&IID_IDirectInput7A, 1}, - {&IID_IDirectInput7W, 1}, + {&IID_IDirectInputA}, + {&IID_IDirectInputW}, + {&IID_IDirectInput2A}, + {&IID_IDirectInput2W}, + {&IID_IDirectInput7A}, + {&IID_IDirectInput7W}, {&IID_IDirectInputDeviceA}, {&IID_IDirectInputDeviceW}, {&IID_IDirectInputDevice2A}, @@ -293,20 +292,9 @@ static void test_QueryInterface(void) { pUnk = (void *)0xdeadbeef; hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); - if (no_interface_list[i].test_todo) - { - todo_wine - ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); - todo_wine - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - if (pUnk) IUnknown_Release(pUnk); - } - else - { - ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } + ok(hr == E_NOINTERFACE, "[%d] IDirectInput8_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } IDirectInput8_Release(pDI); -- 1.9.1

1 0

[PATCH] wintab32/tests: Improve WTInfoA tests.
by Alistair Leslie-Hughes 29 Apr '19

29 Apr '19

Some older WACOM tables dont support DVC_Z, DVC_TPRESSURE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wintab32/tests/context.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 3eb1315..a88e4bb 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -160,6 +160,9 @@ static void test_WTInfoA(void) ret = pWTInfoA( WTI_DEVICES, DVC_NAME, name ); trace("DVC_NAME %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_HARDWARE, name ); + trace("DVC_HARDWARE %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); @@ -169,16 +172,20 @@ static void test_WTInfoA(void) trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_Z size %d\n", ret); - trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_Z not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_TPRESSURE, size %d\n", ret); - trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_TPRESSURE not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret); -- 1.9.1

1 0

[PATCH vkd3d 8/9] vkd3d-shader: Translate lod shader instructions.
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3d8195219420..d0304e085eb6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1530,6 +1530,13 @@ static uint32_t vkd3d_spirv_build_op_image_query_samples(struct vkd3d_spirv_buil SpvOpImageQuerySamples, result_type, image_id); } +static uint32_t vkd3d_spirv_build_op_image_query_lod(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t image_id, uint32_t coordinate_id) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpImageQueryLod, result_type, image_id, coordinate_id); +} + static void vkd3d_spirv_build_op_emit_vertex(struct vkd3d_spirv_builder *builder) { return vkd3d_spirv_build_op(&builder->function_stream, SpvOpEmitVertex); @@ -6966,6 +6973,32 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, dst, val_id, image.sampled_type, src[1].swizzle); } +static void vkd3d_dxbc_compiler_emit_lod(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + const struct vkd3d_shader_src_param *resource, *sampler; + uint32_t type_id, coordinate_id, val_id; + struct vkd3d_shader_image image; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); + + resource = &src[1]; + sampler = &src[2]; + vkd3d_dxbc_compiler_prepare_image(compiler, &image, + &resource->reg, &sampler->reg, VKD3D_IMAGE_FLAG_SAMPLED); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 2); + coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); + val_id = vkd3d_spirv_build_op_image_query_lod(builder, + type_id, image.sampled_image_id, coordinate_id); + + vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, + dst, val_id, image.sampled_type, resource->swizzle); +} + static void vkd3d_dxbc_compiler_emit_sample(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -8258,6 +8291,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_LD: vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break; + case VKD3DSIH_LOD: + vkd3d_dxbc_compiler_emit_lod(compiler, instruction); + break; case VKD3DSIH_SAMPLE: case VKD3DSIH_SAMPLE_B: case VKD3DSIH_SAMPLE_GRAD: -- 2.21.0

2 1

[PATCH vkd3d 7/9] vkd3d-shader: Simplify resource declaration handling in SPIR-V generator.
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 54 ++++----------------------------------- 1 file changed, 5 insertions(+), 49 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index dfdc7eb5a24a..3d8195219420 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4989,6 +4989,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co if (semantic->register_space) FIXME("Unhandled register space %u.\n", semantic->register_space); + if (instruction->flags) + FIXME("Unhandled UAV flags %#x.\n", instruction->flags); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, semantic->resource_type, semantic->resource_data_type, 0, false); @@ -4999,18 +5001,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler { const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; - if (resource->register_space) - FIXME("Unhandled register space %u.\n", resource->register_space); - - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); -} - -static void vkd3d_dxbc_compiler_emit_dcl_uav_raw(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; - if (resource->register_space) FIXME("Unhandled register space %u.\n", resource->register_space); if (instruction->flags) @@ -5027,20 +5017,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c const struct vkd3d_shader_register *reg = &resource->reg.reg; unsigned int stride = resource->byte_stride; - if (resource->register_space) - FIXME("Unhandled register space %u.\n", resource->register_space); - - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, reg, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); -} - -static void vkd3d_dxbc_compiler_emit_dcl_uav_structured(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; - const struct vkd3d_shader_register *reg = &resource->reg.reg; - unsigned int stride = resource->byte_stride; - if (resource->register_space) FIXME("Unhandled register space %u.\n", resource->register_space); if (instruction->flags) @@ -5050,20 +5026,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_uav_structured(struct vkd3d_dxbc_compil VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); } -static void vkd3d_dxbc_compiler_emit_dcl_uav_typed(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) -{ - const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; - - if (semantic->register_space) - FIXME("Unhandled register space %u.\n", semantic->register_space); - if (instruction->flags) - FIXME("Unhandled UAV flags %#x.\n", instruction->flags); - - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, - semantic->resource_type, semantic->resource_data_type, 0, false); -} - static void vkd3d_dxbc_compiler_emit_workgroup_memory(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, unsigned int size, unsigned int structure_stride) { @@ -8088,22 +8050,16 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_sampler(compiler, instruction); break; case VKD3DSIH_DCL: + case VKD3DSIH_DCL_UAV_TYPED: vkd3d_dxbc_compiler_emit_dcl_resource(compiler, instruction); break; case VKD3DSIH_DCL_RESOURCE_RAW: - vkd3d_dxbc_compiler_emit_dcl_resource_raw(compiler, instruction); - break; case VKD3DSIH_DCL_UAV_RAW: - vkd3d_dxbc_compiler_emit_dcl_uav_raw(compiler, instruction); + vkd3d_dxbc_compiler_emit_dcl_resource_raw(compiler, instruction); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: - vkd3d_dxbc_compiler_emit_dcl_resource_structured(compiler, instruction); - break; case VKD3DSIH_DCL_UAV_STRUCTURED: - vkd3d_dxbc_compiler_emit_dcl_uav_structured(compiler, instruction); - break; - case VKD3DSIH_DCL_UAV_TYPED: - vkd3d_dxbc_compiler_emit_dcl_uav_typed(compiler, instruction); + vkd3d_dxbc_compiler_emit_dcl_resource_structured(compiler, instruction); break; case VKD3DSIH_DCL_TGSM_RAW: vkd3d_dxbc_compiler_emit_dcl_tgsm_raw(compiler, instruction); -- 2.21.0

2 1

[PATCH vkd3d 6/9] vkd3d-shader: Add support for parsing Shader Model 5.1 bytecode.
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Translation to SPIR-V isn't implemented yet. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 100 ++++++++++++++++++++--- libs/vkd3d-shader/spirv.c | 54 +++++++++--- libs/vkd3d-shader/trace.c | 35 +++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 27 +++++- 4 files changed, 186 insertions(+), 30 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 045e8682a574..7336a7a3f4c6 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -78,6 +78,9 @@ #define VKD3D_SM4_REGISTER_MODIFIER (0x1u << 31) +#define VKD3D_SM4_ADDRESSING_SHIFT2 28 +#define VKD3D_SM4_ADDRESSING_MASK2 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT2) + #define VKD3D_SM4_ADDRESSING_SHIFT1 25 #define VKD3D_SM4_ADDRESSING_MASK1 (0x3u << VKD3D_SM4_ADDRESSING_SHIFT1) @@ -512,11 +515,35 @@ static const enum vkd3d_data_type data_type_table[] = /* VKD3D_SM4_DATA_FLOAT */ VKD3D_DATA_FLOAT, }; +static bool shader_is_sm_5_1(const struct vkd3d_sm4_data *priv) +{ + const struct vkd3d_shader_version *version = &priv->shader_version; + return version->major >= 5 && version->minor >= 1; +} + static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); static bool shader_sm4_read_dst_param(struct vkd3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum vkd3d_data_type data_type, struct vkd3d_shader_dst_param *dst_param); +static bool shader_sm4_read_register_space(struct vkd3d_sm4_data *priv, + const DWORD **ptr, const DWORD *end, unsigned int *register_space) +{ + *register_space = 0; + + if (!shader_is_sm_5_1(priv)) + return true; + + if (*ptr >= end) + { + WARN("Invalid ptr %p >= end %p.\n", *ptr, end); + return false; + } + + *register_space = *(*ptr)++; + return true; +} + static void shader_sm4_read_conditional_op(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) @@ -560,6 +587,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, struct vkd3d_sm4_data *priv) { enum vkd3d_sm4_resource_type resource_type; + const DWORD *end = &tokens[token_count]; enum vkd3d_sm4_data_type data_type; enum vkd3d_data_type reg_data_type; DWORD components; @@ -575,7 +603,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, ins->declaration.semantic.resource_type = resource_type_table[resource_type]; } reg_data_type = opcode == VKD3D_SM4_OP_DCL_RESOURCE ? VKD3D_DATA_RESOURCE : VKD3D_DATA_UAV; - shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], reg_data_type, &ins->declaration.semantic.reg); + shader_sm4_read_dst_param(priv, &tokens, end, reg_data_type, &ins->declaration.semantic.reg); components = *tokens++; if ((components & 0xfff0) != (components & 0xf) * 0x1110) @@ -594,25 +622,47 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, if (reg_data_type == VKD3D_DATA_UAV) ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; + + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.semantic.register_space); } static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { - shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_FLOAT, &ins->declaration.src); + const DWORD *end = &tokens[token_count]; + + shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_FLOAT, &ins->declaration.cb.src); if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK) ins->flags |= VKD3DSI_INDEXED_DYNAMIC; + + ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[1].offset; + ins->declaration.cb.register_space = 0; + + if (shader_is_sm_5_1(priv)) + { + if (tokens >= end) + { + FIXME("Invalid ptr %p >= end %p.\n", tokens, end); + return; + } + + ins->declaration.cb.size = *tokens++; + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.cb.register_space); + } } static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { + const DWORD *end = &tokens[token_count]; + ins->flags = (opcode_token & VKD3D_SM4_SAMPLER_MODE_MASK) >> VKD3D_SM4_SAMPLER_MODE_SHIFT; if (ins->flags & ~VKD3D_SM4_SAMPLER_COMPARISON) FIXME("Unhandled sampler mode %#x.\n", ins->flags); - shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_SAMPLER, &ins->declaration.dst); + shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_SAMPLER, &ins->declaration.sampler.src); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.sampler.register_space); } static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins, @@ -808,20 +858,25 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UAV, &ins->declaration.dst); + const DWORD *end = &tokens[token_count]; + + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.raw_resource.dst); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); } static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_UAV, - &ins->declaration.structured_resource.reg); + const DWORD *end = &tokens[token_count]; + + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &ins->declaration.structured_resource.reg); ins->flags = (opcode_token & VKD3D_SM5_UAV_FLAGS_MASK) >> VKD3D_SM5_UAV_FLAGS_SHIFT; ins->declaration.structured_resource.byte_stride = *tokens; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space); } static void shader_sm5_read_dcl_tgsm_raw(struct vkd3d_shader_instruction *ins, @@ -850,18 +905,23 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_RESOURCE, - &ins->declaration.structured_resource.reg); + const DWORD *end = &tokens[token_count]; + + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); ins->declaration.structured_resource.byte_stride = *tokens; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.structured_resource.register_space); } static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], VKD3D_DATA_RESOURCE, &ins->declaration.dst); + const DWORD *end = &tokens[token_count]; + + shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &ins->declaration.dst); + shader_sm4_read_register_space(priv, &tokens, end, &ins->declaration.raw_resource.register_space); } static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, @@ -1470,8 +1530,26 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr } } - if (order > 2) - FIXME("Unhandled order %u.\n", order); + if (order < 3) + { + param->idx[2].offset = ~0u; + param->idx[2].rel_addr = NULL; + } + else + { + DWORD addressing = (token & VKD3D_SM4_ADDRESSING_MASK2) >> VKD3D_SM4_ADDRESSING_SHIFT2; + if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[2]))) + { + ERR("Failed to read register index.\n"); + return false; + } + } + + if (order > 3) + { + WARN("Unhandled order %u.\n", order); + return false; + } if (register_type == VKD3D_SM4_RT_IMMCONST) { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 86d5be89b039..dfdc7eb5a24a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4671,39 +4671,42 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi const struct vkd3d_shader_instruction *instruction) { uint32_t vec4_id, array_type_id, length_id, struct_id, pointer_type_id, var_id; - const struct vkd3d_shader_register *reg = &instruction->declaration.src.reg; + const struct vkd3d_shader_constant_buffer *cb = &instruction->declaration.cb; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const SpvStorageClass storage_class = SpvStorageClassUniform; + const struct vkd3d_shader_register *reg = &cb->src.reg; struct vkd3d_push_constant_buffer_binding *push_cb; struct vkd3d_symbol reg_symbol; - unsigned int cb_size; assert(!(instruction->flags & ~VKD3DSI_INDEXED_DYNAMIC)); - cb_size = reg->idx[1].offset; + if (cb->register_space) + FIXME("Unhandled register space %u.\n", cb->register_space); if ((push_cb = vkd3d_dxbc_compiler_find_push_constant_buffer(compiler, reg))) { /* Push constant buffers are handled in * vkd3d_dxbc_compiler_emit_push_constant_buffers(). */ - unsigned int cb_size_in_bytes = cb_size * VKD3D_VEC4_SIZE * sizeof(uint32_t); + unsigned int cb_size_in_bytes = cb->size * VKD3D_VEC4_SIZE * sizeof(uint32_t); push_cb->reg = *reg; if (cb_size_in_bytes > push_cb->pc.size) + { WARN("Constant buffer size %u exceeds push constant size %u.\n", cb_size_in_bytes, push_cb->pc.size); + } return; } vec4_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); - length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb_size); + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb->size); array_type_id = vkd3d_spirv_build_op_type_array(builder, vec4_id, length_id); vkd3d_spirv_build_op_decorate1(builder, array_type_id, SpvDecorationArrayStride, 16); struct_id = vkd3d_spirv_build_op_type_struct(builder, &array_type_id, 1); vkd3d_spirv_build_op_decorate(builder, struct_id, SpvDecorationBlock, NULL, 0); vkd3d_spirv_build_op_member_decorate1(builder, struct_id, 0, SpvDecorationOffset, 0); - vkd3d_spirv_build_op_name(builder, struct_id, "cb%u_struct", cb_size); + vkd3d_spirv_build_op_name(builder, struct_id, "cb%u_struct", cb->size); pointer_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, struct_id); var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, @@ -4756,12 +4759,15 @@ static void vkd3d_dxbc_compiler_emit_dcl_immediate_constant_buffer(struct vkd3d_ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - const struct vkd3d_shader_register *reg = &instruction->declaration.dst.reg; + const struct vkd3d_shader_register *reg = &instruction->declaration.sampler.src.reg; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; + if (instruction->declaration.sampler.register_space) + FIXME("Unhandled register space %u.\n", instruction->declaration.sampler.register_space); + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, reg)) return; @@ -4980,6 +4986,10 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + + if (semantic->register_space) + FIXME("Unhandled register space %u.\n", semantic->register_space); + vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &semantic->reg.reg, semantic->resource_type, semantic->resource_data_type, 0, false); } @@ -4987,25 +4997,38 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource(struct vkd3d_dxbc_compiler *co static void vkd3d_dxbc_compiler_emit_dcl_resource_raw(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &instruction->declaration.dst.reg, + const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; + + if (resource->register_space) + FIXME("Unhandled register space %u.\n", resource->register_space); + + vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); } static void vkd3d_dxbc_compiler_emit_dcl_uav_raw(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + const struct vkd3d_shader_raw_resource *resource = &instruction->declaration.raw_resource; + + if (resource->register_space) + FIXME("Unhandled register space %u.\n", resource->register_space); if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); - vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &instruction->declaration.dst.reg, + vkd3d_dxbc_compiler_emit_resource_declaration(compiler, &resource->dst.reg, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, 0, true); } static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - const struct vkd3d_shader_register *reg = &instruction->declaration.structured_resource.reg.reg; - unsigned int stride = instruction->declaration.structured_resource.byte_stride; + const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; + const struct vkd3d_shader_register *reg = &resource->reg.reg; + unsigned int stride = resource->byte_stride; + + if (resource->register_space) + FIXME("Unhandled register space %u.\n", resource->register_space); vkd3d_dxbc_compiler_emit_resource_declaration(compiler, reg, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_DATA_UINT, stride / 4, false); @@ -5014,9 +5037,12 @@ static void vkd3d_dxbc_compiler_emit_dcl_resource_structured(struct vkd3d_dxbc_c static void vkd3d_dxbc_compiler_emit_dcl_uav_structured(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - const struct vkd3d_shader_register *reg = &instruction->declaration.structured_resource.reg.reg; - unsigned int stride = instruction->declaration.structured_resource.byte_stride; + const struct vkd3d_shader_structured_resource *resource = &instruction->declaration.structured_resource; + const struct vkd3d_shader_register *reg = &resource->reg.reg; + unsigned int stride = resource->byte_stride; + if (resource->register_space) + FIXME("Unhandled register space %u.\n", resource->register_space); if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); @@ -5029,6 +5055,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_uav_typed(struct vkd3d_dxbc_compiler *c { const struct vkd3d_shader_semantic *semantic = &instruction->declaration.semantic; + if (semantic->register_space) + FIXME("Unhandled register space %u.\n", semantic->register_space); if (instruction->flags) FIXME("Unhandled UAV flags %#x.\n", instruction->flags); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 13fb117b5360..279ede06658c 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1042,6 +1042,17 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer, } shader_addline(buffer, "%u]", reg->idx[1].offset); } + + if (reg->idx[2].offset != ~0u) + { + shader_addline(buffer, "["); + if (reg->idx[2].rel_addr) + { + shader_dump_src_param(buffer, reg->idx[2].rel_addr, shader_version); + shader_addline(buffer, " + "); + } + shader_addline(buffer, "%u]", reg->idx[2].offset); + } } if (reg->type == VKD3DSPR_FUNCTIONPOINTER) @@ -1333,6 +1344,13 @@ static void shader_dump_instruction_flags(struct vkd3d_string_buffer *buffer, } } +static void shader_dump_register_space(struct vkd3d_string_buffer *buffer, + unsigned int register_space, const struct vkd3d_shader_version *shader_version) +{ + if (shader_version->major >= 5 && shader_version->minor >= 1) + shader_addline(buffer, ", space=%u", register_space); +} + static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, const struct vkd3d_shader_instruction *ins, const struct vkd3d_shader_version *shader_version) { @@ -1346,13 +1364,17 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_dump_ins_modifiers(buffer, &ins->declaration.semantic.reg); shader_addline(buffer, " "); shader_dump_dst_param(buffer, &ins->declaration.semantic.reg, shader_version); + shader_dump_register_space(buffer, ins->declaration.semantic.register_space, shader_version); break; case VKD3DSIH_DCL_CONSTANT_BUFFER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_src_param(buffer, &ins->declaration.src, shader_version); + shader_dump_src_param(buffer, &ins->declaration.cb.src, shader_version); + if (shader_version->major >= 5 && shader_version->minor >= 1) + shader_addline(buffer, "[%u]", ins->declaration.cb.size); shader_addline(buffer, ", %s", ins->flags & VKD3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); + shader_dump_register_space(buffer, ins->declaration.cb.register_space, shader_version); break; case VKD3DSIH_DCL_FUNCTION_BODY: @@ -1447,20 +1469,23 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, case VKD3DSIH_DCL_RESOURCE_RAW: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + shader_dump_dst_param(buffer, &ins->declaration.raw_resource.dst, shader_version); + shader_dump_register_space(buffer, ins->declaration.raw_resource.register_space, shader_version); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); shader_dump_dst_param(buffer, &ins->declaration.structured_resource.reg, shader_version); shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + shader_dump_register_space(buffer, ins->declaration.structured_resource.register_space, shader_version); break; case VKD3DSIH_DCL_SAMPLER: shader_addline(buffer, "%s ", shader_opcode_names[ins->handler_idx]); - shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + shader_dump_src_param(buffer, &ins->declaration.sampler.src, shader_version); if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE) shader_addline(buffer, ", comparisonMode"); + shader_dump_register_space(buffer, ins->declaration.sampler.register_space, shader_version); break; case VKD3DSIH_DCL_TEMPS: @@ -1512,7 +1537,8 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "%s", shader_opcode_names[ins->handler_idx]); shader_dump_uav_flags(buffer, ins->flags); shader_addline(buffer, " "); - shader_dump_dst_param(buffer, &ins->declaration.dst, shader_version); + shader_dump_dst_param(buffer, &ins->declaration.raw_resource.dst, shader_version); + shader_dump_register_space(buffer, ins->declaration.raw_resource.register_space, shader_version); break; case VKD3DSIH_DCL_UAV_STRUCTURED: @@ -1521,6 +1547,7 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, " "); shader_dump_dst_param(buffer, &ins->declaration.structured_resource.reg, shader_version); shader_addline(buffer, ", %u", ins->declaration.structured_resource.byte_stride); + shader_dump_register_space(buffer, ins->declaration.structured_resource.register_space, shader_version); break; case VKD3DSIH_DEF: diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index fba493e3b563..73ba93fe0133 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -558,7 +558,7 @@ struct vkd3d_shader_register { enum vkd3d_shader_register_type type; enum vkd3d_data_type data_type; - struct vkd3d_shader_register_index idx[2]; + struct vkd3d_shader_register_index idx[3]; enum vkd3d_immconst_type immconst_type; union { @@ -614,6 +614,7 @@ struct vkd3d_shader_semantic enum vkd3d_shader_resource_type resource_type; enum vkd3d_data_type resource_data_type; struct vkd3d_shader_dst_param reg; + unsigned int register_space; }; enum vkd3d_shader_input_sysval_semantic @@ -658,10 +659,30 @@ struct vkd3d_shader_register_semantic enum vkd3d_shader_input_sysval_semantic sysval_semantic; }; +struct vkd3d_shader_sampler +{ + struct vkd3d_shader_src_param src; + unsigned int register_space; +}; + +struct vkd3d_shader_constant_buffer +{ + struct vkd3d_shader_src_param src; + unsigned int size; + unsigned int register_space; +}; + struct vkd3d_shader_structured_resource { struct vkd3d_shader_dst_param reg; unsigned int byte_stride; + unsigned int register_space; +}; + +struct vkd3d_shader_raw_resource +{ + struct vkd3d_shader_dst_param dst; + unsigned int register_space; }; struct vkd3d_shader_tgsm @@ -741,10 +762,12 @@ struct vkd3d_shader_instruction struct vkd3d_shader_register_semantic register_semantic; struct vkd3d_shader_primitive_type primitive_type; struct vkd3d_shader_dst_param dst; - struct vkd3d_shader_src_param src; + struct vkd3d_shader_constant_buffer cb; + struct vkd3d_shader_sampler sampler; unsigned int count; unsigned int index; const struct vkd3d_shader_immediate_constant_buffer *icb; + struct vkd3d_shader_raw_resource raw_resource; struct vkd3d_shader_structured_resource structured_resource; struct vkd3d_shader_tgsm_raw tgsm_raw; struct vkd3d_shader_tgsm_structured tgsm_structured; -- 2.21.0

2 1

[PATCH vkd3d 9/9] vkd3d: Pass d3d12_resource to vk_barrier_parameters_from_d3d12_resource_state().
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f3271eb76940..c609270114df 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1610,9 +1610,10 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li } static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, - bool is_swapchain_image, D3D12_RESOURCE_STATES present_state, VkQueueFlags vk_queue_flags, + const struct d3d12_resource *resource, VkQueueFlags vk_queue_flags, VkAccessFlags *access_mask, VkPipelineStageFlags *stage_flags, VkImageLayout *image_layout) { + bool is_swapchain_image = resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION); VkPipelineStageFlags queue_shader_stages = 0; if (vk_queue_flags & VK_QUEUE_GRAPHICS_BIT) @@ -1637,26 +1638,26 @@ static bool vk_barrier_parameters_from_d3d12_resource_state(unsigned int state, * state when GPU finishes execution of a command list. */ if (is_swapchain_image) { - if (present_state == D3D12_RESOURCE_STATE_PRESENT) + if (resource->present_state == D3D12_RESOURCE_STATE_PRESENT) { *access_mask = VK_ACCESS_MEMORY_READ_BIT; *stage_flags = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; if (image_layout) *image_layout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; + return true; } - else + else if (resource->present_state != D3D12_RESOURCE_STATE_COMMON) { - vk_barrier_parameters_from_d3d12_resource_state(present_state, - false, 0, vk_queue_flags, access_mask, stage_flags, image_layout); + vk_barrier_parameters_from_d3d12_resource_state(resource->present_state, + resource, vk_queue_flags, access_mask, stage_flags, image_layout); + return true; } } - else - { - *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT; - *stage_flags = VK_PIPELINE_STAGE_HOST_BIT; - if (image_layout) - *image_layout = VK_IMAGE_LAYOUT_GENERAL; - } + + *access_mask = VK_ACCESS_HOST_READ_BIT | VK_ACCESS_HOST_WRITE_BIT; + *stage_flags = VK_PIPELINE_STAGE_HOST_BIT; + if (image_layout) + *image_layout = VK_IMAGE_LAYOUT_GENERAL; return true; /* Handle write states. */ @@ -1827,8 +1828,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 VK_IMAGE_LAYOUT_PREINITIALIZED : VK_IMAGE_LAYOUT_UNDEFINED; if (!vk_barrier_parameters_from_d3d12_resource_state(resource->initial_state, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) + resource, list->vk_queue_flags, &barrier.dstAccessMask, &dst_stage_mask, &barrier.newLayout)) { FIXME("Unhandled state %#x.\n", resource->initial_state); return; @@ -3439,15 +3439,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC sub_resource_idx = transition->Subresource; if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateBefore, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) + resource, list->vk_queue_flags, &src_access_mask, &src_stage_mask, &layout_before)) { FIXME("Unhandled state %#x.\n", transition->StateBefore); continue; } if (!vk_barrier_parameters_from_d3d12_resource_state(transition->StateAfter, - resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION, resource->present_state, - list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) + resource, list->vk_queue_flags, &dst_access_mask, &dst_stage_mask, &layout_after)) { FIXME("Unhandled state %#x.\n", transition->StateAfter); continue; @@ -3467,9 +3465,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResourceBarrier(ID3D12GraphicsC resource = unsafe_impl_from_ID3D12Resource(uav->pResource); vk_barrier_parameters_from_d3d12_resource_state(D3D12_RESOURCE_STATE_UNORDERED_ACCESS, - resource && (resource->flags & VKD3D_RESOURCE_PRESENT_STATE_TRANSITION), - resource ? resource->present_state : 0, list->vk_queue_flags, - &access_mask, &stage_mask, &image_layout); + resource, list->vk_queue_flags, &access_mask, &stage_mask, &image_layout); src_access_mask = dst_access_mask = access_mask; src_stage_mask = dst_stage_mask = stage_mask; layout_before = layout_after = image_layout; -- 2.21.0

2 1

[PATCH vkd3d 5/9] vkd3d: Simplify d3d12_pipeline_state_is_render_pass_compatible().
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 91 ++++++-------------------------------- libs/vkd3d/vkd3d_private.h | 4 +- 2 files changed, 14 insertions(+), 81 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b23101e868a6..6a7b6e5e1d5d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2027,7 +2027,6 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ { const struct d3d12_graphics_pipeline_state *a = &state_a->u.graphics; const struct d3d12_graphics_pipeline_state *b = &state_b->u.graphics; - unsigned int i; if (!state_a != !state_b) return false; @@ -2038,18 +2037,7 @@ bool d3d12_pipeline_state_is_render_pass_compatible(const struct d3d12_pipeline_ || state_b->vk_bind_point != VK_PIPELINE_BIND_POINT_GRAPHICS) return false; - if (a->rt_idx != b->rt_idx) - return false; - if (a->attachment_count != b->attachment_count) - return false; - - for (i = 0; i < a->attachment_count; ++i) - { - if (a->attachments[i].format != b->attachments[i].format) - return false; - } - - return true; + return a->render_pass == b->render_pass; } STATIC_ASSERT(sizeof(struct vkd3d_shader_transform_feedback_element) == sizeof(D3D12_SO_DECLARATION_ENTRY)); @@ -2140,11 +2128,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s WARN("Ignoring sample quality %u.\n", desc->SampleDesc.Quality); rt_count = desc->NumRenderTargets; - if (rt_count > ARRAY_SIZE(graphics->attachments) - 1) + if (rt_count > ARRAY_SIZE(graphics->blend_attachments)) { FIXME("NumRenderTargets %zu > %zu, ignoring extra formats.\n", - rt_count, ARRAY_SIZE(graphics->attachments) - 1); - rt_count = ARRAY_SIZE(graphics->attachments) - 1; + rt_count, ARRAY_SIZE(graphics->blend_attachments)); + rt_count = ARRAY_SIZE(graphics->blend_attachments); } if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN @@ -2156,7 +2144,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s && (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable)) { const D3D12_DEPTH_STENCIL_DESC *ds_desc = &desc->DepthStencilState; - VkImageLayout depth_layout; if (!(format = vkd3d_get_format(desc->DSVFormat, true))) { @@ -2168,51 +2155,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) FIXME("Format %#x is not depth/stencil format.\n", format->dxgi_format); - if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) - || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) - { - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - render_pass_key.depth_stencil_write = true; - } - else - { - depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; - render_pass_key.depth_stencil_write = false; - } - - graphics->attachments[0].flags = 0; - graphics->attachments[0].format = format->vk_format; - graphics->attachments[0].samples = sample_count; render_pass_key.depth_enable = desc->DepthStencilState.DepthEnable; - if (desc->DepthStencilState.DepthEnable) - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } render_pass_key.stencil_enable = desc->DepthStencilState.StencilEnable; - if (desc->DepthStencilState.StencilEnable) - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; - } - else - { - graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[0].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - } - graphics->attachments[0].initialLayout = depth_layout; - graphics->attachments[0].finalLayout = depth_layout; - - graphics->attachment_references[0].attachment = 0; - graphics->attachment_references[0].layout = depth_layout; - ++graphics->rt_idx; - + render_pass_key.depth_stencil_write = (ds_desc->DepthEnable && ds_desc->DepthWriteMask) + || (ds_desc->StencilEnable && ds_desc->StencilWriteMask); render_pass_key.vk_formats[0] = format->vk_format; + ++graphics->rt_idx; if (!desc->PS.pShaderBytecode) { @@ -2258,31 +2206,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ps_output_swizzle[i] = vkd3d_get_rt_format_swizzle(format); - graphics->attachments[idx].flags = 0; - graphics->attachments[idx].format = format->vk_format; - graphics->attachments[idx].samples = sample_count; - graphics->attachments[idx].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - graphics->attachments[idx].storeOp = VK_ATTACHMENT_STORE_OP_STORE; - graphics->attachments[idx].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - graphics->attachments[idx].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - graphics->attachments[idx].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - graphics->attachments[idx].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - - graphics->attachment_references[idx].attachment = idx; - graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - render_pass_key.vk_formats[idx] = format->vk_format; blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; - render_pass_key.attachment_count = graphics->rt_idx + rt_count; - render_pass_key.padding = 0; - render_pass_key.sample_count = sample_count; - for (i = render_pass_key.attachment_count; i < ARRAY_SIZE(render_pass_key.vk_formats); ++i) - render_pass_key.vk_formats[i] = VK_FORMAT_UNDEFINED; - ps_shader_parameters[0].name = VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT; ps_shader_parameters[0].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; ps_shader_parameters[0].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; @@ -2540,6 +2469,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } + render_pass_key.attachment_count = graphics->attachment_count; + render_pass_key.padding = 0; + render_pass_key.sample_count = sample_count; + for (i = render_pass_key.attachment_count; i < ARRAY_SIZE(render_pass_key.vk_formats); ++i) + render_pass_key.vk_formats[i] = VK_FORMAT_UNDEFINED; + if (FAILED(hr = vkd3d_render_pass_cache_find(&device->render_pass_cache, device, &render_pass_key, &graphics->render_pass))) goto fail; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 950be6e56981..be82851a0788 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -660,10 +660,8 @@ struct d3d12_graphics_pipeline_state size_t instance_divisor_count; size_t attribute_count; - VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; - VkAttachmentReference attachment_references[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; VkPipelineColorBlendAttachmentState blend_attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT]; - size_t attachment_count, rt_idx; + unsigned int attachment_count, rt_idx; VkRenderPass render_pass; D3D12_INDEX_BUFFER_STRIP_CUT_VALUE index_buffer_strip_cut_value; -- 2.21.0

2 1

[PATCH vkd3d 4/9] vkd3d: Share Vulkan render pass objects between D3D12 pipeline states.
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> For example, World of Warcraft creates 28 render passes for pipeline state objects instead of 600+ render passes. Other games appears to use similarly low number of render passes, e.g. 8, 17, 26, 60. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 6 +- libs/vkd3d/state.c | 260 +++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 30 ++++- 3 files changed, 254 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5c0c880d9d25..5364df28bbc9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1665,7 +1665,7 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) VkResult vr; int rc; - if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) + if ((rc = pthread_mutex_init(&device->mutex, NULL))) { ERR("Failed to initialize mutex, error %d.\n", rc); return hresult_from_errno(rc); @@ -1693,7 +1693,7 @@ static void d3d12_device_destroy_pipeline_cache(struct d3d12_device *device) if (device->vk_pipeline_cache) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); - pthread_mutex_destroy(&device->pipeline_cache_mutex); + pthread_mutex_destroy(&device->mutex); } D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_allocator *allocator, @@ -1866,6 +1866,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); + vkd3d_render_pass_cache_cleanup(&device->render_pass_cache, device); vkd3d_fence_worker_stop(&device->fence_worker, device); d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); @@ -3030,6 +3031,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if (FAILED(hr = vkd3d_init_null_resources(&device->null_resources, device))) goto out_stop_fence_worker; + vkd3d_render_pass_cache_init(&device->render_pass_cache); vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); if ((device->parent = create_info->parent)) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index edf3399b1aa8..b23101e868a6 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1033,6 +1033,196 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, return S_OK; } +/* vkd3d_render_pass_cache */ +struct vkd3d_render_pass_entry +{ + struct vkd3d_render_pass_key key; + VkRenderPass vk_render_pass; +}; + +STATIC_ASSERT(sizeof(struct vkd3d_render_pass_key) == 48); + +static HRESULT vkd3d_render_pass_cache_create_pass_locked(struct vkd3d_render_pass_cache *cache, + struct d3d12_device *device, const struct vkd3d_render_pass_key *key, VkRenderPass *vk_render_pass) +{ + VkAttachmentReference attachment_references[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + VkAttachmentDescription attachments[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_render_pass_entry *entry; + unsigned int color_attachment_index; + VkSubpassDescription sub_pass_desc; + VkRenderPassCreateInfo pass_info; + bool have_depth_stencil; + unsigned int index; + VkResult vr; + + if (!vkd3d_array_reserve((void **)&cache->render_passes, &cache->render_passes_size, + cache->render_pass_count + 1, sizeof(*cache->render_passes))) + { + *vk_render_pass = VK_NULL_HANDLE; + return E_OUTOFMEMORY; + } + + entry = &cache->render_passes[cache->render_pass_count]; + + entry->key = *key; + + have_depth_stencil = key->depth_enable || key->stencil_enable; + color_attachment_index = have_depth_stencil ? 1 : 0; + + index = 0; + if (have_depth_stencil) + { + VkImageLayout depth_layout = key->depth_stencil_write + ? VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL + : VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + + attachments[index].flags = 0; + attachments[index].format = key->vk_formats[index]; + attachments[index].samples = key->sample_count; + + if (key->depth_enable) + { + attachments[index].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachments[index].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + } + else + { + attachments[index].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + attachments[index].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + } + if (key->stencil_enable) + { + attachments[index].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachments[index].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; + } + else + { + attachments[index].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + attachments[index].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + } + attachments[index].initialLayout = depth_layout; + attachments[index].finalLayout = depth_layout; + + attachment_references[index].attachment = 0; + attachment_references[index].layout = depth_layout; + + ++index; + } + + assert(index == color_attachment_index); + for (; index < key->attachment_count; ++index) + { + + attachments[index].flags = 0; + attachments[index].format = key->vk_formats[index]; + attachments[index].samples = key->sample_count; + attachments[index].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + attachments[index].storeOp = VK_ATTACHMENT_STORE_OP_STORE; + attachments[index].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + attachments[index].stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + attachments[index].initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + attachments[index].finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + + attachment_references[index].attachment = index; + attachment_references[index].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + } + + sub_pass_desc.flags = 0; + sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; + sub_pass_desc.inputAttachmentCount = 0; + sub_pass_desc.pInputAttachments = NULL; + sub_pass_desc.colorAttachmentCount = key->attachment_count - color_attachment_index; + sub_pass_desc.pColorAttachments = &attachment_references[color_attachment_index]; + sub_pass_desc.pResolveAttachments = NULL; + if (have_depth_stencil) + sub_pass_desc.pDepthStencilAttachment = &attachment_references[0]; + else + sub_pass_desc.pDepthStencilAttachment = NULL; + sub_pass_desc.preserveAttachmentCount = 0; + sub_pass_desc.pPreserveAttachments = NULL; + + pass_info.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; + pass_info.pNext = NULL; + pass_info.flags = 0; + pass_info.attachmentCount = key->attachment_count; + pass_info.pAttachments = attachments; + pass_info.subpassCount = 1; + pass_info.pSubpasses = &sub_pass_desc; + pass_info.dependencyCount = 0; + pass_info.pDependencies = NULL; + if ((vr = VK_CALL(vkCreateRenderPass(device->vk_device, &pass_info, NULL, vk_render_pass))) >= 0) + { + entry->vk_render_pass = *vk_render_pass; + ++cache->render_pass_count; + } + else + { + WARN("Failed to create Vulkan render pass, vr %d.\n", vr); + *vk_render_pass = VK_NULL_HANDLE; + } + + return hresult_from_vk_result(vr); +} + +HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, + struct d3d12_device *device, const struct vkd3d_render_pass_key *key, VkRenderPass *vk_render_pass) +{ + bool found = false; + HRESULT hr = S_OK; + unsigned int i; + int rc; + + if ((rc = pthread_mutex_lock(&device->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + *vk_render_pass = VK_NULL_HANDLE; + return hresult_from_errno(rc); + } + + for (i = 0; i < cache->render_pass_count; ++i) + { + struct vkd3d_render_pass_entry *current = &cache->render_passes[i]; + + if (!memcmp(&current->key, key, sizeof(*key))) + { + *vk_render_pass = current->vk_render_pass; + found = true; + break; + } + } + + if (!found) + hr = vkd3d_render_pass_cache_create_pass_locked(cache, device, key, vk_render_pass); + + pthread_mutex_unlock(&device->mutex); + + return hr; +} + +void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache) +{ + cache->render_passes = NULL; + cache->render_pass_count = 0; + cache->render_passes_size = 0; +} + +void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache, + struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + unsigned int i; + + for (i = 0; i < cache->render_pass_count; ++i) + { + struct vkd3d_render_pass_entry *current = &cache->render_passes[i]; + VK_CALL(vkDestroyRenderPass(device->vk_device, current->vk_render_pass, NULL)); + } + + vkd3d_free(cache->render_passes); + cache->render_passes = NULL; +} + struct vkd3d_pipeline_key { D3D12_PRIMITIVE_TOPOLOGY topology; @@ -1096,7 +1286,6 @@ static void d3d12_pipeline_state_destroy_graphics(struct d3d12_pipeline_state *s { VK_CALL(vkDestroyShaderModule(device->vk_device, graphics->stages[i].module, NULL)); } - VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); LIST_FOR_EACH_ENTRY_SAFE(current, e, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry) { @@ -1883,17 +2072,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; + struct vkd3d_render_pass_key render_pass_key; VkShaderStageFlagBits xfb_stage = 0; VkSampleCountFlagBits sample_count; - VkSubpassDescription sub_pass_desc; const struct vkd3d_format *format; - VkRenderPassCreateInfo pass_desc; unsigned int instance_divisor; VkVertexInputRate input_rate; unsigned int i, j; size_t rt_count; uint32_t mask; - VkResult vr; HRESULT hr; int ret; @@ -1983,13 +2170,20 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s if ((ds_desc->DepthEnable && ds_desc->DepthWriteMask) || (ds_desc->StencilEnable && ds_desc->StencilWriteMask)) + { depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + render_pass_key.depth_stencil_write = true; + } else + { depth_layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; + render_pass_key.depth_stencil_write = false; + } graphics->attachments[0].flags = 0; graphics->attachments[0].format = format->vk_format; graphics->attachments[0].samples = sample_count; + render_pass_key.depth_enable = desc->DepthStencilState.DepthEnable; if (desc->DepthStencilState.DepthEnable) { graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; @@ -2000,6 +2194,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachments[0].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; graphics->attachments[0].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; } + render_pass_key.stencil_enable = desc->DepthStencilState.StencilEnable; if (desc->DepthStencilState.StencilEnable) { graphics->attachments[0].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; @@ -2017,6 +2212,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[0].layout = depth_layout; ++graphics->rt_idx; + render_pass_key.vk_formats[0] = format->vk_format; + if (!desc->PS.pShaderBytecode) { if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], @@ -2026,6 +2223,12 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ++graphics->stage_count; } } + else + { + render_pass_key.depth_enable = false; + render_pass_key.stencil_enable = false; + render_pass_key.depth_stencil_write = false; + } for (i = 0; i < rt_count; ++i) { @@ -2068,10 +2271,18 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attachment_references[idx].attachment = idx; graphics->attachment_references[idx].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + render_pass_key.vk_formats[idx] = format->vk_format; + blend_attachment_from_d3d12(&graphics->blend_attachments[i], rt_desc); } graphics->attachment_count = graphics->rt_idx + rt_count; + render_pass_key.attachment_count = graphics->rt_idx + rt_count; + render_pass_key.padding = 0; + render_pass_key.sample_count = sample_count; + for (i = render_pass_key.attachment_count; i < ARRAY_SIZE(render_pass_key.vk_formats); ++i) + render_pass_key.vk_formats[i] = VK_FORMAT_UNDEFINED; + ps_shader_parameters[0].name = VKD3D_SHADER_PARAMETER_NAME_RASTERIZER_SAMPLE_COUNT; ps_shader_parameters[0].type = VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT; ps_shader_parameters[0].data_type = VKD3D_SHADER_PARAMETER_DATA_TYPE_UINT32; @@ -2329,35 +2540,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - sub_pass_desc.flags = 0; - sub_pass_desc.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; - sub_pass_desc.inputAttachmentCount = 0; - sub_pass_desc.pInputAttachments = NULL; - sub_pass_desc.colorAttachmentCount = rt_count; - sub_pass_desc.pColorAttachments = &graphics->attachment_references[graphics->rt_idx]; - sub_pass_desc.pResolveAttachments = NULL; - if (graphics->rt_idx) - sub_pass_desc.pDepthStencilAttachment = &graphics->attachment_references[0]; - else - sub_pass_desc.pDepthStencilAttachment = NULL; - sub_pass_desc.preserveAttachmentCount = 0; - sub_pass_desc.pPreserveAttachments = NULL; - - pass_desc.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO; - pass_desc.pNext = NULL; - pass_desc.flags = 0; - pass_desc.attachmentCount = graphics->attachment_count; - pass_desc.pAttachments = graphics->attachments; - pass_desc.subpassCount = 1; - pass_desc.pSubpasses = &sub_pass_desc; - pass_desc.dependencyCount = 0; - pass_desc.pDependencies = NULL; - if ((vr = VK_CALL(vkCreateRenderPass(device->vk_device, &pass_desc, NULL, &graphics->render_pass))) < 0) - { - WARN("Failed to create Vulkan render pass, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); + if (FAILED(hr = vkd3d_render_pass_cache_find(&device->render_pass_cache, device, + &render_pass_key, &graphics->render_pass))) goto fail; - } rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); if ((!graphics->attachment_count && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) @@ -2392,10 +2577,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s list_init(&graphics->compiled_pipelines); if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) - { - VK_CALL(vkDestroyRenderPass(device->vk_device, graphics->render_pass, NULL)); goto fail; - } state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; @@ -2497,7 +2679,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12 struct vkd3d_compiled_pipeline *current; int rc; - if (!(rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + if (!(rc = pthread_mutex_lock(&device->mutex))) { LIST_FOR_EACH_ENTRY(current, &graphics->compiled_pipelines, struct vkd3d_compiled_pipeline, entry) { @@ -2507,7 +2689,7 @@ static VkPipeline d3d12_pipeline_state_find_compiled_pipeline(const struct d3d12 break; } } - pthread_mutex_unlock(&device->pipeline_cache_mutex); + pthread_mutex_unlock(&device->mutex); } else { @@ -2531,7 +2713,7 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta compiled_pipeline->key = *key; compiled_pipeline->vk_pipeline = vk_pipeline; - if ((rc = pthread_mutex_lock(&device->pipeline_cache_mutex))) + if ((rc = pthread_mutex_lock(&device->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); vkd3d_free(compiled_pipeline); @@ -2551,7 +2733,7 @@ static bool d3d12_pipeline_state_put_pipeline_to_cache(struct d3d12_pipeline_sta if (compiled_pipeline) list_add_tail(&graphics->compiled_pipelines, &compiled_pipeline->entry); - pthread_mutex_unlock(&device->pipeline_cache_mutex); + pthread_mutex_unlock(&device->mutex); return compiled_pipeline; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ba586b44aab2..950be6e56981 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -184,6 +184,33 @@ void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocato void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address) DECLSPEC_HIDDEN; +struct vkd3d_render_pass_key +{ + unsigned int attachment_count; + bool depth_enable; + bool stencil_enable; + bool depth_stencil_write; + bool padding; + unsigned int sample_count; + VkFormat vk_formats[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; +}; + +struct vkd3d_render_pass_entry; + +struct vkd3d_render_pass_cache +{ + struct vkd3d_render_pass_entry *render_passes; + size_t render_pass_count; + size_t render_passes_size; +}; + +void vkd3d_render_pass_cache_cleanup(struct vkd3d_render_pass_cache *cache, + struct d3d12_device *device) DECLSPEC_HIDDEN; +HRESULT vkd3d_render_pass_cache_find(struct vkd3d_render_pass_cache *cache, + struct d3d12_device *device, const struct vkd3d_render_pass_key *key, + VkRenderPass *vk_render_pass) DECLSPEC_HIDDEN; +void vkd3d_render_pass_cache_init(struct vkd3d_render_pass_cache *cache) DECLSPEC_HIDDEN; + struct vkd3d_private_store { pthread_mutex_t mutex; @@ -925,7 +952,8 @@ struct d3d12_device struct vkd3d_gpu_va_allocator gpu_va_allocator; struct vkd3d_fence_worker fence_worker; - pthread_mutex_t pipeline_cache_mutex; + pthread_mutex_t mutex; + struct vkd3d_render_pass_cache render_pass_cache; VkPipelineCache vk_pipeline_cache; VkPhysicalDeviceMemoryProperties memory_properties; -- 2.21.0

2 1

[PATCH vkd3d 3/9] vkd3d-shader: Improve ID assignment for specialization constants.
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Allows using 0 as SpecId. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 22e02f9ffa01..86d5be89b039 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2565,20 +2565,20 @@ static const struct vkd3d_spec_constant_info *get_spec_constant_info(enum vkd3d_ static uint32_t vkd3d_dxbc_compiler_alloc_spec_constant_id(struct vkd3d_dxbc_compiler *compiler) { - if (!compiler->current_spec_constant_id && compiler->compile_args) + if (!compiler->current_spec_constant_id) { const struct vkd3d_shader_compile_arguments *compile_args = compiler->compile_args; - unsigned int i, id; + unsigned int i, id = 0; - for (i = 0, id = 0; i < compile_args->parameter_count; ++i) + for (i = 0; compiler->compile_args && i < compile_args->parameter_count; ++i) { const struct vkd3d_shader_parameter *current = &compile_args->parameters[i]; if (current->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - id = max(current->u.specialization_constant.id, id); + id = max(current->u.specialization_constant.id + 1, id); } - compiler->current_spec_constant_id = id + 1; + compiler->current_spec_constant_id = id; } return compiler->current_spec_constant_id++; @@ -2623,9 +2623,6 @@ static uint32_t vkd3d_dxbc_compiler_get_spec_constant(struct vkd3d_dxbc_compiler return compiler->spec_constants[i].id; } - if (!spec_id) - spec_id = vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler); - return vkd3d_dxbc_compiler_emit_spec_constant(compiler, name, spec_id); } @@ -2633,7 +2630,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc enum vkd3d_shader_parameter_name name) { const struct vkd3d_shader_parameter *parameter; - uint32_t spec_constant_id = 0; if (!(parameter = vkd3d_dxbc_compiler_get_shader_parameter(compiler, name))) { @@ -2643,14 +2639,14 @@ static uint32_t vkd3d_dxbc_compiler_emit_uint_shader_parameter(struct vkd3d_dxbc if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_IMMEDIATE_CONSTANT) return vkd3d_dxbc_compiler_get_constant_uint(compiler, parameter->u.immediate_constant.u.u32); - if (parameter->type == VKD3D_SHADER_PARAMETER_TYPE_SPECIALIZATION_CONSTANT) - spec_constant_id = parameter->u.specialization_constant.id; - else - FIXME("Unhandled parameter type %#x.\n", parameter->type); + return vkd3d_dxbc_compiler_get_spec_constant(compiler, name, parameter->u.specialization_constant.id); + + FIXME("Unhandled parameter type %#x.\n", parameter->type); default_parameter: - return vkd3d_dxbc_compiler_get_spec_constant(compiler, name, spec_constant_id); + return vkd3d_dxbc_compiler_get_spec_constant(compiler, + name, vkd3d_dxbc_compiler_alloc_spec_constant_id(compiler)); } static uint32_t vkd3d_dxbc_compiler_emit_construct_vector(struct vkd3d_dxbc_compiler *compiler, -- 2.21.0

2 1

[PATCH vkd3d 2/9] tests: Add test for sample positions.
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f2e6b1da365..dd13ddf999b9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27607,6 +27607,135 @@ static void test_shader_get_render_target_sample_count(void) destroy_test_context(&context); } +static void test_shader_sample_position(void) +{ + D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; + ID3D12Resource *texture, *readback_texture; + ID3D12GraphicsCommandList *command_list; + D3D12_HEAP_PROPERTIES heap_properties; + D3D12_RESOURCE_DESC resource_desc; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + uint32_t sample_index; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + uint index; + Texture2DMS<float4> t; + + float4 main() : SV_Target + { + return float4(t.GetSamplePosition(index), 0, 0); + } +#endif + 0x43425844, 0x89611945, 0x2b7e06f0, 0x953a72bb, 0x1590618f, 0x00000001, 0x000000f8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000080, 0x00000050, 0x00000020, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04002058, 0x00107000, 0x00000000, + 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x0900006e, 0x00102032, 0x00000000, 0x00107046, + 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT; + desc.rt_width = desc.rt_height = 1; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 1, 0); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + memset(&heap_properties, 0, sizeof(heap_properties)); + heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; + resource_desc = ID3D12Resource_GetDesc(context.render_target); + resource_desc.SampleDesc.Count = 4; + hr = ID3D12Device_CreateCommittedResource(context.device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 16); + readback_texture = create_default_texture(context.device, 4, 1, DXGI_FORMAT_R32G32B32A32_FLOAT, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + ID3D12Device_CreateShaderResourceView(context.device, texture, NULL, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap)); + + transition_resource_state(command_list, + texture, D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + for (sample_index = 0; sample_index < resource_desc.SampleDesc.Count; ++sample_index) + { + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 1, &sample_index, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + src_location.pResource = context.render_target; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + dst_location.pResource = readback_texture; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + dst_location.SubresourceIndex = 0; + set_box(&box, 0, 0, 0, 1, 1, 1); + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, sample_index, 0, 0, &src_location, &box); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + transition_resource_state(command_list, readback_texture, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(readback_texture, 0, &rb, queue, command_list); + for (i = 0; i < resource_desc.SampleDesc.Count; ++i) + { + const struct vec4 *position = get_readback_vec4(&rb, i, 0); + + vkd3d_test_set_context("Sample %u", i); + + ok(-1.0f <= position->x && position->x <= 1.0f, "Unexpected x %.8e.\n", position->x); + ok(-1.0f <= position->y && position->y <= 1.0f, "Unexpected y %.8e.\n", position->y); + ok(!position->z, "Unexpected z %.8e.\n", position->z); + ok(!position->w, "Unexpected w %.8e.\n", position->w); + + if (vkd3d_test_state.debug_level > 0) + trace("Sample %u position {%.8e, %.8e}.\n", i, position->x, position->y); + + vkd3d_test_set_context(NULL); + } + release_resource_readback(&rb); + + ID3D12DescriptorHeap_Release(heap); + ID3D12Resource_Release(texture); + ID3D12Resource_Release(readback_texture); + destroy_test_context(&context); +} + static void test_shader_eval_attribute(void) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; @@ -28623,6 +28752,7 @@ START_TEST(d3d12) run_test(test_sample_mask); run_test(test_coverage); run_test(test_shader_get_render_target_sample_count); + run_test(test_shader_sample_position); run_test(test_shader_eval_attribute); run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output); -- 2.21.0

2 1

[PATCH vkd3d 1/9] vkd3d-shader: Translate samplepos instructions.
by Józef Kucia 29 Apr '19

29 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> This returns standard sample locations. DXC and glslang do the same thing. https://github.com/khronosgroup/glslang/commit/d4d0b29752c173d2aa8d2d105f2f… In the long term, we could also add a shader parameter to pass sample positions to the shader compiler. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 171 ++++++++++++++++++++++++++++++++++---- 1 file changed, 154 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6332ef50394b..22e02f9ffa01 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1129,6 +1129,12 @@ static uint32_t vkd3d_spirv_build_op_in_bounds_access_chain(struct vkd3d_spirv_b SpvOpInBoundsAccessChain, result_type, base_id, indexes, index_count); } +static uint32_t vkd3d_spirv_build_op_in_bounds_access_chain1(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t base_id, uint32_t index) +{ + return vkd3d_spirv_build_op_in_bounds_access_chain(builder, result_type, base_id, &index, 1); +} + static uint32_t vkd3d_spirv_build_op_vector_shuffle(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t vector1_id, uint32_t vector2_id, const uint32_t *components, uint32_t component_count) @@ -1340,6 +1346,27 @@ static uint32_t vkd3d_spirv_build_op_shift_right_logical(struct vkd3d_spirv_buil SpvOpShiftRightLogical, result_type, base, shift); } +static uint32_t vkd3d_spirv_build_op_logical_and(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand0, uint32_t operand1) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpLogicalAnd, result_type, operand0, operand1); +} + +static uint32_t vkd3d_spirv_build_op_uless_than(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand0, uint32_t operand1) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpULessThan, result_type, operand0, operand1); +} + +static uint32_t vkd3d_spirv_build_op_uless_than_equal(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand0, uint32_t operand1) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpULessThanEqual, result_type, operand0, operand1); +} + static uint32_t vkd3d_spirv_build_op_convert_utof(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t unsigned_value) { @@ -1989,6 +2016,7 @@ struct vkd3d_dxbc_compiler uint32_t temp_id; unsigned int temp_count; struct vkd3d_hull_shader_variables hs; + uint32_t sample_positions_id; enum vkd3d_shader_type shader_type; @@ -2917,7 +2945,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler const struct vkd3d_shader_register_info *reg_info) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, indexes[1], reg_id, val_id; + uint32_t type_id, ptr_type_id, index, reg_id, val_id; unsigned int component_idx, reg_component_count; enum vkd3d_component_type component_type; unsigned int skipped_component_mask; @@ -2945,9 +2973,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_scalar(struct vkd3d_dxbc_compiler if (reg_component_count != 1) { ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info->storage_class, type_id); - indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - reg_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, reg_id, indexes, ARRAY_SIZE(indexes)); + index = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); + reg_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, reg_id, index); } val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_id, SpvMemoryAccessMaskNone); @@ -3104,7 +3131,7 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co SpvStorageClass storage_class, unsigned int write_mask, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, index[1]; + uint32_t type_id, ptr_type_id, index; unsigned int component_idx; if (vkd3d_write_mask_component_count(dst_write_mask) > 1) @@ -3113,8 +3140,8 @@ static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *co ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); component_idx = vkd3d_write_mask_get_component_idx(write_mask); component_idx -= vkd3d_write_mask_get_component_idx(dst_write_mask); - index[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); - dst_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, ptr_type_id, dst_id, index, ARRAY_SIZE(index)); + index = vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, dst_id, index); } vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); @@ -3870,8 +3897,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); index = vkd3d_dxbc_compiler_get_constant_uint(compiler, i); - val_id = vkd3d_spirv_build_op_in_bounds_access_chain(builder, - ptr_type_id, input_id, &index, 1); + val_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, input_id, index); dst_reg.idx[0].offset = i; } val_id = vkd3d_spirv_build_op_load(builder, type_id, val_id, SpvMemoryAccessMaskNone); @@ -7704,15 +7730,12 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } -static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_instruction *instruction) +static uint32_t vkd3d_dxbc_compiler_emit_query_sample_count(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_src_param *src) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_shader_dst_param *dst = instruction->dst; - const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t constituents[VKD3D_VEC4_SIZE]; + struct vkd3d_shader_image image; uint32_t type_id, val_id; - unsigned int i; if (src->reg.type == VKD3DSPR_RASTERIZER) { @@ -7721,8 +7744,6 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com } else { - struct vkd3d_shader_image image; - vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src->reg, NULL, VKD3D_IMAGE_FLAG_NONE); @@ -7730,6 +7751,21 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com val_id = vkd3d_spirv_build_op_image_query_samples(builder, type_id, image.image_id); } + return val_id; +} + +static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t constituents[VKD3D_VEC4_SIZE]; + uint32_t type_id, val_id; + unsigned int i; + + val_id = vkd3d_dxbc_compiler_emit_query_sample_count(compiler, src); + constituents[0] = val_id; for (i = 1; i < VKD3D_VEC4_SIZE; ++i) constituents[i] = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); @@ -7754,6 +7790,104 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } +/* XXX: This is correct only when standard sample positions are used. */ +static void vkd3d_dxbc_compiler_emit_sample_position(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + /* Standard sample locations from the Vulkan spec. */ + static const float standard_sample_positions[][2] = + { + /* 1 sample */ + { 0.0 / 16.0, 0.0 / 16.0}, + /* 2 samples */ + { 4.0 / 16.0, 4.0 / 16.0}, + {-4.0 / 16.0, -4.0 / 16.0}, + /* 4 samples */ + {-2.0 / 16.0, -6.0 / 16.0}, + { 6.0 / 16.0, -2.0 / 16.0}, + {-6.0 / 16.0, 2.0 / 16.0}, + { 2.0 / 16.0, 6.0 / 16.0}, + /* 8 samples */ + { 1.0 / 16.0, -3.0 / 16.0}, + {-1.0 / 16.0, 3.0 / 16.0}, + { 5.0 / 16.0, 1.0 / 16.0}, + {-3.0 / 16.0, -5.0 / 16.0}, + {-5.0 / 16.0, 5.0 / 16.0}, + {-7.0 / 16.0, -1.0 / 16.0}, + { 3.0 / 16.0, 7.0 / 16.0}, + { 7.0 / 16.0, -7.0 / 16.0}, + /* 16 samples */ + { 1.0 / 16.0, 1.0 / 16.0}, + {-1.0 / 16.0, -3.0 / 16.0}, + {-3.0 / 16.0, 2.0 / 16.0}, + { 4.0 / 16.0, -1.0 / 16.0}, + {-5.0 / 16.0, -2.0 / 16.0}, + { 2.0 / 16.0, 5.0 / 16.0}, + { 5.0 / 16.0, 3.0 / 16.0}, + { 3.0 / 16.0, -5.0 / 16.0}, + {-2.0 / 16.0, 6.0 / 16.0}, + { 0.0 / 16.0, -7.0 / 16.0}, + {-4.0 / 16.0, -6.0 / 16.0}, + {-6.0 / 16.0, 4.0 / 16.0}, + {-8.0 / 16.0, 0.0 / 16.0}, + { 7.0 / 16.0, -4.0 / 16.0}, + { 6.0 / 16.0, 7.0 / 16.0}, + {-7.0 / 16.0, -8.0 / 16.0}, + }; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t constituents[ARRAY_SIZE(standard_sample_positions)]; + const struct vkd3d_shader_dst_param *dst = instruction->dst; + uint32_t array_type_id, length_id, index_id, id; + uint32_t sample_count_id, sample_index_id; + uint32_t type_id, bool_id, ptr_type_id; + unsigned int i; + + sample_count_id = vkd3d_dxbc_compiler_emit_query_sample_count(compiler, &instruction->src[0]); + sample_index_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &instruction->src[1], VKD3DSP_WRITEMASK_0); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + index_id = vkd3d_spirv_build_op_iadd(builder, type_id, sample_count_id, sample_index_id); + index_id = vkd3d_spirv_build_op_isub(builder, + type_id, index_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 1)); + + /* Validate sample index. */ + bool_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_BOOL, 1); + id = vkd3d_spirv_build_op_logical_and(builder, bool_id, + vkd3d_spirv_build_op_uless_than(builder, bool_id, sample_index_id, sample_count_id), + vkd3d_spirv_build_op_uless_than_equal(builder, + bool_id, sample_index_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 16))); + index_id = vkd3d_spirv_build_op_select(builder, type_id, + id, index_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, 0)); + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 2); + if (!(id = compiler->sample_positions_id)) + { + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, ARRAY_SIZE(standard_sample_positions)); + array_type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + + for (i = 0; i < ARRAY_SIZE(standard_sample_positions); ++ i) + { + constituents[i] = vkd3d_dxbc_compiler_get_constant(compiler, + VKD3D_TYPE_FLOAT, 2, (const uint32_t *)standard_sample_positions[i]); + } + + id = vkd3d_spirv_build_op_constant_composite(builder, array_type_id, constituents, ARRAY_SIZE(constituents)); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, array_type_id); + id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, ptr_type_id, SpvStorageClassPrivate, id); + vkd3d_spirv_build_op_name(builder, id, "sample_pos"); + compiler->sample_positions_id = id; + } + + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); + id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, ptr_type_id, id, index_id); + id = vkd3d_spirv_build_op_load(builder, type_id, id, SpvMemoryAccessMaskNone); + + id = vkd3d_dxbc_compiler_emit_swizzle(compiler, + id, VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_1, VKD3D_TYPE_FLOAT, + instruction->src[0].swizzle, dst->write_mask); + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, id); +} + static void vkd3d_dxbc_compiler_emit_eval_attrib(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -8208,6 +8342,9 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_SAMPLE_INFO: vkd3d_dxbc_compiler_emit_sample_info(compiler, instruction); break; + case VKD3DSIH_SAMPLE_POS: + vkd3d_dxbc_compiler_emit_sample_position(compiler, instruction); + break; case VKD3DSIH_EVAL_CENTROID: case VKD3DSIH_EVAL_SAMPLE_INDEX: vkd3d_dxbc_compiler_emit_eval_attrib(compiler, instruction); -- 2.21.0

2 1

[PATCH v3 1/3] wrc: Support Asturian
by Alex Henrie 29 Apr '19

29 Apr '19

From: Enol Puente <enolp(a)softastur.org> Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- include/winnt.rh | 1 + tools/wmc/po.c | 2 ++ tools/wrc/po.c | 2 ++ tools/wrc/utils.c | 1 + 4 files changed, 6 insertions(+) diff --git a/include/winnt.rh b/include/winnt.rh index 50aafb1d96..59791bc996 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -185,6 +185,7 @@ #define LANG_VENDA 0x33 /* non standard; keep the number high enough (but < 0xff) */ +#define LANG_ASTURIAN 0xa5 #define LANG_ESPERANTO 0x8f #define LANG_WALON 0x90 #define LANG_CORNISH 0x92 diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 8a8064a25f..bf10c50c63 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -82,6 +82,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ@latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ@cyrillic" }, diff --git a/tools/wrc/po.c b/tools/wrc/po.c index 913a918a69..3f5affd49f 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -239,6 +239,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ@latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ@cyrillic" }, diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 5533a531f1..a1e07b85b2 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -457,6 +457,7 @@ static const struct lang2cp lang2cps[] = { LANG_ARABIC, SUBLANG_NEUTRAL, 1256 }, { LANG_ARMENIAN, SUBLANG_NEUTRAL, 0 }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, 0 }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, 1252 }, { LANG_AZERI, SUBLANG_NEUTRAL, 1254 }, { LANG_AZERI, SUBLANG_AZERI_CYRILLIC, 1251 }, { LANG_BASHKIR, SUBLANG_NEUTRAL, 1251 }, -- 2.21.0

3 6

[PATCH] wintrust: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 29 Apr '19

29 Apr '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 914f04d7c0..2a4f4f4b25 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1211,7 +1211,7 @@ static void test_wintrust_digest(void) BOOL ret; int i, j; - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { file = create_temp_file(pathW); ok(file != INVALID_HANDLE_VALUE, "failed to create temporary file\n"); -- 2.20.1

1 0

[PATCH] mscoree: Remove a redundant NULL check before heap_free()
by Michael Stefaniuc 29 Apr '19

29 Apr '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 95f6a9a892..13619bdc19 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1707,8 +1707,7 @@ static BOOL try_create_registration_free_com(REFIID clsid, WCHAR *classname, UIN ret = TRUE; end: - if (assembly_info) - heap_free(assembly_info); + heap_free(assembly_info); if (guid_info.hActCtx) ReleaseActCtx(guid_info.hActCtx); -- 2.20.1

1 0

[PATCH] ntdll/tests: Avoid the comma operator
by Michael Stefaniuc 29 Apr '19

29 Apr '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/exception.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4f75cc2454..ada28c91eb 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3274,7 +3274,7 @@ static void test_suspend_process(void) startup.cb = sizeof(startup); sprintf(path_name, "%s exception suspend_process", argv[0]); - ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info); ok(ret, "Failed to create target process.\n"); /* New process signals this event. */ -- 2.20.1

1 0

[PATCH] d3dcompiler: Implement D3DReadFileToBlob().
by Jactry Zeng 29 Apr '19

29 Apr '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/d3dcompiler_43/blob.c | 54 +++++++++++++++- dlls/d3dcompiler_43/tests/blob.c | 106 +++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index f22dc7183d..6b1b20317f 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -466,9 +466,59 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID HRESULT WINAPI D3DReadFileToBlob(const WCHAR *filename, ID3DBlob **contents) { - FIXME("filename %s, contents %p\n", debugstr_w(filename), contents); + struct d3dcompiler_blob *object; + HANDLE file; + SIZE_T data_size; + DWORD read_size; + HRESULT hr; - return E_NOTIMPL; + TRACE("filename %s, contents %p\n", debugstr_w(filename), contents); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + data_size = GetFileSize(file, NULL); + if (data_size == INVALID_FILE_SIZE) + { + CloseHandle(file); + return HRESULT_FROM_WIN32(GetLastError()); + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + CloseHandle(file); + return E_OUTOFMEMORY; + } + + hr = d3dcompiler_blob_init(object, data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize blob, hr %#x.\n", hr); + CloseHandle(file); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + if (!ReadFile(file, object->data, data_size, &read_size, NULL) || + (read_size != data_size)) + { + WARN("Failed to read file contents.\n"); + CloseHandle(file); + HeapFree(GetProcessHeap(), 0, object->data); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + CloseHandle(file); + object->size = read_size; + + *contents = &object->ID3DBlob_iface; + + TRACE("Returning ID3DBlob %p.\n", *contents); + + return S_OK; } HRESULT WINAPI D3DWriteBlobToFile(ID3DBlob* blob, const WCHAR *filename, BOOL overwrite) diff --git a/dlls/d3dcompiler_43/tests/blob.c b/dlls/d3dcompiler_43/tests/blob.c index 443ed2754c..6a9fa5de8b 100644 --- a/dlls/d3dcompiler_43/tests/blob.c +++ b/dlls/d3dcompiler_43/tests/blob.c @@ -35,6 +35,7 @@ static HRESULT (WINAPI *pD3DCreateBlob)(SIZE_T, ID3DBlob **); static HRESULT (WINAPI *pD3DGetBlobPart)(const void *, SIZE_T, D3D_BLOB_PART, UINT, ID3DBlob **); +static HRESULT (WINAPI *pD3DReadFileToBlob)(const WCHAR *, ID3DBlob **); static HRESULT (WINAPI *pD3DStripShader)(const void *, SIZE_T, UINT, ID3DBlob **); #define MAKE_TAG(ch0, ch1, ch2, ch3) \ @@ -752,6 +753,103 @@ static BOOL load_d3dcompiler(void) return TRUE; } +static BOOL load_d3dcompiler_47(void) +{ + HMODULE module; + + if (!(module = LoadLibraryA("d3dcompiler_47.dll"))) return FALSE; + + pD3DReadFileToBlob = (void*)GetProcAddress(module, "D3DReadFileToBlob"); + return TRUE; +} + +static void create_cso_file(LPCWSTR pathW, void *data, DWORD data_size) +{ + HANDLE file; + DWORD written; + + file = CreateFileW(pathW, GENERIC_READ | GENERIC_WRITE, 0, + NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "File creation failed, at %s, error 0x%08x.\n", + wine_dbgstr_w(pathW), GetLastError()); + + if (data) + { + WriteFile(file, data, data_size, &written, NULL); + ok(written == data_size, "Couldn't write .cso file.\n" ); + } + CloseHandle(file); +} + +/* .cso file compiled by fxc.exe. + HLSL source: + ``` + struct PSInput + { + float4 value : SV_POSITION; + }; + + PSInput main(float4 position : POSITION) + { + PSInput result; + result.value = position; + return result; + } + ``` + */ +static byte test_cso_data[] = +{ + 0x00,0x02,0xfe,0xff,0xfe,0xff,0x14,0x00,0x43,0x54,0x41,0x42,0x1c,0x00,0x00,0x00,0x23,0x00, + 0x00,0x00,0x00,0x02,0xfe,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, + 0x1c,0x00,0x00,0x00,0x76,0x73,0x5f,0x32,0x5f,0x30,0x00,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f, + 0x66,0x74,0x20,0x28,0x52,0x29,0x20,0x48,0x4c,0x53,0x4c,0x20,0x53,0x68,0x61,0x64,0x65,0x72, + 0x20,0x43,0x6f,0x6d,0x70,0x69,0x6c,0x65,0x72,0x20,0x31,0x30,0x2e,0x31,0x00,0xab,0x1f,0x00, + 0x00,0x02,0x00,0x00,0x00,0x80,0x00,0x00,0x0f,0x90,0x01,0x00,0x00,0x02,0x00,0x00,0x0f,0xc0, + 0x00,0x00,0xe4,0x90,0xff,0xff,0x00,0x00 +}; + +static void test_D3DReadFileToBlob(void) +{ + ID3DBlob *blob = NULL; + HRESULT hr; + static const WCHAR filenameW[] = {'t','e','s','t','.','c','s','o',0}; + byte *data_enter; + SIZE_T data_size; + + hr = pD3DReadFileToBlob(filenameW, NULL); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "D3DReadFileToBlob returned: 0x%08x.\n", hr); + + hr = pD3DReadFileToBlob(filenameW, &blob); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), + "D3DReadFileToBlob returned: 0x%08x.\n", hr); + + /* Crash on Windows + create_cso_file(filenameW, test_cso_data, sizeof(test_cso_data)); + pD3DReadFileToBlob(filenameW, NULL); + DeleteFileW(filenameW); + */ + + create_cso_file(filenameW, NULL, 0); + hr = pD3DReadFileToBlob(filenameW, &blob); + ok(hr == S_OK, "D3DReadFileToBlob failed: 0x%08x.\n", hr); + data_size = ID3D10Blob_GetBufferSize(blob); + ok(data_size == 0, "got wrong data size: %lu, expected %u.\n", data_size, 0); + DeleteFileW(filenameW); + ID3D10Blob_Release(blob); + + create_cso_file(filenameW, test_cso_data, sizeof(test_cso_data)); + hr = pD3DReadFileToBlob(filenameW, &blob); + ok(hr == S_OK, "D3DReadFileToBlob failed: 0x%08x.\n", hr); + data_size = ID3D10Blob_GetBufferSize(blob); + ok(data_size == sizeof(test_cso_data), "got wrong data size: %lu, expected %u.\n", + data_size, sizeof(test_cso_data)); + data_enter = ID3D10Blob_GetBufferPointer(blob); + ok(!memcmp(data_enter, test_cso_data, sizeof(test_cso_data)), "got wrong data.\n"); + DeleteFileW(filenameW); + ID3D10Blob_Release(blob); +} + START_TEST(blob) { if (!load_d3dcompiler()) @@ -763,4 +861,12 @@ START_TEST(blob) test_create_blob(); test_get_blob_part(); test_get_blob_part2(); + + if (!load_d3dcompiler_47()) + { + win_skip("Could not load d3dcompiler_47.dll\n"); + return; + } + + test_D3DReadFileToBlob(); } -- 2.20.1

2 1

[PATCH] user32: Add DECLSPEC_HOTPATCH to UnRegisterDeviceNotification Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47098
by Louis Lenders 29 Apr '19

29 Apr '19

Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/user32/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bd4795a346..6ff0980ecd 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -404,7 +404,7 @@ HDEVNOTIFY WINAPI DECLSPEC_HOTPATCH RegisterDeviceNotificationW(HANDLE hRecipien * UnregisterDeviceNotification (USER32.@) * */ -BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY hnd) +BOOL WINAPI DECLSPEC_HOTPATCH UnregisterDeviceNotification(HDEVNOTIFY hnd) { FIXME("(handle=%p), STUB!\n", hnd); return TRUE; -- 2.20.1

2 1

[PATCH] user32: Add DECLSPEC_HOTPATCH to RegisterDeviceNotification{A, W} Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47097
by Louis Lenders 29 Apr '19

29 Apr '19

Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/user32/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index d28cd9fd05..bd4795a346 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -363,7 +363,7 @@ DWORD WINAPI RegisterTasklist (DWORD x) * * See RegisterDeviceNotificationW. */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) +HDEVNOTIFY WINAPI DECLSPEC_HOTPATCH RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags) { FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", hnd,notifyfilter,flags ); @@ -393,7 +393,7 @@ HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, D *| DEVICE_NOTIFY_WINDOW_HANDLE - hRecipient is a window handle *| DEVICE_NOTIFY_SERVICE_HANDLE - hRecipient is a service status handle */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationW(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) +HDEVNOTIFY WINAPI DECLSPEC_HOTPATCH RegisterDeviceNotificationW(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) { FIXME("(hwnd=%p, filter=%p,flags=0x%08x) returns a fake device notification handle!\n", hRecipient,pNotificationFilter,dwFlags ); -- 2.20.1

1 0

[PATCH 1/3] jscript: implement Enumerator()
by Andreas Maier 29 Apr '19

29 Apr '19

Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/enumerator.c | 292 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 280 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index aa7737ac52..9d47b70d42 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -17,6 +17,7 @@ */ #include <assert.h> +#include <sal.h> #include "jscript.h" @@ -24,8 +25,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +#define DATATYPE_NULL 0 +#define DATATYPE_ARRAY 1 +#define DATATYPE_ENUMVARIANT 2 + typedef struct { jsdisp_t dispex; + int datatype; + BOOL atend; + /* constructor with jsarray e.g. ["A","B"] */ + jsdisp_t *array; + /* current index of jsarray */ + int arrayidx; + int arraylen; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* IEnumVARIANT current item */ + VARIANT* enumitm; } EnumeratorInstance; static const WCHAR atEndW[] = {'a','t','E','n','d',0}; @@ -33,43 +49,197 @@ static const WCHAR itemW[] = {'i','t','e','m',0}; static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline HRESULT enumary_get_item( + _In_ EnumeratorInstance *This, + _Out_ jsval_t *r) +{ + HRESULT hres; + + if (!r) + return S_OK; + + if (This->atend) + { + *r = jsval_undefined(); + return S_OK; + } + + hres = jsdisp_get_idx(This->array, This->arrayidx, r); + if (FAILED(hres)) + *r = jsval_undefined(); + + return S_OK; +} + +static inline HRESULT enumvar_get_next_item( + _In_ IEnumVARIANT* enumvar, + _Inout_ VARIANT* enumitm, + _Inout_ BOOL* atend, + _Out_opt_ jsval_t *r) +{ + HRESULT hres; + + /* not at end ... get next item */ + if (!(*atend)) + { + /* Assume valid variant */ + VariantClear(enumitm); + hres = IEnumVARIANT_Next(enumvar, 1, enumitm, NULL); + if (hres != S_OK) + { + VariantClear(enumitm); + *atend = TRUE; + } + } + + if (*atend) + { + if (r) + *r = jsval_undefined(); + return S_OK; + } + + if (r) + return variant_to_jsval(enumitm, r); + + return S_OK; +} + static void Enumerator_destructor(jsdisp_t *dispex) { + EnumeratorInstance *This; + TRACE("Enumerator_destructor\n"); + This = enumerator_from_jsdisp(dispex); + + if (This->enumitm) + { + VariantClear(This->enumitm); + heap_free(This->enumitm); + } + heap_free(dispex); } HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_atEnd\n"); + EnumeratorInstance *This; + + This = enumerator_from_vdisp(jsthis); + + if (r) + *r = jsval_bool(This->atend); - return E_NOTIMPL; + TRACE("Enumerator_atEnd %d\n", This->atend); + + return S_OK; } HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + TRACE("Enumerator_item\n"); - return E_NOTIMPL; + This = enumerator_from_vdisp(jsthis); + + if (This->datatype == DATATYPE_ARRAY) + { + hres = enumary_get_item(This, r); + } + else if (This->datatype == DATATYPE_ENUMVARIANT) + { + hres = variant_to_jsval(This->enumitm, r); + } + else if (This->datatype == DATATYPE_NULL) + { + if (r) + *r = jsval_undefined(); + hres = S_OK; + } + + return hres; } HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + TRACE("Enumerator_moveFirst\n"); - return E_NOTIMPL; + This = enumerator_from_vdisp(jsthis); + if (This->datatype == DATATYPE_ARRAY) + { + This->arrayidx = 0; + This->atend = FALSE; + hres = enumary_get_item(This, r); + } + else if (This->datatype == DATATYPE_ENUMVARIANT) + { + IEnumVARIANT_Reset(This->enumvar); + hres = enumvar_get_next_item(This->enumvar, This->enumitm, &This->atend, r); + } + else if (This->datatype == DATATYPE_NULL) + { + if (r) + *r = jsval_undefined(); + hres = S_OK; + } + + return hres; } HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + EnumeratorInstance *This; + HRESULT hres = E_FAIL; + TRACE("Enumerator_moveNext\n"); - return E_NOTIMPL; + This = enumerator_from_vdisp(jsthis); + + if (This->atend) + { + if (r) + *r = jsval_undefined(); + return S_OK; + } + if (This->datatype == DATATYPE_ARRAY) + { + if (This->arrayidx <= This->arraylen) + This->arrayidx++; + This->atend = (This->arrayidx > This->arraylen); + hres = enumary_get_item(This, r); + } + else if (This->datatype == DATATYPE_ENUMVARIANT) + { + hres = enumvar_get_next_item(This->enumvar, This->enumitm, &This->atend, r); + } + else if (This->datatype == DATATYPE_NULL) + { + if (r) + *r = jsval_undefined(); + hres = S_OK; + } + + return hres; } static const builtin_prop_t Enumerator_props[] = { @@ -101,16 +271,18 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl jsval_t *r) { jsdisp_t *obj; + jsval_t *arg0; HRESULT hres; TRACE("EnumeratorConstr_value\n"); switch(flags) { case DISPATCH_CONSTRUCT: { - if (argc != 1) - return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); - hres = create_enumerator(ctx, &argv[0], &obj); + arg0 = (argc == 1) ? &argv[0] : 0; + hres = create_enumerator(ctx, arg0, &obj); if(FAILED(hres)) return hres; @@ -118,7 +290,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl break; } default: - FIXME("unimplemented flags: %x\n", flags); + ERR("unimplemented flags: %x\n", flags); return E_NOTIMPL; } @@ -140,7 +312,8 @@ static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, E hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, ctx->enumerator_constr); - if(FAILED(hres)) { + if(FAILED(hres)) + { heap_free(enumerator); return hres; } @@ -180,11 +353,106 @@ HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) { EnumeratorInstance *enumerator; HRESULT hres; + BOOL atend; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + VARIANT varresult; + + int datatype = -1; + int arrayidx = 0; + int arraylen = 0; + jsdisp_t *array = NULL; + IEnumVARIANT *enumvar = NULL; + VARIANT *enumitm = NULL; + + /* new Enumerator() */ + if (argv == NULL) + { + datatype = DATATYPE_NULL; + atend = TRUE; + } + else if(is_object_instance(*argv)) + { + obj = get_object(*argv); + array = iface_to_jsdisp(obj); + if ((array) && + (is_class(array, JSCLASS_ARRAY))) + { + datatype = DATATYPE_ARRAY; + arraylen = array_get_length(array); + /* atend is here always FALSE + * MS returns a "undefined"-element after + * the last element of the given array. + * Because of this, there is at least one + * element to return. */ + atend = FALSE; + } + else + { + if (array) + jsdisp_release(array); + + datatype = DATATYPE_ENUMVARIANT; + /* Try to get a IEnumVARIANT by _NewEnum */ + memset(&varresult, 0, sizeof(VARIANT)); + VariantInit(&varresult); + hres = IDispatch_Invoke(obj, + DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, + NULL, NULL); + if (FAILED(hres)) + { + ERR("Enumerator: no DISPID_NEWENUM.\n"); + VariantClear(&varresult); + return E_INVALIDARG; + } + if (V_VT(&varresult) != VT_DISPATCH) + { + ERR("Enumerator: NewEnum unexpected result.\n"); + VariantClear(&varresult); + return E_INVALIDARG; + } + enumvar = (IEnumVARIANT*)V_DISPATCH(&varresult); + VariantClear(&varresult); + + enumitm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)); + if (!enumitm) + { + hres = E_OUTOFMEMORY; + goto cleanuperr; + } + VariantInit(enumitm); + + atend = FALSE; + enumvar_get_next_item(enumvar, enumitm, &atend, NULL); + } + } + else + { + ERR("I don't know how to handle this type!\n"); + hres = E_NOTIMPL; + goto cleanuperr; + } hres = alloc_enumerator(ctx, NULL, &enumerator); if(FAILED(hres)) - return hres; + goto cleanuperr; + enumerator->datatype = datatype; + enumerator->atend = atend; + enumerator->array = array; + enumerator->arraylen = arraylen; + enumerator->arrayidx = arrayidx; + enumerator->enumvar = enumvar; + enumerator->enumitm = enumitm; *ret = &enumerator->dispex; - return S_OK; + + return S_OK; +cleanuperr: + if (enumitm) + { + VariantClear(enumitm); + HeapFree(GetProcessHeap(), 0, enumitm); + } + return hres; } -- 2.11.0

3 6

[PATCH] mf: Add stub scheme handler for local file urls.
by Nikolay Sivov 29 Apr '19

29 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/Makefile.in | 2 + dlls/mf/main.c | 236 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.idl | 26 +++++ dlls/mf/mf.spec | 8 +- 4 files changed, 268 insertions(+), 4 deletions(-) create mode 100644 dlls/mf/mf.idl diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index f05364bca6..5e18ab454e 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -6,3 +6,5 @@ C_SRCS = \ main.c \ session.c \ topology.c + +IDL_SRCS = mf.idl diff --git a/dlls/mf/main.c b/dlls/mf/main.c index b3573d78af..1b00ea502e 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -25,11 +25,246 @@ #include "windef.h" #include "winbase.h" #include "mfidl.h" +#include "rpcproxy.h" + +#include "initguid.h" +#include "mf.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static HINSTANCE mf_instance; + +struct class_factory +{ + IClassFactory IClassFactory_iface; + HRESULT (*create_instance)(REFIID riid, void **obj); +}; + +static inline struct class_factory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, struct class_factory, IClassFactory_iface); +} + +static HRESULT WINAPI class_factory_QueryInterface(IClassFactory *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IClassFactory) || + IsEqualGUID(riid, &IID_IUnknown)) + { + *obj = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + WARN("%s is not supported.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI class_factory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **obj) +{ + struct class_factory *factory = impl_from_IClassFactory(iface); + + TRACE("%p, %p, %s, %p.\n", iface, outer, debugstr_guid(riid), obj); + + if (outer) + { + *obj = NULL; + return CLASS_E_NOAGGREGATION; + } + + return factory->create_instance(riid, obj); +} + +static HRESULT WINAPI class_factory_LockServer(IClassFactory *iface, BOOL dolock) +{ + FIXME("%d.\n", dolock); + + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +struct file_scheme_handler +{ + IMFSchemeHandler IMFSchemeHandler_iface; + LONG refcount; +}; + +static struct file_scheme_handler *impl_from_IMFSchemeHandler(IMFSchemeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct file_scheme_handler, IMFSchemeHandler_iface); +} + +static HRESULT WINAPI file_scheme_handler_QueryInterface(IMFSchemeHandler *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFSchemeHandler) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFSchemeHandler_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI file_scheme_handler_AddRef(IMFSchemeHandler *iface) +{ + struct file_scheme_handler *handler = impl_from_IMFSchemeHandler(iface); + ULONG refcount = InterlockedIncrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", handler, refcount); + + return refcount; +} + +static ULONG WINAPI file_scheme_handler_Release(IMFSchemeHandler *iface) +{ + struct file_scheme_handler *handler = impl_from_IMFSchemeHandler(iface); + ULONG refcount = InterlockedDecrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + heap_free(handler); + + return refcount; +} + +static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *iface, const WCHAR *url, DWORD flags, + IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) +{ + FIXME("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_scheme_handler_EndCreateObject(IMFSchemeHandler *iface, IMFAsyncResult *result, + MF_OBJECT_TYPE *obj_type, IUnknown **object) +{ + FIXME("%p, %p, %p, %p.\n", iface, result, obj_type, object); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_scheme_handler_CancelObjectCreation(IMFSchemeHandler *iface, IUnknown *cancel_cookie) +{ + FIXME("%p, %p.\n", iface, cancel_cookie); + + return E_NOTIMPL; +} + +static const IMFSchemeHandlerVtbl file_scheme_handler_vtbl = +{ + file_scheme_handler_QueryInterface, + file_scheme_handler_AddRef, + file_scheme_handler_Release, + file_scheme_handler_BeginCreateObject, + file_scheme_handler_EndCreateObject, + file_scheme_handler_CancelObjectCreation, +}; + +static HRESULT file_scheme_handler_construct(REFIID riid, void **obj) +{ + struct file_scheme_handler *handler; + HRESULT hr; + + TRACE("%s, %p.\n", debugstr_guid(riid), obj); + + handler = heap_alloc(sizeof(*handler)); + if (!handler) + return E_OUTOFMEMORY; + + handler->IMFSchemeHandler_iface.lpVtbl = &file_scheme_handler_vtbl; + handler->refcount = 1; + + hr = IMFSchemeHandler_QueryInterface(&handler->IMFSchemeHandler_iface, riid, obj); + IMFSchemeHandler_Release(&handler->IMFSchemeHandler_iface); + + return hr; +} + +static struct class_factory file_scheme_handler_factory = { { &class_factory_vtbl }, file_scheme_handler_construct }; + +static const struct class_object +{ + const GUID *clsid; + IClassFactory *factory; +} +class_objects[] = +{ + { &CLSID_FileSchemeHandler, &file_scheme_handler_factory.IClassFactory_iface }, +}; + +/******************************************************************************* + * DllGetClassObject (mf.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **obj) +{ + unsigned int i; + + TRACE("%s, %s, %p.\n", debugstr_guid(rclsid), debugstr_guid(riid), obj); + + for (i = 0; i < ARRAY_SIZE(class_objects); ++i) + { + if (IsEqualGUID(class_objects[i].clsid, rclsid)) + return IClassFactory_QueryInterface(class_objects[i].factory, riid, obj); + } + + WARN("%s: class not found.\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/****************************************************************** + * DllCanUnloadNow (mf.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (mf.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( mf_instance ); +} + +/*********************************************************************** + * DllUnregisterServer (mf.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( mf_instance ); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -37,6 +272,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + mf_instance = instance; DisableThreadLibraryCalls(instance); break; } diff --git a/dlls/mf/mf.idl b/dlls/mf/mf.idl new file mode 100644 index 0000000000..824c246d30 --- /dev/null +++ b/dlls/mf/mf.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#pragma makedep header register + +[ + helpstring("File scheme handler"), + threading(both), + uuid(477ec299-1421-4bdd-971f-7ccb933f21ad) +] +coclass FileSchemeHandler { } diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index 2d02ef8fec..dd3d6d0688 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -2,10 +2,10 @@ @ stub ConvertPropVariant @ stub CopyPropertyStore @ stub CreateNamedPropertyStore -@ stub DllCanUnloadNow -@ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub ExtractPropVariant @ stub MFCreate3GPMediaSink @ stub MFCreateASFByteStreamPlugin -- 2.20.1

1 0

[PATCH 1/5] ntoskrnl.exe: Implement IoGetCurrentProcess.
by Jacek Caban 29 Apr '19

29 Apr '19

Based on patch by Derek Lesho. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29460 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++-- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/tests/driver.c | 7 ++++++- 3 files changed, 17 insertions(+), 3 deletions(-)

2 1

[PATCH 5/5] ntoskrnl.exe: Implement PsGetThreadId.
by Jacek Caban 29 Apr '19

29 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 1 + include/ddk/ntddk.h | 1 + 4 files changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 4/5] ntoskrnl.exe: Implement PsGetProcessId.
by Jacek Caban 29 Apr '19

29 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++---------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 +++- dlls/ntoskrnl.exe/tests/driver.c | 2 ++ include/ddk/ntddk.h | 1 + 4 files changed, 16 insertions(+), 11 deletions(-)

1 0

[PATCH 3/5] ntoskrnl.exe: Implement IoGetCurrentProcess.
by Jacek Caban 29 Apr '19

29 Apr '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 5 +++++ dlls/ntoskrnl.exe/tests/driver.c | 2 ++ include/ddk/ntifs.h | 1 + 5 files changed, 18 insertions(+), 1 deletion(-)

1 0

[PATCH 2/5] ntoskrnl.exe: Export and set PsInitialSystemProcess.
by Jacek Caban 29 Apr '19

29 Apr '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] mfplat: Improve thread safety for IStream-based stream.
by Nikolay Sivov 29 Apr '19

29 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 64 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 13c48cfe23..14bde4a954 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2730,11 +2730,18 @@ static HRESULT WINAPI bytestream_stream_SetLength(IMFByteStream *iface, QWORD le { struct bytestream *stream = impl_from_IMFByteStream(iface); ULARGE_INTEGER size; + HRESULT hr; TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(length)); + EnterCriticalSection(&stream->cs); + size.QuadPart = length; - return IStream_SetSize(stream->stream, size); + hr = IStream_SetSize(stream->stream, size); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) @@ -2754,7 +2761,9 @@ static HRESULT WINAPI bytestream_stream_SetCurrentPosition(IMFByteStream *iface, TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); + EnterCriticalSection(&stream->cs); stream->position = position; + LeaveCriticalSection(&stream->cs); return S_OK; } @@ -2767,12 +2776,14 @@ static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL TRACE("%p, %p.\n", iface, ret); - if (FAILED(hr = IStream_Stat(stream->stream, &statstg, STATFLAG_NONAME))) - return hr; + EnterCriticalSection(&stream->cs); - *ret = stream->position >= statstg.cbSize.QuadPart; + if (SUCCEEDED(hr = IStream_Stat(stream->stream, &statstg, STATFLAG_NONAME))) + *ret = stream->position >= statstg.cbSize.QuadPart; - return S_OK; + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) @@ -2783,12 +2794,16 @@ static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer, TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len); + EnterCriticalSection(&stream->cs); + position.QuadPart = stream->position; - if (FAILED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - return hr; + if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) + { + if (SUCCEEDED(hr = IStream_Read(stream->stream, buffer, size, read_len))) + stream->position += *read_len; + } - if (SUCCEEDED(hr = IStream_Read(stream->stream, buffer, size, read_len))) - stream->position += *read_len; + LeaveCriticalSection(&stream->cs); return hr; } @@ -2801,12 +2816,16 @@ static HRESULT WINAPI bytestream_stream_Write(IMFByteStream *iface, const BYTE * TRACE("%p, %p, %u, %p.\n", iface, buffer, size, written); + EnterCriticalSection(&stream->cs); + position.QuadPart = stream->position; - if (FAILED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) - return hr; + if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) + { + if (SUCCEEDED(hr = IStream_Write(stream->stream, buffer, size, written))) + stream->position += *written; + } - if (SUCCEEDED(hr = IStream_Write(stream->stream, buffer, size, written))) - stream->position += *written; + LeaveCriticalSection(&stream->cs); return hr; } @@ -2815,9 +2834,12 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_ DWORD flags, QWORD *current) { struct bytestream *stream = impl_from_IMFByteStream(iface); + HRESULT hr = S_OK; TRACE("%p, %u, %s, %#x, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current); + EnterCriticalSection(&stream->cs); + switch (origin) { case msoBegin: @@ -2828,12 +2850,14 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_ break; default: WARN("Unknown origin mode %d.\n", origin); - return E_INVALIDARG; + hr = E_INVALIDARG; } *current = stream->position; - return S_OK; + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_stream_Flush(IMFByteStream *iface) @@ -2948,6 +2972,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i op = impl_async_stream_op_from_IUnknown(object); + EnterCriticalSection(&stream->cs); + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { @@ -2956,9 +2982,8 @@ static HRESULT WINAPI bytestream_stream_read_callback_Invoke(IMFAsyncCallback *i } IMFAsyncResult_SetStatus(op->caller, hr); - - EnterCriticalSection(&stream->cs); list_add_tail(&stream->pending, &op->entry); + LeaveCriticalSection(&stream->cs); MFInvokeCallback(op->caller); @@ -2979,6 +3004,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * op = impl_async_stream_op_from_IUnknown(object); + EnterCriticalSection(&stream->cs); + position.QuadPart = op->position; if (SUCCEEDED(hr = IStream_Seek(stream->stream, position, STREAM_SEEK_SET, NULL))) { @@ -2987,9 +3014,8 @@ static HRESULT WINAPI bytestream_stream_write_callback_Invoke(IMFAsyncCallback * } IMFAsyncResult_SetStatus(op->caller, hr); - - EnterCriticalSection(&stream->cs); list_add_tail(&stream->pending, &op->entry); + LeaveCriticalSection(&stream->cs); MFInvokeCallback(op->caller); -- 2.20.1

2 2

[PATCH] mfreadwrite: Return sample timestamp from ReadSample().
by Nikolay Sivov 29 Apr '19

29 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e396dcd5f5..aeb86db3e3 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -850,6 +850,15 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, LeaveCriticalSection(&stream->cs); TRACE("Got sample %p.\n", *sample); + + if (timestamp) + { + /* TODO: it's possible timestamp has to be set for some events. + For MEEndOfStream it's correct to return 0. */ + *timestamp = 0; + if (*sample) + IMFSample_GetSampleTime(*sample, timestamp); + } } return S_OK; -- 2.20.1

1 0

[PATCH] tools: Update to Unicode 12.0
by Nikolay Sivov 29 Apr '19

29 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 238 ++++++++++++++++++------------------- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 134 ++++++++++----------- dlls/dwrite/scripts.h | 2 +- dlls/gdi32/vertical.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 72 +++++------ dlls/usp10/linebreak.c | 238 ++++++++++++++++++------------------- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 6 +- dlls/wineps.drv/vertical.c | 2 +- libs/port/casemap.c | 33 ++--- libs/port/combclass.c | 4 +- libs/port/compose.c | 2 +- libs/port/decompose.c | 2 +- libs/port/digitmap.c | 2 +- libs/port/wctype.c | 36 +++--- loader/l_intl.nls | Bin 6662 -> 6726 bytes tools/make_unicode | 2 +- 20 files changed, 390 insertions(+), 393 deletions(-) diff --git a/dlls/dwrite/bracket.c b/dlls/dwrite/bracket.c index 16df6381a6..cd573d3df7 100644 --- a/dlls/dwrite/bracket.c +++ b/dlls/dwrite/bracket.c @@ -1,5 +1,5 @@ /* Unicode Bidirectional Bracket table */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/BidiBrackets.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/dlls/dwrite/linebreak.c b/dlls/dwrite/linebreak.c index 6d92c4465b..804b60a8a5 100644 --- a/dlls/dwrite/linebreak.c +++ b/dlls/dwrite/linebreak.c @@ -1,10 +1,10 @@ /* Unicode Line Break Properties */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/LineBreak.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = +const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, @@ -69,119 +69,119 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0b70, 0x0ae0, 0x05b0, 0x0b80, 0x0b90, 0x0ba0, 0x0950, 0x0bb0, 0x0bc0, 0x0bd0, 0x05b0, 0x0be0, 0x0bf0, 0x0c00, 0x09b0, 0x0c10, 0x0c20, 0x0c30, 0x0c30, 0x0c40, 0x0c50, 0x0c60, 0x0870, 0x0870, - 0x0c70, 0x0c80, 0x0c90, 0x0ca0, 0x0cb0, 0x0cc0, 0x0870, 0x0870, - 0x0cd0, 0x0ce0, 0x07b0, 0x0cf0, 0x0d00, 0x05b0, 0x0d10, 0x0d20, - 0x0d30, 0x0d40, 0x0580, 0x0d50, 0x0d60, 0x0d70, 0x0870, 0x0870, - 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0d80, 0x0c30, 0x0c30, 0x0c30, - 0x0c30, 0x0d90, 0x05b0, 0x05b0, 0x0da0, 0x05b0, 0x05b0, 0x05b0, - 0x0db0, 0x0db0, 0x0db0, 0x0db0, 0x0db0, 0x0db0, 0x0dc0, 0x0dc0, - 0x0dc0, 0x0dc0, 0x0dd0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0df0, 0x0e00, 0x05b0, 0x05b0, - 0x0df0, 0x05b0, 0x05b0, 0x0e10, 0x0e20, 0x0e30, 0x05b0, 0x05b0, - 0x05b0, 0x0e20, 0x05b0, 0x05b0, 0x05b0, 0x0e40, 0x0e50, 0x0d10, - 0x05b0, 0x0e60, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e70, - 0x0e80, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x0c70, 0x0c30, 0x0c80, 0x0c90, 0x0ca0, 0x0cb0, 0x0870, 0x0870, + 0x0cc0, 0x0cd0, 0x07b0, 0x0ce0, 0x0cf0, 0x05b0, 0x0d00, 0x0d10, + 0x0d20, 0x0d30, 0x0580, 0x0d40, 0x0d50, 0x0d60, 0x0870, 0x0870, + 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0d70, 0x0c30, 0x0c30, 0x0c30, + 0x0c30, 0x0d80, 0x05b0, 0x05b0, 0x0d90, 0x05b0, 0x05b0, 0x05b0, + 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0db0, 0x0db0, + 0x0db0, 0x0db0, 0x0dc0, 0x0dd0, 0x0dd0, 0x0dd0, 0x0dd0, 0x0dd0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0de0, 0x0df0, 0x05b0, 0x05b0, + 0x0de0, 0x05b0, 0x05b0, 0x0e00, 0x0e10, 0x0e20, 0x05b0, 0x05b0, + 0x05b0, 0x0e10, 0x05b0, 0x05b0, 0x05b0, 0x0e30, 0x0e40, 0x0d00, + 0x05b0, 0x0e50, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e60, + 0x0e70, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x0e80, 0x0e90, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ea0, 0x0eb0, - 0x0ec0, 0x0ed0, 0x05b0, 0x0ee0, 0x05b0, 0x0ef0, 0x0ec0, 0x0f00, - 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0f10, 0x0f20, 0x0e60, - 0x0f30, 0x0f20, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0eb0, - 0x0f40, 0x05b0, 0x0f50, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0f60, - 0x05b0, 0x0840, 0x0f70, 0x0f70, 0x0f80, 0x0c30, 0x0f90, 0x0fa0, - 0x0c30, 0x0c30, 0x0fb0, 0x0c30, 0x0fc0, 0x0fd0, 0x05b0, 0x05b0, - 0x05b0, 0x0fe0, 0x0c30, 0x0c30, 0x0c30, 0x0ff0, 0x0c30, 0x1000, - 0x0f20, 0x0f20, 0x0f90, 0x1010, 0x0870, 0x0870, 0x0870, 0x0870, - 0x1020, 0x05b0, 0x05b0, 0x1030, 0x1040, 0x1050, 0x1060, 0x1070, - 0x1080, 0x05b0, 0x1090, 0x07b0, 0x05b0, 0x05b0, 0x07f0, 0x10a0, - 0x05b0, 0x05b0, 0x1030, 0x10b0, 0x10c0, 0x07b0, 0x05b0, 0x10d0, - 0x0eb0, 0x05b0, 0x05b0, 0x10e0, 0x0a50, 0x10f0, 0x1100, 0x1110, + 0x0e70, 0x0e80, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e90, 0x0ea0, + 0x0eb0, 0x0ec0, 0x05b0, 0x0ed0, 0x05b0, 0x0ee0, 0x0eb0, 0x0ef0, + 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0f00, 0x0f10, 0x0e50, + 0x0f20, 0x0f10, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ea0, + 0x0f30, 0x05b0, 0x0f40, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0f50, + 0x05b0, 0x0840, 0x0f60, 0x0f60, 0x0f70, 0x0c30, 0x0c90, 0x0f80, + 0x0c30, 0x0c30, 0x0f90, 0x0c30, 0x0fa0, 0x0fb0, 0x05b0, 0x05b0, + 0x05b0, 0x0fc0, 0x0c30, 0x0c30, 0x0c30, 0x0fd0, 0x0c30, 0x0fe0, + 0x0f10, 0x0f10, 0x0c90, 0x0ff0, 0x0870, 0x0870, 0x0870, 0x0870, + 0x1000, 0x05b0, 0x05b0, 0x1010, 0x1020, 0x1030, 0x1040, 0x1050, + 0x1060, 0x05b0, 0x1070, 0x07b0, 0x05b0, 0x05b0, 0x07f0, 0x1080, + 0x05b0, 0x05b0, 0x1010, 0x1090, 0x10a0, 0x07b0, 0x05b0, 0x10b0, + 0x0ea0, 0x05b0, 0x05b0, 0x10c0, 0x0a50, 0x10d0, 0x10e0, 0x10f0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0580, 0x0580, 0x0580, 0x1120, - 0x05b0, 0x0e70, 0x05b0, 0x05b0, 0x0e70, 0x1130, 0x05b0, 0x1140, - 0x05b0, 0x05b0, 0x05b0, 0x1150, 0x1150, 0x1160, 0x05b0, 0x1170, - 0x1180, 0x1190, 0x11a0, 0x11b0, 0x11c0, 0x11d0, 0x11e0, 0x11f0, - 0x1200, 0x0d10, 0x1210, 0x1220, 0x1230, 0x0580, 0x0580, 0x1240, - 0x1250, 0x1260, 0x1270, 0x05b0, 0x05b0, 0x1280, 0x1290, 0x12a0, - 0x12b0, 0x12a0, 0x05b0, 0x05b0, 0x05b0, 0x12c0, 0x05b0, 0x05b0, - 0x12d0, 0x12e0, 0x12f0, 0x1300, 0x1310, 0x1320, 0x1330, 0x05b0, - 0x1340, 0x1350, 0x1360, 0x1370, 0x05b0, 0x05b0, 0x1380, 0x05b0, - 0x1390, 0x13a0, 0x13b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x13c0, - 0x05b0, 0x05b0, 0x13d0, 0x0870, 0x0860, 0x0870, 0x13e0, 0x13e0, - 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13f0, - 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x1290, 0x13e0, 0x13e0, 0x1400, - 0x13e0, 0x1410, 0x1420, 0x1430, 0x1440, 0x1450, 0x1460, 0x05b0, - 0x1470, 0x1480, 0x05b0, 0x1490, 0x14a0, 0x05b0, 0x14b0, 0x14c0, - 0x05b0, 0x14d0, 0x05b0, 0x14e0, 0x14f0, 0x1500, 0x1510, 0x1520, - 0x1530, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1540, 0x1550, 0x1560, - 0x13e0, 0x1570, 0x05b0, 0x05b0, 0x1580, 0x05b0, 0x1590, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0580, 0x0580, 0x0580, 0x1100, + 0x05b0, 0x0e60, 0x05b0, 0x05b0, 0x0e60, 0x1110, 0x05b0, 0x1120, + 0x05b0, 0x05b0, 0x05b0, 0x1130, 0x1130, 0x1140, 0x05b0, 0x1150, + 0x1160, 0x1170, 0x1180, 0x1190, 0x11a0, 0x11b0, 0x11c0, 0x11d0, + 0x11e0, 0x0d00, 0x11f0, 0x1200, 0x1210, 0x0580, 0x0580, 0x1220, + 0x1230, 0x1240, 0x1250, 0x05b0, 0x05b0, 0x1260, 0x1270, 0x1280, + 0x1290, 0x1280, 0x05b0, 0x05b0, 0x05b0, 0x12a0, 0x05b0, 0x05b0, + 0x12b0, 0x12c0, 0x12d0, 0x12e0, 0x12f0, 0x1300, 0x1310, 0x05b0, + 0x1320, 0x1330, 0x1340, 0x1350, 0x05b0, 0x05b0, 0x1360, 0x05b0, + 0x1370, 0x1380, 0x1390, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x13a0, + 0x05b0, 0x05b0, 0x13b0, 0x0870, 0x0860, 0x0870, 0x13c0, 0x13c0, + 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13d0, + 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x1270, 0x13c0, 0x13c0, 0x13e0, + 0x13c0, 0x13f0, 0x1400, 0x1410, 0x1420, 0x1430, 0x1440, 0x05b0, + 0x1450, 0x1460, 0x05b0, 0x1470, 0x1480, 0x05b0, 0x1490, 0x14a0, + 0x05b0, 0x14b0, 0x05b0, 0x14c0, 0x14d0, 0x14e0, 0x14f0, 0x1500, + 0x1510, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1520, 0x1530, 0x1540, + 0x13c0, 0x1550, 0x05b0, 0x05b0, 0x1560, 0x05b0, 0x1570, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x15a0, 0x15b0, 0x05b0, 0x05b0, 0x05b0, 0x1390, 0x05b0, 0x15c0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15d0, 0x05b0, 0x15e0, - 0x05b0, 0x15f0, 0x05b0, 0x05b0, 0x0910, 0x05b0, 0x05b0, 0x0840, + 0x1580, 0x1590, 0x05b0, 0x05b0, 0x05b0, 0x1370, 0x05b0, 0x15a0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15b0, 0x05b0, 0x15c0, + 0x05b0, 0x15d0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1600, 0x1610, - 0x05b0, 0x05b0, 0x0da0, 0x05b0, 0x05b0, 0x05b0, 0x1620, 0x1630, - 0x05b0, 0x13d0, 0x1640, 0x1640, 0x1640, 0x1640, 0x0580, 0x0580, - 0x1650, 0x1660, 0x1670, 0x1680, 0x1690, 0x0870, 0x0870, 0x0870, - 0x16a0, 0x16b0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16c0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16d0, 0x0870, 0x16e0, - 0x16f0, 0x1700, 0x1710, 0x1720, 0x1730, 0x16a0, 0x1740, 0x16a0, - 0x1750, 0x1760, 0x1770, 0x16a0, 0x1740, 0x16a0, 0x1750, 0x1780, - 0x1790, 0x16a0, 0x16a0, 0x17a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x17b0, 0x16a0, 0x16a0, 0x17c0, 0x16a0, 0x16a0, 0x16c0, 0x17d0, - 0x16a0, 0x17b0, 0x16a0, 0x16a0, 0x17e0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x17b0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x16a0, 0x17f0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x1800, 0x16a0, 0x16a0, 0x16a0, 0x1810, 0x05b0, 0x05b0, 0x10d0, - 0x1820, 0x05b0, 0x1830, 0x0870, 0x05b0, 0x05b0, 0x1600, 0x1840, - 0x05b0, 0x1850, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1860, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15e0, 0x15f0, + 0x05b0, 0x05b0, 0x0d90, 0x05b0, 0x05b0, 0x05b0, 0x1600, 0x1610, + 0x05b0, 0x13b0, 0x1620, 0x1620, 0x1620, 0x1620, 0x0580, 0x0580, + 0x1630, 0x1640, 0x1650, 0x1660, 0x1670, 0x0870, 0x0870, 0x0870, + 0x1680, 0x1690, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x16a0, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x16b0, 0x0870, 0x16c0, + 0x16d0, 0x16e0, 0x16f0, 0x1700, 0x1710, 0x1680, 0x1720, 0x1680, + 0x1730, 0x1740, 0x1750, 0x1680, 0x1720, 0x1680, 0x1730, 0x1760, + 0x1770, 0x1680, 0x1680, 0x1780, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1790, 0x1680, 0x1680, 0x17a0, 0x1680, 0x1680, 0x16a0, 0x17b0, + 0x1680, 0x1790, 0x1680, 0x1680, 0x17c0, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1790, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x1680, 0x17d0, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x17e0, 0x1680, 0x1680, 0x1680, 0x17f0, 0x05b0, 0x05b0, 0x10b0, + 0x1800, 0x05b0, 0x1810, 0x0870, 0x05b0, 0x05b0, 0x15e0, 0x1820, + 0x05b0, 0x1830, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1840, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x0e60, 0x0870, 0x0870, 0x0870, 0x1870, - 0x1880, 0x05b0, 0x1890, 0x18a0, 0x05b0, 0x05b0, 0x05b0, 0x18b0, - 0x18c0, 0x05b0, 0x05b0, 0x1030, 0x18d0, 0x0f20, 0x0580, 0x18e0, - 0x07b0, 0x05b0, 0x18f0, 0x05b0, 0x1900, 0x1910, 0x0db0, 0x1920, - 0x08b0, 0x05b0, 0x05b0, 0x1930, 0x1940, 0x1950, 0x0c30, 0x1960, - 0x05b0, 0x05b0, 0x1970, 0x1980, 0x1990, 0x19a0, 0x0c30, 0x0c30, - 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x19b0, 0x19c0, 0x0760, 0x19d0, - 0x19e0, 0x19f0, 0x1640, 0x05b0, 0x05b0, 0x05b0, 0x0f60, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1a00, 0x0f20, - 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, - 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, - 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, - 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, - 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, - 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, - 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, - 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, - 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, - 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, - 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, - 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, - 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, - 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, - 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, - 0x1a40, 0x1a30, 0x1a60, 0x0dc0, 0x1a70, 0x0de0, 0x0de0, 0x1a80, - 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, - 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1850, 0x0870, 0x0870, 0x1860, + 0x1870, 0x05b0, 0x1880, 0x1890, 0x05b0, 0x05b0, 0x05b0, 0x18a0, + 0x18b0, 0x05b0, 0x05b0, 0x1010, 0x18c0, 0x0f10, 0x0580, 0x18d0, + 0x07b0, 0x05b0, 0x18e0, 0x05b0, 0x18f0, 0x1900, 0x0da0, 0x1910, + 0x08b0, 0x05b0, 0x05b0, 0x1920, 0x1930, 0x1940, 0x0c30, 0x1950, + 0x05b0, 0x05b0, 0x1960, 0x1970, 0x1980, 0x1990, 0x0c30, 0x0c30, + 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x19a0, 0x19b0, 0x0760, 0x19c0, + 0x19d0, 0x19e0, 0x1620, 0x05b0, 0x05b0, 0x05b0, 0x0a50, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x19f0, 0x0f10, + 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, + 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, + 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, + 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, + 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, + 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, + 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, + 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, + 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, + 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, + 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, + 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, + 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, + 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, + 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, + 0x1a30, 0x1a20, 0x1a50, 0x0db0, 0x1a60, 0x0dd0, 0x0dd0, 0x1a70, + 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, + 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, - 0x13d0, 0x1aa0, 0x1ab0, 0x1ac0, 0x1ad0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ae0, 0x1af0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x1b00, 0x0870, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x1b10, 0x05b0, 0x05b0, 0x0a50, 0x0870, 0x0870, 0x1b20, - 0x0580, 0x1b30, 0x0580, 0x1b40, 0x1b50, 0x1b60, 0x1b70, 0x1150, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1b80, - 0x1b90, 0x1ba0, 0x16a0, 0x1bb0, 0x16a0, 0x1bc0, 0x1bd0, 0x1be0, - 0x16a0, 0x1bf0, 0x16a0, 0x17b0, 0x1c00, 0x1c10, 0x1c20, 0x1c30, + 0x13b0, 0x1a90, 0x1aa0, 0x1ab0, 0x1ac0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ad0, 0x1ae0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x1af0, 0x0870, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x1b00, 0x05b0, 0x05b0, 0x0a50, 0x0870, 0x0870, 0x1b10, + 0x0580, 0x1b20, 0x0580, 0x1b30, 0x1b40, 0x1b50, 0x1b60, 0x1130, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1b70, + 0x1b80, 0x1b90, 0x1680, 0x1ba0, 0x1680, 0x1bb0, 0x1bc0, 0x1bd0, + 0x1680, 0x1be0, 0x1680, 0x1790, 0x1bf0, 0x1c00, 0x1c10, 0x1c20, /* values */ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0003, 0x0001, 0x0001, 0x0002, 0x0004, 0x0004, @@ -365,7 +365,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, @@ -407,14 +407,12 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0011, 0x0023, - 0x0023, 0x0011, 0x0023, 0x0011, 0x0011, 0x0023, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, - 0x0011, 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, + 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, @@ -507,8 +505,6 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0017, 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, @@ -555,8 +551,8 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x0004, + 0x0004, 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -732,7 +728,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0025, 0x0025, 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0012, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0011, + 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, @@ -791,6 +787,8 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, diff --git a/dlls/dwrite/mirror.c b/dlls/dwrite/mirror.c index 9239d79596..5c4abcd69a 100644 --- a/dlls/dwrite/mirror.c +++ b/dlls/dwrite/mirror.c @@ -1,5 +1,5 @@ /* Unicode BiDi mirroring */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/BidiMirroring.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/dlls/dwrite/scripts.c b/dlls/dwrite/scripts.c index a7e80a8f93..23514efa57 100644 --- a/dlls/dwrite/scripts.c +++ b/dlls/dwrite/scripts.c @@ -1,10 +1,10 @@ /* Unicode Script IDs */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/Scripts.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/Scripts.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = +const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6736] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, @@ -111,63 +111,63 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x13d0, - 0x0500, 0x13e0, 0x0500, 0x0500, 0x13f0, 0x0500, 0x0500, 0x1330, - 0x1400, 0x1400, 0x1410, 0x1400, 0x1400, 0x1410, 0x0540, 0x0540, - 0x1420, 0x1420, 0x1420, 0x1420, 0x1420, 0x1420, 0x1420, 0x1430, - 0x0db0, 0x0db0, 0x0dc0, 0x1440, 0x1440, 0x1440, 0x1450, 0x1460, - 0x0df0, 0x1470, 0x1480, 0x1480, 0x1480, 0x1480, 0x05e0, 0x05e0, - 0x0500, 0x0500, 0x0500, 0x0500, 0x1330, 0x07d0, 0x07d0, 0x07d0, - 0x1490, 0x14a0, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x14b0, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x14c0, 0x07d0, 0x14d0, - 0x14e0, 0x0500, 0x14f0, 0x1500, 0x1510, 0x1520, 0x1520, 0x1520, - 0x1520, 0x1530, 0x1540, 0x1550, 0x1550, 0x1550, 0x1550, 0x1560, - 0x1570, 0x1580, 0x1580, 0x1590, 0x0de0, 0x0de0, 0x0de0, 0x0de0, - 0x15a0, 0x0500, 0x1580, 0x15b0, 0x0500, 0x0500, 0x15c0, 0x1550, - 0x0de0, 0x15a0, 0x0500, 0x0500, 0x0500, 0x0500, 0x0de0, 0x15d0, - 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x1550, 0x1550, 0x15e0, - 0x1550, 0x1550, 0x1550, 0x1550, 0x1550, 0x15f0, 0x0500, 0x0500, + 0x0500, 0x13e0, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, + 0x13f0, 0x13f0, 0x1400, 0x13f0, 0x13f0, 0x1400, 0x0540, 0x0540, + 0x1410, 0x1410, 0x1410, 0x1410, 0x1410, 0x1410, 0x1410, 0x1420, + 0x0db0, 0x0db0, 0x0dc0, 0x1430, 0x1430, 0x1430, 0x1440, 0x1450, + 0x0df0, 0x1460, 0x1470, 0x1470, 0x1470, 0x1470, 0x05e0, 0x05e0, + 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x07d0, 0x07d0, 0x07d0, + 0x1480, 0x1490, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x14a0, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x14b0, 0x07d0, 0x14c0, + 0x14d0, 0x0500, 0x14e0, 0x14f0, 0x1500, 0x1510, 0x1510, 0x1510, + 0x1510, 0x1520, 0x1530, 0x1540, 0x1540, 0x1540, 0x1540, 0x1550, + 0x1560, 0x1570, 0x1570, 0x1580, 0x0de0, 0x0de0, 0x0de0, 0x0de0, + 0x1590, 0x0500, 0x1570, 0x15a0, 0x0500, 0x0500, 0x15b0, 0x1540, + 0x0de0, 0x1590, 0x0500, 0x0500, 0x0500, 0x0500, 0x0de0, 0x15c0, + 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x1540, 0x1540, 0x15d0, + 0x1540, 0x1540, 0x1540, 0x1540, 0x1540, 0x15e0, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, 0x0500, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, - 0x1490, 0x1490, 0x1490, 0x14c0, 0x0500, 0x0500, 0x0500, 0x0500, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x07d0, - 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, - 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, - 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, 0x1600, - 0x1610, 0x1600, 0x1600, 0x1600, 0x1620, 0x1630, 0x1630, 0x1630, - 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, - 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, 0x1640, - 0x1640, 0x1640, 0x1650, 0x07d0, 0x05e0, 0x05e0, 0x05e0, 0x05e0, - 0x05e0, 0x05e0, 0x1660, 0x1660, 0x1660, 0x1660, 0x1660, 0x1670, - 0x0500, 0x0500, 0x1680, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, - 0x1690, 0x0540, 0x0540, 0x16a0, 0x07d0, 0x07d0, 0x07d0, 0x16b0, - 0x16c0, 0x16c0, 0x16d0, 0x16e0, 0x16f0, 0x16f0, 0x16f0, 0x1700, - 0x1710, 0x1710, 0x1710, 0x1710, 0x1720, 0x1730, 0x0810, 0x0810, - 0x1740, 0x1740, 0x1750, 0x1760, 0x1760, 0x1770, 0x0de0, 0x1780, - 0x1790, 0x1790, 0x1790, 0x1790, 0x17a0, 0x17b0, 0x0da0, 0x17c0, - 0x17d0, 0x17d0, 0x17d0, 0x17e0, 0x17f0, 0x1800, 0x0da0, 0x0da0, - 0x1810, 0x1810, 0x1810, 0x1810, 0x1820, 0x1830, 0x1840, 0x1850, - 0x1860, 0x1870, 0x1480, 0x0540, 0x0540, 0x1880, 0x1890, 0x0e80, - 0x0e80, 0x0e80, 0x0e80, 0x0e80, 0x1840, 0x1840, 0x18a0, 0x18b0, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, + 0x1480, 0x1480, 0x1480, 0x14b0, 0x0500, 0x0500, 0x0500, 0x0500, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x07d0, + 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, + 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, + 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, 0x15f0, + 0x1600, 0x15f0, 0x15f0, 0x15f0, 0x1610, 0x1620, 0x1620, 0x1620, + 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, + 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, 0x1630, + 0x1630, 0x1630, 0x1640, 0x07d0, 0x05e0, 0x05e0, 0x05e0, 0x05e0, + 0x05e0, 0x05e0, 0x1650, 0x1650, 0x1650, 0x1650, 0x1650, 0x1660, + 0x0500, 0x0500, 0x1670, 0x0540, 0x0540, 0x0540, 0x0540, 0x0540, + 0x1680, 0x0540, 0x0540, 0x0540, 0x1690, 0x07d0, 0x07d0, 0x16a0, + 0x16b0, 0x16b0, 0x16c0, 0x16d0, 0x16e0, 0x16e0, 0x16e0, 0x16f0, + 0x1700, 0x1700, 0x1700, 0x1700, 0x1710, 0x1720, 0x0810, 0x0810, + 0x1730, 0x1730, 0x1740, 0x1750, 0x1750, 0x1760, 0x0de0, 0x1770, + 0x1780, 0x1780, 0x1780, 0x1780, 0x1790, 0x17a0, 0x0da0, 0x17b0, + 0x17c0, 0x17c0, 0x17c0, 0x17d0, 0x17e0, 0x17f0, 0x0da0, 0x0da0, + 0x1800, 0x1800, 0x1800, 0x1800, 0x1810, 0x1820, 0x1830, 0x1840, + 0x1850, 0x1860, 0x1470, 0x0540, 0x0540, 0x1870, 0x1880, 0x0e80, + 0x0e80, 0x0e80, 0x0e80, 0x0e80, 0x1830, 0x1830, 0x1890, 0x18a0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, - 0x0de0, 0x0de0, 0x18c0, 0x0de0, 0x18d0, 0x0de0, 0x0de0, 0x18e0, + 0x0de0, 0x0de0, 0x18b0, 0x0de0, 0x18c0, 0x0de0, 0x0de0, 0x18d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, 0x07d0, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x18f0, 0x1490, - 0x1490, 0x1490, 0x1490, 0x1490, 0x1490, 0x1900, 0x07d0, 0x07d0, - 0x1910, 0x1920, 0x0650, 0x1930, 0x1940, 0x06b0, 0x06b0, 0x06b0, - 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x1950, 0x07f0, 0x06b0, 0x06b0, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x18e0, 0x1480, + 0x1480, 0x1480, 0x1480, 0x1480, 0x1480, 0x18f0, 0x07d0, 0x07d0, + 0x1900, 0x1910, 0x0650, 0x1920, 0x1930, 0x06b0, 0x06b0, 0x06b0, + 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x1940, 0x07f0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, - 0x06b0, 0x06b0, 0x06b0, 0x1960, 0x07d0, 0x06b0, 0x06b0, 0x06b0, - 0x06b0, 0x1970, 0x06b0, 0x06b0, 0x1980, 0x07d0, 0x07d0, 0x1990, - 0x0580, 0x16e0, 0x19a0, 0x0500, 0x0500, 0x19b0, 0x19c0, 0x19d0, - 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x19e0, - 0x19f0, 0x0500, 0x0510, 0x0520, 0x0510, 0x0520, 0x1a00, 0x1540, - 0x1550, 0x1a10, 0x0de0, 0x15a0, 0x1a20, 0x1a30, 0x1a40, 0x1a50, + 0x06b0, 0x06b0, 0x06b0, 0x1950, 0x07d0, 0x06b0, 0x06b0, 0x06b0, + 0x06b0, 0x1960, 0x06b0, 0x06b0, 0x1970, 0x07d0, 0x07d0, 0x1980, + 0x0580, 0x16d0, 0x1990, 0x0500, 0x0500, 0x19a0, 0x19b0, 0x19c0, + 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x06b0, 0x19d0, + 0x19e0, 0x0500, 0x0510, 0x0520, 0x0510, 0x0520, 0x19f0, 0x1530, + 0x1540, 0x1a00, 0x0de0, 0x1590, 0x1a10, 0x1a20, 0x1a30, 0x1a40, /* values */ 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, @@ -269,7 +269,7 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, - 0x0018, 0x0002, 0x0002, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, + 0x0018, 0x0002, 0x0002, 0x0002, 0x0002, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0001, 0x0001, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, @@ -367,7 +367,7 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x0058, 0x0058, 0x0058, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0000, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x0058, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x002b, 0x0000, 0x002b, 0x002b, @@ -421,14 +421,14 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x005a, 0x005a, 0x005a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x005a, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0030, 0x0030, 0x0000, 0x0030, 0x0000, 0x0000, 0x0030, - 0x0030, 0x0000, 0x0030, 0x0000, 0x0000, 0x0030, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0000, 0x0030, 0x0030, 0x0030, 0x0000, 0x0030, 0x0000, 0x0030, - 0x0000, 0x0000, 0x0030, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, + 0x0000, 0x0030, 0x0030, 0x0000, 0x0030, 0x0000, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0030, 0x0000, 0x0030, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, - 0x0030, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, 0x0000, 0x0000, + 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0030, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0000, 0x0000, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, 0x0030, @@ -592,7 +592,7 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x0002, 0x0001, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, - 0x0002, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0002, 0x0002, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x0016, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, @@ -647,8 +647,6 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, @@ -733,8 +731,8 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0001, 0x0001, 0x0001, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, 0x0050, @@ -795,7 +793,7 @@ const unsigned short DECLSPEC_HIDDEN wine_scripts_table[6752] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x0001, 0x0031, 0x0031, 0x0031, 0x0031, - 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x0000, 0x0000, + 0x0031, 0x0031, 0x0031, 0x0031, 0x0031, 0x001e, 0x0031, 0x0031, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x003a, 0x0000, 0x0000, diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index bf38988b0a..ebf97f3b62 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -1,5 +1,5 @@ /* Unicode Script IDs */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/Scripts.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/Scripts.txt */ /* DO NOT EDIT!! */ enum unicode_script_id { diff --git a/dlls/gdi32/vertical.c b/dlls/gdi32/vertical.c index ca4467911c..1738deece6 100644 --- a/dlls/gdi32/vertical.c +++ b/dlls/gdi32/vertical.c @@ -1,5 +1,5 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/VerticalOrientation.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/dlls/usp10/bracket.c b/dlls/usp10/bracket.c index 16df6381a6..cd573d3df7 100644 --- a/dlls/usp10/bracket.c +++ b/dlls/usp10/bracket.c @@ -1,5 +1,5 @@ /* Unicode Bidirectional Bracket table */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/BidiBrackets.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/dlls/usp10/indicsyllable.c b/dlls/usp10/indicsyllable.c index fba732bc14..d436e8a55c 100644 --- a/dlls/usp10/indicsyllable.c +++ b/dlls/usp10/indicsyllable.c @@ -1,11 +1,11 @@ /* Unicode Indic Syllabic Category */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/IndicSyllabicCategory.txt */ -/* and from http://www.unicode.org/Public/11.0.0/ucd/IndicPositionalCategory.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/IndicSyllabicCategory.txt */ +/* and from http://www.unicode.org/Public/12.0.0/ucd/IndicPositionalCategory.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = +const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3344] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, @@ -56,35 +56,35 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x05c0, 0x0530, 0x02f0, 0x05d0, 0x05e0, 0x05f0, 0x0330, 0x0600, 0x0610, 0x0620, 0x02f0, 0x0630, 0x0640, 0x0650, 0x0400, 0x0660, 0x0670, 0x02f0, 0x0680, 0x0690, 0x06a0, 0x0290, 0x0270, 0x0270, - 0x06b0, 0x06c0, 0x06d0, 0x06e0, 0x06f0, 0x0700, 0x0270, 0x0270, - 0x0270, 0x0710, 0x0720, 0x0730, 0x0740, 0x02f0, 0x0750, 0x0760, - 0x0770, 0x0780, 0x0790, 0x07a0, 0x07b0, 0x0270, 0x0270, 0x0270, - 0x02f0, 0x02f0, 0x07c0, 0x07d0, 0x07e0, 0x07f0, 0x0800, 0x0810, - 0x0820, 0x0830, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0840, 0x0850, 0x0860, 0x0850, 0x0860, 0x0870, 0x0840, 0x0880, - 0x02f0, 0x02f0, 0x0890, 0x08a0, 0x08b0, 0x08c0, 0x0290, 0x0270, - 0x08d0, 0x0680, 0x08e0, 0x08f0, 0x0400, 0x02f0, 0x0900, 0x0910, - 0x02f0, 0x02f0, 0x0920, 0x0930, 0x0940, 0x0290, 0x0270, 0x0270, + 0x06b0, 0x02f0, 0x06c0, 0x06d0, 0x06e0, 0x06f0, 0x0270, 0x0270, + 0x0270, 0x0700, 0x0710, 0x0720, 0x0730, 0x02f0, 0x0740, 0x0750, + 0x0760, 0x0770, 0x0780, 0x0790, 0x07a0, 0x0270, 0x0270, 0x0270, + 0x02f0, 0x02f0, 0x07b0, 0x07c0, 0x07d0, 0x07e0, 0x07f0, 0x0800, + 0x0810, 0x0820, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, + 0x0830, 0x0840, 0x0850, 0x0840, 0x0850, 0x0860, 0x0830, 0x0870, + 0x02f0, 0x02f0, 0x0880, 0x0890, 0x08a0, 0x08b0, 0x0290, 0x0270, + 0x08c0, 0x0680, 0x08d0, 0x08e0, 0x0400, 0x02f0, 0x08f0, 0x0900, + 0x02f0, 0x02f0, 0x0910, 0x0920, 0x0930, 0x0940, 0x0270, 0x0270, 0x02f0, 0x0950, 0x02f0, 0x02f0, 0x0960, 0x0970, 0x0980, 0x0990, 0x0290, 0x0290, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x09a0, 0x0860, 0x02f0, 0x09b0, 0x09c0, 0x0290, 0x09d0, 0x09e0, + 0x09a0, 0x0850, 0x02f0, 0x09b0, 0x09c0, 0x0290, 0x09d0, 0x09e0, 0x09f0, 0x02f0, 0x0a00, 0x0a10, 0x02f0, 0x02f0, 0x0a20, 0x0a30, 0x02f0, 0x02f0, 0x0a40, 0x0a50, 0x0a60, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0a70, 0x0a80, 0x0a90, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0aa0, 0x0ab0, 0x0ac0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0ad0, - 0x0ae0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, + 0x0ae0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0af0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0af0, 0x0270, 0x0270, 0x0270, - 0x0b00, 0x02f0, 0x0b10, 0x0270, 0x02f0, 0x0b20, 0x0b30, 0x0b40, - 0x0b50, 0x0b60, 0x02f0, 0x0b70, 0x0b80, 0x0290, 0x0b90, 0x0ba0, - 0x0bb0, 0x02f0, 0x0bc0, 0x02f0, 0x0bd0, 0x0be0, 0x0270, 0x0270, - 0x0bf0, 0x02f0, 0x02f0, 0x0c00, 0x0c10, 0x0290, 0x0c20, 0x0c30, - 0x0c40, 0x02f0, 0x0c50, 0x0c60, 0x0c70, 0x0290, 0x02f0, 0x0c80, - 0x02f0, 0x02f0, 0x02f0, 0x0c90, 0x0ca0, 0x0270, 0x0cb0, 0x0cc0, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0b00, 0x0270, 0x0270, 0x0270, + 0x0b10, 0x02f0, 0x0b20, 0x0270, 0x02f0, 0x0b30, 0x0b40, 0x0b50, + 0x0b60, 0x0b70, 0x02f0, 0x0b80, 0x0b90, 0x0290, 0x0ba0, 0x0bb0, + 0x0bc0, 0x02f0, 0x0bd0, 0x02f0, 0x0be0, 0x0bf0, 0x0270, 0x0270, + 0x0c00, 0x02f0, 0x02f0, 0x0c10, 0x0c20, 0x0290, 0x0c30, 0x0c40, + 0x0c50, 0x02f0, 0x0c60, 0x0c70, 0x0c80, 0x0290, 0x02f0, 0x0c90, + 0x02f0, 0x02f0, 0x02f0, 0x0ca0, 0x0cb0, 0x0270, 0x0cc0, 0x0cd0, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, 0x0270, - 0x0270, 0x0270, 0x0270, 0x0270, 0x0cd0, 0x0ce0, 0x0cf0, 0x0290, + 0x0270, 0x0270, 0x0270, 0x0270, 0x0ce0, 0x0cf0, 0x0d00, 0x0290, /* values */ 0x5f00, 0x9c00, 0x9500, 0x9500, 0x8600, 0x8600, 0x8600, 0x8600, 0x7e00, 0x6e00, 0x6c00, 0x6000, 0x5100, 0x3c00, 0x2600, 0x1900, @@ -136,7 +136,7 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x000a, 0x000a, 0x0000, 0x0000, 0x0604, 0x0000, 0x0107, 0x0207, 0x0107, 0x0607, 0x0607, 0x0000, 0x0000, 0x0000, 0x0000, 0x0507, 0x0507, 0x0000, 0x0000, 0x0507, 0x0507, 0x0605, 0x0000, 0x0000, - 0x0000, 0x0019, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0619, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -184,7 +184,7 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x0007, 0x0000, 0x0507, 0x0507, 0x0507, 0x0505, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0507, 0x0607, 0x0000, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0501, 0x0101, 0x0102, 0x0000, 0x0006, 0x0006, 0x0006, + 0x0001, 0x0501, 0x0101, 0x0102, 0x0000, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0000, 0x0604, 0x0003, 0x0107, 0x0507, @@ -224,14 +224,12 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x0607, 0x0607, 0x0616, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0307, 0x0307, 0x0307, 0x0307, 0x0307, 0x0107, 0x0000, 0x0507, 0x0513, 0x0513, 0x0513, 0x0513, 0x0522, 0x0501, 0x0516, 0x0000, - 0x0000, 0x000a, 0x000a, 0x0000, 0x000a, 0x0000, 0x0000, 0x000a, - 0x000a, 0x0000, 0x000a, 0x0000, 0x0000, 0x000a, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, - 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, - 0x0000, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x0000, 0x000a, - 0x0000, 0x0000, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x0000, + 0x0000, 0x000a, 0x000a, 0x0000, 0x000a, 0x0000, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x000a, 0x0000, 0x000a, + 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0000, 0x0107, 0x0507, 0x0107, 0x0107, 0x0507, 0x0507, 0x0507, 0x0507, - 0x0607, 0x0607, 0x0000, 0x0507, 0x060e, 0x000e, 0x0000, 0x0000, + 0x0607, 0x0607, 0x0616, 0x0507, 0x060e, 0x000e, 0x0000, 0x0000, 0x0307, 0x0307, 0x0307, 0x0307, 0x0307, 0x0000, 0x0000, 0x0000, 0x0513, 0x0513, 0x0513, 0x0513, 0x0500, 0x0501, 0x0000, 0x0000, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -308,6 +306,8 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x0107, 0x0107, 0x0007, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x000f, 0x0113, 0x0113, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, + 0x001d, 0x001d, 0x001d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0507, 0x0607, 0x0207, 0x0107, 0x0507, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, @@ -348,8 +348,8 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x0619, 0x0619, 0x0519, 0x0519, 0x0619, 0x0619, 0x0619, 0x0619, 0x0519, 0x0119, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0d00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0600, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0002, 0x0002, 0x0519, 0x001f, 0x001f, 0x0119, - 0x0019, 0x0019, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x000b, 0x000b, 0x0519, 0x001f, 0x001f, 0x0119, + 0x0019, 0x0019, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0521, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -360,9 +360,11 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0021, 0x0021, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0519, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000, 0x0000, - 0x0006, 0x0006, 0x0000, 0x0006, 0x0006, 0x0006, 0x0516, 0x000a, + 0x0006, 0x0006, 0x0507, 0x0006, 0x0006, 0x0006, 0x0505, 0x000a, 0x000a, 0x000a, 0x000a, 0x0501, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0107, 0x0107, 0x0607, 0x0507, 0x0107, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -395,7 +397,7 @@ const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3328] = 0x0501, 0x0501, 0x050c, 0x0102, 0x0006, 0x0006, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x0006, 0x0006, 0x0006, 0x000a, 0x000a, 0x000a, 0x000a, 0x0504, 0x0107, 0x0107, 0x0507, 0x0507, - 0x0607, 0x0607, 0x0207, 0x0207, 0x0507, 0x010d, 0x010e, 0x000e, + 0x0607, 0x0607, 0x0207, 0x0207, 0x0507, 0x060e, 0x010e, 0x000e, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000a, 0x000a, 0x000a, 0x000a, 0x000a, 0x0507, 0x0000, 0x000a, diff --git a/dlls/usp10/linebreak.c b/dlls/usp10/linebreak.c index 6d92c4465b..804b60a8a5 100644 --- a/dlls/usp10/linebreak.c +++ b/dlls/usp10/linebreak.c @@ -1,10 +1,10 @@ /* Unicode Line Break Properties */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/LineBreak.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = +const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, @@ -69,119 +69,119 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0b70, 0x0ae0, 0x05b0, 0x0b80, 0x0b90, 0x0ba0, 0x0950, 0x0bb0, 0x0bc0, 0x0bd0, 0x05b0, 0x0be0, 0x0bf0, 0x0c00, 0x09b0, 0x0c10, 0x0c20, 0x0c30, 0x0c30, 0x0c40, 0x0c50, 0x0c60, 0x0870, 0x0870, - 0x0c70, 0x0c80, 0x0c90, 0x0ca0, 0x0cb0, 0x0cc0, 0x0870, 0x0870, - 0x0cd0, 0x0ce0, 0x07b0, 0x0cf0, 0x0d00, 0x05b0, 0x0d10, 0x0d20, - 0x0d30, 0x0d40, 0x0580, 0x0d50, 0x0d60, 0x0d70, 0x0870, 0x0870, - 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0d80, 0x0c30, 0x0c30, 0x0c30, - 0x0c30, 0x0d90, 0x05b0, 0x05b0, 0x0da0, 0x05b0, 0x05b0, 0x05b0, - 0x0db0, 0x0db0, 0x0db0, 0x0db0, 0x0db0, 0x0db0, 0x0dc0, 0x0dc0, - 0x0dc0, 0x0dc0, 0x0dd0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, 0x0de0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0df0, 0x0e00, 0x05b0, 0x05b0, - 0x0df0, 0x05b0, 0x05b0, 0x0e10, 0x0e20, 0x0e30, 0x05b0, 0x05b0, - 0x05b0, 0x0e20, 0x05b0, 0x05b0, 0x05b0, 0x0e40, 0x0e50, 0x0d10, - 0x05b0, 0x0e60, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e70, - 0x0e80, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x0c70, 0x0c30, 0x0c80, 0x0c90, 0x0ca0, 0x0cb0, 0x0870, 0x0870, + 0x0cc0, 0x0cd0, 0x07b0, 0x0ce0, 0x0cf0, 0x05b0, 0x0d00, 0x0d10, + 0x0d20, 0x0d30, 0x0580, 0x0d40, 0x0d50, 0x0d60, 0x0870, 0x0870, + 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0d70, 0x0c30, 0x0c30, 0x0c30, + 0x0c30, 0x0d80, 0x05b0, 0x05b0, 0x0d90, 0x05b0, 0x05b0, 0x05b0, + 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0da0, 0x0db0, 0x0db0, + 0x0db0, 0x0db0, 0x0dc0, 0x0dd0, 0x0dd0, 0x0dd0, 0x0dd0, 0x0dd0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0de0, 0x0df0, 0x05b0, 0x05b0, + 0x0de0, 0x05b0, 0x05b0, 0x0e00, 0x0e10, 0x0e20, 0x05b0, 0x05b0, + 0x05b0, 0x0e10, 0x05b0, 0x05b0, 0x05b0, 0x0e30, 0x0e40, 0x0d00, + 0x05b0, 0x0e50, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e60, + 0x0e70, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x0e80, 0x0e90, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ea0, 0x0eb0, - 0x0ec0, 0x0ed0, 0x05b0, 0x0ee0, 0x05b0, 0x0ef0, 0x0ec0, 0x0f00, - 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0f10, 0x0f20, 0x0e60, - 0x0f30, 0x0f20, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0eb0, - 0x0f40, 0x05b0, 0x0f50, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0f60, - 0x05b0, 0x0840, 0x0f70, 0x0f70, 0x0f80, 0x0c30, 0x0f90, 0x0fa0, - 0x0c30, 0x0c30, 0x0fb0, 0x0c30, 0x0fc0, 0x0fd0, 0x05b0, 0x05b0, - 0x05b0, 0x0fe0, 0x0c30, 0x0c30, 0x0c30, 0x0ff0, 0x0c30, 0x1000, - 0x0f20, 0x0f20, 0x0f90, 0x1010, 0x0870, 0x0870, 0x0870, 0x0870, - 0x1020, 0x05b0, 0x05b0, 0x1030, 0x1040, 0x1050, 0x1060, 0x1070, - 0x1080, 0x05b0, 0x1090, 0x07b0, 0x05b0, 0x05b0, 0x07f0, 0x10a0, - 0x05b0, 0x05b0, 0x1030, 0x10b0, 0x10c0, 0x07b0, 0x05b0, 0x10d0, - 0x0eb0, 0x05b0, 0x05b0, 0x10e0, 0x0a50, 0x10f0, 0x1100, 0x1110, + 0x0e70, 0x0e80, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0e90, 0x0ea0, + 0x0eb0, 0x0ec0, 0x05b0, 0x0ed0, 0x05b0, 0x0ee0, 0x0eb0, 0x0ef0, + 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x0f00, 0x0f10, 0x0e50, + 0x0f20, 0x0f10, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0ea0, + 0x0f30, 0x05b0, 0x0f40, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0f50, + 0x05b0, 0x0840, 0x0f60, 0x0f60, 0x0f70, 0x0c30, 0x0c90, 0x0f80, + 0x0c30, 0x0c30, 0x0f90, 0x0c30, 0x0fa0, 0x0fb0, 0x05b0, 0x05b0, + 0x05b0, 0x0fc0, 0x0c30, 0x0c30, 0x0c30, 0x0fd0, 0x0c30, 0x0fe0, + 0x0f10, 0x0f10, 0x0c90, 0x0ff0, 0x0870, 0x0870, 0x0870, 0x0870, + 0x1000, 0x05b0, 0x05b0, 0x1010, 0x1020, 0x1030, 0x1040, 0x1050, + 0x1060, 0x05b0, 0x1070, 0x07b0, 0x05b0, 0x05b0, 0x07f0, 0x1080, + 0x05b0, 0x05b0, 0x1010, 0x1090, 0x10a0, 0x07b0, 0x05b0, 0x10b0, + 0x0ea0, 0x05b0, 0x05b0, 0x10c0, 0x0a50, 0x10d0, 0x10e0, 0x10f0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0580, 0x0580, 0x0580, 0x1120, - 0x05b0, 0x0e70, 0x05b0, 0x05b0, 0x0e70, 0x1130, 0x05b0, 0x1140, - 0x05b0, 0x05b0, 0x05b0, 0x1150, 0x1150, 0x1160, 0x05b0, 0x1170, - 0x1180, 0x1190, 0x11a0, 0x11b0, 0x11c0, 0x11d0, 0x11e0, 0x11f0, - 0x1200, 0x0d10, 0x1210, 0x1220, 0x1230, 0x0580, 0x0580, 0x1240, - 0x1250, 0x1260, 0x1270, 0x05b0, 0x05b0, 0x1280, 0x1290, 0x12a0, - 0x12b0, 0x12a0, 0x05b0, 0x05b0, 0x05b0, 0x12c0, 0x05b0, 0x05b0, - 0x12d0, 0x12e0, 0x12f0, 0x1300, 0x1310, 0x1320, 0x1330, 0x05b0, - 0x1340, 0x1350, 0x1360, 0x1370, 0x05b0, 0x05b0, 0x1380, 0x05b0, - 0x1390, 0x13a0, 0x13b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x13c0, - 0x05b0, 0x05b0, 0x13d0, 0x0870, 0x0860, 0x0870, 0x13e0, 0x13e0, - 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x13f0, - 0x13e0, 0x13e0, 0x13e0, 0x13e0, 0x1290, 0x13e0, 0x13e0, 0x1400, - 0x13e0, 0x1410, 0x1420, 0x1430, 0x1440, 0x1450, 0x1460, 0x05b0, - 0x1470, 0x1480, 0x05b0, 0x1490, 0x14a0, 0x05b0, 0x14b0, 0x14c0, - 0x05b0, 0x14d0, 0x05b0, 0x14e0, 0x14f0, 0x1500, 0x1510, 0x1520, - 0x1530, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1540, 0x1550, 0x1560, - 0x13e0, 0x1570, 0x05b0, 0x05b0, 0x1580, 0x05b0, 0x1590, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0580, 0x0580, 0x0580, 0x1100, + 0x05b0, 0x0e60, 0x05b0, 0x05b0, 0x0e60, 0x1110, 0x05b0, 0x1120, + 0x05b0, 0x05b0, 0x05b0, 0x1130, 0x1130, 0x1140, 0x05b0, 0x1150, + 0x1160, 0x1170, 0x1180, 0x1190, 0x11a0, 0x11b0, 0x11c0, 0x11d0, + 0x11e0, 0x0d00, 0x11f0, 0x1200, 0x1210, 0x0580, 0x0580, 0x1220, + 0x1230, 0x1240, 0x1250, 0x05b0, 0x05b0, 0x1260, 0x1270, 0x1280, + 0x1290, 0x1280, 0x05b0, 0x05b0, 0x05b0, 0x12a0, 0x05b0, 0x05b0, + 0x12b0, 0x12c0, 0x12d0, 0x12e0, 0x12f0, 0x1300, 0x1310, 0x05b0, + 0x1320, 0x1330, 0x1340, 0x1350, 0x05b0, 0x05b0, 0x1360, 0x05b0, + 0x1370, 0x1380, 0x1390, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x13a0, + 0x05b0, 0x05b0, 0x13b0, 0x0870, 0x0860, 0x0870, 0x13c0, 0x13c0, + 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x13d0, + 0x13c0, 0x13c0, 0x13c0, 0x13c0, 0x1270, 0x13c0, 0x13c0, 0x13e0, + 0x13c0, 0x13f0, 0x1400, 0x1410, 0x1420, 0x1430, 0x1440, 0x05b0, + 0x1450, 0x1460, 0x05b0, 0x1470, 0x1480, 0x05b0, 0x1490, 0x14a0, + 0x05b0, 0x14b0, 0x05b0, 0x14c0, 0x14d0, 0x14e0, 0x14f0, 0x1500, + 0x1510, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1520, 0x1530, 0x1540, + 0x13c0, 0x1550, 0x05b0, 0x05b0, 0x1560, 0x05b0, 0x1570, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x15a0, 0x15b0, 0x05b0, 0x05b0, 0x05b0, 0x1390, 0x05b0, 0x15c0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15d0, 0x05b0, 0x15e0, - 0x05b0, 0x15f0, 0x05b0, 0x05b0, 0x0910, 0x05b0, 0x05b0, 0x0840, + 0x1580, 0x1590, 0x05b0, 0x05b0, 0x05b0, 0x1370, 0x05b0, 0x15a0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15b0, 0x05b0, 0x15c0, + 0x05b0, 0x15d0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, 0x0840, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1600, 0x1610, - 0x05b0, 0x05b0, 0x0da0, 0x05b0, 0x05b0, 0x05b0, 0x1620, 0x1630, - 0x05b0, 0x13d0, 0x1640, 0x1640, 0x1640, 0x1640, 0x0580, 0x0580, - 0x1650, 0x1660, 0x1670, 0x1680, 0x1690, 0x0870, 0x0870, 0x0870, - 0x16a0, 0x16b0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16c0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16d0, 0x0870, 0x16e0, - 0x16f0, 0x1700, 0x1710, 0x1720, 0x1730, 0x16a0, 0x1740, 0x16a0, - 0x1750, 0x1760, 0x1770, 0x16a0, 0x1740, 0x16a0, 0x1750, 0x1780, - 0x1790, 0x16a0, 0x16a0, 0x17a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x17b0, 0x16a0, 0x16a0, 0x17c0, 0x16a0, 0x16a0, 0x16c0, 0x17d0, - 0x16a0, 0x17b0, 0x16a0, 0x16a0, 0x17e0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x17b0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x16a0, 0x17f0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, 0x16a0, - 0x1800, 0x16a0, 0x16a0, 0x16a0, 0x1810, 0x05b0, 0x05b0, 0x10d0, - 0x1820, 0x05b0, 0x1830, 0x0870, 0x05b0, 0x05b0, 0x1600, 0x1840, - 0x05b0, 0x1850, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1860, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x15e0, 0x15f0, + 0x05b0, 0x05b0, 0x0d90, 0x05b0, 0x05b0, 0x05b0, 0x1600, 0x1610, + 0x05b0, 0x13b0, 0x1620, 0x1620, 0x1620, 0x1620, 0x0580, 0x0580, + 0x1630, 0x1640, 0x1650, 0x1660, 0x1670, 0x0870, 0x0870, 0x0870, + 0x1680, 0x1690, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x16a0, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x16b0, 0x0870, 0x16c0, + 0x16d0, 0x16e0, 0x16f0, 0x1700, 0x1710, 0x1680, 0x1720, 0x1680, + 0x1730, 0x1740, 0x1750, 0x1680, 0x1720, 0x1680, 0x1730, 0x1760, + 0x1770, 0x1680, 0x1680, 0x1780, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1790, 0x1680, 0x1680, 0x17a0, 0x1680, 0x1680, 0x16a0, 0x17b0, + 0x1680, 0x1790, 0x1680, 0x1680, 0x17c0, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1790, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x05b0, 0x05b0, 0x05b0, 0x05b0, + 0x1680, 0x17d0, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, 0x1680, + 0x17e0, 0x1680, 0x1680, 0x1680, 0x17f0, 0x05b0, 0x05b0, 0x10b0, + 0x1800, 0x05b0, 0x1810, 0x0870, 0x05b0, 0x05b0, 0x15e0, 0x1820, + 0x05b0, 0x1830, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1840, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x0e60, 0x0870, 0x0870, 0x0870, 0x1870, - 0x1880, 0x05b0, 0x1890, 0x18a0, 0x05b0, 0x05b0, 0x05b0, 0x18b0, - 0x18c0, 0x05b0, 0x05b0, 0x1030, 0x18d0, 0x0f20, 0x0580, 0x18e0, - 0x07b0, 0x05b0, 0x18f0, 0x05b0, 0x1900, 0x1910, 0x0db0, 0x1920, - 0x08b0, 0x05b0, 0x05b0, 0x1930, 0x1940, 0x1950, 0x0c30, 0x1960, - 0x05b0, 0x05b0, 0x1970, 0x1980, 0x1990, 0x19a0, 0x0c30, 0x0c30, - 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x19b0, 0x19c0, 0x0760, 0x19d0, - 0x19e0, 0x19f0, 0x1640, 0x05b0, 0x05b0, 0x05b0, 0x0f60, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1a00, 0x0f20, - 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, - 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, - 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, - 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, - 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, - 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, - 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, - 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, - 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, - 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, - 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, - 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, - 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, - 0x1a30, 0x1a10, 0x1a20, 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, - 0x1a30, 0x1a40, 0x1a30, 0x1a50, 0x1a30, 0x1a10, 0x1a20, 0x1a30, - 0x1a40, 0x1a30, 0x1a60, 0x0dc0, 0x1a70, 0x0de0, 0x0de0, 0x1a80, - 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, - 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, 0x1a90, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1850, 0x0870, 0x0870, 0x1860, + 0x1870, 0x05b0, 0x1880, 0x1890, 0x05b0, 0x05b0, 0x05b0, 0x18a0, + 0x18b0, 0x05b0, 0x05b0, 0x1010, 0x18c0, 0x0f10, 0x0580, 0x18d0, + 0x07b0, 0x05b0, 0x18e0, 0x05b0, 0x18f0, 0x1900, 0x0da0, 0x1910, + 0x08b0, 0x05b0, 0x05b0, 0x1920, 0x1930, 0x1940, 0x0c30, 0x1950, + 0x05b0, 0x05b0, 0x1960, 0x1970, 0x1980, 0x1990, 0x0c30, 0x0c30, + 0x0c30, 0x0c30, 0x0c30, 0x0c30, 0x19a0, 0x19b0, 0x0760, 0x19c0, + 0x19d0, 0x19e0, 0x1620, 0x05b0, 0x05b0, 0x05b0, 0x0a50, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x19f0, 0x0f10, + 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, + 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, + 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, + 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, + 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, + 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, + 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, + 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, + 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, + 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, + 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, + 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, + 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, + 0x1a20, 0x1a00, 0x1a10, 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, + 0x1a20, 0x1a30, 0x1a20, 0x1a40, 0x1a20, 0x1a00, 0x1a10, 0x1a20, + 0x1a30, 0x1a20, 0x1a50, 0x0db0, 0x1a60, 0x0dd0, 0x0dd0, 0x1a70, + 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, + 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x1a80, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, 0x0870, - 0x13d0, 0x1aa0, 0x1ab0, 0x1ac0, 0x1ad0, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ae0, 0x1af0, 0x05b0, 0x05b0, - 0x05b0, 0x05b0, 0x05b0, 0x1b00, 0x0870, 0x05b0, 0x05b0, 0x05b0, - 0x05b0, 0x1b10, 0x05b0, 0x05b0, 0x0a50, 0x0870, 0x0870, 0x1b20, - 0x0580, 0x1b30, 0x0580, 0x1b40, 0x1b50, 0x1b60, 0x1b70, 0x1150, - 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1b80, - 0x1b90, 0x1ba0, 0x16a0, 0x1bb0, 0x16a0, 0x1bc0, 0x1bd0, 0x1be0, - 0x16a0, 0x1bf0, 0x16a0, 0x17b0, 0x1c00, 0x1c10, 0x1c20, 0x1c30, + 0x13b0, 0x1a90, 0x1aa0, 0x1ab0, 0x1ac0, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1ad0, 0x1ae0, 0x05b0, 0x05b0, + 0x05b0, 0x05b0, 0x05b0, 0x1af0, 0x0870, 0x05b0, 0x05b0, 0x05b0, + 0x05b0, 0x1b00, 0x05b0, 0x05b0, 0x0a50, 0x0870, 0x0870, 0x1b10, + 0x0580, 0x1b20, 0x0580, 0x1b30, 0x1b40, 0x1b50, 0x1b60, 0x1130, + 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x05b0, 0x1b70, + 0x1b80, 0x1b90, 0x1680, 0x1ba0, 0x1680, 0x1bb0, 0x1bc0, 0x1bd0, + 0x1680, 0x1be0, 0x1680, 0x1790, 0x1bf0, 0x1c00, 0x1c10, 0x1c20, /* values */ 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0022, 0x0003, 0x0001, 0x0001, 0x0002, 0x0004, 0x0004, @@ -365,7 +365,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0011, 0x001d, 0x001d, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0021, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, 0x001d, 0x001d, @@ -407,14 +407,12 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x001d, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, - 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0011, 0x0023, - 0x0023, 0x0011, 0x0023, 0x0011, 0x0011, 0x0023, 0x0011, 0x0011, - 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0011, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, - 0x0011, 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, + 0x0011, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, + 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0023, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, @@ -507,8 +505,6 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x0011, 0x0011, 0x0011, 0x0017, 0x0017, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, 0x001c, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, - 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, 0x0023, @@ -555,8 +551,8 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, - 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x0004, - 0x0004, 0x0004, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x0004, + 0x0004, 0x0004, 0x001d, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0011, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, @@ -732,7 +728,7 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0025, 0x0025, 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x0022, 0x0012, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, - 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0011, + 0x0022, 0x0022, 0x0022, 0x001d, 0x0022, 0x001d, 0x0022, 0x0022, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, 0x001e, @@ -791,6 +787,8 @@ const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7232] = 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x0004, 0x0004, 0x0004, 0x001d, 0x0022, 0x0022, 0x0022, 0x0022, 0x0022, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, + 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0011, + 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x0011, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, 0x001d, 0x001d, 0x0004, 0x001d, diff --git a/dlls/usp10/mirror.c b/dlls/usp10/mirror.c index 9239d79596..5c4abcd69a 100644 --- a/dlls/usp10/mirror.c +++ b/dlls/usp10/mirror.c @@ -1,5 +1,5 @@ /* Unicode BiDi mirroring */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/BidiMirroring.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/dlls/usp10/shaping.c b/dlls/usp10/shaping.c index 941bd59415..08e185e85e 100644 --- a/dlls/usp10/shaping.c +++ b/dlls/usp10/shaping.c @@ -1,5 +1,5 @@ /* Unicode Arabic shaping */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/ArabicShaping.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" @@ -258,7 +258,7 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2944] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -360,7 +360,7 @@ const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2944] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0001, 0x0000, 0x0000, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, diff --git a/dlls/wineps.drv/vertical.c b/dlls/wineps.drv/vertical.c index ca4467911c..1738deece6 100644 --- a/dlls/wineps.drv/vertical.c +++ b/dlls/wineps.drv/vertical.c @@ -1,5 +1,5 @@ /* Unicode Vertical Orientation */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/VerticalOrientation.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/VerticalOrientation.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/libs/port/casemap.c b/libs/port/casemap.c index 1c975dbfd2..3888109d09 100644 --- a/libs/port/casemap.c +++ b/libs/port/casemap.c @@ -1,5 +1,5 @@ /* Unicode case mappings */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" @@ -522,8 +522,8 @@ const WCHAR wine_casemap_lower[4259] = 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x5abc, 0x5ab1, 0x5ab5, 0x5abf, 0x5abc, 0x0000, 0x5aee, 0x5ad6, 0x5aeb, 0x03a0, 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0x0001, 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, + 0x0001, 0x0000, 0xffd0, 0x5abd, 0x75c8, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -562,7 +562,7 @@ const WCHAR wine_casemap_lower[4259] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 }; -const WCHAR wine_casemap_upper[4828] = +const WCHAR wine_casemap_upper[4838] = { /* index */ 0x019f, 0x029f, 0x039f, 0x045a, 0x0556, 0x0656, 0x0100, 0x0100, @@ -586,7 +586,7 @@ const WCHAR wine_casemap_upper[4828] = 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0f85, 0x1062, - 0x0100, 0x0100, 0x0100, 0x111c, 0x0100, 0x0100, 0x0100, 0x0100, + 0x0100, 0x0100, 0x0100, 0x1126, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, @@ -596,7 +596,7 @@ const WCHAR wine_casemap_upper[4828] = 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, - 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x11dc, + 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x11e6, /* defaults */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -701,7 +701,7 @@ const WCHAR wine_casemap_upper[4828] = 0xff2f, 0xff2d, 0xa544, 0x29f7, 0xa541, 0x0000, 0x0000, 0xff2d, 0x0000, 0x29fd, 0xff2b, 0x0000, 0x0000, 0xff2a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x29e7, 0x0000, 0x0000, - 0xff26, 0x0000, 0x0000, 0xff26, 0x0000, 0x0000, 0x0000, 0xa52a, + 0xff26, 0x0000, 0xa543, 0xff26, 0x0000, 0x0000, 0x0000, 0xa52a, 0xff26, 0xffbb, 0xff27, 0xff27, 0xffb9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xff25, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa515, 0xa512, 0x0000, @@ -895,7 +895,7 @@ const WCHAR wine_casemap_upper[4828] = /* 0x1d77 .. 0x1dff */ 0x0000, 0x0000, 0x8a04, 0x0000, 0x0000, 0x0000, 0x0ee6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8a38, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1131,13 +1131,13 @@ const WCHAR wine_casemap_upper[4828] = 0x0000, 0xffff, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, - 0xffff, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, + 0xffff, 0x0030, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0xffff, 0x0000, 0xffff, 0x0000, 0xffff, 0x0000, 0x0000, 0x0000, + 0xffff, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1145,13 +1145,14 @@ const WCHAR wine_casemap_upper[4828] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - /* 0xab46 .. 0xabff */ + /* 0xab3c .. 0xabff */ 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfc60, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xfc60, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, @@ -1161,7 +1162,7 @@ const WCHAR wine_casemap_upper[4828] = 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, 0x6830, - 0x6830, 0x6830, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x6830, 0x6830, 0x6830, 0x6830, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1169,7 +1170,7 @@ const WCHAR wine_casemap_upper[4828] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, /* 0xff40 .. 0xffff */ 0x0000, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, 0xffe0, diff --git a/libs/port/combclass.c b/libs/port/combclass.c index 1567812c33..48a2ff4e77 100644 --- a/libs/port/combclass.c +++ b/libs/port/combclass.c @@ -1,5 +1,5 @@ /* Unicode Combining Classes */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" @@ -188,7 +188,7 @@ const unsigned short DECLSPEC_HIDDEN combining_class_table[2208] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x006b, 0x006b, 0x006b, 0x006b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0076, 0x0076, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0076, 0x0076, 0x0009, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x007a, 0x007a, 0x007a, 0x007a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, diff --git a/libs/port/compose.c b/libs/port/compose.c index 06f6062d24..4a0c5100b8 100644 --- a/libs/port/compose.c +++ b/libs/port/compose.c @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/libs/port/decompose.c b/libs/port/decompose.c index e8305d938b..7026704be0 100644 --- a/libs/port/decompose.c +++ b/libs/port/decompose.c @@ -1,5 +1,5 @@ /* Unicode char composition */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/libs/port/digitmap.c b/libs/port/digitmap.c index 79a86651cc..278e227316 100644 --- a/libs/port/digitmap.c +++ b/libs/port/digitmap.c @@ -1,5 +1,5 @@ /* Unicode digit folding mappings */ -/* generated from http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt */ +/* generated from http://www.unicode.org/Public/12.0.0/ucd/UnicodeData.txt */ /* DO NOT EDIT!! */ #include "wine/unicode.h" diff --git a/libs/port/wctype.c b/libs/port/wctype.c index 4153cb82f7..da19148f2a 100644 --- a/libs/port/wctype.c +++ b/libs/port/wctype.c @@ -437,7 +437,7 @@ const unsigned short wine_wctype_table[17152] = 0x1300, 0x1300, 0x1300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0xd200, 0xd200, 0x0000, 0x0000, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1210, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x1200, 0x1300, 0xd200, 0x1200, 0x1200, 0x1210, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x1300, @@ -503,14 +503,14 @@ const unsigned short wine_wctype_table[17152] = 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x1300, 0x1300, 0x0000, 0x1300, 0x0000, 0x0000, 0x1300, - 0x1300, 0x0000, 0x1300, 0x0000, 0x0000, 0x1300, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, - 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, - 0x0000, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x0000, 0x1300, - 0x0000, 0x0000, 0x1300, 0x1300, 0x0000, 0x1300, 0x1300, 0x1300, + 0x0000, 0x1300, 0x1300, 0x0000, 0x1300, 0x0000, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x0000, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0xd200, 0x1300, 0x1300, 0xd200, 0xd200, 0xd200, 0xd200, - 0xd200, 0xd200, 0x0000, 0xd200, 0xd200, 0x1300, 0x0000, 0x0000, + 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1300, 0x0000, 0x0000, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x0000, 0x1300, 0x0000, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x0000, 0x0000, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, @@ -724,7 +724,7 @@ const unsigned short wine_wctype_table[17152] = 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, - 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1210, 0x1210, 0x1300, + 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1200, 0x1210, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0xa208, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, @@ -933,8 +933,8 @@ const unsigned short wine_wctype_table[17152] = 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0xd200, 0x1300, 0x1300, 0x1300, 0x1300, 0xd200, 0x1300, 0x1300, - 0x1300, 0x1300, 0x1200, 0x1200, 0xd200, 0x1300, 0x1300, 0x1200, - 0xd200, 0xd200, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1300, 0x1300, 0x1300, 0x1300, 0xd200, 0x1300, 0x1300, 0x1200, + 0xd200, 0xd200, 0x1300, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, @@ -1376,13 +1376,13 @@ const unsigned short wine_wctype_table[17152] = 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, - 0xb200, 0x0000, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, - 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x0000, + 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, + 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0xb200, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, @@ -1456,7 +1456,7 @@ const unsigned short wine_wctype_table[17152] = 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, - 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x0000, + 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0xb210, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1790,8 +1790,8 @@ const unsigned short wine_wctype_table[17152] = 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1302, 0x1301, 0x1301, 0x1301, 0x1301, 0x1301, 0x1302, 0x1301, 0x1302, - 0x1301, 0x1302, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, 0x1301, 0x1302, + 0x0000, 0x0000, 0x1301, 0x1302, 0x1301, 0x1301, 0x1301, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, @@ -1854,7 +1854,7 @@ const unsigned short wine_wctype_table[17152] = 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0x1300, 0xd200, 0x1200, 0x1200, 0xd200, 0xd200, - 0xd200, 0xd200, 0x1200, 0x1200, 0xd200, 0x1200, 0x1200, 0x1200, + 0xd200, 0xd200, 0x1200, 0x1200, 0xd200, 0xd200, 0x1200, 0x1200, 0x1200, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x1210, 0x0000, 0x1300, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, 0x1204, @@ -1907,7 +1907,7 @@ const unsigned short wine_wctype_table[17152] = 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1200, 0x1300, 0x1300, 0x1300, 0x1300, - 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x0000, 0x0000, + 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, 0x1302, diff --git a/loader/l_intl.nls b/loader/l_intl.nls index 29c2294b91c780e725fdb4f36b98d7665d4daedb..f3c256c7e38203aadb7466710793a3a5cc70434c 100644 GIT binary patch delta 337 zcmZoOIcCDl$nbFTQeNwgc4Ev-A6O=bF)KJQux?;NKmk?-RskSXU^M`e4q&zbYXEBk zYXNHmkPKjgzzJa10@e+zlMgUy=p10Z0GDcDX<&K4`hk^!4PopCCIL1DHUl7ZU;}DU z@&`!;umu3g1R#kD6POd2AzBOA8rUYVEnwRK)QqYofaw5G<N_NMZmwqGWoB|-y19!z zhH3J5E-4m^E(V6l57@*u|Kb#4W;B@G$fG!U0vpfdeLNzQ{djpM-(%xpV*rALKa&|b tBqq1;Dlj^3Udk)U!eqd<`GBAm$K*3Ye3Ju2*d#9e-y3zJ6r>gv008#XQmX&} delta 310 zcmX?R(q_WU$Z&D;QC{nfc4Ev-0Zfy_m=zp8uxwyLKn7L;Rt6vxU{wH;24FS=s{?BQ zYXWNlkPHB71HlF`YXa*6*2xE$G;}tw9zaO3G_YJ?eZcyG6=CcKCI&VEHU%IwU;}DU z@&`#dumu3g03eA96POd2AzBmI3fLOhCa^8QPy^Hn6g$8Mg`2Bcc$t|P7&dpY$1qJ+ zW8<6rfsJjm6qgY5<TvbGlh3g!Oy0oCGWi~l$mBd;9w05il<;RVBZtJ~CA<oZhMSM_ SO0qC1Fl~MyXvM+9fCK<sRY|x2 diff --git a/tools/make_unicode b/tools/make_unicode index 5060548752..4d1e219d96 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -23,7 +23,7 @@ use strict; # base URLs for www.unicode.org files my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; -my $UNIDATA = "http://www.unicode.org/Public/11.0.0/ucd"; +my $UNIDATA = "http://www.unicode.org/Public/12.0.0/ucd"; my $REPORTS = "http://www.unicode.org/reports"; my $RFCS = "http://www.rfc-editor.org/rfc"; -- 2.20.1

1 0

[PATCH] server: zero allocated memory after allocating mappings
by Jefferson Carpenter 29 Apr '19

29 Apr '19

2 4

[PATCH v2] dinput: Don't return IDirectInput8 interface when using DirectX 7
by Alistair Leslie-Hughes 29 Apr '19

29 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/dinput_main.c | 17 ++++++++--------- dlls/dinput/tests/dinput.c | 21 ++++----------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 1b2020c..e87b684 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -566,6 +566,8 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE if (!riid || !ppobj) return E_POINTER; + *ppobj = NULL; + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IDirectInputA, riid ) || IsEqualGUID( &IID_IDirectInput2A, riid ) || @@ -587,21 +589,19 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE return DI_OK; } +#if DIRECTINPUT_VERSION == 0x0800 if (IsEqualGUID( &IID_IDirectInput8A, riid )) - { *ppobj = &This->IDirectInput8A_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; - } + else if (IsEqualGUID( &IID_IDirectInput8W, riid )) + *ppobj = &This->IDirectInput8W_iface; - if (IsEqualGUID( &IID_IDirectInput8W, riid )) + if(*ppobj) { - *ppobj = &This->IDirectInput8W_iface; IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; } +#endif if (IsEqualGUID( &IID_IDirectInputJoyConfig8, riid )) { @@ -611,8 +611,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE return DI_OK; } - FIXME( "Unsupported interface: %s\n", debugstr_guid(riid)); - *ppobj = NULL; + WARN( "Unsupported interface: %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 23b20d2..6451241 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -272,11 +272,10 @@ static void test_QueryInterface(void) static const struct { REFIID riid; - int test_todo; } no_interface_list[] = { - {&IID_IDirectInput8A, 1}, - {&IID_IDirectInput8W, 1}, + {&IID_IDirectInput8A}, + {&IID_IDirectInput8W}, {&IID_IDirectInputDeviceA}, {&IID_IDirectInputDeviceW}, {&IID_IDirectInputDevice2A}, @@ -324,20 +323,8 @@ static void test_QueryInterface(void) { pUnk = (void *)0xdeadbeef; hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); - if (no_interface_list[i].test_todo) - { - todo_wine - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - todo_wine - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - - if (pUnk) IUnknown_Release(pUnk); - } - else - { - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } IDirectInput_Release(pDI); -- 1.9.1

1 0

[PATCH v2] qcap: implement and test VfwPin_CheckMediaType()
by Damjan Jovanovic 29 Apr '19

29 Apr '19

VfwPin_CheckMediaType() always return a hardcoded E_NOTIMPL, preventing any media format from being negotiated, and limiting video capture devices from connecting to many other filters. Implement it and test. In try 2, instead of the high-level test of connecting to a NullRenderer, more elaborate lower-level testing is done: we test that the device can accept all of its own media types, and prove that AM_MEDIA_TYPEs of NULL, GUID_NULL, FORMAT_Empty, and a NULL pbFormat, all fail. The implementation matches results obtained by testing against 2 webcams on Windows. Also coding style was cleaned up. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/qcap/capture.h | 1 + dlls/qcap/tests/Makefile.in | 3 +- dlls/qcap/tests/videocapture.c | 149 +++++++++++++++++++++++++++++++++ dlls/qcap/v4l.c | 50 +++++++++-- dlls/qcap/vfwcapture.c | 4 +- 5 files changed, 198 insertions(+), 9 deletions(-) create mode 100644 dlls/qcap/tests/videocapture.c

2 2

[PATCH v2] authz: Add AuthzFreeResourceManager stub
by Alistair Leslie-Hughes 29 Apr '19

29 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47082 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/authz/authz.c | 9 +++++++++ dlls/authz/authz.spec | 2 +- include/authz.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 5502e79..72d462d 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -59,6 +59,15 @@ BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, PFN_AUTHZ_DYNAMIC_ACCESS return FALSE; } +/*********************************************************************** + * AuthzFreeResourceManager (AUTHZ.@) + */ +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE handle) +{ + FIXME("%p\n", handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /*********************************************************************** * AuthzInstallSecurityEventSource (AUTHZ.@) diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index eb9e044..933e3d5 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -6,7 +6,7 @@ @ stub AuthzFreeAuditEvent @ stdcall AuthzFreeContext(long) @ stub AuthzFreeHandle -@ stub AuthzFreeResourceManager +@ stdcall AuthzFreeResourceManager(ptr) @ stub AuthzGetInformationFromContext @ stub AuthzInitializeContextFromAuthzContext @ stdcall AuthzInitializeContextFromSid(long ptr long ptr int64 ptr ptr) diff --git a/include/authz.h b/include/authz.h index 42edc8c..d93372a 100644 --- a/include/authz.h +++ b/include/authz.h @@ -103,6 +103,7 @@ BOOL WINAPI AuthzAccessCheck(DWORD flags, AUTHZ_CLIENT_CONTEXT_HANDLE client_con AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *access_check_result); BOOL WINAPI AuthzFreeContext(AUTHZ_CLIENT_CONTEXT_HANDLE client_context); +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE handle); BOOL WINAPI AuthzInitializeContextFromSid(DWORD flags, PSID sid, AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time, -- 1.9.1

1 0

[PATCH] authz: Add AuthzFreeResourceManager stub
by Alistair Leslie-Hughes 29 Apr '19

29 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47082 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/authz/authz.c | 9 +++++++++ dlls/authz/authz.spec | 2 +- include/authz.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 5502e79..be324f7 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -59,6 +59,15 @@ BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, PFN_AUTHZ_DYNAMIC_ACCESS return FALSE; } +/*********************************************************************** + * AuthzFreeResourceManager (AUTHZ.@) + */ +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE *handle) +{ + FIXME("%p\n", handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} /*********************************************************************** * AuthzInstallSecurityEventSource (AUTHZ.@) diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index eb9e044..933e3d5 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -6,7 +6,7 @@ @ stub AuthzFreeAuditEvent @ stdcall AuthzFreeContext(long) @ stub AuthzFreeHandle -@ stub AuthzFreeResourceManager +@ stdcall AuthzFreeResourceManager(ptr) @ stub AuthzGetInformationFromContext @ stub AuthzInitializeContextFromAuthzContext @ stdcall AuthzInitializeContextFromSid(long ptr long ptr int64 ptr ptr) diff --git a/include/authz.h b/include/authz.h index 42edc8c..6ab8001 100644 --- a/include/authz.h +++ b/include/authz.h @@ -103,6 +103,7 @@ BOOL WINAPI AuthzAccessCheck(DWORD flags, AUTHZ_CLIENT_CONTEXT_HANDLE client_con AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *access_check_result); BOOL WINAPI AuthzFreeContext(AUTHZ_CLIENT_CONTEXT_HANDLE client_context); +BOOL WINAPI AuthzFreeResourceManager(AUTHZ_RESOURCE_MANAGER_HANDLE *handle); BOOL WINAPI AuthzInitializeContextFromSid(DWORD flags, PSID sid, AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, LARGE_INTEGER *expire_time, -- 1.9.1

2 1

[PATCH] winegcc: Add support for -fno-PIC.
by Zebediah Figura 29 Apr '19

29 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/winegcc/winegcc.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 46b67ce810..fa95c6d490 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -208,6 +208,7 @@ struct options int wine_builtin; int unwind_tables; int strip; + int pic; const char* wine_objdir; const char* output_name; const char* image_base; @@ -684,7 +685,10 @@ static void compile(struct options* opts, const char* lang) strarray_add(comp_args, "-DWINE_UNICODE_NATIVE"); } strarray_add(comp_args, "-D_REENTRANT"); - strarray_add(comp_args, "-fPIC"); + if (opts->pic) + strarray_add(comp_args, "-fPIC"); + else + strarray_add(comp_args, "-fno-PIC"); } if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) @@ -1026,7 +1030,10 @@ static void build(struct options* opts) if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size )); strarray_add(spec_args, "-D_REENTRANT"); - strarray_add(spec_args, "-fPIC"); + if (opts->pic) + strarray_add(spec_args, "-fPIC"); + else + strarray_add(spec_args, "-fno-PIC"); strarray_add(spec_args, opts->shared ? "--dll" : "--exe"); if (fake_module) { @@ -1345,6 +1352,7 @@ int main(int argc, char **argv) opts.linker_args = strarray_alloc(); opts.compiler_args = strarray_alloc(); opts.winebuild_args = strarray_alloc(); + opts.pic = 1; /* determine the processor type */ if (strendswith(argv[0], "winecpp")) opts.processor = proc_cpp; @@ -1466,6 +1474,10 @@ int main(int argc, char **argv) opts.unwind_tables = 1; else if (!strcmp("-fno-asynchronous-unwind-tables", argv[i])) opts.unwind_tables = 0; + else if (!strcmp("-fPIC", argv[i]) || !strcmp("-fpic", argv[i])) + opts.pic = 1; + else if (!strcmp("-fno-PIC", argv[i]) || !strcmp("-fno-pic", argv[i])) + opts.pic = 0; break; case 'l': strarray_add(opts.files, strmake("-l%s", option_arg)); -- 2.21.0

1 0

[PATCH] kernel32/tests: Avoid a crash on WinXP and Win2K.
by Jactry Zeng 29 Apr '19

29 Apr '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/kernel32/tests/sync.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 8dea3b30c3..188689a9f4 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -38,6 +38,7 @@ static BOOL (WINAPI *pInitOnceExecuteOnce)(PINIT_ONCE,PINIT_ONCE_FN,PVOID,LPVO static BOOL (WINAPI *pInitOnceBeginInitialize)(PINIT_ONCE,DWORD,BOOL*,LPVOID*); static BOOL (WINAPI *pInitOnceComplete)(PINIT_ONCE,DWORD,LPVOID); +static BOOL (WINAPI *pInitializeCriticalSectionEx)(CRITICAL_SECTION*,DWORD,DWORD); static VOID (WINAPI *pInitializeConditionVariable)(PCONDITION_VARIABLE); static BOOL (WINAPI *pSleepConditionVariableCS)(PCONDITION_VARIABLE,PCRITICAL_SECTION,DWORD); static BOOL (WINAPI *pSleepConditionVariableSRW)(PCONDITION_VARIABLE,PSRWLOCK,DWORD,ULONG); @@ -2648,8 +2649,14 @@ static void test_crit_section(void) ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); + if (!pInitializeCriticalSectionEx) + { + win_skip("InitializeCriticalSectionEx isn't available, skipping tests.\n"); + return; + } + memset(&cs, 0, sizeof(cs)); - ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); @@ -2672,6 +2679,7 @@ START_TEST(sync) pSleepConditionVariableSRW = (void *)GetProcAddress(hdll, "SleepConditionVariableSRW"); pWakeAllConditionVariable = (void *)GetProcAddress(hdll, "WakeAllConditionVariable"); pWakeConditionVariable = (void *)GetProcAddress(hdll, "WakeConditionVariable"); + pInitializeCriticalSectionEx = (void *)GetProcAddress(hdll, "InitializeCriticalSectionEx"); pInitializeSRWLock = (void *)GetProcAddress(hdll, "InitializeSRWLock"); pAcquireSRWLockExclusive = (void *)GetProcAddress(hdll, "AcquireSRWLockExclusive"); pAcquireSRWLockShared = (void *)GetProcAddress(hdll, "AcquireSRWLockShared"); -- 2.20.1

1 0

[PATCH v2 1/4] quartz: Convert media type registration to IRegistrar mechanism.
by Zebediah Figura 29 Apr '19

29 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/{version.rc => quartz.rc} | 3 + dlls/quartz/quartz.rgs | 82 +++++++ dlls/quartz/regsvr.c | 305 -------------------------- 4 files changed, 86 insertions(+), 306 deletions(-) rename dlls/quartz/{version.rc => quartz.rc} (95%) create mode 100644 dlls/quartz/quartz.rgs diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index efd96dbb1c..4e5f18d20a 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -24,7 +24,7 @@ C_SRCS = \ vmr9.c \ waveparser.c -RC_SRCS = version.rc +RC_SRCS = quartz.rc IDL_SRCS = \ control_tlb.idl \ diff --git a/dlls/quartz/version.rc b/dlls/quartz/quartz.rc similarity index 95% rename from dlls/quartz/version.rc rename to dlls/quartz/quartz.rc index 8245cfbe0d..2355351274 100644 --- a/dlls/quartz/version.rc +++ b/dlls/quartz/quartz.rc @@ -25,3 +25,6 @@ #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" + +/* @makedep: quartz.rgs */ +1 WINE_REGISTRY quartz.rgs diff --git a/dlls/quartz/quartz.rgs b/dlls/quartz/quartz.rgs new file mode 100644 index 0000000000..f99f59423e --- /dev/null +++ b/dlls/quartz/quartz.rgs @@ -0,0 +1,82 @@ +HKCR +{ + NoRemove 'Media Type' + { + '{e436eb83-524f-11ce-9f53-0020af0ba770}' + { + '{7364696d-0000-0010-8000-00aa00389b71}' + { + val '0' = s '0,4,,52494646,8,4,,524d4944' + val '1' = s '0,4,,4d546864' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{73747874-0000-0010-8000-00aa00389b71}' + { + val '0' = s '0,4,,4c595249' + val '1' = s '0,4,,6c797269' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e06d8022-db46-11cf-b4d1-00805f6cbbea}' + { + val '0' = s '0,5,ffffffffc0,000001ba40' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb84-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,16,fffffffff100010001800001ffffffff,000001ba2100010001800001000001bb' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb85-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,4,,52494646,8,8,,43445841666D7420,36,20,FFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFF,646174610000000000FFFFFFFFFFFFFFFFFFFF00' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb86-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,4,,000001b3' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb87-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,2,ffe0,ffe0' + val '1' = s '0,10,ffffff00000080808080,494433000000000000' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb88-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,4,,52494646,8,4,,41564920' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb89-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '4,4,,6d646174' + val '1' = s '4,4,,6d6f6f76' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb8b-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,4,,52494646,8,4,,57415645' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb8c-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,4,,2e736e64' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + '{e436eb8d-524f-11ce-9f53-0020af0ba770}' + { + val '0' = s '0,4,,464f524d,8,4,,41494646' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + } + NoRemove Extensions + { + '.mp3' + { + val 'Media Type' = s '{e436eb83-524f-11ce-9f53-0020af0ba770}' + val 'Subtype' = s '{e436eb87-524f-11ce-9f53-0020af0ba770}' + val 'Source Filter' = s '{e436ebb5-524f-11ce-9f53-0020af0ba770}' + } + } + } +} diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index 839af311a6..7773caa947 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -45,23 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); * DllUnregisterServer, which make all this worthwhile. */ -struct regsvr_mediatype_parsing -{ - CLSID const *majortype; /* NULL for end of list */ - CLSID const *subtype; - LPCSTR line[11]; /* NULL for end of list */ -}; - -static HRESULT register_mediatypes_parsing(struct regsvr_mediatype_parsing const *list); -static HRESULT unregister_mediatypes_parsing(struct regsvr_mediatype_parsing const *list); - -struct regsvr_mediatype_extension -{ - CLSID const *majortype; /* NULL for end of list */ - CLSID const *subtype; - LPCSTR extension; -}; - struct mediatype { CLSID const *majortype; /* NULL for end of list */ @@ -84,201 +67,6 @@ struct regsvr_filter struct pin pins[11]; }; -static HRESULT register_mediatypes_extension(struct regsvr_mediatype_extension const *list); -static HRESULT unregister_mediatypes_extension(struct regsvr_mediatype_extension const *list); - -static HRESULT register_filters(struct regsvr_filter const *list); -static HRESULT unregister_filters(struct regsvr_filter const *list); - -/*********************************************************************** - * static string constants - */ -static const WCHAR mediatype_name[] = { - 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; -static const WCHAR subtype_valuename[] = { - 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; -static const WCHAR sourcefilter_valuename[] = { - 'S', 'o', 'u', 'r', 'c', 'e', ' ', 'F', 'i', 'l', 't', 'e', 'r', 0 }; -static const WCHAR extensions_keyname[] = { - 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 's', 0 }; - -/*********************************************************************** - * register_mediatypes_parsing - */ -static HRESULT register_mediatypes_parsing(struct regsvr_mediatype_parsing const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY mediatype_key; - WCHAR buf[39]; - int i; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &mediatype_key, NULL); - if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); - - for (; res == ERROR_SUCCESS && list->majortype; ++list) { - HKEY majortype_key = NULL; - HKEY subtype_key = NULL; - - StringFromGUID2(list->majortype, buf, 39); - res = RegCreateKeyExW(mediatype_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &majortype_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_keys; - - StringFromGUID2(list->subtype, buf, 39); - res = RegCreateKeyExW(majortype_key, buf, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &subtype_key, NULL); - if (res != ERROR_SUCCESS) goto error_close_keys; - - StringFromGUID2(&CLSID_AsyncReader, buf, 39); - res = RegSetValueExW(subtype_key, sourcefilter_valuename, 0, REG_SZ, (const BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - if (res != ERROR_SUCCESS) goto error_close_keys; - - for(i = 0; list->line[i]; i++) { - char buffer[3]; - wsprintfA(buffer, "%d", i); - res = RegSetValueExA(subtype_key, buffer, 0, REG_SZ, (const BYTE*)list->line[i], - lstrlenA(list->line[i])); - if (res != ERROR_SUCCESS) goto error_close_keys; - } - -error_close_keys: - if (majortype_key) - RegCloseKey(majortype_key); - if (subtype_key) - RegCloseKey(subtype_key); - } - - RegCloseKey(mediatype_key); - - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * register_mediatypes_extension - */ -static HRESULT register_mediatypes_extension(struct regsvr_mediatype_extension const *list) -{ - LONG res = ERROR_SUCCESS; - HKEY mediatype_key; - HKEY extensions_root_key = NULL; - WCHAR buf[39]; - - res = RegCreateKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &mediatype_key, NULL); - if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); - - res = RegCreateKeyExW(mediatype_key, extensions_keyname, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &extensions_root_key, NULL); - if (res != ERROR_SUCCESS) goto error_return; - - for (; res == ERROR_SUCCESS && list->majortype; ++list) { - HKEY extension_key; - - res = RegCreateKeyExA(extensions_root_key, list->extension, 0, NULL, 0, - KEY_READ | KEY_WRITE, NULL, &extension_key, NULL); - if (res != ERROR_SUCCESS) break; - - StringFromGUID2(list->majortype, buf, 39); - res = RegSetValueExW(extension_key, mediatype_name, 0, REG_SZ, (const BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - if (res != ERROR_SUCCESS) goto error_close_key; - - StringFromGUID2(list->subtype, buf, 39); - res = RegSetValueExW(extension_key, subtype_valuename, 0, REG_SZ, (const BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - if (res != ERROR_SUCCESS) goto error_close_key; - - StringFromGUID2(&CLSID_AsyncReader, buf, 39); - res = RegSetValueExW(extension_key, sourcefilter_valuename, 0, REG_SZ, (const BYTE*)buf, - (lstrlenW(buf) + 1) * sizeof(WCHAR)); - if (res != ERROR_SUCCESS) goto error_close_key; - -error_close_key: - RegCloseKey(extension_key); - } - -error_return: - RegCloseKey(mediatype_key); - if (extensions_root_key) - RegCloseKey(extensions_root_key); - - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_mediatypes_parsing - */ -static HRESULT unregister_mediatypes_parsing(struct regsvr_mediatype_parsing const *list) -{ - LONG res; - HKEY mediatype_key; - HKEY majortype_key; - WCHAR buf[39]; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, - KEY_READ | KEY_WRITE, &mediatype_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); - - for (; res == ERROR_SUCCESS && list->majortype; ++list) { - StringFromGUID2(list->majortype, buf, 39); - res = RegOpenKeyExW(mediatype_key, buf, 0, - KEY_READ | KEY_WRITE, &majortype_key); - if (res == ERROR_FILE_NOT_FOUND) { - res = ERROR_SUCCESS; - continue; - } - if (res != ERROR_SUCCESS) break; - - StringFromGUID2(list->subtype, buf, 39); - res = RegDeleteTreeW(majortype_key, buf); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - - /* Removed majortype key if there is no more subtype key */ - res = RegDeleteKeyW(majortype_key, 0); - if (res == ERROR_ACCESS_DENIED) res = ERROR_SUCCESS; - - RegCloseKey(majortype_key); - } - - RegCloseKey(mediatype_key); - - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - -/*********************************************************************** - * unregister_mediatypes_extension - */ -static HRESULT unregister_mediatypes_extension(struct regsvr_mediatype_extension const *list) -{ - LONG res; - HKEY mediatype_key; - HKEY extensions_root_key = NULL; - - res = RegOpenKeyExW(HKEY_CLASSES_ROOT, mediatype_name, 0, - KEY_READ | KEY_WRITE, &mediatype_key); - if (res == ERROR_FILE_NOT_FOUND) return S_OK; - if (res != ERROR_SUCCESS) return HRESULT_FROM_WIN32(res); - - res = RegOpenKeyExW(mediatype_key, extensions_keyname, 0, - KEY_READ | KEY_WRITE, &extensions_root_key); - if (res == ERROR_FILE_NOT_FOUND) - res = ERROR_SUCCESS; - else if (res == ERROR_SUCCESS) - for (; res == ERROR_SUCCESS && list->majortype; ++list) { - res = RegDeleteTreeA(extensions_root_key, list->extension); - if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; - } - - RegCloseKey(mediatype_key); - if (extensions_root_key) - RegCloseKey(extensions_root_key); - - return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; -} - /*********************************************************************** * register_filters */ @@ -386,91 +174,6 @@ static HRESULT unregister_filters(struct regsvr_filter const *list) return hr; } -/*********************************************************************** - * mediatype list - */ - -static struct regsvr_mediatype_parsing const mediatype_parsing_list[] = { - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_Avi, - { "0,4,,52494646,8,4,,41564920", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_MPEG1System, - { "0, 16, FFFFFFFFF100010001800001FFFFFFFF, 000001BA2100010001800001000001BB", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_MPEG1VideoCD, - { "0, 4, , 52494646, 8, 8, , 43445841666D7420, 36, 20, FFFFFFFF00000000FFFFFFFFFFFFFFFFFFFFFFFF, 646174610000000000FFFFFFFFFFFFFFFFFFFF00", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_MPEG1Video, - { "0, 4, , 000001B3", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_MPEG1Audio, - { "0, 2, FFE0, FFE0", - "0, 10, FFFFFF00000080808080, 494433000000000000", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_MPEG2_PROGRAM, - { "0, 5, FFFFFFFFC0, 000001BA40", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_QTMovie, - { "4, 4, , 6d646174", - "4, 4, , 6d6f6f76", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_WAVE, - { "0,4,,52494646,8,4,,57415645", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_AU, - { "0,4,,2e736e64", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_AIFF, - { "0,4,,464f524d,8,4,,41494646", - "0,4,,464f524d,8,4,,41494643", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIATYPE_Text, - { "0,4,,4C595249", - "0,4,,6C797269", - NULL } - }, - { &MEDIATYPE_Stream, - &MEDIATYPE_Midi, - { "0,4,,52494646,8,4,,524D4944", - "0,4,,4D546864", - NULL } - }, - { NULL } /* list terminator */ -}; - -/*********************************************************************** - * mediatype list - */ - -static struct regsvr_mediatype_extension const mediatype_extension_list[] = { - { &MEDIATYPE_Stream, - &MEDIASUBTYPE_MPEG1Audio, - ".mp3" - }, - { NULL } /* list terminator */ -}; - /*********************************************************************** * filter list */ @@ -687,10 +390,6 @@ HRESULT WINAPI DllRegisterServer(void) TRACE("\n"); hr = QUARTZ_DllRegisterServer(); - if (SUCCEEDED(hr)) - hr = register_mediatypes_parsing(mediatype_parsing_list); - if (SUCCEEDED(hr)) - hr = register_mediatypes_extension(mediatype_extension_list); if (SUCCEEDED(hr)) hr = register_filters(filter_list); return hr; @@ -706,10 +405,6 @@ HRESULT WINAPI DllUnregisterServer(void) TRACE("\n"); hr = unregister_filters(filter_list); - if (SUCCEEDED(hr)) - hr = unregister_mediatypes_parsing(mediatype_parsing_list); - if (SUCCEEDED(hr)) - hr = unregister_mediatypes_extension(mediatype_extension_list); if (SUCCEEDED(hr)) hr = QUARTZ_DllUnregisterServer(); return hr; -- 2.21.0

1 3

[PATCH 5/5] dinput: Support DIDEVICEINSTANCE_DX3 for Mouse GetDeviceInfo
by Alistair Leslie-Hughes 28 Apr '19

28 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/mouse.c | 5 ----- dlls/dinput/tests/mouse.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index f3ec8e4f03..58c78a5cc7 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -765,11 +765,6 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceInfo( SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); TRACE("(this=%p,%p)\n", This, pdidi); - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEA)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - fill_mouse_dideviceinstanceA(pdidi, This->base.dinput->dwVersion); return DI_OK; diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index c2d0226487..c1a7ff7dec 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -198,6 +198,35 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DestroyWindow( hwnd2 ); } +static void test_GetDeviceInfo(IDirectInputA *pDI) +{ + HRESULT hr; + IDirectInputDeviceA *pMouse = NULL; + DIDEVICEINSTANCEA instA; + DIDEVICEINSTANCE_DX3A inst3A; + + hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); + ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %08x\n", hr); + if (FAILED(hr)) return; + + instA.dwSize = sizeof(instA); + hr = IDirectInputDevice_GetDeviceInfo(pMouse, &instA); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + inst3A.dwSize = sizeof(inst3A); + hr = IDirectInputDevice_GetDeviceInfo(pMouse, (DIDEVICEINSTANCEA *)&inst3A); + ok(SUCCEEDED(hr), "got %08x\n", hr); + + ok(instA.dwSize != inst3A.dwSize, "got %d, %d \n", instA.dwSize, inst3A.dwSize); + ok(IsEqualGUID(&instA.guidInstance, &inst3A.guidInstance), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidInstance), wine_dbgstr_guid(&inst3A.guidInstance) ); + ok(IsEqualGUID(&instA.guidProduct, &inst3A.guidProduct), "got %s, %s\n", + wine_dbgstr_guid(&instA.guidProduct), wine_dbgstr_guid(&inst3A.guidProduct) ); + ok(instA.dwDevType == inst3A.dwDevType, "got %d, %d\n", instA.dwDevType, inst3A.dwDevType); + + if (pMouse) IUnknown_Release(pMouse); +} + static void mouse_tests(void) { HRESULT hr; @@ -224,6 +253,7 @@ static void mouse_tests(void) test_set_coop(pDI, hwnd); test_acquire(pDI, hwnd); + test_GetDeviceInfo(pDI); DestroyWindow(hwnd); } -- 2.20.1

2 1

[PATCH 1/5] dinput: Don't return IDirectInput8 interface when using DirectX 7
by Alistair Leslie-Hughes 28 Apr '19

28 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/dinput_main.c | 14 ++++++-------- dlls/dinput/tests/dinput.c | 21 ++++----------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 1b2020c711..720635f937 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -587,21 +587,19 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE return DI_OK; } +#if DIRECTINPUT_VERSION == 0x0800 if (IsEqualGUID( &IID_IDirectInput8A, riid )) - { *ppobj = &This->IDirectInput8A_iface; - IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; - } + else if (IsEqualGUID( &IID_IDirectInput8W, riid )) + *ppobj = &This->IDirectInput8W_iface; - if (IsEqualGUID( &IID_IDirectInput8W, riid )) + if(*ppobj) { - *ppobj = &This->IDirectInput8W_iface; IUnknown_AddRef( (IUnknown*)*ppobj ); - return DI_OK; } +#endif if (IsEqualGUID( &IID_IDirectInputJoyConfig8, riid )) { @@ -611,7 +609,7 @@ static HRESULT WINAPI IDirectInputAImpl_QueryInterface(LPDIRECTINPUT7A iface, RE return DI_OK; } - FIXME( "Unsupported interface: %s\n", debugstr_guid(riid)); + WARN( "Unsupported interface: %s\n", debugstr_guid(riid)); *ppobj = NULL; return E_NOINTERFACE; } diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 23b20d2b9e..6451241d38 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -272,11 +272,10 @@ static void test_QueryInterface(void) static const struct { REFIID riid; - int test_todo; } no_interface_list[] = { - {&IID_IDirectInput8A, 1}, - {&IID_IDirectInput8W, 1}, + {&IID_IDirectInput8A}, + {&IID_IDirectInput8W}, {&IID_IDirectInputDeviceA}, {&IID_IDirectInputDeviceW}, {&IID_IDirectInputDevice2A}, @@ -324,20 +323,8 @@ static void test_QueryInterface(void) { pUnk = (void *)0xdeadbeef; hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); - if (no_interface_list[i].test_todo) - { - todo_wine - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - todo_wine - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - - if (pUnk) IUnknown_Release(pUnk); - } - else - { - ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); - ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); - } + ok(hr == E_NOINTERFACE, "[%d] IDirectInput_QueryInterface returned 0x%08x\n", i, hr); + ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } IDirectInput_Release(pDI); -- 2.20.1

2 1

[PATCH v2] kernel32: Consider the working directory first when launching executables with CreateProcess.
by Erich E. Hoover 28 Apr '19

28 Apr '19

v2: Fix the logic so that having NoDefaultCurrentDirectoryInExePath set does not break the search *The three most relevant cases* Case 1: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = True Overall = True (stop search) Case 2: NoDefaultCurrentDirectoryInExePath = False NeedCurrentDirectoryForExePathW = True GetCurrentDirectoryW != 0 (True) SearchPathW = False Overall = False (continue search) Case 3: NoDefaultCurrentDirectoryInExePath = True NeedCurrentDirectoryForExePathW = False GetCurrentDirectoryW (not called) SearchPathW (not called) Overall = False (continue search) Best, Erich

1 0

[PATCH 4/5] dinput: Improve EnumDevice tracing
by Alistair Leslie-Hughes 28 Apr '19

28 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 720635f937..460e22d5e8 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -467,9 +467,10 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; + + TRACE(" Checking device %u ('%s')\n", i, dinput_devices[i]->name); for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j); if (r == S_OK) if (enum_callback_wrapper(lpCallback, &devInstance, pvRef) == DIENUM_STOP) -- 2.20.1

2 1

[PATCH 3/5] dinput: Dont report we cannot open a device
by Alistair Leslie-Hughes 28 Apr '19

28 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/joystick_linuxinput.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index cea669b90c..320696fa4b 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -211,10 +211,7 @@ static void find_joydevs(void) } if (fd == -1) - { - WARN("Failed to open \"%s\": %d %s\n", buf, errno, strerror(errno)); continue; - } if (ioctl(fd, EVIOCGBIT(0, sizeof(joydev.evbits)), joydev.evbits) == -1) { -- 2.20.1

2 1

[PATCH 2/5] dinput: Return E_NOINTERFACE from IDirectInputDevice2 QueryInterface
by Alistair Leslie-Hughes 28 Apr '19

28 Apr '19

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dinput/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6c446163d1..cfade08433 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1203,7 +1203,7 @@ HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W ifa } WARN("Unsupported interface!\n"); - return E_FAIL; + return E_NOINTERFACE; } HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface, REFIID riid, LPVOID *ppobj) -- 2.20.1

2 1

[PATCH] iphlpapi: Add GetBestRoute2 stub.
by Vijay Kiran Kamuju 28 Apr '19

28 Apr '19

From: Austin English <austinenglish(a)gmail.com> Add more failure conditions Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44850 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b4f77beced..7a447e733a 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -77,7 +77,7 @@ @ stdcall GetBestInterfaceEx( ptr ptr ) @ stub GetBestInterfaceFromStack @ stdcall GetBestRoute( long long ptr ) -#@ stub GetBestRoute2 +@ stdcall GetBestRoute2( ptr long ptr ptr long ptr ptr ) @ stub GetBestRouteFromStack #@ stub GetCurrentThreadCompartmentId @ stdcall GetExtendedTcpTable( ptr ptr long long long long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5df4cd832b..95ccf496e7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3313,3 +3313,23 @@ DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY family, PMIB_IPINTERFACE_TABLE * FIXME("(%u %p): stub\n", family, table); return ERROR_NOT_SUPPORTED; } + +/****************************************************************** + * GetBestRoute2 (IPHLPAPI.@) + */ +DWORD WINAPI GetBestRoute2(NET_LUID *luid, NET_IFINDEX index, + const SOCKADDR_INET *source, const SOCKADDR_INET *destination, + ULONG options, PMIB_IPFORWARD_ROW2 bestroute, + SOCKADDR_INET *bestaddress) +{ + static int once; + + if (!once++) + FIXME("(%p, %d, %p, %p, 0x%08x, %p, %p): stub\n", luid, index, source, + destination, options, bestroute, bestaddress); + + if (!destination || !bestroute || !bestaddress) + return ERROR_INVALID_PARAMETER; + + return ERROR_NOT_SUPPORTED; +} -- 2.21.0

1 0

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-devel