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

Zebediah Figura : ws2_32: Keep a list of open sockets.
by Alexandre Julliard 23 Mar '21

23 Mar '21

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

Zebediah Figura : ws2_32: Close all open sockets in WSACleanup().
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 51fb80556e392814f2eebeb3545d27b9edeff6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=51fb80556e392814f2eebeb3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 10 16:17:15 2020 -0500 ws2_32: Close all open sockets in WSACleanup(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18670 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 470b9d037988cf5e79b039370e2c6c55daf3459c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++--- dlls/ws2_32/tests/sock.c | 3 --- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4495d19a802..9dac32bf210 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1768,9 +1768,17 @@ int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) */ INT WINAPI WSACleanup(void) { - if (num_startup) { - num_startup--; - TRACE("pending cleanups: %d\n", num_startup); + TRACE("decreasing startup count from %d\n", num_startup); + if (num_startup) + { + if (!--num_startup) + { + unsigned int i; + + for (i = 0; i < socket_list_size; ++i) + CloseHandle(SOCKET2HANDLE(socket_list[i])); + memset(socket_list, 0, socket_list_size * sizeof(*socket_list)); + } return 0; } SetLastError(WSANOTINITIALISED); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 15954b0fa91..305258deea7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1218,7 +1218,6 @@ static void test_WithWSAStartup(void) ok(res == 0, "WSAStartup() failed unexpectedly: %d\n", res); /* show that sockets are destroyed automatically after WSACleanup */ - todo_wine { SetLastError(0xdeadbeef); res = send(pairs[0].src, "TEST", 4, 0); error = WSAGetLastError(); @@ -1255,8 +1254,6 @@ static void test_WithWSAStartup(void) } } - } - /* While wine is not fixed, close all sockets manually */ for (i = 0; i < socks; i++) {

1 0

Jacek Caban : include: Use nameless unions in dxva2api.idl helpers.
by Alexandre Julliard 22 Mar '21

22 Mar '21

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

Jacek Caban : ieframe: Use nameless unions.
by Alexandre Julliard 22 Mar '21

22 Mar '21

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

Nikolay Sivov : gdiplus: Add a helper to check for metafile graphics context.
by Alexandre Julliard 22 Mar '21

22 Mar '21

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

Nikolay Sivov : gdiplus/metafile: Implement DrawRectangles() recording.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 81bbc4872e8f5fb88916cd79bc6ef8b2c15dff83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bbc4872e8f5fb88916cd79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 18 15:18:03 2021 +0300 gdiplus/metafile: Implement DrawRectangles() recording. 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/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 3 +++ dlls/gdiplus/metafile.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 9b608035909..a617ca4803e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -112,6 +112,7 @@ extern GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN; extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rect) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) DECLSPEC_HIDDEN; extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c2c116acf94..2c18ced3e92 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4132,6 +4132,9 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; + if (is_metafile_graphics(graphics)) + return METAFILE_DrawRectangles((GpMetafile *)graphics->image, pen, rects, count); + status = GdipCreatePath(FillModeAlternate, &path); if (status != Ok) return status; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c285dc58f40..eafcdaee963 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -5102,3 +5102,59 @@ GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* reg return Ok; } + +GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) +{ + EmfPlusDrawRects *record; + GpStatus stat; + BOOL integer_rects = TRUE; + DWORD pen_id; + int i; + + if (metafile->metafile_type == MetafileTypeEmf) + { + FIXME("stub!\n"); + return NotImplemented; + } + + stat = METAFILE_AddPenObject(metafile, pen, &pen_id); + if (stat != Ok) return stat; + + for (i = 0; i < count; i++) + { + if (!is_integer_rect(&rects[i])) + { + integer_rects = FALSE; + break; + } + } + + stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawRects, RectData) + + count * (integer_rects ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF)), + (void **)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeDrawRects; + record->Header.Flags = pen_id; + if (integer_rects) + record->Header.Flags |= 0x4000; + record->Count = count; + + if (integer_rects) + { + for (i = 0; i < count; i++) + { + record->RectData.rect[i].X = (SHORT)rects[i].X; + record->RectData.rect[i].Y = (SHORT)rects[i].Y; + record->RectData.rect[i].Width = (SHORT)rects[i].Width; + record->RectData.rect[i].Height = (SHORT)rects[i].Height; + } + } + else + memcpy(record->RectData.rectF, rects, sizeof(*rects) * count); + + METAFILE_WriteRecords(metafile); + + return Ok; +}

1 0

Alexandre Julliard : ntdll: Load the Unix library only when __wine_init_unix_lib() is called.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 89340bb762300c76a40cb4b62ba0f0d779306125 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89340bb762300c76a40cb4b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 16:03:22 2021 +0100 ntdll: Load the Unix library only when __wine_init_unix_lib() is called. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 40 ++++++++++++++++++++++++---------------- dlls/ntdll/unix/unix_private.h | 4 ++-- dlls/ntdll/unix/virtual.c | 36 +++++++++++++++++++++--------------- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9e43358a26d..1c95b84e965 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1111,30 +1111,38 @@ already_loaded: /*********************************************************************** - * dlopen_unix_dll + * init_unix_lib */ -static NTSTATUS dlopen_unix_dll( void *module, const char *name ) +static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) { - void *unix_module, *handle, *entry; + NTSTATUS (CDECL *init_func)( HMODULE, DWORD, const void *, void * ); const IMAGE_NT_HEADERS *nt; - NTSTATUS status = STATUS_INVALID_IMAGE_FORMAT; + const char *name; + void *handle, *entry, *unix_module; + NTSTATUS status; - handle = dlopen( name, RTLD_NOW ); - if (!handle) return STATUS_DLL_NOT_FOUND; - if (!(nt = dlsym( handle, "__wine_spec_nt_header" ))) goto done; - if (!(entry = dlsym( handle, "__wine_init_unix_lib" ))) goto done; + if ((status = get_builtin_unix_info( module, &name, &handle, &entry ))) return status; - unix_module = (HMODULE)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); - status = set_builtin_unix_handle( module, handle, entry ); - if (!status) + if (!entry) { + if (!name) return STATUS_DLL_NOT_FOUND; + if (!(handle = dlopen( name, RTLD_NOW ))) return STATUS_DLL_NOT_FOUND; + + if (!(nt = dlsym( handle, "__wine_spec_nt_header" )) || + !(entry = dlsym( handle, "__wine_init_unix_lib" ))) + { + dlclose( handle ); + set_builtin_unix_info( module, NULL, NULL, NULL ); + return STATUS_INVALID_IMAGE_FORMAT; + } + TRACE( "loaded %s for %p\n", debugstr_a(name), module ); + unix_module = (void *)((nt->OptionalHeader.ImageBase + 0xffff) & ~0xffff); map_so_dll( nt, unix_module ); fixup_ntdll_imports( name, unix_module ); - return status; + set_builtin_unix_info( module, NULL, handle, entry ); } -done: - dlclose( handle ); - return status; + init_func = entry; + return init_func( module, reason, ptr_in, ptr_out ); } @@ -1393,7 +1401,7 @@ done: if (!status && ext) { strcpy( ext, ".so" ); - dlopen_unix_dll( *module, ptr ); + set_builtin_unix_info( *module, ptr, NULL, NULL ); } free( file ); return status; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c00a6ee6aa8..5877a00bac8 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -203,8 +203,8 @@ extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; -extern NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) DECLSPEC_HIDDEN; +extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; +extern NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) DECLSPEC_HIDDEN; extern NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_len ) DECLSPEC_HIDDEN; extern BOOL get_thread_times( int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index bff4569b615..4edc7d0261e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -90,6 +90,7 @@ struct builtin_module ino_t ino; void *handle; void *module; + char *unix_name; void *unix_handle; void *unix_entry; }; @@ -570,6 +571,7 @@ static void add_builtin_module( void *module, void *handle, const struct stat *s if (!(builtin = malloc( sizeof(*builtin) ))) return; builtin->handle = handle; builtin->module = module; + builtin->unix_name = NULL; builtin->unix_handle = NULL; builtin->unix_entry = NULL; if (st) @@ -641,9 +643,9 @@ void *get_builtin_so_handle( void *module ) /*********************************************************************** - * set_builtin_unix_handle + * get_builtin_unix_info */ -NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) +NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) { sigset_t sigset; NTSTATUS status = STATUS_DLL_NOT_FOUND; @@ -653,13 +655,10 @@ NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - if (!builtin->unix_handle) - { - builtin->unix_handle = handle; - builtin->unix_entry = entry; - status = STATUS_SUCCESS; - } - else status = STATUS_IMAGE_ALREADY_LOADED; + *name = builtin->unix_name; + *handle = builtin->unix_handle; + *entry = builtin->unix_entry; + status = STATUS_SUCCESS; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -668,24 +667,31 @@ NTSTATUS set_builtin_unix_handle( void *module, void *handle, void *entry ) /*********************************************************************** - * init_unix_lib + * set_builtin_unix_info */ -NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr_in, void *ptr_out ) +NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) { sigset_t sigset; - NTSTATUS (CDECL *init_func)( HMODULE, DWORD, const void *, void * ) = NULL; + NTSTATUS status = STATUS_DLL_NOT_FOUND; struct builtin_module *builtin; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - init_func = builtin->unix_entry; + if (!builtin->unix_handle) + { + free( builtin->unix_name ); + builtin->unix_name = name ? strdup( name ) : NULL; + builtin->unix_handle = handle; + builtin->unix_entry = entry; + status = STATUS_SUCCESS; + } + else status = STATUS_IMAGE_ALREADY_LOADED; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); - if (!init_func) return STATUS_DLL_NOT_FOUND; - return init_func( module, reason, ptr_in, ptr_out ); + return status; }

1 0

Alexandre Julliard : ntdll: Add refcounting for .so builtin dlls.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 20c4ae45cecb2b08544880da5aeb7b9435d1ec65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c4ae45cecb2b08544880da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 16:11:51 2021 +0100 ntdll: Add refcounting for .so builtin dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 4 ++- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 58 +++++++++++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 1c95b84e965..f7bdb055871 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1456,7 +1456,9 @@ static void CDECL init_builtin_dll( void *module ) #endif if (!(handle = get_builtin_so_handle( module ))) return; - if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) return; + if (dlinfo( handle, RTLD_DI_LINKMAP, &map )) map = NULL; + release_builtin_module( module ); + if (!map) return; for (dyn = map->l_ld; dyn->d_tag; dyn++) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 5877a00bac8..1307364d5d3 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -202,6 +202,7 @@ extern void virtual_set_force_exec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; +extern NTSTATUS release_builtin_module( void *module ) DECLSPEC_HIDDEN; extern void *get_builtin_so_handle( void *module ) DECLSPEC_HIDDEN; extern NTSTATUS get_builtin_unix_info( void *module, const char **name, void **handle, void **entry ) DECLSPEC_HIDDEN; extern NTSTATUS set_builtin_unix_info( void *module, const char *name, void *handle, void *entry ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 4edc7d0261e..d00178d6261 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -85,14 +85,15 @@ static struct list reserved_areas = LIST_INIT(reserved_areas); struct builtin_module { - struct list entry; - dev_t dev; - ino_t ino; - void *handle; - void *module; - char *unix_name; - void *unix_handle; - void *unix_entry; + struct list entry; + unsigned int refcount; + dev_t dev; + ino_t ino; + void *handle; + void *module; + char *unix_name; + void *unix_handle; + void *unix_entry; }; static struct list builtin_modules = LIST_INIT( builtin_modules ); @@ -569,8 +570,9 @@ static void add_builtin_module( void *module, void *handle, const struct stat *s struct builtin_module *builtin; if (!(builtin = malloc( sizeof(*builtin) ))) return; - builtin->handle = handle; - builtin->module = module; + builtin->handle = handle; + builtin->module = module; + builtin->refcount = 1; builtin->unix_name = NULL; builtin->unix_handle = NULL; builtin->unix_entry = NULL; @@ -589,19 +591,23 @@ static void add_builtin_module( void *module, void *handle, const struct stat *s /*********************************************************************** - * remove_builtin_module + * release_builtin_module */ -static NTSTATUS remove_builtin_module( void *module ) +NTSTATUS release_builtin_module( void *module ) { struct builtin_module *builtin; LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - list_remove( &builtin->entry ); - if (builtin->handle) dlclose( builtin->handle ); - if (builtin->unix_handle) dlclose( builtin->unix_handle ); - free( builtin ); + if (!--builtin->refcount) + { + list_remove( &builtin->entry ); + if (builtin->handle) dlclose( builtin->handle ); + if (builtin->unix_handle) dlclose( builtin->unix_handle ); + free( builtin->unix_name ); + free( builtin ); + } return STATUS_SUCCESS; } return STATUS_INVALID_PARAMETER; @@ -635,6 +641,7 @@ void *get_builtin_so_handle( void *module ) { if (builtin->module != module) continue; ret = builtin->handle; + if (ret) builtin->refcount++; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -4374,6 +4381,23 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if ((view = find_view( addr, 0 )) && !is_view_valloc( view )) { + if (view->protect & VPROT_SYSTEM) + { + struct builtin_module *builtin; + + LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) + { + if (builtin->module != view->base) continue; + if (builtin->refcount > 1) + { + TRACE( "not freeing in-use builtin %p\n", view->base ); + builtin->refcount--; + server_leave_uninterrupted_section( &virtual_mutex, &sigset ); + return STATUS_SUCCESS; + } + } + } + SERVER_START_REQ( unmap_view ) { req->base = wine_server_client_ptr( view->base ); @@ -4382,7 +4406,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) SERVER_END_REQ; if (!status) { - if (view->protect & SEC_IMAGE) remove_builtin_module( view->base ); + if (view->protect & SEC_IMAGE) release_builtin_module( view->base ); delete_view( view ); } else FIXME( "failed to unmap %p %x\n", view->base, status );

1 0

Alexandre Julliard : ntdll: Use NtAreMappedFilesTheSame() to find duplicated module mappings.
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 0ea5772113684f5884b44cd7e76d45508ef3fbd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ea5772113684f5884b44cd7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 20:38:25 2021 +0100 ntdll: Use NtAreMappedFilesTheSame() to find duplicated module mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 092c47eac3b..c7e7c86e88f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1167,6 +1167,8 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name wm->ldr.Flags = LDR_DONT_RESOLVE_REFS | (builtin ? LDR_WINE_INTERNAL : 0); wm->ldr.TlsIndex = -1; wm->ldr.LoadCount = 1; + wm->ldr.CheckSum = nt->OptionalHeader.CheckSum; + wm->ldr.TimeDateStamp = nt->FileHeader.TimeDateStamp; if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, nt_name->Length - 3 * sizeof(WCHAR) ))) { @@ -2274,6 +2276,33 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, HANDL } +/****************************************************************************** + * find_existing_module + * + * Find an existing module that is the same mapping as the new module. + */ +static WINE_MODREF *find_existing_module( HMODULE module ) +{ + WINE_MODREF *wm; + LIST_ENTRY *mark, *entry; + LDR_DATA_TABLE_ENTRY *mod; + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + + if ((wm = get_modref( module ))) return wm; + + mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) + { + mod = CONTAINING_RECORD( entry, LDR_DATA_TABLE_ENTRY, InMemoryOrderLinks ); + if (mod->TimeDateStamp != nt->FileHeader.TimeDateStamp) continue; + if (mod->CheckSum != nt->OptionalHeader.CheckSum) continue; + if (NtAreMappedFilesTheSame( mod->DllBase, module ) != STATUS_SUCCESS) continue; + return CONTAINING_RECORD( mod, WINE_MODREF, ldr ); + } + return NULL; +} + + /****************************************************************************** * load_native_dll (internal) */ @@ -2351,12 +2380,13 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, UNICODE_STRING *nt_name, status = unix_funcs->load_builtin_dll( nt_name, &module, &image_info, prefer_native ); if (status) return status; - if ((*pwm = get_modref( module ))) /* already loaded */ + if ((*pwm = find_existing_module( module ))) /* already loaded */ { if ((*pwm)->ldr.LoadCount != -1) (*pwm)->ldr.LoadCount++; TRACE( "Found %s for %s at %p, count=%d\n", debugstr_us(&(*pwm)->ldr.FullDllName), debugstr_us(nt_name), (*pwm)->ldr.DllBase, (*pwm)->ldr.LoadCount); + if (module != (*pwm)->ldr.DllBase) NtUnmapViewOfSection( NtCurrentProcess(), module ); return STATUS_SUCCESS; }

1 0

Alexandre Julliard : ntdll: Return the mapping size in virtual_map_builtin_module().
by Alexandre Julliard 22 Mar '21

22 Mar '21

Module: wine Branch: master Commit: 5dcd3c1dd97de2f20a4ed886ffe3e72be2ab8da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dcd3c1dd97de2f20a4ed886… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 22 09:56:48 2021 +0100 ntdll: Return the mapping size in virtual_map_builtin_module(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 42 ++++++++++++++++++++++++++++-------------- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unix/virtual.c | 6 +++--- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f7bdb055871..25be205c696 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1234,7 +1234,7 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) * Open a file for a new dll. Helper for open_builtin_file. */ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) + SIZE_T *size_ptr, SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) { LARGE_INTEGER size; NTSTATUS status; @@ -1281,7 +1281,7 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, void * NtClose( mapping ); return STATUS_IMAGE_ALREADY_LOADED; } - status = virtual_map_builtin_module( mapping, module ); + status = virtual_map_builtin_module( mapping, module, size_ptr ); NtClose( mapping ); return status; } @@ -1290,14 +1290,14 @@ static NTSTATUS open_dll_file( const char *name, OBJECT_ATTRIBUTES *attr, void * /*********************************************************************** * open_builtin_file */ -static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **module, +static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **module, SIZE_T *size, SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) { NTSTATUS status; int fd; *module = NULL; - status = open_dll_file( name, attr, module, image_info, prefer_native ); + status = open_dll_file( name, attr, module, size, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) return status; /* try .so file */ @@ -1325,10 +1325,10 @@ static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, void **m /*********************************************************************** - * load_builtin_dll + * find_builtin_dll */ -static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) +static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T *size_ptr, + SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) { unsigned int i, pos, namepos, namelen, maxlen = 0; unsigned int len = nt_name->Length / sizeof(WCHAR); @@ -1369,7 +1369,7 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/dlls", sizeof("/dlls") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; /* now as a program */ @@ -1380,7 +1380,7 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, "/programs", sizeof("/programs") - 1 ); ptr = prepend( ptr, build_dir, strlen(build_dir) ); - status = open_builtin_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1388,17 +1388,15 @@ static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, { file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); - status = open_builtin_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; } if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; WARN( "cannot find builtin library for %s\n", debugstr_us(nt_name) ); - done: - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - if (!status && ext) + if (status >= 0 && ext) { strcpy( ext, ".so" ); set_builtin_unix_info( *module, ptr, NULL, NULL ); @@ -1408,6 +1406,21 @@ done: } +/*********************************************************************** + * load_builtin_dll + */ +static NTSTATUS CDECL load_builtin_dll( UNICODE_STRING *nt_name, void **module, + SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) +{ + SIZE_T size; + NTSTATUS status; + + status = find_builtin_dll( nt_name, module, &size, image_info, prefer_native ); + if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; + return status; +} + + #ifdef __FreeBSD__ /* The PT_LOAD segments are sorted in increasing order, and the first * starts at the beginning of the ELF file. By parsing the file, we can @@ -1500,12 +1513,13 @@ static void load_ntdll(void) OBJECT_ATTRIBUTES attr; UNICODE_STRING str; void *module; + SIZE_T size = 0; char *name = build_path( dll_dir, "ntdll.dll.so" ); init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); name[strlen(name) - 3] = 0; /* remove .so */ - status = open_builtin_file( name, &attr, &module, &info, FALSE ); + status = open_builtin_file( name, &attr, &module, &size, &info, FALSE ); if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); else if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 1307364d5d3..e527f5f799b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -178,7 +178,7 @@ extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_name, pe_image_info_t *info, void *so_handle ) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d00178d6261..a38b8478371 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2732,14 +2732,13 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_map_builtin_module */ -NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module ) +NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module, SIZE_T *size ) { mem_size_t full_size; unsigned int sec_flags; HANDLE shared_file; pe_image_info_t *image_info = NULL; ACCESS_MASK access = SECTION_MAP_READ | SECTION_MAP_EXECUTE; - SIZE_T size = 0; NTSTATUS status; WCHAR *filename; @@ -2749,9 +2748,10 @@ NTSTATUS virtual_map_builtin_module( HANDLE mapping, void **module ) if (!image_info) return STATUS_INVALID_PARAMETER; *module = NULL; + *size = 0; filename = (WCHAR *)(image_info + 1); status = virtual_map_image( mapping, SECTION_MAP_READ | SECTION_MAP_EXECUTE, - module, &size, 0, shared_file, 0, image_info, filename, TRUE ); + module, size, 0, shared_file, 0, image_info, filename, TRUE ); if (shared_file) NtClose( shared_file ); free( image_info ); return status;

1 0