wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update the GetSystemTimes tests to get rid of type warnings on 64-bit.

Browse Source
This commit is contained in:
Erich E. Hoover 2014-08-21 00:07:25 -06:00
parent 16b62f6817
commit 717300b790
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/kernel32-GetSystemTimes/0001-kernel32-Add-tests-for-GetSystemTimes.patch
View File

@ -1,4 +1,4 @@
From d42b5e55c0b0eeae00b0c12cac539d918a5bacf9 Mon Sep 17 00:00:00 2001
From 2c9376fc366c2e96a4319cf15b46e4682947665d Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox_xerox2000@yahoo.co.uk>
Date: Sun, 27 Jul 2014 11:42:28 -0600
Subject: kernel32: Add tests for GetSystemTimes.
@ -8,7 +8,7 @@ Subject: kernel32: Add tests for GetSystemTimes.
1 file changed, 77 insertions(+)
diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index 55d4be9..dde9f5d 100644
index 55d4be9..c38a957 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -22,9 +22,11 @@
@ -45,27 +45,27 @@ index 55d4be9..dde9f5d 100644
+ }
+
+ todo_wine ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" );
+
+
+ memset( &idletime, 0x0, sizeof(idletime) );
+ memset( &kerneltime, 0x0, sizeof(kerneltime) );
+ memset( &usertime, 0x0, sizeof(usertime) );
+ todo_wine ok( pGetSystemTimes(&idletime, &kerneltime , &usertime),
+ "GetSystemTimes failed unexpectedly\n" );
+
+
+ ul1.LowPart = idletime.dwLowDateTime;
+ ul1.HighPart = idletime.dwHighDateTime;
+
+ trace( "IdleTime: %llu seconds\n",ul1.QuadPart/10000000);
+ trace( "IdleTime: %f seconds\n", (double)ul1.QuadPart/10000000.0 );
+
+ ul2.LowPart = kerneltime.dwLowDateTime;
+ ul2.HighPart = kerneltime.dwHighDateTime;
+
+ trace( "KernelTime: %llu seconds\n", ul2.QuadPart/10000000 );
+ trace( "KernelTime: %f seconds\n", (double)ul2.QuadPart/10000000.0 );
+
+ ul3.LowPart = usertime.dwLowDateTime;
+ ul3.HighPart = usertime.dwHighDateTime;
+
+ trace( "UserTime: %llu seconds\n", ul3.QuadPart/10000000 );
+ trace( "UserTime: %f seconds\n", (double)ul3.QuadPart/10000000.0 );
+
+
+ ok( !NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), &ReturnLength),

8
patches/kernel32-GetSystemTimes/0002-kernel32-Implement-GetSystemTimes.patch
View File

@ -1,4 +1,4 @@
From c3acb24297b1b4e41746ba13f7e997bbe7e0c64a Mon Sep 17 00:00:00 2001
From 7b6b18f45e59a5f770c230277a0e13bb5527c287 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Sun, 27 Jul 2014 12:38:29 -0600
Subject: kernel32: Implement GetSystemTimes.
@ -9,7 +9,7 @@ Subject: kernel32: Implement GetSystemTimes.
2 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index dde9f5d..fe459e4 100644
index c38a957..5dff5aa 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -751,13 +751,13 @@ static void test_GetSystemTimes(void)
@ -18,7 +18,7 @@ index dde9f5d..fe459e4 100644
- todo_wine ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" );
+ ok( pGetSystemTimes(NULL, NULL, NULL), "GetSystemTimes failed unexpectedly\n" );
memset( &idletime, 0x0, sizeof(idletime) );
memset( &kerneltime, 0x0, sizeof(kerneltime) );
memset( &usertime, 0x0, sizeof(usertime) );
@ -26,7 +26,7 @@ index dde9f5d..fe459e4 100644
- "GetSystemTimes failed unexpectedly\n" );
+ ok( pGetSystemTimes(&idletime, &kerneltime , &usertime),
+ "GetSystemTimes failed unexpectedly\n" );
ul1.LowPart = idletime.dwLowDateTime;
ul1.HighPart = idletime.dwHighDateTime;
@@ -801,9 +801,9 @@ static void test_GetSystemTimes(void)