fix GUID struct field types to be LP64-proof

diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
index 96301dbbe4b96c88dbec2e6680491dcb44853fbe..7d6f0ab5f2673b5fa5b5d4a54ccd96f18f524128 100644 (file)
--- a/basis/windows/kernel32/kernel32.factor
+++ b/basis/windows/kernel32/kernel32.factor
@@ -315,10 +315,10 @@ C-STRUCT: MEMORY_BASIC_INFORMATION
   { "DWORD" "type" } ;
 
 C-STRUCT: GUID
-    { "ulong" "Data1" }
-    { "ushort" "Data2" }
-    { "ushort" "Data3" }
-    { { "uchar" 8 } "Data4" } ;
+    { "ULONG" "Data1" }
+    { "WORD"  "Data2" }
+    { "WORD"  "Data3" }
+    { { "UCHAR" 8 } "Data4" } ;
 
 
 : SE_CREATE_TOKEN_NAME "SeCreateTokenPrivilege" ;

diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor
index 6b1a57a098af32a6fcb79071d4cb73831c5e3213..63ee6627c400237b3cf204f1745445e74883f0ad 100644 (file)
--- a/basis/windows/types/types.factor
+++ b/basis/windows/types/types.factor
@@ -30,7 +30,7 @@ TYPEDEF: long*               LPLONG
 TYPEDEF: long                LONG_PTR
 TYPEDEF: long*               PLONG_PTR
 
-TYPEDEF: int                 ULONG
+TYPEDEF: uint                ULONG
 TYPEDEF: void*               ULONG_PTR
 TYPEDEF: void*               PULONG_PTR