Changeset 4502 for trunk/src/kernel32/message.cpp

Timestamp:

Oct 20, 2000, 1:46:48 PM (25 years ago)

Author:

sandervl

Message:

basic support for VIO console command line apps added + FormatMessage addition

File:

• trunk/src/kernel32/message.cpp (modified) (5 diffs)

trunk/src/kernel32/message.cpp

@@ -1 @@
-/* $Id: message.cpp,v 1.12 2000-10-06 11:04:01 sandervl Exp $ */
+/* $Id: message.cpp,v 1.13 2000-10-20 11:46:47 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 #include "heapstring.h"
 
-#define DBG_LOCALLOG    DBG_message
+#define DBG_LOCALLOG    DBG_message
 #include "dbglocal.h"
 
@@ -223 +223 @@
          }
 
+         if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) {
+            /* Ignore inserts, except for '%0' - maybe more? */
+            if (*f == '0') {
+               eos = TRUE;
+               f++;
+               continue;
+            }
+            else {
+               ADD_TO_T('%');
+               continue;
+            }
+         }
+
          switch (*f)
          {
@@ -356 +369 @@
     HeapFree(GetProcessHeap(),0,from);
 
+  dprintf(("gives: %s", (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ?
+           *(LPSTR*)lpBuffer : lpBuffer));
+
   return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ?
          strlen(*(LPSTR*)lpBuffer):
@@ -446 +462 @@
                continue;
             }
+
+            if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) {
+               /* Ignore inserts, except for '%0' - maybe more? */
+               if (*f == '0') {
+                  eos = TRUE;
+                  f++;
+                  continue;
+               }
+               else {
+                  ADD_TO_T('%');
+                  continue;
+               }
+            }
+
             switch (*f) {
             case '1':case '2':case '3':case '4':case '5':