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

Chip Davis : ntdll: Stub power request APIs.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: ca2b7012496c4a97d7c03bc34b388592fd1157f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2b7012496c4a97d7c03bc3… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jul 31 21:40:28 2019 -0500 ntdll: Stub power request APIs. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 6 ++++++ include/winbase.h | 7 ------- include/winnt.h | 7 +++++++ include/winternl.h | 20 ++++++++++++++++++++ 5 files changed, 66 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index cdfbd9f..a9985fb 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3073,6 +3073,39 @@ NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_ return STATUS_SUCCESS; } +/****************************************************************************** + * NtCreatePowerRequest [NTDLL.@] + * + */ +NTSTATUS WINAPI NtCreatePowerRequest( HANDLE *handle, COUNTED_REASON_CONTEXT *context ) +{ + FIXME( "(%p, %p): stub\n", handle, context ); + + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtSetPowerRequest [NTDLL.@] + * + */ +NTSTATUS WINAPI NtSetPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + + return STATUS_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * NtClearPowerRequest [NTDLL.@] + * + */ +NTSTATUS WINAPI NtClearPowerRequest( HANDLE handle, POWER_REQUEST_TYPE type ) +{ + FIXME( "(%p, %u): stub\n", handle, type ); + + return STATUS_NOT_IMPLEMENTED; +} + #ifdef linux /* Fallback using /proc/cpuinfo for Linux systems without cpufreq. For * most distributions on recent enough hardware, this is only likely to diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 278699c..32b2f61 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -142,6 +142,7 @@ @ stdcall NtCancelIoFileEx(long ptr ptr) @ stdcall NtCancelTimer(long ptr) @ stdcall NtClearEvent(long) +@ stdcall NtClearPowerRequest(long long) @ stdcall NtClose(long) @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys @@ -167,6 +168,7 @@ @ stdcall NtCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) @ stdcall NtCreatePagingFile(ptr ptr ptr ptr) @ stdcall NtCreatePort(ptr ptr long long ptr) +@ stdcall NtCreatePowerRequest(ptr ptr) @ stub NtCreateProcess # @ stub NtCreateProcessEx @ stub NtCreateProfile @@ -374,6 +376,7 @@ @ stub NtSetLowEventPair @ stub NtSetLowWaitHighEventPair @ stub NtSetLowWaitHighThread +@ stdcall NtSetPowerRequest(long long) # @ stub NtSetQuotaInformationFile @ stdcall NtSetSecurityObject(long long ptr) @ stub NtSetSystemEnvironmentValue @@ -1094,6 +1097,7 @@ @ stdcall -private ZwCancelIoFileEx(long ptr ptr) NtCancelIoFileEx @ stdcall -private ZwCancelTimer(long ptr) NtCancelTimer @ stdcall -private ZwClearEvent(long) NtClearEvent +@ stdcall -private ZwClearPowerRequest(long long) NtClearPowerRequest @ stdcall -private ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys @@ -1118,6 +1122,7 @@ @ stdcall -private ZwCreateNamedPipeFile(ptr long ptr ptr long long long long long long long long long ptr) NtCreateNamedPipeFile @ stdcall -private ZwCreatePagingFile(ptr ptr ptr ptr) NtCreatePagingFile @ stdcall -private ZwCreatePort(ptr ptr long long ptr) NtCreatePort +@ stdcall -private ZwCreatePowerRequest(ptr ptr) NtCreatePowerRequest @ stub ZwCreateProcess # @ stub ZwCreateProcessEx @ stub ZwCreateProfile @@ -1323,6 +1328,7 @@ @ stub ZwSetLowEventPair @ stub ZwSetLowWaitHighEventPair @ stub ZwSetLowWaitHighThread +@ stdcall -private ZwSetPowerRequest(long long) NtSetPowerRequest # @ stub ZwSetQuotaInformationFile @ stdcall -private ZwSetSecurityObject(long long ptr) NtSetSecurityObject @ stub ZwSetSystemEnvironmentValue diff --git a/include/winbase.h b/include/winbase.h index 086a8b3..9ee290a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -966,13 +966,6 @@ typedef struct _SYSTEM_POWER_STATUS DWORD BatteryFullLifeTime; } SYSTEM_POWER_STATUS, *LPSYSTEM_POWER_STATUS; -typedef enum _POWER_REQUEST_TYPE -{ - PowerRequestDisplayRequired, - PowerRequestSystemRequired, - PowerRequestAwayModeRequired -} POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; - typedef struct _SYSTEM_INFO { union { diff --git a/include/winnt.h b/include/winnt.h index 9eb61db..613f858 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5578,6 +5578,13 @@ typedef struct _SYSTEM_POWER_POLICY { } SYSTEM_POWER_POLICY, *PSYSTEM_POWER_POLICY; +typedef enum _POWER_REQUEST_TYPE +{ + PowerRequestDisplayRequired, + PowerRequestSystemRequired, + PowerRequestAwayModeRequired +} POWER_REQUEST_TYPE, *PPOWER_REQUEST_TYPE; + typedef union _FILE_SEGMENT_ELEMENT { PVOID64 Buffer; ULONGLONG Alignment; diff --git a/include/winternl.h b/include/winternl.h index d654391..fd898e9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2070,6 +2070,23 @@ typedef enum _SHUTDOWN_ACTION { ShutdownPowerOff } SHUTDOWN_ACTION, *PSHUTDOWN_ACTION; +typedef struct _COUNTED_REASON_CONTEXT +{ + ULONG Version; + ULONG Flags; + union + { + struct + { + UNICODE_STRING ResourceFileName; + USHORT ResourceReasonId; + ULONG StringCount; + UNICODE_STRING *ReasonStrings; + } DUMMYSTRUCTNAME; + UNICODE_STRING SimpleString; + } DUMMYUNIONNAME; +} COUNTED_REASON_CONTEXT, *PCOUNTED_REASON_CONTEXT; + typedef enum _KPROFILE_SOURCE { ProfileTime, ProfileAlignmentFixup, @@ -2326,6 +2343,7 @@ NTSYSAPI NTSTATUS WINAPI NtCancelIoFile(HANDLE,PIO_STATUS_BLOCK); NTSYSAPI NTSTATUS WINAPI NtCancelIoFileEx(HANDLE,PIO_STATUS_BLOCK,PIO_STATUS_BLOCK); NTSYSAPI NTSTATUS WINAPI NtCancelTimer(HANDLE, BOOLEAN*); NTSYSAPI NTSTATUS WINAPI NtClearEvent(HANDLE); +NTSYSAPI NTSTATUS WINAPI NtClearPowerRequest(HANDLE,POWER_REQUEST_TYPE); NTSYSAPI NTSTATUS WINAPI NtClose(HANDLE); NTSYSAPI NTSTATUS WINAPI NtCloseObjectAuditAlarm(PUNICODE_STRING,HANDLE,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCompleteConnectPort(HANDLE); @@ -2345,6 +2363,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIB NTSYSAPI NTSTATUS WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreatePagingFile(PUNICODE_STRING,PLARGE_INTEGER,PLARGE_INTEGER,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreatePort(PHANDLE,POBJECT_ATTRIBUTES,ULONG,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtCreatePowerRequest(HANDLE*,COUNTED_REASON_CONTEXT*); NTSYSAPI NTSTATUS WINAPI NtCreateProcess(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,HANDLE,BOOLEAN,HANDLE,HANDLE,HANDLE); NTSYSAPI NTSTATUS WINAPI NtCreateProfile(PHANDLE,HANDLE,PVOID,ULONG,ULONG,PVOID,ULONG,KPROFILE_SOURCE,KAFFINITY); NTSYSAPI NTSTATUS WINAPI NtCreateSection(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,const LARGE_INTEGER*,ULONG,ULONG,HANDLE); @@ -2510,6 +2529,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetLdtEntries(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetLowEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighEventPair(HANDLE); NTSYSAPI NTSTATUS WINAPI NtSetLowWaitHighThread(VOID); +NTSYSAPI NTSTATUS WINAPI NtSetPowerRequest(HANDLE,POWER_REQUEST_TYPE); NTSYSAPI NTSTATUS WINAPI NtSetSecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); NTSYSAPI NTSTATUS WINAPI NtSetSystemEnvironmentValue(PUNICODE_STRING,PUNICODE_STRING); NTSYSAPI NTSTATUS WINAPI NtSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG);

1 0

Chip Davis : ntdll: Move SetThreadExecutionState() implementation to ntdll.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 6420ebdf93373ebad789d471f6235a4d8a585188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6420ebdf93373ebad789d471… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jul 31 17:24:55 2019 -0500 ntdll: Move SetThreadExecutionState() implementation to ntdll. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/powermgnt.c | 9 +++------ dlls/ntdll/nt.c | 17 +++++++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- include/winternl.h | 1 + 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 81e43b4..056dd9d 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(powermgnt); @@ -100,14 +101,10 @@ BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate, */ EXECUTION_STATE WINAPI SetThreadExecutionState(EXECUTION_STATE flags) { - static EXECUTION_STATE current = - ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; - EXECUTION_STATE old = current; + EXECUTION_STATE old; - WARN("(0x%x): stub, harmless.\n", flags); + NtSetThreadExecutionState(flags, &old); - if (!(current & ES_CONTINUOUS) || (flags & ES_CONTINUOUS)) - current = flags; return old; } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b58c2d6..cdfbd9f 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -3056,6 +3056,23 @@ NTSTATUS WINAPI NtInitiatePowerAction( return STATUS_NOT_IMPLEMENTED; } +/****************************************************************************** + * NtSetThreadExecutionState [NTDLL.@] + * + */ +NTSTATUS WINAPI NtSetThreadExecutionState( EXECUTION_STATE new_state, EXECUTION_STATE *old_state ) +{ + static EXECUTION_STATE current = + ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; + *old_state = current; + + WARN( "(0x%x, %p): stub, harmless.\n", new_state, old_state ); + + if (!(current & ES_CONTINUOUS) || (new_state & ES_CONTINUOUS)) + current = new_state; + return STATUS_SUCCESS; +} + #ifdef linux /* Fallback using /proc/cpuinfo for Linux systems without cpufreq. For * most distributions on recent enough hardware, this is only likely to diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 323d5ea..278699c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -381,7 +381,7 @@ @ stdcall NtSetSystemInformation(long ptr long) @ stub NtSetSystemPowerState @ stdcall NtSetSystemTime(ptr ptr) -# @ stub NtSetThreadExecutionState +@ stdcall NtSetThreadExecutionState(long ptr) @ stdcall NtSetTimer(long ptr ptr ptr long long ptr) @ stdcall NtSetTimerResolution(long long ptr) # @ stub NtSetUuidSeed @@ -1330,7 +1330,7 @@ @ stdcall -private ZwSetSystemInformation(long ptr long) NtSetSystemInformation @ stub ZwSetSystemPowerState @ stdcall -private ZwSetSystemTime(ptr ptr) NtSetSystemTime -# @ stub ZwSetThreadExecutionState +@ stdcall ZwSetThreadExecutionState(long ptr) NtSetThreadExecutionState @ stdcall -private ZwSetTimer(long ptr ptr ptr long long ptr) NtSetTimer @ stdcall -private ZwSetTimerResolution(long long ptr) NtSetTimerResolution # @ stub ZwSetUuidSeed diff --git a/include/winternl.h b/include/winternl.h index 49eedaf..d654391 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2515,6 +2515,7 @@ NTSYSAPI NTSTATUS WINAPI NtSetSystemEnvironmentValue(PUNICODE_STRING,PUNICODE_S NTSYSAPI NTSTATUS WINAPI NtSetSystemInformation(SYSTEM_INFORMATION_CLASS,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetSystemPowerState(POWER_ACTION,SYSTEM_POWER_STATE,ULONG); NTSYSAPI NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER*,LARGE_INTEGER*); +NTSYSAPI NTSTATUS WINAPI NtSetThreadExecutionState(EXECUTION_STATE,EXECUTION_STATE*); NTSYSAPI NTSTATUS WINAPI NtSetTimer(HANDLE, const LARGE_INTEGER*, PTIMER_APC_ROUTINE, PVOID, BOOLEAN, ULONG, BOOLEAN*); NTSYSAPI NTSTATUS WINAPI NtSetTimerResolution(ULONG,BOOLEAN,PULONG); NTSYSAPI NTSTATUS WINAPI NtSetValueKey(HANDLE,const UNICODE_STRING *,ULONG,ULONG,const void *,ULONG);

1 0

Chip Davis : ntdll: Implement RtlCaptureStackBackTrace() for x86_64.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 4e4aa467752db723cb36ea140860ea24efbe5719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e4aa467752db723cb36ea14… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Jul 31 16:57:10 2019 -0500 ntdll: Implement RtlCaptureStackBackTrace() for x86_64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40868 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47101 Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 111 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index b024de7..9441230 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4436,13 +4436,120 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "call " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); +static inline ULONG hash_pointers( void **ptrs, ULONG count ) +{ + /* Based on MurmurHash2, which is in the public domain */ + static const ULONG m = 0x5bd1e995; + static const ULONG r = 24; + ULONG hash = count * sizeof(void*); + for (; count > 0; ptrs++, count--) + { + ULONG_PTR data = (ULONG_PTR)*ptrs; + ULONG k1 = (ULONG)(data & 0xffffffff), k2 = (ULONG)(data >> 32); + k1 *= m; + k1 = (k1 ^ (k1 >> r)) * m; + k2 *= m; + k2 = (k2 ^ (k2 >> r)) * m; + hash = (((hash * m) ^ k1) * m) ^ k2; + } + hash = (hash ^ (hash >> 13)) * m; + return hash ^ (hash >> 15); +} + + /************************************************************************* * RtlCaptureStackBackTrace (NTDLL.@) */ USHORT WINAPI RtlCaptureStackBackTrace( ULONG skip, ULONG count, PVOID *buffer, ULONG *hash ) { - FIXME( "(%d, %d, %p, %p) stub!\n", skip, count, buffer, hash ); - return 0; + UNWIND_HISTORY_TABLE table; + DISPATCHER_CONTEXT dispatch; + CONTEXT context; + LDR_MODULE *module; + NTSTATUS status; + ULONG i; + USHORT num_entries = 0; + + TRACE( "(%u, %u, %p, %p)", skip, count, buffer, hash ); + + RtlCaptureContext( &context ); + dispatch.TargetIp = 0; + dispatch.ContextRecord = &context; + dispatch.HistoryTable = &table; + if (hash) *hash = 0; + for (i = 0; i < skip + count; i++) + { + /* FIXME: should use the history table to make things faster */ + + dispatch.ImageBase = 0; + dispatch.ControlPc = context.Rip; + dispatch.ScopeIndex = 0; + + /* first look for PE exception information */ + + if ((dispatch.FunctionEntry = lookup_function_info( dispatch.ControlPc, &dispatch.ImageBase, &module ))) + { + RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, + dispatch.FunctionEntry, &context, &dispatch.HandlerData, + &dispatch.EstablisherFrame, NULL ); + goto unwind_done; + } + + /* then look for host system exception information */ + + if (!module || (module->Flags & LDR_WINE_INTERNAL)) + { + BOOL got_info = FALSE; + struct dwarf_eh_bases bases; + const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(dispatch.ControlPc - 1), &bases ); + + if (fde) + { + status = dwarf_virtual_unwind( dispatch.ControlPc, &dispatch.EstablisherFrame, &context, + fde, &bases, &dispatch.LanguageHandler, &dispatch.HandlerData ); + if (status != STATUS_SUCCESS) return status; + got_info = TRUE; + } +#ifdef HAVE_LIBUNWIND_H + else + { + status = libunwind_virtual_unwind( dispatch.ControlPc, &got_info, &dispatch.EstablisherFrame, &context, + &dispatch.LanguageHandler, &dispatch.HandlerData ); + if (status != STATUS_SUCCESS) return i; + } +#endif + + if (got_info) + { + dispatch.FunctionEntry = NULL; + goto unwind_done; + } + } + else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); + + context.Rip = *(ULONG64 *)context.Rsp; + context.Rsp = context.Rsp + sizeof(ULONG64); + dispatch.EstablisherFrame = context.Rsp; + + unwind_done: + if (!dispatch.EstablisherFrame) break; + + if ((dispatch.EstablisherFrame & 7) || + dispatch.EstablisherFrame < (ULONG64)NtCurrentTeb()->Tib.StackLimit || + dispatch.EstablisherFrame > (ULONG64)NtCurrentTeb()->Tib.StackBase) + { + ERR( "invalid frame %lx (%p-%p)\n", dispatch.EstablisherFrame, + NtCurrentTeb()->Tib.StackLimit, NtCurrentTeb()->Tib.StackBase ); + break; + } + + if (context.Rsp == (ULONG64)NtCurrentTeb()->Tib.StackBase) break; + + if (i >= skip) buffer[num_entries++] = (void *)context.Rip; + } + if (hash && num_entries > 0) *hash = hash_pointers( buffer, num_entries ); + TRACE( "captured %hu frames\n", num_entries ); + return num_entries; }

1 0

Martin Storsjo : msvcrt: Provide the fmal function using the existing fma implementation.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 1010857a00298969c6ad61ffb231a558180d406e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1010857a00298969c6ad61ff… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jul 31 00:08:50 2019 +0300 msvcrt: Provide the fmal function using the existing fma implementation. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index bc281ca..9eb3059 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -243,7 +243,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) ucrtbase.floorf @ cdecl fma(double double double) ucrtbase.fma @ cdecl fmaf(float float float) ucrtbase.fmaf -@ stub fmal +@ cdecl fmal(double double double) ucrtbase.fmal @ cdecl fmax(double double) ucrtbase.fmax @ cdecl fmaxf(float float) ucrtbase.fmaxf @ cdecl fmaxl(double double) ucrtbase.fmaxl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dc887b7..26d6983 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2166,7 +2166,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma @ cdecl fmaf(float float float) MSVCRT_fmaf -@ stub fmal +@ cdecl fmal(double double double) MSVCRT_fma @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c56d1a9..3ca90c3 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1832,7 +1832,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) msvcr120.floorf @ cdecl fma(double double double) msvcr120.fma @ cdecl fmaf(float float float) msvcr120.fmaf -@ stub fmal +@ cdecl fmal(double double double) msvcr120.fmal @ cdecl fmax(double double) msvcr120.fmax @ cdecl fmaxf(float float) msvcr120.fmaxf @ cdecl fmaxl(double double) msvcr120.fmaxl diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index e290c14..6609683 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2307,7 +2307,7 @@ @ cdecl -arch=arm,x86_64,arm64 floorf(float) MSVCRT_floorf @ cdecl fma(double double double) MSVCRT_fma @ cdecl fmaf(float float float) MSVCRT_fmaf -@ stub fmal +@ cdecl fmal(double double double) MSVCRT_fma @ cdecl fmax(double double) MSVCR120_fmax @ cdecl fmaxf(float float) MSVCR120_fmaxf @ cdecl fmaxl(double double) MSVCR120_fmax

1 0

Alistair Leslie-Hughes : include: Added missing Edit_* defines.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: b943b8c347493a6d28cec2d6aa8c65098454f332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b943b8c347493a6d28cec2d6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 06:21:14 2019 +0000 include: Added missing Edit_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 77b22b4..0ad5614 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5336,6 +5336,14 @@ typedef struct _tagEDITBALLOONTIP (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, (WPARAM)(drawfocused), (LPARAM)(text)) #define Edit_GetCueBannerText(hwnd, buff, buff_size) \ (BOOL)SNDMSG((hwnd), EM_GETCUEBANNER, (WPARAM)(buff), (LPARAM)(buff_size)) +#define Edit_SetHilite(hwnd, start, end) \ + SNDMSG((hwnd), EM_SETHILITE, start, end) +#define Edit_GetHilite(hwnd) \ + ((DWORD)SNDMSG((hwnd), EM_GETHILITE, 0L, 0L)) +#define Edit_ShowBalloonTip(hwnd, tip) \ + (BOOL)SNDMSG((hwnd), EM_SHOWBALLOONTIP, 0, (LPARAM)(tip)) +#define Edit_HideBalloonTip(hwnd) \ + (BOOL)SNDMSG((hwnd), EM_HIDEBALLOONTIP, 0, 0) /************************************************************************** * Listbox control

1 0

Alistair Leslie-Hughes : include: Added missing DateTime_* defines.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 10cc93371572a2382fef3051775747433492cf26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10cc93371572a2382fef3051… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:29:04 2019 +0000 include: Added missing DateTime_* defines. Also defines struct DATETIMEPICKERINFO needed for #defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 0f0d83c..f21d930 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5054,6 +5054,17 @@ typedef struct tagNMDATETIMEFORMATQUERYW DECL_WINELIB_TYPE_AW(NMDATETIMEFORMATQUERY) DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) +typedef struct tagDATETIMEPICKERINFO +{ + DWORD cbSize; + RECT rcCheck; + DWORD stateCheck; + RECT rcButton; + DWORD stateButton; + HWND hwndEdit; + HWND hwndUD; + HWND hwndDropDown; +} DATETIMEPICKERINFO, *LPDATETIMEPICKERINFO; #define GDT_ERROR -1 @@ -5089,6 +5100,14 @@ DECL_WINELIB_TYPE_AW(LPNMDATETIMEFORMATQUERY) SNDMSG (hdp, DTM_GETMCFONT, 0, 0) #define DateTime_GetIdealSize(hdp, sz) \ (BOOL) SNDMSG (hdp, DTM_GETIDEALSIZE, 0, (LPARAM)sz) +#define DateTime_SetMonthCalStyle(hdp, style) \ + SNDMSG(hdp, DTM_SETMCSTYLE, 0, (LPARAM)style) +#define DateTime_GetMonthCalStyle(hdp) \ + SNDMSG(hdp, DTM_GETMCSTYLE, 0, 0) +#define DateTime_GetDateTimePickerInfo(hdp, info) \ + SNDMSG(hdp, DTM_GETDATETIMEPICKERINFO, 0, (LPARAM)info) +#define DateTime_CloseMonthCal(hdp) \ + SNDMSG(hdp, DTM_CLOSEMONTHCAL, 0, 0) #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff)

1 0

Gijs Vermeulen : wmp: Add IWMPPlaylist stub.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 559842ffc15f85b54a8731b6c6603468f9dd740b URL: https://source.winehq.org/git/wine.git/?a=commit;h=559842ffc15f85b54a8731b6… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 18:14:31 2019 +0200 wmp: Add IWMPPlaylist stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 255 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/wmp/tests/oleobj.c | 15 +++ dlls/wmp/wmp_private.h | 12 +++ 3 files changed, 279 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=559842ffc15f85b54a87…

1 0

Gijs Vermeulen : wmp: Fake success in IWMPMedia::getItemInfo.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: eccd8c5424c16a70e3fec9efeaf73a60364f4062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eccd8c5424c16a70e3fec9ef… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:57 2019 +0200 wmp: Fake success in IWMPMedia::getItemInfo. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 5673d0e..fc4439d 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1874,11 +1874,11 @@ static HRESULT WINAPI WMPMedia_getAttributeName(IWMPMedia *iface, LONG lIndex, B return E_NOTIMPL; } -static HRESULT WINAPI WMPMedia_getItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR *pbstrVal) +static HRESULT WINAPI WMPMedia_getItemInfo(IWMPMedia *iface, BSTR item_name, BSTR *value) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_w(bstrItemName), pbstrVal); - return E_NOTIMPL; + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(item_name), value); + return return_bstr(NULL, value); } static HRESULT WINAPI WMPMedia_setItemInfo(IWMPMedia *iface, BSTR bstrItemName, BSTR bstrVal)

1 0

Gijs Vermeulen : wmp: Implement IWMPMedia::put/get_name.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 3b0e8197613dcafbf67f8c1792a7456acdf73017 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b0e8197613dcafbf67f8c17… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:55 2019 +0200 wmp: Implement IWMPMedia::put/get_name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47029 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/Makefile.in | 2 +- dlls/wmp/player.c | 61 ++++++++++++++++++++++++++++++++++++++++++++------ dlls/wmp/tests/media.c | 5 ----- dlls/wmp/wmp_private.h | 1 + 4 files changed, 56 insertions(+), 13 deletions(-) diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 5ed3d42..333717c 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,5 +1,5 @@ MODULE = wmp.dll -IMPORTS = oleaut32 ole32 user32 gdi32 +IMPORTS = oleaut32 ole32 urlmon shlwapi user32 gdi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 7a1befe..5673d0e 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include <nserror.h> #include "wmpids.h" +#include "shlwapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -1730,6 +1731,7 @@ static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) if(!ref) { heap_free(This->url); + heap_free(This->name); heap_free(This); } @@ -1789,17 +1791,21 @@ static HRESULT WINAPI WMPMedia_get_name(IWMPMedia *iface, BSTR *name) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%p)\n", This, name); + TRACE("(%p)->(%p)\n", This, name); - /* FIXME: this should be a display name */ - return return_bstr(This->url, name); + return return_bstr(This->name, name); } -static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR pbstrName) +static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR name) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pbstrName)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(name)); + + if (!name) return E_POINTER; + + This->name = heap_strdupW(name); + return S_OK; } static HRESULT WINAPI WMPMedia_get_imageSourceWidth(IWMPMedia *iface, LONG *pWidth) @@ -2022,13 +2028,54 @@ WMPMedia *unsafe_impl_from_IWMPMedia(IWMPMedia *iface) HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) { WMPMedia *media; + IUri *uri; + BSTR path; + HRESULT hr; + WCHAR *name_dup, slashW[] = {'/',0}; media = heap_alloc_zero(sizeof(*media)); if (!media) return E_OUTOFMEMORY; media->IWMPMedia_iface.lpVtbl = &WMPMediaVtbl; - media->url = url ? heap_strdupW(url) : heap_strdupW(emptyW); + + if (url) + { + media->url = heap_strdupW(url); + name_dup = heap_strdupW(url); + + hr = CreateUri(name_dup, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); + if (FAILED(hr)) + { + heap_free(name_dup); + return hr; + } + hr = IUri_GetPath(uri, &path); + if (hr != S_OK) + { + heap_free(name_dup); + IUri_Release(uri); + return hr; + } + + /* GetPath() will return "/" for invalid uri's + * only strip extension when uri is valid + */ + if (wcscmp(path, slashW) != 0) + PathRemoveExtensionW(name_dup); + PathStripPathW(name_dup); + + media->name = name_dup; + + SysFreeString(path); + IUri_Release(uri); + } + else + { + media->url = heap_strdupW(emptyW); + media->name = heap_strdupW(emptyW); + } + media->duration = duration; media->ref = 1; diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index c190eee..3d750e1 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -573,15 +573,12 @@ todo_wine SysFreeString(str); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPMedia_put_name(media, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); @@ -594,7 +591,6 @@ todo_wine ok(media2 != NULL, "Unexpected media instance.\n"); hr = IWMPMedia_get_name(media2, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media2); @@ -615,7 +611,6 @@ todo_wine SysFreeString(str); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); - todo_wine ok(!lstrcmpW(str, tests[i].expected), "Expected %s, got %s\n", wine_dbgstr_w(tests[i].expected), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media); diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index 27ec55e..5149d73 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -56,6 +56,7 @@ typedef struct { LONG ref; WCHAR *url; + WCHAR *name; DOUBLE duration; } WMPMedia;

1 0

Gijs Vermeulen : wmp/tests: Add more IWMPMedia name handling tests.
by Alexandre Julliard Aug. 1, 2019

Aug. 1, 2019

Module: wine Branch: master Commit: 53ac8e7b113b5fbc78f2168252d937a6d757bddb URL: https://source.winehq.org/git/wine.git/?a=commit;h=53ac8e7b113b5fbc78f21682… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Aug 1 15:07:54 2019 +0200 wmp/tests: Add more IWMPMedia name handling tests. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index dd6fdcb..c190eee 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -489,11 +489,40 @@ playback_skip: static void test_media_item(void) { + static const WCHAR slashW[] = {'\\',0}; static const WCHAR testW[] = {'t','e','s','t',0}; + static const WCHAR fooW[] = {'f','o','o',':','/','/',0}; + static const WCHAR fileW[] = {'f','i','l','e',':','/','/','/',0}; + static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; + static const WCHAR httpsW[] = {'h','t','t','p','s',':','/','/',0}; + static const WCHAR invalidurlW[] = {'i','n','v','a','l','i','d','_','u','r','l',0}; + static const WCHAR invalidurlmp3W[] = {'i','n','v','a','l','i','d','_','u','r','l','.','m','p','3',0}; + static const WCHAR winehqurlW[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g', + '/','t','e','s','t','s','/','t','e','s','t','.','m','p','3',0}; + static WCHAR pathW[MAX_PATH]; + static WCHAR currentdirW[MAX_PATH]; + struct { + const WCHAR *prefix; + const WCHAR *filename; + const WCHAR *expected; + } tests[] = { + { NULL, invalidurlmp3W, invalidurlW }, + { currentdirW, mp3file, testW }, + { currentdirW, invalidurlmp3W, invalidurlW }, + { httpW, winehqurlW, testW }, + { httpW, invalidurlmp3W, invalidurlmp3W }, + { httpsW, winehqurlW, testW }, + { httpsW, invalidurlmp3W, invalidurlmp3W }, + { fileW, mp3file, testW }, + { fileW, invalidurlmp3W, invalidurlW }, + { fooW, mp3file, mp3file }, + { fooW, invalidurlmp3W, invalidurlmp3W } + }; IWMPMedia *media, *media2; IWMPPlayer4 *player; HRESULT hr; BSTR str; + int i; hr = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IWMPPlayer4, (void **)&player); if (hr == REGDB_E_CLASSNOTREG) @@ -505,6 +534,9 @@ static void test_media_item(void) hr = IWMPPlayer4_newMedia(player, NULL, &media); ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + hr = IWMPMedia_get_name(media, NULL); +todo_wine + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); ok(*str == 0, "Unexpected name %s.\n", wine_dbgstr_w(str)); @@ -542,7 +574,15 @@ static void test_media_item(void) hr = IWMPMedia_get_name(media, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); todo_wine - ok(!lstrcmpW(str, testW), "Unexpected name %s.\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); + SysFreeString(str); + hr = IWMPMedia_put_name(media, NULL); +todo_wine + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IWMPMedia_get_name(media, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); +todo_wine + ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); hr = IWMPPlayer4_put_currentMedia(player, media); @@ -555,10 +595,32 @@ todo_wine hr = IWMPMedia_get_name(media2, &str); ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); todo_wine - ok(!lstrcmpW(str, testW), "Unexpected name %s.\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, testW), "Expected %s, got %s\n", wine_dbgstr_w(testW), wine_dbgstr_w(str)); SysFreeString(str); IWMPMedia_Release(media2); + GetCurrentDirectoryW(ARRAY_SIZE(currentdirW), currentdirW); + lstrcatW(currentdirW, slashW); + + for (i=0; i<ARRAY_SIZE(tests); i++) + { + + pathW[0] = '\0'; + if(tests[i].prefix) lstrcatW(pathW, tests[i].prefix); + lstrcatW(pathW, tests[i].filename); + + str = SysAllocString(pathW); + hr = IWMPPlayer4_newMedia(player, str, &media); + ok(hr == S_OK, "Failed to create a media item, hr %#x.\n", hr); + SysFreeString(str); + hr = IWMPMedia_get_name(media, &str); + ok(hr == S_OK, "Failed to get item name, hr %#x.\n", hr); + todo_wine + ok(!lstrcmpW(str, tests[i].expected), "Expected %s, got %s\n", wine_dbgstr_w(tests[i].expected), wine_dbgstr_w(str)); + SysFreeString(str); + IWMPMedia_Release(media); + } + IWMPPlayer4_Release(player); }

1 0