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

Gijs Vermeulen : winecfg: Disable virtual desktop when using macdrv.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: e2db7ef7f47b667962f533691aa1ef0246264076 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2db7ef7f47b667962f53369… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Aug 18 14:06:35 2021 +0200 winecfg: Disable virtual desktop when using macdrv. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/x11drvdlg.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index fbc6716e94e..34b194d04a6 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -111,17 +111,44 @@ static void update_gui_for_desktop_mode(HWND dialog) updating_ui = FALSE; } +static BOOL can_enable_desktop(void) +{ + char *value; + UINT guid_atom; + BOOL ret = FALSE; + char key[sizeof("System\\CurrentControlSet\\Control\\Video\\{}\\0000") + 40]; + + guid_atom = HandleToULong(GetPropA(GetDesktopWindow(), "__wine_display_device_guid")); + strcpy( key, "System\\CurrentControlSet\\Control\\Video\\{" ); + if (!GlobalGetAtomNameA(guid_atom, key + strlen(key), 40)) return ret; + strcat( key, "}\\0000" ); + if ((value = get_reg_key(HKEY_LOCAL_MACHINE, key, "GraphicsDriver", NULL))) + { + if(strcmp(value, "winemac.drv")) + ret = TRUE; + HeapFree(GetProcessHeap(), 0, value); + } + return ret; +} + static void init_dialog(HWND dialog) { char* buf; + BOOL enable_desktop; convert_x11_desktop_key(); - update_gui_for_desktop_mode(dialog); + if ((enable_desktop = can_enable_desktop())) + update_gui_for_desktop_mode(dialog); + else + disable(IDC_ENABLE_DESKTOP); updating_ui = TRUE; - SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); - SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + if (enable_desktop) + { + SendDlgItemMessageW(dialog, IDC_DESKTOP_WIDTH, EM_LIMITTEXT, RES_MAXLEN, 0); + SendDlgItemMessageW(dialog, IDC_DESKTOP_HEIGHT, EM_LIMITTEXT, RES_MAXLEN, 0); + } buf = get_reg_key(config_key, keypath("X11 Driver"), "GrabFullscreen", "N"); if (IS_OPTION_TRUE(*buf))

1 0

Rémi Bernon : winebus.sys: Pass HID_XFER_PACKET and IO_STATUS_BLOCK to callbacks.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 6e7ca583746d3a266c56e777c13f3086bf73d141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e7ca583746d3a266c56e777… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:14:22 2021 +0200 winebus.sys: Pass HID_XFER_PACKET and IO_STATUS_BLOCK to callbacks. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 7 ++-- dlls/winebus.sys/bus_iohid.c | 41 ++++++++++---------- dlls/winebus.sys/bus_sdl.c | 29 ++++++++------- dlls/winebus.sys/bus_udev.c | 89 +++++++++++++++++++++++--------------------- dlls/winebus.sys/main.c | 55 ++++++++++++++------------- 5 files changed, 114 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e7ca583746d3a266c56…

1 0

Piotr Caban : msvcrt: Move _Trace_ppl_function to concurrency.c.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: ce5c989171f458842bee6e168a65dc36d2ec61d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce5c989171f458842bee6e16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:51 2021 +0200 msvcrt: Move _Trace_ppl_function to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcrt/concurrency.c | 19 +++++++++++++++++++ dlls/msvcrt/cpp.c | 23 ----------------------- 5 files changed, 25 insertions(+), 29 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6af92d7ea6f..26a1f1fdea7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -386,8 +386,8 @@ @ stub -arch=win64 ?_Stop(a)_Timer@details(a)Concurrency@@IEAAXXZ @ stub -arch=win32 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ -@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function -@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function @ thiscall -arch=win32 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=win32 ?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 45d8e2b3507..e77a855a263 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -658,8 +658,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents -@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function -@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 3ed0aafdc3d..c540c4019bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -640,8 +640,8 @@ @ stub -arch=i386 ?_Tidy(a)exception@std@@AAEXXZ @ stub -arch=win64 ?_Tidy(a)exception@std@@AEAAXXZ @ varargs ?_Trace_agents(a)Concurrency@@YAXW4Agents_EventType(a)1@_JZZ(long int64) _Trace_agents -@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function -@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) Concurrency__Trace_ppl_function +@ cdecl -arch=win32 ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function +@ cdecl -arch=win64 ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z(ptr long long) _Trace_ppl_function @ cdecl -arch=arm ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ thiscall -arch=i386 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ(ptr) _ReentrantBlockingLock__TryAcquire @ cdecl -arch=win64 ?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ(ptr) _ReentrantBlockingLock__TryAcquire diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 5aee472559e..a4df63d19a8 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -296,6 +296,18 @@ typedef struct { CRITICAL_SECTION cs; } _ReentrantBlockingLock; +enum ConcRT_EventType +{ + CONCRT_EVENT_GENERIC, + CONCRT_EVENT_START, + CONCRT_EVENT_END, + CONCRT_EVENT_BLOCK, + CONCRT_EVENT_UNBLOCK, + CONCRT_EVENT_YIELD, + CONCRT_EVENT_ATTACH, + CONCRT_EVENT_DETACH +}; + static int context_tls_index = TLS_OUT_OF_INDEXES; static CRITICAL_SECTION default_scheduler_cs; @@ -2382,6 +2394,13 @@ void WINAPIV _Trace_agents(/*enum Concurrency::Agents_EventType*/int type, __int } #endif +/* ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +/* ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z */ +void __cdecl _Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type) +{ + FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); +} + #ifdef __ASM_USE_THISCALL_WRAPPER #define DEFINE_VTBL_WRAPPER(off) \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 1f36bca5712..638081f5b85 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -2075,26 +2075,3 @@ size_t CDECL __std_type_info_hash(const type_info140 *ti) } #endif /* _MSVCR_VER >= 140 */ - -#if _MSVCR_VER >= 100 - -enum ConcRT_EventType -{ - CONCRT_EVENT_GENERIC, - CONCRT_EVENT_START, - CONCRT_EVENT_END, - CONCRT_EVENT_BLOCK, - CONCRT_EVENT_UNBLOCK, - CONCRT_EVENT_YIELD, - CONCRT_EVENT_ATTACH, - CONCRT_EVENT_DETACH -}; - -/* ?_Trace_ppl_function(a)Concurrency@@YAXABU_GUID@@EW4ConcRT_EventType(a)1@@Z */ -/* ?_Trace_ppl_function(a)Concurrency@@YAXAEBU_GUID@@EW4ConcRT_EventType(a)1@@Z */ -void __cdecl Concurrency__Trace_ppl_function(const GUID *guid, unsigned char level, enum ConcRT_EventType type) -{ - FIXME("(%s %u %i) stub\n", debugstr_guid(guid), level, type); -} - -#endif /* _MSVCR_VER >= 100 */

1 0

Piotr Caban : msvcrt: Rename scheduler.c file to concurrency.c.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: eff57ac9c6280751f5f51a66fcac05d6f842fecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eff57ac9c6280751f5f51a66… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:09 2021 +0200 msvcrt: Rename scheduler.c file to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/{scheduler.c => concurrency.c} | 6 +++--- dlls/msvcrt/main.c | 4 ++-- dlls/msvcrt/msvcrt.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index 7a760a57e3b..7996a60718a 100644 --- a/dlls/msvcr100/Makefile.in +++ b/dlls/msvcr100/Makefile.in @@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + concurrency.c \ console.c \ cpp.c \ ctype.c \ @@ -33,7 +34,6 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ - scheduler.c \ sincos.c \ string.c \ thread.c \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 0d0d73b3262..5ea8706a78c 100644 --- a/dlls/msvcr110/Makefile.in +++ b/dlls/msvcr110/Makefile.in @@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + concurrency.c \ console.c \ cpp.c \ ctype.c \ @@ -33,7 +34,6 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ - scheduler.c \ sincos.c \ string.c \ thread.c \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index aff77ba24ac..3a045483f6c 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + concurrency.c \ console.c \ cpp.c \ ctype.c \ @@ -33,7 +34,6 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ - scheduler.c \ sincos.c \ string.c \ thread.c \ diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 74d88088444..a2f62613296 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -6,6 +6,7 @@ DELAYIMPORTS = advapi32 user32 EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ + concurrency.c \ console.c \ cpp.c \ crt_gccmain.c \ @@ -37,7 +38,6 @@ C_SRCS = \ onexit.c \ process.c \ scanf.c \ - scheduler.c \ sincos.c \ string.c \ thread.c \ diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/concurrency.c similarity index 99% rename from dlls/msvcrt/scheduler.c rename to dlls/msvcrt/concurrency.c index b8bff6119bf..ba3dc6be4ad 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/concurrency.c @@ -1,5 +1,5 @@ /* - * msvcrt.dll C++ objects + * Concurrency namespace implementation * * Copyright 2017 Piotr Caban * @@ -1136,7 +1136,7 @@ __ASM_BLOCK_BEGIN(scheduler_vtables) ); __ASM_BLOCK_END -void msvcrt_init_scheduler(void *base) +void msvcrt_init_concurrency(void *base) { #ifdef __x86_64__ init_Context_rtti(base); @@ -1148,7 +1148,7 @@ void msvcrt_init_scheduler(void *base) #endif } -void msvcrt_free_scheduler(void) +void msvcrt_free_concurrency(void) { if (context_tls_index != TLS_OUT_OF_INDEXES) TlsFree(context_tls_index); diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 61e8479bf90..23dfb24ac5d 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -116,7 +116,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_init_args(); msvcrt_init_signals(); #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 - msvcrt_init_scheduler(hinstDLL); + msvcrt_init_concurrency(hinstDLL); #endif #if _MSVCR_VER == 0 /* don't allow unloading msvcrt, we can't setup file handles twice */ @@ -143,7 +143,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) _free_locale(MSVCRT_locale); #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 msvcrt_free_scheduler_thread(); - msvcrt_free_scheduler(); + msvcrt_free_concurrency(); #endif msvcrt_destroy_heap(); TRACE("finished process free\n"); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ad366a74d86..51e9b9726db 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -245,8 +245,8 @@ extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN; extern void msvcrt_init_clock(void) DECLSPEC_HIDDEN; #if _MSVCR_VER >= 100 -extern void msvcrt_init_scheduler(void*) DECLSPEC_HIDDEN; -extern void msvcrt_free_scheduler(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_concurrency(void*) DECLSPEC_HIDDEN; +extern void msvcrt_free_concurrency(void) DECLSPEC_HIDDEN; extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; #endif

1 0

Piotr Caban : msvcrt: Add macro that defines type_info vtable.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 6c4cddc4f6324cfd6d37e269aaec111a8a665e22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c4cddc4f6324cfd6d37e269… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:05 2021 +0200 msvcrt: Add macro that defines type_info vtable. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 27 ++------------------------- dlls/msvcrt/cxx.h | 31 ++++++++++++++++++++++++++++++- dlls/msvcrt/lock.c | 1 - dlls/msvcrt/scheduler.c | 2 -- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ac363c41923..1f36bca5712 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -27,12 +27,13 @@ #include "wine/exception.h" #include "wine/debug.h" #include "msvcrt.h" -#include "cppexcept.h" #include "mtdll.h" #include "cxx.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +CREATE_TYPE_INFO_VTABLE + struct __type_info_node { void *memPtr; @@ -626,27 +627,6 @@ const char * __thiscall type_info_raw_name(type_info * _this) return _this->mangled; } -/* Unexported */ -DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) -void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) -{ - TRACE("(%p %x)\n", _this, flags); - if (flags & 2) - { - /* we have an array, with the number of elements stored before the first object */ - INT_PTR i, *ptr = (INT_PTR *)_this - 1; - - for (i = *ptr - 1; i >= 0; i--) type_info_dtor(_this + i); - operator_delete(ptr); - } - else - { - type_info_dtor(_this); - if (flags & 1) operator_delete(_this); - } - return _this; -} - #if _MSVCR_VER >= 80 typedef exception bad_alloc; @@ -936,8 +916,6 @@ improper_scheduler_detach * __thiscall improper_scheduler_detach_copy_ctor( __ASM_BLOCK_BEGIN(vtables) -__ASM_VTABLE(type_info, - VTABLE_ADD_FUNC(type_info_vector_dtor)); __ASM_VTABLE(exception, VTABLE_ADD_FUNC(exception_vector_dtor) VTABLE_ADD_FUNC(what_exception)); @@ -984,7 +962,6 @@ __ASM_VTABLE(improper_scheduler_detach, __ASM_BLOCK_END -DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) #if _MSVCR_VER >= 80 DEFINE_RTTI_DATA0( exception, 0, ".?AVexception(a)std@@" ) DEFINE_RTTI_DATA0( exception_old, 0, ".?AVexception@@" ) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 77778730e25..1a5442725ef 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "wine/asm.h" +#include "cppexcept.h" #ifdef _WIN64 @@ -279,3 +279,32 @@ extern void *vtbl_wrapper_48; #endif exception* __thiscall exception_ctor(exception*, const char**); + +extern const vtable_ptr type_info_vtable; + +#define CREATE_TYPE_INFO_VTABLE \ +DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ +void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \ +{ \ + if (flags & 2) \ + { \ + /* we have an array, with the number of elements stored before the first object */ \ + INT_PTR i, *ptr = (INT_PTR *)_this - 1; \ +\ + for (i = *ptr - 1; i >= 0; i--) free(_this->name); \ + free(ptr); \ + } \ + else \ + { \ + free(_this->name); \ + if (flags & 1) free(_this); \ + } \ + return _this; \ +} \ +\ +DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) \ +\ +__ASM_BLOCK_BEGIN(type_info_vtables) \ + __ASM_VTABLE(type_info, \ + VTABLE_ADD_FUNC(type_info_vector_dtor)); \ +__ASM_BLOCK_END diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 78767689c06..9c96217ca95 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -24,7 +24,6 @@ #include "winbase.h" #include "winternl.h" #include "msvcrt.h" -#include "cppexcept.h" #include "mtdll.h" #include "cxx.h" diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index ef40a3236cd..b8bff6119bf 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -25,7 +25,6 @@ #include "winternl.h" #include "wine/debug.h" #include "msvcrt.h" -#include "cppexcept.h" #include "cxx.h" #if _MSVCR_VER >= 100 @@ -1097,7 +1096,6 @@ DEFINE_VTBL_WRAPPER(48); #endif -extern const vtable_ptr type_info_vtable; DEFINE_RTTI_DATA0(Context, 0, ".?AVContext(a)Concurrency@@") DEFINE_RTTI_DATA1(ContextBase, 0, &Context_rtti_base_descriptor, ".?AVContextBase(a)details@Concurrency@@") DEFINE_RTTI_DATA2(ExternalContextBase, 0, &ContextBase_rtti_base_descriptor,

1 0

Piotr Caban : msvcp90: Remove type_info_dtor helper from CREATE_TYPE_INFO_VTABLE macro.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: a2d8a0ce4e4d9858d8f46e77b0f76c2931c1cd52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d8a0ce4e4d9858d8f46e77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:02 2021 +0200 msvcp90: Remove type_info_dtor helper from CREATE_TYPE_INFO_VTABLE macro. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/cxx.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index 9c6c70e375c..012354ac9c8 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -464,12 +464,7 @@ typedef struct #endif -#define CREATE_TYPE_INFO_VTABLE\ - static void type_info_dtor(type_info * _this) \ -{ \ - free(_this->name); \ -} \ -\ +#define CREATE_TYPE_INFO_VTABLE \ DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \ { \ @@ -478,12 +473,12 @@ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \ /* we have an array, with the number of elements stored before the first object */ \ INT_PTR i, *ptr = (INT_PTR *)_this - 1; \ \ - for (i = *ptr - 1; i >= 0; i--) type_info_dtor(_this + i); \ + for (i = *ptr - 1; i >= 0; i--) free(_this->name); \ free(ptr); \ } \ else \ { \ - type_info_dtor(_this); \ + free(_this->name); \ if (flags & 1) free(_this); \ } \ return _this; \

1 0

Piotr Caban : msvcrt: Allow specifying destructor in DEFINE_CXX_DATA macro.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: bc05707364d722c7b8c105709962cb78c0469cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc05707364d722c7b8c10570… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:00 2021 +0200 msvcrt: Allow specifying destructor in DEFINE_CXX_DATA macro. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cpp.c | 80 ++++++++----------------------------------------- dlls/msvcrt/cppexcept.h | 53 +++++++++++++++++++++----------- 2 files changed, 48 insertions(+), 85 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ffb91175a8f..ac363c41923 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -731,14 +731,6 @@ HRESULT __thiscall scheduler_resource_allocation_error_get_error_code( return this->hr; } -DEFINE_THISCALL_WRAPPER(scheduler_resource_allocation_error_dtor,4) -void __thiscall scheduler_resource_allocation_error_dtor( - scheduler_resource_allocation_error * this) -{ - TRACE("(%p)\n", this); - exception_dtor(&this->e); -} - typedef exception improper_lock; extern const vtable_ptr improper_lock_vtable; @@ -770,13 +762,6 @@ improper_lock * __thiscall improper_lock_copy_ctor(improper_lock * _this, const return _this; } -DEFINE_THISCALL_WRAPPER(improper_lock_dtor,4) -void __thiscall improper_lock_dtor(improper_lock * _this) -{ - TRACE("(%p)\n", _this); - exception_dtor(_this); -} - typedef exception invalid_scheduler_policy_key; extern const vtable_ptr invalid_scheduler_policy_key_vtable; @@ -811,14 +796,6 @@ invalid_scheduler_policy_key * __thiscall invalid_scheduler_policy_key_copy_ctor return _this; } -DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_key_dtor,4) -void __thiscall invalid_scheduler_policy_key_dtor( - invalid_scheduler_policy_key * _this) -{ - TRACE("(%p)\n", _this); - exception_dtor(_this); -} - typedef exception invalid_scheduler_policy_value; extern const vtable_ptr invalid_scheduler_policy_value_vtable; @@ -853,14 +830,6 @@ invalid_scheduler_policy_value * __thiscall invalid_scheduler_policy_value_copy_ return _this; } -DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_value_dtor,4) -void __thiscall invalid_scheduler_policy_value_dtor( - invalid_scheduler_policy_value * _this) -{ - TRACE("(%p)\n", _this); - exception_dtor(_this); -} - typedef exception invalid_scheduler_policy_thread_specification; extern const vtable_ptr invalid_scheduler_policy_thread_specification_vtable; @@ -895,14 +864,6 @@ invalid_scheduler_policy_thread_specification * __thiscall invalid_scheduler_pol return _this; } -DEFINE_THISCALL_WRAPPER(invalid_scheduler_policy_thread_specification_dtor,4) -void __thiscall invalid_scheduler_policy_thread_specification_dtor( - invalid_scheduler_policy_thread_specification * _this) -{ - TRACE("(%p)\n", _this); - exception_dtor(_this); -} - typedef exception improper_scheduler_attach; extern const vtable_ptr improper_scheduler_attach_vtable; @@ -937,14 +898,6 @@ improper_scheduler_attach * __thiscall improper_scheduler_attach_copy_ctor( return _this; } -DEFINE_THISCALL_WRAPPER(improper_scheduler_attach_dtor,4) -void __thiscall improper_scheduler_attach_dtor( - improper_scheduler_attach * _this) -{ - TRACE("(%p)\n", _this); - exception_dtor(_this); -} - typedef exception improper_scheduler_detach; extern const vtable_ptr improper_scheduler_detach_vtable; @@ -979,14 +932,6 @@ improper_scheduler_detach * __thiscall improper_scheduler_detach_copy_ctor( return _this; } -DEFINE_THISCALL_WRAPPER(improper_scheduler_detach_dtor,4) -void __thiscall improper_scheduler_detach_dtor( - improper_scheduler_detach * _this) -{ - TRACE("(%p)\n", _this); - exception_dtor(_this); -} - #endif /* _MSVCR_VER >= 100 */ __ASM_BLOCK_BEGIN(vtables) @@ -1069,21 +1014,22 @@ DEFINE_RTTI_DATA1(improper_scheduler_detach, 0, &exception_rtti_base_descriptor, ".?AVimproper_scheduler_detach(a)Concurrency@@" ) #endif -DEFINE_EXCEPTION_TYPE_INFO( exception, 0, NULL, NULL ) -DEFINE_EXCEPTION_TYPE_INFO( bad_typeid, 1, &exception_cxx_type_info, NULL ) -DEFINE_EXCEPTION_TYPE_INFO( bad_cast, 1, &exception_cxx_type_info, NULL ) -DEFINE_EXCEPTION_TYPE_INFO( __non_rtti_object, 2, &bad_typeid_cxx_type_info, &exception_cxx_type_info ) +DEFINE_CXX_DATA0( exception, exception_dtor ) +DEFINE_CXX_DATA1( bad_typeid, &exception_cxx_type_info, bad_typeid_dtor ) +DEFINE_CXX_DATA1( bad_cast, &exception_cxx_type_info, bad_cast_dtor ) +DEFINE_CXX_DATA2( __non_rtti_object, &bad_typeid_cxx_type_info, + &exception_cxx_type_info, __non_rtti_object_dtor ) #if _MSVCR_VER >= 80 -DEFINE_EXCEPTION_TYPE_INFO( bad_alloc, 1, &exception_cxx_type_info, NULL ) +DEFINE_CXX_DATA1( bad_alloc, &exception_cxx_type_info, bad_alloc_dtor ) #endif #if _MSVCR_VER >= 100 -DEFINE_EXCEPTION_TYPE_INFO(scheduler_resource_allocation_error, 1, &exception_cxx_type_info, NULL) -DEFINE_EXCEPTION_TYPE_INFO(improper_lock, 1, &exception_cxx_type_info, NULL) -DEFINE_EXCEPTION_TYPE_INFO(invalid_scheduler_policy_key, 1, &exception_cxx_type_info, NULL) -DEFINE_EXCEPTION_TYPE_INFO(invalid_scheduler_policy_value, 1, &exception_cxx_type_info, NULL) -DEFINE_EXCEPTION_TYPE_INFO(invalid_scheduler_policy_thread_specification, 1, &exception_cxx_type_info, NULL) -DEFINE_EXCEPTION_TYPE_INFO(improper_scheduler_attach, 1, &exception_cxx_type_info, NULL) -DEFINE_EXCEPTION_TYPE_INFO(improper_scheduler_detach, 1, &exception_cxx_type_info, NULL) +DEFINE_CXX_DATA1(scheduler_resource_allocation_error, &exception_cxx_type_info, exception_dtor) +DEFINE_CXX_DATA1(improper_lock, &exception_cxx_type_info, exception_dtor) +DEFINE_CXX_DATA1(invalid_scheduler_policy_key, &exception_cxx_type_info, exception_dtor) +DEFINE_CXX_DATA1(invalid_scheduler_policy_value, &exception_cxx_type_info, exception_dtor) +DEFINE_CXX_DATA1(invalid_scheduler_policy_thread_specification, &exception_cxx_type_info, exception_dtor) +DEFINE_CXX_DATA1(improper_scheduler_attach, &exception_cxx_type_info, exception_dtor) +DEFINE_CXX_DATA1(improper_scheduler_detach, &exception_cxx_type_info, exception_dtor) #endif void msvcrt_init_exception(void *base) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 5170bf23fa2..2792491ca7f 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -156,36 +156,37 @@ static inline void *get_this_pointer( const this_ptr_offsets *off, void *object } #ifndef __x86_64__ -#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \ -\ +#define DEFINE_CXX_TYPE_INFO(type) \ static const cxx_type_info type ## _cxx_type_info = { \ 0, \ & type ##_type_info, \ { 0, -1, 0 }, \ sizeof(type), \ (cxx_copy_ctor)THISCALL(type ##_copy_ctor) \ -}; \ +}; + +#define DEFINE_CXX_DATA(type, base_no, cl1, cl2, dtor) \ +DEFINE_CXX_TYPE_INFO(type) \ \ -static const cxx_type_info_table type ## _type_info_table = { \ +static const cxx_type_info_table type ## _cxx_type_table = { \ base_no+1, \ { \ & type ## _cxx_type_info, \ cl1, \ - cl2 \ + cl2, \ } \ }; \ \ static const cxx_exception_type type ## _exception_type = { \ 0, \ - (cxx_copy_ctor)THISCALL(type ## _dtor), \ + (cxx_copy_ctor)THISCALL(dtor), \ NULL, \ - & type ## _type_info_table \ + & type ## _cxx_type_table \ }; #else -#define DEFINE_EXCEPTION_TYPE_INFO(type, base_no, cl1, cl2) \ -\ +#define DEFINE_CXX_TYPE_INFO(type) \ static cxx_type_info type ## _cxx_type_info = { \ 0, \ 0xdeadbeef, \ @@ -194,12 +195,22 @@ static cxx_type_info type ## _cxx_type_info = { \ 0xdeadbeef \ }; \ \ -static cxx_type_info_table type ## _type_info_table = { \ +static void init_ ## type ## _cxx_type_info(char *base) \ +{ \ + type ## _cxx_type_info.type_info = (char *)&type ## _type_info - base; \ + type ## _cxx_type_info.copy_ctor = (char *)type ## _copy_ctor - base; \ +} + +#define DEFINE_CXX_DATA(type, base_no, cl1, cl2, dtor) \ +\ +DEFINE_CXX_TYPE_INFO(type) \ +\ +static cxx_type_info_table type ## _cxx_type_table = { \ base_no+1, \ { \ 0xdeadbeef, \ 0xdeadbeef, \ - 0xdeadbeef \ + 0xdeadbeef, \ } \ }; \ \ @@ -212,14 +223,20 @@ static cxx_exception_type type ##_exception_type = { \ \ static void init_ ## type ## _cxx(char *base) \ { \ - type ## _cxx_type_info.type_info = (char *)&type ## _type_info - base; \ - type ## _cxx_type_info.copy_ctor = (char *)type ## _copy_ctor - base; \ - type ## _type_info_table.info[0] = (char *)&type ## _cxx_type_info - base; \ - type ## _type_info_table.info[1] = (char *)cl1 - base; \ - type ## _type_info_table.info[2] = (char *)cl2 - base; \ - type ## _exception_type.destructor = (char *)type ## _dtor - base; \ - type ## _exception_type.type_info_table = (char *)&type ## _type_info_table - base; \ + init_ ## type ## _cxx_type_info(base); \ + type ## _cxx_type_table.info[0] = (char *)&type ## _cxx_type_info - base; \ + type ## _cxx_type_table.info[1] = (char *)cl1 - base; \ + type ## _cxx_type_table.info[2] = (char *)cl2 - base; \ + type ## _exception_type.destructor = (char *)dtor - base; \ + type ## _exception_type.type_info_table = (char *)&type ## _cxx_type_table - base; \ } #endif +#define DEFINE_CXX_DATA0(name, dtor) \ + DEFINE_CXX_DATA(name, 0, NULL, NULL, dtor) +#define DEFINE_CXX_DATA1(name, cl1, dtor) \ + DEFINE_CXX_DATA(name, 1, cl1, NULL, dtor) +#define DEFINE_CXX_DATA2(name, cl1, cl2, dtor) \ + DEFINE_CXX_DATA(name, 2, cl1, cl2, dtor) + #endif /* __MSVCRT_CPPEXCEPT_H */

1 0

Piotr Caban : msvcrt: Move lock Concurrency functions to concurrency.c.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: 3192bb97647433c96351b5ba20563ff949bd2b09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3192bb97647433c96351b5ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 18 16:09:13 2021 +0200 msvcrt: Move lock Concurrency functions to concurrency.c. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/concurrency.c | 1307 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/lock.c | 1310 --------------------------------------------- 2 files changed, 1307 insertions(+), 1310 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3192bb97647433c96351…

1 0

Rémi Bernon : setupapi: Create only one driver per driver id match.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: eb94d7aea85b13197f8d678baeca414adc05aaed URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb94d7aea85b13197f8d678b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:40:11 2021 +0200 setupapi: Create only one driver per driver id match. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 26 +++++++++++++++----------- dlls/setupapi/tests/devinst.c | 9 +-------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index baef28ac130..13e52f4534a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4648,6 +4648,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa DWORD i, j, k, driver_count = device->driver_count; struct driver driver, *drivers = device->drivers; INFCONTEXT ctx; + BOOL found; HINF hinf; TRACE("Enumerating drivers from %s.\n", debugstr_w(path)); @@ -4687,20 +4688,23 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa for (j = 0; SetupGetLineByIndexW(hinf, driver.mfg_key, j, &ctx); ++j) { - for (k = 2; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) + for (k = 2, found = FALSE; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) { - if (device_matches_id(device, HardwareId, id) || device_matches_id(device, CompatibleIDs, id)) - { - SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); - SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); + if ((found = device_matches_id(device, HardwareId, id))) break; + if ((found = device_matches_id(device, CompatibleIDs, id))) break; + } - TRACE("Found compatible driver: manufacturer %s, desc %s.\n", - debugstr_w(driver.manufacturer), debugstr_w(driver.description)); + if (found) + { + SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); + SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); - driver_count++; - drivers = heap_realloc(drivers, driver_count * sizeof(*drivers)); - drivers[driver_count - 1] = driver; - } + TRACE("Found compatible driver: manufacturer %s, desc %s.\n", + debugstr_w(driver.manufacturer), debugstr_w(driver.description)); + + driver_count++; + drivers = heap_realloc(drivers, driver_count * sizeof(*drivers)); + drivers[driver_count - 1] = driver; } } } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 73e0086081d..677d6bda02a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2458,14 +2458,7 @@ static void test_driver_list(void) ret = SetupDiEnumDriverInfoA(set, &device, SPDIT_COMPATDRIVER, idx++, &driver); ok(ret, "Failed to enumerate drivers, error %#x.\n", GetLastError()); ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); - todo_wine ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); - if (strcmp(driver.Description, "desc1")) - { - ret = SetupDiEnumDriverInfoA(set, &device, SPDIT_COMPATDRIVER, idx++, &driver); - ok(ret, "Failed to enumerate drivers, error %#x.\n", GetLastError()); - ok(driver.DriverType == SPDIT_COMPATDRIVER, "Got wrong type %#x.\n", driver.DriverType); - ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); - } + ok(!strcmp(driver.Description, "desc1"), "Got wrong description '%s'.\n", driver.Description); ok(!strcmp(driver.MfgName, wow64 ? "mfg1_wow" : "mfg1"), "Got wrong manufacturer '%s'.\n", driver.MfgName); ok(!strcmp(driver.ProviderName, ""), "Got wrong provider '%s'.\n", driver.ProviderName);

1 0

Rémi Bernon : winebus.sys: Merge begin_report_processing with start_device.
by Alexandre Julliard Aug. 18, 2021

Aug. 18, 2021

Module: wine Branch: master Commit: ee5cde83dae7024873438be4c806c106fe121b04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee5cde83dae7024873438be4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 18 09:14:21 2021 +0200 winebus.sys: Merge begin_report_processing with start_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 - dlls/winebus.sys/bus_iohid.c | 27 +++++-------- dlls/winebus.sys/bus_sdl.c | 6 --- dlls/winebus.sys/bus_udev.c | 94 ++++++++++++++++++++------------------------ dlls/winebus.sys/main.c | 17 -------- 5 files changed, 51 insertions(+), 94 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee5cde83dae702487343…

1 0