Changeset 3588 for trunk

Timestamp:

Sep 4, 2007, 10:48:11 PM (18 years ago)

Author:

bird

Message:

Made build on VCC80 / amd64.

Location:

trunk/kStuff

Files:

• Config.kmk (modified) (2 diffs)
• kDbg/kDbgModule.cpp (modified) (2 diffs)
• kLdr/kLdrMod.c (modified) (1 diff)
• kLdr/kLdrModLX.c (modified) (1 diff)
• kRdr/kRdrFile.cpp (modified) (3 diffs)

trunk/kStuff/Config.kmk

@@ -77 +77 @@
 TEMPLATE_kStuff_LDFLAGS.linux    = -g
 TEMPLATE_kStuff_LDFLAGS.os2      = -g
-TEMPLATE_kStuff_LDFLAGS.win      = /DEBUG
+TEMPLATE_kStuff_LDFLAGS.win      = /DEBUG /NODEFAULTLIB
 
 TEMPLATE_kStuff_LIBS.freebsd     =
@@ -89 +89 @@
         $(PATH_TOOL_VCC70_LIB)/oldnames.lib \
         $(PATH_SDK_W2K3DDKX86_LIB)/ntdll.lib
+TEMPLATE_kStuff_LIBS.win.amd64   = \
+        $(PATH_TOOL_VCC80AMD64_LIB)/msvcrt.lib \
+        $(PATH_TOOL_VCC80AMD64_LIB)/msvcprt.lib \
+        $(PATH_TOOL_VCC80AMD64_LIB)/oldnames.lib \
+        $(PATH_SDK_W2K3DDKAMD64_LIB)/ntdll.lib
 
 TEMPLATE_kStuffEXE = kStuff Executable Template

trunk/kStuff/kDbg/kDbgModule.cpp

@@ -43 +43 @@
 #if K_OS == K_OS_WINDOWS
     &g_kDbgModWinDbgHelpOpen,
+#else
+#error huh?s
 #endif
 //    &g_kDbgModLdr,
@@ -206 +208 @@
 
     for (PKDBGMODOPS pCur = g_pHead; pCur; pCur = pCur->pNext)
-        if (g_aBuiltIns[i]->pfnOpen)
+        if (pCur->pfnOpen)
         {
-            int rc2 = g_aBuiltIns[i]->pfnOpen(ppDbgMod, pRdr, fCloseRdr, off, cb, pLdrMod);
+            int rc2 = pCur->pfnOpen(ppDbgMod, pRdr, fCloseRdr, off, cb, pLdrMod);
             if (!rc2)
                 return 0;

trunk/kStuff/kLdr/kLdrMod.c

@@ -335 +335 @@
  * Checks if this module can be executed by the specified arch+cpu.
  *
- * @returns 0 if it can, KLDR_ERR_ARCH_CPU_NOT_COMPATIBLE if it can't.
+ * @returns 0 if it can, KCPU_ERR_ARCH_CPU_NOT_COMPATIBLE if it can't.
  *          Other failures may occur and cause other return values.
  * @param   pMod            The module.

trunk/kStuff/kLdr/kLdrModLX.c

@@ -2105 +2105 @@
 
 #else
-    return KLDR_ERR_ARCH_CPU_NOT_COMPATIBLE;
+    return KCPU_ERR_ARCH_CPU_NOT_COMPATIBLE;
 #endif
 }

trunk/kStuff/kRdr/kRdrFile.cpp

@@ -125 +125 @@
       IN HANDLE ProcessHandle,
       IN OUT PVOID *BaseAddress,
-      IN OUT PULONG ProtectSize,
+      IN OUT PSIZE_T ProtectSize,
       IN ULONG NewProtect,
       OUT PULONG OldProtect
@@ -138 +138 @@
       IN OUT PVOID *BaseAddress,
       IN ULONG ZeroBits,
-      IN OUT PULONG AllocationSize,
+      IN OUT PSIZE_T AllocationSize,
       IN ULONG AllocationType,
       IN ULONG Protect
@@ -149 +149 @@
       IN HANDLE ProcessHandle,
       IN OUT PVOID *BaseAddress,
-      IN OUT PULONG FreeSize,
+      IN OUT PSIZE_T FreeSize,
       IN ULONG FreeType
   );