May 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : Wine release 5.9
by Alexandre Julliard 22 May '20

22 May '20

Module: website Branch: master Commit: f1a7cc8f5d84a2dac60bb10781b64830b9f39812 URL: https://source.winehq.org/git/website.git/?a=commit;h=f1a7cc8f5d84a2dac60bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 20:51:25 2020 +0200 Wine release 5.9 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020052201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020052201.xml b/news/en/2020052201.xml new file mode 100644 index 00000000..3ad9bf0a --- /dev/null +++ b/news/en/2020052201.xml @@ -0,0 +1,16 @@ +<news> +<date>May 22, 2020</date> +<title>Wine 5.9 Released</title> +<body> + The Wine development release 5.9 is now available. + <a href="{$root}/announce/5.9">What's new</a> in this release: +<ul> + <li>Major progress on the WineD3D Vulkan backend.</li> + <li>Initial support for splitting dlls into PE and Unix parts.</li> + <li>Support for generating PDB files when building PE dlls.</li> + <li>Timestamp updates in the Kernel User Shared Data.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.9.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : math.h: Provide copysign declaration for ucrt.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 073016ecd484f8d57685cedfde1ee808235840c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=073016ecd484f8d57685cedf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 22 17:16:43 2020 +0200 math.h: Provide copysign declaration for ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 01c4a4b61b..83b252ad5f 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -182,8 +182,13 @@ static inline int _fpclassf(float x) { return _fpclass(x); } static inline float ldexpf(float x, int y) { return ldexp(x, y); } +#ifdef _UCRT +_ACRTIMP double __cdecl copysign(double, double); +_ACRTIMP float __cdecl copysignf(float, float); +#else #define copysign(x,y) _copysign(x,y) #define copysignf(x,y) _copysignf(x,y) +#endif double __cdecl nearbyint(double); float __cdecl nearbyintf(float);

1 0

Jacek Caban : math.h: Add scalbn declaration.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: ff17814d04c109145362748f4b230e7d064a93b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff17814d04c109145362748f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 22 17:16:50 2020 +0200 math.h: Add scalbn declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 83b252ad5f..ee51f28050 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -101,6 +101,9 @@ long __cdecl lrintf(float); long __cdecl lround(double); long __cdecl lroundf(float); +_ACRTIMP double __cdecl scalbn(double,int); +_ACRTIMP float __cdecl scalbnf(float,int); + double __cdecl _copysign (double, double); double __cdecl _chgsign (double); double __cdecl _scalb(double, __msvcrt_long);

1 0

Esme Povirk : maintainers: Changing my name.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 9ddceebe52fc79f6839f11e75e27b03c87f6e90b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ddceebe52fc79f6839f11e7… Author: Esme Povirk <vincent(a)codeweavers.com> Date: Fri May 22 11:35:41 2020 -0500 maintainers: Changing my name. Also my X11 Driver knowledge is quite stale, so I'm removing myself there. Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index cfbeaeb12b..6cc1699665 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -122,7 +122,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -130,7 +130,7 @@ M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ GDIPlus -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -202,7 +202,7 @@ F: dlls/ole32/stubmanager.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -243,7 +243,7 @@ F: dlls/rpcrt4 F: tools/widl TWAIN -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -271,7 +271,7 @@ F: dlls/mshtml/ F: dlls/shdocvw/ Windows Imaging Component -M: Vincent Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ @@ -315,7 +315,6 @@ F: dlls/wpcap/ X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> -P: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/winex11.drv/ XML parsing @@ -329,7 +328,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Vincent Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <vincent(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */

1 0

Zebediah Figura : ntoskrnl.exe: Protect the two relocated pages independently.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: c750ae6b9dc85fd2173e40a07204388988b64532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c750ae6b9dc85fd2173e40a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 09:52:56 2020 -0500 ntoskrnl.exe: Protect the two relocated pages independently. They may have different protection flags. This fixes a regression introduced by 22dfb0df10b44d1c21b3d04b59312670c2318431. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49198 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7ebce5709d..316bc8f032 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3413,8 +3413,8 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) while (rel < end - 1 && rel->SizeOfBlock) { - void *page = get_rva( module, rel->VirtualAddress ); - DWORD old_prot; + char *page = get_rva( module, rel->VirtualAddress ); + DWORD old_prot1, old_prot2; if (rel->VirtualAddress >= len) { @@ -3424,10 +3424,12 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len, ULONG page_size ) /* Relocation entries may hang over the end of the page, so we need to * protect two pages. */ - VirtualProtect( page, page_size * 2, PAGE_READWRITE, &old_prot ); + VirtualProtect( page, page_size, PAGE_READWRITE, &old_prot1 ); + VirtualProtect( page + page_size, page_size, PAGE_READWRITE, &old_prot2 ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - VirtualProtect( page, page_size * 2, old_prot, &old_prot ); + VirtualProtect( page, page_size, old_prot1, &old_prot1 ); + VirtualProtect( page + page_size, page_size, old_prot2, &old_prot2 ); if (!rel) return STATUS_INVALID_IMAGE_FORMAT; }

1 0

Gijs Vermeulen : ntdll: Fix number of arguments passed to mmap_remove_reserved_area in apple_create_wine_thread.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 676b6b0fd728fda4b5819ae52d73d169a8c77e65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=676b6b0fd728fda4b5819ae5… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 22 18:50:09 2020 +0200 ntdll: Fix number of arguments passed to mmap_remove_reserved_area in apple_create_wine_thread. This fixes a regression introduced by 625209433fa82e233a828329e9e109602f9c0ef0 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d4480e86f0..a19f0c0149 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1067,7 +1067,7 @@ static void apple_create_wine_thread( void *arg ) if (!pthread_attr_getstacksize( &attr, &info.desired_size ) && mmap_enum_reserved_areas( apple_alloc_thread_stack, &info, 1 )) { - mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); + mmap_remove_reserved_area( info.stack, info.desired_size ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } #endif

1 0

Alexandre Julliard : Release 5.9.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 056c9df854817670dc4fb9c095cba29c99089ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=056c9df854817670dc4fb9c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 20:49:34 2020 +0200 Release 5.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 890 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 6 +- VERSION | 2 +- configure | 18 +- 5 files changed, 469 insertions(+), 448 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=056c9df854817670dc4f…

1 0

Tag wine-5.9 : Alexandre Julliard : Release 5.9
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: refs/tags/wine-5.9 Tag: 101643a8b92702a5dbbe888c040b54d07e09eabe URL: https://source.winehq.org/git/wine.git/?a=tag;h=101643a8b92702a5dbbe888c040… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 20:49:34 2020 +0200 Release 5.9

1 0

Alexandre Julliard : kernel32: Move GetProcessTimes() implementation to kernelbase and ntdll.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 7cc9ccbd22511d71d23ee298cd9718da1e448dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cc9ccbd22511d71d23ee298… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 09:15:39 2020 +0200 kernel32: Move GetProcessTimes() implementation to kernelbase and ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 64 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 23 +++++++++++++++ dlls/ntdll/process.c | 19 ++++++++++-- 5 files changed, 41 insertions(+), 69 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 659f72cf78..efb892bf1b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -791,7 +791,7 @@ @ stdcall -import GetProcessPriorityBoost(long ptr) @ stdcall -import GetProcessShutdownParameters(ptr ptr) # @ stub GetProcessorSystemCycleTime -@ stdcall GetProcessTimes(long ptr ptr ptr ptr) +@ stdcall -import GetProcessTimes(long ptr ptr ptr ptr) # @ stub GetProcessUserModeExceptionPolicy @ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 5d27fc7ac3..5aef53da63 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -55,12 +55,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); static const struct _KUSER_SHARED_DATA *user_shared_data = (struct _KUSER_SHARED_DATA *)0x7ffe0000; -static inline void longlong_to_filetime( LONGLONG t, FILETIME *ft ) -{ - ft->dwLowDateTime = (DWORD)t; - ft->dwHighDateTime = (DWORD)(t >> 32); -} - /*********************************************************************** * GetSystemTimeAdjustment (KERNEL32.@) @@ -109,64 +103,6 @@ BOOL WINAPI SetSystemTimeAdjustment( DWORD dwTimeAdjustment, BOOL bTimeAdjustmen return TRUE; } -/********************************************************************* - * TIME_ClockTimeToFileTime (olorin(a)fandra.org, 20-Sep-1998) - * - * Used by GetProcessTimes to convert clock_t into FILETIME. - * - * Differences to UnixTimeToFileTime: - * 1) Divided by CLK_TCK - * 2) Time is relative. There is no 'starting date', so there is - * no need for offset correction, like in UnixTimeToFileTime - */ -static void TIME_ClockTimeToFileTime(clock_t unix_time, LPFILETIME filetime) -{ - long clocksPerSec = sysconf(_SC_CLK_TCK); - ULONGLONG secs = (ULONGLONG)unix_time * 10000000 / clocksPerSec; - filetime->dwLowDateTime = (DWORD)secs; - filetime->dwHighDateTime = (DWORD)(secs >> 32); -} - -/********************************************************************* - * GetProcessTimes (KERNEL32.@) - * - * Get the user and kernel execution times of a process, - * along with the creation and exit times if known. - * - * PARAMS - * hprocess [in] The process to be queried. - * lpCreationTime [out] The creation time of the process. - * lpExitTime [out] The exit time of the process if exited. - * lpKernelTime [out] The time spent in kernel routines in 100's of nanoseconds. - * lpUserTime [out] The time spent in user routines in 100's of nanoseconds. - * - * RETURNS - * TRUE. - * - * NOTES - * olorin(a)fandra.org: - * Would be nice to subtract the cpu time used by Wine at startup. - * Also, there is a need to separate times used by different applications. - * - * BUGS - * KernelTime and UserTime are always for the current process - */ -BOOL WINAPI GetProcessTimes( HANDLE hprocess, LPFILETIME lpCreationTime, - LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime ) -{ - struct tms tms; - KERNEL_USER_TIMES pti; - - times(&tms); - TIME_ClockTimeToFileTime(tms.tms_utime,lpUserTime); - TIME_ClockTimeToFileTime(tms.tms_stime,lpKernelTime); - if (NtQueryInformationProcess( hprocess, ProcessTimes, &pti, sizeof(pti), NULL)) - return FALSE; - longlong_to_filetime( pti.CreateTime.QuadPart, lpCreationTime ); - longlong_to_filetime( pti.ExitTime.QuadPart, lpExitTime ); - return TRUE; -} - /********************************************************************* * GetCalendarInfoA (KERNEL32.@) * diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 1f1a65fc85..4a6bc5eea4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -635,7 +635,7 @@ @ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetProcessPriorityBoost(long ptr) @ stdcall GetProcessShutdownParameters(ptr ptr) -@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) @ stdcall GetProcessVersion(long) kernel32.GetProcessVersion @ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) # @ stub GetProcessorSystemCycleTime diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 67fcb5f04e..66e115ce69 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -791,6 +791,29 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetProcessShutdownParameters( LPDWORD level, LPDWO } +/********************************************************************* + * GetProcessTimes (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetProcessTimes( HANDLE process, FILETIME *create, FILETIME *exit, + FILETIME *kernel, FILETIME *user ) +{ + KERNEL_USER_TIMES time; + + if (!set_ntstatus( NtQueryInformationProcess( process, ProcessTimes, &time, sizeof(time), NULL ))) + return FALSE; + + create->dwLowDateTime = time.CreateTime.u.LowPart; + create->dwHighDateTime = time.CreateTime.u.HighPart; + exit->dwLowDateTime = time.ExitTime.u.LowPart; + exit->dwHighDateTime = time.ExitTime.u.HighPart; + kernel->dwLowDateTime = time.KernelTime.u.LowPart; + kernel->dwHighDateTime = time.KernelTime.u.HighPart; + user->dwLowDateTime = time.UserTime.u.LowPart; + user->dwHighDateTime = time.UserTime.u.HighPart; + return TRUE; +} + + /*********************************************************************** * GetProcessWorkingSetSizeEx (kernelbase.@) */ diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index cd867e6028..637bef0b65 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -32,6 +32,12 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif +#ifdef HAVE_SYS_TIMES_H +# include <sys/times.h> +#endif #include <sys/types.h> #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> @@ -359,7 +365,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( break; case ProcessTimes: { - KERNEL_USER_TIMES pti; + KERNEL_USER_TIMES pti = {{{0}}}; if (ProcessInformationLength >= sizeof(KERNEL_USER_TIMES)) { @@ -369,8 +375,15 @@ NTSTATUS WINAPI NtQueryInformationProcess( ret = STATUS_INVALID_HANDLE; else { - /* FIXME : User- and KernelTime have to be implemented */ - memset(&pti, 0, sizeof(KERNEL_USER_TIMES)); + long ticks = sysconf(_SC_CLK_TCK); + struct tms tms; + + /* FIXME: user/kernel times only work for current process */ + if (ticks && times( &tms ) != -1) + { + pti.UserTime.QuadPart = (ULONGLONG)tms.tms_utime * 10000000 / ticks; + pti.KernelTime.QuadPart = (ULONGLONG)tms.tms_stime * 10000000 / ticks; + } SERVER_START_REQ(get_process_info) {

1 0

Alexandre Julliard : kernel32: Move GetSystemTimes() implementation to kernelbase.
by Alexandre Julliard 22 May '20

22 May '20

Module: wine Branch: master Commit: 79e3c21c3cca822efedff3092df42f9044da10fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e3c21c3cca822efedff309… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 22 09:15:45 2020 +0200 kernel32: Move GetSystemTimes() implementation to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 71 ----------------------------------------- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/sync.c | 57 ++++++++++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 74 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index efb892bf1b..72a09c53c8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -835,7 +835,7 @@ @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall -import GetSystemTimeAsFileTime(ptr) @ stdcall -import GetSystemTimePreciseAsFileTime(ptr) -@ stdcall GetSystemTimes(ptr ptr ptr) +@ stdcall -import GetSystemTimes(ptr ptr ptr) @ stdcall -import GetSystemWindowsDirectoryA(ptr long) @ stdcall -import GetSystemWindowsDirectoryW(ptr long) @ stdcall -import GetSystemWow64DirectoryA(ptr long) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 5aef53da63..127f341adc 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -223,77 +223,6 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, return TRUE; } -/********************************************************************* - * GetSystemTimes (KERNEL32.@) - * - * Retrieves system timing information - * - * PARAMS - * lpIdleTime [O] Destination for idle time. - * lpKernelTime [O] Destination for kernel time. - * lpUserTime [O] Destination for user time. - * - * RETURNS - * TRUE if success, FALSE otherwise. - */ -BOOL WINAPI GetSystemTimes(LPFILETIME lpIdleTime, LPFILETIME lpKernelTime, LPFILETIME lpUserTime) -{ - LARGE_INTEGER idle_time, kernel_time, user_time; - SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *sppi; - SYSTEM_BASIC_INFORMATION sbi; - ULONG ret_size; - int i; - - TRACE("(%p,%p,%p)\n", lpIdleTime, lpKernelTime, lpUserTime); - - if (!set_ntstatus( NtQuerySystemInformation( SystemBasicInformation, &sbi, sizeof(sbi), &ret_size ))) - return FALSE; - - sppi = HeapAlloc( GetProcessHeap(), 0, - sizeof(SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION) * sbi.NumberOfProcessors); - if (!sppi) - { - SetLastError( ERROR_OUTOFMEMORY ); - return FALSE; - } - - if (!set_ntstatus( NtQuerySystemInformation( SystemProcessorPerformanceInformation, sppi, - sizeof(*sppi) * sbi.NumberOfProcessors, &ret_size ))) - { - HeapFree( GetProcessHeap(), 0, sppi ); - return FALSE; - } - - idle_time.QuadPart = 0; - kernel_time.QuadPart = 0; - user_time.QuadPart = 0; - for (i = 0; i < sbi.NumberOfProcessors; i++) - { - idle_time.QuadPart += sppi[i].IdleTime.QuadPart; - kernel_time.QuadPart += sppi[i].KernelTime.QuadPart; - user_time.QuadPart += sppi[i].UserTime.QuadPart; - } - - if (lpIdleTime) - { - lpIdleTime->dwLowDateTime = idle_time.u.LowPart; - lpIdleTime->dwHighDateTime = idle_time.u.HighPart; - } - if (lpKernelTime) - { - lpKernelTime->dwLowDateTime = kernel_time.u.LowPart; - lpKernelTime->dwHighDateTime = kernel_time.u.HighPart; - } - if (lpUserTime) - { - lpUserTime->dwLowDateTime = user_time.u.LowPart; - lpUserTime->dwHighDateTime = user_time.u.HighPart; - } - - HeapFree( GetProcessHeap(), 0, sppi ); - return TRUE; -} - /****************************************************************************** * GetTickCount64 (KERNEL32.@) */ diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 4a6bc5eea4..1500229969 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -698,7 +698,7 @@ @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment @ stdcall GetSystemTimeAsFileTime(ptr) @ stdcall GetSystemTimePreciseAsFileTime(ptr) -@ stdcall GetSystemTimes(ptr ptr ptr) kernel32.GetSystemTimes +@ stdcall GetSystemTimes(ptr ptr ptr) @ stdcall GetSystemWindowsDirectoryA(ptr long) @ stdcall GetSystemWindowsDirectoryW(ptr long) @ stdcall GetSystemWow64Directory2A(ptr long long) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index 99706277da..7ea70202c2 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -124,10 +124,60 @@ static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING /*********************************************************************** - * Waits + * Time functions ***********************************************************************/ +/********************************************************************* + * GetSystemTimes (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH GetSystemTimes( FILETIME *idle, FILETIME *kernel, FILETIME *user ) +{ + LARGE_INTEGER idle_time, kernel_time, user_time; + SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION *info; + ULONG ret_size; + DWORD i, cpus = NtCurrentTeb()->Peb->NumberOfProcessors; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, sizeof(*info) * cpus ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return FALSE; + } + if (!set_ntstatus( NtQuerySystemInformation( SystemProcessorPerformanceInformation, info, + sizeof(*info) * cpus, &ret_size ))) + { + HeapFree( GetProcessHeap(), 0, info ); + return FALSE; + } + idle_time.QuadPart = 0; + kernel_time.QuadPart = 0; + user_time.QuadPart = 0; + for (i = 0; i < cpus; i++) + { + idle_time.QuadPart += info[i].IdleTime.QuadPart; + kernel_time.QuadPart += info[i].KernelTime.QuadPart; + user_time.QuadPart += info[i].UserTime.QuadPart; + } + if (idle) + { + idle->dwLowDateTime = idle_time.u.LowPart; + idle->dwHighDateTime = idle_time.u.HighPart; + } + if (kernel) + { + kernel->dwLowDateTime = kernel_time.u.LowPart; + kernel->dwHighDateTime = kernel_time.u.HighPart; + } + if (user) + { + user->dwLowDateTime = user_time.u.LowPart; + user->dwHighDateTime = user_time.u.HighPart; + } + HeapFree( GetProcessHeap(), 0, info ); + return TRUE; +} + + /****************************************************************************** * GetTickCount (kernelbase.@) */ @@ -156,6 +206,11 @@ ULONGLONG WINAPI DECLSPEC_HOTPATCH GetTickCount64(void) } +/*********************************************************************** + * Waits + ***********************************************************************/ + + static HANDLE normalize_handle_if_console( HANDLE handle ) { static HANDLE wait_event;

1 0