wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6d323d81b2a604b89c612928a573b290c945df75.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-05-11 18:10:47 +02:00
parent d3dbcb9165
commit 5215a311fe
4 changed files with 113 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 15dc0e88f4fcd63c876d9037204074ed7506dd51 Mon Sep 17 00:00:00 2001
From 599947d1aaf88c78ed5affe2609c431db14bccd4 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, 76 insertions(+)
diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index 55d4be9..c524343 100644
index 378941d..1937e65 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -22,9 +22,11 @@
@@ -22,10 +22,10 @@ index 55d4be9..c524343 100644
+static BOOL (WINAPI *pGetSystemTimes)(LPFILETIME, LPFILETIME, LPFILETIME);
static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD);
static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD);
@@ -732,12 +734,85 @@ static void test_GetCalendarInfo(void)
ok( ret == ret2, "got %d, expected %d\n", ret, ret2 );
static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*);
@@ -760,12 +762,85 @@ static void test_GetDynamicTimeZoneInformation(void)
ok(dyninfo.TimeZoneKeyName[0] != 0, "got empty tz keyname\n");
trace("Dyn TimeZoneKeyName %s\n", wine_dbgstr_w(dyninfo.TimeZoneKeyName));
}
+static void test_GetSystemTimes(void)
+{
@@ -108,15 +108,15 @@ index 55d4be9..c524343 100644
+ pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes");
pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA");
pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW");
@@ -747,6 +822,7 @@ START_TEST(time)
pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation");
@@ -776,6 +851,7 @@ START_TEST(time)
test_FileTimeToSystemTime();
test_FileTimeToLocalFileTime();
test_TzSpecificLocalTimeToSystemTime();
+ test_GetSystemTimes();
test_FileTimeToDosDateTime();
test_GetCalendarInfo();
}
test_GetDynamicTimeZoneInformation();
--
2.1.0
2.4.0