March 2021 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : ws2_32: Correct returned error code for an invalid socket.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: 5a174e05f41502caa096a54e26878330b25af35d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a174e05f41502caa096a54e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 27 12:51:46 2020 +1000 ws2_32: Correct returned error code for an invalid socket. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 587732acb7834a52a2af5bb45e59899ab8ec3f5d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 32 +++++++------------------------- dlls/ws2_32/tests/sock.c | 7 ++----- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 374eec37f2e..73c605238ed 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1117,8 +1117,8 @@ static DWORD NtStatusToWSAError( DWORD status ) { case STATUS_SUCCESS: return 0; case STATUS_PENDING: return WSA_IO_PENDING; + case STATUS_INVALID_HANDLE: case STATUS_OBJECT_TYPE_MISMATCH: return WSAENOTSOCK; - case STATUS_INVALID_HANDLE: return WSAEBADF; case STATUS_INVALID_PARAMETER: return WSAEINVAL; case STATUS_PIPE_DISCONNECTED: return WSAESHUTDOWN; case STATUS_NETWORK_BUSY: return WSAEALREADY; @@ -2887,19 +2887,11 @@ static BOOL WINAPI WS2_AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DW } fd = get_sock_fd( listener, FILE_READ_DATA, NULL ); - if (fd == -1) - { - SetLastError(WSAENOTSOCK); - return FALSE; - } + if (fd == -1) return FALSE; release_sock_fd( listener, fd ); fd = get_sock_fd( acceptor, FILE_READ_DATA, NULL ); - if (fd == -1) - { - SetLastError(WSAENOTSOCK); - return FALSE; - } + if (fd == -1) return FALSE; release_sock_fd( acceptor, fd ); wsa = (struct ws2_accept_async *)alloc_async_io( sizeof(*wsa), WS2_async_accept ); @@ -3145,11 +3137,8 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE h, DWORD file_bytes, DWORD buffers, flags ); fd = get_sock_fd( s, FILE_WRITE_DATA, NULL ); - if (fd == -1) - { - WSASetLastError( WSAENOTSOCK ); - return FALSE; - } + if (fd == -1) return FALSE; + if (getpeername( fd, &uaddr.addr, &uaddrlen ) != 0) { release_sock_fd( s, fd ); @@ -3495,8 +3484,6 @@ int WINAPI WS_closesocket(SOCKET s) if (CloseHandle(SOCKET2HANDLE(s))) res = 0; } - else - SetLastError(WSAENOTSOCK); } else SetLastError(WSANOTINITIALISED); @@ -3607,11 +3594,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n } fd = get_sock_fd( s, FILE_READ_DATA, NULL ); - if (fd == -1) - { - SetLastError( WSAENOTSOCK ); - return FALSE; - } + if (fd == -1) return FALSE; TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); @@ -5205,8 +5188,7 @@ int WINAPI WS_listen(SOCKET s, int backlog) SetLastError(wsaErrno()); release_sock_fd( s, fd ); } - else - SetLastError(WSAENOTSOCK); + return ret; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bf1aeefb852..15954b0fa91 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1562,7 +1562,6 @@ todo_wine size = sizeof(i); i = 1234; err = getsockopt(s, SOL_SOCKET, SO_ERROR, (char *) &i, &size); -todo_wine ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAENOTSOCK), "got %d with %d (expected SOCKET_ERROR with WSAENOTSOCK)\n", err, WSAGetLastError()); @@ -4152,8 +4151,7 @@ static void test_select(void) SetLastError(0xdeadbeef); ret = select(0, &readfds, NULL, &exceptfds, &select_timeout); ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); -todo_wine - ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + ok(GetLastError() == WSAENOTSOCK, "got %d\n", GetLastError()); /* descriptor sets are unchanged */ ok(readfds.fd_count == 2, "expected 2, got %d\n", readfds.fd_count); ok(exceptfds.fd_count == 2, "expected 2, got %d\n", exceptfds.fd_count); @@ -4180,8 +4178,7 @@ todo_wine ret = select(0, NULL, NULL, &exceptfds, &select_timeout); todo_wine ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); -todo_wine - ok(GetLastError() == WSAENOTSOCK, "expected 10038, got %d\n", GetLastError()); + ok(GetLastError() == WSAENOTSOCK, "got %d\n", GetLastError()); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead);

1 0

Zebediah Figura : ws2_32: Keep a list of open sockets.
by Alexandre Julliard March 23, 2021

March 23, 2021

Module: wine Branch: oldstable Commit: e0a3c5b4ed407b31f8f294b58014c9496bbc3541 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a3c5b4ed407b31f8f294b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:14 2020 -0500 ws2_32: Keep a list of open sockets. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 23dbfaadbb93eea84601d763d303273ab9872f66) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 99 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 77 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 73c605238ed..4495d19a802 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -266,26 +266,22 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, LPWSABUF lpControlBuffer ); -/* critical section to protect some non-reentrant net function */ -static CRITICAL_SECTION csWSgetXXXbyYYY; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &csWSgetXXXbyYYY, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": csWSgetXXXbyYYY") } -}; -static CRITICAL_SECTION csWSgetXXXbyYYY = { &critsect_debug, -1, 0, 0, 0, 0 }; +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 } + +DECLARE_CRITICAL_SECTION(csWSgetXXXbyYYY); +DECLARE_CRITICAL_SECTION(cs_if_addr_cache); +DECLARE_CRITICAL_SECTION(cs_socket_list); static in_addr_t *if_addr_cache; static unsigned int if_addr_cache_size; -static CRITICAL_SECTION cs_if_addr_cache; -static CRITICAL_SECTION_DEBUG cs_if_addr_cache_debug = -{ - 0, 0, &cs_if_addr_cache, - { &cs_if_addr_cache_debug.ProcessLocksList, &cs_if_addr_cache_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_if_addr_cache") } -}; -static CRITICAL_SECTION cs_if_addr_cache = { &cs_if_addr_cache_debug, -1, 0, 0, 0, 0 }; + +static SOCKET *socket_list; +static unsigned int socket_list_size; union generic_unix_sockaddr { @@ -480,6 +476,48 @@ static inline const char *debugstr_optval(const char *optval, int optlenval) #define SOCKET2HANDLE(s) ((HANDLE)(s)) #define HANDLE2SOCKET(h) ((SOCKET)(h)) +static BOOL socket_list_add(SOCKET socket) +{ + unsigned int i, new_size; + SOCKET *new_array; + + EnterCriticalSection(&cs_socket_list); + for (i = 0; i < socket_list_size; ++i) + { + if (!socket_list[i]) + { + socket_list[i] = socket; + LeaveCriticalSection(&cs_socket_list); + return TRUE; + } + } + new_size = max(socket_list_size * 2, 8); + if (!(new_array = heap_realloc(socket_list, new_size * sizeof(*socket_list)))) + return FALSE; + socket_list = new_array; + memset(socket_list + socket_list_size, 0, (new_size - socket_list_size) * sizeof(*socket_list)); + socket_list[socket_list_size] = socket; + socket_list_size = new_size; + LeaveCriticalSection(&cs_socket_list); + return TRUE; +} + +static void socket_list_remove(SOCKET socket) +{ + unsigned int i; + + EnterCriticalSection(&cs_socket_list); + for (i = 0; i < socket_list_size; ++i) + { + if (socket_list[i] == socket) + { + socket_list[i] = 0; + break; + } + } + LeaveCriticalSection(&cs_socket_list); +} + /**************************************************************** * Async IO declarations ****************************************************************/ @@ -2830,6 +2868,11 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) SERVER_END_REQ; if (!err) { + if (!socket_list_add(as)) + { + CloseHandle(SOCKET2HANDLE(as)); + return SOCKET_ERROR; + } if (addr && addrlen32 && WS_getpeername(as, addr, addrlen32)) { WS_closesocket(as); @@ -3481,6 +3524,7 @@ int WINAPI WS_closesocket(SOCKET s) if (fd >= 0) { release_sock_fd(s, fd); + socket_list_remove(s); if (CloseHandle(SOCKET2HANDLE(s))) res = 0; } @@ -7607,10 +7651,16 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } /* hack for WSADuplicateSocket */ - if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) { - ret = lpProtocolInfo->dwServiceFlags3; - TRACE("\tgot duplicate %04lx\n", ret); - return ret; + if (lpProtocolInfo && lpProtocolInfo->dwServiceFlags4 == 0xff00ff00) + { + ret = lpProtocolInfo->dwServiceFlags3; + TRACE("\tgot duplicate %04lx\n", ret); + if (!socket_list_add(ret)) + { + CloseHandle(SOCKET2HANDLE(ret)); + return INVALID_SOCKET; + } + return ret; } if (lpProtocolInfo) @@ -7734,7 +7784,12 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, } } #endif - return ret; + if (!socket_list_add(ret)) + { + CloseHandle(SOCKET2HANDLE(ret)); + return INVALID_SOCKET; + } + return ret; } if (err == WSAEACCES) /* raw socket denied */

1 0

Jacek Caban : ieframe: Use nameless unions.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: d1764a45cfd12f8c5699fd7428cf90f90a2d31ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1764a45cfd12f8c5699fd74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 22 18:31:46 2021 +0100 ieframe: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/Makefile.in | 1 - dlls/ieframe/intshcut.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/Makefile.in b/dlls/ieframe/Makefile.in index 1ddb02598cc..61037143f2e 100644 --- a/dlls/ieframe/Makefile.in +++ b/dlls/ieframe/Makefile.in @@ -1,7 +1,6 @@ MODULE = ieframe.dll IMPORTLIB = ieframe IMPORTS = uuid urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/ieframe/intshcut.c b/dlls/ieframe/intshcut.c index 6c64eb5b3b2..4a0e870ca09 100644 --- a/dlls/ieframe/intshcut.c +++ b/dlls/ieframe/intshcut.c @@ -509,7 +509,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam ps.ulKind = PRSPEC_PROPID; ps.u.propid = PID_IS_ICONFILE; pv.vt = VT_LPWSTR; - pv.u.pwszVal = iconfile; + pv.pwszVal = iconfile; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); if (FAILED(hr)) TRACE("Failed to store the iconfile to our property storage. hr = 0x%x\n", hr); @@ -525,7 +525,7 @@ static HRESULT WINAPI PersistFile_Load(IPersistFile *pFile, LPCOLESTR pszFileNam ps.ulKind = PRSPEC_PROPID; ps.u.propid = PID_IS_ICONINDEX; pv.vt = VT_I4; - pv.u.iVal = iconindex; + pv.iVal = iconindex; hr = IPropertyStorage_WriteMultiple(pPropStg, 1, &ps, &pv, 0); if (FAILED(hr)) TRACE("Failed to store the iconindex to our property storage. hr = 0x%x\n", hr); @@ -606,18 +606,18 @@ static HRESULT WINAPI PersistFile_Save(IPersistFile *pFile, LPCOLESTR pszFileNam else if (SUCCEEDED(hr)) { char indexString[50]; - len = WideCharToMultiByte(CP_UTF8, 0, pvread[0].u.pwszVal, -1, NULL, 0, 0, 0); + len = WideCharToMultiByte(CP_UTF8, 0, pvread[0].pwszVal, -1, NULL, 0, 0, 0); iconfile = heap_alloc(len); if (iconfile != NULL) { - WideCharToMultiByte(CP_UTF8, 0, pvread[0].u.pwszVal, -1, iconfile, len, 0, 0); + WideCharToMultiByte(CP_UTF8, 0, pvread[0].pwszVal, -1, iconfile, len, 0, 0); WriteFile(file, str_ICONFILE, lstrlenA(str_ICONFILE), &bytesWritten, NULL); WriteFile(file, iconfile, lstrlenA(iconfile), &bytesWritten, NULL); WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL); heap_free(iconfile); } - sprintf(indexString, "ICONINDEX=%d", pvread[1].u.iVal); + sprintf(indexString, "ICONINDEX=%d", pvread[1].iVal); WriteFile(file, indexString, lstrlenA(indexString), &bytesWritten, NULL); WriteFile(file, str_eol, lstrlenA(str_eol), &bytesWritten, NULL);

1 0

Jacek Caban : include: Use nameless unions in dxva2api.idl helpers.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: ee587da9e5b1276e8908c4442c909650f0c7aacf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee587da9e5b1276e8908c444… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 22 18:31:39 2021 +0100 include: Use nameless unions in dxva2api.idl helpers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50836 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 1 - dlls/mfplat/main.c | 62 ++++++++++++++++++++++---------------------- dlls/mfplat/mfplat_private.h | 14 +++++----- dlls/mfreadwrite/Makefile.in | 1 - dlls/mfreadwrite/reader.c | 10 +++---- include/dxva2api.idl | 13 +++++----- 6 files changed, 49 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee587da9e5b1276e8908…

1 0

Giovanni Mascellani : mfreadwrite: Unset seeking flag also on SourceStarted and SourceStopped.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 1a7be75656003f2fe0dfdde609a6ebf7c8bc07cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7be75656003f2fe0dfdde6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Mar 22 15:59:49 2021 +0100 mfreadwrite: Unset seeking flag also on SourceStarted and SourceStopped. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 2 ++ dlls/mfreadwrite/tests/mfplat.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index cb4166265a0..7ce4674f940 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -550,9 +550,11 @@ static HRESULT source_reader_source_state_handler(struct source_reader *reader, { case MESourceStarted: reader->source_state = SOURCE_STATE_STARTED; + reader->flags &= ~SOURCE_READER_SEEKING; break; case MESourceStopped: reader->source_state = SOURCE_STATE_STOPPED; + reader->flags &= ~SOURCE_READER_SEEKING; break; case MESourceSeeked: reader->flags &= ~SOURCE_READER_SEEKING; diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index c6191767164..25aa29ac272 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -902,6 +902,7 @@ static void test_source_reader_from_media_source(void) IMFAttributes *attributes; ULONG refcount; int i; + PROPVARIANT pos; source = create_test_source(); ok(!!source, "Failed to create test source.\n"); @@ -916,6 +917,11 @@ static void test_source_reader_from_media_source(void) hr = IMFSourceReader_SetStreamSelection(reader, 1, TRUE); ok(hr == S_OK, "Failed to select a stream, hr %#x.\n", hr); + pos.vt = VT_I8; + pos.hVal.QuadPart = 0; + hr = IMFSourceReader_SetCurrentPosition(reader, &GUID_NULL, &pos); + ok(hr == S_OK, "Failed to seek to beginning of stream, hr %#x.\n", hr); + hr = IMFSourceReader_ReadSample(reader, MF_SOURCE_READER_ANY_STREAM, 0, &actual_index, &stream_flags, &timestamp, &sample); ok(hr == S_OK, "Failed to get a sample, hr %#x.\n", hr);

1 0

Alexandre Julliard : ntdll: Don't return an existing address when mapping a builtin PE dll.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 49f12d65d86fe0005dd446adf67caa48776e21b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f12d65d86fe0005dd446ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 16:14:31 2021 +0100 ntdll: Don't return an existing address when mapping a builtin PE dll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 44 +++----------------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 06b9c02a73f..8ceba611875 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -87,8 +87,6 @@ struct builtin_module { struct list entry; unsigned int refcount; - dev_t dev; - ino_t ino; void *handle; void *module; char *unix_name; @@ -565,7 +563,7 @@ static void mmap_init( const struct preload_info *preload_info ) /*********************************************************************** * add_builtin_module */ -static void add_builtin_module( void *module, void *handle, const struct stat *st ) +static void add_builtin_module( void *module, void *handle ) { struct builtin_module *builtin; @@ -576,16 +574,6 @@ static void add_builtin_module( void *module, void *handle, const struct stat *s builtin->unix_name = NULL; builtin->unix_handle = NULL; builtin->unix_entry = NULL; - if (st) - { - builtin->dev = st->st_dev; - builtin->ino = st->st_ino; - } - else - { - builtin->dev = 0; - builtin->ino = 0; - } list_add_tail( &builtin_modules, &builtin->entry ); } @@ -614,19 +602,6 @@ NTSTATUS release_builtin_module( void *module ) } -/*********************************************************************** - * find_builtin_module - */ -static void *find_builtin_module( const struct stat *st ) -{ - struct builtin_module *builtin; - - LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) - if (builtin->dev == st->st_dev && builtin->ino == st->st_ino) return builtin->module; - return NULL; -} - - /*********************************************************************** * get_builtin_so_handle */ @@ -2411,7 +2386,6 @@ static NTSTATUS virtual_map_image( HANDLE mapping, ACCESS_MASK access, void **ad SIZE_T size = image_info->map_size; struct file_view *view; NTSTATUS status; - struct stat st; sigset_t sigset; void *base; @@ -2428,18 +2402,6 @@ static NTSTATUS virtual_map_image( HANDLE mapping, ACCESS_MASK access, void **ad status = STATUS_INVALID_PARAMETER; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - if (is_builtin) /* check for already loaded builtin */ - { - fstat( unix_fd, &st ); - if ((base = find_builtin_module( &st ))) - { - *addr_ptr = base; - *size_ptr = size; - status = STATUS_SUCCESS; - goto done; - } - } - base = wine_server_get_ptr( image_info->base ); if ((ULONG_PTR)base != image_info->base) base = NULL; @@ -2465,7 +2427,7 @@ static NTSTATUS virtual_map_image( HANDLE mapping, ACCESS_MASK access, void **ad } if (status >= 0) { - if (is_builtin) add_builtin_module( view->base, NULL, &st ); + if (is_builtin) add_builtin_module( view->base, NULL ); *addr_ptr = view->base; *size_ptr = size; VIRTUAL_DEBUG_DUMP_VIEW( view ); @@ -2832,7 +2794,7 @@ NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_nam if (status >= 0) { - add_builtin_module( view->base, so_handle, NULL ); + add_builtin_module( view->base, so_handle ); VIRTUAL_DEBUG_DUMP_VIEW( view ); if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; }

1 0

Nikolay Sivov : gdiplus: Add a helper to check for metafile graphics context.
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: b733e39ae5e246246ea993013484f2352abd3580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b733e39ae5e246246ea99301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 15:18:02 2021 +0300 gdiplus: Add a helper to check for metafile graphics context. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 78 +++++++++++++++++++++++++++---------------------- dlls/gdiplus/image.c | 1 + 2 files changed, 44 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b733e39ae5e246246ea9…

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_predication().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: ac0f240ac6f296d915916746c13f503e42fdd9a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac0f240ac6f296d915916746… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:39 2021 -0500 d3d11: Use wined3d_device_context_set_predication(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4f59a2e41a5..6e0ae6d695b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -879,7 +879,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11DeviceContext1 *iface, ID3D11Predicate *predicate, BOOL value) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_query *query; TRACE("iface %p, predicate %p, value %#x.\n", iface, predicate, value); @@ -887,7 +887,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_SetPredication(ID3D11Devic query = unsafe_impl_from_ID3D11Query((ID3D11Query *)predicate); wined3d_mutex_lock(); - wined3d_device_set_predication(device->wined3d_device, query ? query->wined3d_query : NULL, value); + wined3d_device_context_set_predication(context->wined3d_context, query ? query->wined3d_query : NULL, value); wined3d_mutex_unlock(); } @@ -2637,7 +2637,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon { wined3d_device_set_stream_output(device->wined3d_device, i, NULL, 0); } - wined3d_device_set_predication(device->wined3d_device, NULL, FALSE); + wined3d_device_context_set_predication(context->wined3d_context, NULL, FALSE); wined3d_mutex_unlock(); }

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_predication().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 874ff93c0420db42fb0182f89314f0671645fee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=874ff93c0420db42fb0182f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:37 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_predication(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1611a9efd27..f7b682b627e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1123,16 +1123,17 @@ static void wined3d_cs_exec_set_predication(struct wined3d_cs *cs, const void *d cs->state.predicate_value = op->value; } -void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, struct wined3d_query *predicate, BOOL value) +void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context, + struct wined3d_query *predicate, BOOL value) { struct wined3d_cs_set_predication *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_PREDICATION; op->predicate = predicate; op->value = value; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_viewports(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 267a8cae17d..4c914f6adc1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1894,7 +1894,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 wined3d_cs_emit_set_index_buffer(device->cs, state->index_buffer, state->index_format, state->index_offset); - wined3d_cs_emit_set_predication(device->cs, state->predicate, state->predicate_value); + wined3d_device_context_emit_set_predication(context, state->predicate, state->predicate_value); for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { @@ -4399,7 +4399,7 @@ void CDECL wined3d_device_set_predication(struct wined3d_device *device, } state->predicate = predicate; state->predicate_value = value; - wined3d_cs_emit_set_predication(device->cs, predicate, value); + wined3d_device_context_emit_set_predication(&device->cs->c, predicate, value); if (prev) wined3d_query_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2541ca10c1e..0df57a91049 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4755,8 +4755,6 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_material *material) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_predication(struct wined3d_cs *cs, - struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, @@ -4805,6 +4803,8 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_depth_stencil_view(struct wined3d_device_context *context, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context, + struct wined3d_query *predicate, BOOL value) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx,

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_depth_stencil_view().
by Alexandre Julliard March 22, 2021

March 22, 2021

Module: wine Branch: master Commit: 9b52cef45bc4d858d988dc812beab3ef4f26343a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b52cef45bc4d858d988dc81… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 18 23:16:36 2021 -0500 d3d11: Use wined3d_device_context_set_depth_stencil_view(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4840c014b6c..4f59a2e41a5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -935,7 +935,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargets(ID3D11D ID3D11DepthStencilView *depth_stencil_view) { struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_depthstencil_view *dsv; unsigned int i; @@ -955,7 +954,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargets(ID3D11D } dsv = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view); - wined3d_device_set_depth_stencil_view(device->wined3d_device, dsv ? dsv->wined3d_view : NULL); + wined3d_device_context_set_depth_stencil_view(context->wined3d_context, dsv ? dsv->wined3d_view : NULL); wined3d_mutex_unlock(); } @@ -2623,7 +2622,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon { wined3d_device_context_set_rendertarget_view(context->wined3d_context, i, NULL, FALSE); } - wined3d_device_set_depth_stencil_view(device->wined3d_device, NULL); + wined3d_device_context_set_depth_stencil_view(context->wined3d_context, NULL); for (i = 0; i < WINED3D_PIPELINE_COUNT; ++i) { for (j = 0; j < D3D11_PS_CS_UAV_REGISTER_COUNT; ++j)

1 0