November 2020 - Wine-commits

Alexandre Julliard : include: Move XSTATE definitions to winnt.h.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: c6f2ef3d1cea1e02ade335a7f16dc3158f3a7e49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f2ef3d1cea1e02ade335a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 11:37:38 2020 +0100 include: Move XSTATE definitions to winnt.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddk/wdm.h | 47 ----------------------------------------------- include/winnt.h | 28 ++++++++++++++++++++++++++++ include/winternl.h | 14 ++++++++++++++ 3 files changed, 42 insertions(+), 47 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6885de1cf89..c0b97e243aa 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1194,39 +1194,6 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE #define NX_SUPPORT_POLICY_OPTIN 2 #define NX_SUPPORT_POLICY_OPTOUT 3 -#define XSTATE_LEGACY_FLOATING_POINT 0 -#define XSTATE_LEGACY_SSE 1 -#define XSTATE_GSSE 2 - -#define XSTATE_MASK_LEGACY_FLOATING_POINT (1 << XSTATE_LEGACY_FLOATING_POINT) -#define XSTATE_MASK_LEGACY_SSE (1 << XSTATE_LEGACY_SSE) -#define XSTATE_MASK_LEGACY (XSTATE_MASK_LEGACY_FLOATING_POINT | XSTATE_MASK_LEGACY_SSE) -#define XSTATE_MASK_GSSE (1 << XSTATE_GSSE) - -#define MAXIMUM_XSTATE_FEATURES 64 - -typedef struct _XSTATE_FEATURE -{ - ULONG Offset; - ULONG Size; -} XSTATE_FEATURE, *PXSTATE_FEATURE; - -typedef struct _XSTATE_CONFIGURATION -{ - ULONG64 EnabledFeatures; - ULONG64 EnabledVolatileFeatures; - ULONG Size; - ULONG OptimizedSave:1; - ULONG CompactionEnabled:1; - XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; - - ULONG64 EnabledSupervisorFeatures; - ULONG64 AlignedFeatures; - ULONG AllFeatureSize; - ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; - ULONG64 EnabledUserVisibleSupervisorFeatures; -} XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; - typedef struct _KUSER_SHARED_DATA { ULONG TickCountLowDeprecated; /* 0x000 */ ULONG TickCountMultiplier; /* 0x004 */ @@ -1836,20 +1803,6 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS); BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS); -#if defined(__x86_64__) || defined(__i386__) -NTSTATUS WINAPI RtlCopyExtendedContext(CONTEXT_EX*,ULONG,CONTEXT_EX*); -NTSTATUS WINAPI RtlInitializeExtendedContext(void*,ULONG,CONTEXT_EX**); -NTSTATUS WINAPI RtlInitializeExtendedContext2(void*,ULONG,CONTEXT_EX**,ULONG64); -ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); -NTSTATUS WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); -NTSTATUS WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); -void * WINAPI RtlLocateLegacyContext(CONTEXT_EX*,ULONG*); -void * WINAPI RtlLocateExtendedFeature(CONTEXT_EX*,ULONG,ULONG*); -void * WINAPI RtlLocateExtendedFeature2(CONTEXT_EX*,ULONG,XSTATE_CONFIGURATION*,ULONG*); -ULONG64 WINAPI RtlGetExtendedFeaturesMask(CONTEXT_EX*); -void WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64); -#endif - #ifdef __x86_64__ void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T); #else diff --git a/include/winnt.h b/include/winnt.h index 1945ee82eab..04353d9405d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1338,6 +1338,34 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(ULONG,ULONG64,ULONG64,RUNTIME_FUNCTION*,C #define XSTATE_IPT 8 #define XSTATE_CET_U 11 #define XSTATE_LWP 62 +#define MAXIMUM_XSTATE_FEATURES 64 + +#define XSTATE_MASK_LEGACY_FLOATING_POINT (1 << XSTATE_LEGACY_FLOATING_POINT) +#define XSTATE_MASK_LEGACY_SSE (1 << XSTATE_LEGACY_SSE) +#define XSTATE_MASK_LEGACY (XSTATE_MASK_LEGACY_FLOATING_POINT | XSTATE_MASK_LEGACY_SSE) +#define XSTATE_MASK_GSSE (1 << XSTATE_GSSE) + +typedef struct _XSTATE_FEATURE +{ + ULONG Offset; + ULONG Size; +} XSTATE_FEATURE, *PXSTATE_FEATURE; + +typedef struct _XSTATE_CONFIGURATION +{ + ULONG64 EnabledFeatures; + ULONG64 EnabledVolatileFeatures; + ULONG Size; + ULONG OptimizedSave:1; + ULONG CompactionEnabled:1; + XSTATE_FEATURE Features[MAXIMUM_XSTATE_FEATURES]; + + ULONG64 EnabledSupervisorFeatures; + ULONG64 AlignedFeatures; + ULONG AllFeatureSize; + ULONG AllFeatures[MAXIMUM_XSTATE_FEATURES]; + ULONG64 EnabledUserVisibleSupervisorFeatures; +} XSTATE_CONFIGURATION, *PXSTATE_CONFIGURATION; typedef struct _YMMCONTEXT { diff --git a/include/winternl.h b/include/winternl.h index 11b64d078f0..a5c4837837f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3660,6 +3660,20 @@ NTSYSAPI NTSTATUS WINAPI RtlpUnWaitCriticalSection(RTL_CRITICAL_SECTION *); NTSYSAPI NTSTATUS WINAPI vDbgPrintEx(ULONG,ULONG,LPCSTR,__ms_va_list); NTSYSAPI NTSTATUS WINAPI vDbgPrintExWithPrefix(LPCSTR,ULONG,ULONG,LPCSTR,__ms_va_list); +#if defined(__x86_64__) || defined(__i386__) +NTSYSAPI NTSTATUS WINAPI RtlCopyExtendedContext(CONTEXT_EX*,ULONG,CONTEXT_EX*); +NTSYSAPI NTSTATUS WINAPI RtlInitializeExtendedContext(void*,ULONG,CONTEXT_EX**); +NTSYSAPI NTSTATUS WINAPI RtlInitializeExtendedContext2(void*,ULONG,CONTEXT_EX**,ULONG64); +NTSYSAPI ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64); +NTSYSAPI NTSTATUS WINAPI RtlGetExtendedContextLength(ULONG,ULONG*); +NTSYSAPI NTSTATUS WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64); +NTSYSAPI void * WINAPI RtlLocateLegacyContext(CONTEXT_EX*,ULONG*); +NTSYSAPI void * WINAPI RtlLocateExtendedFeature(CONTEXT_EX*,ULONG,ULONG*); +NTSYSAPI void * WINAPI RtlLocateExtendedFeature2(CONTEXT_EX*,ULONG,XSTATE_CONFIGURATION*,ULONG*); +NTSYSAPI ULONG64 WINAPI RtlGetExtendedFeaturesMask(CONTEXT_EX*); +NTSYSAPI void WINAPI RtlSetExtendedFeaturesMask(CONTEXT_EX*,ULONG64); +#endif + NTSYSAPI int __cdecl _strnicmp(LPCSTR,LPCSTR,size_t); /* 32-bit only functions */

1 0

Alexandre Julliard : include: Use proper dllimports for kernel32 functions.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 9dc2892785649b22272f68de42bbd55e72a64bf1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dc2892785649b22272f68de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 18:41:13 2020 +0100 include: Use proper dllimports for kernel32 functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 1 + dlls/kernelbase/debug.c | 1 + dlls/kernelbase/locale.c | 1 + dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/exception.c | 3 ++- dlls/winecrt0/delay_load.c | 11 ++++++----- include/winbase.h | 6 +++--- include/wine/winbase16.h | 2 ++ include/winnls.h | 4 +++- 9 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 14953246f24..971022139c5 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DWINBASEAPI= MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 0382ea9f95a..52d0f705267 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -314,6 +314,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou RtlRaiseException( &record ); } +__ASM_STDCALL_IMPORT(RaiseException,16) /*********************************************************************** diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 9cfb9f129ee..7218a159844 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -28,6 +28,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS +#define WINNORMALIZEAPI #include "windef.h" #include "winbase.h" #include "winreg.h" diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 02eb5f1d871..b2f63d9f63a 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= +EXTRADEFS = -D_NTSYSTEM_ -D_ACRTIMP= -DWINBASEAPI= MODULE = ntdll.dll IMPORTLIB = ntdll IMPORTS = winecrt0 diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index a6b4b6a7baa..6b51be39be0 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -634,7 +634,7 @@ BOOL WINAPI IsBadStringPtrA( LPCSTR str, UINT_PTR max ) __ENDTRY return FALSE; } - +__ASM_STDCALL_IMPORT(IsBadStringPtrA,8) /************************************************************* * IsBadStringPtrW @@ -656,6 +656,7 @@ BOOL WINAPI IsBadStringPtrW( LPCWSTR str, UINT_PTR max ) __ENDTRY return FALSE; } +__ASM_STDCALL_IMPORT(IsBadStringPtrW,8) /********************************************************************** diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index 8c8a9cc836a..1778856aa56 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -23,16 +23,17 @@ #include "winbase.h" #include "delayloadhandler.h" -void *WINAPI ResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, - PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, - PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, - IMAGE_THUNK_DATA* addr, ULONG flags ); -void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ); +WINBASEAPI void *WINAPI DelayLoadFailureHook( LPCSTR name, LPCSTR function ); #ifdef _WIN32 extern IMAGE_DOS_HEADER __ImageBase; +WINBASEAPI void *WINAPI ResolveDelayLoadedAPI( void* base, const IMAGE_DELAYLOAD_DESCRIPTOR* desc, + PDELAYLOAD_FAILURE_DLL_CALLBACK dllhook, + PDELAYLOAD_FAILURE_SYSTEM_ROUTINE syshook, + IMAGE_THUNK_DATA* addr, ULONG flags ); + FARPROC WINAPI __delayLoadHelper2( const IMAGE_DELAYLOAD_DESCRIPTOR *descr, IMAGE_THUNK_DATA *addr ) { return ResolveDelayLoadedAPI( &__ImageBase, descr, NULL, DelayLoadFailureHook, addr, 0 ); diff --git a/include/winbase.h b/include/winbase.h index 82797efc2b0..dc8aa081be4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -25,10 +25,12 @@ extern "C" { #endif +#ifndef WINBASEAPI #ifdef _KERNEL32_ #define WINBASEAPI #else -#define WINBASEAPI DECLSPEC_HIDDEN +#define WINBASEAPI DECLSPEC_IMPORT +#endif #endif #ifdef _ADVAPI32_ @@ -2473,8 +2475,6 @@ WINBASEAPI void WINAPI MakeCriticalSectionGlobal(CRITICAL_SECTION *lpCrit #define MakeProcInstance(proc,inst) (proc) WINADVAPI BOOL WINAPI MakeSelfRelativeSD(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD); WINADVAPI VOID WINAPI MapGenericMask(PDWORD,PGENERIC_MAPPING); -WINBASEAPI HMODULE WINAPI MapHModuleSL(WORD); -WINBASEAPI WORD WINAPI MapHModuleLS(HMODULE); WINBASEAPI BOOL WINAPI MapUserPhysicalPages(PVOID,ULONG_PTR,PULONG_PTR); WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE,DWORD,DWORD,DWORD,SIZE_T); WINBASEAPI LPVOID WINAPI MapViewOfFileEx(HANDLE,DWORD,DWORD,DWORD,SIZE_T,LPVOID); diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index d4a5096ee11..5938ef19966 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -515,6 +515,8 @@ BOOL16 WINAPI LocalUnlock16(HLOCAL16); LPVOID WINAPI LockResource16(HGLOBAL16); HGLOBAL16 WINAPI LockSegment16(HGLOBAL16); FARPROC16 WINAPI MakeProcInstance16(FARPROC16,HANDLE16); +HMODULE WINAPI MapHModuleSL(WORD); +WORD WINAPI MapHModuleLS(HMODULE); HFILE16 WINAPI OpenFile16(LPCSTR,OFSTRUCT*,UINT16); DWORD WINAPI RegCloseKey16(HKEY); DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,PHKEY); diff --git a/include/winnls.h b/include/winnls.h index 2964ae56853..e90b6f5a22f 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -24,11 +24,13 @@ extern "C" { #endif +#ifndef WINNORMALIZEAPI #ifndef _NORMALIZE_ -# define WINNORMALIZEAPI DECLSPEC_HIDDEN +# define WINNORMALIZEAPI DECLSPEC_IMPORT #else # define WINNORMALIZEAPI #endif +#endif /* Country codes */ #define CTRY_DEFAULT (0)

1 0

Alexandre Julliard : include: Use proper dllimports for msvcrt functions.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 579fc688af0c54fe6a49e3b56204c34c77dc6e9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=579fc688af0c54fe6a49e3b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 24 18:50:06 2020 +0100 include: Use proper dllimports for msvcrt functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp90.h | 2 - dlls/msvcrt/mathf.c | 13 +++ include/msvcrt/assert.h | 2 +- include/msvcrt/conio.h | 34 +++--- include/msvcrt/corecrt_wctype.h | 44 ++++---- include/msvcrt/corecrt_wdirect.h | 10 +- include/msvcrt/corecrt_wio.h | 32 +++--- include/msvcrt/corecrt_wprocess.h | 34 +++--- include/msvcrt/corecrt_wstdio.h | 70 ++++++------ include/msvcrt/corecrt_wstdlib.h | 78 +++++++------- include/msvcrt/corecrt_wtime.h | 16 +-- include/msvcrt/crtdbg.h | 16 +-- include/msvcrt/ctype.h | 48 ++++----- include/msvcrt/direct.h | 16 +-- include/msvcrt/dos.h | 2 +- include/msvcrt/eh.h | 6 +- include/msvcrt/errno.h | 2 +- include/msvcrt/float.h | 30 +++--- include/msvcrt/fpieee.h | 2 +- include/msvcrt/io.h | 86 +++++++-------- include/msvcrt/locale.h | 16 +-- include/msvcrt/malloc.h | 40 +++---- include/msvcrt/math.h | 208 ++++++++++++++++++------------------ include/msvcrt/mbctype.h | 32 +++--- include/msvcrt/mbstring.h | 160 ++++++++++++++-------------- include/msvcrt/memory.h | 16 +-- include/msvcrt/process.h | 62 +++++------ include/msvcrt/search.h | 8 +- include/msvcrt/setjmp.h | 8 +- include/msvcrt/signal.h | 6 +- include/msvcrt/stddef.h | 4 +- include/msvcrt/stdio.h | 156 +++++++++++++-------------- include/msvcrt/stdlib.h | 218 +++++++++++++++++++------------------- include/msvcrt/sys/stat.h | 26 ++--- include/msvcrt/sys/timeb.h | 4 +- include/msvcrt/sys/utime.h | 12 +-- include/msvcrt/time.h | 56 +++++----- include/msvcrt/wchar.h | 5 +- include/msvcrt/wctype.h | 34 +++--- 39 files changed, 812 insertions(+), 802 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=579fc688af0c54fe6a49…

1 0

Hans Leidekker : winebus.sys: Fix registry access rights for SDL controller mapping.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 6ce03d93135247fce4e9b2319319c8e989fd3767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ce03d93135247fce4e9b231… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 24 12:22:00 2020 +0100 winebus.sys: Fix registry access rights for SDL controller mapping. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48545 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 95d5b9f9d0d..feac5acf950 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1025,7 +1025,7 @@ static DWORD CALLBACK deviceloop_thread(void *args) HKEY key; static const WCHAR szPath[] = {'m','a','p',0}; - if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_ENUMERATE_SUB_KEYS, &key)) + if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) { DWORD index = 0; CHAR *buffer = NULL;

1 0

Hans Leidekker : winebus.sys: Support setting SDL controller mapping through environment variable.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 3a007a95e86b6a9795a6ab92a53a08acf58e4b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a007a95e86b6a9795a6ab92… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 24 12:22:01 2020 +0100 winebus.sys: Support setting SDL controller mapping through environment variable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50154 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index feac5acf950..19c6f23e071 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -1024,8 +1024,15 @@ static DWORD CALLBACK deviceloop_thread(void *args) { HKEY key; static const WCHAR szPath[] = {'m','a','p',0}; + const char *mapping; - if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) + if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) + { + TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); + if (pSDL_GameControllerAddMapping(mapping) < 0) + WARN("Failed to add environment mapping %s\n", pSDL_GetError()); + } + else if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) { DWORD index = 0; CHAR *buffer = NULL; @@ -1054,8 +1061,9 @@ static DWORD CALLBACK deviceloop_thread(void *args) if (rc == STATUS_SUCCESS) { - TRACE("Setting mapping %s...\n",debugstr_an(buffer,29)); - pSDL_GameControllerAddMapping(buffer); + TRACE("Setting registry mapping %s\n", debugstr_a(buffer)); + if (pSDL_GameControllerAddMapping(buffer) < 0) + WARN("Failed to add registry mapping %s\n", pSDL_GetError()); index ++; } } while (rc == STATUS_SUCCESS);

1 0

Nikolay Sivov : evr/presenter: Set frame size and aperture attributes for mixer output type.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 1f1842e02719905f08fdd858fe455cde1ab2b9ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f1842e02719905f08fdd858… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 18:12:45 2020 +0300 evr/presenter: Set frame size and aperture attributes for mixer output type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 36 ++++++++++++-- dlls/evr/tests/evr.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index f0733f6f060..5701eb17bd3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -306,17 +306,43 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) { - IMFMediaType *media_type; + IMFMediaType *media_type, *candidate_type; unsigned int idx = 0; + UINT64 frame_size; + MFVideoArea aperture; + RECT rect; HRESULT hr; + if (FAILED(hr = MFCreateMediaType(&media_type))) + return hr; + video_presenter_get_native_video_size(presenter); - while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &media_type))) + rect = presenter->dst_rect; + if (rect.left == 0 && rect.right == 0 && rect.bottom == 0 && rect.top == 0) + { + rect.right = presenter->native_size.cx; + rect.bottom = presenter->native_size.cy; + } + + aperture.Area.cx = rect.right - rect.left; + aperture.Area.cy = rect.bottom - rect.top; + aperture.OffsetX.value = 0; + aperture.OffsetX.fract = 0; + aperture.OffsetY.value = 0; + aperture.OffsetY.fract = 0; + frame_size = (UINT64)aperture.Area.cx << 32 | aperture.Area.cy; + + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(presenter->mixer, 0, idx++, &candidate_type))) { /* FIXME: check that d3d device supports this format */ - /* FIXME: potentially adjust frame size */ + if (FAILED(hr = IMFMediaType_CopyAllItems(candidate_type, (IMFAttributes *)media_type))) + WARN("Failed to clone a media type, hr %#x.\n", hr); + IMFMediaType_Release(candidate_type); + + IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, frame_size); + IMFMediaType_SetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, MFT_SET_TYPE_TEST_ONLY); @@ -326,12 +352,12 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre if (SUCCEEDED(hr)) hr = IMFTransform_SetOutputType(presenter->mixer, 0, media_type, 0); - IMFMediaType_Release(media_type); - if (SUCCEEDED(hr)) break; } + IMFMediaType_Release(media_type); + return hr; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 2740f2263f0..31434bde43a 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2072,6 +2072,137 @@ todo_wine { IMFVideoPresenter_Release(presenter); } +static void get_output_aperture(IMFTransform *mixer, SIZE *frame_size, MFVideoArea *aperture) +{ + IMFMediaType *media_type; + UINT64 size; + HRESULT hr; + + memset(frame_size, 0xcc, sizeof(*frame_size)); + memset(aperture, 0xcc, sizeof(*aperture)); + + hr = IMFTransform_GetOutputCurrentType(mixer, 0, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + frame_size->cx = size >> 32; + frame_size->cy = size; + + hr = IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)aperture, sizeof(*aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFMediaType_Release(media_type); +} + +static void test_presenter_media_type(void) +{ + IMFTopologyServiceLookupClient *lookup_client; + IMFVideoPresenter *presenter; + struct test_host host; + IMFMediaType *input_type; + IDirect3DDeviceManager9 *manager; + HRESULT hr; + IMFTransform *mixer; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + unsigned int token; + SIZE frame_size; + HWND window; + MFVideoArea aperture; + IMFVideoDisplayControl *display_control; + RECT dst; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = DXVA2CreateDirect3DDeviceManager9(&token, &manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDeviceManager9_ResetDevice(manager, device, token); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); + ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); + + input_type = create_video_type(&MFVideoFormat_RGB32); + + hr = IMFMediaType_SetUINT64(input_type, &MF_MT_FRAME_SIZE, (UINT64)100 << 32 | 50); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(input_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)manager); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, input_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + init_test_host(&host, mixer, presenter); + + hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + get_output_aperture(mixer, &frame_size, &aperture); + ok(frame_size.cx == 100 && frame_size.cy == 50, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 50, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); + ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, + "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); + + SetRect(&dst, 1, 2, 200, 300); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + get_output_aperture(mixer, &frame_size, &aperture); +todo_wine { + ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); +} + ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, + "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); + + hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_None); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + get_output_aperture(mixer, &frame_size, &aperture); +todo_wine { + ok(frame_size.cx == 199 && frame_size.cy == 298, "Unexpected frame size %u x %u.\n", frame_size.cx, frame_size.cy); + ok(aperture.Area.cx == 199 && aperture.Area.cy == 298, "Unexpected size %u x %u.\n", aperture.Area.cx, aperture.Area.cy); +} + ok(!aperture.OffsetX.value && !aperture.OffsetX.fract && !aperture.OffsetY.value && !aperture.OffsetY.fract, + "Unexpected offset %u x %u.\n", aperture.OffsetX.value, aperture.OffsetY.value); + + IMFVideoDisplayControl_Release(display_control); + IMFVideoPresenter_Release(presenter); + IMFTransform_Release(mixer); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -2574,6 +2705,7 @@ START_TEST(evr) test_presenter_ar_mode(); test_presenter_video_window(); test_presenter_quality_control(); + test_presenter_media_type(); test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples();

1 0

Nikolay Sivov : evr/presenter: Add aspect ratio preserving scaling.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: c06e7ba7299827d1a876a58676b51597a2560a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c06e7ba7299827d1a876a586… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 18:12:46 2020 +0300 evr/presenter: Add aspect ratio preserving scaling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 5701eb17bd3..9b7fb5f6f67 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -426,10 +426,27 @@ static HRESULT video_presenter_get_sample_surface(IMFSample *sample, IDirect3DSu return hr; } +static void scale_rect(RECT *rect, unsigned int width, unsigned int height, const MFVideoNormalizedRect *scale) +{ + if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) + { + SetRect(rect, 0, 0, width, height); + } + else + { + rect->left = width * scale->left; + rect->right = width * scale->right; + rect->top = height * scale->top; + rect->bottom = height * scale->bottom; + } +} + static void video_presenter_sample_present(struct video_presenter *presenter, IMFSample *sample) { IDirect3DSurface9 *surface, *backbuffer; IDirect3DDevice9 *device; + D3DSURFACE_DESC desc; + RECT dst, src; HRESULT hr; if (!presenter->swapchain) @@ -450,7 +467,39 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); - IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); + + IDirect3DSurface9_GetDesc(surface, &desc); + scale_rect(&src, desc.Width, desc.Height, &presenter->src_rect); + + IDirect3DSurface9_GetDesc(backbuffer, &desc); + SetRect(&dst, 0, 0, desc.Width, desc.Height); + + if (presenter->ar_mode & MFVideoARMode_PreservePicture) + { + unsigned int src_width = src.right - src.left, src_height = src.bottom - src.top; + unsigned int dst_width = dst.right - dst.left, dst_height = dst.bottom - dst.top; + + if (src_width * dst_height > dst_width * src_height) + { + /* src is "wider" than dst. */ + unsigned int dst_center = (dst.top + dst.bottom) / 2; + unsigned int scaled_height = src_height * dst_width / src_width; + + dst.top = dst_center - scaled_height / 2; + dst.bottom = dst.top + scaled_height; + } + else if (src_width * dst_height < dst_width * src_height) + { + /* src is "taller" than dst. */ + unsigned int dst_center = (dst.left + dst.right) / 2; + unsigned int scaled_width = src_width * dst_height / src_height; + + dst.left = dst_center - scaled_width / 2; + dst.right = dst.left + scaled_width; + } + } + + IDirect3DSwapChain9_Present(presenter->swapchain, &src, &dst, NULL, NULL, 0); IDirect3DDevice9_Release(device); IDirect3DSurface9_Release(backbuffer);

1 0

Nikolay Sivov : mfreadwrite/reader: Implement GetServiceForStream() for stream objects.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 8999dd2ba093c8f249f2182299ee7c9d069f0083 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8999dd2ba093c8f249f21822… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 24 18:14:24 2020 +0300 mfreadwrite/reader: Implement GetServiceForStream() for stream objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 52 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 7aa8f65df7a..85aec9aaedc 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -1906,36 +1906,60 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO { struct source_reader *reader = impl_from_IMFSourceReader(iface); IUnknown *obj = NULL; - HRESULT hr; + HRESULT hr = S_OK; TRACE("%p, %#x, %s, %s, %p\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); + EnterCriticalSection(&reader->cs); + switch (index) { case MF_SOURCE_READER_MEDIASOURCE: obj = (IUnknown *)reader->source; break; default: - FIXME("Unsupported index %#x.\n", index); - return E_NOTIMPL; - } + if (index == MF_SOURCE_READER_FIRST_VIDEO_STREAM) + index = reader->first_video_stream_index; + else if (index == MF_SOURCE_READER_FIRST_AUDIO_STREAM) + index = reader->first_audio_stream_index; - if (IsEqualGUID(service, &GUID_NULL)) - { - hr = IUnknown_QueryInterface(obj, riid, object); + if (index >= reader->stream_count) + hr = MF_E_INVALIDSTREAMNUMBER; + else + { + obj = (IUnknown *)reader->streams[index].decoder; + if (!obj) hr = E_NOINTERFACE; + } + break; } - else - { - IMFGetService *gs; - hr = IUnknown_QueryInterface(obj, &IID_IMFGetService, (void **)&gs); - if (SUCCEEDED(hr)) + if (obj) + IUnknown_AddRef(obj); + + LeaveCriticalSection(&reader->cs); + + if (obj) + { + if (IsEqualGUID(service, &GUID_NULL)) { - hr = IMFGetService_GetService(gs, service, riid, object); - IMFGetService_Release(gs); + hr = IUnknown_QueryInterface(obj, riid, object); + } + else + { + IMFGetService *gs; + + hr = IUnknown_QueryInterface(obj, &IID_IMFGetService, (void **)&gs); + if (SUCCEEDED(hr)) + { + hr = IMFGetService_GetService(gs, service, riid, object); + IMFGetService_Release(gs); + } } } + if (obj) + IUnknown_Release(obj); + return hr; }

1 0

Jacek Caban : conhost: Signal console in process_console_input if needed.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: dfe1bb7b8d90fd1e6f660232eb8ccccf8a30f05c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe1bb7b8d90fd1e6f660232… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 24 17:18:01 2020 +0100 conhost: Signal console in process_console_input if needed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50037 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 7 ++++++- programs/conhost/conhost.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 2a4de030cbb..e3a9a25eac3 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -428,6 +428,7 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v } SERVER_END_REQ; if (status && (console->read_ioctl || status != STATUS_INVALID_HANDLE)) ERR( "failed: %#x\n", status ); + console->signaled = signal; console->read_ioctl = 0; console->pending_read = 0; return status; @@ -1218,6 +1219,9 @@ static NTSTATUS process_console_input( struct console *console ) case IOCTL_CONDRV_READ_FILE: break; default: + assert( !console->read_ioctl ); + if (console->record_count && !console->signaled) + read_complete( console, STATUS_PENDING, NULL, 0, TRUE ); /* signal server */ return STATUS_SUCCESS; } @@ -2534,11 +2538,12 @@ static NTSTATUS process_console_ioctls( struct console *console ) { if (status) out_size = 0; + console->signaled = console->record_count != 0; SERVER_START_REQ( get_next_console_request ) { req->handle = wine_server_obj_handle( console->server ); req->status = status; - req->signal = console->record_count != 0; + req->signal = console->signaled; wine_server_add_data( req, ioctl_buffer, out_size ); wine_server_set_reply( req, ioctl_buffer, ioctl_buffer_size ); status = wine_server_call( req ); diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 7bc102b0df0..3094fd6e5f0 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -80,6 +80,7 @@ struct console INPUT_RECORD *records; /* input records */ unsigned int record_count; /* number of input records */ unsigned int record_size; /* size of input records buffer */ + int signaled; /* is server in signaled state */ WCHAR *read_buffer; /* buffer of data available for read */ size_t read_buffer_count; /* size of available data */ size_t read_buffer_size; /* size of buffer */

1 0

Erich E. Hoover : ntdll: Fix converting large 32-bit time_t when time_t is signed.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 773b97bb2b0f4421d213b466337dd6d66b2b0856 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773b97bb2b0f4421d213b466… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Nov 21 22:33:20 2020 -0700 ntdll: Fix converting large 32-bit time_t when time_t is signed. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 12 ++++++++++++ dlls/ntdll/unix/file.c | 10 +++++----- dlls/ntdll/unix/sync.c | 12 +++++------- dlls/ntdll/unix/unix_private.h | 9 ++++++++- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 8b9ec4f624d..2507437c8c3 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1361,6 +1361,18 @@ static void test_file_basic_information(void) ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + memset(&fbi2, 0, sizeof(fbi2)); + fbi2.LastAccessTime.QuadPart = 0x200deadcafebeef; + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile(h, &io, &fbi2, sizeof(fbi2), FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't set system attribute, NtSetInformationFile returned %x\n", res ); + ok ( U(io).Status == STATUS_SUCCESS, "can't set system attribute, io.Status is %x\n", U(io).Status ); + res = pNtQueryInformationFile(h, &io, &fbi, sizeof(fbi), FileBasicInformation); + ok ( res == STATUS_SUCCESS, "can't get system attribute, NtQueryInformationFile returned %x\n", res ); + ok ( U(io).Status == STATUS_SUCCESS, "can't get system attribute, io.Status is %x\n", U(io).Status ); + ok ( fbi2.LastAccessTime.QuadPart == fbi.LastAccessTime.QuadPart, + "large access time set/get does not match.\n" ); + memset(&fbi2, 0, sizeof(fbi2)); res = pNtQueryInformationFile(h, &io, &fbi2, sizeof fbi2, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index cf413f46e5c..6d6edfe8926 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1631,9 +1631,9 @@ static NTSTATUS set_file_times( int fd, const LARGE_INTEGER *mtime, const LARGE_ static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, LARGE_INTEGER *ctime, LARGE_INTEGER *atime, LARGE_INTEGER *creation ) { - mtime->QuadPart = st->st_mtime * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - ctime->QuadPart = st->st_ctime * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - atime->QuadPart = st->st_atime * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + mtime->QuadPart = ticks_from_time_t( st->st_mtime ); + ctime->QuadPart = ticks_from_time_t( st->st_ctime ); + atime->QuadPart = ticks_from_time_t( st->st_atime ); #ifdef HAVE_STRUCT_STAT_ST_MTIM mtime->QuadPart += st->st_mtim.tv_nsec / 100; #elif defined(HAVE_STRUCT_STAT_ST_MTIMESPEC) @@ -1650,14 +1650,14 @@ static inline void get_file_times( const struct stat *st, LARGE_INTEGER *mtime, atime->QuadPart += st->st_atimespec.tv_nsec / 100; #endif #ifdef HAVE_STRUCT_STAT_ST_BIRTHTIME - creation->QuadPart = st->st_birthtime * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + creation->QuadPart = ticks_from_time_t( st->st_birthtime ); #ifdef HAVE_STRUCT_STAT_ST_BIRTHTIM creation->QuadPart += st->st_birthtim.tv_nsec / 100; #elif defined(HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC) creation->QuadPart += st->st_birthtimespec.tv_nsec / 100; #endif #elif defined(HAVE_STRUCT_STAT___ST_BIRTHTIME) - creation->QuadPart = st->__st_birthtime * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; + creation->QuadPart = ticks_from_time_t( st->__st_birthtime ); #ifdef HAVE_STRUCT_STAT___ST_BIRTHTIM creation->QuadPart += st->__st_birthtim.tv_nsec / 100; #endif diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index bba7af7e34f..dcc8c5447ef 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -104,7 +104,7 @@ static inline ULONGLONG monotonic_counter(void) return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; #endif gettimeofday( &now, 0 ); - return now.tv_sec * (ULONGLONG)TICKSPERSEC + now.tv_usec * 10 + TICKS_1601_TO_1970 - server_start_time; + return ticks_from_time_t( now.tv_sec ) + now.tv_usec * 10 - server_start_time; } @@ -1392,8 +1392,7 @@ NTSTATUS WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) if (!clock_gettime( clock_id, &ts )) { - time->QuadPart = ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - time->QuadPart += (ts.tv_nsec + 50) / 100; + time->QuadPart = ticks_from_time_t( ts.tv_sec ) + (ts.tv_nsec + 50) / 100; } else #endif /* HAVE_CLOCK_GETTIME */ @@ -1401,8 +1400,7 @@ NTSTATUS WINAPI NtQuerySystemTime( LARGE_INTEGER *time ) struct timeval now; gettimeofday( &now, 0 ); - time->QuadPart = now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970; - time->QuadPart += now.tv_usec * 10; + time->QuadPart = ticks_from_time_t( now.tv_sec ) + now.tv_usec * 10; } return STATUS_SUCCESS; } @@ -1475,10 +1473,10 @@ LONGLONG WINAPI RtlGetSystemTimePrecise(void) struct timespec ts; if (!clock_gettime( CLOCK_REALTIME, &ts )) - return ts.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970 + (ts.tv_nsec + 50) / 100; + return ticks_from_time_t( ts.tv_sec ) + (ts.tv_nsec + 50) / 100; #endif gettimeofday( &now, 0 ); - return now.tv_sec * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970 + now.tv_usec * 10; + return ticks_from_time_t( now.tv_sec ) + now.tv_usec * 10; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index c3ad0a41098..23731f0fdc6 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -249,7 +249,14 @@ extern void WINAPI DECLSPEC_NORETURN call_raise_user_exception_dispatcher( NTSTA #define TICKSPERSEC 10000000 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)86400) -#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKSPERSEC) + +static inline ULONGLONG ticks_from_time_t( time_t time ) +{ + if (sizeof(time_t) == sizeof(int)) /* time_t may be signed */ + return ((ULONGLONG)(ULONG)time + SECS_1601_TO_1970) * TICKSPERSEC; + else + return ((ULONGLONG)time + SECS_1601_TO_1970) * TICKSPERSEC; +} static inline const char *debugstr_us( const UNICODE_STRING *us ) {

1 0