August 2020 - Wine-devel - list.winehq.org

[PATCH 5/6] msvcrt: Import atanf from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 85 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 3 deletions(-)

1 0

[PATCH 4/6] msvcrt: Import atan2 from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 71 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-)

1 0

[PATCH 3/6] msvcrt: Import atan2f from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 69 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 4 deletions(-)

1 0

[PATCH 2/6] msvcrt: Import asin from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 70 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 66 insertions(+), 4 deletions(-)

1 0

[PATCH 1/6] msvcrt: Import asinf from musl.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 47 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-)

1 0

[PATCH 1/7] xactengine3_6: New DLL
by Alistair Leslie-Hughes 06 Aug '20

06 Aug '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_6/Makefile.in | 11 +++++++++++ dlls/xactengine3_6/xactengine3_6.spec | 4 ++++ dlls/xactengine3_7/xact_classes.idl | 11 ++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 dlls/xactengine3_6/Makefile.in create mode 100644 dlls/xactengine3_6/xactengine3_6.spec diff --git a/dlls/xactengine3_6/Makefile.in b/dlls/xactengine3_6/Makefile.in new file mode 100644 index 00000000000..fad71a2fd57 --- /dev/null +++ b/dlls/xactengine3_6/Makefile.in @@ -0,0 +1,11 @@ +MODULE = xactengine3_6.dll +IMPORTS = ole32 uuid +EXTRADEFS = -DXACT3_VER=0x0306 +PARENTSRC = ../xactengine3_7 +EXTRALIBS = $(FAUDIO_LIBS) +EXTRAINCL = $(FAUDIO_CFLAGS) + +C_SRCS = \ + xact_dll.c + +IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_6/xactengine3_6.spec b/dlls/xactengine3_6/xactengine3_6.spec new file mode 100644 index 00000000000..b16365d0c9f --- /dev/null +++ b/dlls/xactengine3_6/xactengine3_6.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/xactengine3_7/xact_classes.idl b/dlls/xactengine3_7/xact_classes.idl index 24c792e2f05..a6abeb773ca 100644 --- a/dlls/xactengine3_7/xact_classes.idl +++ b/dlls/xactengine3_7/xact_classes.idl @@ -20,9 +20,18 @@ #pragma makedep register +#if XACT3_VER == 0x0306 [ - helpstring("XACT3 Class"), + helpstring("XACT3.6 Class"), + threading(both), + uuid(248d8a3b-6256-44d3-a018-2ac96c459f47) +] +coclass XACTEngine36 { interface IXACT37Engine; } +#else /* XACT3_VER == 0x0307 or not defined */ +[ + helpstring("XACT3.7 Class"), threading(both), uuid(bcc782bc-6492-4c22-8c35-f5d72fe73c6e) ] coclass XACTEngine37 { interface IXACT37Engine; } +#endif -- 2.27.0

2 1

[PATCH] winex11.drv: Send WM_SYSKEYDOWN if the Alt+F4 shortcut was used to close the window.
by Gabriel Ivăncescu 06 Aug '20

06 Aug '20

Some applications (e.g. Brothers - A Tale of Two Sons) are sensitive to the difference between Alt+F4 and a normal close of the window. Window Managers typically have the Alt+F4 configured to send the WM_DELETE_WINDOW message, which won't even send a F4 key press at all to the window. So we have to distinguish between that and another source of that message (for example, clicking the X button) while handling it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/event.c | 2 ++ dlls/winex11.drv/keyboard.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 52 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 07f7a1a..99077ad 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -688,6 +688,8 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) break; } } + else if (X11DRV_HandleKeyCloseShortcut( hwnd, event->display, event_time )) + return; PostMessageW( hwnd, WM_SYSCOMMAND, SC_CLOSE, 0 ); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 48da12c..4efee15 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1417,6 +1417,55 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) return TRUE; } +/*********************************************************************** + * X11DRV_HandleKeyCloseShortcut + * + * Handle the close shortcut (Alt+F4) on a delete window message. + */ +BOOL X11DRV_HandleKeyCloseShortcut(HWND hwnd, Display *display, Time event_time) +{ + unsigned int pressed = 0, i; + BYTE keystate[256]; + char keys[32]; + WORD scan = 0; + + /* WMs handle this shortcut and not send it to the window at all, + so we have to query the keymap and see whether it is pressed. */ + XQueryKeymap(display, keys); + + /* The minimum keycode is always greater or equal to 8. */ + for (i = 8; i < 256; i++) + { + switch (keyc2vkey[i]) + { + case VK_MENU: + case VK_LMENU: + case VK_RMENU: + if (keys[i / 8] & (1 << (i % 8))) + pressed |= 1; + break; + case VK_F4: + if (keys[i / 8] & (1 << (i % 8))) + { + scan = keyc2scan[i] & 0xFF; + pressed |= 2; + } + break; + } + } + if (pressed != 3) return FALSE; + + /* In this case, the Alt keystate must match, but not the VK_F4. */ + if (!get_async_key_state(keystate)) return FALSE; + if (!(keystate[VK_MENU] & 0x80) || (keystate[VK_F4] & 0x80)) return FALSE; + + /* Simulate the VK_F4 press, since it's eaten by the WM (the release is not). */ + update_user_time(event_time); + X11DRV_send_keyboard_input(hwnd, VK_F4, scan, 0, EVENT_x11_time_to_win32_time(event_time)); + + return TRUE; +} + /********************************************************************** * X11DRV_KEYBOARD_DetectLayout * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 375fd14..f294c10 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -632,6 +632,7 @@ extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN; extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN; extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN; +extern BOOL X11DRV_HandleKeyCloseShortcut( HWND hwnd, Display *display, Time event_time ) DECLSPEC_HIDDEN; extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN; extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) DECLSPEC_HIDDEN; -- 2.21.0

1 0

[PATCH] preloader: Extend low memory area a bit
by Arkadiusz Hiler 06 Aug '20

06 Aug '20

SDL.dll which is shipped with Doom II on Steam has one of the fixup records broken which causes relocation to fail on some Linux systems. On Windows if we reserve that memory area before loading the DLL we experience similar crash, and yet there are no bug reports for this dosbox.exe + SDL combo. The change here extends the low memory area over the DLL's base address (+ some) to make sure that range is available. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49660 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- loader/preloader.c | 4 ++-- loader/preloader_mac.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index bb16ecd96a..fe7e005320 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -114,11 +114,11 @@ static struct wine_preload_info preload_info[] = #ifdef __i386__ { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x00110000, 0x68160000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ #else { (void *)0x000000010000, 0x00100000 }, /* DOS area */ - { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x000000110000, 0x68160000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x7ffffe000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 43dc6b2b7e..6bd88882c6 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -73,11 +73,11 @@ static struct wine_preload_info preload_info[] = { (void *)0x00000000, 0x00001000 }, /* first page */ { (void *)0x00001000, 0x0000f000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ - { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x00110000, 0x68160000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared heap + virtual heap */ #else /* __i386__ */ { (void *)0x000000010000, 0x00100000 }, /* DOS area */ - { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ + { (void *)0x000000110000, 0x68160000 }, /* low memory area */ { (void *)0x00007ff00000, 0x000f0000 }, /* shared user data */ { (void *)0x7ffef0000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ -- 2.28.0

1 0

[PATCH 3/3] ucrtbase: Support _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING flag in printf.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/printf.h | 78 +++++++++++++++++++++++---- dlls/ucrtbase/tests/printf.c | 10 +++- include/msvcrt/corecrt_stdio_config.h | 1 + 4 files changed, 78 insertions(+), 14 deletions(-)

1 0

[PATCH 2/3] ucrtbase: Fix away from 0 rounding in %a format.
by Piotr Caban 06 Aug '20

06 Aug '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- We were duplicating bug in native implementation that is fixed in newest ucrtbase version. dlls/msvcrt/printf.h | 4 ++-- dlls/ucrtbase/tests/printf.c | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-)

1 0