- Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : odbc32: Correct SQLSetConnectOptionW length parameter type.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 55842cee31c6ccc6b86c6d4b753c0a7be4bd5159 URL: https://gitlab.winehq.org/wine/wine/-/commit/55842cee31c6ccc6b86c6d4b753c0a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:27:00 2024 +1000 odbc32: Correct SQLSetConnectOptionW length parameter type. --- dlls/odbc32/proxyodbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d5c271bdfa2..a3732c001be 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -2488,7 +2488,7 @@ SQLRETURN WINAPI SQLGetTypeInfoW(SQLHSTMT StatementHandle, SQLSMALLINT DataType) /************************************************************************* * SQLSetConnectOptionW [ODBC32.150] */ -SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLLEN Value) +SQLRETURN WINAPI SQLSetConnectOptionW(SQLHDBC ConnectionHandle, SQLUSMALLINT Option, SQLULEN Value) { struct SQLSetConnectOptionW_params params = { 0, Option, Value }; struct handle *handle = ConnectionHandle;

1 0

Alistair Leslie-Hughes : include: Correct ListView_GetItemIndexRect macro.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: ccc803a06c98a0ead3cd877ac7b452e168c29751 URL: https://gitlab.winehq.org/wine/wine/-/commit/ccc803a06c98a0ead3cd877ac7b452… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:26:29 2024 +1000 include: Correct ListView_GetItemIndexRect macro. --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index a54de13d8b2..7c5b09f6e72 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4211,7 +4211,7 @@ typedef struct tagLVITEMINDEX SNDMSG((hwnd), LVM_GETGROUPCOUNT, (WPARAM)0, (LPARAM)0) #define ListView_GetItemIndexRect(hwnd, index, subitem, code, prc) \ (BOOL)SNDMSG((hwnd), LVM_GETITEMINDEXRECT, (WPARAM)(LVITEMINDEX*)(index), \ - (prc ? ((((LPRECT)prc)->top = subitem), (((LPRECT)prc)->left = code), (LPARAM)prc) : (LPARAM)NULL) + (prc ? ((((LPRECT)prc)->top = subitem), (((LPRECT)prc)->left = code), (LPARAM)prc) : (LPARAM)NULL)) #define ListView_SetItemIndexState(hwndLV, index, data, mask) \ { LV_ITEM macro; macro.stateMask = (mask); macro.state = data; \ SNDMSG((hwndLV), LVM_SETITEMINDEXSTATE, (WPARAM)(LVITEMINDEX*)(index), (LPARAM)(LV_ITEM *)&macro); }

1 0

Rémi Bernon : win32u: Update the display device cache after loading the driver.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 4e1a049c9399e8a35b5fda7d317804fa2fcd4b7c URL: https://gitlab.winehq.org/wine/wine/-/commit/4e1a049c9399e8a35b5fda7d317804… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 11:43:32 2024 +0200 win32u: Update the display device cache after loading the driver. --- dlls/win32u/driver.c | 1 + dlls/winemac.drv/display.c | 13 ------------- dlls/winemac.drv/macdrv.h | 1 - dlls/winemac.drv/macdrv_main.c | 1 - dlls/winewayland.drv/display.c | 10 ---------- dlls/winewayland.drv/wayland.c | 2 -- dlls/winewayland.drv/waylanddrv.h | 1 - dlls/winex11.drv/display.c | 8 -------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 1 - 10 files changed, 1 insertion(+), 38 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 7c694d20a3c..3d4f01643c8 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1012,6 +1012,7 @@ static const struct user_driver_funcs *load_driver(void) __wine_set_user_driver( &null_user_driver, WINE_GDI_DRIVER_VERSION ); } + update_display_cache( FALSE ); return user_driver; } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index c933a770a79..4caae9c8444 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1206,16 +1206,3 @@ UINT macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage macdrv_free_displays(displays); return STATUS_SUCCESS; } - -/*********************************************************************** - * macdrv_init_display_devices - * - * Initialize display device registry data. - */ -void macdrv_init_display_devices(void) -{ - UINT32 num_path, num_mode; - - /* trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes( QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode ); -} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 3899fbb1d30..774d3505b5f 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -271,7 +271,6 @@ extern void macdrv_status_item_mouse_button(const macdrv_event *event); extern void macdrv_status_item_mouse_move(const macdrv_event *event); extern void check_retina_status(void); -extern void macdrv_init_display_devices(void); extern void macdrv_resize_desktop(void); extern void init_user_driver(void); diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index d42a85f257a..84e5818b8ce 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -451,7 +451,6 @@ static NTSTATUS macdrv_init(void *arg) } init_user_driver(); - macdrv_init_display_devices(); return STATUS_SUCCESS; } diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index aed1f65904a..51fae6aac8b 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -36,16 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); -void wayland_init_display_devices(void) -{ - UINT32 num_path, num_mode; - - TRACE("\n"); - - /* Trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes(QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode); -} - struct output_info { int x, y; diff --git a/dlls/winewayland.drv/wayland.c b/dlls/winewayland.drv/wayland.c index 2e82a1deee2..c94b35e173c 100644 --- a/dlls/winewayland.drv/wayland.c +++ b/dlls/winewayland.drv/wayland.c @@ -280,8 +280,6 @@ BOOL wayland_process_init(void) return FALSE; } - wayland_init_display_devices(); - process_wayland.initialized = TRUE; return TRUE; diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index bdc205a92d9..bc4d456ef50 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -223,7 +223,6 @@ struct wayland_shm_buffer */ BOOL wayland_process_init(void); -void wayland_init_display_devices(void); /********************************************************************** * Wayland output diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7238ba87ce2..f2780ccbf83 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -559,11 +559,3 @@ UINT X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manage host_handler.free_gpus( gpus, gpu_count ); return STATUS_SUCCESS; } - -void X11DRV_DisplayDevices_Init(void) -{ - UINT32 num_path, num_mode; - - /* trigger refresh in win32u */ - NtUserGetDisplayConfigBufferSizes( QDC_ONLY_ACTIVE_PATHS, &num_path, &num_mode ); -} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1aa71449af6..9f522778436 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -819,7 +819,6 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler); -extern void X11DRV_DisplayDevices_Init(void); extern void X11DRV_DisplayDevices_RegisterEventHandlers(void); extern BOOL X11DRV_DisplayDevices_SupportEventHandlers(void); /* Display device handler used in virtual desktop mode */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 420c254b7ca..9c00b16386e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -682,7 +682,6 @@ static NTSTATUS x11drv_init( void *arg ) if (use_xim) use_xim = xim_init( input_style ); init_user_driver(); - X11DRV_DisplayDevices_Init(); X11DRV_DisplayDevices_RegisterEventHandlers(); return STATUS_SUCCESS; }

1 0

Alistair Leslie-Hughes : include: Add IFACEMETHOD macros.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: ae6aa1c8a4787c26110eeb863d2eac52ded57553 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae6aa1c8a4787c26110eeb863d2eac… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:26:29 2024 +1000 include: Add IFACEMETHOD macros. --- include/objbase.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/objbase.h b/include/objbase.h index bae8de54bab..024d96ca7da 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -210,6 +210,11 @@ #define DECLARE_INTERFACE_(iface,ibase) interface DECLSPEC_NOVTABLE iface : public ibase #define DECLARE_INTERFACE_IID_(iface, ibase, iid) interface DECLSPEC_UUID(iid) DECLSPEC_NOVTABLE iface : public ibase +#define IFACEMETHOD(method) STDMETHOD(method) +#define IFACEMETHOD_(type,method) STDMETHOD_(type,method) +#define IFACEMETHODV(method) STDMETHODV(method) +#define IFACEMETHODV_(type,method) STDMETHODV_(type,method) + #define BEGIN_INTERFACE #define END_INTERFACE @@ -253,6 +258,11 @@ #define BEGIN_INTERFACE #define END_INTERFACE +#define IFACEMETHOD(method) STDMETHOD(method) +#define IFACEMETHOD_(type,method) STDMETHOD_(type,method) +#define IFACEMETHODV(method) STDMETHODV(method) +#define IFACEMETHODV_(type,method) STDMETHODV_(type,method) + #endif /* __cplusplus && !CINTERFACE */ #ifndef __IRpcStubBuffer_FWD_DEFINED__

1 0

Alistair Leslie-Hughes : include: Added sqlucode.h to sql.h.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: fc9fd3c5c3cb56479317ec46229d3f07f84716ac URL: https://gitlab.winehq.org/wine/wine/-/commit/fc9fd3c5c3cb56479317ec46229d3f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 27 17:27:00 2024 +1000 include: Added sqlucode.h to sql.h. --- include/sqlext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sqlext.h b/include/sqlext.h index 51e76a5a856..6a707f8e162 100644 --- a/include/sqlext.h +++ b/include/sqlext.h @@ -22,6 +22,7 @@ #define __SQLEXT_H #include <sql.h> +#include <sqlucode.h> #ifdef __cplusplus extern "C" {

1 0

Conor McCarthy : vkd3d: Check for mutable descriptor set allocation failure in d3d12_descriptor_heap_create_descriptor_set().
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: vkd3d Branch: master Commit: ae25c804984704264810dbd707ec3a9f373b27e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ae25c804984704264810dbd707ec3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 23 12:13:59 2024 +1000 vkd3d: Check for mutable descriptor set allocation failure in d3d12_descriptor_heap_create_descriptor_set(). --- libs/vkd3d/resource.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7a2f464c..c897d9f2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4284,12 +4284,14 @@ static HRESULT d3d12_descriptor_heap_create_descriptor_set(struct d3d12_descript VkDescriptorSetVariableDescriptorCountAllocateInfoEXT set_size; VkDescriptorSetAllocateInfo set_desc; VkResult vr; + HRESULT hr; if (!device->vk_descriptor_heap_layouts[set].vk_set_layout) { /* Set 0 uses mutable descriptors, and this set is unused. */ - if (!descriptor_heap->vk_descriptor_sets[0].vk_set) - d3d12_descriptor_heap_create_descriptor_set(descriptor_heap, device, 0); + if (!descriptor_heap->vk_descriptor_sets[0].vk_set + && FAILED(hr = d3d12_descriptor_heap_create_descriptor_set(descriptor_heap, device, 0))) + return hr; descriptor_set->vk_set = descriptor_heap->vk_descriptor_sets[0].vk_set; descriptor_set->vk_type = device->vk_descriptor_heap_layouts[set].type; return S_OK;

1 0

Alexandre Julliard : msvcp: Export the thiscall version of ios_base_Tidy.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: c0a5b58ef3af16c2f5b0b7d3b2153ba5cffe7c2f URL: https://gitlab.winehq.org/wine/wine/-/commit/c0a5b58ef3af16c2f5b0b7d3b2153b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 26 22:16:33 2024 +0200 msvcp: Export the thiscall version of ios_base_Tidy. --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp60/ios.c | 5 +++-- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp90/ios.c | 6 ++++++ dlls/msvcp_win/msvcp_win.spec | 4 ++-- 11 files changed, 23 insertions(+), 16 deletions(-)

1 0

Alexandre Julliard : msvcp120_app: Fix a typo in a C++ mangled name.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: ce23f76c1628578596bbf18e91de84cc1805d678 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce23f76c1628578596bbf18e91de84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 26 22:41:26 2024 +0200 msvcp120_app: Fix a typo in a C++ mangled name. --- dlls/msvcp120_app/msvcp120_app.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index dc69df9ce6a..3882871568f 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -2537,7 +2537,7 @@ @ cdecl -arch=arm ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAA_N(a)Z(ptr ptr ptr long ptr long ptr ptr ptr) msvcp120.?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAA_N(a)Z @ thiscall -arch=i386 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAA_N(a)Z(ptr ptr ptr long ptr long ptr ptr ptr) msvcp120.?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AAVios_base(a)2@AAHAA_N(a)Z @ cdecl -arch=win64 ?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_N(a)Z(ptr ptr ptr ptr ptr ptr ptr) msvcp120.?get@?$num_get(a)_WV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@0AEAVios_base(a)2@AEAHAEA_N(a)Z -@ cdecl -arch=arm ?get@?$tigme_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@DD(a)Z(ptr ptr ptr long ptr long ptr ptr ptr long long) msvcp120.?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@DD(a)Z +@ cdecl -arch=arm ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@DD(a)Z(ptr ptr ptr long ptr long ptr ptr ptr long long) msvcp120.?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@DD(a)Z @ thiscall -arch=i386 ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@DD(a)Z(ptr ptr ptr long ptr long ptr ptr ptr long long) msvcp120.?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBE?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@DD(a)Z @ cdecl -arch=win64 ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@DD(a)Z(ptr ptr ptr long ptr long ptr ptr ptr long long) msvcp120.?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QEBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AEAVios_base(a)2@AEAHPEAUtm@@DD(a)Z @ cdecl -arch=arm ?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@PBD4(a)Z(ptr ptr ptr long ptr long ptr ptr ptr ptr ptr) msvcp120.?get@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QBA?AV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@0AAVios_base(a)2@AAHPAUtm@@PBD4(a)Z

1 0

Alexandre Julliard : msvcrt: Export all _ConcRT functions also on ARM.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: 228420183ed4f74233fe738a4c15a11d5f7804f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/228420183ed4f74233fe738a4c15a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 26 22:04:19 2024 +0200 msvcrt: Export all _ConcRT functions also on ARM. --- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 55002757da9..b5310d7745f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -499,11 +499,11 @@ @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ -@ stub -arch=i386 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z +@ stub -arch=win32 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_Assert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPEBD0H(a)Z -@ stub -arch=i386 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPB_WZZ +@ stub -arch=win32 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPB_WZZ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2062989fb47..6b5f66bdf73 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -496,11 +496,11 @@ @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ -@ stub -arch=i386 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z +@ stub -arch=win32 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_Assert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPEBD0H(a)Z -@ stub -arch=i386 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPB_WZZ +@ stub -arch=win32 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPB_WZZ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 544ef4eb0da..06521c8a4f5 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -493,11 +493,11 @@ @ stub -arch=arm ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAAXXZ @ stub -arch=i386 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AAEXXZ @ stub -arch=win64 ?_CleanupToken(a)_StructuredTaskCollection@details(a)Concurrency@@AEAAXXZ -@ stub -arch=i386 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z +@ stub -arch=win32 ?_ConcRT_Assert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_Assert(a)details@Concurrency@@YAXPEBD0H(a)Z @ stub -arch=win32 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPBD0H(a)Z @ stub -arch=win64 ?_ConcRT_CoreAssert(a)details@Concurrency@@YAXPEBD0H(a)Z -@ stub -arch=i386 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPB_WZZ +@ stub -arch=win32 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPB_WZZ @ stub -arch=win64 ?_ConcRT_DumpMessage(a)details@Concurrency@@YAXPEB_WZZ @ stub -arch=win32 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPB_WZZ @ stub -arch=win64 ?_ConcRT_Trace(a)details@Concurrency@@YAXHPEB_WZZ

1 0

Alexandre Julliard : msvcp: Replace some stubs by exported functions that already exist for other platforms.
by Alexandre Julliard May 27, 2024

May 27, 2024

Module: wine Branch: master Commit: dce1f2fd2e514962c35af573c982a257ed3d98c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dce1f2fd2e514962c35af573c982a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 26 22:12:25 2024 +0200 msvcp: Replace some stubs by exported functions that already exist for other platforms. --- dlls/concrt140/concrt140.spec | 50 +++++++++++++++++++++---------------------- dlls/msvcp100/msvcp100.spec | 6 +++--- dlls/msvcp_win/msvcp_win.spec | 2 +- 3 files changed, 29 insertions(+), 29 deletions(-)

1 0