November 2022 - Wine-Commits

Zhiyi Zhang : winecfg: Adjust top-level window rectangles after theme changes.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 957dfccb14a4ba73c8a9e2f8edfaa6d324c685b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/957dfccb14a4ba73c8a9e2f8edfaa6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Oct 20 22:47:41 2022 +0800 winecfg: Adjust top-level window rectangles after theme changes. Manual tests show that calling EnableTheming() in uxtheme.dll doesn't update window sizes. So it seems more appropriate to do it in winecfg.exe. --- programs/winecfg/theme.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index d66d31837e6..621b471455f 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1107,6 +1107,24 @@ static void update_mime_types(HWND hDlg) set_reg_key(config_key, keypath(L"FileOpenAssociations"), L"Enable", state); } +static BOOL CALLBACK update_window_pos_proc(HWND hwnd, LPARAM lp) +{ + RECT rect; + + GetClientRect(hwnd, &rect); + AdjustWindowRectEx(&rect, GetWindowLongW(hwnd, GWL_STYLE), !!GetMenu(hwnd), + GetWindowLongW(hwnd, GWL_EXSTYLE)); + SetWindowPos(hwnd, 0, 0, 0, rect.right - rect.left, rect.bottom - rect.top, + SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + return TRUE; +} + +/* Adjust the rectangle for top-level windows because the new non-client metrics may be different */ +static void update_window_pos(void) +{ + EnumWindows(update_window_pos_proc, 0); +} + INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1261,6 +1279,7 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) read_shell_folder_link_targets(); update_shell_folder_listview(hDlg); update_mime_types(hDlg); + update_window_pos(); SetWindowLongPtrW(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; }

1 0

Alex Henrie : include: Include minidumpapiset.h in imagehlp.h.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: abf03748af822401390c4118016c794074acbe2c URL: https://gitlab.winehq.org/wine/wine/-/commit/abf03748af822401390c4118016c79… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Nov 1 21:31:03 2022 -0600 include: Include minidumpapiset.h in imagehlp.h. Needed to compile Tera Term. --- dlls/imagehlp/access.c | 1 + dlls/imagehlp/imagehlp_main.c | 1 + dlls/imagehlp/integrity.c | 1 + dlls/imagehlp/modify.c | 1 + dlls/imagehlp/tests/integrity.c | 1 + dlls/wintrust/crypt.c | 1 + include/imagehlp.h | 1 + 7 files changed, 7 insertions(+) diff --git a/dlls/imagehlp/access.c b/dlls/imagehlp/access.c index f0b5814dead..d9e3731dc02 100644 --- a/dlls/imagehlp/access.c +++ b/dlls/imagehlp/access.c @@ -25,6 +25,7 @@ #include "winnt.h" #include "winternl.h" #include "winerror.h" +#include "winver.h" #include "wine/debug.h" #include "imagehlp.h" diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index 183b744dab0..8a7cbf8b929 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winver.h" #include "imagehlp.h" #include "wine/debug.h" diff --git a/dlls/imagehlp/integrity.c b/dlls/imagehlp/integrity.c index c2759c027f4..0085387159d 100644 --- a/dlls/imagehlp/integrity.c +++ b/dlls/imagehlp/integrity.c @@ -29,6 +29,7 @@ #include "winerror.h" #include "winternl.h" #include "winnt.h" +#include "winver.h" #include "imagehlp.h" #include "wine/debug.h" diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index aa93ee63365..3cb5dd800fd 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winternl.h" #include "winerror.h" +#include "winver.h" #include "wine/debug.h" #include "imagehlp.h" diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index ae3b2d23d64..4081fa2f6d7 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -25,6 +25,7 @@ #include "winuser.h" #include "winerror.h" #include "winnt.h" +#include "winver.h" #include "imagehlp.h" #define PSAPI_VERSION 1 #include "psapi.h" diff --git a/dlls/wintrust/crypt.c b/dlls/wintrust/crypt.c index 5d320c9a009..ac3ac9251f1 100644 --- a/dlls/wintrust/crypt.c +++ b/dlls/wintrust/crypt.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wintrust.h" +#include "winver.h" #include "mscat.h" #include "mssip.h" #include "imagehlp.h" diff --git a/include/imagehlp.h b/include/imagehlp.h index 0d146d7a166..87f16c3ede3 100644 --- a/include/imagehlp.h +++ b/include/imagehlp.h @@ -22,6 +22,7 @@ #define __WINE_IMAGEHLP_H #include <wintrust.h> +#include <minidumpapiset.h> #ifdef __cplusplus extern "C" {

1 0

Stefan Dösinger : ntdll: Fix building on Mojave / Xcode 11.3.1.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 97bef536a341c20a1699e4fb8ec860d78b338538 URL: https://gitlab.winehq.org/wine/wine/-/commit/97bef536a341c20a1699e4fb8ec860… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 2 07:03:43 2022 +0300 ntdll: Fix building on Mojave / Xcode 11.3.1. _STRUCT_X86_THREAD_FULL_STATE64 exists, but _STRUCT_MCONTEXT64_FULL and _STRUCT_MCONTEXT_AVX64_FULL do not. --- dlls/ntdll/unix/signal_x86_64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 41f860ac4f4..72f4a56d764 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -223,7 +223,9 @@ _STRUCT_X86_THREAD_FULL_STATE64 __uint64_t __ss; __uint64_t __gsbase; }; +#endif +#ifndef _STRUCT_MCONTEXT64_FULL #define _STRUCT_MCONTEXT64_FULL struct __darwin_mcontext64_full _STRUCT_MCONTEXT64_FULL { @@ -231,7 +233,9 @@ _STRUCT_MCONTEXT64_FULL _STRUCT_X86_THREAD_FULL_STATE64 __ss; _STRUCT_X86_FLOAT_STATE64 __fs; }; +#endif +#ifndef _STRUCT_MCONTEXT_AVX64_FULL #define _STRUCT_MCONTEXT_AVX64_FULL struct __darwin_mcontext_avx64_full _STRUCT_MCONTEXT_AVX64_FULL {

1 0

Zhiyi Zhang : winecfg: Use SM_CYSIZE to set and get caption height.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 982c9974a76e9f59bbab5385df868498c8a95bde URL: https://gitlab.winehq.org/wine/wine/-/commit/982c9974a76e9f59bbab5385df8684… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Oct 19 16:42:49 2022 +0800 winecfg: Use SM_CYSIZE to set and get caption height. After applying a theme with CaptionBarHeight set, caption height from SPI_GETNONCLIENTMETRICS is set to the specified size. However in refresh_sysparams(), the caption height is refreshed and the value from SM_CXSIZE is used and ends up overwriting the theme specified caption height. SM_CYSIZE is the correct index instead of SM_CXSIZE. You may need to turn a theme off and on for the correct caption height to take effect after the fix. --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 78bbf71dbfa..d66d31837e6 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -508,7 +508,7 @@ static struct {-1, COLOR_INFOTEXT, L"InfoText" }, /* IDC_SYSPARAMS_TOOLTIP_TEXT */ {-1, COLOR_WINDOW, L"Window" }, /* IDC_SYSPARAMS_WINDOW */ {-1, COLOR_WINDOWTEXT, L"WindowText" }, /* IDC_SYSPARAMS_WINDOW_TEXT */ - {SM_CXSIZE, COLOR_ACTIVECAPTION, L"ActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE */ + {SM_CYSIZE, COLOR_ACTIVECAPTION, L"ActiveTitle" }, /* IDC_SYSPARAMS_ACTIVE_TITLE */ {-1, COLOR_CAPTIONTEXT, L"TitleText" }, /* IDC_SYSPARAMS_ACTIVE_TITLE_TEXT */ {-1, COLOR_INACTIVECAPTION, L"InactiveTitle" }, /* IDC_SYSPARAMS_INACTIVE_TITLE */ {-1, COLOR_INACTIVECAPTIONTEXT,L"InactiveTitleText" }, /* IDC_SYSPARAMS_INACTIVE_TITLE_TEXT */

1 0

Rémi Bernon : winebus.sys: Ignore SDL events for devices which aren't started.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: d3bca13483b220361286a96f729f244db202f715 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3bca13483b220361286a96f729f24… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 12 14:14:43 2022 +0200 winebus.sys: Ignore SDL events for devices which aren't started. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53666 --- dlls/winebus.sys/bus_sdl.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 39432ce9f17..1af029bed65 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -137,6 +137,7 @@ struct sdl_device SDL_Joystick *sdl_joystick; SDL_GameController *sdl_controller; SDL_JoystickID id; + BOOL started; DWORD effect_support; SDL_Haptic *sdl_haptic; @@ -439,8 +440,17 @@ static void sdl_device_destroy(struct unix_device *iface) static NTSTATUS sdl_device_start(struct unix_device *iface) { struct sdl_device *impl = impl_from_unix_device(iface); - if (impl->sdl_controller) return build_controller_report_descriptor(iface); - return build_joystick_report_descriptor(iface); + NTSTATUS status; + + pthread_mutex_lock(&sdl_cs); + + if (impl->sdl_controller) status = build_controller_report_descriptor(iface); + else status = build_joystick_report_descriptor(iface); + impl->started = !status; + + pthread_mutex_unlock(&sdl_cs); + + return status; } static void sdl_device_stop(struct unix_device *iface) @@ -452,6 +462,7 @@ static void sdl_device_stop(struct unix_device *iface) if (impl->sdl_haptic) pSDL_HapticClose(impl->sdl_haptic); pthread_mutex_lock(&sdl_cs); + impl->started = FALSE; list_remove(&impl->unix_device.entry); pthread_mutex_unlock(&sdl_cs); } @@ -1009,13 +1020,14 @@ static void process_device_event(SDL_Event *event) id = ((SDL_JoyDeviceEvent *)event)->which; impl = find_device_from_id(id); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); - else WARN("failed to find device with id %d\n", id); + else WARN("Failed to find device with id %d\n", id); } else if (event->type == SDL_JOYAXISMOTION && options.split_controllers) { id = event->jaxis.which; impl = find_device_from_id_and_axis(id, event->jaxis.axis); - if (!impl) WARN("failed to find device with id %d for axis %d\n", id, event->jaxis.axis); + if (!impl) WARN("Failed to find device with id %d for axis %d\n", id, event->jaxis.axis); + else if (!impl->started) WARN("Device %p with id %d is stopped, ignoring event %#x\n", impl, id, event->type); else { event->jaxis.axis -= impl->axis_offset; @@ -1026,15 +1038,17 @@ static void process_device_event(SDL_Event *event) { id = ((SDL_JoyButtonEvent *)event)->which; impl = find_device_from_id(id); - if (impl) set_report_from_joystick_event(impl, event); - else WARN("failed to find device with id %d\n", id); + if (!impl) WARN("Failed to find device with id %d\n", id); + else if (!impl->started) WARN("Device %p with id %d is stopped, ignoring event %#x\n", impl, id, event->type); + else set_report_from_joystick_event(impl, event); } else if (event->type >= SDL_CONTROLLERAXISMOTION && event->type <= SDL_CONTROLLERBUTTONUP) { id = ((SDL_ControllerButtonEvent *)event)->which; impl = find_device_from_id(id); - if (impl) set_report_from_controller_event(impl, event); - else WARN("failed to find device with id %d\n", id); + if (!impl) WARN("Failed to find device with id %d\n", id); + else if (!impl->started) WARN("Device %p with id %d is stopped, ignoring event %#x\n", impl, id, event->type); + else set_report_from_controller_event(impl, event); } pthread_mutex_unlock(&sdl_cs);

1 0

Rémi Bernon : winmm: Add missing void parameter in function definition.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 764f91e5ba21d733dd5707812a42eaff5e932a7e URL: https://gitlab.winehq.org/wine/wine/-/commit/764f91e5ba21d733dd5707812a42ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 2 13:12:01 2022 +0100 winmm: Add missing void parameter in function definition. --- dlls/winmm/joystick.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 572cbb82e90..0285074bd40 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -159,7 +159,7 @@ static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **cont return TRUE; } -void joystick_unload() +void joystick_unload(void) { int i;

1 0

Rémi Bernon : winmm: Use a separate last_check for joyGetDevCapsW and joyGetPosEx.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: f7ca911a6b2f24cafa1f32c47d70359c41a5a656 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7ca911a6b2f24cafa1f32c47d7035… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 2 13:11:30 2022 +0100 winmm: Use a separate last_check for joyGetDevCapsW and joyGetPosEx. Fixing spurious tests failures on the testbot. --- dlls/winmm/joystick.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 428593fa590..572cbb82e90 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -136,7 +136,6 @@ struct joystick static DIDEVICEINSTANCEW instances[16]; static struct joystick joysticks[16]; static IDirectInput8W *dinput; -static ULONG last_check; static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *context ) { @@ -313,6 +312,7 @@ UINT WINAPI DECLSPEC_HOTPATCH joyGetNumDevs(void) */ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsW( UINT_PTR id, JOYCAPSW *caps, UINT size ) { + static ULONG last_check; DIDEVICEOBJECTINSTANCEW instance = {.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW)}; DIDEVCAPS dicaps = {.dwSize = sizeof(DIDEVCAPS)}; DIPROPDWORD diprop = @@ -464,6 +464,7 @@ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetDevCapsA( UINT_PTR id, JOYCAPSA *caps, U */ MMRESULT WINAPI DECLSPEC_HOTPATCH joyGetPosEx( UINT id, JOYINFOEX *info ) { + static ULONG last_check; DWORD i, ticks = GetTickCount(); MMRESULT res = JOYERR_NOERROR; IDirectInputDevice8W *device;

1 0

Zhiyi Zhang : winex11.drv: Initialize escape.drawable in X11DRV_GetDC().
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 1d5e6d23ee0cc4fdaed6f4516195a04edab93080 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d5e6d23ee0cc4fdaed6f4516195a0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Nov 2 16:13:24 2022 +0800 winex11.drv: Initialize escape.drawable in X11DRV_GetDC(). Fix an uninitialized variable warning with GCC 12. --- dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 70a29d24fb1..e1fa665608e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2299,6 +2299,7 @@ void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.code = X11DRV_SET_DRAWABLE; escape.mode = IncludeInferiors; + escape.drawable = 0; escape.dc_rect.left = win_rect->left - top_rect->left; escape.dc_rect.top = win_rect->top - top_rect->top;

1 0

Bartosz Kosiorek : msvcp90: Add _Wclog_func implementation.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 8b5b111f164b18687216c3b6cd057c801b00e5b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b5b111f164b18687216c3b6cd057c… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Oct 30 22:23:03 2022 +0100 msvcp90: Add _Wclog_func implementation. --- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/ios.c | 14 ++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 423e703d34c..b5fdab98fde 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2828,10 +2828,10 @@ @ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcin_func_short @ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func @ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func -@ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wclog_func_short +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wclog_func_short +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcout_func_short @ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcout_func_short @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a6231af7257..662c159fcc3 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -16010,6 +16010,20 @@ basic_ostream_char* __cdecl _Clog_func(void) return &MSVCP_clog.obj; } +/* ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ */ +/* ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ */ +basic_ostream_wchar* __cdecl _Wclog_func_short(void) +{ + return &uclog.obj; +} + +/* ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ */ +/* ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ */ +basic_ostream_wchar* __cdecl _Wclog_func(void) +{ + return &wclog.obj; +} + /* ?_Cerr_func(a)std@@YAAAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ */ /* ?_Cerr_func(a)std@@YAAEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)XZ */ basic_ostream_char* __cdecl _Cerr_func(void) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 7194dfb477c..a42a296d320 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3171,10 +3171,10 @@ @ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcin_func_short @ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func @ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func -@ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wclog_func_short +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wclog_func_short +@ cdecl -arch=win32 ?_Wclog_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func +@ cdecl -arch=win64 ?_Wclog_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wclog_func @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcout_func_short @ cdecl -arch=win64 ?_Wcout_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcout_func_short @ cdecl -arch=win32 ?_Wcout_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcout_func

1 0

Bartosz Kosiorek : msvcp90: Add _Wcerr_func implementation.
by Alexandre Julliard Nov. 2, 2022

Nov. 2, 2022

Module: wine Branch: master Commit: 5258c8b952dc0daf55252a31e84b0c9f40a20988 URL: https://gitlab.winehq.org/wine/wine/-/commit/5258c8b952dc0daf55252a31e84b0c… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Sun Oct 30 22:23:04 2022 +0100 msvcp90: Add _Wcerr_func implementation. --- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/ios.c | 14 ++++++++++++++ dlls/msvcp90/msvcp90.spec | 8 ++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index b5fdab98fde..06816896d06 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -2820,10 +2820,10 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock(a)_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcerr_func_short +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcerr_func_short +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func @ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcin_func_short @ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcin_func_short @ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 662c159fcc3..1240bb537c9 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -16030,3 +16030,17 @@ basic_ostream_char* __cdecl _Cerr_func(void) { return &cerr.obj; } + +/* ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ */ +/* ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ */ +basic_ostream_wchar* __cdecl _Wcerr_func_short(void) +{ + return &ucerr.obj; +} + +/* ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ */ +/* ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ */ +basic_ostream_wchar* __cdecl _Wcerr_func(void) +{ + return &wcerr.obj; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index a42a296d320..766f248aaa6 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3163,10 +3163,10 @@ @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@QEAAXXZ(ptr) basic_streambuf_wchar__Unlock @ thiscall -arch=win32 ?_Unlock(a)_Mutex@std@@QAEXXZ(ptr) mutex_unlock @ cdecl -arch=win64 ?_Unlock(a)_Mutex@std@@QEAAXXZ(ptr) mutex_unlock -@ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ -@ stub -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ -@ stub -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcerr_func_short +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcerr_func_short +@ cdecl -arch=win32 ?_Wcerr_func(a)std@@YAAAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func +@ cdecl -arch=win64 ?_Wcerr_func(a)std@@YAAEAV?$basic_ostream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcerr_func @ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcin_func_short @ cdecl -arch=win64 ?_Wcin_func(a)std@@YAAEAV?$basic_istream(a)GU?$char_traits(a)G@std@@@1(a)XZ() _Wcin_func_short @ cdecl -arch=win32 ?_Wcin_func(a)std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@1(a)XZ() _Wcin_func

1 0