Changeset 21916 for trunk/src/vdmdbg

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/vdmdbg/Makefile (deleted)
• src/vdmdbg/Makefile.kmk (copied) (copied from branches/gcc-kmk/src/vdmdbg/Makefile.kmk )
• src/vdmdbg/vdmdbg.cpp (modified) (27 diffs)
• src/vdmdbg/vdmdbg.def (modified) (1 diff)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/vdmdbg/vdmdbg.cpp

@@ -49 +49 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x) - stub\n", lpDebugEvent));
+    dprintf(("VDMDBG: %s(%x) - stub\n", __FUNCTION__, lpDebugEvent));
     return FALSE;
 }
@@ -66 +66 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x) - stub\n", hProcess, hThread, wSelector, lpSelectorEntry));
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x) - stub\n", __FUNCTION__, hProcess, hThread, wSelector, lpSelectorEntry));
     return FALSE;
 }
@@ -85 +85 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x) - stub\n", hProcess, hThread, wSelector, dwOffset, fProtMode));
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x) - stub\n", __FUNCTION__, hProcess, hThread, wSelector, dwOffset, fProtMode));
     return NULL;
 }
@@ -101 +101 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x) - stub\n", lpDebugEvent, lpVDMContext));
+    dprintf(("VDMDBG: %s(%x, %x) - stub\n", __FUNCTION__, lpDebugEvent, lpVDMContext));
     return FALSE;
 }
@@ -117 +117 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x) - stub\n", lpDebugEvent, lpVDMContext));
+    dprintf(("VDMDBG: %s(%x, %x) - stub\n", __FUNCTION__, lpDebugEvent, lpVDMContext));
     return FALSE;
 }
@@ -133 +133 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x) - stub\n", hProcess, hThread, lpVDMContext));
+    dprintf(("VDMDBG: %s(%x, %x, %x) - stub\n", __FUNCTION__, hProcess, hThread, lpVDMContext));
     return FALSE;
 }
@@ -149 +149 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x) - stub\n", hProcess, hThread, lpVDMContext));
+    dprintf(("VDMDBG: %s(%x, %x, %x) - stub\n", __FUNCTION__, hProcess, hThread, lpVDMContext));
     return FALSE;
 }
@@ -170 +170 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              hProcess, hThread, wSelector, lpSegmentNumber, lpModuleName, nNameSize, lpModulePath, nPathSize));
     return FALSE;
@@ -190 +190 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              hProcess, hThread, wSegmentNumber, lpModuleName, lpSelector));
     return FALSE;
@@ -209 +209 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              hProcess, hThread, lpModuleEntry, lpEventProc, lpData));
     return FALSE;
@@ -229 +229 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              hProcess, hThread, lpModuleEntry, lpEventProc, lpData));
     return FALSE;
@@ -250 +250 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              hProcess, hThread, lpGlobalEntry, wFlags, lpEventProc, lpData));
     return FALSE;
@@ -270 +270 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              hProcess, hThread, lpGlobalEntry, wFlags, lpEventProc, lpData));
     return FALSE;
@@ -290 +290 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x) - stub\n", fp, lparam));
+    dprintf(("VDMDBG: %s(%x, %x) - stub\n", __FUNCTION__, fp, lparam));
     return 0;
 }
@@ -310 +310 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x) - stub\n", dwProcessId, fp, lparam));
+    dprintf(("VDMDBG: %s(%x, %x, %x) - stub\n", __FUNCTION__, dwProcessId, fp, lparam));
     return 0;
 }
@@ -332 +332 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x) - stub\n", dwProcessId, fp, lparam));
+    dprintf(("VDMDBG: %s(%x, %x, %x) - stub\n", __FUNCTION__, dwProcessId, fp, lparam));
     return 0;
 }
@@ -351 +351 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x) - stub\n", dwProcessId, htask));
+    dprintf(("VDMDBG: %s(%x, %x) - stub\n", __FUNCTION__, dwProcessId, htask));
     return FALSE;
 }
@@ -380 +380 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ " (%x, %s, %x) - stub\n", dwProcessId, lpCommandLine, wShow));
+    dprintf(("VDMDBG: %s (%x, %s, %x) - stub\n", __FUNCTION__, dwProcessId, lpCommandLine, wShow));
     return FALSE;
 }
@@ -394 +394 @@
 BOOL WIN32API VDMKillWOW(VOID)
 {
-    dprintf(("VDMDBG: " __FUNCTION__ " - stub\n"));
+    dprintf(("VDMDBG: %s - stub\n", __FUNCTION__));
     return FALSE;
 }
@@ -408 +408 @@
 BOOL WIN32API VDMDetectWOW(VOID)
 {
-    dprintf(("VDMDBG: " __FUNCTION__ " - stub\n"));
+    dprintf(("VDMDBG: %s - stub\n", __FUNCTION__));
     return FALSE;
 }
@@ -425 +425 @@
 )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x) - stub\n", hProcess, hThread));
+    dprintf(("VDMDBG: %s(%x, %x) - stub\n", __FUNCTION__, hProcess, hThread));
     return FALSE;
 }
@@ -440 +440 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x) - stub\n", hProcess));
+    dprintf(("VDMDBG: %s(%x, %x) - stub\n", __FUNCTION__, hProcess));
     return 0;
 }
@@ -455 +455 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x) - stub\n", hProcess, dwFlags));
+    dprintf(("VDMDBG: %s(%x, %x) - stub\n", __FUNCTION__, hProcess, dwFlags));
     return FALSE;
 }
@@ -469 +469 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%s) - stub\n", szPath));
+    dprintf(("VDMDBG: %s(%s) - stub\n", __FUNCTION__, szPath));
     return FALSE;
 }
@@ -486 +486 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x) - stub\n", Selector, Offset, bProtectMode, pSegInfo));
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x) - stub\n", __FUNCTION__, Selector, Offset, bProtectMode, pSegInfo));
     return FALSE;
 }
@@ -513 +513 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              pszModule, SegNumber, Offset, bProtectMode, bNextSymbol, szSymbolName, pDisplacement));
     return FALSE;
@@ -532 +532 @@
     )
 {
-    dprintf(("VDMDBG: " __FUNCTION__ "(%x, %x, %x, %x, %x) - stub\n",
+    dprintf(("VDMDBG: %s(%x, %x, %x, %x, %x) - stub\n", __FUNCTION__,
              szModule, szSymbol, Selector, Offset, Type));
     return FALSE;

trunk/src/vdmdbg/vdmdbg.def

@@ -9 +9 @@
 ; Exports as defined by NT4 sp6
 ; -----------------------------
-        VDMBreakThread            = _VDMBreakThread@8                   @1
-        VDMDetectWOW              = _VDMDetectWOW@0                     @2
-        VDMEnumProcessWOW         = _VDMEnumProcessWOW@8                @3
-        VDMEnumTaskWOW            = _VDMEnumTaskWOW@12                  @4
-        VDMEnumTaskWOWEx          = _VDMEnumTaskWOWEx@12                @5
-        VDMGetModuleSelector      = _VDMGetModuleSelector@20            @6
-        VDMGetPointer             = _VDMGetPointer@20                   @7
-        VDMGetSelectorModule      = _VDMGetSelectorModule@32            @8
-        VDMGetThreadContext       = _VDMGetThreadContext@8              @9
-        VDMGetThreadSelectorEntry = _VDMGetThreadSelectorEntry@16       @10
-        VDMGlobalFirst            = _VDMGlobalFirst@24                  @11
-        VDMGlobalNext             = _VDMGlobalNext@24                   @12
-        VDMKillWOW                = _VDMKillWOW@0                       @13
-        VDMModuleFirst            = _VDMModuleFirst@20                  @14
-        VDMModuleNext             = _VDMModuleNext@20                   @15
-        VDMProcessException       = _VDMProcessException@4              @16
-        VDMSetThreadContext       = _VDMSetThreadContext@8              @17
-        VDMStartTaskInWOW         = _VDMStartTaskInWOW@12               @18
-        VDMTerminateTaskWOW       = _VDMTerminateTaskWOW@8              @19
+        VDMBreakThread            = "_VDMBreakThread@8"                 @1
+        VDMDetectWOW              = "_VDMDetectWOW@0"                   @2
+        VDMEnumProcessWOW         = "_VDMEnumProcessWOW@8"              @3
+        VDMEnumTaskWOW            = "_VDMEnumTaskWOW@12"                @4
+        VDMEnumTaskWOWEx          = "_VDMEnumTaskWOWEx@12"              @5
+        VDMGetModuleSelector      = "_VDMGetModuleSelector@20"          @6
+        VDMGetPointer             = "_VDMGetPointer@20"                 @7
+        VDMGetSelectorModule      = "_VDMGetSelectorModule@32"          @8
+        VDMGetThreadContext       = "_VDMGetThreadContext@8"            @9
+        VDMGetThreadSelectorEntry = "_VDMGetThreadSelectorEntry@16"     @10
+        VDMGlobalFirst            = "_VDMGlobalFirst@24"                @11
+        VDMGlobalNext             = "_VDMGlobalNext@24"                 @12
+        VDMKillWOW                = "_VDMKillWOW@0"                     @13
+        VDMModuleFirst            = "_VDMModuleFirst@20"                @14
+        VDMModuleNext             = "_VDMModuleNext@20"                 @15
+        VDMProcessException       = "_VDMProcessException@4"            @16
+        VDMSetThreadContext       = "_VDMSetThreadContext@8"            @17
+        VDMStartTaskInWOW         = "_VDMStartTaskInWOW@12"             @18
+        VDMTerminateTaskWOW       = "_VDMTerminateTaskWOW@8"            @19
 
 ; -----------------------------------------------

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk