December 2020 - Wine-Devel - list.winehq.org

[PATCH] ntdll/tests: The case-sensitivity tests don't need write access.

by Francois Gouget

This fixes the tests when missing elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ntdll/tests/reg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 24832312460..9335d9cc927 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -614,6 +614,7 @@ static void test_NtCreateKey(void) pRtlFreeUnicodeString( &str ); /* the REGISTRY part is case-sensitive unless OBJ_CASE_INSENSITIVE is specified */ + am = GENERIC_READ; attr.Attributes = 0; pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); @@ -624,14 +625,14 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); -- 2.20.1

Dec. 14, 2020

[PATCH] ntdll/tests: Skip some registry tests when missing elevated privileges.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ntdll/tests/reg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 51562786e99..24832312460 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1458,6 +1458,11 @@ static void test_redirection(void) pRtlInitUnicodeString( &str, wine64W ); status = pNtCreateKey( &root64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not authorized to modify KEY_WOW64_64KEY, no redirection\n"); + return; + } ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); pRtlInitUnicodeString( &str, wine32W ); -- 2.20.1

Dec. 14, 2020

Re: [PATCH] crypt32/tests: Fix a registerOIDInfo() failure when missing elevated privileges.

by Dmitry Timoshkov

Francois Gouget <fgouget(a)codeweavers.com> wrote: > @@ -314,7 +330,7 @@ static void test_registerOIDFunction(void) > SetLastError(0xdeadbeef); > ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "CryptDllEncodeObject", > "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); > - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) > + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) > { > skip("Need admin rights\n"); > return; > @@ -393,7 +409,7 @@ static void test_registerDefaultOIDFunction(void) > SetLastError(0xdeadbeef); > ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, > bogusDll); > - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) > + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) > { > skip("Need admin rights\n"); > return; > @@ -499,7 +515,7 @@ static void test_getDefaultOIDFunctionAddress(void) > SetLastError(0xdeadbeef); > ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, > bogusDll); > - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) > + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) > skip("Need admin rights\n"); > else > ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); In which cases the changes above are needed? It seems that this only complicates things without a reason and could potentially slow down the tests execution. > @@ -645,7 +661,11 @@ static void test_registerOIDInfo(void) > info1.pszOID = test_oid; > SetLastError(0xdeadbeef); > ret = CryptUnregisterOIDInfo(&info1); > - ok(!ret, "should fail\n"); > + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) > + { > + skip("Need admin rights FIXME\n"); > + return; > + } ok(!ret, "should fail\n"); This change doesn't look right. Most likely it's not needed here. -- Dmitry.

Dec. 14, 2020

[PATCH] gdi32/tests: Add tests for zero-width control characters.

by Sven Baars

Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> --- Some tests with zero-width control characters for inconsistent behavior that I observed while trying to fix the ID3DXFont implementation. In our implementation these functions all use the same internal function, but on Windows none of them seem to do exactly the same. dlls/gdi32/tests/font.c | 151 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05ea..75a41f69ab9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7693,6 +7693,156 @@ done: ReleaseDC(0, hdc); } +static void test_zero_width_control(void) +{ + int len, dx[20], nfit, pos[20]; + DWORD size, charcount; + GCP_RESULTSW result; + WCHAR space_glyph; + WCHAR glyphs[20]; + unsigned int i; + LOGFONTA lf; + HFONT hfont; + BOOL ret; + SIZE sz; + HDC hdc; + ABC abc; + + static const WCHAR nul[] = {0}; + static const WCHAR space[] = {' '}; + static const WCHAR zero_width_control[] = { + 0x0009, /* \t */ + 0x000a, /* \n */ + 0x000d, /* \r */ + 0x001c, /* FS */ + 0x001d, /* GS */ + 0x001e, /* RS */ + 0x001f, /* US */ + 0x200b, /* ZWSP */ + 0x200c, /* ZWNJ */ + 0x200d, /* ZWJ */ + 0x200e, /* LRM */ + 0x200f, /* RLM */ + 0x202a, /* LRE */ + 0x202c, /* PDF */ + 0x202d, /* LRO */ + 0x202b, /* RLE */ + 0x202e, /* RLO */ + }; + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = 20; + + hfont = CreateFontIndirectA(&lf); + hdc = GetDC(NULL); + hfont = SelectObject(hdc, hfont); + + memset(&result, 0, sizeof(result)); + result.lStructSize = sizeof(result); + result.lpCaretPos = pos; + result.lpGlyphs = glyphs; + + for (i = 0; i < ARRAY_SIZE(zero_width_control); ++i) + { + WCHAR test[] = {'W', 'i', 'n', 'e', ' ', zero_width_control[i], 'T', 'e', 's', 't', 0}; + + /* Some control characters are treated as space */ + result.nGlyphs = 20; + size = GetCharacterPlacementW(hdc, test, 10, 0, &result, 0); + ok(size, "Test %d: GetCharacterPlacementA failed.\n", i); + ok(result.nGlyphs == 10, "Test %d: unexpected number of glyphs %u.\n", i, result.nGlyphs); + todo_wine ok(glyphs[5] == glyphs[4], "Test %d: unexpected glyphs %s.\n", i, wine_dbgstr_wn(glyphs, result.nGlyphs)); + if (i < 15) + todo_wine ok(pos[6] - pos[5] == 0, "Test %d: unexpected width %d.\n", i, pos[6] - pos[5]); + else + ok(pos[6] - pos[5] > 0, "Test %d: unexpected width %d.\n", i, pos[6] - pos[5]); + ok(pos[5] - pos[4] > 0, "Test %d: unexpected width %d.\n", i, pos[5] - pos[4]); + + /* They all have zero width in GetTextExtentExPoint */ + nfit = -1; + dx[0] = -1; + sz.cx = -1; + ret = GetTextExtentExPointW(hdc, zero_width_control + i, 1, 1000, &nfit, dx, &sz); + ok(ret, "Test %d: expected TRUE.\n", i); + ok(nfit == 1, "Test %d: got %d.\n", i, nfit); + todo_wine ok(dx[0] == 0, "Test %d: got %d.\n", i, dx[0]); + todo_wine ok(sz.cx == 0, "Test %d: got %d.\n", i, sz.cx); + + /* But are treated differently for the fit */ + nfit = -1; + sz.cx = -1; + ret = GetTextExtentExPointW(hdc, test, 10, 1000, &nfit, dx, &sz); + ok(ret, "Test %d: expected TRUE.\n", i); + ok(nfit == 10, "Test %d: got %d.\n", i, nfit); + todo_wine ok(dx[4] == dx[5], "Test %d: expected %d got %d.\n", i, dx[4], dx[5]); + + /* The ZW characters do fit, the others don't */ + ret = GetTextExtentExPointW(hdc, test, 10, dx[5], &nfit, NULL, &sz); + ok(ret, "Test %d: expected TRUE.\n", i); + if (i < 7 || i > 9) + todo_wine ok(nfit == 5, "Test %d: got %d.\n", i, nfit); + else + ok(nfit == 6, "Test %d: got %d.\n", i, nfit); + + /* They do not all have zero width in GetCharWidth32 */ + len = -1; + ret = GetCharWidth32W(hdc, zero_width_control[i], zero_width_control[i], &len); + ok(ret, "Test %d: expected TRUE.\n", i); + + /* In which case ABC also does not have zero width, but A+B+C + * is not always equal to the length from GetCharWidth32 */ + memset(&abc, 0, sizeof(abc)); + ret = GetCharABCWidthsW(hdc, zero_width_control[i], zero_width_control[i], &abc); + ok(ret, "Test %d: expected TRUE.\n", i); + + if (i < 7) + { + ok(len > 0, "Test %d: got %d.\n", i, len); + ok(abc.abcA + abc.abcB + abc.abcC <= len && abc.abcA + abc.abcB + abc.abcC > 0, + "Test %d: expected %d >= %d > 0.\n", i, len, abc.abcA + abc.abcB + abc.abcC); + ok(abc.abcB > 0, "Test %d: got %d.\n", i, abc.abcB); + } + else + { + todo_wine ok(len == 0 || broken(i > 11) /* before Win10 */, "Test %d: got %d.\n", i, len); + ok(abc.abcA + abc.abcB + abc.abcC == len, + "Test %d: expected %d == 0.\n", i, abc.abcA + abc.abcB + abc.abcC); + ok(abc.abcB > 0, "Test %d: got %d.\n", i, abc.abcB); + } + } + + /* The NUL character does not have zero width */ + nfit = -1; + dx[0] = -1; + sz.cx = -1; + ret = GetTextExtentExPointW(hdc, nul, 1, 1000, &nfit, dx, &sz); + ok(ret, "Expected TRUE.\n"); + ok(nfit == 1, "Got %d.\n", nfit); + ok(dx[0] > 0, "Got %d.\n", dx[0]); + ok(sz.cx > 0, "Got %d.\n", sz.cx); + + memset(&abc, 0, sizeof(abc)); + ret = GetCharABCWidthsW(hdc, 0, 0, &abc); + ok(ret, "Expected TRUE.\n"); + todo_wine ok(abc.abcA == 0, "Got %d.\n", abc.abcA); + ok(abc.abcB > 0, "Got %d.\n", abc.abcB); + ok(abc.abcC >= 0, "Got %d.\n", abc.abcC); + + /* Characters that are treated as spaces by GetCharacterPlacement */ + /* are not treated as spaces by GetGlyphIndices. */ + charcount = GetGlyphIndicesW(hdc, space, 1, &space_glyph, 0); + ok(charcount == 1, "Wrong character count %d.\n", charcount); + + charcount = GetGlyphIndicesW(hdc, zero_width_control, ARRAY_SIZE(zero_width_control), glyphs, 0); + ok(charcount == ARRAY_SIZE(zero_width_control), "Wrong character count %d.\n", charcount); + for (i = 0; i < ARRAY_SIZE(zero_width_control); ++i) + ok(glyphs[i] != space_glyph, "Test %d: glyph is a space: %04x\n", i, glyphs[i]); + + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7779,6 +7929,7 @@ START_TEST(font) test_ttf_names(); test_lang_names(); test_char_width(); + test_zero_width_control(); /* These tests should be last test until RemoveFontResource * is properly implemented. -- 2.25.1

Dec. 14, 2020

[PATCH] crypt32/tests: Fix a registerOIDInfo() failure when missing elevated privileges.

by Francois Gouget

And only accept the access denied errors when running without elevated privileges. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/crypt32/tests/oid.c | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index ae03bba90e8..d135092a3ad 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -30,6 +30,22 @@ #include "wine/test.h" +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + static BOOL (WINAPI *pCryptEnumOIDInfo)(DWORD,DWORD,void*,PFN_CRYPT_ENUM_OID_INFO); @@ -314,7 +330,7 @@ static void test_registerOIDFunction(void) SetLastError(0xdeadbeef); ret = CryptRegisterOIDFunction(X509_ASN_ENCODING, "CryptDllEncodeObject", "1.2.3.4.5.6.7.8.9.10", bogusDll, NULL); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) { skip("Need admin rights\n"); return; @@ -393,7 +409,7 @@ static void test_registerDefaultOIDFunction(void) SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, bogusDll); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) { skip("Need admin rights\n"); return; @@ -499,7 +515,7 @@ static void test_getDefaultOIDFunctionAddress(void) SetLastError(0xdeadbeef); ret = CryptRegisterDefaultOIDFunction(0, "CertDllOpenStoreProv", 0, bogusDll); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) skip("Need admin rights\n"); else ok(ret, "CryptRegisterDefaultOIDFunction failed: %08x\n", GetLastError()); @@ -645,7 +661,11 @@ static void test_registerOIDInfo(void) info1.pszOID = test_oid; SetLastError(0xdeadbeef); ret = CryptUnregisterOIDInfo(&info1); - ok(!ret, "should fail\n"); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) + { + skip("Need admin rights FIXME\n"); + return; + } ok(!ret, "should fail\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got %u\n", GetLastError()); info2 = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, (void *)test_oid, 0); @@ -668,7 +688,7 @@ static void test_registerOIDInfo(void) info1.dwGroupId = CRYPT_HASH_ALG_OID_GROUP_ID; SetLastError(0xdeadbeef); ret = CryptRegisterOIDInfo(&info1, CRYPT_INSTALL_OID_INFO_BEFORE_FLAG); - if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED && !is_process_elevated()) { skip("Need admin rights\n"); return; -- 2.20.1

Dec. 14, 2020

[PATCH] ws2_32/tests: Skip some raw socket tests when missing elevated privileges.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 46 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d69a05aec5..8711b65fcea 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2551,29 +2551,35 @@ static void test_WSASocket(void) SOCK_RAW, socktype); closesocket(sock); - todo_wine { sock = WSASocketA(0, 0, IPPROTO_RAW, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); + if (sock != INVALID_SOCKET) + { + todo_wine { + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); + } + + sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); + ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", + WSAGetLastError()); + size = sizeof(socktype); + socktype = 0xdead; + err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); + ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); + ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", + SOCK_RAW, socktype); + closesocket(sock); } + else if (WSAGetLastError() == WSAEACCES) + skip("SOCK_RAW is not available\n"); + else + ok(0, "Failed to create socket: %d\n", WSAGetLastError()); - sock = WSASocketA(AF_INET, SOCK_RAW, IPPROTO_TCP, NULL, 0, 0); - ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", - WSAGetLastError()); - size = sizeof(socktype); - socktype = 0xdead; - err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); - ok(!err, "getsockopt failed with %d\n", WSAGetLastError()); - ok(socktype == SOCK_RAW, "Wrong socket type, expected %d received %d\n", - SOCK_RAW, socktype); - closesocket(sock); } /* IPX socket tests */ -- 2.20.1

Dec. 14, 2020

Re: [PATCH v3] dlls/d3d9: Fix handling of D3DENUM_WHQL_LEVEL

by Henri Verbeet

On Mon, 14 Dec 2020 at 00:56, Rafał Harabień <rafalh92(a)outlook.com> wrote: > > D3DENUM_NO_WHQL_LEVEL was renamed to D3DENUM_WHQL_LEVEL and its > meaning was negated in DirectX 9. > > Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> > --- > dlls/d3d8/directx.c | 3 +++ > dlls/ddraw/ddraw.c | 2 +- > dlls/wined3d/directx.c | 2 +- > include/d3d9.h | 2 +- > include/wine/wined3d.h | 2 +- > 5 files changed, 7 insertions(+), 4 deletions(-) > Thanks. I've sent a slightly modified version that avoids the C99 comment.

Dec. 14, 2020

[PATCH 6/6] d3d9: Fix handling of D3DENUM_WHQL_LEVEL.

by Henri Verbeet

From: Rafał Harabień <rafalh92(a)outlook.com> D3DENUM_NO_WHQL_LEVEL from Direct3D 8 was replaced with D3DENUM_WHQL_LEVEL in Direct3D 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/directx.c | 3 +++ dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..3818cb79952 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,9 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + /* D3DENUM_NO_WHQL_LEVEL -> WINED3DENUM_WHQL_LEVEL */ + flags ^= D3DENUM_NO_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f78d344c085..d616330c307 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2642,7 +2642,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); wined3d_mutex_lock(); - hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, WINED3DENUM_WHQL_LEVEL, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000 -- 2.20.1

Dec. 14, 2020

[PATCH 5/6] wined3d: The Vulkan blitter supports depth blits.

by Henri Verbeet

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50123 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Note that this patch helps with the bug mentioned above, but isn't enough to fix it on its own. dlls/wined3d/texture.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 69f948c5fd2..b630f0dcfc5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6465,11 +6465,6 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ src_aspect = vk_aspect_mask_from_format(src_texture_vk->t.resource.format); dst_aspect = vk_aspect_mask_from_format(dst_texture_vk->t.resource.format); - if ((src_aspect | dst_aspect) & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) - { - TRACE("Depth/stencil blits not supported.\n"); - goto next; - } if (wined3d_resource_get_sample_count(&src_texture_vk->t.resource) > 1) resolve = true; -- 2.20.1

Dec. 14, 2020

[PATCH 4/6] wined3d: Unmap the slab if needed in wined3d_context_vk_destroy_bo().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 41 +++++++++++++++++++++++++--------- dlls/wined3d/context_vk.c | 9 +++++--- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4e804b60502..0404aa1877b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -772,12 +772,11 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ if ((slab = bo->slab)) { - if (!(bo->map_ptr = slab->map_ptr) && !(bo->map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) + if (!(bo->map_ptr = wined3d_bo_slab_vk_map(slab, context_vk))) { ERR("Failed to map slab.\n"); return NULL; } - ++slab->map_count; } else if (bo->memory) { @@ -811,21 +810,43 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context if ((slab = bo->slab)) { - if (--slab->map_count) - return; + wined3d_bo_slab_vk_unmap(slab, context_vk); + return; + } - wined3d_bo_vk_unmap(&slab->bo, context_vk); - slab->map_ptr = NULL; + if (bo->memory) + { + wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); return; } vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context_vk->c.device); + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); +} - if (bo->memory) - wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); - else - VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); +void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + TRACE("slab_vk %p, context_vk %p.\n", slab_vk, context_vk); + + if (!slab_vk->map_ptr && !(slab_vk->map_ptr = wined3d_bo_vk_map(&slab_vk->bo, context_vk))) + { + ERR("Failed to map slab.\n"); + return NULL; + } + + ++slab_vk->map_count; + + return slab_vk->map_ptr; +} + +void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_context_vk *context_vk) +{ + if (--slab_vk->map_count) + return; + + wined3d_bo_vk_unmap(&slab_vk->bo, context_vk); + slab_vk->map_ptr = NULL; } static VkAccessFlags vk_access_mask_from_buffer_usage(VkBufferUsageFlags usage) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index bd3dc50ab01..9db363172f1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -797,15 +797,18 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const { struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_bo_slab_vk *slab_vk; size_t object_size, idx; TRACE("context_vk %p, bo %p.\n", context_vk, bo); - if (bo->slab) + if ((slab_vk = bo->slab)) { - object_size = bo->slab->bo.size / 32; + if (bo->map_ptr) + wined3d_bo_slab_vk_unmap(slab_vk, context_vk); + object_size = slab_vk->bo.size / 32; idx = bo->buffer_offset / object_size; - wined3d_context_vk_destroy_bo_slab_slice(context_vk, bo->slab, idx, bo->command_buffer_id); + wined3d_context_vk_destroy_bo_slab_slice(context_vk, slab_vk, idx, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f48778ee345..0749f95f998 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1633,6 +1633,11 @@ struct wined3d_bo_slab_vk uint32_t map; }; +void *wined3d_bo_slab_vk_map(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, + struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; + struct wined3d_bo_address { UINT_PTR buffer_object; -- 2.20.1

Dec. 14, 2020

[PATCH 3/6] wined3d: Unmap the chunk if needed in wined3d_context_vk_destroy_bo().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 16 +++++++--------- dlls/wined3d/context_vk.c | 2 ++ dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3da1615b1b5..4e804b60502 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -762,7 +762,6 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - void *map_ptr; VkResult vr; if (bo->map_ptr) @@ -773,7 +772,7 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ if ((slab = bo->slab)) { - if (!(map_ptr = slab->map_ptr) && !(map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) + if (!(bo->map_ptr = slab->map_ptr) && !(bo->map_ptr = wined3d_bo_vk_map(&slab->bo, context_vk))) { ERR("Failed to map slab.\n"); return NULL; @@ -784,22 +783,19 @@ static void *wined3d_bo_vk_map(struct wined3d_bo_vk *bo, struct wined3d_context_ { struct wined3d_allocator_chunk_vk *chunk_vk = wined3d_allocator_chunk_vk(bo->memory->chunk); - if (!(map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) + if (!(bo->map_ptr = wined3d_allocator_chunk_vk_map(chunk_vk, context_vk))) { ERR("Failed to map chunk.\n"); return NULL; } } - else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &map_ptr))) < 0) + else if ((vr = VK_CALL(vkMapMemory(device_vk->vk_device, bo->vk_memory, 0, VK_WHOLE_SIZE, 0, &bo->map_ptr))) < 0) { ERR("Failed to map memory, vr %s.\n", wined3d_debug_vkresult(vr)); return NULL; } - if (sizeof(map_ptr) >= sizeof(uint64_t)) - bo->map_ptr = map_ptr; - - return map_ptr; + return bo->map_ptr; } static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context_vk *context_vk) @@ -808,9 +804,11 @@ static void wined3d_bo_vk_unmap(struct wined3d_bo_vk *bo, struct wined3d_context struct wined3d_device_vk *device_vk; struct wined3d_bo_slab_vk *slab; - if (bo->map_ptr) + if (wined3d_map_persistent()) return; + bo->map_ptr = NULL; + if ((slab = bo->slab)) { if (--slab->map_count) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 1b937dd3b21..bd3dc50ab01 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -812,6 +812,8 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const wined3d_context_vk_destroy_buffer(context_vk, bo->vk_buffer, bo->command_buffer_id); if (bo->memory) { + if (bo->map_ptr) + wined3d_allocator_chunk_vk_unmap(wined3d_allocator_chunk_vk(bo->memory->chunk), context_vk); wined3d_context_vk_destroy_allocator_block(context_vk, bo->memory, bo->command_buffer_id); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 30b21a8225f..f48778ee345 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6367,6 +6367,11 @@ static inline void wined3d_context_gl_reference_bo(struct wined3d_context_gl *co bo_gl->command_fence_id = device_gl->current_fence_id; } +static inline bool wined3d_map_persistent(void) +{ + return sizeof(void *) >= sizeof(uint64_t); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" -- 2.20.1

Dec. 14, 2020

[PATCH 2/6] wined3d: Only clear "map_ptr" if the memory was unmapped in wined3d_allocator_chunk_vk_unmap().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 66f5109dc87..1b937dd3b21 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -277,8 +277,10 @@ void wined3d_allocator_chunk_vk_unmap(struct wined3d_allocator_chunk_vk *chunk_v TRACE("chunk_vk %p, context_vk %p.\n", chunk_vk, context_vk); - if (!--chunk_vk->c.map_count) - VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); + if (--chunk_vk->c.map_count) + return; + + VK_CALL(vkUnmapMemory(device_vk->vk_device, chunk_vk->vk_memory)); chunk_vk->c.map_ptr = NULL; } -- 2.20.1

Dec. 14, 2020

[PATCH 1/6] wined3d: Compare requested memory types in wined3d_bo_slab_vk_compare().

by Henri Verbeet

Instead of comparing the requested memory type against what we actually got. For example, we may have gotten coherent memory without having explicitly requested it, in which case wined3d_context_vk_create_slab_bo() would fail to find an existing slab to allocate from. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This fixes a rather atrocious VRAM leak with some allocation patterns on some configurations. I don't think we have any explicit bug reports about this, but it affects for example the menu in Batman: Arkham Origins. dlls/wined3d/context_vk.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index f1258842152..66f5109dc87 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -371,6 +371,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context return false; } + slab->requested_memory_type = memory_type; if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { ERR("Failed to create slab bo.\n"); @@ -625,7 +626,7 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, if (!slab->map) { - key.memory_type = slab->bo.memory_type; + key.memory_type = slab->requested_memory_type; key.usage = slab->bo.usage; key.size = slab->bo.size; @@ -1677,8 +1678,8 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); const struct wined3d_bo_slab_vk_key *k = key; - if (k->memory_type != slab->bo.memory_type) - return k->memory_type - slab->bo.memory_type; + if (k->memory_type != slab->requested_memory_type) + return k->memory_type - slab->requested_memory_type; if (k->usage != slab->bo.usage) return k->usage - slab->bo.usage; return k->size - slab->bo.size; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf1a0bb0668..30b21a8225f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1626,6 +1626,7 @@ struct wined3d_bo_slab_vk { struct wine_rb_entry entry; struct wined3d_bo_slab_vk *next; + VkMemoryPropertyFlags requested_memory_type; struct wined3d_bo_vk bo; unsigned int map_count; void *map_ptr; -- 2.20.1

Dec. 14, 2020

[PATCH] ntdll: Remove unwind registers save space from struct stack_layout on x64.

by Paul Gofman

The unwind space used right below the context's Rsp and can currently potentially overlap with xstate. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..7181b48728c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -240,10 +240,6 @@ struct stack_layout CONTEXT context; CONTEXT_EX context_ex; EXCEPTION_RECORD rec; - ULONG64 rsi; - ULONG64 rdi; - ULONG64 rbp; - ULONG64 rip; ULONG64 align; char xstate[0]; /* If xstate is present it is allocated * dynamically to provide 64 byte alignment. */ @@ -252,7 +248,7 @@ struct stack_layout C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))); C_ASSERT( sizeof(XSTATE) == 0x140 ); -C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ struct syscall_frame { @@ -1964,10 +1960,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - stack_size = sizeof(*stack); + stack_size = sizeof(*stack) + 0x20; if ((src_xs = xstate_from_context( context ))) { - stack_size += (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr + stack_size += (ULONG_PTR)stack_ptr - 0x20 - (((ULONG_PTR)stack_ptr - 0x20 - sizeof(XSTATE)) & ~(ULONG_PTR)63); } @@ -2120,12 +2116,13 @@ struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RE __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ + "subq $0x20,%r9\n\t" /* Unwind registers save space */ "andq $~0xf,%r9\n\t" "btl $6,0x30(%rdx)\n\t" /* context->ContextFlags, CONTEXT_XSTATE bit. */ "jnc 1f\n\t" "subq $0x140,%r9\n\t" /* sizeof(XSTATE) */ "andq $~63,%r9\n" - "1:\tsubq $0x5b0,%r9\n\t" /* sizeof(struct stack_layout) */ + "1:\tsubq $0x590,%r9\n\t" /* sizeof(struct stack_layout) */ "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" "pushq %r8\n\t" -- 2.29.2

Dec. 14, 2020

[PATCH 2/2] po: Update Japanese translation style.

by Akihiro Sagawa

Follow recent Microsoft Japanese Style Guide, especially Katakana prolonged sound mark. As of 2008, they followed the June 1991 Cabinet Notification on Loanword Orthography. It states prolonged the sound mark should be used for long vowels when English original terms have final -er, -or, -ar, in general. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 894 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 452 insertions(+), 442 deletions(-)

Dec. 14, 2020

[PATCH 1/2] po: Update Japanese translation.

by Akihiro Sagawa

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 196 ++++++++++++++++--------------------------------------- 1 file changed, 57 insertions(+), 139 deletions(-)

Dec. 14, 2020

[website] German translation for release 6.0-rc2

by Julian Rüger

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

Dec. 14, 2020

Re: TestBot news

by Francois Gouget

On Mon, 7 Dec 2020, Francois Gouget wrote: [...] > w1064 > ----- > > This is essentially the same as the w10pro64 VM but with test > configurations for 1507, 1607, 1709, 1809, 1909 and the latest 2009. It turns out that the 1909 snapshot was displaying the boot-time "Let's finish setting up your device" full-screen wizard (bug 50298). So I refreshed that snapshot to make sure it won't interfere with the tests. I also added a configuration running the tests without elevated privileges (w1064_adm). > PCI-passthrough > --------------- > > I also set up a new Windows 10 Pro VM on my development TestBot > environment and added a configuration with an RX550 graphics card to it > using PCI-passthrough. > > That seems to be working [1] so far, by which I mostly mean that besides > actually running its TestBot tasks the graphics card has not locked up > and required a host reboot yet. And... now it's failing to initialize the RX550 driver with a code 43 error. Nothing seems to help so I suspect rebooting the host is going to be necessary. The next step is going to be checking whether performing clean shutdowns helps prevent this issue but that requires a TestBot patch. debiant2 -------- This is a copy of debiant with the following changes: * I have updated the packages to the current Debian Testing. * I added fonts for the locales we can run the tests in. * I installed a manually backported X11 1.7.0 packages for bug 50086. Unfortunately WineTest still times out. user32:monitor is not the single culprit since WineTest sometimes times out before running it. I manually ran WineTest without a timeout and it took 33 minutes. There are 23 tests with runtimes above 30 seconds (only one timeout), representing close to 22 minutes! Test Runtime (s) user32:monitor 120 cmd.exe:batch 93 dwrite:font 77 mlang:mlang 77 regedit.exe:regedit 67 ddraw:ddraw4 65 ddraw:ddraw7 65 d3d9:device 63 user32:msg 60 dxgi:dxgi 58 d3d11:d3d11 57 ddraw:ddraw2 56 dwrite:analyzer 54 ddraw:ddraw1 48 dwrite:layout 45 ws2_32:sock 42 d3d9:visual 41 d3d8:device 40 winhttp:winhttp 38 shell32:shlexec 36 d3d10core:d3d10core 35 d3d9:d3d9ex 35 reg.exe:reg 34 Maybe some of those can be sped up but I think it is going to be necessary is to increase the timeout to run the tests in Wine. -- Francois Gouget <fgouget(a)codeweavers.com>

Dec. 14, 2020

Re: [PATCH] msi/tests: Use wide-char string literals.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 14, 2020

[PATCH 2/2] gdi32/tests: Fix test failures on Win10 1909+.

by Zhiyi Zhang

Memory DC, metafile DC and enhanced metafile DC support gamma ramp on Win10 1909+. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like in https://test.winehq.org/data/3acb0b3326c4120ea0c4c6076bd03c9cfe82c744/win10… dlls/gdi32/tests/dc.c | 45 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 2cb8c65dd64..04703288302 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -346,11 +346,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale "wrong caps on %s for %u: %u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ) ); - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); type = GetClipBox( hdc, &rect ); ok( type == ERROR, "GetClipBox returned %d on %s\n", type, descr ); @@ -393,17 +388,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale hdc_caps, GetDeviceCaps( ref_dc, caps[i] ), scale ); } - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) - { - ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); - } - else - ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, "GetBoundsRect returned type %x for %s\n", type, descr ); @@ -494,12 +478,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale "mismatched caps on %s and DIB for %u: %u/%u\n", descr, caps[i], GetDeviceCaps( hdc, caps[i] ), GetDeviceCaps( ref_dc, caps[i] ) ); - SetLastError( 0xdeadbeef ); - ret = GetDeviceGammaRamp( hdc, &ramp ); - ok( !ret, "GetDeviceGammaRamp succeeded on %s\n", descr ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ - "wrong error %u on %s\n", GetLastError(), descr ); - type = GetClipBox( hdc, &rect ); ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); ok( rect.left == 0 && rect.top == 0 && rect.right == 16 && rect.bottom == 16, @@ -517,6 +495,29 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale DeleteObject( dib ); } + /* Memory DC, metafile DC and enhanced metafile DC support gamma ramp on Win10 1909+. Exclude + * these types from tests as they return different results depending on Windows versions */ + if (GetObjectType( hdc ) != OBJ_MEMDC + && GetObjectType( hdc ) != OBJ_METADC + && GetObjectType( hdc ) != OBJ_ENHMETADC) + { + SetLastError( 0xdeadbeef ); + ret = GetDeviceGammaRamp( hdc, &ramp ); + if (GetObjectType( hdc ) != OBJ_DC || GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + { + ok( !ret, "GetDeviceGammaRamp succeeded on %s (type %d)\n", descr, GetObjectType( hdc ) ); + ok( GetLastError() == ERROR_INVALID_PARAMETER + || broken(GetLastError() == 0xdeadbeef) /* nt4 */ + || broken(GetLastError() == NO_ERROR), /* Printer DC on Win10 1909+ */ + "wrong error %u on %s\n", GetLastError(), descr ); + } + else + { + ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", + descr, GetObjectType( hdc ), GetLastError() ); + } + } + /* restore hdc state */ SetBoundsRect( hdc, NULL, DCB_RESET | DCB_DISABLE ); SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_DISABLE ); -- 2.27.0

Dec. 14, 2020

[PATCH 1/2] gdi32/tests: Fix possible test failures in test_clip_box().

by Zhiyi Zhang

When there are multiple monitors and their monitor region union can still be represented by a simple rectangle, the clip box region type for the screen DC is still SIMPLEREGION. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Fix test failures like in https://test.winehq.org/data/3acb0b3326c4120ea0c4c6076bd03c9cfe82c744/win7_… dlls/gdi32/tests/dc.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b4a89b213d2..2cb8c65dd64 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1539,6 +1539,40 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +struct screen_region_info +{ + HRGN region; + INT type; +}; + +static BOOL CALLBACK enum_monitor_proc(HMONITOR monitor, HDC hdc, RECT *rect, LPARAM lparam) +{ + struct screen_region_info *info = (struct screen_region_info *)lparam; + HRGN region; + + if (!info->region) + { + info->region = CreateRectRgnIndirect(rect); + info->type = SIMPLEREGION; + } + else + { + region = CreateRectRgnIndirect(rect); + info->type = CombineRgn(info->region, info->region, region, RGN_OR); + DeleteObject(region); + } + return TRUE; +} + +static INT get_screen_region_type(void) +{ + struct screen_region_info info = {NULL, NULLREGION}; + + EnumDisplayMonitors(NULL, NULL, enum_monitor_proc, (LPARAM)&info); + DeleteObject(info.region); + return info.type; +} + static void test_clip_box(void) { DEVMODEA scale_mode = {.dmSize = sizeof(DEVMODEA)}; @@ -1554,7 +1588,7 @@ static void test_clip_box(void) SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); - screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + screen_type = get_screen_region_type(); dc = CreateDCA("DISPLAY", NULL, NULL, NULL); type = GetClipBox(dc, &rect); -- 2.27.0

Dec. 14, 2020

[PATCH resend] winex11.drv: Call XIconifyWindow() after XMapWindow() with a minimized window.

by Zhiyi Zhang

Mutter always unminimizes a window when handling map requests. So a window could be in normal state as far as Mutter concerns while Wine mistakenly considers it still minimized. Fix Disgaea PC black screen after Alt+Tab in fullscreen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- See https://gitlab.gnome.org/GNOME/mutter/-/blob/master/src/x11/events.c#L1430 dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f46cbfb088a..9ed5ef0b0b8 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1134,6 +1134,9 @@ static void map_window( HWND hwnd, DWORD new_style ) data->mapped = TRUE; data->iconic = (new_style & WS_MINIMIZE) != 0; + /* Mutter always unminimizes windows when handling map requests. Restore iconic state here */ + if (data->iconic) + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); } release_win_data( data ); } -- 2.27.0

Dec. 14, 2020

[PATCH] po: Update Catalan translation

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- po/ca.po | 387 +++++++++++++++++-------------------------------------- 1 file changed, 121 insertions(+), 266 deletions(-) diff --git a/po/ca.po b/po/ca.po index 916856d1a5c..7ba8be78fe1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-31 11:39-0700\n" +"PO-Revision-Date: 2020-12-13 20:27-0700\n" "Last-Translator: Alex Henrie <alexhenrie24(a)gmail.com>\n" "Language-Team: Catalan\n" "Language: ca\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.2.4\n" +"X-Generator: Poedit 2.4.1\n" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -3668,7 +3668,7 @@ msgstr "Opcions d'Internet" #: dlls/inetcpl.cpl/inetcpl.rc:32 msgid "Configure Wine Internet Browser and related settings" -msgstr "Configura el Wine Internet Browser i els ajusts relacionats" +msgstr "Configura el Wine Internet Browser i les opcions relacionades" #: dlls/inetcpl.cpl/inetcpl.rc:33 msgid "Security settings for zone: " @@ -3756,7 +3756,7 @@ msgstr "Controladors de joc" #: dlls/joy.cpl/joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Prova i configura controladors de joc." #: dlls/jscript/jscript.rc:28 msgid "Error converting object to primitive type" @@ -3771,10 +3771,8 @@ msgid "Subscript out of range" msgstr "El subíndex és fora d'interval" #: dlls/jscript/jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "No queda paper; " +msgstr "No queda espai de pila" #: dlls/jscript/jscript.rc:32 msgid "Object required" @@ -3862,17 +3860,15 @@ msgstr "S'esperava '@'" #: dlls/jscript/jscript.rc:78 msgid "Microsoft JScript compilation error" -msgstr "" +msgstr "Error de compilació de Microsoft JScript" #: dlls/jscript/jscript.rc:79 msgid "Microsoft JScript runtime error" -msgstr "" +msgstr "Error d'entorn d'execució de Microsoft JScript" #: dlls/jscript/jscript.rc:80 dlls/vbscript/vbscript.rc:64 -#, fuzzy -#| msgid "Unknown error" msgid "Unknown runtime error" -msgstr "Error desconegut" +msgstr "Error d'entorn d'execució desconegut" #: dlls/jscript/jscript.rc:55 msgid "Number expected" @@ -3915,16 +3911,12 @@ msgid "JScript object expected" msgstr "S'esperava un objecte JScript" #: dlls/jscript/jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "S'esperava un objecte Array" +msgstr "S'esperava un objecte d'Enumerator" #: dlls/jscript/jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "S'esperava un objecte booleà" +msgstr "S'esperava un objecte d'expressió regular" #: dlls/jscript/jscript.rc:65 msgid "Syntax error in regular expression" @@ -3932,7 +3924,7 @@ msgstr "Error de sintaxi en l'expressió regular" #: dlls/jscript/jscript.rc:66 msgid "Exception thrown and not caught" -msgstr "" +msgstr "S'ha llançat una excepció que no s'ha atrapat" #: dlls/jscript/jscript.rc:68 msgid "URI to be encoded contains invalid characters" @@ -6950,32 +6942,24 @@ msgid "Connection reset by peer.\n" msgstr "Un igual ha restablert la connexió.\n" #: dlls/kernel32/winerror.mc:3767 -#, fuzzy -#| msgid "Not implemented" msgid "Not implemented.\n" -msgstr "No implementat" +msgstr "No implementat.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "La trucada RPC ha fallat.\n" +msgstr "La trucada ha fallat.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" msgstr "No s'ha trobat cap signatura en el fitxer.\n" #: dlls/kernel32/winerror.mc:3774 -#, fuzzy -#| msgid "Invalid level.\n" msgid "Invalid call.\n" -msgstr "El nivell no és vàlid.\n" +msgstr "La trucada no és vàlida.\n" #: dlls/kernel32/winerror.mc:3781 -#, fuzzy -#| msgid "Value is not available.\n" msgid "Resource is not currently available.\n" -msgstr "El valor no està disponible.\n" +msgstr "El recurs actualment no està disponible.\n" #: dlls/localspl/localspl.rc:31 dlls/localui/localui.rc:31 #: dlls/winspool.drv/winspool.rc:30 @@ -7037,10 +7021,8 @@ msgid "Sink has not been finalized.\n" msgstr "No s'ha finalitzat el receptor.\n" #: dlls/mferror/mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "El receptor ja s'ha aturat.\n" +msgstr "El rellotge s'ha aturat\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7419,10 +7401,8 @@ msgid "Clock state was already set.\n" msgstr "Ja s'ha establert l'estat de rellotge.\n" #: dlls/mferror/mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "El rellotge no està disponible.\n" +msgstr "El rellotge no és simple\n" #: dlls/mpr/mpr.rc:35 dlls/wininet/wininet.rc:48 msgid "Enter Network Password" @@ -8527,150 +8507,117 @@ msgid "Select the data you want to connect to:" msgstr "Seleccioneu les dades a les qualles voleu connectar:" #: dlls/oledb32/version.rc:66 -#, fuzzy -#| msgid "Connections" msgid "Connection" -msgstr "Connexions" +msgstr "Connexió" #: dlls/oledb32/version.rc:69 -#, fuzzy -#| msgid "Select the data you want to connect to:" msgid "Specify the following to connect to ODBC data:" -msgstr "Seleccioneu les dades a les qualles voleu connectar:" +msgstr "Especifiqueu ho següent per a connectar a les dades ODBC:" #: dlls/oledb32/version.rc:70 msgid "1. Specify the source of data:" -msgstr "" +msgstr "1. Especifiqueu la font de dades:" #: dlls/oledb32/version.rc:71 -#, fuzzy -#| msgid "Please enter your name" msgid "Use &data source name" -msgstr "Si us plau, introduïu el vostre nom" +msgstr "Utilitza el nom de font de &dades" #: dlls/oledb32/version.rc:74 -#, fuzzy -#| msgid "Reset Connections" msgid "Use c&onnection string" -msgstr "Connexions restablertes" +msgstr "Utilitza una cadena de c&onnexió" #: dlls/oledb32/version.rc:75 -#, fuzzy -#| msgid "Connections" msgid "&Connection string:" -msgstr "Connexions" +msgstr "Cadena de &connexió:" #: dlls/oledb32/version.rc:77 -#, fuzzy -#| msgid "A&dd..." msgid "B&uild..." -msgstr "A&fegeix..." +msgstr "Constr&ueix..." #: dlls/oledb32/version.rc:78 msgid "2. Enter information to log on to the server" -msgstr "" +msgstr "2. Introduïu la informació per a entrar al servidor" #: dlls/oledb32/version.rc:79 -#, fuzzy -#| msgid "&User name:" msgid "User &name:" msgstr "&Nom d'usuari:" #: dlls/oledb32/version.rc:83 -#, fuzzy -#| msgid "&Blank page" msgid "&Blank password" -msgstr "Pàgina en &blanc" +msgstr "Contrasenya en &blanc" #: dlls/oledb32/version.rc:84 -#, fuzzy -#| msgid "Wrong password.\n" msgid "Allow &saving password" -msgstr "La contrasenya està equivocada.\n" +msgstr "Permet &desar la contrasenya" #: dlls/oledb32/version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "" +msgstr "3. Introduïu el catàleg &inicial per a utilitzar:" #: dlls/oledb32/version.rc:87 -#, fuzzy -#| msgid "Reset Connections" msgid "&Test Connection" -msgstr "Connexions restablertes" +msgstr "&Prova la connexió" #: dlls/oledb32/version.rc:92 msgid "Advanced" msgstr "Avançat" #: dlls/oledb32/version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Recurs compartit de xarxa" +msgstr "Opcions de xarxa" #: dlls/oledb32/version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "El nivell de suplantació és dolent.\n" +msgstr "Nivell de &suplantació:" #: dlls/oledb32/version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "Nivell de p&rotecció:" #: dlls/oledb32/version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Connectat" +msgstr "Connecta:" #: dlls/oledb32/version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "segons" +msgstr "segons." #: dlls/oledb32/version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Èxit" +msgstr "A&ccés:" #: dlls/oledb32/version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Tot" +msgstr "Tot" #: dlls/oledb32/version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Aquestes són les propietats d'inicialització per a aquest tipus de dades. " +"Per a editar un valor, seleccioneu una propietat, llavors trieu \"Edita el " +"valor\" a sota." #: dlls/oledb32/version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "E&dita..." +msgstr "&Edita el valor..." #: dlls/oledb32/version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Propietats d'enllaç de dades" +msgstr "Error d'enllaç de dades" #: dlls/oledb32/version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Si us plau, seleccioneu un fitxer." +msgstr "Si us plau, seleccioneu un proveïdor." #: dlls/oledb32/version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"El proveïdor ja no està disponible. Assegureu-vos que el proveïdor estigui " +"instal·lat correctament." #: dlls/oledb32/version.rc:36 msgid "Data Link Properties" @@ -8681,38 +8628,32 @@ msgid "OLE DB Provider(s)" msgstr "Proveïdors de base de dades OLE" #: dlls/oledb32/version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Llest" +msgstr "Lectura" #: dlls/oledb32/version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Llegiu-me:" +msgstr "Lectura i escriptura" #: dlls/oledb32/version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "No deneguis res de la compartició" #: dlls/oledb32/version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "Denega lectura de la compartició" #: dlls/oledb32/version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "Denega escriptura a la compartició" #: dlls/oledb32/version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "Compartició exclusiva" #: dlls/oledb32/version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "Escriptures d'E/S" +msgstr "Escriptura" #: dlls/oledlg/oledlg.rc:55 msgid "Insert Object" @@ -9959,16 +9900,12 @@ msgid "Cape Verde Daylight Time" msgstr "Hora d'estiu de Cap Verd" #: dlls/tzres/tzres.rc:126 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Hora estàndard de Hawaii" +msgstr "Hora estàndard de Haití" #: dlls/tzres/tzres.rc:127 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Hora d'estiu de Hawaii" +msgstr "Hora d'estiu de Haití" #: dlls/tzres/tzres.rc:80 msgid "Central European Standard Time" @@ -10003,16 +9940,12 @@ msgid "Iran Daylight Time" msgstr "Hora d'estiu d'Iran" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Hora estàndard de Hawaii" +msgstr "Hora estàndard de Sant Pere" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Hora d'estiu de Hawaii" +msgstr "Hora d'estiu de Sant Pere" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -10055,16 +9988,12 @@ msgid "Central Asia Daylight Time" msgstr "Hora d'estiu de l'Àsia Central" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Hora estàndard de Corea" +msgstr "Hora estàndard de Lord Howe" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Hora d'estiu de Corea" +msgstr "Hora d'estiu de Lord Howe" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10115,16 +10044,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Hora d'estiu de l'Azerbaidjan" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Hora estàndard de Magadan" +msgstr "Hora estàndard de Magallanes" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Hora d'estiu de Magadan" +msgstr "Hora d'estiu de Magallanes" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10175,16 +10100,12 @@ msgid "Line Islands Daylight Time" msgstr "Hora d'estiu de les Illes de la Línia" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "Hora estàndard de la Xina" +msgstr "Hora estàndard de Cuba" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "Hora d'estiu de la Xina" +msgstr "Hora d'estiu de Cuba" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10227,16 +10148,12 @@ msgid "Argentina Daylight Time" msgstr "Hora d'estiu de l'Argentina" #: dlls/tzres/tzres.rc:152 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "Hora estàndard de Maurici" +msgstr "Hora estàndard de Marqueses" #: dlls/tzres/tzres.rc:153 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "Hora d'estiu de Maurici" +msgstr "Hora d'estiu de Marqueses" #: dlls/tzres/tzres.rc:166 msgid "Myanmar Standard Time" @@ -10387,16 +10304,12 @@ msgid "US Eastern Daylight Time" msgstr "Hora d'estiu oriental EUA" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Hora estàndard de Corea" +msgstr "Hora estàndard de Corea del Nord" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Hora d'estiu de Corea" +msgstr "Hora d'estiu de Corea del Nord" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10487,16 +10400,12 @@ msgid "Arabian Daylight Time" msgstr "Hora d'estiu de l'Àrabia" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Hora estàndard de les muntanyes" +msgstr "Hora estàndard de Tocantins" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Hora d'estiu de les muntanyes" +msgstr "Hora d'estiu de Tocantins" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10507,16 +10416,12 @@ msgid "Russian Daylight Time" msgstr "Hora d'estiu de Rússia" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Hora estàndard central AUS" +msgstr "Hora estàndard central occident d'Austràlia" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Hora d'estiu central AUS" +msgstr "Hora d'estiu central occident d'Austràlia" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" @@ -10647,16 +10552,12 @@ msgid "Venezuela Daylight Time" msgstr "Hora d'estiu de Veneçuela" #: dlls/tzres/tzres.rc:62 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "Hora estàndard de les muntanyes" +msgstr "Hora estàndard de Bougainville" #: dlls/tzres/tzres.rc:63 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "Hora d'estiu de les muntanyes" +msgstr "Hora d'estiu de Bougainville" #: dlls/tzres/tzres.rc:128 msgid "Hawaiian Standard Time" @@ -10683,16 +10584,12 @@ msgid "New Zealand Daylight Time" msgstr "Hora d'estiu de Nova Zelanda" #: dlls/tzres/tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "Hora estàndard de l'Argentina" +msgstr "Hora estàndard aleutiana" #: dlls/tzres/tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "Hora d'estiu de l'Argentina" +msgstr "Hora d'estiu aleutiana" #: dlls/tzres/tzres.rc:76 msgid "Central Brazilian Standard Time" @@ -10743,16 +10640,12 @@ msgid "Egypt Daylight Time" msgstr "Hora d'estiu d'Egipte" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Hora estàndard central (Mèxic)" +msgstr "Hora estàndard oriental (Mèxic)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Hora d'estiu central (Mèxic)" +msgstr "Hora d'estiu oriental (Mèxic)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time" @@ -10787,16 +10680,12 @@ msgid "Korea Daylight Time" msgstr "Hora d'estiu de Corea" #: dlls/tzres/tzres.rc:88 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "Hora estàndard de l'Illa de Pasqua" +msgstr "Hora estàndard de les Illes de Chatham" #: dlls/tzres/tzres.rc:89 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "Hora d'estiu de l'Illa de Pasqua" +msgstr "Hora d'estiu de les Illes de Chatham" #: dlls/tzres/tzres.rc:96 msgid "E. Africa Standard Time" @@ -10962,149 +10851,119 @@ msgstr "&Més finestres..." #: dlls/vbscript/vbscript.rc:30 msgid "Overflow" -msgstr "" +msgstr "Desbordament" #: dlls/vbscript/vbscript.rc:31 -#, fuzzy -#| msgid "Out of memory." msgid "Out of memory" -msgstr "No queda memòria." +msgstr "No queda memòria" #: dlls/vbscript/vbscript.rc:33 msgid "This array is fixed or temporarily locked" -msgstr "" +msgstr "Aquest vector és fix o està bloquejat temporalment" #: dlls/vbscript/vbscript.rc:34 -#, fuzzy -#| msgid "Data type mismatch.\n" msgid "Type mismatch" -msgstr "Els tipus de dades no es coincideixen.\n" +msgstr "Els tipus de dades no es coincideixen" #: dlls/vbscript/vbscript.rc:36 -#, fuzzy -#| msgid "I/O device error.\n" msgid "Device I/O error" -msgstr "Hi ha hagut un error de dispositiu E/S.\n" +msgstr "Error de dispositiu E/S" #: dlls/vbscript/vbscript.rc:37 -#, fuzzy -#| msgid "File already exists.\n" msgid "File already exists" -msgstr "El fitxer ja existeix.\n" +msgstr "El fitxer ja existeix" #: dlls/vbscript/vbscript.rc:38 -#, fuzzy -#| msgid "Disk full.\n" msgid "Disk full" -msgstr "El disc està ple.\n" +msgstr "El disc està ple" #: dlls/vbscript/vbscript.rc:39 -#, fuzzy -#| msgid "Too many open files.\n" msgid "Too many files" -msgstr "Hi ha massa fitxers oberts.\n" +msgstr "Hi ha massa fitxers" #: dlls/vbscript/vbscript.rc:40 -#, fuzzy -#| msgid "Access denied.\n" msgid "Permission denied" -msgstr "S'ha denegat l'accés.\n" +msgstr "S'ha denegat el permís" #: dlls/vbscript/vbscript.rc:41 msgid "Path/File access error" -msgstr "" +msgstr "Error d'accés al camí/fitxer" #: dlls/vbscript/vbscript.rc:42 -#, fuzzy -#| msgid "Path not found.\n" msgid "Path not found" -msgstr "No s'ha trobat el camí.\n" +msgstr "No s'ha trobat el camí" #: dlls/vbscript/vbscript.rc:43 -#, fuzzy -#| msgid "(value not set)" msgid "Object variable not set" -msgstr "(valor no definit)" +msgstr "La variable d'objecte no està establerta" #: dlls/vbscript/vbscript.rc:44 -#, fuzzy -#| msgid "Invalid user buffer.\n" msgid "Invalid use of Null" -msgstr "La memòria intermèdia d'usuari no és vàlida.\n" +msgstr "Ús no vàlid de Null" #: dlls/vbscript/vbscript.rc:45 msgid "Can't create necessary temporary file" -msgstr "" +msgstr "No es pot crear el fitxer temporal necessari" #: dlls/vbscript/vbscript.rc:46 -#, fuzzy -#| msgid "Automation server can't create object" msgid "ActiveX component can't create object" -msgstr "El servidor d'automatització no pot crear l'objecte" +msgstr "El component d'ActiveX no pot crear l'objecte" #: dlls/vbscript/vbscript.rc:47 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Class doesn't support Automation" -msgstr "L'objecte no accepta aquesta acció" +msgstr "La classe no permet l'automatització" #: dlls/vbscript/vbscript.rc:48 msgid "File name or class name not found during Automation operation" msgstr "" +"No s'ha trobat el nom de fitxer o nom de classe durant l'operació " +"d'automatització" #: dlls/vbscript/vbscript.rc:51 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support named arguments" -msgstr "L'objecte no accepta aquesta acció" +msgstr "L'objecte no accepta arguments nombrats" #: dlls/vbscript/vbscript.rc:52 -#, fuzzy -#| msgid "Object doesn't support this action" msgid "Object doesn't support current locale setting" -msgstr "L'objecte no accepta aquesta acció" +msgstr "L'objecte no accepta la configuració de localització actual" #: dlls/vbscript/vbscript.rc:53 dlls/vbscript/vbscript.rc:54 -#, fuzzy -#| msgid "Element not found.\n" msgid "Named argument not found" -msgstr "No s'ha trobat l'element.\n" +msgstr "No s'ha trobat el argument anomenat" #: dlls/vbscript/vbscript.rc:55 msgid "Wrong number of arguments or invalid property assignment" msgstr "" +"El nombre d'arguments és incorrecte o l'assignació de propietat no és vàlida" #: dlls/vbscript/vbscript.rc:56 -#, fuzzy -#| msgid "Object Class Violation" msgid "Object not a collection" -msgstr "Violació de classe d'objecte" +msgstr "L'objecte no és una colecció" #: dlls/vbscript/vbscript.rc:57 -#, fuzzy -#| msgid "Specified control was not found in message" msgid "Specified DLL function not found" -msgstr "No s'ha trobat el control especificat en el missatge" +msgstr "No s'ha trobat la funció especificada de la DLL" #: dlls/vbscript/vbscript.rc:58 msgid "Variable uses an Automation type not supported in VBScript" msgstr "" +"La variable utilitza un tipus d'automatització que no s'admet en VBScript" #: dlls/vbscript/vbscript.rc:59 msgid "The remote server machine does not exist or is unavailable" -msgstr "" +msgstr "La maquinà de servidor remota no existeix o no està disponible" #: dlls/vbscript/vbscript.rc:60 msgid "Invalid or unqualified reference" -msgstr "" +msgstr "Referència no vàlida o no qualificada" #: dlls/vbscript/vbscript.rc:62 msgid "Microsoft VBScript compilation error" -msgstr "" +msgstr "Error de compilació de Microsoft VBScript" #: dlls/vbscript/vbscript.rc:63 msgid "Microsoft VBScript runtime error" -msgstr "" +msgstr "Error d'entorn d'execució de Microsoft VBScript" #: dlls/winemac.drv/winemac.rc:33 msgid "Hide %@" @@ -11202,33 +11061,27 @@ msgstr "" #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Data efectiva" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Seguretat" +msgstr "Protocol de seguretat" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Signatura" +msgstr "Tipus de signatura" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Sistema de fitxers xifrant" +msgstr "Tipus de xifratge" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Força de privacitat" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bits" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n" @@ -13303,6 +13156,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Ordres admesos -\n" +"\n" +"hardlink gestió d'enllaços durs\n" #: programs/fsutil/fsutil.mc:35 msgid "" @@ -13310,10 +13166,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Enllaços durs - Ordres admesos -\n" +"\n" +"create crea un enllaç dur\n" #: programs/fsutil/fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Sintaxis: fsutil hardlink create <nou> <existent>\n" #: programs/hostname/hostname.rc:30 msgid "Usage: hostname\n" @@ -17159,10 +17018,8 @@ msgid "&Beginner" msgstr "&Principiant" #: programs/winemine/winemine.rc:45 -#, fuzzy -#| msgid "Interface" msgid "&Intermediate" -msgstr "Interfície" +msgstr "&Intermedi" #: programs/winemine/winemine.rc:46 msgid "&Expert" @@ -17193,10 +17050,8 @@ msgid "Beginner" msgstr "Principiant" #: programs/winemine/winemine.rc:65 -#, fuzzy -#| msgid "Interface" msgid "Intermediate" -msgstr "Interfície" +msgstr "Intermedi" #: programs/winemine/winemine.rc:66 msgid "Expert" -- 2.29.2

Dec. 14, 2020

Re: [PATCH] schedsvc/tests: Use wide-char string literals.

by Michael Stefaniuc

These are pre-existing failures with the line numbers changed: Win7: https://test.winehq.org/data/1f15ddce9c7d0ee71521d7b98c698488b76d3f01/win7_… Wine10 with random guid: https://test.winehq.org/data/3acb0b3326c4120ea0c4c6076bd03c9cfe82c744/win10… https://test.winehq.org/data/3acb0b3326c4120ea0c4c6076bd03c9cfe82c744/win10… bye michael On 12/13/20 11:16 PM, Marvin wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=83381 > > Your paranoid android. > > > === w7u_adm (32 bit report) === > > schedsvc: > rpcapi.c:245: Test failed: expected NULL, got 002CAC78 > rpcapi.c:257: Test failed: expected NULL, got 002CAC98 > rpcapi.c:357: Test failed: expected NULL, got 002CACB8 > > === w1064 (32 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{6E296D87-3A37-4576-8B29-672152273685}") error 0x80070057 > > === w10pro64 (32 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{71082777-AFC5-4A92-85FA-46995635F7FC}") error 0x80070057 > > === w1064 (64 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{6E296D87-3A37-4576-8B29-672152273685}") error 0x80070057 > > === w1064_2qxl (64 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{531B33AB-9322-4725-BCE9-BD0599B19B65}") error 0x80070057 > > === w10pro64 (64 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{1EDB8FC6-BE3E-40BE-823F-DB19FFBDFCCA}") error 0x80070057 > > === w10pro64_ar (64 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{CB2719FD-C006-44B6-BAB0-FC6506610C55}") error 0x80070057 > > === w10pro64_he (64 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{CBA05FEB-F013-46C5-BDE2-9A8D0579D288}") error 0x80070057 > > === w10pro64_ja (64 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{F79C4043-52FD-43CE-B546-85E5C12606F9}") error 0x80070057 > > === w10pro64_zh_CN (64 bit report) === > > schedsvc: > rpcapi.c:524: Test failed: IIDFromString(L"\\{1893A337-1CEF-4C9F-9EF7-D0879D50089B}") error 0x80070057 >

Dec. 13, 2020

Re: [PATCH] schedsvc/tests: Use wide-char string literals.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83381 Your paranoid android. === w7u_adm (32 bit report) === schedsvc: rpcapi.c:245: Test failed: expected NULL, got 002CAC78 rpcapi.c:257: Test failed: expected NULL, got 002CAC98 rpcapi.c:357: Test failed: expected NULL, got 002CACB8 === w1064 (32 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{6E296D87-3A37-4576-8B29-672152273685}") error 0x80070057 === w10pro64 (32 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{71082777-AFC5-4A92-85FA-46995635F7FC}") error 0x80070057 === w1064 (64 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{6E296D87-3A37-4576-8B29-672152273685}") error 0x80070057 === w1064_2qxl (64 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{531B33AB-9322-4725-BCE9-BD0599B19B65}") error 0x80070057 === w10pro64 (64 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{1EDB8FC6-BE3E-40BE-823F-DB19FFBDFCCA}") error 0x80070057 === w10pro64_ar (64 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{CB2719FD-C006-44B6-BAB0-FC6506610C55}") error 0x80070057 === w10pro64_he (64 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{CBA05FEB-F013-46C5-BDE2-9A8D0579D288}") error 0x80070057 === w10pro64_ja (64 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{F79C4043-52FD-43CE-B546-85E5C12606F9}") error 0x80070057 === w10pro64_zh_CN (64 bit report) === schedsvc: rpcapi.c:524: Test failed: IIDFromString(L"\\{1893A337-1CEF-4C9F-9EF7-D0879D50089B}") error 0x80070057

Dec. 13, 2020

[PATCH v3] dlls/d3d9: Fix handling of D3DENUM_WHQL_LEVEL

by Rafał Harabień

D3DENUM_NO_WHQL_LEVEL was renamed to D3DENUM_WHQL_LEVEL and its meaning was negated in DirectX 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/d3d8/directx.c | 3 +++ dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..886100442fd 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,9 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + // D3DENUM_NO_WHQL_LEVEL -> WINED3DENUM_WHQL_LEVEL + flags ^= D3DENUM_NO_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f78d344c085..d616330c307 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2642,7 +2642,7 @@ static HRESULT WINAPI ddraw7_GetDeviceIdentifier(IDirectDraw7 *iface, adapter_id.description = DDDI->szDescription; adapter_id.description_size = sizeof(DDDI->szDescription); wined3d_mutex_lock(); - hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, 0x0, &adapter_id); + hr = wined3d_adapter_get_identifier(ddraw->wined3d_adapter, WINED3DENUM_WHQL_LEVEL, &adapter_id); wined3d_mutex_unlock(); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000 -- 2.25.1

Dec. 13, 2020

Re: [PATCH] ntdll: Only build Linux-specific functions on Linux

by Gerald Pfeifer

On Tue, 8 Dec 2020, Alexandre Julliard wrote: >> logical_proc_info_add_by_id, logical_proc_info_add_cache, >> logical_proc_info_add_group, and logical_proc_info_add_numa_node >> are only useful and invoked on Linux, so disable their build >> elsewhere. > They are also used on macOS. A better fix would be to implement the > missing functionality for *BSD platforms. Hmm, that's true. Until that happens, would you consider a patch #if defined(linux) || defined(__APPLE__) instead? (Damjan, maybe that's something for you? We're talking about dlls/ntdll/unix/system.c.) Thanks, Gerald

Dec. 13, 2020

[PATCH] schedsvc/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/schedsvc/tests/atsvcapi.c | 2 +- dlls/schedsvc/tests/rpcapi.c | 168 ++++++++++++++++----------------- 2 files changed, 80 insertions(+), 90 deletions(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index f10c9d07232..5f5ca06627a 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -52,7 +52,7 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) START_TEST(atsvcapi) { static unsigned char ncalrpc[] = "ncalrpc"; - static WCHAR task1W[] = { 'T','a','s','k','1','.','e','x','e',0 }; + static WCHAR task1W[] = L"Task1.exe"; HRESULT hr; unsigned char *binding_str; WCHAR server_name[MAX_COMPUTERNAME_LENGTH + 1]; diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index b791a047dce..b806b97539d 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -42,19 +42,6 @@ static LONG CALLBACK rpc_exception_filter(EXCEPTION_POINTERS *ptrs) START_TEST(rpcapi) { static unsigned char ncalrpc[] = "ncalrpc"; - static const WCHAR empty[] = { 0 }; - static const WCHAR Wine[] = { '\\','W','i','n','e',0 }; - static const WCHAR Wine_Folder1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1',0 }; - static const WCHAR Wine_Folder2[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','2',0 }; - static const WCHAR Folder1[] = { 'F','o','l','d','e','r','1',0 }; - static const WCHAR Folder2[] = { 'F','o','l','d','e','r','2',0 }; - static const WCHAR Wine_Task1[] = { '\\','W','i','n','e','\\','T','a','s','k','1',0 }; - static const WCHAR Wine_Task2[] = { '\\','W','i','n','e','\\','T','a','s','k','2',0 }; - static const WCHAR Wine_Task3[] = { '\\','W','i','n','e','\\','T','a','s','k','3',0 }; - static const WCHAR Wine_Folder1_Task1[] = { '\\','W','i','n','e','\\','F','o','l','d','e','r','1','\\','T','a','s','k','1',0 }; - static const WCHAR Task1[] = { 'T','a','s','k','1',0 }; - static const WCHAR Task2[] = { 'T','a','s','k','2',0 }; - static const WCHAR Task3[] = { 'T','a','s','k','3',0 }; static const char xml1[] = "<?xml version=\"1.0\"?>\n" "<Task xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n" @@ -121,49 +108,49 @@ START_TEST(rpcapi) SetUnhandledExceptionFilter(old_exception_filter); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 1); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder2+1, empty, 0); + hr = SchRpcCreateFolder(L"Wine\\Folder2", L"", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine+1, 0); + hr = SchRpcDelete(L"Wine", 0); ok(hr == HRESULT_FROM_WIN32(ERROR_DIR_NOT_EMPTY), "expected ERROR_DIR_NOT_EMPTY, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 1); + hr = SchRpcDelete(L"Wine\\Folder1", 1); ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder2, 0); + hr = SchRpcDelete(L"\\Wine\\Folder2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || broken(hr == S_OK), /* Early versions of Win 10 */ "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); - hr = SchRpcDelete(empty, 0); + hr = SchRpcDelete(L"", 0); ok(hr == E_ACCESSDENIED /* win7 */ || hr == E_INVALIDARG /* vista */, "expected E_ACCESSDENIED, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, ARRAY_SIZE(xmlW)); path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine+1, xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -172,12 +159,13 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1, xmlW, create_new_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, create_new_task[i].flags, NULL, + TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == create_new_task[i].hr, "%u: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); if (hr == S_OK) { - hr = SchRpcDelete(Wine_Task1, 0); + hr = SchRpcDelete(L"\\Wine\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); @@ -186,7 +174,7 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1, xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task1", xmlW, TASK_VALIDATE_ONLY, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); @@ -200,9 +188,9 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Folder1_Task1) /* win7 */ || !lstrcmpW(path, Wine_Folder1_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Folder1\\Task1") /* vista */, "expected \\Wine\\Folder1\\Task1, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); @@ -211,11 +199,13 @@ START_TEST(rpcapi) { path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, open_existing_task[i].flags, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, open_existing_task[i].flags, NULL, + TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == open_existing_task[i].hr, "%u: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); if (hr == S_OK) { - ok(!lstrcmpW(path, Wine_Folder1_Task1) /* win7 */ || !lstrcmpW(path, Wine_Folder1_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Folder1\\Task1") /* win7 */ || + !lstrcmpW(path, L"Wine\\Folder1\\Task1") /* vista */, "expected \\Wine\\Folder1\\Task1, task actual path %s\n", wine_dbgstr_w(path)); MIDL_user_free(path); } @@ -226,55 +216,55 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Folder1_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Folder1\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr); ok(!path, "expected NULL, path %p\n", path); ok(!info, "expected NULL, info %p\n", info); count = 0; xml = NULL; - hr = SchRpcRetrieveTask(Wine_Folder1_Task1, empty, &count, &xml); + hr = SchRpcRetrieveTask(L"\\Wine\\Folder1\\Task1", L"", &count, &xml); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); if (hr == S_OK) trace("%s\n", wine_dbgstr_w(xml)); MIDL_user_free(xml); - hr = SchRpcDelete(Wine_Folder1_Task1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine+1, 0); + hr = SchRpcDelete(L"Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcCreateFolder(Wine, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcCreateFolder(Wine_Folder1, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder1", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcCreateFolder(Wine_Folder2, NULL, 0); + hr = SchRpcCreateFolder(L"\\Wine\\Folder2", NULL, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -282,9 +272,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -294,19 +284,19 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 1, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 1, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); - ok(!lstrcmpW(names[0], Folder1) || !lstrcmpW(names[0], Folder2), "got %s\n", wine_dbgstr_w(names[0])); + ok(!lstrcmpW(names[0], L"Folder1") || !lstrcmpW(names[0], L"Folder2"), "got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 2, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 2, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -314,9 +304,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -326,7 +316,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -334,9 +324,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Folder1)) + if (!lstrcmpW(names[i], L"Folder1")) enumed += 1; - else if (!lstrcmpW(names[i], Folder2)) + else if (!lstrcmpW(names[i], L"Folder2")) enumed += 2; MIDL_user_free(names[i]); } @@ -346,21 +336,21 @@ START_TEST(rpcapi) start_index = 10; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumFolders(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumFolders(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(start_index == 10, "expected 10, got %u\n", start_index); ok(!names, "expected NULL, got %p\n", names); - hr = SchRpcDelete(Wine_Folder1+1, 0); + hr = SchRpcDelete(L"Wine\\Folder1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Folder2, 0); + hr = SchRpcDelete(L"\\Wine\\Folder2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine_Folder1, TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine\\Folder1", TASK_ENUM_HIDDEN, &start_index, 0, &count, &names); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); ok(!count, "expected 0, got %u\n", count); ok(!start_index, "expected 0, got %u\n", start_index); @@ -368,25 +358,25 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task1+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task1", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task1) /* win7 */ || !lstrcmpW(path, Wine_Task1+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Task1") /* win7 */ || !lstrcmpW(path, L"Wine\\Task1") /* vista */, "expected \\Wine\\Task1, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task2, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"\\Wine\\Task2", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task2), "expected \\Wine\\Task2, task actual path %s\n", wine_dbgstr_w(path)); + ok(!lstrcmpW(path, L"\\Wine\\Task2"), "expected \\Wine\\Task2, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 0, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 0, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -394,9 +384,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -406,13 +396,13 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 1, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 1, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 1, "expected 1, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ - ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2), + ok(!lstrcmpW(names[0], L"Task1") || !lstrcmpW(names[0], L"Task2"), "expected Task1, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -420,7 +410,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 2, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 2, &count, &names); ok(hr == S_FALSE, "expected S_FALSE, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -428,9 +418,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -440,7 +430,7 @@ START_TEST(rpcapi) start_index = 0; count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumTasks(L"\\Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 2, "expected 2, got %u\n", count); ok(start_index == 2, "expected 2, got %u\n", start_index); @@ -448,9 +438,9 @@ START_TEST(rpcapi) enumed = 0; for (i = 0; i < count; i++) { - if (!lstrcmpW(names[i], Task1)) + if (!lstrcmpW(names[i], L"Task1")) enumed += 1; - else if (!lstrcmpW(names[i], Task2)) + else if (!lstrcmpW(names[i], L"Task2")) enumed += 2; MIDL_user_free(names[i]); } @@ -459,22 +449,22 @@ START_TEST(rpcapi) path = NULL; info = NULL; - hr = SchRpcRegisterTask(Wine_Task3+1, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); + hr = SchRpcRegisterTask(L"Wine\\Task3", xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - ok(!lstrcmpW(path, Wine_Task3) /* win7 */ || !lstrcmpW(path, Wine_Task3+1) /* vista */, + ok(!lstrcmpW(path, L"\\Wine\\Task3") /* win7 */ || !lstrcmpW(path, L"Wine\\Task3") /* vista */, "expected \\Wine\\Task3, task actual path %s\n", wine_dbgstr_w(path)); ok(!info, "expected NULL, info %p\n", info); MIDL_user_free(path); count = 0xdeadbeef; names = NULL; - hr = SchRpcEnumTasks(Wine+1, 0, &start_index, 10, &count, &names); + hr = SchRpcEnumTasks(L"Wine", 0, &start_index, 10, &count, &names); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(count == 1, "expected 1, got %u\n", count); ok(start_index == 3, "expected 3, got %u\n", start_index); ok(names != NULL, "names should not be NULL\n"); /* returned name depends whether directory randomization is on */ - ok(!lstrcmpW(names[0], Task1) || !lstrcmpW(names[0], Task2) || !lstrcmpW(names[0], Task3), + ok(!lstrcmpW(names[0], L"Task1") || !lstrcmpW(names[0], L"Task2") || !lstrcmpW(names[0], L"Task3"), "expected Task3, got %s\n", wine_dbgstr_w(names[0])); MIDL_user_free(names[0]); MIDL_user_free(names); @@ -482,45 +472,45 @@ START_TEST(rpcapi) if (0) /* crashes under win7 */ { hr = SchRpcGetTaskInfo(NULL, 0, NULL, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, NULL, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, &enabled, NULL); - hr = SchRpcGetTaskInfo(Task1, 0, NULL, &state); + hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, NULL); + hr = SchRpcGetTaskInfo(L"Task1", 0, &enabled, NULL); + hr = SchRpcGetTaskInfo(L"Task1", 0, NULL, &state); } - hr = SchRpcGetTaskInfo(Task1, 0, &enabled, &state); + hr = SchRpcGetTaskInfo(L"Task1", 0, &enabled, &state); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, 0, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", 0, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_UNKNOWN, "expected TASK_STATE_UNKNOWN, got %u\n", state); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); ok(enabled == 0, "expected 0, got %u\n", enabled); ok(state == TASK_STATE_DISABLED, "expected TASK_STATE_DISABLED, got %u\n", state); - hr = SchRpcEnableTask(Wine_Task1, 0xdeadbeef); + hr = SchRpcEnableTask(L"\\Wine\\Task1", 0xdeadbeef); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); enabled = state = 0xdeadbeef; - hr = SchRpcGetTaskInfo(Wine_Task1, SCH_FLAG_STATE, &enabled, &state); + hr = SchRpcGetTaskInfo(L"\\Wine\\Task1", SCH_FLAG_STATE, &enabled, &state); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); todo_wine ok(enabled == 1, "expected 1, got %u\n", enabled); todo_wine ok(state == TASK_STATE_READY, "expected TASK_STATE_READY, got %u\n", state); - hr = SchRpcDelete(Wine_Task1+1, 0); + hr = SchRpcDelete(L"Wine\\Task1", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Task2+1, 0); + hr = SchRpcDelete(L"Wine\\Task2", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine_Task3+1, 0); + hr = SchRpcDelete(L"Wine\\Task3", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = SchRpcDelete(Wine, 0); + hr = SchRpcDelete(L"\\Wine", 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); path = NULL; -- 2.26.2

Dec. 13, 2020

[PATCH] msi/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/tests/custom.c | 4 +--- dlls/msi/tests/record.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index caf24356948..d74d0a2d097 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -518,12 +518,10 @@ static void test_db(MSIHANDLE hinst) for (i = 0; i < 20; i++) { - WCHAR emptyW[1] = { 0 }; - r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); - r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, emptyW); + r = MsiSummaryInfoSetPropertyW(suminfo, i, prop_type[i], 1252, &ft, L""); ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); } diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index 8e4c2df4294..407d756caae 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -56,7 +56,6 @@ static void test_msirecord(void) char buf[10]; WCHAR bufW[10]; const char str[] = "hello"; - const WCHAR strW[] = { 'h','e','l','l','o',0}; char filename[MAX_PATH]; /* check behaviour with an invalid record */ @@ -210,7 +209,7 @@ static void test_msirecord(void) r = MsiRecordGetStringW(h,0,bufW,&sz); ok(r == ERROR_MORE_DATA, "wrong error\n"); ok(sz == 5, "MsiRecordGetStringA returned the wrong length\n"); - ok(0==memcmp(bufW,strW,8), "MsiRecordGetStringA returned the wrong string\n"); + ok(!memcmp(bufW, L"hello", 8), "MsiRecordGetStringA returned the wrong string\n"); sz = 0; bufW[0] = 'x'; -- 2.26.2

Dec. 13, 2020

[PATCH] hnetcfg/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 416049c0093..e2606933079 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -109,7 +109,7 @@ static void test_interfaces(void) static void test_NetFwAuthorizedApplication(void) { INetFwAuthorizedApplication *app; - static WCHAR empty[] = {0}; + static WCHAR empty[] = L""; UNIVERSAL_NAME_INFOW *info; WCHAR fullpath[MAX_PATH]; WCHAR netpath[MAX_PATH]; -- 2.26.2

Dec. 13, 2020

[PATCH] wldap32/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/tests/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index c982be9e592..9fdd4db03ad 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -98,7 +98,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) static void test_ldap_search_extW( LDAP *ld ) { ULONG ret, message, timelimit; - WCHAR base[] = {0}, filter[] = {'o','u','=','*',0}; + WCHAR base[] = L"", filter[] = L"ou=*"; timelimit = 20; ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); -- 2.26.2

Dec. 13, 2020

[PATCH] atl100/tests: Use wide-char string literals.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl100/tests/atl.c | 59 +++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index d23c53c1047..71e25b3fb3e 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -43,24 +43,12 @@ static const GUID CATID_CatTest1 = static const GUID CATID_CatTest2 = {0x178fc163,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x46}}; #define CATID_CATTEST2_STR "178fc163-0000-0000-0000-000000000246" - -static const WCHAR emptyW[] = {'\0'}; -static const WCHAR randomW[] = {'r','a','n','d','o','m','\0'}; -static const WCHAR progid1W[] = {'S','h','e','l','l','.','E','x','p','l','o','r','e','r','.','2','\0'}; -static const WCHAR clsid1W[] = {'{','8','8','5','6','f','9','6','1','-','3','4','0','a','-', - '1','1','d','0','-','a','9','6','b','-', - '0','0','c','0','4','f','d','7','0','5','a','2','}','\0'}; -static const WCHAR url1W[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q', - '.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_', - 's','n','a','p','s','h','o','t','/','\0'}; -static const WCHAR mshtml1W[] = {'m','s','h','t','m','l',':','<','h','t','m','l','>','<','b','o','d','y','>', - 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR mshtml2W[] = {'M','S','H','T','M','L',':','<','h','t','m','l','>','<','b','o','d','y','>', - 't','e','s','t','<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR mshtml3W[] = {'<','h','t','m','l','>','<','b','o','d','y','>', 't','e','s','t', - '<','/','b','o','d','y','>','<','/','h','t','m','l','>','\0'}; -static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/','\0'}; -static const WCHAR html_fileW[] = {'t','e','s','t','.','h','t','m','l','\0'}; +static const WCHAR progid1W[] = L"Shell.Explorer.2"; +static const WCHAR clsid1W[] = L"{8856f961-340a-11d0-a96b-00c04fd705a2}"; +static const WCHAR url1W[] = L"http://test.winehq.org/tests/winehq_snapshot/"; +static const WCHAR mshtml1W[] = L"mshtml:<html><body>test</body></html>"; +static const WCHAR mshtml2W[] = L"MSHTML:<html><body>test</body></html>"; +static const WCHAR mshtml3W[] = L"<html><body>test</body></html>"; static const char html_str[] = "<html><body>test</body><html>"; static BOOL is_token_admin(HANDLE token) @@ -292,9 +280,6 @@ static void test_typelib(void) BSTR path; HRESULT hres; - static const WCHAR scrrun_dll_suffixW[] = {'\\','s','c','r','r','u','n','.','d','l','l',0}; - static const WCHAR mshtml_tlb_suffixW[] = {'\\','m','s','h','t','m','l','.','t','l','b',0}; - inst = LoadLibraryA("scrrun.dll"); ok(inst != NULL, "Could not load scrrun.dll\n"); @@ -304,8 +289,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > ARRAY_SIZE(scrrun_dll_suffixW) - && lstrcmpiW(path+len-ARRAY_SIZE(scrrun_dll_suffixW), scrrun_dll_suffixW), + ok(len > ARRAY_SIZE(L"\\scrrun.dll") + && lstrcmpiW(path+len-ARRAY_SIZE(L"\\scrrun.dll"), L"\\scrrun.dll"), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -320,8 +305,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > ARRAY_SIZE(mshtml_tlb_suffixW) - && lstrcmpiW(path+len-ARRAY_SIZE(mshtml_tlb_suffixW), mshtml_tlb_suffixW), + ok(len > ARRAY_SIZE(L"\\mshtml.tlb") + && lstrcmpiW(path+len-ARRAY_SIZE(L"\\mshtml.tlb"), L"\\mshtml.tlb"), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -589,12 +574,10 @@ static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID l ITypeLib *typelib; HRESULT hres; - static const WCHAR mshtml_tlbW[] = {'m','s','h','t','m','l','.','t','l','b',0}; - ok(!iTInfo, "iTInfo = %d\n", iTInfo); ok(!lcid, "lcid = %x\n", lcid); - hres = LoadTypeLib(mshtml_tlbW, &typelib); + hres = LoadTypeLib(L"mshtml.tlb", &typelib); ok(hres == S_OK, "LoadTypeLib failed: %08x\n", hres); hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IHTMLElement, ppTInfo); @@ -679,8 +662,8 @@ static void test_ax_win(void) static HMODULE hinstance = 0; static const WCHAR cls_names[][16] = { - {'A','t','l','A','x','W','i','n','1','0','0',0}, - {'A','t','l','A','x','W','i','n','L','i','c','1','0','0',0} + L"AtlAxWin100", + L"AtlAxWinLic100" }; ret = AtlAxWinInit(); @@ -706,7 +689,7 @@ static void test_ax_win(void) if (control) IUnknown_Release(control); DestroyWindow(hwnd); - hwnd = CreateWindowW(cls_names[i], emptyW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + hwnd = CreateWindowW(cls_names[i], L"", 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); @@ -715,7 +698,7 @@ static void test_ax_win(void) if (control) IUnknown_Release(control); DestroyWindow(hwnd); - hwnd = CreateWindowW(cls_names[i], randomW, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); + hwnd = CreateWindowW(cls_names[i], L"random", 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); todo_wine ok(!hwnd, "returned %p\n", hwnd); if(hwnd) DestroyWindow(hwnd); @@ -772,7 +755,7 @@ static void test_ax_win(void) ret = GetTempPathW(MAX_PATH, pathW); ok(ret, "GetTempPath failed!\n"); - lstrcatW(pathW, html_fileW); + lstrcatW(pathW, L"test.html"); hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); @@ -790,7 +773,7 @@ static void test_ax_win(void) DestroyWindow(hwnd); /* test file:// scheme */ - lstrcpyW(file_uri1W, fileW); + lstrcpyW(file_uri1W, L"file:///"); lstrcatW(file_uri1W, pathW); hwnd = CreateWindowW(cls_names[i], file_uri1W, 0, 100, 100, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindow failed!\n"); @@ -940,7 +923,7 @@ static void test_AtlAxCreateControl(void) control = (IUnknown *)0xdeadbeef; hwnd = create_container_window(); ok(hwnd != NULL, "create window failed!\n"); - hr = AtlAxCreateControlEx(emptyW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + hr = AtlAxCreateControlEx(L"", hwnd, NULL, &container, &control, &IID_NULL, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(container != NULL, "returned %p!\n", container); ok(!control, "returned %p\n", control); @@ -950,7 +933,7 @@ static void test_AtlAxCreateControl(void) control = (IUnknown *)0xdeadbeef; hwnd = create_container_window(); ok(hwnd != NULL, "create window failed!\n"); - hr = AtlAxCreateControlEx(randomW, hwnd, NULL, &container, &control, &IID_NULL, NULL); + hr = AtlAxCreateControlEx(L"random", hwnd, NULL, &container, &control, &IID_NULL, NULL); ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); ok(!container, "returned %p!\n", container); ok(!control, "returned %p\n", control); @@ -1028,7 +1011,7 @@ static void test_AtlAxCreateControl(void) ret = GetTempPathW(MAX_PATH, pathW); ok(ret, "GetTempPath failed!\n"); - lstrcatW(pathW, html_fileW); + lstrcatW(pathW, L"test.html"); hfile = CreateFileW(pathW, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create file\n"); ret = WriteFile(hfile, html_str, sizeof(html_str), &ret_size, NULL); @@ -1049,7 +1032,7 @@ static void test_AtlAxCreateControl(void) DestroyWindow(hwnd); /* test file:// scheme */ - lstrcpyW(file_uri1W, fileW); + lstrcpyW(file_uri1W, L"file:///"); lstrcatW(file_uri1W, pathW); container = NULL; control = NULL; -- 2.26.2

Dec. 13, 2020

[PATCH v2] kernelbase: Implement SetFileInformationByHandle(FileEndOfFileInfo).

by Jiangyi Chen

Dec. 13, 2020

[PATCH] kernelbase: Setting FileEndOfFileInfo has been implemented in NtSetInformationFile. SetFileInformationByHandle should do the same call as SetEndOfFile in case of FileEndOfFileInfo.

by Jiangyi Chen

Dec. 13, 2020

[PATCH] kernelbase: Implement GetFileInformationByHandleEx(FileEndOfFileInfo).

by Jiangyi Chen

Dec. 13, 2020

Wine staging 6.0-rc2 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0-rc2 (715 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * None Updated: * server-Stored_ACLs * ntdll-DOS_Attributes * ntdll-Junction_Points * libs-Unicode_Collation * eventfd_synchronization * mfplat-streaming-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

Dec. 13, 2020

[PATCH] inetcpl.cpl: Fix memory leak in security_on_initdialog.

by Haidong Yu

Dec. 13, 2020

[PATCH] inetcpl.cpl: If memory allocation fails,the program will carsh.

by Haidong Yu

Dec. 12, 2020

Re: [PATCH v2 vkd3d 2/4] vkd3d-shader: Implement basic support for #if and #endif.

by Zebediah Figura (she/her)

On 12/11/20 12:11 PM, Henri Verbeet wrote: > On Fri, 11 Dec 2020 at 00:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: >> diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h >> index 5a022708..01a74ede 100644 >> --- a/libs/vkd3d-shader/vkd3d_shader_private.h >> +++ b/libs/vkd3d-shader/vkd3d_shader_private.h >> @@ -81,6 +81,10 @@ enum vkd3d_shader_error >> VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, >> >> VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, >> + >> + VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 5001, >> + VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 5003, >> + VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 5005, >> }; >> >> enum VKD3D_SHADER_INSTRUCTION_HANDLER >> @@ -867,6 +871,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d >> const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; >> void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, >> enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; >> +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, >> + enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; >> > Is reusing enum vkd3d_shader_error for warnings instead of introducing > a separate enumeration here intentional? > It was intentional, though of course not necessary. I guess my reasoning was that there's no reason to let any numerical values coincide, and hence no reason to bother separating the enumerations...

Dec. 11, 2020

Re: [PATCH v2 vkd3d 1/4] vkd3d-shader: Handle preprocessor parsing errors.

by Zebediah Figura (she/her)

On 12/11/20 12:11 PM, Henri Verbeet wrote: > On Fri, 11 Dec 2020 at 00:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: >> +struct preproc_location >> +{ >> + const char *filename; >> + unsigned int first_line, first_column; >> +}; >> + >> struct preproc_ctx >> { >> void *scanner; >> >> + struct vkd3d_shader_message_context *message_context; >> struct vkd3d_string_buffer buffer; >> + unsigned int line, column; >> + const char *source_name; >> + >> + bool error; >> }; >> > There seems to be some duplication of location information between > struct vkd3d_shader_message_context, struct preproc_ctx, and struct > preproc_location. Is that intentional? If it is, would it make sense > to introduce e.g. a struct vkd3d_shader_source_location instead of > struct preproc_location, and then use that structure in both struct > vkd3d_shader_message_context and struct preproc_ctx? Wrt the vkd3d_shader_message_context part—the current structure definitely isn't a great fit for the preprocessor or HLSL parser (i.e. the parts that use yacc) because the location tracking means that we'll be setting a new location on every error call. (And of course most of the other parsers we have don't really have a meaningful concept of line/column locations...) But I wasn't sure enough to actually try to redesign those parts, and it seemed like something that could be deferred, so I just left it alone... Wrt preproc_location vs preproc_ctx—part of the rub here is that {line, column} is a bit different from {first_line, first_column}; i.e. if we were to add {last_line, last_column}, that wouldn't be a part of preproc_ctx. > >> +#define YYLLOC_DEFAULT(cur, rhs, n) \ >> + do \ >> + { \ >> + if (n) \ >> + { \ >> + (cur).filename = YYRHSLOC(rhs, 1).filename; \ >> + (cur).first_line = YYRHSLOC(rhs, 1).first_line; \ >> + (cur).first_column = YYRHSLOC(rhs, 1).first_column; \ >> + } \ >> + else \ >> + { \ >> + (cur).filename = YYRHSLOC(rhs, 0).filename; \ >> + (cur).first_line = YYRHSLOC(rhs, 0).first_line; \ >> + (cur).first_column = YYRHSLOC(rhs, 0).first_column; \ >> + } \ >> + } while (0) >> + > Generally speaking, we would try to avoid multi-line macros by doing > something like the following where possible: > > static inline void preproc_yylloc_default(struct preproc_location > *cur, const struct preproc_location *rhs, int n) > { > if (n) > { > cur->filename = YYRHSLOC(rhs, 1).filename; > cur->first_line = YYRHSLOC(rhs, 1).first_line; > cur->first_column = YYRHSLOC(rhs, 1).first_column; > } > else > { > cur->filename = YYRHSLOC(rhs, 0).filename; > cur->first_line = YYRHSLOC(rhs, 0).first_line; > cur->first_column = YYRHSLOC(rhs, 0).first_column; > } > } > > #define YYLLOC_DEFAULT(cur, rhs, n) preproc_yylloc_default(&cur, rhs, n) > > In this particular case though, I think all that essentially reduces to: > > #define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n) > Excellent point, thanks.

Dec. 11, 2020

Re: [PATCH v2 vkd3d 2/4] vkd3d-shader: Implement basic support for #if and #endif.

by Henri Verbeet

On Fri, 11 Dec 2020 at 00:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h > index 5a022708..01a74ede 100644 > --- a/libs/vkd3d-shader/vkd3d_shader_private.h > +++ b/libs/vkd3d-shader/vkd3d_shader_private.h > @@ -81,6 +81,10 @@ enum vkd3d_shader_error > VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, > > VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, > + > + VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 5001, > + VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 5003, > + VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 5005, > }; > > enum VKD3D_SHADER_INSTRUCTION_HANDLER > @@ -867,6 +871,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d > const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; > void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, > enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; > +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, > + enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; > Is reusing enum vkd3d_shader_error for warnings instead of introducing a separate enumeration here intentional?

Dec. 11, 2020

Re: [PATCH v2 vkd3d 1/4] vkd3d-shader: Handle preprocessor parsing errors.

by Henri Verbeet

On Fri, 11 Dec 2020 at 00:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > +struct preproc_location > +{ > + const char *filename; > + unsigned int first_line, first_column; > +}; > + > struct preproc_ctx > { > void *scanner; > > + struct vkd3d_shader_message_context *message_context; > struct vkd3d_string_buffer buffer; > + unsigned int line, column; > + const char *source_name; > + > + bool error; > }; > There seems to be some duplication of location information between struct vkd3d_shader_message_context, struct preproc_ctx, and struct preproc_location. Is that intentional? If it is, would it make sense to introduce e.g. a struct vkd3d_shader_source_location instead of struct preproc_location, and then use that structure in both struct vkd3d_shader_message_context and struct preproc_ctx? > +#define YYLLOC_DEFAULT(cur, rhs, n) \ > + do \ > + { \ > + if (n) \ > + { \ > + (cur).filename = YYRHSLOC(rhs, 1).filename; \ > + (cur).first_line = YYRHSLOC(rhs, 1).first_line; \ > + (cur).first_column = YYRHSLOC(rhs, 1).first_column; \ > + } \ > + else \ > + { \ > + (cur).filename = YYRHSLOC(rhs, 0).filename; \ > + (cur).first_line = YYRHSLOC(rhs, 0).first_line; \ > + (cur).first_column = YYRHSLOC(rhs, 0).first_column; \ > + } \ > + } while (0) > + Generally speaking, we would try to avoid multi-line macros by doing something like the following where possible: static inline void preproc_yylloc_default(struct preproc_location *cur, const struct preproc_location *rhs, int n) { if (n) { cur->filename = YYRHSLOC(rhs, 1).filename; cur->first_line = YYRHSLOC(rhs, 1).first_line; cur->first_column = YYRHSLOC(rhs, 1).first_column; } else { cur->filename = YYRHSLOC(rhs, 0).filename; cur->first_line = YYRHSLOC(rhs, 0).first_line; cur->first_column = YYRHSLOC(rhs, 0).first_column; } } #define YYLLOC_DEFAULT(cur, rhs, n) preproc_yylloc_default(&cur, rhs, n) In this particular case though, I think all that essentially reduces to: #define YYLLOC_DEFAULT(cur, rhs, n) (cur) = YYRHSLOC(rhs, !!n)

Dec. 11, 2020

Re: [PATCH v2 1/2] include: Remove two D3DCAPS2 defines in d3d9 headers

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 11, 2020

[PATCH] setjmp.h: Use GCC-style setjmp on Clang in MSVC mode.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/setjmp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

Dec. 11, 2020

Re: [PATCH v2 2/2] dlls/d3d9: Fix handling of D3DENUM_WHQL_LEVEL

by Henri Verbeet

On Fri, 11 Dec 2020 at 01:09, Rafał Harabień <rafalh92(a)outlook.com> wrote: > diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c > index 0c0f2ecaadc..900e2782353 100644 > --- a/dlls/d3d8/directx.c > +++ b/dlls/d3d8/directx.c > @@ -121,6 +121,11 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, > adapter_id.description = identifier->Description; > adapter_id.description_size = sizeof(identifier->Description); > > + if (flags & D3DENUM_NO_WHQL_LEVEL) > + flags = flags & ~D3DENUM_NO_WHQL_LEVEL; > + else > + flags |= WINED3DENUM_WHQL_LEVEL; > + That's reasonable enough, although "flags ^= WINED3DENUM_WHQL_LEVEL" would perhaps be more straightforward. You seem to have missed ddraw7_GetDeviceIdentifier() however, which also uses wined3d_adapter_get_identifier().

Dec. 11, 2020

[PATCH 2/2] winevulkan: Check for NULL in vkDestroyDebugReportCallbackEXT.

by Georg Lehmann

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 47f06f32bc3..10c86159a61 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1965,6 +1965,9 @@ void WINAPI wine_vkDestroyDebugReportCallbackEXT( TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(callback), allocator); + if (!callback) + return; + object = wine_debug_report_callback_from_handle(callback); instance->funcs.p_vkDestroyDebugReportCallbackEXT(instance->instance, object->debug_callback, NULL); -- 2.29.2

Dec. 11, 2020

[PATCH 1/2] winevulkan: Check for NULL in vkDestroyDebugUtilsMessengerEXT.

by Georg Lehmann

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index b0a8559fe2c..47f06f32bc3 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1860,6 +1860,9 @@ void WINAPI wine_vkDestroyDebugUtilsMessengerEXT( TRACE("%p, 0x%s, %p\n", instance, wine_dbgstr_longlong(messenger), allocator); + if (!messenger) + return; + object = wine_debug_utils_messenger_from_handle(messenger); instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL); -- 2.29.2

Dec. 11, 2020

[website] German translation for release 6.0-rc1

by Julian Rüger

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

Dec. 11, 2020

[website] German translation for release 5.22

by Julian Rüger

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

Dec. 11, 2020

[PATCH] po: Update German translation.

by Julian Rüger

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

Dec. 11, 2020

[PATCH] ntdll: Don't set xstate in context if xstate features are not supported.

by Paul Gofman

Fixes a regression reproducible on CPUs without XSAVE support introduced by 419abd49a1f816e5a869dbf4cc81114cd516138b. The regression commit erroneously assumes that if XSAVE is not supported then the host signal context won't have xsave data set up. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50271 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 2e75d0b84ff..f1fd2cd2e41 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -784,7 +784,7 @@ static inline void restore_xstate( const CONTEXT *context ) XSAVE_FORMAT *xrstor_base; XSTATE *xs; - if (!(xs = xstate_from_context( context ))) + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) return; xrstor_base = (XSAVE_FORMAT *)xs - 1; @@ -901,7 +901,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); - if ((xs = XState_sig(fpux))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(fpux))) { context_init_xstate( context, xs ); xcontext->host_compaction_mask = xs->CompactionMask; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 1b5c2e59444..59b7a3750c4 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1483,7 +1483,7 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex context->ContextFlags |= CONTEXT_FLOATING_POINT; context->u.FltSave = *FPU_sig(sigcontext); context->MxCsr = context->u.FltSave.MxCsr; - if ((xs = XState_sig(FPU_sig(sigcontext)))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) { /* xcontext and sigcontext are both on the signal stack, so we can * just reference sigcontext without overflowing 32 bit XState.Offset */ @@ -1563,7 +1563,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon amd64_thread_data()->dr7 = context->Dr7; set_sigcontext( context, sigcontext ); if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; - if ((xs = XState_sig(FPU_sig(sigcontext)))) + if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) xs->CompactionMask = xcontext->host_compaction_mask; } @@ -1637,7 +1637,7 @@ static void restore_xstate( const CONTEXT *context ) XSAVE_FORMAT *xrstor_base; XSTATE *xs; - if (!(xs = xstate_from_context( context ))) + if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) return; xrstor_base = (XSAVE_FORMAT *)xs - 1; -- 2.29.2

Dec. 11, 2020

Re: [PATCH] evr: Add missing LeaveCriticalSection on creating tracking thread.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Dec. 11, 2020

Fw: FOSDEM 21 emulator devroom

by Mahmoud Abdelghany

> Hey guys, > > We're hosting an emulator development room at FOSDEM 21, and were wondering if you guys would be interested in sharing some of your knowledge with the community. > > If the answer is yes :D, please let us know. > > You can find more info here: > https://github.com/blackbeard334/fosdem21-emulator-devroom-cfp > > Regards, > > Christophe Creeten & Mahmoud Abdelghany > > Sent with ProtonMail Secure Email.

Dec. 11, 2020

[PATCH] winex11.drv: Minimizing a window with the owner property does not require a real minimization.

by Haoyang Chen

Dec. 11, 2020

Re: [PATCH 2/4] kernel32/tests: Add tests for Get(Active|Maximum)ProcessorCount

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83346 Your paranoid android. === w1064 (32 bit report) === kernel32: process.c:4043: Test failed: Got unexpected ret 0x1, GetLastError() 1813. process.c:4057: Test failed: Got unexpected ret 0x1, GetLastError() 1813. process.c:3986: Test failed: Got unexpected ret 0, level 2, GetLastError() 6. process.c:3993: Test failed: Got parent id 296, parent_data.parent_id 0. process.c:4137: Test failed: Unexpected return value, error 203. === w10pro64_ar (64 bit report) === kernel32: process.c:4137: Test failed: Unexpected return value, error 203.

Dec. 11, 2020

[PATCH 4/4] kernel32: Reimplement GetMaximumProcessorCount on top of SystemCpuInformation

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This fixes the console spam when the Clinithink natural language processing software <https://www.clinithink.com/> calls GetMaximumProcessorCount repeatedly. --- dlls/kernel32/kernel_main.c | 1 + dlls/kernel32/kernel_private.h | 1 + dlls/kernel32/process.c | 9 +++++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 89394e16430..531a580749f 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -123,6 +123,7 @@ static BOOL process_attach( HMODULE module ) RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); + NtQuerySystemInformation( SystemCpuInformation, &cpu_info, sizeof(cpu_info), NULL ); copy_startup_info(); diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 633511d6140..cbd23f52f10 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -30,6 +30,7 @@ static inline BOOL set_ntstatus( NTSTATUS status ) } extern SYSTEM_BASIC_INFORMATION system_info DECLSPEC_HIDDEN; +extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; extern WCHAR *FILE_name_AtoW( LPCSTR name, BOOL alloc ) DECLSPEC_HIDDEN; extern DWORD FILE_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen ) DECLSPEC_HIDDEN; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c1c3c484493..564fa703b5a 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -50,6 +50,7 @@ typedef struct } LOADPARMS32; SYSTEM_BASIC_INFORMATION system_info = { 0 }; +SYSTEM_CPU_INFORMATION cpu_info = { 0 }; /* Process flags */ #define PDB32_DEBUGGED 0x0001 /* Process is being debugged */ @@ -620,9 +621,13 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) */ DWORD WINAPI GetMaximumProcessorCount(WORD group) { - DWORD cpus = system_info.NumberOfProcessors; + DWORD cpus = cpu_info.MaximumCpus; + + if (group == ALL_PROCESSOR_GROUPS) + TRACE("(0x%x): returning %u\n", group, cpus); + else + FIXME("(0x%x): processor groups not supported, returning %u\n", group, cpus); - FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } -- 2.29.2

Dec. 11, 2020

[PATCH 3/4] ntdll: Fill in SYSTEM_CPU_INFORMATION.MaximumCpus

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- https://www.geoffchappell.com/studies/windows/km/ntoskrnl/api/ex/sysinfo/pr… --- dlls/ntdll/unix/system.c | 29 +++++++++++++++++++++++++++++ include/winternl.h | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index a889b2e020c..d34a3229816 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -170,6 +170,31 @@ struct smbios_boot_info static SYSTEM_CPU_INFORMATION cpu_info; +static int get_possible_cpus(void) +{ + int ret = NtCurrentTeb()->Peb->NumberOfProcessors; +#ifdef linux + FILE *f = fopen("/sys/devices/system/cpu/possible", "r"); + char line[32]; + char *value; + if (f) + { + if (fgets(line, sizeof(line), f)) + { + value = strchr(line, '-'); + if (value) + { + *value = 0; + value++; + ret = atoi(value) - atoi(line) + 1; + } + } + fclose(f); + } +#endif + return ret; +} + /******************************************************************************* * Architecture specific feature detection for CPUs * @@ -267,6 +292,8 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) info->Architecture = PROCESSOR_ARCHITECTURE_AMD64; #endif + info->MaximumCpus = get_possible_cpus(); + /* We're at least a 386 */ info->FeatureSet = CPU_FEATURE_VME | CPU_FEATURE_X86 | CPU_FEATURE_PGE; info->Level = 3; @@ -415,6 +442,7 @@ static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) FIXME("CPU Feature detection not implemented.\n"); #endif info->Architecture = PROCESSOR_ARCHITECTURE_ARM; + info->MaximumCpus = get_possible_cpus(); } #elif defined(__aarch64__) @@ -463,6 +491,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) #endif info->Level = max(info->Level, 8); info->Architecture = PROCESSOR_ARCHITECTURE_ARM64; + info->MaximumCpus = get_possible_cpus(); } #endif /* End architecture specific feature detection for CPUs */ diff --git a/include/winternl.h b/include/winternl.h index a7b0e04aade..4d207f9cd17 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1691,7 +1691,7 @@ typedef struct _SYSTEM_CPU_INFORMATION { WORD Architecture; WORD Level; WORD Revision; /* combination of CPU model and stepping */ - WORD Reserved; /* always zero */ + WORD MaximumCpus; /* number of CPUs if as many as possible are hot-added */ DWORD FeatureSet; /* see bit flags below */ } SYSTEM_CPU_INFORMATION, *PSYSTEM_CPU_INFORMATION; -- 2.29.2

Dec. 11, 2020

[PATCH 2/4] kernel32/tests: Add tests for Get(Active|Maximum)ProcessorCount

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/tests/process.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 7c6a0ff0a84..ea9cde5facc 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -90,6 +90,8 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void); static BOOL (WINAPI *pInitializeProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD, SIZE_T*); static BOOL (WINAPI *pUpdateProcThreadAttribute)(struct _PROC_THREAD_ATTRIBUTE_LIST*, DWORD, DWORD_PTR, void *,SIZE_T,void*,SIZE_T*); static void (WINAPI *pDeleteProcThreadAttributeList)(struct _PROC_THREAD_ATTRIBUTE_LIST*); +static DWORD (WINAPI *pGetActiveProcessorCount)(WORD); +static DWORD (WINAPI *pGetMaximumProcessorCount)(WORD); /* ############################### */ static char base[MAX_PATH]; @@ -270,6 +272,8 @@ static BOOL init(void) pInitializeProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "InitializeProcThreadAttributeList"); pUpdateProcThreadAttribute = (void *)GetProcAddress(hkernel32, "UpdateProcThreadAttribute"); pDeleteProcThreadAttributeList = (void *)GetProcAddress(hkernel32, "DeleteProcThreadAttributeList"); + pGetActiveProcessorCount = (void *)GetProcAddress(hkernel32, "GetActiveProcessorCount"); + pGetMaximumProcessorCount = (void *)GetProcAddress(hkernel32, "GetMaximumProcessorCount"); return TRUE; } @@ -2320,6 +2324,23 @@ static void test_SystemInfo(void) } } +static void test_ProcessorCount(void) +{ + DWORD active, maximum; + + if (!pGetActiveProcessorCount || !pGetMaximumProcessorCount) + { + win_skip("GetActiveProcessorCount or GetMaximumProcessorCount is not available\n"); + return; + } + + active = pGetActiveProcessorCount(ALL_PROCESSOR_GROUPS); + maximum = pGetMaximumProcessorCount(ALL_PROCESSOR_GROUPS); + ok(active <= maximum, + "Number of active processors %i is greater than maximum number of processors %i\n", + active, maximum); +} + static void test_RegistryQuota(void) { BOOL ret; @@ -4257,6 +4278,7 @@ START_TEST(process) test_IsWow64Process(); test_IsWow64Process2(); test_SystemInfo(); + test_ProcessorCount(); test_RegistryQuota(); test_DuplicateHandle(); test_StartupNoConsole(); -- 2.29.2

Dec. 11, 2020

[PATCH 1/4] kernel32: Print processor group in Get(Active|Maximum)ProcessorCount

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b8a0c823398..c1c3c484493 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -611,7 +611,7 @@ DWORD WINAPI GetActiveProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } @@ -622,7 +622,7 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group) { DWORD cpus = system_info.NumberOfProcessors; - FIXME("semi-stub, returning %u\n", cpus); + FIXME("(0x%x): semi-stub, returning %u\n", group, cpus); return cpus; } -- 2.29.2

Dec. 11, 2020

[PATCH resend 4/4] ntdll: Add stub RtlLookupElementGenericTable function

by Alex Henrie

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49426 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0623c2443d0..99df072b411 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -842,7 +842,7 @@ # @ stub RtlLockMemoryStreamRegion # @ stub RtlLogStackBackTrace @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) -@ stub RtlLookupElementGenericTable +@ stdcall RtlLookupElementGenericTable(ptr ptr) # @ stub RtlLookupElementGenericTableAvl @ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 2f90d89662f..579aca542a7 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -472,6 +472,14 @@ void * WINAPI RtlGetElementGenericTable(RTL_GENERIC_TABLE *table, ULONG index) return NULL; } +/****************************************************************************** + * RtlLookupElementGenericTable [NTDLL.@] + */ +void * WINAPI RtlLookupElementGenericTable(RTL_GENERIC_TABLE *table, void *buffer) +{ + FIXME("(%p, %p) stub!\n", table, buffer); + return NULL; +} /****************************************************************************** * RtlMoveMemory [NTDLL.@] * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b501e822347..ad6322ead21 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1180,7 +1180,7 @@ @ stdcall RtlLocateLegacyContext(ptr ptr) @ stub RtlLockBootStatusData @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) -@ stub RtlLookupElementGenericTable +@ stdcall RtlLookupElementGenericTable(ptr ptr) @ stub RtlLookupElementGenericTableAvl @ stub RtlLookupElementGenericTableFull @ stub RtlLookupElementGenericTableFullAvl diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 2940436d0ca..a6b2974ee6a 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -269,6 +269,7 @@ void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); #endif -- 2.29.2

Dec. 11, 2020

[PATCH resend 3/4] ntdll: Add stub RtlGetElementGenericTable function

by Alex Henrie

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49426 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0a6de61be49..0623c2443d0 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -698,7 +698,7 @@ @ stdcall RtlGetCurrentProcessorNumberEx(ptr) @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) -@ stub RtlGetElementGenericTable +@ stdcall RtlGetElementGenericTable(ptr long) # @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 9bdccaa8c3c..2f90d89662f 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -463,6 +463,15 @@ ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) return table->NumberGenericTableElements; } +/****************************************************************************** + * RtlGetElementGenericTable [NTDLL.@] + */ +void * WINAPI RtlGetElementGenericTable(RTL_GENERIC_TABLE *table, ULONG index) +{ + FIXME("(%p, %u) stub!\n", table, index); + return NULL; +} + /****************************************************************************** * RtlMoveMemory [NTDLL.@] * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6ac70c718f1..b501e822347 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1095,7 +1095,7 @@ @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetDefaultCodePage -@ stub RtlGetElementGenericTable +@ stdcall RtlGetElementGenericTable(ptr long) @ stub RtlGetElementGenericTableAvl @ stdcall RtlGetExtendedContextLength(long ptr) @ stdcall RtlGetExtendedContextLength2(long ptr int64) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 569552bcad0..2940436d0ca 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 2.29.2

Dec. 11, 2020

[PATCH resend 2/4] ntdll: Implement RtlNumberGenericTableElements

by Alex Henrie

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/rtl.c | 4 ++-- include/ddk/ntddk.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 6afe4d876dd..9bdccaa8c3c 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -459,8 +459,8 @@ void * WINAPI RtlEnumerateGenericTableWithoutSplaying(RTL_GENERIC_TABLE *table, */ ULONG WINAPI RtlNumberGenericTableElements(RTL_GENERIC_TABLE *table) { - FIXME("(%p) stub!\n", table); - return 0; + TRACE("(%p)\n", table); + return table->NumberGenericTableElements; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 3a1d68b1fa8..569552bcad0 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -268,5 +268,6 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); #endif -- 2.29.2

Dec. 11, 2020

[PATCH resend 1/4] ntdll: Implement RtlInitializeGenericTable

by Alex Henrie

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/rtl.c | 13 ++++++++++++- include/ddk/ntddk.h | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index cf21c980a45..6afe4d876dd 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -428,7 +428,18 @@ void WINAPI RtlInitializeGenericTable(RTL_GENERIC_TABLE *table, PRTL_GENERIC_COM PRTL_GENERIC_ALLOCATE_ROUTINE allocate, PRTL_GENERIC_FREE_ROUTINE free, void *context) { - FIXME("(%p, %p, %p, %p, %p) stub!\n", table, compare, allocate, free, context); + TRACE("(%p, %p, %p, %p, %p)\n", table, compare, allocate, free, context); + + table->TableRoot = NULL; + table->InsertOrderList.Flink = &(table->InsertOrderList); + table->InsertOrderList.Blink = &(table->InsertOrderList); + table->OrderedPointer = &(table->InsertOrderList); + table->NumberGenericTableElements = 0; + table->WhichOrderedElement = 0; + table->CompareRoutine = compare; + table->AllocateRoutine = allocate; + table->FreeRoutine = free; + table->TableContext = context; } /****************************************************************************** diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 41ad3d721bd..3a1d68b1fa8 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -265,6 +265,7 @@ NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE, NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 2.29.2

Dec. 11, 2020

[PATCH 1/1] ntdll: Remove unnecessary call to strlen from get_dos_device

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/unix/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 6d6edfe8926..a4c6bf4a137 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2812,7 +2812,6 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, char **unix_na if (!new_name) break; free( unix_name ); unix_name = new_name; - unix_len = strlen(unix_name) + 1; dev = NULL; /* last try */ } free( unix_name ); -- 2.29.2

Dec. 11, 2020

Re: Re: [PATCH] evr: Add missing LeaveCriticalSection on creating tracking thread.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83337 Your paranoid android. === debiant (build log) === ../wine/dlls/evr/sample.c:348:35: error: ‘amp’ undeclared (first use in this function) ../wine/dlls/evr/sample.c:348:38: error: expected ‘)’ before ‘;’ token Task: The win32 Wine build failed === debiant (build log) === ../wine/dlls/evr/sample.c:348:35: error: ‘amp’ undeclared (first use in this function) ../wine/dlls/evr/sample.c:348:38: error: expected ‘)’ before ‘;’ token Task: The wow64 Wine build failed

Dec. 11, 2020

[PATCH] evr: Add missing LeaveCriticalSection on creating tracking thread.

by Haidong Yu

Dec. 11, 2020

Re: [PATCH] evr: Add missing LeaveCriticalSection on creating tracking thread.

by Zhiyi Zhang

On 12/11/20 10:52 AM, Haidong Yu wrote: > > > 0001-evr-Add-missing-LeaveCriticalSection-on-creating-tra.patch > > From 79707b289e9cfa1bb734c2dfef68fe24f78e5c38 Mon Sep 17 00:00:00 2001 > From: yuhaidong <yuhaidong(a)uniontech.com> > Date: Fri, 11 Dec 2020 10:16:00 +0800 > Subject: [PATCH] evr: Add missing LeaveCriticalSection on creating tracking > thread. > > Signed-off-by: yuhaidong <yuhaidong(a)uniontech.com> > --- > .vscode/settings.json | 16 ++++++++++++++++ > dlls/evr/sample.c | 1 + > 2 files changed, 17 insertions(+) > create mode 100644 .vscode/settings.json > > diff --git a/.vscode/settings.json b/.vscode/settings.json > new file mode 100644 > index 00000000000..f6f773bb522 > --- /dev/null > +++ b/.vscode/settings.json > @@ -0,0 +1,16 @@ > +{ > + "files.associations": { > + "*.idl": "c", > + "array": "c", > + "string_view": "c", > + "initializer_list": "c", > + "utility": "c", > + "functional": "c", > + "istream": "c", > + "ostream": "c", > + "tuple": "c", > + "type_traits": "c", > + "string": "c", > + "*.rh": "c" > + } > +} > \ No newline at end of file Hi Haidong, You're submitting unrelated changes. Thanks, Zhiyi > diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c > index aedf19b9fd4..44b09d6d474 100644 > --- a/dlls/evr/sample.c > +++ b/dlls/evr/sample.c > @@ -345,6 +345,7 @@ static void video_sample_create_tracking_thread(void) > { > WARN("Failed to create sample tracking thread.\n"); > CloseHandle(ready_event); > + LeaveCriticalSection(&tracking_thread_cs); > return; > } >

Dec. 11, 2020

[PATCH] evr: Add missing LeaveCriticalSection on creating tracking thread.

by Haidong Yu

Dec. 11, 2020

Re: [PATCH] include: Fix broken defines in d3d9 headers

by Rafal Harabień

I sent v2 for this patch which should address your concerns. On 10.12.2020 19:04, Henri Verbeet wrote: > On Wed, 9 Dec 2020 at 02:54, Rafał Harabień <rafalh92(a)outlook.com> wrote: >> * rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL >> * remove D3DCAPS2_NO2DDURING3DSCENE >> * remove D3DCAPS2_CANRENDERWINDOWED >> > This kind of commit message typically indicates you're doing multiple > separate things in a single patch, and the patch should be split. > >> diff --git a/include/d3d9.h b/include/d3d9.h >> index 3ebde4509af..d61461f0833 100644 >> --- a/include/d3d9.h >> +++ b/include/d3d9.h >> @@ -61,7 +61,7 @@ >> */ >> #define D3D_SDK_VERSION 32 >> #define D3DADAPTER_DEFAULT 0 >> -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) >> +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) > Ok, but in that case the interpretation of the flag is probably wrong > too; this currently maps to WINED3DENUM_NO_WHQL_LEVEL.

Dec. 10, 2020

[PATCH v2 2/2] dlls/d3d9: Fix handling of D3DENUM_WHQL_LEVEL

by Rafał Harabień

D3DENUM_NO_WHQL_LEVEL was renamed to D3DENUM_WHQL_LEVEL and its meaning was negated in DirectX 9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/d3d8/directx.c | 5 +++++ dlls/wined3d/directx.c | 2 +- include/d3d9.h | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 0c0f2ecaadc..900e2782353 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -121,6 +121,11 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter, adapter_id.description = identifier->Description; adapter_id.description_size = sizeof(identifier->Description); + if (flags & D3DENUM_NO_WHQL_LEVEL) + flags = flags & ~D3DENUM_NO_WHQL_LEVEL; + else + flags |= WINED3DENUM_WHQL_LEVEL; + wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); if (SUCCEEDED(hr = wined3d_adapter_get_identifier(wined3d_adapter, flags, &adapter_id))) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 412842469b3..d35108710c2 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1513,7 +1513,7 @@ HRESULT CDECL wined3d_adapter_get_identifier(const struct wined3d_adapter *adapt identifier->device_identifier = IID_D3DDEVICE_D3DUID; identifier->driver_uuid = adapter->driver_uuid; identifier->device_uuid = adapter->device_uuid; - identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + identifier->whql_level = (flags & WINED3DENUM_WHQL_LEVEL) ? 1 : 0; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); identifier->shared_system_memory = min(~(SIZE_T)0, adapter->driver_info.sysmem_bytes); diff --git a/include/d3d9.h b/include/d3d9.h index 3ebde4509af..d61461f0833 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -61,7 +61,7 @@ */ #define D3D_SDK_VERSION 32 #define D3DADAPTER_DEFAULT 0 -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1f370d69a88..310911992ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -874,7 +874,7 @@ enum wined3d_shader_type #define WINED3DCOLORWRITEENABLE_ALPHA (1u << 3) #define WINED3DADAPTER_DEFAULT 0 -#define WINED3DENUM_NO_WHQL_LEVEL 2 +#define WINED3DENUM_WHQL_LEVEL 2 #define WINED3DTSS_TCI_PASSTHRU 0x00000 #define WINED3DTSS_TCI_CAMERASPACENORMAL 0x10000 -- 2.25.1

Dec. 10, 2020

[PATCH v2 1/2] include: Remove two D3DCAPS2 defines in d3d9 headers

by Rafał Harabień

* remove D3DCAPS2_NO2DDURING3DSCENE * remove D3DCAPS2_CANRENDERWINDOWED Removed macro-definitions seems to have been copied from d3d8.h and according to public docs do not exist in d3d9. Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> --- dlls/d3d9/tests/d3d9ex.c | 3 +-- dlls/d3d9/tests/device.c | 3 +-- include/d3d9caps.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 462037b2e01..2afe73088c7 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4020,8 +4020,7 @@ static void test_device_caps(void) ok(!(caps.Caps & ~(D3DCAPS_OVERLAY | D3DCAPS_READ_SCANLINE)), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Caps2 field has unexpected flags %#x.\n", caps.Caps2); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2791e91a068..0343fade792 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13172,8 +13172,7 @@ static void test_device_caps(void) test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + ok(!(caps.Caps2 & ~(D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP | D3DCAPS2_CANSHARERESOURCE)), "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); diff --git a/include/d3d9caps.h b/include/d3d9caps.h index 1068a2c35a9..c62780b4a0a 100644 --- a/include/d3d9caps.h +++ b/include/d3d9caps.h @@ -258,9 +258,7 @@ #define D3DCAPS3_DXVAHD_LIMITED __MSABI_LONG(0x00000800) #define D3DCAPS3_RESERVED __MSABI_LONG(0x8000001F) -#define D3DCAPS2_NO2DDURING3DSCENE __MSABI_LONG(0x00000002) #define D3DCAPS2_FULLSCREENGAMMA __MSABI_LONG(0x00020000) -#define D3DCAPS2_CANRENDERWINDOWED __MSABI_LONG(0x00080000) #define D3DCAPS2_CANCALIBRATEGAMMA __MSABI_LONG(0x00100000) #define D3DCAPS2_RESERVED __MSABI_LONG(0x02000000) #define D3DCAPS2_CANMANAGERESOURCE __MSABI_LONG(0x10000000) -- 2.25.1

Dec. 10, 2020

[PATCH vkd3d 4/4] vkd3d-shader: Implement #elif.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 1 - libs/vkd3d-shader/preproc.l | 3 +++ libs/vkd3d-shader/preproc.y | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 32c8777f..f6fbe416 100644 --- a/Makefile.am +++ b/Makefile.am @@ -241,7 +241,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ - tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index fc3c5fa2..bf1ef5c0 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "elif")) + return T_ELIF; if (!strcmp(p, "else")) return T_ELSE; if (!strcmp(p, "endif")) @@ -192,6 +194,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_ELIF: case T_ELSE: case T_ENDIF: case T_IF: diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index add39735..e0b3c4c1 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -163,6 +163,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_NEWLINE +%token T_ELIF "#elif" %token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" @@ -184,6 +185,28 @@ directive if (!preproc_push_if(ctx, !!$2)) YYABORT; } + | T_ELIF expr T_NEWLINE + { + if (ctx->if_count) + { + struct preproc_if_state *state = &ctx->if_stack[ctx->if_count - 1]; + + if (state->seen_else) + { + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, "Ignoring #elif after #else."); + } + else + { + state->current_true = $2 && !state->seen_true && preproc_was_writing(ctx); + state->seen_true = $2 || state->seen_true; + } + } + else + { + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, + "Ignoring #elif without prior #if."); + } + } | T_ELSE T_NEWLINE { if (ctx->if_count) -- 2.29.2

Dec. 10, 2020

[PATCH vkd3d 3/4] vkd3d-shader: Implement #else.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/preproc.h | 4 ++++ libs/vkd3d-shader/preproc.l | 3 +++ libs/vkd3d-shader/preproc.y | 25 +++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 224ae5b2..c05e3f6d 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -33,6 +33,10 @@ struct preproc_if_state { /* Are we currently in a "true" block? */ bool current_true; + /* Have we seen a "true" block in this #if..#endif yet? */ + bool seen_true; + /* Have we seen an #else yet? */ + bool seen_else; }; struct preproc_ctx diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index dd2b9c0a..fc3c5fa2 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -100,6 +100,8 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* for (p = yytext + 1; strchr(" \t", *p); ++p) ; + if (!strcmp(p, "else")) + return T_ELSE; if (!strcmp(p, "endif")) return T_ENDIF; if (!strcmp(p, "if")) @@ -190,6 +192,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { switch (token) { + case T_ELSE: case T_ENDIF: case T_IF: ctx->current_directive = token; diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index fda04a07..add39735 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -105,6 +105,8 @@ static bool preproc_push_if(struct preproc_ctx *ctx, bool condition) return false; state = &ctx->if_stack[ctx->if_count++]; state->current_true = condition && preproc_was_writing(ctx); + state->seen_true = condition; + state->seen_else = false; return true; } @@ -161,6 +163,7 @@ static uint32_t preproc_parse_integer(const char *s) %token T_NEWLINE +%token T_ELSE "#else" %token T_ENDIF "#endif" %token T_IF "#if" @@ -181,6 +184,28 @@ directive if (!preproc_push_if(ctx, !!$2)) YYABORT; } + | T_ELSE T_NEWLINE + { + if (ctx->if_count) + { + struct preproc_if_state *state = &ctx->if_stack[ctx->if_count - 1]; + + if (state->seen_else) + { + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, "Ignoring #else after #else."); + } + else + { + state->current_true = !state->seen_true && preproc_was_writing(ctx); + state->seen_else = true; + } + } + else + { + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, + "Ignoring #else without prior #if."); + } + } | T_ENDIF T_NEWLINE { if (ctx->if_count) -- 2.29.2

Dec. 10, 2020

[PATCH v2 vkd3d 2/4] vkd3d-shader: Implement basic support for #if and #endif.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Avoid another instance of YYEOF, which is only available since Bison 3.6. include/private/vkd3d_memory.h | 11 +++ libs/vkd3d-shader/preproc.h | 17 ++++ libs/vkd3d-shader/preproc.l | 108 +++++++++++++++++++++-- libs/vkd3d-shader/preproc.y | 102 ++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_main.c | 15 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 6 ++ tests/hlsl_d3d12.c | 2 +- 7 files changed, 251 insertions(+), 10 deletions(-) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index df93abf5..bd56d30a 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -22,6 +22,7 @@ #include <assert.h> #include <stdbool.h> #include <stdlib.h> +#include <string.h> #include "vkd3d_debug.h" @@ -54,6 +55,16 @@ static inline void vkd3d_free(void *ptr) free(ptr); } +static inline char *vkd3d_strdup(const char *string) +{ + size_t len = strlen(string) + 1; + char *ptr; + + if ((ptr = vkd3d_malloc(len))) + memcpy(ptr, string, len); + return ptr; +} + bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index 769b8c23..224ae5b2 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -29,6 +29,12 @@ struct preproc_location unsigned int first_line, first_column; }; +struct preproc_if_state +{ + /* Are we currently in a "true" block? */ + bool current_true; +}; + struct preproc_ctx { void *scanner; @@ -38,7 +44,18 @@ struct preproc_ctx unsigned int line, column; const char *source_name; + struct preproc_if_state *if_stack; + size_t if_count, if_stack_size; + + int current_directive; + + bool last_was_newline; + bool last_was_eof; + bool error; }; +void preproc_warning(struct preproc_ctx *ctx, const struct preproc_location *loc, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(4, 5) DECLSPEC_HIDDEN; + #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 116a7ed5..dd2b9c0a 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -50,6 +50,7 @@ static void update_location(struct preproc_ctx *ctx); %s C_COMMENT %s CXX_COMMENT +NEWLINE \r?\n WS [ \t] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* @@ -57,10 +58,10 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"//" {yy_push_state(CXX_COMMENT, yyscanner);} <INITIAL>"/*" {yy_push_state(C_COMMENT, yyscanner);} -<CXX_COMMENT>\\\r?\n {} +<CXX_COMMENT>\\{NEWLINE} {} <CXX_COMMENT>\n { yy_pop_state(yyscanner); - return T_TEXT; + return T_NEWLINE; } <C_COMMENT>"*/" {yy_pop_state(yyscanner);} <C_COMMENT,CXX_COMMENT><<EOF>> {yy_pop_state(yyscanner);} @@ -68,13 +69,15 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>{IDENTIFIER} {return T_TEXT;} + /* We have no use for floats, but shouldn't parse them as integers. */ + <INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+\.([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} <INITIAL>[0-9]+([eE][+-]?[0-9]+)?[hHfF] {return T_TEXT;} <INITIAL>[0-9]+[eE][+-]?[0-9]+ {return T_TEXT;} -<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_TEXT;} -<INITIAL>0[0-7]*[ul]{0,2} {return T_TEXT;} -<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_TEXT;} +<INITIAL>0[xX][0-9a-fA-f]+[ul]{0,2} {return T_INTEGER;} +<INITIAL>0[0-7]*[ul]{0,2} {return T_INTEGER;} +<INITIAL>[1-9][0-9]*[ul]{0,2} {return T_INTEGER;} <INITIAL>"&&" {return T_TEXT;} <INITIAL>"||" {return T_TEXT;} @@ -87,6 +90,29 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* /* C strings (including escaped quotes). */ <INITIAL>\"([^"\\]|\\.)*\" {return T_TEXT;} +<INITIAL>#{WS}*{IDENTIFIER} { + struct preproc_ctx *ctx = yyget_extra(yyscanner); + const char *p; + + if (!ctx->last_was_newline) + return T_TEXT; + + for (p = yytext + 1; strchr(" \t", *p); ++p) + ; + + if (!strcmp(p, "endif")) + return T_ENDIF; + if (!strcmp(p, "if")) + return T_IF; + + preproc_warning(ctx, yyget_lloc(yyscanner), VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE, + "Ignoring unknown directive \"%s\".", yytext); + return T_TEXT; + } + +<INITIAL>\\{NEWLINE} {} +<INITIAL>{NEWLINE} {return T_NEWLINE;} + <INITIAL>{WS}+ {} <INITIAL>. {return T_TEXT;} @@ -114,6 +140,27 @@ static void update_location(struct preproc_ctx *ctx) } } +static bool preproc_is_writing(struct preproc_ctx *ctx) +{ + if (!ctx->if_count) + return true; + return ctx->if_stack[ctx->if_count - 1].current_true; +} + +static int return_token(int token, YYSTYPE *lval, const char *text) +{ + switch (token) + { + case T_INTEGER: + case T_TEXT: + if (!(lval->string = vkd3d_strdup(text))) + return 0; + break; + } + + return token; +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -123,11 +170,46 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) const char *text; int token; - if (!(token = preproc_lexer_lex(lval, lloc, scanner))) + if (ctx->last_was_eof) return 0; - text = yyget_text(scanner); - TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->first_line, debugstr_a(text)); + if (!(token = preproc_lexer_lex(lval, lloc, scanner))) + { + ctx->last_was_eof = true; + token = T_NEWLINE; + text = "\n"; + } + else + { + text = yyget_text(scanner); + } + + lloc->filename = ctx->source_name; + + if (ctx->last_was_newline) + { + switch (token) + { + case T_ENDIF: + case T_IF: + ctx->current_directive = token; + break; + + default: + ctx->current_directive = 0; + } + } + + ctx->last_was_newline = (token == T_NEWLINE); + + TRACE("Parsing token %d, line %d, in directive %d, string %s.\n", token, + lloc->first_line, ctx->current_directive, debugstr_a(text)); + + if (!ctx->current_directive && !preproc_is_writing(ctx)) + continue; + + if (ctx->current_directive) + return return_token(token, lval, text); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -148,12 +230,22 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); + ctx.last_was_newline = true; preproc_yyparse(ctx.scanner, &ctx); yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.if_count) + { + const struct preproc_location loc = {.filename = ctx.source_name}; + + preproc_warning(&ctx, &loc, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF, "Unterminated #if block."); + } + + vkd3d_free(ctx.if_stack); + if (ctx.error) { WARN("Failed to preprocess.\n"); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 186a0e1d..fda04a07 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -74,11 +74,71 @@ static void preproc_error(struct preproc_ctx *ctx, const struct preproc_location ctx->error = true; } +void preproc_warning(struct preproc_ctx *ctx, const struct preproc_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + set_location(ctx, loc); + va_start(args, format); + vkd3d_shader_vwarning(ctx->message_context, error, format, args); + va_end(args); +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } +static bool preproc_was_writing(struct preproc_ctx *ctx) +{ + if (ctx->if_count < 2) + return true; + return ctx->if_stack[ctx->if_count - 2].current_true; +} + +static bool preproc_push_if(struct preproc_ctx *ctx, bool condition) +{ + struct preproc_if_state *state; + + if (!vkd3d_array_reserve((void **)&ctx->if_stack, &ctx->if_stack_size, ctx->if_count + 1, sizeof(*ctx->if_stack))) + return false; + state = &ctx->if_stack[ctx->if_count++]; + state->current_true = condition && preproc_was_writing(ctx); + return true; +} + +static int char_to_int(char c) +{ + if ('0' <= c && c <= '9') + return c - '0'; + if ('A' <= c && c <= 'F') + return c - 'A' + 10; + if ('a' <= c && c <= 'f') + return c - 'a' + 10; + return -1; +} + +static uint32_t preproc_parse_integer(const char *s) +{ + uint32_t base = 10, ret = 0; + int digit; + + if (s[0] == '0') + { + base = 8; + if (s[1] == 'x' || s[1] == 'X') + { + base = 16; + s += 2; + } + } + + while ((digit = char_to_int(*s++)) >= 0) + ret = ret * base + (uint32_t)digit; + return ret; +} + } %define api.prefix {preproc_yy} @@ -90,9 +150,49 @@ static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, %parse-param {void *scanner} %parse-param {struct preproc_ctx *ctx} -%token T_TEXT +%union +{ + char *string; + uint32_t integer; +} + +%token <string> T_INTEGER +%token <string> T_TEXT + +%token T_NEWLINE + +%token T_ENDIF "#endif" +%token T_IF "#if" + +%type <integer> expr %% shader_text : %empty + | shader_text directive + { + vkd3d_string_buffer_printf(&ctx->buffer, "\n"); + } + +directive + : T_IF expr T_NEWLINE + { + if (!preproc_push_if(ctx, !!$2)) + YYABORT; + } + | T_ENDIF T_NEWLINE + { + if (ctx->if_count) + --ctx->if_count; + else + preproc_warning(ctx, &@$, VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE, + "Ignoring #endif without prior #if."); + } + +expr + : T_INTEGER + { + $$ = preproc_parse_integer($1); + vkd3d_free($1); + } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index eed0316c..ad456133 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -148,6 +148,21 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont return true; } +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, + enum vkd3d_shader_error error, const char *format, va_list args) +{ + if (context->log_level < VKD3D_SHADER_LOG_WARNING) + return; + + if (context->line) + vkd3d_string_buffer_printf(&context->messages, "%s:%u:%u: W%04u: ", + context->source_name, context->line, context->column, error); + else + vkd3d_string_buffer_printf(&context->messages, "%s: W%04u: ", context->source_name, error); + vkd3d_string_buffer_vprintf(&context->messages, format, args); + vkd3d_string_buffer_printf(&context->messages, "\n"); +} + void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, const char *format, va_list args) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5a022708..01a74ede 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -81,6 +81,10 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, + + VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE = 5001, + VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 5003, + VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 5005, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER @@ -867,6 +871,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; void vkd3d_shader_verror(struct vkd3d_shader_message_context *context, enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context, + enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN; int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 61324fa9..77a7ea1a 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -414,7 +414,7 @@ static void test_preprocess(void) hr = D3DPreprocess(test_include_top, strlen(test_include_top), NULL, NULL, &test_include_fail, &blob, &errors); todo ok(hr == E_FAIL, "Got hr %#x.\n", hr); todo ok(blob == (ID3D10Blob *)0xdeadbeef, "Expected no compiled shader blob.\n"); - todo ok(!!errors, "Expected non-NULL error blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); if (errors) { if (vkd3d_test_state.debug_level) -- 2.29.2

Dec. 10, 2020

[PATCH v2 vkd3d 1/4] vkd3d-shader: Handle preprocessor parsing errors.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Avoid api.location.type, which is only available since Bison 3.4. libs/vkd3d-shader/preproc.h | 11 +++++++ libs/vkd3d-shader/preproc.l | 39 ++++++++++++++++++++++- libs/vkd3d-shader/preproc.y | 40 +++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 4 files changed, 90 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.h b/libs/vkd3d-shader/preproc.h index cbd93229..769b8c23 100644 --- a/libs/vkd3d-shader/preproc.h +++ b/libs/vkd3d-shader/preproc.h @@ -23,11 +23,22 @@ #include "vkd3d_shader_private.h" +struct preproc_location +{ + const char *filename; + unsigned int first_line, first_column; +}; + struct preproc_ctx { void *scanner; + struct vkd3d_shader_message_context *message_context; struct vkd3d_string_buffer buffer; + unsigned int line, column; + const char *source_name; + + bool error; }; #endif diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 4d809b8f..116a7ed5 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -27,6 +27,10 @@ #define YY_DECL static int preproc_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner) +static void update_location(struct preproc_ctx *ctx); + +#define YY_USER_ACTION update_location(yyget_extra(yyscanner)); + %} %option 8bit @@ -88,6 +92,28 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* %% +static void update_location(struct preproc_ctx *ctx) +{ + unsigned int i, leng = yyget_leng(ctx->scanner); + const char *text = yyget_text(ctx->scanner); + + /* We want to do this here, rather than before calling yylex(), because + * some tokens are skipped by the lexer. */ + + yyget_lloc(ctx->scanner)->first_line = ctx->line; + yyget_lloc(ctx->scanner)->first_column = ctx->column; + + for (i = 0; i < leng; ++i) + { + ++ctx->column; + if (text[i] == '\n') + { + ctx->column = 1; + ++ctx->line; + } + } +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -101,7 +127,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) return 0; text = yyget_text(scanner); - TRACE("Parsing token %d, string %s.\n", token, debugstr_a(text)); + TRACE("Parsing token %d, line %d, string %s.\n", token, lloc->first_line, debugstr_a(text)); vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); } @@ -115,6 +141,10 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, void *output_code; vkd3d_string_buffer_init(&ctx.buffer); + ctx.message_context = message_context; + ctx.source_name = compile_info->source_name ? compile_info->source_name : "<anonymous>"; + ctx.line = 1; + ctx.column = 1; yylex_init_extra(&ctx, &ctx.scanner); top_buffer = yy_scan_bytes(compile_info->source.code, compile_info->source.size, ctx.scanner); @@ -124,6 +154,13 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, yy_delete_buffer(top_buffer, ctx.scanner); yylex_destroy(ctx.scanner); + if (ctx.error) + { + WARN("Failed to preprocess.\n"); + vkd3d_string_buffer_cleanup(&ctx.buffer); + return VKD3D_ERROR_INVALID_SHADER; + } + if (!(output_code = vkd3d_malloc(ctx.buffer.content_size))) { vkd3d_string_buffer_cleanup(&ctx.buffer); diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 92448f24..186a0e1d 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -24,6 +24,8 @@ #include "vkd3d_shader_private.h" #include "preproc.h" +#define PREPROC_YYLTYPE struct preproc_location + } %code provides @@ -36,9 +38,45 @@ int preproc_yylex(PREPROC_YYSTYPE *yylval_param, PREPROC_YYLTYPE *yylloc_param, %code { +#define YYLLOC_DEFAULT(cur, rhs, n) \ + do \ + { \ + if (n) \ + { \ + (cur).filename = YYRHSLOC(rhs, 1).filename; \ + (cur).first_line = YYRHSLOC(rhs, 1).first_line; \ + (cur).first_column = YYRHSLOC(rhs, 1).first_column; \ + } \ + else \ + { \ + (cur).filename = YYRHSLOC(rhs, 0).filename; \ + (cur).first_line = YYRHSLOC(rhs, 0).first_line; \ + (cur).first_column = YYRHSLOC(rhs, 0).first_column; \ + } \ + } while (0) + +static void set_location(struct preproc_ctx *ctx, const struct preproc_location *loc) +{ + ctx->message_context->source_name = loc->filename; + ctx->message_context->line = loc->first_line; + ctx->message_context->column = loc->first_column; +} + +static void preproc_error(struct preproc_ctx *ctx, const struct preproc_location *loc, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + set_location(ctx, loc); + va_start(args, format); + vkd3d_shader_verror(ctx->message_context, error, format, args); + va_end(args); + ctx->error = true; +} + static void yyerror(const YYLTYPE *loc, void *scanner, struct preproc_ctx *ctx, const char *string) { - FIXME("Error reporting is not implemented.\n"); + preproc_error(ctx, loc, VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX, "%s", string); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 83038384..5a022708 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -79,6 +79,8 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_RS_INVALID_ROOT_PARAMETER_TYPE = 3002, VKD3D_SHADER_ERROR_RS_INVALID_DESCRIPTOR_RANGE_TYPE = 3003, VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES = 3004, + + VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX = 4000, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER -- 2.29.2

Dec. 10, 2020

Re: [PATCH 5/5] include: Add ID2D1Multithread interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 2/5] include: Add ID2D1GradientStopCollection1 interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 4/5] include: Add ID2D1StrokeStyle1 interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 3/5] include: Add ID2D1ImageBrush interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 1/5] include: Add ID2D1ColorContext interface in d2d1_1.idl.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH] include: Fix broken defines in d3d9 headers

by Henri Verbeet

On Wed, 9 Dec 2020 at 02:54, Rafał Harabień <rafalh92(a)outlook.com> wrote: > > * rename D3DENUM_NO_WHQL_LEVEL to D3DENUM_WHQL_LEVEL > * remove D3DCAPS2_NO2DDURING3DSCENE > * remove D3DCAPS2_CANRENDERWINDOWED > This kind of commit message typically indicates you're doing multiple separate things in a single patch, and the patch should be split. > diff --git a/include/d3d9.h b/include/d3d9.h > index 3ebde4509af..d61461f0833 100644 > --- a/include/d3d9.h > +++ b/include/d3d9.h > @@ -61,7 +61,7 @@ > */ > #define D3D_SDK_VERSION 32 > #define D3DADAPTER_DEFAULT 0 > -#define D3DENUM_NO_WHQL_LEVEL __MSABI_LONG(0x00000002) > +#define D3DENUM_WHQL_LEVEL __MSABI_LONG(0x00000002) Ok, but in that case the interpretation of the flag is probably wrong too; this currently maps to WINED3DENUM_NO_WHQL_LEVEL.

Dec. 10, 2020

[PATCH 3/3] wined3d: Do not request VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for unmappable buffers.

by Henri Verbeet

In particular, some implementations may not support the combination of VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT and VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT for all buffer types, or at all. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Reported by Stefan on IRC. dlls/wined3d/buffer.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 11974467984..088697a57d5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1391,11 +1391,13 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + memory_type = 0; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) - memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT; + else if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_W) + memory_type |= VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { @@ -1472,9 +1474,11 @@ static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_range *ranges) { + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); struct wined3d_resource *resource = &buffer->resource; + struct wined3d_bo_address src, dst; const struct wined3d_range *range; - struct wined3d_bo_address dst; + struct wined3d_bo_vk *dst_bo; unsigned int i = range_count; uint32_t flags; void *map_ptr; @@ -1488,6 +1492,24 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc flags = WINED3D_MAP_WRITE; if (!ranges->offset && ranges->size == resource->size) flags |= WINED3D_MAP_DISCARD; + + dst_bo = &wined3d_buffer_vk(buffer)->bo; + if (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(flags & WINED3D_MAP_DISCARD) + && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id)) + { + src.buffer_object = 0; + while (range_count--) + { + range = &ranges[range_count]; + + src.addr = (uint8_t *)data + range->offset - data_offset; + dst.addr = (void *)(uintptr_t)range->offset; + wined3d_context_copy_bo_address(context, &dst, &src, range->size); + } + + return; + } + if (!(map_ptr = wined3d_context_map_bo_address(context, &dst, resource->size, flags))) { FIXME("Failed to map buffer.\n"); -- 2.20.1

Dec. 10, 2020

[PATCH 2/3] wined3d: Request VK_MEMORY_PROPERTY_HOST_CACHED_BIT for WINED3D_RESOURCE_ACCESS_MAP_R buffers.

by Henri Verbeet

Unsurprisingly, reading for uncached memory may be very slow. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dc32d97530a..11974467984 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1394,6 +1394,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (resource->access & WINED3D_RESOURCE_ACCESS_MAP_R) + memory_type |= VK_MEMORY_PROPERTY_HOST_CACHED_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { -- 2.20.1

Dec. 10, 2020

[PATCH 1/3] wined3d: Do not request VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT for dynamic buffers.

by Henri Verbeet

We don't typically need these to be in VRAM, and VRAM may not be mappable. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6ff6a5b6cd0..dc32d97530a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1390,8 +1390,11 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT - | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; + if (!(resource->usage & WINED3DUSAGE_DYNAMIC)) + memory_type |= VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n"); -- 2.20.1

Dec. 10, 2020

Re: [PATCH v2 5/5] gdiplus/tests: Use wide-char string literals for test strings.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 4/5] gdiplus/tests: Use wide-char string literal for metafile description.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 1/5] gdiplus/tests: Use wide-char string literals for font names.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 3/5] gdiplus/tests: Use wide-char string literal for mimetype.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: [PATCH 2/5] gdiplus/tests: Use wide-char string literals for file names.

by Esme Povirk (they/them)

Signed-off-by: Esme Povirk <esme(a)codeweavers.com>

Dec. 10, 2020

Re: Wine staging 6.0rc1 release

by Gerald Pfeifer

Alistair Leslie-Hughes wrote: > * Rebased to current wine 6.0rc1 (740 patches are applied to wine vanilla) Thank you. Just a little ask: would you mind using the same version designator as Alexandre does? He's using 6.0-rc1 with a dash as opposed to 6.0rc1 without (cf. https://www.winehq.org/pipermail/wine-announce/2020-December/000504.html ). That kind of consistency makes life for packagers a little easier. Thanks, Gerald

Dec. 9, 2020

Re: [PATCH] ntoskrnl/tests: Use wide-char string literals in locale.c.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83311 Your paranoid android. === w8 (32 bit report) === ntoskrnl.exe: ntoskrnl.c:676: Test failed: Got unexpected ret -1. ntoskrnl.c:677: Test failed: Received unexpected data.

Dec. 9, 2020

[PATCH] ntoskrnl/tests: Use wide-char string literals in locale.c.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 38 ++++++++---------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 +-- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dfc742eec3b..5617342d803 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -50,13 +50,6 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n ) return 0; } -static const WCHAR device_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; -static const WCHAR upper_name[] = {'\\','D','e','v','i','c','e', - '\\','W','i','n','e','T','e','s','t','U','p','p','e','r',0}; -static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; - static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *lower_device, *upper_device; @@ -183,14 +176,8 @@ static void test_init_funcs(void) ok(timer2.Header.SignalState == 0, "got: %u\n", timer2.Header.SignalState); } -static const WCHAR driver2_path[] = { - '\\','R','e','g','i','s','t','r','y', - '\\','M','a','c','h','i','n','e', - '\\','S','y','s','t','e','m', - '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t', - '\\','S','e','r','v','i','c','e','s', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r','2',0 -}; +static const WCHAR driver2_path[] = + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\WineTestDriver2"; static IMAGE_INFO test_image_info; static int test_load_image_notify_count; @@ -1163,8 +1150,6 @@ static void test_ob_reference(const WCHAR *test_path) SIZE_T len; NTSTATUS status; - static const WCHAR tmpW[] = {'.','t','m','p',0}; - pObGetObjectType = get_proc_address("ObGetObjectType"); if (!pObGetObjectType) win_skip("ObGetObjectType not found\n"); @@ -1174,9 +1159,9 @@ static void test_ob_reference(const WCHAR *test_path) ok(!status, "ZwCreateEvent failed: %#x\n", status); len = wcslen(test_path); - tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(tmpW)); + tmp_path = ExAllocatePool(PagedPool, len * sizeof(WCHAR) + sizeof(L".tmp")); memcpy(tmp_path, test_path, len * sizeof(WCHAR)); - memcpy(tmp_path + len, tmpW, sizeof(tmpW)); + memcpy(tmp_path + len, L".tmp", sizeof(L".tmp")); RtlInitUnicodeString(&pathU, tmp_path); attr.ObjectName = &pathU; @@ -2487,7 +2472,7 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) DbgPrint("unloading driver\n"); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); IoDeleteSymbolicLink(&linkW); IoDeleteDevice(upper_device); @@ -2496,9 +2481,6 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) { - static const WCHAR IoDriverObjectTypeW[] = {'I','o','D','r','i','v','e','r','O','b','j','e','c','t','T','y','p','e',0}; - static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r', - '\\','W','i','n','e','T','e','s','t','D','r','i','v','e','r',0}; UNICODE_STRING nameW, linkW; NTSTATUS status; void *obj; @@ -2517,10 +2499,10 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) driver->MajorFunction[IRP_MJ_QUERY_INFORMATION] = driver_QueryInformation; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; - RtlInitUnicodeString(&nameW, IoDriverObjectTypeW); + RtlInitUnicodeString(&nameW, L"IoDriverObjectType"); pIoDriverObjectType = MmGetSystemRoutineAddress(&nameW); - RtlInitUnicodeString(&nameW, driver_nameW); + RtlInitUnicodeString(&nameW, L"\\Driver\\WineTestDriver"); if ((status = ObReferenceObjectByName(&nameW, 0, NULL, 0, *pIoDriverObjectType, KernelMode, NULL, &obj))) return status; if (obj != driver) @@ -2530,8 +2512,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) } ObDereferenceObject(obj); - RtlInitUnicodeString(&nameW, device_name); - RtlInitUnicodeString(&linkW, driver_link); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestDriver"); + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); if (!(status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &lower_device))) @@ -2542,7 +2524,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) if (!status) { - RtlInitUnicodeString(&nameW, upper_name); + RtlInitUnicodeString(&nameW, L"\\Device\\WineTestUpper"); status = IoCreateDevice(driver, 0, &nameW, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, FALSE, &upper_device); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c2285aef6fc..2a7ebaa9599 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -156,7 +156,6 @@ static ULONG64 modified_value; static void main_test(void) { - static const WCHAR dokW[] = {'d','o','k',0}; WCHAR temppathW[MAX_PATH], pathW[MAX_PATH]; struct test_input *test_input; DWORD len, written, read; @@ -168,7 +167,7 @@ static void main_test(void) /* Create a temporary file that the driver will write ok/trace output to. */ GetTempPathW(MAX_PATH, temppathW); - GetTempFileNameW(temppathW, dokW, 0, pathW); + GetTempFileNameW(temppathW, L"dok", 0, pathW); pRtlDosPathNameToNtPathName_U( pathW, &pathU, NULL, NULL ); len = pathU.Length + sizeof(WCHAR); -- 2.26.2

Dec. 9, 2020

[PATCH] wmvcore/tests: Use wide-char string literals in locale.c.

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 2b5a4555a35..fac9948d60e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -321,36 +321,31 @@ static void test_WMCreateWriterPriv(void) static void test_urlextension(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; - const WCHAR mkvfile[] = {'t','e','s','t','.','m','k','v',0}; - const WCHAR urlfile[] = {'a','b','c','d',':','/','/','t','e','s','t','/','t','e','s','t','.','w','m','v',0}; - const WCHAR testurl[] = {'h','t','t','p',':','/','/','t','e','s','t','/','t','.','a','s','f','?','a','l','t','=','t','.','m','k','v',0}; hr = WMCheckURLExtension(NULL); ok(hr == E_INVALIDARG, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mkvfile); + hr = WMCheckURLExtension(L"test.mkv"); ok(hr == NS_E_INVALID_NAME, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(mp3file); + hr = WMCheckURLExtension(L"test.mp3"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(urlfile); + hr = WMCheckURLExtension(L"abcd://test/test.wmv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); - hr = WMCheckURLExtension(testurl); + hr = WMCheckURLExtension(L"http://test/t.asf?alt=t.mkv"); todo_wine ok(hr == S_OK, "WMCheckURLExtension failed 0x%08x\n", hr); } static void test_iscontentprotected(void) { HRESULT hr; - const WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; BOOL drm; hr = WMIsContentProtected(NULL, NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); hr = WMIsContentProtected(NULL, &drm); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, NULL); + hr = WMIsContentProtected(L"test.mp3", NULL); ok(hr == E_INVALIDARG, "WMIsContentProtected failed 0x%08x\n", hr); - hr = WMIsContentProtected(mp3file, &drm); + hr = WMIsContentProtected(L"test.mp3", &drm); ok(hr == S_FALSE, "WMIsContentProtected failed 0x%08x\n", hr); ok(drm == FALSE, "got %0dx\n", drm); } -- 2.26.2

Dec. 9, 2020

[PATCH] gdi32: Fix gdi font leak in CreateScalableFontResourceW.

by Rémi Bernon

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50273 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 9fa0f45ec4b..e76bb772eea 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6887,6 +6887,7 @@ BOOL WINAPI CreateScalableFontResourceW( DWORD hidden, LPCWSTR resource_file, fontdir.dfReserved = 0; WideCharToMultiByte( CP_ACP, 0, (WCHAR *)font->otm.otmpFamilyName, -1, fontdir.szFaceName, LF_FACESIZE, NULL, NULL ); + free_gdi_font( font ); if (hidden) fontdir.dfType |= 0x80; return create_fot( resource_file, font_file, &fontdir ); -- 2.29.2

Dec. 9, 2020

Re: ntdll:exception crashes some Windows 10

by Francois Gouget

For future reference here is a summary of some additional tests I did with Paul: * Setting all Dr* fields to 0 in dreg_handler() except Dr2 still causes a crash. That's a buggy behavior. * Moving the TestBot's w10pro64 VM to my box and running ntdll:exception also leads to a crash. So that seems to indicate a host issue rather than a guest-side Windows configuration issue. * All hosts are running Debian 10 but combining my results with the TestBot's we have the following matrix: kernel 4.19.0-12-amd64 + QEmu 1:3.1+dfsg-8+deb10u8 -> Works (w1064) kernel 5.8.0-0.bpo.2-amd64 + QEmu 1:5.0-14~bpo10+1 -> Works (w10pro64) kernel 4.19.0-11-amd64 + QEmu 1:5.0-14~bpo10+1 -> Crashes (my w10pro64) So maybe it's a 4.19.0.11 bug or QEmu 5.0 does not like 4.19 kernels. I'll continue the tests when I can reboot. -- Francois Gouget <fgouget(a)codeweavers.com>

Dec. 9, 2020

Re: [PATCH vkd3d v3 5/5] vkd3d-shader: Implement basic support for #if and #endif.

by Henri Verbeet

On Mon, 7 Dec 2020 at 22:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > +newline > + : T_NEWLINE > + | YYEOF > + <srcdir>/libs/vkd3d-shader/preproc.y:194.7-11: error: symbol YYEOF is used, but is not defined as a token and has no rules

Dec. 9, 2020

Re: [PATCH vkd3d v3 4/5] vkd3d-shader: Handle preprocessor parsing errors.

by Henri Verbeet

On Mon, 7 Dec 2020 at 22:27, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/preproc.h | 11 +++++++ > libs/vkd3d-shader/preproc.l | 39 +++++++++++++++++++++++- > libs/vkd3d-shader/preproc.y | 39 +++++++++++++++++++++++- > libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ > 4 files changed, 89 insertions(+), 2 deletions(-) > It fails to build here: <srcdir>/libs/vkd3d-shader/preproc.y:82.9-25: error: %define variable 'api.location.type' is not used

Dec. 9, 2020

Re: [PATCH vkd3d] vkd3d: Fix misplaced parenthesis.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 9, 2020

Re: [PATCH vkd3d v3 3/5] vkd3d-shader: Preserve some tokens verbatim for HLSL.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 9, 2020

Re: [PATCH vkd3d v3 2/5] vkd3d-shader: Parse comments in the preprocessor.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Dec. 9, 2020