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

Shawn M. Chapla : wine.inf: Don't use DDE for winebrowser by default.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 2a667e28ba7800288f5873a4b13bc0baf6e4a857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a667e28ba7800288f5873a4… Author: Shawn M. Chapla <schapla(a)codeweavers.com> Date: Tue May 18 12:54:30 2021 -0400 wine.inf: Don't use DDE for winebrowser by default. Signed-off-by: Shawn M. Chapla <schapla(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index a20efbcce3e..c909f58f53c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -260,11 +260,7 @@ HKCR,folder\shell\open\ddeexec\application,,2,"Folders" HKCR,folder\shellex\ContextMenuHandlers,,16 HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" -HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,htmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,htmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,inffile,,2,"Setup Information" HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" HKCR,inifile,,2,"Configuration Settings" @@ -286,11 +282,7 @@ HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,pdffile,,2,"PDF Document" -HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,pdffile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,pdffile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,pdffile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,pdffile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,pdffile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,rtffile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" @@ -300,26 +292,10 @@ HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" %1" HKCR,wrifile\shell\print\command,,2,"""%16422%\Windows NT\Accessories\wordpad.exe"" /p %1" HKCR,xmlfile,,2,"XML Document" -HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,xmlfile\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,xmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,ftp\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,ftp\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,ftp\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,ftp\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,http\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,http\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,http\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,http\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" -HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" -nohome" -HKCR,https\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," -HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" -HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" -HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,xmlfile\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,ftp\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" +HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" %1" HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"Codepage",0x10003,932

1 0

Zhiyi Zhang : user32: Optimize getting virtual screen rectangle with GetSystemMetrics().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 59e5a8d055f28bde9f53354cd250a641d84b9a51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59e5a8d055f28bde9f53354c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 18 17:11:18 2021 +0800 user32: Optimize getting virtual screen rectangle with GetSystemMetrics(). This saves calls to GetMonitorInfo(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 49 +++++++++++++++---------------------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab1c5af0c1b..3d0cb2a6566 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -337,38 +337,20 @@ static void SYSPARAMS_NonClientMetrics32ATo32W( const NONCLIENTMETRICSA* lpnm32A /* Helper functions to retrieve monitors info */ -struct monitor_info +static BOOL CALLBACK get_virtual_screen_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { - int count; - RECT primary_rect; - RECT virtual_rect; -}; + RECT *virtual_rect = (RECT *)lp; -static BOOL CALLBACK monitor_info_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) -{ - MONITORINFO mi; - struct monitor_info *info = (struct monitor_info *)lp; - info->count++; - UnionRect( &info->virtual_rect, &info->virtual_rect, rect ); - mi.cbSize = sizeof(mi); - if (GetMonitorInfoW( monitor, &mi ) && (mi.dwFlags & MONITORINFOF_PRIMARY)) - info->primary_rect = mi.rcMonitor; + UnionRect( virtual_rect, virtual_rect, rect ); return TRUE; } -static void get_monitors_info( struct monitor_info *info ) -{ - info->count = 0; - SetRectEmpty( &info->primary_rect ); - SetRectEmpty( &info->virtual_rect ); - EnumDisplayMonitors( 0, NULL, monitor_info_proc, (LPARAM)info ); -} - RECT get_virtual_screen_rect(void) { - struct monitor_info info; - get_monitors_info( &info ); - return info.virtual_rect; + RECT rect = {0}; + + EnumDisplayMonitors( 0, NULL, get_virtual_screen_proc, (LPARAM)&rect ); + return rect; } static BOOL CALLBACK get_primary_monitor_proc( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) @@ -2527,7 +2509,6 @@ BOOL WINAPI SystemParametersInfoA( UINT uiAction, UINT uiParam, */ INT WINAPI GetSystemMetrics( INT index ) { - struct monitor_info info; NONCLIENTMETRICSW ncm; MINIMIZEDMETRICS mm; ICONMETRICSW im; @@ -2743,17 +2724,17 @@ INT WINAPI GetSystemMetrics( INT index ) rect = get_primary_monitor_rect(); return rect.bottom - rect.top; case SM_XVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.left; + rect = get_virtual_screen_rect(); + return rect.left; case SM_YVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.top; + rect = get_virtual_screen_rect(); + return rect.top; case SM_CXVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.right - info.virtual_rect.left; + rect = get_virtual_screen_rect(); + return rect.right - rect.left; case SM_CYVIRTUALSCREEN: - get_monitors_info( &info ); - return info.virtual_rect.bottom - info.virtual_rect.top; + rect = get_virtual_screen_rect(); + return rect.bottom - rect.top; case SM_CMONITORS: return get_monitor_count(); case SM_SAMEDISPLAYFORMAT:

1 0

Piotr Caban : msvcrt: Import fmodf implementation from musl.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: bc5f28888ce57514dc7a7b4eec316d3327bcbb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc5f28888ce57514dc7a7b4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:08:28 2021 +0200 msvcrt: Import fmodf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++----- dlls/msvcrt/unixlib.c | 9 ------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d71a7108b5d..de0db9cca50 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -620,12 +620,70 @@ float CDECL expf( float x ) /********************************************************************* * fmodf (MSVCRT.@) + * + * Copied from musl: src/math/fmodf.c */ float CDECL fmodf( float x, float y ) { - float ret = unix_funcs->fmodf( x, y ); - if (!isfinite(x) || !isfinite(y)) return math_error(_DOMAIN, "fmodf", x, 0, ret); - return ret; + UINT32 xi = *(UINT32*)&x; + UINT32 yi = *(UINT32*)&y; + int ex = xi>>23 & 0xff; + int ey = yi>>23 & 0xff; + UINT32 sx = xi & 0x80000000; + UINT32 i; + + if (isinf(x)) return math_error(_DOMAIN, "fmodf", x, y, (x * y) / (x * y)); + if (yi << 1 == 0 || isnan(y) || ex == 0xff) + return (x * y) / (x * y); + if (xi << 1 <= yi << 1) { + if (xi << 1 == yi << 1) + return 0 * x; + return x; + } + + /* normalize x and y */ + if (!ex) { + for (i = xi << 9; i >> 31 == 0; ex--, i <<= 1); + xi <<= -ex + 1; + } else { + xi &= -1U >> 9; + xi |= 1U << 23; + } + if (!ey) { + for (i = yi << 9; i >> 31 == 0; ey--, i <<= 1); + yi <<= -ey + 1; + } else { + yi &= -1U >> 9; + yi |= 1U << 23; + } + + /* x mod y */ + for (; ex > ey; ex--) { + i = xi - yi; + if (i >> 31 == 0) { + if (i == 0) + return 0 * x; + xi = i; + } + xi <<= 1; + } + i = xi - yi; + if (i >> 31 == 0) { + if (i == 0) + return 0 * x; + xi = i; + } + for (; xi>>23 == 0; xi <<= 1, ex--); + + /* scale result up */ + if (ex > 0) { + xi -= 1U << 23; + xi |= (UINT32)ex << 23; + } else { + xi >>= -ex + 1; + } + xi |= sx; + return *(float*)ξ } /********************************************************************* @@ -633,9 +691,9 @@ float CDECL fmodf( float x, float y ) */ float CDECL logf( float x ) { - float ret = unix_funcs->logf( x ); - if (x < 0.0) return math_error(_DOMAIN, "logf", x, 0, ret); - if (x == 0.0) return math_error(_SING, "logf", x, 0, ret); + float ret = unix_funcs->logf( x ); + if (x < 0.0) return math_error(_DOMAIN, "logf", x, 0, ret); + if (x == 0.0) return math_error(_SING, "logf", x, 0, ret); return ret; } diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 69ce6bb027e..a2bae9c6e5e 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -297,14 +297,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * fmodf - */ -static float CDECL unix_fmodf( float x, float y ) -{ - return fmodf( x, y ); -} - /********************************************************************* * frexp */ @@ -665,7 +657,6 @@ static const struct unix_funcs funcs = unix_expm1f, unix_fma, unix_fmaf, - unix_fmodf, unix_frexp, unix_frexpf, unix_hypot, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index c1cd2c60d29..edb9e99d3e4 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -45,7 +45,6 @@ struct unix_funcs float (CDECL *expm1f)(float x); double (CDECL *fma)(double x, double y, double z); float (CDECL *fmaf)(float x, float y, float z); - float (CDECL *fmodf)(float x, float y); double (CDECL *frexp)(double x, int *exp); float (CDECL *frexpf)(float x, int *exp); double (CDECL *hypot)(double x, double y);

1 0

Jacek Caban : msvcrt: Add sincos to importlib.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: f0131276474997b9d4e593bbf8c5616b879d3bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0131276474997b9d4e593bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 18 18:08:43 2021 +0200 msvcrt: Add sincos to importlib. Fixes cross compilation with GCC 11, which may optimize a pair of sin(), cos() calls to a single sincos() call, which is not exported by any msvcrt version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/sincos.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/Makefile.in | 1 + 10 files changed, 49 insertions(+) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index c5a7710ea41..edf4b4d4407 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -34,6 +34,7 @@ C_SRCS = \ process.c \ scanf.c \ scheduler.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index d2ba0ac29e3..c3ee2ca7e8e 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -34,6 +34,7 @@ C_SRCS = \ process.c \ scanf.c \ scheduler.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index 68a85c581d1..953e9760ca0 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -34,6 +34,7 @@ C_SRCS = \ process.c \ scanf.c \ scheduler.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index e6dd41b32a5..4c443ecd7f6 100644 --- a/dlls/msvcr70/Makefile.in +++ b/dlls/msvcr70/Makefile.in @@ -33,6 +33,7 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index 7795ce1ae24..6f51a326c6b 100644 --- a/dlls/msvcr71/Makefile.in +++ b/dlls/msvcr71/Makefile.in @@ -33,6 +33,7 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 7d11f65b3a3..3e2da553562 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -33,6 +33,7 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 9cb511bbe06..4a49fcfd254 100644 --- a/dlls/msvcr90/Makefile.in +++ b/dlls/msvcr90/Makefile.in @@ -33,6 +33,7 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 486e6f5491b..16405262fca 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -38,6 +38,7 @@ C_SRCS = \ process.c \ scanf.c \ scheduler.c \ + sincos.c \ string.c \ thread.c \ time.c \ diff --git a/dlls/msvcrt/sincos.c b/dlls/msvcrt/sincos.c new file mode 100644 index 00000000000..1a34c50f034 --- /dev/null +++ b/dlls/msvcrt/sincos.c @@ -0,0 +1,40 @@ +/* + * sincos implementation + * + * Copyright 2021 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep implib +#endif + +#include <math.h> + +/* GCC may optimize a pair of sin(), cos() calls to a single sincos() call, + * which is not exported by any msvcrt version. */ + +void sincos(double x, double *s, double *c) +{ + *s = sin(x); + *c = cos(x); +} + +void sincosf(float x, float *s, float *c) +{ + *s = sinf(x); + *c = cosf(x); +} diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index a576cf0250b..2910016f29f 100644 --- a/dlls/ucrtbase/Makefile.in +++ b/dlls/ucrtbase/Makefile.in @@ -37,6 +37,7 @@ C_SRCS = \ printf.c \ process.c \ scanf.c \ + sincos.c \ string.c \ thread.c \ time.c \

1 0

Zhiyi Zhang : winex11.drv: Add a cache for querying XRandR 1.4 current modes.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 7fabcf6fed93545cea5f8e4fdace4355bb5710ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fabcf6fed93545cea5f8e4f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 18 17:14:29 2021 +0800 winex11.drv: Add a cache for querying XRandR 1.4 current modes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51047 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 120 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 104 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fa748c2af04..c3af35d8ec3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -324,6 +324,32 @@ static LONG xrandr10_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) #ifdef HAVE_XRRGETPROVIDERRESOURCES +static struct current_mode +{ + ULONG_PTR id; + BOOL loaded; + DEVMODEW mode; +} *current_modes; +static int current_mode_count; + +static CRITICAL_SECTION current_modes_section; +static CRITICAL_SECTION_DEBUG current_modes_critsect_debug = +{ + 0, 0, &current_modes_section, + {&current_modes_critsect_debug.ProcessLocksList, &current_modes_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": current_modes_section")} +}; +static CRITICAL_SECTION current_modes_section = {&current_modes_critsect_debug, -1, 0, 0, 0, 0}; + +static void xrandr14_invalidate_current_mode_cache(void) +{ + EnterCriticalSection( &current_modes_section ); + heap_free( current_modes); + current_modes = NULL; + current_mode_count = 0; + LeaveCriticalSection( &current_modes_section ); +} + static XRRScreenResources *xrandr_get_screen_resources(void) { XRRScreenResources *resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ); @@ -1115,6 +1141,7 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { + xrandr14_invalidate_current_mode_cache(); if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) { /* Don't send a WM_DISPLAYCHANGE message here because this event may be a result from @@ -1148,7 +1175,8 @@ static void xrandr14_register_event_handlers(void) /* XRandR 1.4 display settings handler */ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) { - INT gpu_count, adapter_count, display_count = 0; + struct current_mode *tmp_modes, *new_current_modes = NULL; + INT gpu_count, adapter_count, new_current_mode_count = 0; INT gpu_idx, adapter_idx, display_idx; struct x11drv_adapter *adapters; struct x11drv_gpu *gpus; @@ -1159,31 +1187,60 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) if (*end) return FALSE; - if (!xrandr14_get_gpus2( &gpus, &gpu_count, FALSE )) - return FALSE; - - for (gpu_idx = 0; gpu_idx < gpu_count; ++gpu_idx) + /* Update cache */ + EnterCriticalSection( &current_modes_section ); + if (!current_modes) { - if (!xrandr14_get_adapters( gpus[gpu_idx].id, &adapters, &adapter_count )) + if (!xrandr14_get_gpus2( &gpus, &gpu_count, FALSE )) { - xrandr14_free_gpus( gpus ); + LeaveCriticalSection( &current_modes_section ); return FALSE; } - adapter_idx = display_idx - display_count; - if (adapter_idx < adapter_count) + for (gpu_idx = 0; gpu_idx < gpu_count; ++gpu_idx) { - *id = adapters[adapter_idx].id; + if (!xrandr14_get_adapters( gpus[gpu_idx].id, &adapters, &adapter_count )) + break; + + if (!new_current_modes) + tmp_modes = heap_alloc( adapter_count * sizeof(*tmp_modes) ); + else + tmp_modes = heap_realloc( new_current_modes, (new_current_mode_count + adapter_count) * sizeof(*tmp_modes) ); + + if (!tmp_modes) + { + xrandr14_free_adapters( adapters ); + break; + } + new_current_modes = tmp_modes; + + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + new_current_modes[new_current_mode_count + adapter_idx].id = adapters[adapter_idx].id; + new_current_modes[new_current_mode_count + adapter_idx].loaded = FALSE; + } + new_current_mode_count += adapter_count; xrandr14_free_adapters( adapters ); - xrandr14_free_gpus( gpus ); - return TRUE; } + xrandr14_free_gpus( gpus ); - display_count += adapter_count; - xrandr14_free_adapters( adapters ); + if (new_current_modes) + { + heap_free( current_modes ); + current_modes = new_current_modes; + current_mode_count = new_current_mode_count; + } } - xrandr14_free_gpus( gpus ); - return FALSE; + + if (display_idx >= current_mode_count) + { + LeaveCriticalSection( &current_modes_section ); + return FALSE; + } + + *id = current_modes[display_idx].id; + LeaveCriticalSection( &current_modes_section ); + return TRUE; } static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency, @@ -1342,6 +1399,21 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) RECT primary; INT mode_idx; + EnterCriticalSection( &current_modes_section ); + for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) + { + if (current_modes[mode_idx].id != id) + continue; + + if (!current_modes[mode_idx].loaded) + break; + + memcpy( mode, &current_modes[mode_idx].mode, sizeof(*mode) ); + LeaveCriticalSection( &current_modes_section ); + return TRUE; + } + LeaveCriticalSection( &current_modes_section ); + screen_resources = xrandr_get_screen_resources(); if (!screen_resources) goto done; @@ -1400,6 +1472,21 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->u1.s2.dmPosition.x = crtc_info->x - primary.left; mode->u1.s2.dmPosition.y = crtc_info->y - primary.top; ret = TRUE; + + EnterCriticalSection( &current_modes_section ); + for (mode_idx = 0; mode_idx < current_mode_count; ++mode_idx) + { + if (current_modes[mode_idx].id != id) + continue; + + memcpy( &current_modes[mode_idx].mode, mode, sizeof(*mode) ); + current_modes[mode_idx].mode.dmSize = sizeof(*mode); + current_modes[mode_idx].mode.dmDriverExtra = 0; + current_modes[mode_idx].loaded = TRUE; + break; + } + LeaveCriticalSection( &current_modes_section ); + done: if (crtc_info) pXRRFreeCrtcInfo( crtc_info ); @@ -1517,6 +1604,7 @@ done: if (output_info) pXRRFreeOutputInfo( output_info ); pXRRFreeScreenResources( screen_resources ); + xrandr14_invalidate_current_mode_cache(); return ret; }

1 0

Dongwan Kim : gdiplus: Implement GdipEnumerateMetafileSrcRectDestRectI.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: aa54278250333abcebeb19ed35842a979850a403 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa54278250333abcebeb19ed… Author: Dongwan Kim <kdw6485(a)gmail.com> Date: Thu May 13 12:09:27 2021 +0900 gdiplus: Implement GdipEnumerateMetafileSrcRectDestRectI. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bda8bd56a3f..15d9b5d81e8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -201,7 +201,7 @@ 201 stdcall GdipEnumerateMetafileSrcRectDestPoints(ptr ptr ptr long ptr long ptr ptr ptr) 202 stub GdipEnumerateMetafileSrcRectDestPointsI 203 stdcall GdipEnumerateMetafileSrcRectDestRect(ptr ptr ptr ptr long ptr ptr ptr) -204 stub GdipEnumerateMetafileSrcRectDestRectI +204 stdcall GdipEnumerateMetafileSrcRectDestRectI(ptr ptr ptr ptr long ptr ptr ptr) 205 stdcall GdipFillClosedCurve2(ptr ptr ptr long float long) 206 stdcall GdipFillClosedCurve2I(ptr ptr ptr long float long) 207 stdcall GdipFillClosedCurve(ptr ptr ptr long) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f4824d4257b..d79c939218c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3666,6 +3666,25 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRect( GpGraphics *graphics, return GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, points, 3, src, srcUnit, callback, cb_data, attrs); } +GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRectI( GpGraphics * graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST Rect *destRect, + GDIPCONST Rect *srcRect, Unit srcUnit, EnumerateMetafileProc callback, + VOID *cb_data, GDIPCONST GpImageAttributes *attrs ) +{ + GpRectF destRectF, srcRectF; + + destRectF.X = destRect->X; + destRectF.Y = destRect->Y; + destRectF.Width = destRect->Width; + destRectF.Height = destRect->Height; + + srcRectF.X = srcRect->X; + srcRectF.Y = srcRect->Y; + srcRectF.Width = srcRect->Width; + srcRectF.Height = srcRect->Height; + + return GdipEnumerateMetafileSrcRectDestRect( graphics, metafile, &destRectF, &srcRectF, srcUnit, callback, cb_data, attrs); +} GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST GpRectF *dest,

1 0

Piotr Caban : msvcrt: Import modf implementation from musl.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 9984a5d661ff45b5e273dedaea9f80f0c1479ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9984a5d661ff45b5e273deda… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:08:37 2021 +0200 msvcrt: Import modf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index de0db9cca50..a860dfc3d2b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2000,10 +2000,40 @@ double CDECL frexp( double x, int *exp ) /********************************************************************* * modf (MSVCRT.@) + * + * Copied from musl: src/math/modf.c */ double CDECL modf( double x, double *iptr ) { - return unix_funcs->modf( x, iptr ); + union {double f; UINT64 i;} u = {x}; + UINT64 mask; + int e = (u.i >> 52 & 0x7ff) - 0x3ff; + + /* no fractional part */ + if (e >= 52) { + *iptr = x; + if (e == 0x400 && u.i << 12 != 0) /* nan */ + return x; + u.i &= 1ULL << 63; + return u.f; + } + + /* no integral part*/ + if (e < 0) { + u.i &= 1ULL << 63; + *iptr = u.f; + return x; + } + + mask = -1ULL >> 12 >> e; + if ((u.i & mask) == 0) { + *iptr = x; + u.i &= 1ULL << 63; + return u.f; + } + u.i &= ~mask; + *iptr = u.f; + return x - u.f; } /********************************************************************** diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index a2bae9c6e5e..2a3d8ed4090 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -459,14 +459,6 @@ static float CDECL unix_logbf( float x ) return logbf( x ); } -/********************************************************************* - * modf - */ -static double CDECL unix_modf( double x, double *iptr ) -{ - return modf( x, iptr ); -} - /********************************************************************* * modff */ @@ -674,7 +666,6 @@ static const struct unix_funcs funcs = unix_log2f, unix_logb, unix_logbf, - unix_modf, unix_modff, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index edb9e99d3e4..080c9da9d08 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -62,7 +62,6 @@ struct unix_funcs float (CDECL *log2f)(float x); double (CDECL *logb)(double x); float (CDECL *logbf)(float x); - double (CDECL *modf)(double x, double *iptr); float (CDECL *modff)(float x, float *iptr); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y);

1 0

Piotr Caban : msvcrt: Import remquo implementation from musl.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: c7fa4673769c42bfb1b44ebfc7c981b458784e5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7fa4673769c42bfb1b44ebf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 18 19:09:00 2021 +0200 msvcrt: Import remquo implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 --------- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 -- 6 files changed, 78 insertions(+), 23 deletions(-) diff --git a/configure b/configure index ac738ca964b..b243f0280f5 100755 --- a/configure +++ b/configure @@ -19640,7 +19640,6 @@ for ac_func in \ log2f \ remainder \ remainderf \ - remquo \ remquof \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index 4c98c3e5597..8942a3eefc2 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,7 +2680,6 @@ AC_CHECK_FUNCS(\ log2f \ remainder \ remainderf \ - remquo \ remquof \ tgamma \ tgammaf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index fab505abfb5..f4c5c69fc4b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5496,12 +5496,87 @@ float CDECL remainderf(float x, float y) /********************************************************************* * remquo (MSVCR120.@) + * + * Copied from musl: src/math/remquo.c */ double CDECL remquo(double x, double y, int *quo) { - if(!isfinite(x)) *_errno() = EDOM; - if(isnan(y) || y==0.0) *_errno() = EDOM; - return unix_funcs->remquo( x, y, quo ); + UINT64 uxi = *(UINT64*)&x; + UINT64 uyi = *(UINT64*)&y; + int ex = uxi >> 52 & 0x7ff; + int ey = uyi >> 52 & 0x7ff; + int sx = uxi >> 63; + int sy = uyi >> 63; + UINT32 q; + UINT64 i; + + *quo = 0; + if (y == 0 || isinf(x)) *_errno() = EDOM; + if (uyi << 1 == 0 || isnan(y) || ex == 0x7ff) + return (x * y) / (x * y); + if (uxi << 1 == 0) + return x; + + /* normalize x and y */ + if (!ex) { + for (i = uxi << 12; i >> 63 == 0; ex--, i <<= 1); + uxi <<= -ex + 1; + } else { + uxi &= -1ULL >> 12; + uxi |= 1ULL << 52; + } + if (!ey) { + for (i = uyi << 12; i >> 63 == 0; ey--, i <<= 1); + uyi <<= -ey + 1; + } else { + uyi &= -1ULL >> 12; + uyi |= 1ULL << 52; + } + + q = 0; + if (ex < ey) { + if (ex+1 == ey) + goto end; + return x; + } + + /* x mod y */ + for (; ex > ey; ex--) { + i = uxi - uyi; + if (i >> 63 == 0) { + uxi = i; + q++; + } + uxi <<= 1; + q <<= 1; + } + i = uxi - uyi; + if (i >> 63 == 0) { + uxi = i; + q++; + } + if (uxi == 0) + ex = -60; + else + for (; uxi >> 52 == 0; uxi <<= 1, ex--); +end: + /* scale result and decide between |x| and |x|-|y| */ + if (ex > 0) { + uxi -= 1ULL << 52; + uxi |= (UINT64)ex << 52; + } else { + uxi >>= -ex + 1; + } + x = *(double*)&uxi; + if (sy) + y = -y; + if (ex == ey || (ex + 1 == ey && (2 * x > y || (2 * x == y && q % 2)))) { + x -= y; + q++; + } + q &= 0x7fffffff; + *quo = sx ^ sy ? -(int)q : (int)q; + return sx ? -x : x; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 62c6a5ae189..05d8c2bd83a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -501,19 +501,6 @@ static float CDECL unix_remainderf(float x, float y) #endif } -/********************************************************************* - * remquo - */ -static double CDECL unix_remquo(double x, double y, int *quo) -{ -#ifdef HAVE_REMQUO - return remquo(x, y, quo); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * remquof */ @@ -662,7 +649,6 @@ static const struct unix_funcs funcs = unix_powf, unix_remainder, unix_remainderf, - unix_remquo, unix_remquof, unix_sin, unix_sinf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 69f4e02f321..9f91c097d71 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -66,7 +66,6 @@ struct unix_funcs float (CDECL *powf)(float x, float y); double (CDECL *remainder)(double x, double y); float (CDECL *remainderf)(float x, float y); - double (CDECL *remquo)(double x, double y, int *quo); float (CDECL *remquof)(float x, float y, int *quo); double (CDECL *sin)(double x); float (CDECL *sinf)(float x); diff --git a/include/config.h.in b/include/config.h.in index bf7fc0d4e9b..7d0c5e934e6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -636,9 +636,6 @@ /* Define to 1 if you have the `remainderf' function. */ #undef HAVE_REMAINDERF -/* Define to 1 if you have the `remquo' function. */ -#undef HAVE_REMQUO - /* Define to 1 if you have the `remquof' function. */ #undef HAVE_REMQUOF

1 0

Hans Leidekker : webservices: Add async support in WsOpenChannel.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 69fa6f21654544ad521da9484fc57970cb426d47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69fa6f21654544ad521da948… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:45 2021 +0200 webservices: Add async support in WsOpenChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 48 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 458815ea7cc..bc65f0943bf 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1177,18 +1177,52 @@ static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS return hr; } +struct open_channel +{ + struct task task; + struct channel *channel; + const WS_ENDPOINT_ADDRESS *endpoint; + WS_ASYNC_CONTEXT ctx; +}; + +static void open_channel_proc( struct task *task ) +{ + struct open_channel *o = (struct open_channel *)task; + HRESULT hr; + + hr = open_channel( o->channel, o->endpoint ); + + TRACE( "calling %p(%08x)\n", o->ctx.callback, hr ); + o->ctx.callback( hr, WS_LONG_CALLBACK, o->ctx.callbackState ); + TRACE( "%p returned\n", o->ctx.callback ); +} + +static HRESULT queue_open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint, + const WS_ASYNC_CONTEXT *ctx ) +{ + struct open_channel *o; + + if (!(o = heap_alloc( sizeof(*o) ))) return E_OUTOFMEMORY; + o->task.proc = open_channel_proc; + o->channel = channel; + o->endpoint = endpoint; + o->ctx = *ctx; + return queue_task( &channel->send_q, &o->task ); +} + /************************************************************************** * WsOpenChannel [webservices.@] */ -HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, - const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !endpoint) return E_INVALIDARG; @@ -1205,7 +1239,13 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return WS_E_INVALID_OPERATION; } - hr = open_channel( channel, endpoint ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_open_channel( channel, endpoint, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0

Hans Leidekker : webservices: Always queue an async in WsReceiveMessage and WsRequestReply.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 96d2c61aa6630a20ba76dd7c624372c19aeb8fb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d2c61aa6630a20ba76dd7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:42 2021 +0200 webservices: Always queue an async in WsReceiveMessage and WsRequestReply. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 58 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 69ceb2f051e..76b0c1a96e2 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -771,6 +771,34 @@ static HRESULT send_byte( SOCKET socket, BYTE byte ) return S_OK; } +struct async +{ + HRESULT hr; + HANDLE done; +}; + +static void CALLBACK async_callback( HRESULT hr, WS_CALLBACK_MODEL model, void *state ) +{ + struct async *async = state; + async->hr = hr; + SetEvent( async->done ); +} + +static void async_init( struct async *async, WS_ASYNC_CONTEXT *ctx ) +{ + async->done = CreateEventW( NULL, FALSE, FALSE, NULL ); + async->hr = E_FAIL; + ctx->callback = async_callback; + ctx->callbackState = async; +} + +static HRESULT async_wait( struct async *async ) +{ + DWORD err; + if ((err = WaitForSingleObject( async->done, INFINITE )) == WAIT_OBJECT_0) return async->hr; + return HRESULT_FROM_WIN32( err ); +} + static HRESULT shutdown_session( struct channel *channel ) { HRESULT hr; @@ -2154,6 +2182,8 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M void *value, ULONG size, ULONG *index, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %u %08x %08x %p %p %u %p %p %p\n", handle, msg, desc, count, option, read_option, heap, @@ -2170,10 +2200,14 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M return E_INVALIDARG; } - if (ctx) - hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, ctx ); - else - hr = receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, + ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); @@ -2266,6 +2300,8 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS WS_HEAP *heap, void *value, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %08x %p %u %p %p %08x %p %p %u %p %p\n", handle, request, request_desc, write_option, @@ -2287,12 +2323,14 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS return WS_E_INVALID_OPERATION; } - if (ctx) - hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, - reply_desc, read_option, heap, value, size, ctx ); - else - hr = request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, - reply_desc, read_option, heap, value, size ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, + reply_desc, read_option, heap, value, size, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0