Rebase against 1e8759805e3c5dfe00a31bb5f13f1c1da28d2826.

This commit is contained in:
Sebastian Lackner
2015-05-21 06:24:11 +02:00
parent f09433417e
commit b2297b41c3
24 changed files with 255 additions and 908 deletions

View File

@@ -1,14 +1,14 @@
From 599947d1aaf88c78ed5affe2609c431db14bccd4 Mon Sep 17 00:00:00 2001
From 25af9ecd4fb4120ca415afd27079b749a11b6537 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.
---
dlls/kernel32/tests/time.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
dlls/kernel32/tests/time.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 77 insertions(+)
diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index 378941d..1937e65 100644
index d205174..5b0bf69 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -22,9 +22,11 @@
@@ -23,10 +23,10 @@ index 378941d..1937e65 100644
static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD);
static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD);
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));
@@ -801,11 +803,85 @@ static void test_GetSystemTimePreciseAsFileTime(void)
ok(diff < 10000 && diff > 0, "GetSystemTimePreciseAsFileTime incremented by more than 1 ms\n");
}
+static void test_GetSystemTimes(void)
+{
+
@@ -99,7 +99,7 @@ index 378941d..1937e65 100644
+
+ HeapFree(GetProcessHeap(), 0, sppi);
+}
+
START_TEST(time)
{
HMODULE hKernel = GetModuleHandleA("kernel32");
@@ -109,7 +109,7 @@ index 378941d..1937e65 100644
pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA");
pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW");
pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation");
@@ -776,6 +851,7 @@ START_TEST(time)
@@ -817,6 +893,7 @@ START_TEST(time)
test_FileTimeToSystemTime();
test_FileTimeToLocalFileTime();
test_TzSpecificLocalTimeToSystemTime();