Merge pull request #6 from omega13a/patch-6

Update 0004-ntdll-tests-Test-updating-TickCount-in-user_shared_d.patch
This commit is contained in:
Alistair Leslie-Hughes 2018-02-18 13:45:17 +11:00 committed by GitHub
commit 616ab59674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -21,16 +21,8 @@ index b684bc1980d..f90ac6ff91c 100644
#define TICKSPERSEC 10000000
#define TICKSPERMSEC 10000
@@ -27,6 +29,7 @@
static VOID (WINAPI *pRtlTimeToTimeFields)( const LARGE_INTEGER *liTime, PTIME_FIELDS TimeFields) ;
static VOID (WINAPI *pRtlTimeFieldsToTime)( PTIME_FIELDS TimeFields, PLARGE_INTEGER Time) ;
static NTSTATUS (WINAPI *pNtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency );
+static ULONG (WINAPI *pNtGetTickCount)(void);
static const int MonthLengths[2][12] =
{
@@ -115,15 +118,40 @@ static void test_NtQueryPerformanceCounter(void)
ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status);
@@ -153,12 +155,36 @@ static void test_RtlQueryTimeZoneInforma
wine_dbgstr_w(tzinfo.DaylightName));
}
+static void test_NtGetTickCount(void)
@ -63,13 +55,15 @@ index b684bc1980d..f90ac6ff91c 100644
pRtlTimeFieldsToTime = (void *)GetProcAddress(mod,"RtlTimeFieldsToTime");
pNtQueryPerformanceCounter = (void *)GetProcAddress(mod, "NtQueryPerformanceCounter");
+ pNtGetTickCount = (void *)GetProcAddress(mod,"NtGetTickCount");
if (pRtlTimeToTimeFields && pRtlTimeFieldsToTime)
test_pRtlTimeToTimeFields();
pRtlQueryTimeZoneInformation =
(void *)GetProcAddress(mod, "RtlQueryTimeZoneInformation");
pRtlQueryDynamicTimeZoneInformation =
@@ -169,5 +195,6 @@ START_TEST(time)
else
win_skip("Required time conversion functions are not available\n");
test_NtQueryPerformanceCounter();
+ test_NtGetTickCount();
test_RtlQueryTimeZoneInformation();
}
--
2.12.2