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

Francois Gouget : mstask/tests: Work around race conditions with the task scheduler process.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 2e6ae164692072abd1f4dc156581dc760f0a8046 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6ae164692072abd1f4dc15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 21 00:13:52 2021 +0200 mstask/tests: Work around race conditions with the task scheduler process. When a task is created the process scheduler locks and loads it. This can cause ITaskScheduler_Delete() to fail with a sharing violation if it is called at the wrong time. Just retry a bit later when that happens. This fixes failures mostly in Wine but also in Windows 10 from time to time in both task and task_scheduler. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task.c | 7 +++++-- dlls/mstask/tests/task_scheduler.c | 31 ++++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index a9957117e9b..0c7f85394ea 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -29,6 +29,9 @@ static ITaskScheduler *scheduler; static const WCHAR task_name[] = {'T','e','s','t','i','n','g',0}; static const WCHAR empty[] = {0}; +extern HRESULT taskscheduler_delete(ITaskScheduler*, const WCHAR*); + + static LPCWSTR path_resolve_name(LPCWSTR base_name) { static WCHAR buffer[MAX_PATH]; @@ -552,7 +555,7 @@ static void test_Run(void) HRESULT hr, status; /* cleanup after previous runs */ - ITaskScheduler_Delete(scheduler, wine_test_runW); + taskscheduler_delete(scheduler, wine_test_runW); hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); @@ -679,7 +682,7 @@ static void test_Run(void) else ITask_Release(task); - hr = ITaskScheduler_Delete(scheduler, wine_test_runW); + hr = taskscheduler_delete(scheduler, wine_test_runW); ok(hr == S_OK, "got %#x\n", hr); } diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 5abee75e23c..fafad585f53 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -31,6 +31,27 @@ static ITaskScheduler *test_task_scheduler; static const WCHAR does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + +HRESULT taskscheduler_delete(ITaskScheduler *scheduler, const WCHAR *name) +{ + HRESULT hr; + int i = 0; + + while (1) + { + hr = ITaskScheduler_Delete(scheduler, name); + if (hr != HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION)) break; + if (++i == 5) break; + + /* The task scheduler locked the file to load the task (see + * ITaskScheduler_Activate()). It should be done soon. + */ + trace("Got a sharing violation deleting %s, retrying...\n", wine_dbgstr_w(name)); + Sleep(100); + } + return hr; +} + static void test_NewWorkItem(void) { HRESULT hres; @@ -225,7 +246,7 @@ static void test_Enum(void) ok(hr == S_OK, "got %#x\n", hr); /* cleanup after previous runs */ - ITaskScheduler_Delete(scheduler, Task1); + taskscheduler_delete(scheduler, Task1); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "got %#x\n", hr); @@ -291,7 +312,7 @@ static void test_Enum(void) IEnumWorkItems_Release(tasks); - hr = ITaskScheduler_Delete(scheduler, Task1); + hr = taskscheduler_delete(scheduler, Task1); ok(hr == S_OK, "got %#x\n", hr); ITaskScheduler_Release(scheduler); @@ -494,11 +515,11 @@ static void test_task_storage(void) test_save_task_curfile(task); - hr = ITaskScheduler_Delete(scheduler, Task1); + hr = taskscheduler_delete(scheduler, Task1); ok(hr == S_OK, "got %#x\n", hr); - hr = ITaskScheduler_Delete(scheduler, Task2); + hr = taskscheduler_delete(scheduler, Task2); ok(hr == S_OK, "got %#x\n", hr); - hr = ITaskScheduler_Delete(scheduler, Task3); + hr = taskscheduler_delete(scheduler, Task3); ok(hr == S_OK, "got %#x\n", hr); ITask_Release(task);

1 0

Alexandre Julliard : ntdll/tests: Only load RtlWow64GetCpuAreaInfo() on 64-bit.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 771e9260f88c782a5ac7b1c76786c6cc469c2158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=771e9260f88c782a5ac7b1c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 18:08:45 2021 +0200 ntdll/tests: Only load RtlWow64GetCpuAreaInfo() on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 213ff3cde36..4f638721262 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -25,7 +25,6 @@ static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); static NTSTATUS (WINAPI * pNtSetSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG); static NTSTATUS (WINAPI * pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS, PVOID, ULONG, PULONG); -static NTSTATUS (WINAPI * pRtlWow64GetCpuAreaInfo)( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ); static USHORT (WINAPI * pRtlWow64GetCurrentMachine)(void); static NTSTATUS (WINAPI * pRtlWow64GetProcessMachines)(HANDLE,WORD*,WORD*); static NTSTATUS (WINAPI * pRtlWow64IsWowGuestMachineSupported)(USHORT,BOOLEAN*); @@ -50,6 +49,9 @@ static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void static NTSTATUS (WINAPI * pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); +#ifdef _WIN64 +static NTSTATUS (WINAPI * pRtlWow64GetCpuAreaInfo)( WOW64_CPURESERVED *cpu, ULONG reserved, WOW64_CPU_AREA_INFO *info ); +#endif static BOOL is_wow64; @@ -86,7 +88,6 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(NtQuerySystemInformationEx); NTDLL_GET_PROC(NtSetSystemInformation); NTDLL_GET_PROC(RtlGetNativeSystemInformation); - NTDLL_GET_PROC(RtlWow64GetCpuAreaInfo); NTDLL_GET_PROC(RtlWow64GetCurrentMachine); NTDLL_GET_PROC(RtlWow64GetProcessMachines); NTDLL_GET_PROC(RtlWow64IsWowGuestMachineSupported); @@ -107,6 +108,9 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(NtSetInformationDebugObject); NTDLL_GET_PROC(NtGetCurrentProcessorNumber); NTDLL_GET_PROC(DbgUiConvertStateChangeStructure); +#ifdef _WIN64 + NTDLL_GET_PROC(RtlWow64GetCpuAreaInfo); +#endif pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE;

1 0

Francois Gouget : schedsvc: Fix the spelling of a comment.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 33e2b134fa3d3785e26a8494c94eb9fba33f1682 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33e2b134fa3d3785e26a8494… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 21 00:01:02 2021 +0200 schedsvc: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 5a34b33e039..1625b43c888 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -828,7 +828,7 @@ static BOOL create_job(const WCHAR *job_name, const AT_INFO *info) if (!write_reserved_data(hfile)) goto failed; - /* Trigegrs */ + /* Triggers */ if (!write_trigger(hfile, info)) goto failed;

1 0

Piotr Caban : msvcrt: Import sin implementation from musl.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: ceefbb76a1f814abcf6fed541a50e7bd19cdb2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceefbb76a1f814abcf6fed54… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:52 2021 +0200 msvcrt: Import sin 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 | 522 +++++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcrt/unixlib.c | 9 - dlls/msvcrt/unixlib.h | 1 - 3 files changed, 493 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ceefbb76a1f814abcf6f…

1 0

Piotr Caban : msvcrt: Import _logb implementation from musl.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 6758acbb43b9cc59195958ce4625b00698c643a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6758acbb43b9cc59195958ce… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:36 2021 +0200 msvcrt: Import _logb 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 | 47 +++++++++++++++++++++++++++-------------------- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 2e2161e91c4..df00f0532bb 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1897,15 +1897,36 @@ __int64 CDECL _abs64( __int64 n ) return n >= 0 ? n : -n; } +/* Copied from musl: src/math/ilogb.c */ +static int __ilogb(double x) +{ + union { double f; UINT64 i; } u = { x }; + int e = u.i >> 52 & 0x7ff; + + if (!e) + { + u.i <<= 12; + if (u.i == 0) return FP_ILOGB0; + /* subnormal x */ + for (e = -0x3ff; u.i >> 63 == 0; e--, u.i <<= 1); + return e; + } + if (e == 0x7ff) return u.i << 12 ? FP_ILOGBNAN : INT_MAX; + return e - 0x3ff; +} + /********************************************************************* * _logb (MSVCRT.@) + * + * Copied from musl: src/math/logb.c */ -double CDECL _logb(double num) +double CDECL _logb(double x) { - double ret = unix_funcs->logb(num); - if (isnan(num)) return math_error(_DOMAIN, "_logb", num, 0, ret); - if (!num) return math_error(_SING, "_logb", num, 0, ret); - return ret; + if (!isfinite(x)) + return x * x; + if (x == 0) + return math_error(_SING, "_logb", x, 0, -1 / (x * x)); + return __ilogb(x); } /********************************************************************* @@ -6149,24 +6170,10 @@ double CDECL MSVCR120_creal(_Dcomplex z) /********************************************************************* * ilogb (MSVCR120.@) - * - * Copied from musl: src/math/ilogb.c */ int CDECL ilogb(double x) { - union { double f; UINT64 i; } u = { x }; - int e = u.i >> 52 & 0x7ff; - - if (!e) - { - u.i <<= 12; - if (u.i == 0) return FP_ILOGB0; - /* subnormal x */ - for (e = -0x3ff; u.i >> 63 == 0; e--, u.i <<= 1); - return e; - } - if (e == 0x7ff) return u.i << 12 ? FP_ILOGBNAN : INT_MAX; - return e - 0x3ff; + return __ilogb(x); } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index fd82c5afb94..51fe7ef6f0f 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -387,14 +387,6 @@ static float CDECL unix_log2f(float x) #endif } -/********************************************************************* - * logb - */ -static double CDECL unix_logb( double x ) -{ - return logb( x ); -} - /********************************************************************* * logbf */ @@ -544,7 +536,6 @@ static const struct unix_funcs funcs = unix_log1pf, unix_log2, unix_log2f, - unix_logb, unix_logbf, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index 95b4a6488de..a0cded99e20 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -56,7 +56,6 @@ struct unix_funcs float (CDECL *log1pf)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x); - double (CDECL *logb)(double x); float (CDECL *logbf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y);

1 0

Piotr Caban : msvcp90: Depend on compiler in _Getcoll implementation if possible.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 83cc0110f2662b5d8c3530e05de666d65d535bb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cc0110f2662b5d8c3530e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:23 2021 +0200 msvcp90: Depend on compiler in _Getcoll implementation if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 13 ++++++++----- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 29 +++++++++++++---------------- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d964954dc1f..1fc93b05438 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2915,7 +2915,7 @@ @ extern _FSnan # extern _FXbig @ stub _GetLocaleForCP -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index cd2236fe389..aeab529d69a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3778,7 +3778,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 2c5e457b2fc..0b1cb92f8ce 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3721,7 +3721,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 93e172a944f..eefb9762708 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3721,7 +3721,7 @@ @ stub _FXp_sqrtx @ stub _FXp_subx # extern _FZero -@ cdecl -ret64 _Getcoll() msvcp120._Getcoll +@ cdecl -norelay _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype @ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 7e7ea012236..d2cb4dbed8c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3649,7 +3649,7 @@ @ stub _FSinh @ extern _FSnan @ cdecl _File_size(wstr) -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 628e5f7f59e..de7aafa73b7 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4274,7 +4274,7 @@ @ stub _FSinh @ extern _FSnan _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index c48945d9509..d1a152ff0e3 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5061,7 +5061,7 @@ @ extern _FSnan # extern _FXbig # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ extern _Hugeval diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index f9fc613b7d0..6176c9be2df 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5115,7 +5115,7 @@ @ extern _FSnan # extern _FXbig # extern _FZero -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 74c0cac3669..f450286505a 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5724,7 +5724,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index bd045333dfc..2f6c103b2a2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -669,20 +669,23 @@ static _Collvec* getcoll(_Collvec *ret) } /* _Getcoll */ -#if defined(__i386__) || _MSVCP_VER<110 +#if defined(__i386__) +/* Work around a gcc bug */ ULONGLONG __cdecl _Getcoll(void) { + C_ASSERT(sizeof(_Collvec) == sizeof(ULONGLONG)); ULONGLONG ret; - C_ASSERT(sizeof(_Collvec) <= sizeof(ULONGLONG)); - getcoll((_Collvec*)&ret); return ret; } #else -_Collvec* __cdecl _Getcoll(_Collvec *ret) +_Collvec __cdecl _Getcoll(void) { - return getcoll(ret); + _Collvec ret; + + getcoll(&ret); + return ret; } #endif diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index ff6fe952053..15b16ed7f12 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6500,7 +6500,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ cdecl -ret64 _Getcoll() +@ cdecl -norelay _Getcoll() @ cdecl _Getctype(ptr) @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 9d6fe2b9bcc..546f10f6858 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -101,7 +101,7 @@ static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); -static /*MSVCP__Collvec*/ULONGLONG (__cdecl *p__Getcoll)(void); +static MSVCP__Collvec (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); static void (__cdecl *p_locale__Locimp__Locimp_Addfac)(locale__Locimp*,locale_facet*,size_t); @@ -604,26 +604,23 @@ static void test__Getctype(void) static void test__Getcoll(void) { - ULONGLONG (__cdecl *p__Getcoll_arg)(MSVCP__Collvec*); +#ifdef __i386__ + /* Workaround a gcc bug */ + ULONGLONG tmp; +#define call__Getcoll(ret) tmp = ((ULONGLONG (__cdecl*)(void))p__Getcoll)(); \ + memcpy(&ret, &tmp, sizeof(tmp)) +#else +#define call__Getcoll(ret) ret = p__Getcoll() +#endif _locale_t locale; - - union { - MSVCP__Collvec collvec; - ULONGLONG ull; - }ret; + MSVCP__Collvec ret; locale = p__get_current_locale(); locale->locinfo->lc_handle[LC_COLLATE] = 0x7654321; p__free_locale(locale); - ret.ull = 0; - p__Getcoll_arg = (void*)p__Getcoll; - p__Getcoll_arg(&ret.collvec); - ok(ret.collvec.handle == 0, "ret.handle = %x\n", ret.collvec.handle); - ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); - - ret.ull = p__Getcoll(); - ok(ret.collvec.handle == 0x7654321, "ret.collvec.handle = %x\n", ret.collvec.handle); - ok(ret.collvec.page == 0, "ret.page = %x\n", ret.collvec.page); + call__Getcoll(ret); + ok(ret.handle == 0x7654321, "ret.handle = %x\n", ret.handle); + ok(ret.page == 0, "ret.page = %x\n", ret.page); } static void test_towctrans(void)

1 0

Piotr Caban : msvcp90: Depend on compiler to handle returning struct in _Getctype.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: dff85646517526562644c23648d11596daeb26d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff85646517526562644c236… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:26 2021 +0200 msvcp90: Depend on compiler to handle returning struct in _Getctype. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 22 ++++++++++++---------- dlls/msvcp90/msvcp90.spec | 2 +- dlls/msvcp90/tests/misc.c | 6 +++--- 12 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 1fc93b05438..c0a4910eb4b 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2916,7 +2916,7 @@ # extern _FXbig @ stub _GetLocaleForCP @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index aeab529d69a..33f93c9e8cf 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3779,7 +3779,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0b1cb92f8ce..9dfe0b186c5 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3722,7 +3722,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index eefb9762708..e9ff7256419 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3722,7 +3722,7 @@ @ stub _FXp_subx # extern _FZero @ cdecl -norelay _Getcoll() msvcp120._Getcoll -@ cdecl _Getctype(ptr) msvcp120._Getctype +@ cdecl -norelay _Getctype() msvcp120._Getctype @ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index d2cb4dbed8c..343571ae401 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3650,7 +3650,7 @@ @ extern _FSnan @ cdecl _File_size(wstr) @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index de7aafa73b7..c616a10b4a4 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4275,7 +4275,7 @@ @ extern _FSnan _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval @ extern _Inf _Inf diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index d1a152ff0e3..a35949e15fb 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5062,7 +5062,7 @@ # extern _FXbig # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ extern _Hugeval @ extern _Inf diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 6176c9be2df..41c8bb01a9c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5116,7 +5116,7 @@ # extern _FXbig # extern _FZero @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index f450286505a..020e8d26fc7 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5725,7 +5725,7 @@ @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2f6c103b2a2..ea0729cf4f9 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -698,8 +698,9 @@ _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) } /* _Getctype */ -_Ctypevec* __cdecl _Getctype(_Ctypevec *ret) +_Ctypevec __cdecl _Getctype(void) { + _Ctypevec ret; short *table; #if _MSVCP_VER >= 110 wchar_t *name; @@ -708,24 +709,24 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) TRACE("\n"); - ret->page = ___lc_codepage_func(); + ret.page = ___lc_codepage_func(); #if _MSVCP_VER < 110 - ret->handle = ___lc_handle_func()[LC_COLLATE]; + ret.handle = ___lc_handle_func()[LC_COLLATE]; #else if((name = ___lc_locale_name_func()[LC_COLLATE])) { size = wcslen(name)+1; - ret->name = malloc(size*sizeof(*name)); - if(!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); - memcpy(ret->name, name, size*sizeof(*name)); + ret.name = malloc(size*sizeof(*name)); + if(!ret.name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); + memcpy(ret.name, name, size*sizeof(*name)); } else { - ret->name = NULL; + ret.name = NULL; } #endif - ret->delfl = TRUE; + ret.delfl = TRUE; table = malloc(sizeof(short[256])); if(!table) throw_exception(EXCEPTION_BAD_ALLOC, NULL); memcpy(table, __pctype_func(), sizeof(short[256])); - ret->table = table; + ret.table = table; return ret; } @@ -734,7 +735,8 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) DEFINE_THISCALL_WRAPPER(_Locinfo__Getctype, 8) _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) { - return _Getctype(ret); + *ret = _Getctype(); + return ret; } /* _Getcvt */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 15b16ed7f12..1e79400e469 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6501,7 +6501,7 @@ @ extern _FSnan # extern _FXbig @ cdecl -norelay _Getcoll() -@ cdecl _Getctype(ptr) +@ cdecl -norelay _Getctype() @ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 546f10f6858..40858bc5594 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -100,7 +100,7 @@ static BYTE (__cdecl *p_short_eq)(const void*, const void*); static char* (__cdecl *p_Copy_s)(char*, size_t, const char*, size_t); static unsigned short (__cdecl *p_wctype)(const char*); -static MSVCP__Ctypevec* (__cdecl *p__Getctype)(MSVCP__Ctypevec*); +static MSVCP__Ctypevec (__cdecl *p__Getctype)(void); static MSVCP__Collvec (__cdecl *p__Getcoll)(void); static wctrans_t (__cdecl *p_wctrans)(const char*); static wint_t (__cdecl *p_towctrans)(wint_t, wctrans_t); @@ -584,7 +584,7 @@ static void test__Getctype(void) MSVCP__Ctypevec ret; _locale_t locale; - ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ret = p__Getctype(); ok(ret.handle == 0, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl); @@ -594,7 +594,7 @@ static void test__Getctype(void) locale = p__get_current_locale(); locale->locinfo->lc_handle[LC_COLLATE] = 0x1234567; p__free_locale(locale); - ok(p__Getctype(&ret) == &ret, "__Getctype returned incorrect pointer\n"); + ret = p__Getctype(); ok(ret.handle == 0x1234567, "ret.handle = %d\n", ret.handle); ok(ret.page == 0, "ret.page = %d\n", ret.page); ok(ret.delfl == 1, "ret.delfl = %d\n", ret.delfl);

1 0

Piotr Caban : msvcp90: Depend on compiler in _Getcvt implementation if possible.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: 24f7abafd754bb7d706f588e97532ce3169ade9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f7abafd754bb7d706f588e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 21:37:16 2021 +0200 msvcp90: Depend on compiler in _Getcvt implementation if possible. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp60/msvcp60.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/locale.c | 38 +++++++++++++++++++++++++------------ dlls/msvcp90/msvcp90.spec | 2 +- 12 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 657cdc9f217..d964954dc1f 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2917,7 +2917,7 @@ @ stub _GetLocaleForCP @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 834c4225373..cd2236fe389 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3780,7 +3780,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 633b3da8552..2c5e457b2fc 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 35e90cfa29c..495ee9dd6fb 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -209,7 +209,7 @@ static int (__cdecl *p__ismbblead)(unsigned int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); -static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); +static _Cvtvec (__cdecl *p__Getcvt)(void); static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static void (CDECL *p__Do_call)(void *this); @@ -930,7 +930,7 @@ static void test__Getcvt(void) _Cvtvec cvtvec; int i; - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 0, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 1, "cvtvec.mb_max = %d\n", cvtvec.mb_max); todo_wine ok(cvtvec.unk == 1, "cvtvec.unk = %d\n", cvtvec.unk); @@ -941,7 +941,7 @@ static void test__Getcvt(void) win_skip("_Getcvt tests\n"); return; } - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); @@ -955,7 +955,7 @@ static void test__Getcvt(void) } p__setmbcp(936); - p__Getcvt(&cvtvec); + cvtvec = p__Getcvt(); ok(cvtvec.page == 936, "cvtvec.page = %d\n", cvtvec.page); ok(cvtvec.mb_max == 2, "cvtvec.mb_max = %d\n", cvtvec.mb_max); ok(cvtvec.unk == 0, "cvtvec.unk = %d\n", cvtvec.unk); diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index c35dcb2d427..93e172a944f 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3723,7 +3723,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() msvcp120._Getcoll @ cdecl _Getctype(ptr) msvcp120._Getctype -@ cdecl -ret64 _Getcvt() msvcp120._Getcvt +@ cdecl -norelay _Getcvt() msvcp120._Getcvt @ cdecl _Getdateorder() msvcp120._Getdateorder @ cdecl _Getwctype(long ptr) msvcp120._Getwctype @ cdecl _Getwctypes(ptr ptr ptr ptr) msvcp120._Getwctypes diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6ad46186cb5..7e7ea012236 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3651,7 +3651,7 @@ @ cdecl _File_size(wstr) @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index f3ed2e8b667..628e5f7f59e 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4276,7 +4276,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ extern _Hugeval _Hugeval @ extern _Inf _Inf @ stub _LCosh diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index d60e37bcff6..c48945d9509 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5063,7 +5063,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ extern _Hugeval @ extern _Inf @ stub _LCosh diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 1ccdd09825c..f9fc613b7d0 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5117,7 +5117,7 @@ # extern _FZero @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) @ extern _Hugeval diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index c1f409a1d78..74c0cac3669 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -5726,7 +5726,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0d0af6eac34..bd045333dfc 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -735,9 +735,11 @@ _Ctypevec* __thiscall _Locinfo__Getctype(const _Locinfo *this, _Ctypevec *ret) } /* _Getcvt */ -#if _MSVCP_VER < 110 +#if _MSVCP_VER < 110 && defined(__i386__) +/* Work around a gcc bug */ ULONGLONG __cdecl _Getcvt(void) { + C_ASSERT(sizeof(_Cvtvec) == sizeof(ULONGLONG)); union { _Cvtvec cvtvec; ULONGLONG ull; @@ -749,20 +751,32 @@ ULONGLONG __cdecl _Getcvt(void) ret.cvtvec.handle = ___lc_handle_func()[LC_CTYPE]; return ret.ull; } +#elif _MSVCP_VER < 110 +_Cvtvec __cdecl _Getcvt(void) +{ + _Cvtvec ret; + + TRACE("\n"); + + ret.page = ___lc_codepage_func(); + ret.handle = ___lc_handle_func()[LC_CTYPE]; + return ret; +} #else -_Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) +_Cvtvec __cdecl _Getcvt(void) { + _Cvtvec ret; int i; TRACE("\n"); - memset(ret, 0, sizeof(*ret)); - ret->page = ___lc_codepage_func(); - ret->mb_max = ___mb_cur_max_func(); + memset(&ret, 0, sizeof(ret)); + ret.page = ___lc_codepage_func(); + ret.mb_max = ___mb_cur_max_func(); - if(ret->mb_max > 1) { + if(ret.mb_max > 1) { for(i=0; i<256; i++) - if(_ismbblead(i)) ret->isleadbyte[i/8] |= 1 << (i&7); + if(_ismbblead(i)) ret.isleadbyte[i/8] |= 1 << (i&7); } return ret; } @@ -773,14 +787,14 @@ _Cvtvec* __cdecl _Getcvt(_Cvtvec *ret) DEFINE_THISCALL_WRAPPER(_Locinfo__Getcvt, 8) _Cvtvec* __thiscall _Locinfo__Getcvt(const _Locinfo *this, _Cvtvec *ret) { -#if _MSVCP_VER < 110 - ULONGLONG ull = _Getcvt(); - memcpy(ret, &ull, sizeof(ull)); +#if _MSVCP_VER < 110 && defined(__i386__) + ULONGLONG cvtvec; #else _Cvtvec cvtvec; - _Getcvt(&cvtvec); - memcpy(ret, &cvtvec, sizeof(cvtvec)); #endif + + cvtvec = _Getcvt(); + memcpy(ret, &cvtvec, sizeof(cvtvec)); return ret; } diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 9274a24b706..ff6fe952053 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -6502,7 +6502,7 @@ # extern _FXbig @ cdecl -ret64 _Getcoll() @ cdecl _Getctype(ptr) -@ cdecl -ret64 _Getcvt() +@ cdecl -norelay _Getcvt() @ cdecl _Getdateorder() @ cdecl _Getwctype(long ptr) @ cdecl _Getwctypes(ptr ptr ptr ptr)

1 0

Zebediah Figura : wined3d: Use wined3d_device_context functions internally where possible.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: ac7a67fa7f30cd8c57724147e83cda372260ef9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7a67fa7f30cd8c57724147… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 20 00:15:19 2021 -0500 wined3d: Use wined3d_device_context functions internally where possible. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a8383a89617..e4f0556fdbc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -933,16 +933,17 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) static void device_init_swapchain_state(struct wined3d_device *device, struct wined3d_swapchain *swapchain) { BOOL ds_enable = swapchain->state.desc.enable_auto_depth_stencil; + struct wined3d_device_context *context = &device->cs->c; unsigned int i; for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } if (device->back_buffer_view) - wined3d_device_set_rendertarget_view(device, 0, device->back_buffer_view, TRUE); + wined3d_device_context_set_rendertarget_view(context, 0, device->back_buffer_view, TRUE); - wined3d_device_set_depth_stencil_view(device, ds_enable ? device->auto_depth_stencil_view : NULL); + wined3d_device_context_set_depth_stencil_view(context, ds_enable ? device->auto_depth_stencil_view : NULL); } void wined3d_device_delete_opengl_contexts_cs(void *object) @@ -3979,9 +3980,9 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, TRACE("device %p, stateblock %p.\n", device, stateblock); if (changed->vertexShader) - wined3d_device_set_vertex_shader(device, state->vs); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_VERTEX, state->vs); if (changed->pixelShader) - wined3d_device_set_pixel_shader(device, state->ps); + wined3d_device_context_set_shader(context, WINED3D_SHADER_TYPE_PIXEL, state->ps); for (start = 0; ; start = range.offset + range.size) { @@ -4136,12 +4137,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->rasterizer_states, &desc))) { rasterizer_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_rasterizer_state, entry); - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); } else if (SUCCEEDED(wined3d_rasterizer_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &rasterizer_state))) { - wined3d_device_set_rasterizer_state(device, rasterizer_state); + wined3d_device_context_set_rasterizer_state(context, rasterizer_state); if (wine_rb_put(&device->rasterizer_states, &desc, &rasterizer_state->entry) == -1) { ERR("Failed to insert rasterizer state.\n"); @@ -4209,12 +4210,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->blend_states, &desc))) { blend_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_blend_state, entry); - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); } else if (SUCCEEDED(wined3d_blend_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &blend_state))) { - wined3d_device_set_blend_state(device, blend_state, &colour, state->rs[WINED3D_RS_MULTISAMPLEMASK]); + wined3d_device_context_set_blend_state(context, blend_state, &colour, + state->rs[WINED3D_RS_MULTISAMPLEMASK]); if (wine_rb_put(&device->blend_states, &desc, &blend_state->entry) == -1) { ERR("Failed to insert blend state.\n"); @@ -4276,12 +4279,12 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { depth_stencil_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_depth_stencil_state, entry); - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); } else if (SUCCEEDED(wined3d_depth_stencil_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); + wined3d_device_context_set_depth_stencil_state(context, depth_stencil_state, stencil_ref); if (wine_rb_put(&device->depth_stencil_states, &desc, &depth_stencil_state->entry) == -1) { ERR("Failed to insert depth/stencil state.\n"); @@ -4325,22 +4328,22 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, } if (changed->indices) - wined3d_device_set_index_buffer(device, state->index_buffer, state->index_format, 0); + wined3d_device_context_set_index_buffer(context, state->index_buffer, state->index_format, 0); wined3d_device_set_base_vertex_index(device, state->base_vertex_index); if (changed->vertexDecl) - wined3d_device_set_vertex_declaration(device, state->vertex_declaration); + wined3d_device_context_set_vertex_declaration(context, state->vertex_declaration); if (changed->material) wined3d_device_set_material(device, &state->material); if (changed->viewport) - wined3d_device_set_viewports(device, 1, &state->viewport); + wined3d_device_context_set_viewports(context, 1, &state->viewport); if (changed->scissorRect) - wined3d_device_set_scissor_rects(device, 1, &state->scissor_rect); + wined3d_device_context_set_scissor_rects(context, 1, &state->scissor_rect); map = changed->streamSource; while (map) { i = wined3d_bit_scan(&map); - wined3d_device_set_stream_source(device, i, state->streams[i].buffer, + wined3d_device_context_set_stream_source(context, i, state->streams[i].buffer, state->streams[i].offset, state->streams[i].stride); } map = changed->streamFreq; @@ -5696,9 +5699,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_reset_cb callback, BOOL reset_state) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; + struct wined3d_device_context *context = &device->cs->c; struct wined3d_swapchain_state *swapchain_state; + struct wined3d_state *state = context->state; struct wined3d_swapchain_desc *current_desc; - struct wined3d_state *state = device->cs->c.state; struct wined3d_resource *resource, *cursor; struct wined3d_rendertarget_view *view; struct wined3d_swapchain *swapchain; @@ -5737,9 +5741,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { - wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); + wined3d_device_context_set_rendertarget_view(context, i, NULL, FALSE); } - wined3d_device_set_depth_stencil_view(device, NULL); + wined3d_device_context_set_depth_stencil_view(context, NULL); if (reset_state) { @@ -5961,9 +5965,9 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, else { if ((view = device->back_buffer_view)) - wined3d_device_set_rendertarget_view(device, 0, view, FALSE); + wined3d_device_context_set_rendertarget_view(context, 0, view, FALSE); if ((view = device->auto_depth_stencil_view)) - wined3d_device_set_depth_stencil_view(device, view); + wined3d_device_context_set_depth_stencil_view(context, view); } if (reset_state)

1 0

Zebediah Figura : wined3d: Remove no longer used wined3d_device functions.
by Alexandre Julliard May 20, 2021

May 20, 2021

Module: wine Branch: master Commit: caa039466b08accef83654a02edd7f56d4199f1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=caa039466b08accef83654a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 20 00:15:20 2021 -0500 wined3d: Remove no longer used wined3d_device functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 539 +--------------------------------------------- dlls/wined3d/wined3d.spec | 63 ------ include/wine/wined3d.h | 102 --------- 3 files changed, 1 insertion(+), 703 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=caa039466b08accef836…

1 0