June 2024 - Wine-commits - list.winehq.org

Rémi Bernon : winex11: Move layered window mapping to X11DRV_UpdateLayeredWindow.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: eca7068ab3f74a0b3ef4d2599c0239932fc952bf URL: https://gitlab.winehq.org/wine/wine/-/commit/eca7068ab3f74a0b3ef4d2599c0239… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 11 11:42:18 2024 +0200 winex11: Move layered window mapping to X11DRV_UpdateLayeredWindow. --- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 20 +++++++++++++++++--- dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ec77a232e8e..28729d1c14b 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -421,6 +421,7 @@ static const struct user_driver_funcs x11drv_funcs = .pClipboardWindowProc = X11DRV_ClipboardWindowProc, .pUpdateClipboard = X11DRV_UpdateClipboard, .pCreateLayeredWindow = X11DRV_CreateLayeredWindow, + .pUpdateLayeredWindow = X11DRV_UpdateLayeredWindow, .pWindowMessage = X11DRV_WindowMessage, .pWindowPosChanging = X11DRV_WindowPosChanging, .pCreateWindowSurface = X11DRV_CreateWindowSurface, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1d6bf30206d..74a9a4f6d68 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2991,7 +2991,6 @@ BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF co { struct window_surface *surface; struct x11drv_win_data *data; - BOOL mapped; RECT rect; if (!(data = get_win_data( hwnd ))) return FALSE; @@ -3013,6 +3012,22 @@ BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF co else set_surface_color_key( surface, color_key ); if ((*window_surface = surface)) window_surface_add_ref( surface ); + release_win_data( data ); + + return TRUE; +} + + +/*********************************************************************** + * UpdateLayeredWindow (X11DRV.@) + */ +void X11DRV_UpdateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, + BYTE alpha, UINT flags ) +{ + struct x11drv_win_data *data; + BOOL mapped; + + if (!(data = get_win_data( hwnd ))) return; mapped = data->mapped; release_win_data( data ); @@ -3024,10 +3039,9 @@ BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF co if ((style & WS_VISIBLE) && ((style & WS_MINIMIZE) || is_window_rect_mapped( window_rect ))) map_window( hwnd, style ); } - - return TRUE; } + /* Add a window to taskbar */ static void taskbar_add_tab( HWND hwnd ) { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c16423b3cf0..49fb17fc7cd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -242,6 +242,8 @@ extern LRESULT X11DRV_ClipboardWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARA extern void X11DRV_UpdateClipboard(void); extern BOOL X11DRV_CreateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, struct window_surface **surface ); +extern void X11DRV_UpdateLayeredWindow( HWND hwnd, const RECT *window_rect, COLORREF color_key, + BYTE alpha, UINT flags ); extern LRESULT X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); extern BOOL X11DRV_WindowPosChanging( HWND hwnd, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, RECT *visible_rect ); extern BOOL X11DRV_CreateWindowSurface( HWND hwnd, UINT swp_flags, const RECT *visible_rect, struct window_surface **surface );

1 0

Rémi Bernon : winemac: Move layered window mapping to macdrv_UpdateLayeredWindow.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: c7287cc73499a53077a510bcdae9885547c8d031 URL: https://gitlab.winehq.org/wine/wine/-/commit/c7287cc73499a53077a510bcdae988… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 11 11:44:12 2024 +0200 winemac: Move layered window mapping to macdrv_UpdateLayeredWindow. --- dlls/winemac.drv/window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index a3c13659360..012189249a4 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1925,10 +1925,6 @@ BOOL macdrv_CreateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if ((*window_surface = surface)) window_surface_add_ref(surface); - /* Since layered attributes are now set, can now show the window */ - if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) - show_window(data); - release_win_data(data); return TRUE; @@ -1944,6 +1940,10 @@ void macdrv_UpdateLayeredWindow(HWND hwnd, const RECT *window_rect, COLORREF col if ((data = get_win_data(hwnd))) { + /* Since layered attributes are now set, can now show the window */ + if (data->cocoa_window && !data->on_screen && NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_VISIBLE) + show_window(data); + /* The ULW flags are a superset of the LWA flags. */ sync_window_opacity(data, color_key, 255, TRUE, flags); release_win_data(data);

1 0

Rémi Bernon : win32u: Move WM_WINE_DESKTOP_RESIZED into driver internal messages range.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 6eac284201b4f8b2ecf78ad5623bf0fcebcd57bb URL: https://gitlab.winehq.org/wine/wine/-/commit/6eac284201b4f8b2ecf78ad5623bf0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 13 10:35:15 2024 +0200 win32u: Move WM_WINE_DESKTOP_RESIZED into driver internal messages range. It is otherwise ignored and not passed to the drivers WindowMessage callback. Fixes: b89c9c60d50cf21650331d1528ff965c319a1217 --- include/ntuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ntuser.h b/include/ntuser.h index 10afabfdc60..bd11567290f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -504,10 +504,10 @@ enum wine_internal_message WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, WM_WINE_UPDATEWINDOWSTATE, - WM_WINE_DESKTOP_RESIZED, WM_WINE_FIRST_DRIVER_MSG = 0x80001000, /* range of messages reserved for the USER driver */ WM_WINE_CLIPCURSOR = 0x80001ff0, /* internal driver notification messages */ WM_WINE_SETCURSOR, + WM_WINE_DESKTOP_RESIZED, WM_WINE_LAST_DRIVER_MSG = 0x80001fff };

1 0

Eric Pouech : quartz/tests: Fix typo in tests.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 5fb9b19218dacd70366d15cf82f13fec3ec8a3e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fb9b19218dacd70366d15cf82f13f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 11:49:04 2024 +0200 quartz/tests: Fix typo in tests. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/quartz/tests/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index df1db0cfed6..c3dcfb803c2 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -46,7 +46,7 @@ static WCHAR *create_file(const WCHAR *name, const char *data, DWORD size) ok(file != INVALID_HANDLE_VALUE, "Failed to create file %s, error %lu.\n", wine_dbgstr_w(pathW), GetLastError()); WriteFile(file, data, size, &written, NULL); - ok(written = size, "Failed to write file data, error %lu.\n", GetLastError()); + ok(written == size, "Failed to write file data, error %lu.\n", GetLastError()); CloseHandle(file); return pathW;

1 0

Zhiyi Zhang : ws2_32/tests: Test fromlen for recvfrom().
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 2c01c0136bb148acca8be8cbc393bc776f7b1dc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c01c0136bb148acca8be8cbc393bc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 13 12:11:36 2024 +0800 ws2_32/tests: Test fromlen for recvfrom(). Test that specifying a too small or too large fromlen for recvfrom() shouldn't write unnecessary data. --- dlls/ws2_32/tests/sock.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6954b3e077a..57f1e6f9f97 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3185,7 +3185,7 @@ static void test_UDP(void) /* peer 0 receives data from all other peers */ static const TIMEVAL timeout_zero = {0}; struct sock_info peer[NUM_UDP_PEERS]; - char buf[16]; + char buf[16], sockaddr_buf[1024]; int ss, i, n_recv, n_sent, ret; struct sockaddr_in addr; int sock; @@ -3215,11 +3215,40 @@ static void test_UDP(void) ok ( peer[i].addr.sin_port != htons ( 0 ), "UDP: bind() did not associate port\n" ); } + /* Test that specifying a too small fromlen for recvfrom() shouldn't write unnecessary data */ + n_sent = sendto ( peer[1].s, buf, sizeof(buf), 0, (struct sockaddr *)&peer[0].addr, sizeof(peer[0].addr) ); + ok ( n_sent == sizeof(buf), "UDP: sendto() sent wrong amount of data or socket error: %d\n", n_sent ); + + sockaddr_buf[0] = 'A'; + ss = 1; + n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); + todo_wine + ok ( n_recv == SOCKET_ERROR, "UDP: recvfrom() succeeded\n" ); + todo_wine + ok ( sockaddr_buf[0] == 'A', "UDP: marker got overwritten\n" ); + if ( n_recv == SOCKET_ERROR ) + { + ss = sizeof ( peer[0].addr ); + n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); + ok ( n_recv == sizeof(buf), "UDP: recvfrom() failed\n" ); + } + + /* Test that specifying a large fromlen for recvfrom() shouldn't write unnecessary data besides the socket address */ + n_sent = sendto ( peer[1].s, buf, sizeof(buf), 0, (struct sockaddr *)&peer[0].addr, sizeof(peer[0].addr) ); + ok ( n_sent == sizeof(buf), "UDP: sendto() sent wrong amount of data or socket error: %d\n", n_sent ); + + sockaddr_buf[1023] = 'B'; + ss = sizeof(sockaddr_buf); + n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); + ok ( n_recv == sizeof(buf), "UDP: recvfrom() received wrong amount of data or socket error: %d\n", n_recv ); + todo_wine + ok ( sockaddr_buf[1023] == 'B', "UDP: marker got overwritten\n" ); + /* test getsockname() */ ok ( peer[0].addr.sin_port == htons ( SERVERPORT ), "UDP: getsockname returned incorrect peer port\n" ); for ( i = 1; i < NUM_UDP_PEERS; i++ ) { - /* send client's ip */ + /* send client's port */ memcpy( buf, &peer[i].addr.sin_port, sizeof(peer[i].addr.sin_port) ); n_sent = sendto ( peer[i].s, buf, sizeof(buf), 0, (struct sockaddr*) &peer[0].addr, sizeof(peer[0].addr) ); ok ( n_sent == sizeof(buf), "UDP: sendto() sent wrong amount of data or socket error: %d\n", n_sent );

1 0

Zhiyi Zhang : ntdll: Don't zero out socket address in sockaddr_from_unix().
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: d5bfa879088e7dfd3f79cdf724ce8f2880f872cb URL: https://gitlab.winehq.org/wine/wine/-/commit/d5bfa879088e7dfd3f79cdf724ce8f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Jun 13 12:33:52 2024 +0800 ntdll: Don't zero out socket address in sockaddr_from_unix(). tallygatewayserver.exe specifies a from sockaddr pointing to a heap buffer smaller than 128 bytes yet it passes 128 as the fromlen to recvfrom(). So the memset(wsaddr, 0, wsaddrlen) call in sockaddr_from_unix() ends up trashing other data in the heap, causing the application to crash. Although this is an application bug, tests on Windows also showed that the socket address buffer should be written only with the necessary socket address data, thus preventing the crash. --- dlls/ntdll/unix/socket.c | 2 -- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 65f30759db3..ea2f5d3a670 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -298,8 +298,6 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl static int sockaddr_from_unix( const union unix_sockaddr *uaddr, struct WS_sockaddr *wsaddr, socklen_t wsaddrlen ) { - memset( wsaddr, 0, wsaddrlen ); - switch (uaddr->addr.sa_family) { case AF_INET: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 57f1e6f9f97..e8c618cc0af 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3224,7 +3224,6 @@ static void test_UDP(void) n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); todo_wine ok ( n_recv == SOCKET_ERROR, "UDP: recvfrom() succeeded\n" ); - todo_wine ok ( sockaddr_buf[0] == 'A', "UDP: marker got overwritten\n" ); if ( n_recv == SOCKET_ERROR ) { @@ -3241,7 +3240,6 @@ static void test_UDP(void) ss = sizeof(sockaddr_buf); n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0, (struct sockaddr *)sockaddr_buf, &ss ); ok ( n_recv == sizeof(buf), "UDP: recvfrom() received wrong amount of data or socket error: %d\n", n_recv ); - todo_wine ok ( sockaddr_buf[1023] == 'B', "UDP: marker got overwritten\n" ); /* test getsockname() */

1 0

Lucas Chollet : dnsapi: Add a stub for DnsServiceBrowse.
by Alexandre Julliard 13 Jun '24

13 Jun '24

Module: wine Branch: master Commit: 0440cb4b02991f2c827304c538b6420127c68da5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0440cb4b02991f2c827304c538b642… Author: Lucas Chollet <lucas.chollet(a)free.fr> Date: Wed Jun 12 00:45:21 2024 -0400 dnsapi: Add a stub for DnsServiceBrowse. This is needed by Moku (software for scientific instrument). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56828 --- dlls/dnsapi/dnsapi.spec | 1 + dlls/dnsapi/main.c | 10 ++++++++++ include/windns.h | 22 ++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/dnsapi/dnsapi.spec b/dlls/dnsapi/dnsapi.spec index 0d50c56ec68..a8ffa40a0ae 100644 --- a/dlls/dnsapi/dnsapi.spec +++ b/dlls/dnsapi/dnsapi.spec @@ -103,6 +103,7 @@ @ stub DnsReplaceRecordSet_UTF8 @ stdcall DnsReplaceRecordSetW(ptr long ptr ptr ptr) @ stub DnsReplaceRecordSet_W +@ stdcall DnsServiceBrowse(ptr ptr) @ stub DnsServiceNotificationDeregister_A @ stub DnsServiceNotificationDeregister_UTF8 @ stub DnsServiceNotificationDeregister_W diff --git a/dlls/dnsapi/main.c b/dlls/dnsapi/main.c index 6324d46e173..9b057a09a05 100644 --- a/dlls/dnsapi/main.c +++ b/dlls/dnsapi/main.c @@ -233,3 +233,13 @@ DNS_STATUS WINAPI DnsReplaceRecordSetW( DNS_RECORDW *set, DWORD options, HANDLE FIXME( "(%p, %#lx, %p, %p, %p) stub\n", set, options, context, servers, reserved ); return ERROR_SUCCESS; } + +/****************************************************************************** + * DnsServiceBrowse [DNSAPI.@] + * + */ +DNS_STATUS WINAPI DnsServiceBrowse( PDNS_SERVICE_BROWSE_REQUEST request, PDNS_SERVICE_CANCEL cancel) +{ + FIXME( "(%p, %p) stub\n", request, cancel ); + return ERROR_SUCCESS; +} diff --git a/include/windns.h b/include/windns.h index b0b14df1b4f..05d3359b1df 100644 --- a/include/windns.h +++ b/include/windns.h @@ -760,6 +760,27 @@ typedef struct _DNS_CACHE_ENTRY ULONG Flags; } DNS_CACHE_ENTRY, *PDNS_CACHE_ENTRY; +typedef void WINAPI DNS_SERVICE_BROWSE_CALLBACK(DWORD, void *, PDNS_RECORD); +typedef DNS_SERVICE_BROWSE_CALLBACK *PDNS_SERVICE_BROWSE_CALLBACK; + +typedef struct _DNS_SERVICE_BROWSE_REQUEST +{ + ULONG Version; + ULONG InterfaceIndex; + const WCHAR *QueryName; + union + { + PDNS_SERVICE_BROWSE_CALLBACK pBrowseCallback; + DNS_QUERY_COMPLETION_ROUTINE *pBrowseCallbackV2; + }; + void *pQueryContext; +} DNS_SERVICE_BROWSE_REQUEST, *PDNS_SERVICE_BROWSE_REQUEST; + +typedef struct _DNS_SERVICE_CANCEL +{ + void *reserved; +} DNS_SERVICE_CANCEL, *PDNS_SERVICE_CANCEL; + DNS_STATUS WINAPI DnsAcquireContextHandle_A(DWORD,PVOID,PHANDLE); DNS_STATUS WINAPI DnsAcquireContextHandle_W(DWORD,PVOID,PHANDLE); #define DnsAcquireContextHandle WINELIB_NAME_AW(DnsAcquireContextHandle_) @@ -791,6 +812,7 @@ DNS_STATUS WINAPI DnsReplaceRecordSetA(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsReplaceRecordSetW(PDNS_RECORDW,DWORD,HANDLE,PVOID,PVOID); DNS_STATUS WINAPI DnsReplaceRecordSetUTF8(PDNS_RECORDA,DWORD,HANDLE,PVOID,PVOID); #define DnsReplaceRecordSet WINELIB_NAME_AW(DnsReplaceRecordSet) +DNS_STATUS WINAPI DnsServiceBrowse(PDNS_SERVICE_BROWSE_REQUEST, PDNS_SERVICE_CANCEL); DNS_STATUS WINAPI DnsValidateName_A(PCSTR,DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_W(PCWSTR, DNS_NAME_FORMAT); DNS_STATUS WINAPI DnsValidateName_UTF8(PCSTR,DNS_NAME_FORMAT);

1 0

Shengdun Wang : ucrtbase/tests: Add FILE structure tests.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: f19676b3210a00affd8969eec2e538e526267759 URL: https://gitlab.winehq.org/wine/wine/-/commit/f19676b3210a00affd8969eec2e538… Author: Shengdun Wang <uwgghhbcad(a)gmail.com> Date: Thu Jun 6 13:54:38 2024 +0200 ucrtbase/tests: Add FILE structure tests. --- dlls/ucrtbase/tests/file.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c index 76233be3fa7..9dd5eba4fcc 100644 --- a/dlls/ucrtbase/tests/file.c +++ b/dlls/ucrtbase/tests/file.c @@ -81,7 +81,60 @@ static void test_std_stream_buffering(void) ok(DeleteFileA("std_stream_test.tmp"), "DeleteFile failed\n"); } +int CDECL _get_stream_buffer_pointers(FILE*,char***,char***,int**); +static void test_iobuf_layout(void) +{ + union + { + FILE *f; + struct + { + char* _ptr; + char* _base; + int _cnt; + int _flag; + int _file; + int _charbuf; + int _bufsiz; + char* _tmpfname; + CRITICAL_SECTION _crit; + } *iobuf; + } fp; + char *tempf, *ptr, **file_ptr, **file_base; + int cnt, r, *file_cnt; + + tempf = _tempnam(".","wne"); + fp.f = fopen(tempf, "wb"); + ok(fp.f != NULL, "fopen failed with error: %d\n", errno); + + ok(!(fp.iobuf->_flag & 0x40), "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); + r = fprintf(fp.f, "%s", "init"); + ok(r == 4, "fprintf returned %d\n", r); + todo_wine ok(fp.iobuf->_flag & 0x40, "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); + ok(fp.iobuf->_cnt + 4 == fp.iobuf->_bufsiz, "_cnt = %d, _bufsiz = %d\n", + fp.iobuf->_cnt, fp.iobuf->_bufsiz); + + ptr = fp.iobuf->_ptr; + cnt = fp.iobuf->_cnt; + r = fprintf(fp.f, "%s", "hello"); + ok(r == 5, "fprintf returned %d\n", r); + ok(ptr + 5 == fp.iobuf->_ptr, "fp.iobuf->_ptr = %p, expected %p\n", fp.iobuf->_ptr, ptr + 5); + ok(cnt - 5 == fp.iobuf->_cnt, "fp.iobuf->_cnt = %d, expected %d\n", fp.iobuf->_cnt, cnt - 5); + ok(fp.iobuf->_ptr + fp.iobuf->_cnt == fp.iobuf->_base + fp.iobuf->_bufsiz, + "_ptr = %p, _cnt = %d, _base = %p, _bufsiz = %d\n", + fp.iobuf->_ptr, fp.iobuf->_cnt, fp.iobuf->_base, fp.iobuf->_bufsiz); + + _get_stream_buffer_pointers(fp.f, &file_base, &file_ptr, &file_cnt); + ok(file_base == &fp.iobuf->_base, "_base = %p, expected %p\n", file_base, &fp.iobuf->_base); + ok(file_ptr == &fp.iobuf->_ptr, "_ptr = %p, expected %p\n", file_ptr, &fp.iobuf->_ptr); + ok(file_cnt == &fp.iobuf->_cnt, "_cnt = %p, expected %p\n", file_cnt, &fp.iobuf->_cnt); + + fclose(fp.f); + unlink(tempf); +} + START_TEST(file) { test_std_stream_buffering(); + test_iobuf_layout(); }

1 0

Piotr Caban : msvcrt: Don't use custom standard streams definition.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 6033839816018c0f91cb2cbf67a66481ddef4d8b URL: https://gitlab.winehq.org/wine/wine/-/commit/6033839816018c0f91cb2cbf67a664… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 11 20:31:33 2024 +0200 msvcrt: Don't use custom standard streams definition. --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 56 ++++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 9 ++++----- dlls/msvcrt/scanf.c | 16 +++++++-------- dlls/msvcrt/scanf.h | 4 ++-- 5 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index cf1e7caeb06..c8db6c405da 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -302,7 +302,7 @@ void DECLSPEC_NORETURN CDECL _wassert(const wchar_t* str, const wchar_t* file, u DoMessageBoxW(L"Assertion failed!", text); } else - fwprintf(MSVCRT_stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line); + fwprintf(stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line); raise(SIGABRT); _exit(3); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 24cca6fb63e..2075d0b4288 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3915,7 +3915,7 @@ int CDECL _fgetc_nolock(FILE* file) */ int CDECL _fgetchar(void) { - return fgetc(MSVCRT_stdin); + return fgetc(stdin); } /********************************************************************* @@ -4047,7 +4047,7 @@ wint_t CDECL getwc(FILE* file) */ wint_t CDECL _fgetwchar(void) { - return fgetwc(MSVCRT_stdin); + return fgetwc(stdin); } /********************************************************************* @@ -4266,7 +4266,7 @@ wint_t CDECL _fputwc_nolock(wint_t wc, FILE* file) */ wint_t CDECL _fputwchar(wint_t wc) { - return fputwc(wc, MSVCRT_stdout); + return fputwc(wc, stdout); } /********************************************************************* @@ -4424,7 +4424,7 @@ int CDECL _fputc_nolock(int c, FILE* file) */ int CDECL _fputchar(int c) { - return fputc(c, MSVCRT_stdout); + return fputc(c, stdout); } /********************************************************************* @@ -4839,7 +4839,7 @@ int CDECL fputws(const wchar_t *s, FILE* file) */ int CDECL getchar(void) { - return fgetc(MSVCRT_stdin); + return fgetc(stdin); } /********************************************************************* @@ -4861,10 +4861,10 @@ char * CDECL gets_s(char *buf, size_t len) if (!MSVCRT_CHECK_PMT(buf != NULL)) return NULL; if (!MSVCRT_CHECK_PMT(len != 0)) return NULL; - _lock_file(MSVCRT_stdin); - for(cc = _fgetc_nolock(MSVCRT_stdin); + _lock_file(stdin); + for(cc = _fgetc_nolock(stdin); len != 0 && cc != EOF && cc != '\n'; - cc = _fgetc_nolock(MSVCRT_stdin)) + cc = _fgetc_nolock(stdin)) { if (cc != '\r') { @@ -4872,7 +4872,7 @@ char * CDECL gets_s(char *buf, size_t len) len--; } } - _unlock_file(MSVCRT_stdin); + _unlock_file(stdin); if (!len) { @@ -4908,14 +4908,14 @@ wchar_t* CDECL _getws(wchar_t* buf) wint_t cc; wchar_t* ws = buf; - _lock_file(MSVCRT_stdin); - for (cc = _fgetwc_nolock(MSVCRT_stdin); cc != WEOF && cc != '\n'; - cc = _fgetwc_nolock(MSVCRT_stdin)) + _lock_file(stdin); + for (cc = _fgetwc_nolock(stdin); cc != WEOF && cc != '\n'; + cc = _fgetwc_nolock(stdin)) { if (cc != '\r') *buf++ = (wchar_t)cc; } - _unlock_file(MSVCRT_stdin); + _unlock_file(stdin); if ((cc == WEOF) && (ws == buf)) { @@ -4941,7 +4941,7 @@ int CDECL putc(int c, FILE* file) */ int CDECL putchar(int c) { - return fputc(c, MSVCRT_stdout); + return fputc(c, stdout); } /********************************************************************* @@ -4952,14 +4952,14 @@ int CDECL puts(const char *s) size_t len = strlen(s); int ret; - _lock_file(MSVCRT_stdout); - if(_fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { - _unlock_file(MSVCRT_stdout); + _lock_file(stdout); + if(_fwrite_nolock(s, sizeof(*s), len, stdout) != len) { + _unlock_file(stdout); return EOF; } - ret = _fwrite_nolock("\n",1,1,MSVCRT_stdout) == 1 ? 0 : EOF; - _unlock_file(MSVCRT_stdout); + ret = _fwrite_nolock("\n",1,1,stdout) == 1 ? 0 : EOF; + _unlock_file(stdout); return ret; } @@ -4970,11 +4970,11 @@ int CDECL _putws(const wchar_t *s) { int ret; - _lock_file(MSVCRT_stdout); - ret = fputws(s, MSVCRT_stdout); + _lock_file(stdout); + ret = fputws(s, stdout); if(ret >= 0) - ret = _fputwc_nolock('\n', MSVCRT_stdout); - _unlock_file(MSVCRT_stdout); + ret = _fputwc_nolock('\n', stdout); + _unlock_file(stdout); return ret >= 0 ? 0 : WEOF; } @@ -5546,7 +5546,7 @@ int CDECL _vfwprintf_p(FILE* file, const wchar_t *format, va_list valist) */ int CDECL vprintf(const char *format, va_list valist) { - return vfprintf(MSVCRT_stdout,format,valist); + return vfprintf(stdout,format,valist); } /********************************************************************* @@ -5554,7 +5554,7 @@ int CDECL vprintf(const char *format, va_list valist) */ int CDECL vprintf_s(const char *format, va_list valist) { - return vfprintf_s(MSVCRT_stdout,format,valist); + return vfprintf_s(stdout,format,valist); } /********************************************************************* @@ -5562,7 +5562,7 @@ int CDECL vprintf_s(const char *format, va_list valist) */ int CDECL vwprintf(const wchar_t *format, va_list valist) { - return vfwprintf(MSVCRT_stdout,format,valist); + return vfwprintf(stdout,format,valist); } /********************************************************************* @@ -5570,7 +5570,7 @@ int CDECL vwprintf(const wchar_t *format, va_list valist) */ int CDECL vwprintf_s(const wchar_t *format, va_list valist) { - return vfwprintf_s(MSVCRT_stdout,format,valist); + return vfwprintf_s(stdout,format,valist); } /********************************************************************* @@ -5738,7 +5738,7 @@ int WINAPIV printf(const char *format, ...) va_list valist; int res; va_start(valist, format); - res = vfprintf(MSVCRT_stdout, format, valist); + res = vfprintf(stdout, format, valist); va_end(valist); return res; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index d35412ee6b8..35e6e8233a1 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -301,14 +301,13 @@ extern BOOL msvcrt_create_io_inherit_block(WORD*, BYTE**); #define _RT_CRNL 252 #define _RT_BANNER 255 -extern FILE MSVCRT__iob[]; - #define MSVCRT_NO_CONSOLE_FD (-2) #define MSVCRT_NO_CONSOLE ((HANDLE)MSVCRT_NO_CONSOLE_FD) -#define MSVCRT_stdin (MSVCRT__iob+STDIN_FILENO) -#define MSVCRT_stdout (MSVCRT__iob+STDOUT_FILENO) -#define MSVCRT_stderr (MSVCRT__iob+STDERR_FILENO) +#if _MSVCR_VER < 140 +extern FILE MSVCRT__iob[]; +#define __acrt_iob_func(idx) (MSVCRT__iob+(idx)) +#endif /* internal file._flag flags */ #define MSVCRT__USERBUF 0x0100 diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index c8bbe15f373..c77649797ed 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -211,7 +211,7 @@ int WINAPIV scanf(const char *format, ...) int res; va_start(valist, format); - res = vfscanf_l(MSVCRT_stdin, format, NULL, valist); + res = vfscanf_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -225,7 +225,7 @@ int WINAPIV _scanf_l(const char *format, _locale_t locale, ...) int res; va_start(valist, locale); - res = vfscanf_l(MSVCRT_stdin, format, locale, valist); + res = vfscanf_l(stdin, format, locale, valist); va_end(valist); return res; } @@ -239,7 +239,7 @@ int WINAPIV scanf_s(const char *format, ...) int res; va_start(valist, format); - res = vfscanf_s_l(MSVCRT_stdin, format, NULL, valist); + res = vfscanf_s_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -253,7 +253,7 @@ int WINAPIV _scanf_s_l(const char *format, _locale_t locale, ...) int res; va_start(valist, locale); - res = vfscanf_s_l(MSVCRT_stdin, format, locale, valist); + res = vfscanf_s_l(stdin, format, locale, valist); va_end(valist); return res; } @@ -325,7 +325,7 @@ int WINAPIV wscanf(const wchar_t *format, ...) int res; va_start(valist, format); - res = vfwscanf_l(MSVCRT_stdin, format, NULL, valist); + res = vfwscanf_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -340,7 +340,7 @@ int WINAPIV _wscanf_l(const wchar_t *format, int res; va_start(valist, locale); - res = vfwscanf_l(MSVCRT_stdin, format, locale, valist); + res = vfwscanf_l(stdin, format, locale, valist); va_end(valist); return res; } @@ -354,7 +354,7 @@ int WINAPIV wscanf_s(const wchar_t *format, ...) int res; va_start(valist, format); - res = vfwscanf_s_l(MSVCRT_stdin, format, NULL, valist); + res = vfwscanf_s_l(stdin, format, NULL, valist); va_end(valist); return res; } @@ -369,7 +369,7 @@ int WINAPIV _wscanf_s_l(const wchar_t *format, int res; va_start(valist, locale); - res = vfwscanf_s_l(MSVCRT_stdin, format, locale, valist); + res = vfwscanf_s_l(stdin, format, locale, valist); va_end(valist); return res; } diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 97ecc578760..1d7a92a9c1c 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -48,8 +48,8 @@ #define _STRTOD_NAME_(func) console_ ## func #define _GETC_(file) (consumed++, _getch()) #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0) -#define _LOCK_FILE_(file) _lock_file(MSVCRT_stdin) -#define _UNLOCK_FILE_(file) _unlock_file(MSVCRT_stdin) +#define _LOCK_FILE_(file) _lock_file(stdin) +#define _UNLOCK_FILE_(file) _unlock_file(stdin) #ifdef WIDE_SCANF #ifdef SECURE #define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale, va_list ap)

1 0

Shengdun Wang : ucrtbase: Always use CRITICAL_SECTION for FILE locking.
by Alexandre Julliard 12 Jun '24

12 Jun '24

Module: wine Branch: master Commit: 90e59859ce9807b0dca7e5ac823bec03a82e5265 URL: https://gitlab.winehq.org/wine/wine/-/commit/90e59859ce9807b0dca7e5ac823bec… Author: Shengdun Wang <uwgghhbcad(a)gmail.com> Date: Wed Jun 12 12:25:43 2024 +0200 ucrtbase: Always use CRITICAL_SECTION for FILE locking. --- dlls/msvcrt/file.c | 78 +++++++++++++++++++++++++++++++++++----------- dlls/ucrtbase/tests/file.c | 3 ++ 2 files changed, 62 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2075d0b4288..0bf8510c5c9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -246,7 +246,34 @@ typedef struct { CRITICAL_SECTION crit; } file_crit; +#if _MSVCR_VER >= 140 +file_crit MSVCRT__iob[_IOB_ENTRIES] = { 0 }; + +static FILE* iob_get_file(int i) +{ + return &MSVCRT__iob[i].file; +} + +static CRITICAL_SECTION* file_get_cs(FILE *f) +{ + return &((file_crit*)f)->crit; +} +#else FILE MSVCRT__iob[_IOB_ENTRIES] = { { 0 } }; + +static FILE* iob_get_file(int i) +{ + return &MSVCRT__iob[i]; +} + +static CRITICAL_SECTION* file_get_cs(FILE *f) +{ + if (f < iob_get_file(0) || f >= iob_get_file(_IOB_ENTRIES)) + return &((file_crit*)f)->crit; + return NULL; +} +#endif + static file_crit* MSVCRT_fstream[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE]; static int MSVCRT_max_streams = 512, MSVCRT_stream_idx; @@ -502,7 +529,7 @@ static inline FILE* msvcrt_get_file(int i) return NULL; if(i < _IOB_ENTRIES) - return &MSVCRT__iob[i]; + return iob_get_file(i); ret = MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE]; if(!ret) { @@ -604,10 +631,11 @@ static FILE* msvcrt_alloc_fp(void) { if (i == MSVCRT_stream_idx) { - if (file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + CRITICAL_SECTION *cs = file_get_cs(file); + if (cs) { - InitializeCriticalSectionEx(&((file_crit*)file)->crit, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); - ((file_crit*)file)->crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + InitializeCriticalSectionEx(cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); } MSVCRT_stream_idx++; } @@ -784,14 +812,22 @@ void msvcrt_init_io(void) get_ioinfo_nolock(STDOUT_FILENO)->handle, get_ioinfo_nolock(STDERR_FILENO)->handle); - memset(MSVCRT__iob,0,3*sizeof(FILE)); for (i = 0; i < 3; i++) { + FILE *f = iob_get_file(i); + CRITICAL_SECTION *cs = file_get_cs(f); + /* FILE structs for stdin/out/err are static and never deleted */ - MSVCRT__iob[i]._file = get_ioinfo_nolock(i)->handle == MSVCRT_NO_CONSOLE ? + f->_file = get_ioinfo_nolock(i)->handle == MSVCRT_NO_CONSOLE ? MSVCRT_NO_CONSOLE_FD : i; - MSVCRT__iob[i]._tmpfname = NULL; - MSVCRT__iob[i]._flag = (i == 0) ? _IOREAD : _IOWRT; + f->_tmpfname = NULL; + f->_flag = (i == 0) ? _IOREAD : _IOWRT; + + if (cs) + { + InitializeCriticalSectionEx(cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": file_crit.crit"); + } } MSVCRT_stream_idx = 3; } @@ -936,7 +972,7 @@ static int msvcrt_int_to_base32_w(int num, wchar_t *str) #undef __iob_func FILE * CDECL __iob_func(void) { - return &MSVCRT__iob[0]; + return iob_get_file(0); } #if _MSVCR_VER >= 140 @@ -945,7 +981,7 @@ FILE * CDECL __iob_func(void) */ FILE * CDECL __acrt_iob_func(unsigned idx) { - return &MSVCRT__iob[idx]; + return iob_get_file(idx); } #endif @@ -1390,10 +1426,12 @@ void msvcrt_free_io(void) for(j=0; j<MSVCRT_stream_idx; j++) { FILE *file = msvcrt_get_file(j); - if(file<MSVCRT__iob || file>=MSVCRT__iob+_IOB_ENTRIES) + CRITICAL_SECTION *cs = file_get_cs(file); + + if(cs) { - ((file_crit*)file)->crit.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&((file_crit*)file)->crit); + cs->DebugInfo->Spare[0] = 0; + DeleteCriticalSection(cs); } } @@ -1461,10 +1499,11 @@ __msvcrt_long CDECL _lseek(int fd, __msvcrt_long offset, int whence) */ void CDECL _lock_file(FILE *file) { - if(file>=MSVCRT__iob && file<MSVCRT__iob+_IOB_ENTRIES) - _lock(_STREAM_LOCKS+(file-MSVCRT__iob)); + CRITICAL_SECTION *cs = file_get_cs(file); + if (!cs) + _lock(_STREAM_LOCKS + (file - iob_get_file(0))); else - EnterCriticalSection(&((file_crit*)file)->crit); + EnterCriticalSection(cs); } /********************************************************************* @@ -1472,10 +1511,11 @@ void CDECL _lock_file(FILE *file) */ void CDECL _unlock_file(FILE *file) { - if(file>=MSVCRT__iob && file<MSVCRT__iob+_IOB_ENTRIES) - _unlock(_STREAM_LOCKS+(file-MSVCRT__iob)); + CRITICAL_SECTION *cs = file_get_cs(file); + if (!cs) + _unlock(_STREAM_LOCKS + (file - iob_get_file(0))); else - LeaveCriticalSection(&((file_crit*)file)->crit); + LeaveCriticalSection(cs); } /********************************************************************* diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c index 9dd5eba4fcc..c36ea51e825 100644 --- a/dlls/ucrtbase/tests/file.c +++ b/dlls/ucrtbase/tests/file.c @@ -129,6 +129,9 @@ static void test_iobuf_layout(void) ok(file_ptr == &fp.iobuf->_ptr, "_ptr = %p, expected %p\n", file_ptr, &fp.iobuf->_ptr); ok(file_cnt == &fp.iobuf->_cnt, "_cnt = %p, expected %p\n", file_cnt, &fp.iobuf->_cnt); + ok(TryEnterCriticalSection(&fp.iobuf->_crit), "TryEnterCriticalSection section returned FALSE\n"); + LeaveCriticalSection(&fp.iobuf->_crit); + fclose(fp.f); unlink(tempf); }

1 0