April 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Move SendNotifyMessageW implementation from user32.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 980de6afe48b4b51e4e8c0af25f54e16a4eb219d URL: https://source.winehq.org/git/wine.git/?a=commit;h=980de6afe48b4b51e4e8c0af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 16:58:35 2022 +0200 win32u: Move SendNotifyMessageW implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 17 +------- dlls/user32/user_main.c | 1 - dlls/win32u/message.c | 94 +++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/ntuser_private.h | 1 - 4 files changed, 94 insertions(+), 19 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a67032ef917..220b0b94d4f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2271,22 +2271,7 @@ BOOL WINAPI SendNotifyMessageA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara */ BOOL WINAPI SendNotifyMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - struct send_message_info info; - - if (is_pointer_message( msg, wparam )) - { - SetLastError( ERROR_MESSAGE_SYNC_ONLY ); - return FALSE; - } - - info.type = MSG_NOTIFY; - info.hwnd = hwnd; - info.msg = msg; - info.wparam = wparam; - info.lparam = lparam; - info.flags = 0; - - return send_message( &info, NULL, TRUE ); + return NtUserMessageCall( hwnd, msg, wparam, lparam, 0, FNID_SENDNOTIFYMESSAGE, FALSE ); } diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 3fd05ec3f01..1b3e67c6d61 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -165,7 +165,6 @@ static const struct user_callbacks user_funcs = EndMenu, HideCaret, PostMessageW, - SendNotifyMessageW, SetSystemMenu, ShowCaret, free_menu_items, diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 41d97e648a0..a8db3016358 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -111,6 +111,82 @@ struct send_message_info static const INPUT_MESSAGE_SOURCE msg_source_unavailable = { IMDT_UNAVAILABLE, IMO_UNAVAILABLE }; +/* flag for messages that contain pointers */ +/* 32 messages per entry, messages 0..31 map to bits 0..31 */ + +#define SET(msg) (1 << ((msg) & 31)) + +static const unsigned int message_pointer_flags[] = +{ + /* 0x00 - 0x1f */ + SET(WM_CREATE) | SET(WM_SETTEXT) | SET(WM_GETTEXT) | + SET(WM_WININICHANGE) | SET(WM_DEVMODECHANGE), + /* 0x20 - 0x3f */ + SET(WM_GETMINMAXINFO) | SET(WM_DRAWITEM) | SET(WM_MEASUREITEM) | SET(WM_DELETEITEM) | + SET(WM_COMPAREITEM), + /* 0x40 - 0x5f */ + SET(WM_WINDOWPOSCHANGING) | SET(WM_WINDOWPOSCHANGED) | SET(WM_COPYDATA) | SET(WM_HELP), + /* 0x60 - 0x7f */ + SET(WM_STYLECHANGING) | SET(WM_STYLECHANGED), + /* 0x80 - 0x9f */ + SET(WM_NCCREATE) | SET(WM_NCCALCSIZE) | SET(WM_GETDLGCODE), + /* 0xa0 - 0xbf */ + SET(EM_GETSEL) | SET(EM_GETRECT) | SET(EM_SETRECT) | SET(EM_SETRECTNP), + /* 0xc0 - 0xdf */ + SET(EM_REPLACESEL) | SET(EM_GETLINE) | SET(EM_SETTABSTOPS), + /* 0xe0 - 0xff */ + SET(SBM_GETRANGE) | SET(SBM_SETSCROLLINFO) | SET(SBM_GETSCROLLINFO) | SET(SBM_GETSCROLLBARINFO), + /* 0x100 - 0x11f */ + 0, + /* 0x120 - 0x13f */ + 0, + /* 0x140 - 0x15f */ + SET(CB_GETEDITSEL) | SET(CB_ADDSTRING) | SET(CB_DIR) | SET(CB_GETLBTEXT) | + SET(CB_INSERTSTRING) | SET(CB_FINDSTRING) | SET(CB_SELECTSTRING) | + SET(CB_GETDROPPEDCONTROLRECT) | SET(CB_FINDSTRINGEXACT), + /* 0x160 - 0x17f */ + 0, + /* 0x180 - 0x19f */ + SET(LB_ADDSTRING) | SET(LB_INSERTSTRING) | SET(LB_GETTEXT) | SET(LB_SELECTSTRING) | + SET(LB_DIR) | SET(LB_FINDSTRING) | + SET(LB_GETSELITEMS) | SET(LB_SETTABSTOPS) | SET(LB_ADDFILE) | SET(LB_GETITEMRECT), + /* 0x1a0 - 0x1bf */ + SET(LB_FINDSTRINGEXACT), + /* 0x1c0 - 0x1df */ + 0, + /* 0x1e0 - 0x1ff */ + 0, + /* 0x200 - 0x21f */ + SET(WM_NEXTMENU) | SET(WM_SIZING) | SET(WM_MOVING) | SET(WM_DEVICECHANGE), + /* 0x220 - 0x23f */ + SET(WM_MDICREATE) | SET(WM_MDIGETACTIVE) | SET(WM_DROPOBJECT) | + SET(WM_QUERYDROPOBJECT) | SET(WM_DRAGLOOP) | SET(WM_DRAGSELECT) | SET(WM_DRAGMOVE), + /* 0x240 - 0x25f */ + 0, + /* 0x260 - 0x27f */ + 0, + /* 0x280 - 0x29f */ + 0, + /* 0x2a0 - 0x2bf */ + 0, + /* 0x2c0 - 0x2df */ + 0, + /* 0x2e0 - 0x2ff */ + 0, + /* 0x300 - 0x31f */ + SET(WM_ASKCBFORMATNAME) +}; + +/* check whether a given message type includes pointers */ +static inline BOOL is_pointer_message( UINT message, WPARAM wparam ) +{ + if (message >= 8*sizeof(message_pointer_flags)) return FALSE; + if (message == WM_DEVICECHANGE && !(wparam & 0x8000)) return FALSE; + return (message_pointer_flags[message / 32] & SET(message)) != 0; +} + +#undef SET + static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { @@ -2277,7 +2353,23 @@ LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) /* see SendNotifyMessageW */ static BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { - return user_callbacks && user_callbacks->pSendNotifyMessageW( hwnd, msg, wparam, lparam ); + struct send_message_info info; + + if (is_pointer_message( msg, wparam )) + { + SetLastError( ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + } + + info.type = MSG_NOTIFY; + info.hwnd = hwnd; + info.msg = msg; + info.wparam = wparam; + info.lparam = lparam; + info.flags = 0; + info.wm_char = WMCHAR_MAP_SENDMESSAGETIMEOUT; + + return process_message( &info, NULL, ansi ); } /*********************************************************************** diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index f9623446f6d..6afe3955787 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -38,7 +38,6 @@ struct user_callbacks BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pHideCaret)( HWND hwnd ); BOOL (WINAPI *pPostMessageW)( HWND, UINT, WPARAM, LPARAM ); - BOOL (WINAPI *pSendNotifyMessageW)( HWND, UINT, WPARAM, LPARAM ); BOOL (WINAPI *pSetSystemMenu)( HWND hwnd, HMENU menu ); BOOL (WINAPI *pShowCaret)( HWND hwnd ); void (CDECL *free_menu_items)( void *ptr );

1 0

Jacek Caban : win32u: Move SendMessageTimeoutW implementation from user32.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 74da33b7914d191afff03637dda1d60ee09710ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=74da33b7914d191afff03637… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 16:57:43 2022 +0200 win32u: Move SendMessageTimeoutW implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 15 ++---- dlls/user32/user_main.c | 1 - dlls/win32u/input.c | 6 +-- dlls/win32u/message.c | 125 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/palette.c | 5 +- dlls/win32u/sysparams.c | 9 ++-- dlls/win32u/tests/win32u.c | 4 -- dlls/win32u/win32u_private.h | 2 + 9 files changed, 141 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74da33b7914d191afff0…

1 0

Jacek Caban : win32u: Use public declaration for NtUserPostMessage.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: dca49630a9caf34c85a576428a16f4091ac33ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca49630a9caf34c85a57642… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 16:57:31 2022 +0200 win32u: Use public declaration for NtUserPostMessage. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/input.c | 2 +- dlls/win32u/message.c | 6 ++++-- dlls/win32u/win32u_private.h | 1 - dlls/win32u/window.c | 4 ++-- include/ntuser.h | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 9f309ed37ec..7fd9e7da720 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1394,7 +1394,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) MAKEWPARAM( mouse ? WA_CLICKACTIVE : WA_ACTIVE, is_iconic(hwnd) ), (LPARAM)previous ); if (NtUserGetAncestor( hwnd, GA_PARENT ) == get_desktop_window()) - post_message( get_desktop_window(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd ); + NtUserPostMessage( get_desktop_window(), WM_PARENTNOTIFY, WM_NCACTIVATE, (LPARAM)hwnd ); } /* now change focus if necessary */ diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 0f84ad055e7..639372cc7c1 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2154,8 +2154,10 @@ static BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar return user_callbacks && user_callbacks->pSendNotifyMessageW( hwnd, msg, wparam, lparam ); } -/* see PostMessageW */ -LRESULT post_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +/*********************************************************************** + * NtUserPostMessage (win32u.@) + */ +BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { /* FIXME: move implementation from user32 */ if (!user_callbacks) return 0; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 350372b0ed7..d72ce3b8a0d 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -350,7 +350,6 @@ extern HMENU get_menu( HWND hwnd ) DECLSPEC_HIDDEN; /* message.c */ extern LRESULT dispatch_message( const MSG *msg, BOOL ansi ) DECLSPEC_HIDDEN; extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN; -extern LRESULT post_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern void process_sent_messages(void) DECLSPEC_HIDDEN; extern BOOL reply_message_result( LRESULT result, MSG *msg ) DECLSPEC_HIDDEN; extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 09f3fc01e58..a8be22ab51b 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3902,7 +3902,7 @@ void update_window_state( HWND hwnd ) if (!is_current_thread_window( hwnd )) { - post_message( hwnd, WM_WINE_UPDATEWINDOWSTATE, 0, 0 ); + NtUserPostMessage( hwnd, WM_WINE_UPDATEWINDOWSTATE, 0, 0 ); return; } @@ -4923,7 +4923,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, } if (parent == get_desktop_window()) - post_message( parent, WM_PARENTNOTIFY, WM_CREATE, (LPARAM)hwnd ); + NtUserPostMessage( parent, WM_PARENTNOTIFY, WM_CREATE, (LPARAM)hwnd ); if (cs.style & WS_VISIBLE) { diff --git a/include/ntuser.h b/include/ntuser.h index 4515a9ce0f1..0be02986377 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -608,6 +608,8 @@ BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); BOOL WINAPI NtUserPeekMessage( MSG *msg_out, HWND hwnd, UINT first, UINT last, UINT flags ); +BOOL WINAPI NtUserPostMessage( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ); +BOOL WINAPI NtUserPostThreadMessage( DWORD thread, UINT msg, WPARAM wparam, LPARAM lparam ); BOOL WINAPI NtUserRedrawWindow( HWND hwnd, const RECT *rect, HRGN hrgn, UINT flags ); ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *name, UNICODE_STRING *version, struct client_menu_name *client_menu_name, DWORD fnid, DWORD flags,

1 0

Paul Gofman : ucrtbase: Update ioinfo structure.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: cbbe8ad73a45cff0353935e9ef6d98888b75d345 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbbe8ad73a45cff0353935e9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 4 18:52:21 2022 +0300 ucrtbase: Update ioinfo structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2f9ff31f8f3..43f27629a64 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -88,6 +88,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); static char utf8_bom[3] = { 0xef, 0xbb, 0xbf }; static char utf16_bom[2] = { 0xff, 0xfe }; +#define MSVCRT_INTERNAL_BUFSIZ 4096 + enum textmode { TEXTMODE_ANSI, @@ -95,12 +97,33 @@ enum textmode TEXTMODE_UTF16LE, }; -/* FIXME: this should be allocated dynamically */ +#if _MSVCR_VER >= 140 + +#define MSVCRT_MAX_FILES 8192 +#define MSVCRT_FD_BLOCK_SIZE 64 + +typedef struct { + CRITICAL_SECTION crit; + HANDLE handle; + __int64 startpos; + unsigned char wxflag; + char textmode; + char lookahead[3]; + char unicode : 1; + char utf8translations : 1; + char dbcsBufferUsed : 1; + char dbcsBuffer[MB_LEN_MAX]; +} ioinfo; + +/********************************************************************* + * __badioinfo (MSVCRT.@) + */ +ioinfo MSVCRT___badioinfo = { {0}, INVALID_HANDLE_VALUE, 0, WX_TEXT }; +#else + #define MSVCRT_MAX_FILES 2048 #define MSVCRT_FD_BLOCK_SIZE 32 -#define MSVCRT_INTERNAL_BUFSIZ 4096 - typedef struct { HANDLE handle; unsigned char wxflag; @@ -113,23 +136,35 @@ typedef struct { char pipech2[2]; __int64 startpos; BOOL utf8translations; - char dbcsBuffer; + char dbcsBuffer[1]; BOOL dbcsBufferUsed; #endif } ioinfo; /********************************************************************* - * __pioinfo (MSVCRT.@) - * array of pointers to ioinfo arrays [32] + * __badioinfo (MSVCRT.@) */ -ioinfo * MSVCRT___pioinfo[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE] = { 0 }; +ioinfo MSVCRT___badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT }; +#endif /********************************************************************* - * __badioinfo (MSVCRT.@) + * __pioinfo (MSVCRT.@) + * array of pointers to ioinfo arrays [32] */ -ioinfo MSVCRT___badioinfo = { INVALID_HANDLE_VALUE, WX_TEXT }; +ioinfo * MSVCRT___pioinfo[MSVCRT_MAX_FILES/MSVCRT_FD_BLOCK_SIZE] = { 0 }; #if _MSVCR_VER >= 80 + +#if _MSVCR_VER >= 140 +static inline BOOL ioinfo_is_crit_init(ioinfo *info) +{ + return TRUE; +} + +static inline void ioinfo_set_crit_init(ioinfo *info) +{ +} +#else static inline BOOL ioinfo_is_crit_init(ioinfo *info) { return info->exflag & 1; @@ -139,6 +174,7 @@ static inline void ioinfo_set_crit_init(ioinfo *info) { info->exflag |= 1; } +#endif static inline enum textmode ioinfo_get_textmode(ioinfo *info) { @@ -384,9 +420,24 @@ static inline BOOL alloc_pioinfo_block(int fd) return FALSE; } for(i=0; i<MSVCRT_FD_BLOCK_SIZE; i++) + { block[i].handle = INVALID_HANDLE_VALUE; + if (ioinfo_is_crit_init(&block[i])) + { + /* Initialize crit section on block allocation for _MSVC_VER >= 140, + * ioinfo_is_crit_init() is always TRUE. */ + InitializeCriticalSection(&block[i].crit); + } + } if(InterlockedCompareExchangePointer((void**)&MSVCRT___pioinfo[fd/MSVCRT_FD_BLOCK_SIZE], block, NULL)) + { + if (ioinfo_is_crit_init(&block[0])) + { + for(i = 0; i < MSVCRT_FD_BLOCK_SIZE; ++i) + DeleteCriticalSection(&block[i].crit); + } free(block); + } return TRUE; } @@ -3555,7 +3606,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) #if _MSVCR_VER >= 80 if (info->dbcsBufferUsed) { - conv[j++] = info->dbcsBuffer; + conv[j++] = info->dbcsBuffer[0]; info->dbcsBufferUsed = FALSE; conv[j++] = s[i++]; len++; @@ -3572,7 +3623,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) if (i == count) { #if _MSVCR_VER >= 80 - info->dbcsBuffer = conv[j-1]; + info->dbcsBuffer[0] = conv[j-1]; info->dbcsBufferUsed = TRUE; break; #else

1 0

Paul Gofman : msvcr90/tests: Test ioinfo structure.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 7ebba96a951d891b2dc43007ec54f4d88322fab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ebba96a951d891b2dc43007… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 4 18:52:20 2022 +0300 msvcr90/tests: Test ioinfo structure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 63a2254d187..5b6a1d08399 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -33,6 +33,33 @@ #include <errno.h> #include "wine/test.h" +#define WX_OPEN 0x01 +#define WX_ATEOF 0x02 +#define WX_READNL 0x04 +#define WX_PIPE 0x08 +#define WX_DONTINHERIT 0x10 +#define WX_APPEND 0x20 +#define WX_TTY 0x40 +#define WX_TEXT 0x80 + +#define MSVCRT_FD_BLOCK_SIZE 32 + +typedef struct { + HANDLE handle; + unsigned char wxflag; + char lookahead[3]; + int exflag; + CRITICAL_SECTION crit; + char textmode : 7; + char unicode : 1; + char pipech2[2]; + __int64 startpos; + BOOL utf8translations; + char dbcsBuffer; + BOOL dbcsBufferUsed; +} ioinfo; +static ioinfo **__pioinfo; + #define DEFINE_EXPECT(func) \ static BOOL expect_ ## func = FALSE, called_ ## func = FALSE @@ -84,6 +111,9 @@ static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_tmpfile_s)(FILE**); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); +static int (__cdecl *p__open)(const char *, int, ...); +static int (__cdecl *p__close)(int); +static intptr_t (__cdecl *p__get_osfhandle)(int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); static int (__cdecl *p_wsopen_s)(int*, const wchar_t*, int, int, int); static void* (__cdecl *p_realloc_crt)(void*, size_t); @@ -362,6 +392,7 @@ static BOOL init(void) ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, "Invalid parameter handler was already set\n"); + SET(__pioinfo, "__pioinfo"); SET(p_initterm_e, "_initterm_e"); SET(p_encode_pointer, "_encode_pointer"); SET(p_decode_pointer, "_decode_pointer"); @@ -382,6 +413,9 @@ static BOOL init(void) SET(p_set_abort_behavior, "_set_abort_behavior"); SET(p_sopen_s, "_sopen_s"); SET(p_wsopen_s, "_wsopen_s"); + SET(p__open,"_open"); + SET(p__close,"_close"); + SET(p__get_osfhandle, "_get_osfhandle"); SET(p_realloc_crt, "_realloc_crt"); SET(p_malloc, "malloc"); SET(p_free, "free"); @@ -2350,6 +2384,63 @@ static void test__get_current_locale(void) p_setlocale(LC_ALL, "C"); } +static void test_ioinfo_flags(void) +{ + HANDLE handle; + ioinfo *info; + char *tempf; + int tempfd; + + tempf = _tempnam(".","wne"); + + tempfd = p__open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_WTEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + handle = (HANDLE)p__get_osfhandle(tempfd); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == handle, "Unexpected handle %p, expected %p.\n", info->handle, handle); + ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + ok(info->unicode, "Unicode is not set.\n"); + ok(info->textmode == 2, "Unexpected textmode %d.\n", info->textmode); + p__close(tempfd); + + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + ok(info->unicode, "Unicode is not set.\n"); + ok(!info->wxflag, "Unexpected wxflag %#x.\n", info->wxflag); + ok(info->textmode == 2, "Unexpected textmode %d.\n", info->textmode); + + info = &__pioinfo[(tempfd + 4) / MSVCRT_FD_BLOCK_SIZE][(tempfd + 4) % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + ok(!info->exflag, "Unexpected exflag %#x.\n", info->exflag); + ok(!info->textmode, "Unexpected textmode %d.\n", info->textmode); + + tempfd = p__open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_TEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + ok(!info->unicode, "Unicode is not set.\n"); + ok(!info->textmode, "Unexpected textmode %d.\n", info->textmode); + p__close(tempfd); + + tempfd = p__open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_U8TEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + ok(!info->unicode, "Unicode is not set.\n"); + ok(info->textmode == 1, "Unexpected textmode %d.\n", info->textmode); + p__close(tempfd); + + unlink(tempf); + free(tempf); +} + START_TEST(msvcr90) { if(!init()) @@ -2391,4 +2482,5 @@ START_TEST(msvcr90) test_swscanf(); test____mb_cur_max_l_func(); test__get_current_locale(); + test_ioinfo_flags(); }

1 0

Alexandre Julliard : make_unicode: Generate the calendar table in locale.nls.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 65fc470dfe93b5355152edb6a1b78047537a714c URL: https://source.winehq.org/git/wine.git/?a=commit;h=65fc470dfe93b5355152edb6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 16:54:02 2022 +0200 make_unicode: Generate the calendar table in locale.nls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- nls/locale.nls | Bin 660088 -> 663852 bytes tools/make_unicode | 194 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 187 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=65fc470dfe93b5355152…

1 0

Esme Povirk : mscoree/tests: Create csc.exe process as detached.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: c943f924cb10fe522b0b932137a2cd9f74349e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c943f924cb10fe522b0b9321… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 4 14:26:43 2022 -0500 mscoree/tests: Create csc.exe process as detached. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index a2bb3449839..7da40d92887 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -580,7 +580,7 @@ static BOOL compile_cs(const WCHAR *source, const WCHAR *target, const WCHAR *ty swprintf(cmdline, ARRAY_SIZE(cmdline), L"%s /t:%s %s /out:\"%s\" \"%s\"", csc, type, args, target, source); si.cb = sizeof(si); - ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessW(csc, cmdline, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi); ok(ret, "Could not create process: %lu\n", GetLastError()); wait_child_process(pi.hProcess);

1 0

Esme Povirk : mscoree/tests: Build loadpaths.exe as GUI instead of CUI.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: d971600cae1b898d4d31df1f1b0cad79c3ed2c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d971600cae1b898d4d31df1f… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon Apr 4 14:26:42 2022 -0500 mscoree/tests: Build loadpaths.exe as GUI instead of CUI. This prevents unnecessary console windows from being created for it if mscoree_test.exe does not have a console. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/mscoree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index b49465fb16f..a2bb3449839 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -709,7 +709,7 @@ static void test_loadpaths(BOOL neutral) ret = write_resource(exe_source, exe_source); ok(ret, "Could not write resource: %lu\n", GetLastError()); DeleteFileW(exe_name); - ret = compile_cs(exe_source, exe_name, L"exe", L"/reference:libloadpaths.dll"); + ret = compile_cs(exe_source, exe_name, L"winexe", L"/reference:libloadpaths.dll"); if (!ret) return; ret = DeleteFileW(exe_source); ok(ret, "DeleteFileW failed: %lu\n", GetLastError());

1 0

Dmitry Timoshkov : dwrite/tests: Add some fallback tests for Segoe UI Symbol.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: a90d976bb45e26cc64bcb1a4304a6dc7a1ad0571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90d976bb45e26cc64bcb1a4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 5 08:38:22 2022 +0300 dwrite/tests: Add some fallback tests for Segoe UI Symbol. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77c6ff2034..43b6efa107b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4747,6 +4747,86 @@ if (font) { IDWriteFactory2_Release(factory2); } +static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) +{ + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteFont_GetFontFamily(font, &family); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IDWriteLocalizedStrings_FindLocaleName(names, L"en-us", &index, &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(index != UINT_MAX && exists, "Name was not found.\n"); + hr = IDWriteLocalizedStrings_GetString(names, index, name, size); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + IDWriteLocalizedStrings_Release(names); + IDWriteFontFamily_Release(family); +} + +static void test_system_fallback(void) +{ + static const struct fallback_test + { + const WCHAR text[2]; + const WCHAR *name; + } + tests[] = + { + { { 0x25d4, 0}, L"Segoe UI Symbol" }, + }; + IDWriteFontFallback *fallback; + IDWriteFactory2 *factory; + IDWriteFont *font; + UINT32 i, length; + WCHAR name[256]; + BOOL exists; + float scale; + HRESULT hr; + + if (!(factory = create_factory_iid(&IID_IDWriteFactory2))) + { + win_skip("System font fallback API is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontFallback(factory, &fallback); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + g_source = tests[i].text; + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &length, &font, &scale); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (hr != S_OK) continue; + ok(length == 1, "Unexpected length %u\n", length); + ok(scale == 1.0f, "got %f\n", scale); + + get_font_name(font, name, ARRAY_SIZE(name)); + todo_wine + ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); + + hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine + ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); + + IDWriteFont_Release(font); + } + + IDWriteFontFallback_Release(fallback); + IDWriteFactory2_Release(factory); +} + static void test_FontFallbackBuilder(void) { IDWriteFontFallback *fallback, *fallback2; @@ -6529,6 +6609,7 @@ START_TEST(layout) test_pixelsnapping(); test_SetWordWrapping(); test_MapCharacters(); + test_system_fallback(); test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping();

1 0

Jacek Caban : win32u: Return LRESULT from NtUserMessageCall.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 177eb908c9433bd1b45c243d3b13e996711c1cd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=177eb908c9433bd1b45c243d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 16:57:23 2022 +0200 win32u: Return LRESULT from NtUserMessageCall. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 3 +- dlls/user32/winproc.c | 4 +- dlls/win32u/message.c | 20 ++++----- dlls/win32u/tests/win32u.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 4 +- dlls/win32u/window.c | 8 ++-- dlls/win32u/wrappers.c | 4 +- include/ntuser.h | 29 +++++++++---- 8 files changed, 138 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=177eb908c9433bd1b45c…

1 0