Changeset 4839Tweet

Timestamp:

Aug 23, 2012, 4:10:27 PM (9 years ago)

Author:

Sam Hocevar

Message:

win32: add some console handling function diversions.

Location:

zzuf/trunk

Files:

• configure.ac (modified) (1 diff)
• msvc/config.h (modified) (3 diffs)
• src/libzzuf/lib-win32.c (modified) (8 diffs)
• src/libzzuf/sys.c (modified) (2 diffs)

zzuf/trunk/configure.ac

@@ -74 +74 @@
 AC_CHECK_FUNCS(__fgets_chk __fgets_unlocked_chk __fread_chk __fread_unlocked_chk __read_chk __recv_chk __recvfrom_chk)
 AC_CHECK_FUNCS(CreateFileA CreateFileW ReOpenFile ReadFile CloseHandle)
+AC_CHECK_FUNCS(AllocConsole AttachConsole SetConsoleMode WriteConsoleOutputA WriteConsoleOutputW)
 
 AC_CHECK_TYPES(sighandler_t, [], [],

zzuf/trunk/msvc/config.h

@@ -23 +23 @@
 /* #undef HAVE_AIO_H */
 /* #undef HAVE_AIO_READ */
+#define HAVE_ALLOCCONSOLE 1
 /* #undef HAVE_ARPA_INET_H */
+#define HAVE_ATTACHCONSOLE 1
 #define HAVE_BIND 1
 #define HAVE_CLOSEHANDLE 1
@@ -89 +91 @@
 #define HAVE_REGWEXEC 1
 #define HAVE_REOPENFILE 1
+#define HAVE_SETCONSOLEMODE 1
 /* #undef HAVE_SETENV */
 /* #undef HAVE_SETRLIMIT */
@@ -115 +118 @@
 #define HAVE_WINDOWS_H 1
 #define HAVE_WINSOCK2_H 1
+#define HAVE_WRITECONSOLEOUTPUTA 1
+#define HAVE_WRITECONSOLEOUTPUTW 1
 /* #undef HAVE__IO_GETC */
 #define HAVE__PIPE 1

zzuf/trunk/src/libzzuf/lib-win32.c

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006-2010 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2006-2012 Sam Hocevar <sam@hocevar.net>
+ *                2012 Kévin Szkudłapski <kszkudlapski@quarkslab.com>
  *                All Rights Reserved
  *
@@ -85 +86 @@
 static BOOL (__stdcall *ORIG(CloseHandle))(HANDLE);
 #endif
+#if defined HAVE_ALLOCCONSOLE
+static BOOL (__stdcall *ORIG(AllocConsole))();
+#endif
+#if defined HAVE_ATTACHCONSOLE
+static BOOL (__stdcall *ORIG(AttachConsole))(DWORD dwProcessId);
+#endif
+#if defined HAVE_SETCONSOLEMODE
+static BOOL (__stdcall *ORIG(SetConsoleMode))(HANDLE hConsoleHandle,
+                                              DWORD dwMode);
+#endif
+#if defined HAVE_WRITECONSOLEOUTPUTA
+static BOOL (__stdcall *ORIG(WriteConsoleOutputA))(HANDLE hConsoleOutput,
+                 CONST CHAR_INFO *lpBuffer, COORD dwBufferSize,
+                 COORD dwBufferCoord, PSMALL_RECT lpWriteRegion);
+#endif
+#if defined HAVE_WRITECONSOLEOUTPUTW
+static BOOL (__stdcall *ORIG(WriteConsoleOutputW))(HANDLE hConsoleOutput,
+                 CONST CHAR_INFO *lpBuffer, COORD dwBufferSize,
+                 COORD dwBufferCoord, PSMALL_RECT lpWriteRegion);
+#endif
 
 /*
@@ -213 +234 @@
 HANDLE __stdcall NEW(CreateIoCompletionPort)(HANDLE FileHandle, HANDLE ExistingCompletionPort, ULONG_PTR CompletionKey, DWORD NumberOfConcurrentThreads)
 {
-        HANDLE ret;
-
-        ret = ORIG(CreateIoCompletionPort)(FileHandle, ExistingCompletionPort, CompletionKey, NumberOfConcurrentThreads);
-
-        debug("GetQueuedCompletionStatus(0x%08x, 0x%08x, 0x%08x, %d) = 0x%08x",
-                FileHandle, ExistingCompletionPort, CompletionKey, NumberOfConcurrentThreads, ret);
+    HANDLE ret;
+
+    ret = ORIG(CreateIoCompletionPort)(FileHandle, ExistingCompletionPort,
+                                   CompletionKey, NumberOfConcurrentThreads);
+
+    debug("GetQueuedCompletionStatus(0x%08x, 0x%08x, 0x%08x, %d) = 0x%08x",
+          FileHandle, ExistingCompletionPort, CompletionKey,
+          NumberOfConcurrentThreads, ret);
 
     if (!_zz_ready || !_zz_iswatched(FileHandle) /*|| !_zz_hostwatched(hFile)*/ || _zz_islocked(FileHandle) || !_zz_isactive(FileHandle))
@@ -229 +252 @@
     }
 
-        return ret;
+    return ret;
 }
 #endif
@@ -240 +263 @@
     ret = ORIG(GetQueuedCompletionStatus)(CompletionPort, lpNumberOfBytes, lpCompletion, lpOverlapped, dwMilliseconds);
 
-        debug("GetQueuedCompletionStatus(0x%08x, { %d }, %p, %p, %d) = %s",
+    debug("GetQueuedCompletionStatus(0x%08x, { %d }, %p, %p, %d) = %s",
         CompletionPort, *lpNumberOfBytes, lpCompletion, lpOverlapped, dwMilliseconds, (ret ? "TRUE" : "FALSE"));
 
@@ -345 +368 @@
     _zz_unregister(hObject);
     return ret;
+}
+#endif
+
+#if defined HAVE_ALLOCCONSOLE
+BOOL __stdcall NEW(AllocConsole)()
+{
+    debug("AllocConsole()");
+    return ORIG(AllocConsole)();
+}
+#endif
+
+#if defined HAVE_ATTACHCONSOLE
+BOOL __stdcall NEW(AttachConsole)(DWORD dwProcessId)
+{
+    debug("AttachConsole(%#08x)");
+    return ORIG(AttachConsole)(dwProcessId);
+}
+#endif
+
+#if defined HAVE_SETCONSOLEMODE
+BOOL __stdcall NEW(SetConsoleMode)(HANDLE hConsoleHandle, DWORD dwMode)
+{
+    debug("SetConsoleMode(%#08x, %#08x)", (int)hConsoleHandle, dwMode);
+    return ORIG(SetConsoleMode)(hConsoleHandle, dwMode);
+}
+#endif
+
+#if defined HAVE_WRITECONSOLEOUTPUTA
+BOOL __stdcall NEW(WriteConsoleOutputA)(HANDLE hConsoleOutput,
+                               CONST CHAR_INFO *lpBuffer, COORD dwBufferSize,
+                               COORD dwBufferCoord, PSMALL_RECT lpWriteRegion)
+{
+    debug("WriteConsoleOutputA(%#08x, %p, ...)", (int)hConsoleOutput, lpBuffer);
+    return ORIG(WriteConsoleOutputA)(hConsoleOutput, lpBuffer, dwBufferSize,
+                                     dwBufferCoord, lpWriteRegion);
+}
+#endif
+
+#if defined HAVE_WRITECONSOLEOUTPUTW
+BOOL __stdcall NEW(WriteConsoleOutputW)(HANDLE hConsoleOutput,
+                               CONST CHAR_INFO *lpBuffer, COORD dwBufferSize,
+                               COORD dwBufferCoord, PSMALL_RECT lpWriteRegion)
+{
+    debug("WriteConsoleOutputW(%#08x, %p, ...)", (int)hConsoleOutput, lpBuffer);
+    return ORIG(WriteConsoleOutputW)(hConsoleOutput, lpBuffer, dwBufferSize,
+                                     dwBufferCoord, lpWriteRegion);
 }
 #endif
@@ -361 +430 @@
     DIVERT(ReadFile),
     DIVERT(ReadFileEx),
-        DIVERT(CreateIoCompletionPort),
+    DIVERT(CreateIoCompletionPort),
     DIVERT(GetQueuedCompletionStatus),
     DIVERT(GetOverlappedResult),
@@ -367 +436 @@
     DIVERT(CreateFileMappingW),
     DIVERT(MapViewOfFile),
+
+#if defined HAVE_ALLOCCONSOLE
+    DIVERT(AllocConsole),
+#endif
+#if defined HAVE_ATTACHCONSOLE
+    DIVERT(AttachConsole),
+#endif
+#if defined HAVE_SETCONSOLEMODE
+    DIVERT(SetConsoleMode),
+#endif
+#if defined HAVE_WRITECONSOLEOUTPUTA
+    DIVERT(WriteConsoleOutputA),
+#endif
+#if defined HAVE_WRITECONSOLEOUTPUTW
+    DIVERT(WriteConsoleOutputW),
+#endif
+
     DIVERT_END
 };

zzuf/trunk/src/libzzuf/sys.c

@@ -1 +1 @@
 /*
  *  zzuf - general purpose fuzzer
- *  Copyright (c) 2006-2010 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2006-2012 Sam Hocevar <sam@hocevar.net>
+ *                2012 Kévin Szkudłapski <kszkudlapski@quarkslab.com>
  *                All Rights Reserved
  *
@@ -264 +265 @@
 static int relocate_hook(uint8_t **code)
 {
-        uint8_t *cur_code = *code;
+    uint8_t *cur_code = *code;
 
 #ifdef _M_AMD64
     // we ignore the REX prefix
     if ((*cur_code & 0xf8) == 0x48)
-                ++cur_code;
+        ++cur_code;
 #endif