[KMTESTS:MM]
authorThomas Faber <thomas.faber@reactos.org>
Sun, 5 May 2013 12:18:49 +0000 (12:18 +0000)
committerThomas Faber <thomas.faber@reactos.org>
Sun, 5 May 2013 12:18:49 +0000 (12:18 +0000)
- Fix 64-bit warnings. Patch by Nikolay Borisov.
ROSTESTS-112 #resolve

svn path=/trunk/; revision=58940

rostests/kmtests/ntos_mm/ZwAllocateVirtualMemory.c
rostests/kmtests/ntos_mm/ZwCreateSection.c
rostests/kmtests/ntos_mm/ZwMapViewOfSection.c

index 01ae694..d551ee2 100644 (file)
 
 /* These are being used in ZwMapViewOfSection as well */
 const char TestString[] = "TheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedThe";
 
 /* These are being used in ZwMapViewOfSection as well */
 const char TestString[] = "TheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedTheWhiteRabbitTheLongBrownFoxJumpedThe";
-const SIZE_T TestStringSize = sizeof(TestString);
+const ULONG TestStringSize = sizeof(TestString);
 
 VOID Test_ZwAllocateVirtualMemory(VOID);
 
 typedef struct _TEST_CONTEXT
 {
     HANDLE ProcessHandle;
 
 VOID Test_ZwAllocateVirtualMemory(VOID);
 
 typedef struct _TEST_CONTEXT
 {
     HANDLE ProcessHandle;
-    ULONG RegionSize;
+    SIZE_T RegionSize;
     ULONG AllocationType;
     ULONG Protect;
     PVOID Bases[1024];
     ULONG AllocationType;
     ULONG Protect;
     PVOID Bases[1024];
index 4dbc75e..54f2dc7 100644 (file)
@@ -11,7 +11,7 @@
 #define NO_HANDLE_CLOSE -998
 #define _4mb 4194304
 extern const char TestString[];
 #define NO_HANDLE_CLOSE -998
 #define _4mb 4194304
 extern const char TestString[];
-extern const SIZE_T TestStringSize;
+extern const ULONG TestStringSize;
 static UNICODE_STRING FileReadOnlyPath = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll");
 static UNICODE_STRING WritableFilePath = RTL_CONSTANT_STRING(L"\\SystemRoot\\kmtest-MmSection.txt");
 static UNICODE_STRING CalcImgPath = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\calc.exe");
 static UNICODE_STRING FileReadOnlyPath = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\ntdll.dll");
 static UNICODE_STRING WritableFilePath = RTL_CONSTANT_STRING(L"\\SystemRoot\\kmtest-MmSection.txt");
 static UNICODE_STRING CalcImgPath = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\calc.exe");
index 1350984..44f446f 100644 (file)
@@ -16,7 +16,7 @@ static UNICODE_STRING NtosImgPath = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32
 static UNICODE_STRING WritableFilePath = RTL_CONSTANT_STRING(L"\\SystemRoot\\kmtest-MmSection.txt");
 static UNICODE_STRING SharedSectionName = RTL_CONSTANT_STRING(L"\\BaseNamedObjects\\kmtest-SharedSection");
 extern const char TestString[];
 static UNICODE_STRING WritableFilePath = RTL_CONSTANT_STRING(L"\\SystemRoot\\kmtest-MmSection.txt");
 static UNICODE_STRING SharedSectionName = RTL_CONSTANT_STRING(L"\\BaseNamedObjects\\kmtest-SharedSection");
 extern const char TestString[];
-extern const SIZE_T TestStringSize;
+extern const ULONG TestStringSize;
 static OBJECT_ATTRIBUTES NtdllObject;
 static OBJECT_ATTRIBUTES KmtestFileObject;
 static OBJECT_ATTRIBUTES NtoskrnlFileObject;
 static OBJECT_ATTRIBUTES NtdllObject;
 static OBJECT_ATTRIBUTES KmtestFileObject;
 static OBJECT_ATTRIBUTES NtoskrnlFileObject;
@@ -266,7 +266,7 @@ AdvancedErrorChecks(HANDLE FileHandleReadOnly, HANDLE FileHandleWriteOnly)
 
 static
 SIZE_T
 
 static
 SIZE_T
-CompareFileContents(HANDLE FileHandle, SIZE_T BufferLength, PVOID Buffer)
+CompareFileContents(HANDLE FileHandle, ULONG BufferLength, PVOID Buffer)
 {
     NTSTATUS Status;
     LARGE_INTEGER ByteOffset;
 {
     NTSTATUS Status;
     LARGE_INTEGER ByteOffset;