October 2021 - Wine-devel - list.winehq.org

[PATCH v3] wininet: Allow up to 4K for data buffers
by Alistair Leslie-Hughes 07 Oct '21

07 Oct '21

LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..8538699811c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..219b635488e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -44,6 +44,8 @@ static BOOL first_connection_to_test_url = TRUE; static BOOL https_support = TRUE; +#define HEADER_VALUE_SIZE 4000 + /* Adapted from dlls/urlmon/tests/protocol.c */ #define SET_EXPECT2(status, num) \ @@ -2410,6 +2412,22 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header_length")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n" + "Server: winetest\r\n"; + + char *p = HeapAlloc(GetProcessHeap(), 0, HEADER_VALUE_SIZE + 13 ); + strcpy(p, "wine-header: "); + memset(p+13, 'A', HEADER_VALUE_SIZE); + p[HEADER_VALUE_SIZE+12] = 0; + + send(c, allokmsg, sizeof(allokmsg)-1, 0); + send(c, p, HEADER_VALUE_SIZE + 12, 0); + send(c, "\r\n\r\n", 4, 0); + + HeapFree(GetProcessHeap(), 0, p); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3634,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_header_length_value(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == HEADER_VALUE_SIZE, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6243,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_header_length_value(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH v2] wininet: Allow up to 4K for data buffers
by Alistair Leslie-Hughes 07 Oct '21

07 Oct '21

LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..8538699811c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..ace2291fe5c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -44,6 +44,8 @@ static BOOL first_connection_to_test_url = TRUE; static BOOL https_support = TRUE; +#define HEADER_VALUE_SIZE 4098 + /* Adapted from dlls/urlmon/tests/protocol.c */ #define SET_EXPECT2(status, num) \ @@ -2410,6 +2412,22 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header_length")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n" + "Server: winetest\r\n"; + + char *p = HeapAlloc(GetProcessHeap(), 0, HEADER_VALUE_SIZE + 13 ); + strcpy(p, "wine-header: "); + memset(p+13, 'A', HEADER_VALUE_SIZE); + p[HEADER_VALUE_SIZE+12] = 0; + + send(c, allokmsg, sizeof(allokmsg)-1, 0); + send(c, p, HEADER_VALUE_SIZE + 12, 0); + send(c, "\r\n\r\n", 4, 0); + + HeapFree(GetProcessHeap(), 0, p); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3634,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_header_length_value(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == HEADER_VALUE_SIZE, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6243,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_header_length_value(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH] api-ms-win-core-realtime-l1-1-1: Add stub DLL.
by Brendan Shanks 06 Oct '21

06 Oct '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Used by the Swift on Windows runtime. configure.ac | 1 + dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-realtime-l1-1-1.spec | 3 +++ tools/make_specfiles | 1 + 4 files changed, 6 insertions(+) create mode 100644 dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec diff --git a/configure.ac b/configure.ac index 6321206b9db..fdaebc6deb2 100644 --- a/configure.ac +++ b/configure.ac @@ -2772,6 +2772,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psm-appnotify-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in new file mode 100644 index 00000000000..88ebedfb236 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-realtime-l1-1-1.dll diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec new file mode 100644 index 00000000000..6cffa1f0b08 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec @@ -0,0 +1,3 @@ +@ stub QueryInterruptTime +@ stub QueryInterruptTimePrecise +@ stub QueryUnbiasedInterruptTimePrecise diff --git a/tools/make_specfiles b/tools/make_specfiles index a7ee7e7f4db..ecfc6d0e8f2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -219,6 +219,7 @@ my @dll_groups = "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-realtime-l1-1-0", + "api-ms-win-core-realtime-l1-1-1", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0", -- 2.32.0

1 0

wine-6.0.2-rc1 Available
by Michael Stefaniuc 06 Oct '21

06 Oct '21

Hello guys, I have pushed wine-6.0.2-rc1 (bc884477a6ebac35c9a54d5ea04e8baa130b71ae) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Nothing fancy so without further ado.: What's new in this release (see below for details): - Compilation fixes (freetype, gcc 11) - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 6.0.2 (total 51): 12076 Multiple applications refuse to install unless '%SystemRoot%\System32\Drivers\Etc\{services,host}' exist (Informix Database apps, Autodesk 3ds Max 9, SAP GUI) 12457 Multiple apps crash with NotImplementedException at IWebBrowser2.get_LocationName() (SharpDevelop 2.2, Clarion Enterprise Edition 9.0.10376) 19756 Date/time picker doesn't notify app about checkbox changes (TaskCoach: Cannot add new task with a due date) 24893 File/folder context menus have missing options (Explorer++, Double Commander) 29903 Multiple games and applications fail to enumerate processes due to 'wtsapi32.WTSEnumerateProcessesW' stub (Visual Studio 2005, .NET 2.0 SDK DbgCLR, Akamai DL Manager, Dekaron) 32749 Implement atl100.dll.AtlAxDialogBoxW to show error dialogs (Visual Studio 2010 (10.0) Express Edition) 35539 Proteus 8 demo fails to install 36010 Changing font resolution on winecfg changes default main font to Tahoma 39841 IShellFolder.CreateViewObject() doesn't support IID_IContextMenu (Double Commander "Error: invalid parameter" when right-clicking on an empty space) 44813 Some applications fail when calling ntdll.NtReadFile on a directory (expect STATUS_INVALID_DEVICE_REQUEST) 46817 Steam Big Picture needs d3d11_device_CreateDeviceContextState 47296 Google drive crashes before login 47310 Canon TS3100 series full driver and software package refuses to install: "To install the software, you must be logged in to an administrator account." 48123 Word 97 crashes after calling stub URLMoniker_ComposeWith 48412 Multiple games have lighting issue and textures blinking (Call of Duty 4: Modern Warfare, Call of Duty: Modern Warfare 2) 48507 osu! icons in the setting and music player are not being rendered 49434 Wine builtin 'iexplore' crashes upon loading Google Account login page 49663 Performance regression in TrackMania Nations Forever 49954 Multiple games and applications need msvcp140_1._Aligned_get_default_resource (EVE Online Launcher, QT Creator 3.x, Kate, Snap Camera 1.11.x, Cppcheck 2.3) 50119 Dark Souls II: Scholar of the First Sin shows a white screen with vulkan renderer 50147 Microsoft WebView2 "evergreen bootstrapper"/installer needs IStream::CopyTo() 50168 Error when running notepad.exe: Failed to start RpcSs service 50318 'HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\DataBasePath' registry entry has non-standard value 50362 Fl Studio 20.8 crashes on startup 50436 Upstream FAudio pkg-config file not found 50492 Amazon Chime 4.x (.NET 4.5 app) reports 'Failed to InjectErrorHandlingScript, Unable to cast COM object of type 'System.__ComObject' to interface type 'mshtml.HTMLHeadElement'' 50628 Fairy Tale About Father Frost, Ivan and Nastya crashes on DDERR_SURFACE_LOST 50673 FlatOut 2 crashes on launch 50697 Multiple applications crash due to DHTMLEdit 'IOleObject::GetExtent' stub (Atomic Mail Sender 4.2x) 50725 Nvidia FrameView 1.2 (Win10 app) crashes on unimplemented function tdh.dll.TdhLoadManifestFromBinary 50756 "Path is invalid." when using "SVN update" with SVN for Windows, which is used by TortoiseSVN 50791 NtQueryObject( ..., ObjectBasicInformation, NULL, 0, &retLen) returns incorrect NTSTATUS error code and no buffer size (EditSection, Google sandbox-attacksurface-analysis-tools v1.1.x) 50805 Win32_OperatingSystem class is missing 'ProductType' (affects Chocolatey) 50809 Multiple .NET 4.x application installers fail due to 'MsiNetAssemblySupport' property returning incorrect version (IronPython 2.7.5) 50811 gdi32.res fails to compile when freetype pkg-config cflags contain "-pthread" 50818 Mahou Shoujo Shoumou Sensen - DeadΩAegis (Trial) shows unreadable text in the message box. 50829 Process Hacker 2.38 crashes on unimplemented function dbghelp.dll.SymFromNameW 50830 Process Hacker 2.38 crashes on unimplemented function advapi32.dll.LsaEnumerateAccounts 50845 jscript crashes on internal assert(0) in PE build with clang 50854 Multiple Windows 10 application installers refuse to install, requiring 'advapi32.dll' version >= 6.3.10000.0 (Elgato Stream Deck 4.9.3, Windows Admin Center 2103) 50875 HTMLElement_get_offsetParent crashes wine if a NULL offset parent is expected (VbsEdit) 50885 PdfSharp creates invalid PDF files 50925 Error fetching public key in GetRSAKeyFromCert - File not found 50952 Legends of Runeterra crashes at launch 50960 NETCoreCheck from .NET Deployment Tools crashes on unimplemented function api-ms-win-crt-stdio-l1-1-0.dll.__stdio_common_vfwprintf_p 51035 Alacritty v0.7.2 portable crashes: SetEnvironmentVariable ("some_non-existant_var", NULL) should return TRUE 51041 Scalable fonts with fsCsb[0] == 0 are not enumerated correctly 51076 demangle_datatype in ucrtbase crash in vc2019 x86 mode 51117 Silverlight_x64.exe (part of LEGO MINDSTORMS EV3 Home Edition installer) crashes 51324 Imperium Great Battles of Rome can't play videos 51631 winhttp:winhttp and winhttp:notification fail because echo.websocket.org is out of commission ---------------------------------------------------------------- Changes since 6.0.1: Akihiro Sagawa (2): gdi32: Move otmEMSquare initialization to freetype_load_font. gdi32: Fix text metrics used in EnumFonts families. Alexandre Julliard (4): makefiles: Only allow includes and defines in pkg-config flags. configure: Fix package name for FAudio. ws2_32: Install network database files. wine.inf: Fix the Tcpip database path. Alistair Leslie-Hughes (1): gdi32: Don't override FontSubstitutes on a DPI only change. Andrew Eikum (1): windowscodecs: Avoid types deprecated in libtiff 4.3. Andrey Turkin (1): ieframe: Implement IWebBrowser2::get_LocationName(). Anton Baskanov (4): amstream/tests: Add a test for event parameter of IDirectDrawStreamSample::Update. amstream: Support the event parameter in IDirectDrawStreamSample::Update. fonts: Fix breve glyph position in 16px MS Sans Serif. fonts: Fix dotaccent glyph position in Small Fonts. Arkadiusz Hiler (3): msvcp90: Add helpers for creating base class RTTI. msvcp140_1: Implement the DLL. kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources. Austin English (2): tdh: Add TdhLoadManifestFromBinary stub. readme: Document Libera Chat migration. Brendan Shanks (2): wined3d: Add GPU information for Intel UHD Graphics 630. configure: Work around Xcode 12's ld assuming 16KB page sizes. Damjan Jovanovic (6): comctl32: Send DTN_DATETIMECHANGE when the checkbox changes too. shell32: The menu wIDs in hmenu were rebased by idCmdFirst. shell32: Use a smaller range of shellview menu IDs in our IContextMenu functions. shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it. shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b. shell32: Fix a lock leak. David Torok (1): ntdll: Add NtCreateThread stub. David White (1): urlmon: Implement IMoniker_ComposeWith() for url monikers. Dmitry Kislyuk (1): mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent. Dmitry Timoshkov (3): crypt32: Implement CryptImportPublicKeyInfoEx2. crypt32: Add support for importing RSA public keys with BCrypt. ntdll: Exclude large integer APIs from relay tracing. Esme Povirk (1): gdiplus: Implement reference counting for private font families. François Gouget (3): tests: Trace the filename in winetest_wait_child_process(). tests: Add ignore_exceptions(). make_unicode: Add support for the 720 codepage (Arabic, Farsi and Urdu). Gijs Vermeulen (9): wtsapi32: Avoid calling GetUserNameW() twice in WTSQuerySessionInformationW(WTSUserName). wtsapi32/tests: Test returned username for WTSQuerySessionInformation(WTSUserName). kernelbase: Reject SORT_DIGITSASNUMBERS in CompareStringA(). kernelbase: Support FileRenameInfo in SetFileInformationByHandle. ntdll: Return STATUS_INFO_LENGTH_MISMATCH when len is too small in NtQueryObject(ObjectBasicInformation). dbghelp: Implement SymFromNameW(). ntdll/tests: Refactor RtlSetEnvironmentVariable() tests. ntdll: Don't fail when trying to remove the value of a non-existant variable in RtlSetEnvironmentVariable(). amstream: Handle AMMSF_RENDERALLSTREAMS in IAMMultiMediaStream::OpenFile(). Haidong Yu (2): shell32: Fix a memory leak. shell32: Fix a memory leak. Hans Leidekker (3): ntdll: Fall back to reading /dev/urandom if getrandom() is not supported. msi: Fix building the fusion filename. winhttp: Use ws.ifelse.io for websocket tests. Haoyang Chen (2): gdiplus: Avoid filtering of special characters. gdi32: Fix a memory leak. Jacek Caban (3): mshtml: Support DispHTMLHeadElement interface. jscript: Use quiet NaNs in jsval. msvcrt: Add sincos to importlib. Jan Sikorski (1): wined3d: Handle different slice pitches in uncompressed texture updates. John Zourlios (1): kernelbase: Accept LINGUISTIC_IGNOREDIACRITIC & SORT_DIGITSASNUMBERS in CompareStringEx(). Lauri Kenttä (1): msvcrt: Handle negative zero, infinity and nan in _ecvt and others. Louis Lenders (5): wtsapi32: Implement WTSQuerySessionInformation(WTSDomainName). wbemprox: Add ProductType to win32_operatingsystem class. advapi32: Update version resource. advapi32: Add stub for LsaEnumerateAccounts. kernel32: Remove entry for BasepDebugDump. Matteo Bruni (2): wined3d: Handle blits to Vulkan swapchains not matching the D3D swapchain. wined3d: Don't skip FFP vertex pipeline state handlers when STATE_VDECL is dirty. Michele Dionisio (1): msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p. Nguyễn Chính Hữu (1): wined3d: Add GPU information for NVIDIA GT 1030. Nikolay Sivov (2): gdi32: Enumerate scalable fonts with zero charset mask as OEM. shcore/stream: Implement generic CopyTo(). Owen Rudge (1): winspool: Filter invalid characters when creating the PPD filename. Paul Gofman (2): ddraw/tests: Also test RT caps for software device. vcruntime140_1: Support two continuation addresses for catchblock. Piotr Caban (7): msvcp90: Add macro that define type_info vtable. msvcrt: Cleanup _ecvt tests. msvcrt/tests: Link to malloc/free functions in cpp tests. msvcrt/tests: Cleanup datatype demangle tests. msvcrt: Fix _unDName crash when demangling class function pointer. msvcrt: Improve memmove performance on i386 and x86_64 architectures. winemac.drv: Don't filter non active displays out. Qian Hong (1): atl: Implement AtlAxDialogBox(). Roman Pišl (2): kernel32/tests: Add test for FileRenameInfo in SetFileInformationByHandle. kernelbase: Convert DOS to NT path for FileRenameInfo in SetFileInformationByHandle. Rémi Bernon (3): d3d11: Add initial implementation of CreateDeviceContextState. dinput: Wait for the hook thread to exit when stopping it. dinput: Prevent a device interface leak when enumerating. Sebastian Lackner (1): ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory. Torge Matthies (1): winex11.drv: Avoid race condition in X11 error handling. Vijay Kiran Kamuju (3): dhtmled.ocx: Implement IOleObject::SetExtent and IOleObject::GetExtent functions. dhtmled.ocx: Add stub IOleControl interface. dhtmled.ocx: Fake success in IDHTMLEdit::NewDocument. Zebediah Figura (5): msi: Check for a NULL return from deformat_string() when checking for failure. include: Factor out winetest_printf(). include: Introduce winetest_push_context() and winetest_pop_context(). wtsapi32: Implement WTSEnumerateProcessesW(). wine.inf: Install the protocol database at etc\protocol. Zhiyi Zhang (1): ntoskrnl.exe: Exclude large integer APIs from relay tracing. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH v5 7/7] win32u: Move ntgdi implementation from gdi32.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 38 +-- dlls/gdi32/objects.c | 2 - dlls/win32u/Makefile.in | 34 +- dlls/{gdi32 => win32u}/bitblt.c | 0 dlls/{gdi32 => win32u}/bitmap.c | 0 dlls/{gdi32 => win32u}/brush.c | 0 dlls/{gdi32 => win32u}/clipping.c | 0 dlls/{gdi32 => win32u}/dc.c | 0 dlls/{gdi32 => win32u}/dib.c | 0 dlls/{gdi32 => win32u}/dibdrv/bitblt.c | 0 dlls/{gdi32 => win32u}/dibdrv/dc.c | 0 dlls/{gdi32 => win32u}/dibdrv/dibdrv.h | 0 dlls/{gdi32 => win32u}/dibdrv/graphics.c | 0 dlls/{gdi32 => win32u}/dibdrv/objects.c | 0 dlls/{gdi32 => win32u}/dibdrv/opengl.c | 0 dlls/{gdi32 => win32u}/dibdrv/primitives.c | 0 dlls/{gdi32 => win32u}/driver.c | 0 dlls/{gdi32 => win32u}/emfdrv.c | 0 dlls/{gdi32 => win32u}/font.c | 0 dlls/{gdi32 => win32u}/freetype.c | 2 - dlls/{gdi32 => win32u}/gdiobj.c | 13 +- dlls/win32u/main.c | 6 +- dlls/{gdi32 => win32u}/mapping.c | 0 dlls/{gdi32 => win32u}/ntgdi_private.h | 0 dlls/{gdi32 => win32u}/opentype.c | 0 dlls/{gdi32 => win32u}/painting.c | 0 dlls/{gdi32 => win32u}/palette.c | 0 dlls/{gdi32 => win32u}/path.c | 0 dlls/{gdi32 => win32u}/pen.c | 0 dlls/{gdi32 => win32u}/printdrv.c | 0 dlls/{gdi32 => win32u}/region.c | 0 dlls/win32u/syscall.c | 20 +- dlls/{gdi32 => win32u}/vertical.c | 0 dlls/{gdi32 => win32u}/vulkan.c | 0 dlls/win32u/win32u.spec | 362 +++++++++++---------- dlls/{gdi32 => win32u}/win32u_private.h | 8 +- dlls/{gdi32 => win32u}/wrappers.c | 26 +- 37 files changed, 263 insertions(+), 248 deletions(-) rename dlls/{gdi32 => win32u}/bitblt.c (100%) rename dlls/{gdi32 => win32u}/bitmap.c (100%) rename dlls/{gdi32 => win32u}/brush.c (100%) rename dlls/{gdi32 => win32u}/clipping.c (100%) rename dlls/{gdi32 => win32u}/dc.c (100%) rename dlls/{gdi32 => win32u}/dib.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/bitblt.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/dc.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/dibdrv.h (100%) rename dlls/{gdi32 => win32u}/dibdrv/graphics.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/objects.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/opengl.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/primitives.c (100%) rename dlls/{gdi32 => win32u}/driver.c (100%) rename dlls/{gdi32 => win32u}/emfdrv.c (100%) rename dlls/{gdi32 => win32u}/font.c (100%) rename dlls/{gdi32 => win32u}/freetype.c (99%) rename dlls/{gdi32 => win32u}/gdiobj.c (99%) rename dlls/{gdi32 => win32u}/mapping.c (100%) rename dlls/{gdi32 => win32u}/ntgdi_private.h (100%) rename dlls/{gdi32 => win32u}/opentype.c (100%) rename dlls/{gdi32 => win32u}/painting.c (100%) rename dlls/{gdi32 => win32u}/palette.c (100%) rename dlls/{gdi32 => win32u}/path.c (100%) rename dlls/{gdi32 => win32u}/pen.c (100%) rename dlls/{gdi32 => win32u}/printdrv.c (100%) rename dlls/{gdi32 => win32u}/region.c (100%) rename dlls/{gdi32 => win32u}/vertical.c (100%) rename dlls/{gdi32 => win32u}/vulkan.c (100%) rename dlls/{gdi32 => win32u}/win32u_private.h (99%) rename dlls/{gdi32 => win32u}/wrappers.c (98%)

3 2

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: SM4 immediate constants do not have a register index.
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f72494311..328a8ba1b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -961,8 +961,6 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; - instr.srcs[0].reg.idx[0] = constant->reg.id; - instr.srcs[0].reg.idx_count = 1; for (i = 0; i < dimx; ++i) instr.srcs[0].reg.immconst_uint[i] = constant->value[i].u; instr.src_count = 1, -- 2.33.0

6 22

[v2 PATCH 1/5] d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46.
by Matteo Bruni 06 Oct '21

06 Oct '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Simplify broken() condition (thanks Zebediah). Supsersedes patch 216441. dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 75f30e45dce..6d6173824a2 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -164,8 +164,8 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); - /* Broken with older d3dcompiler_47. */ - ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + /* Broken with older d3dcompiler_46, d3dcompiler_47. */ + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); if (hr != S_OK) return; -- 2.26.3

1 0

[PATCH vkd3d v2] tests: Mark WriteToSubresource test as todo on NVIDIA.
by Giovanni Mascellani 06 Oct '21

06 Oct '21

Similarly to ReadFromSubresource, WriteToSubresource is currently implemented only for images with linear tiling, which NVIDIA drivers currently do not support. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..1fa017ab 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32060,6 +32060,7 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); @@ -32102,17 +32103,20 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else @@ -32217,6 +32221,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } + todo_if(is_nvidia_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); release_resource_readback(&rb); -- 2.33.0

2 1

[PATCH v2 1/5] winegstreamer: Handle zero-length reads in src_getrange_cb().
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 72dfab8f3d6..9a382cb724c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1272,7 +1272,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, GstMapInfo map_info; bool ret; - GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); if (offset == GST_BUFFER_OFFSET_NONE) offset = parser->next_pull_offset; @@ -1281,6 +1281,16 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); + if (!size) + { + /* asfreader occasionally asks for zero bytes. gst_buffer_map() will + * return NULL in this case. Avoid confusing the read thread by asking + * it for zero bytes. */ + gst_buffer_set_size(*buffer, 0); + GST_LOG("Returning empty buffer."); + return GST_FLOW_OK; + } + gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); pthread_mutex_lock(&parser->mutex); -- 2.33.0

1 4

[PATCH vkd3d 4/5] vkd3d: Reject descriptor tables containing register collisions.
by Henri Verbeet 06 Oct '21

06 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 37 +++++++++++++++++++++++++++++++++++++ tests/d3d12.c | 4 +--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ffb3e2f5..990b49b2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -662,6 +662,39 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r return S_OK; } +static int compare_register_range(const void *a, const void *b) +{ + const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; + int ret; + + if ((ret = range_a->type - range_b->type)) + return ret; + + if ((ret = range_a->register_space - range_b->register_space)) + return ret; + + return range_a->base_register_idx - range_b->base_register_idx; +} + +static HRESULT validate_descriptor_register_ranges(const struct d3d12_root_descriptor_table_range *ranges, + unsigned int count) +{ + const struct d3d12_root_descriptor_table_range *range, *prev; + unsigned int i; + + for (i = 1; i < count; ++i) + { + range = &ranges[i]; + prev = &ranges[i - 1]; + + if (range->type == prev->type && range->register_space == prev->register_space + && range->base_register_idx - prev->base_register_idx < prev->descriptor_count) + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_root_signature *root_signature, const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) { @@ -715,6 +748,10 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo offset += range->NumDescriptors; } + qsort(table->ranges, range_count, sizeof(*table->ranges), compare_register_range); + if (FAILED(hr = validate_descriptor_register_ranges(table->ranges, range_count))) + return hr; + for (j = 0; j < range_count; ++j) { struct d3d12_root_descriptor_table_range *range; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5dea7812..57c39d27 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2674,9 +2674,7 @@ static void test_create_root_signature(void) descriptor_ranges[1].BaseShaderRegister = 7; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 8; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12RootSignature_Release(root_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* Identical ranges and register indices but different type. */ descriptor_ranges[1] = descriptor_ranges[0]; -- 2.20.1

1 0