[ZH] Fix iostream errors for Zero Hour Tools build (TheSuperHackers#509)

Author: xezon

Dependencies/Utility/Utility/iostream_adapter.h

@@ -0,0 +1,33 @@
+// TheSuperHackers
+// This file helps adapting modern iostream to legacy vs6 iostream,
+// where symbols are not contained in the std namespace.
+
+#pragma once
+
+#if defined(USING_STLPORT) || (defined(_MSC_VER) && _MSC_VER < 1300)
+
+#include <iostream.h>
+
+#else
+
+#include <iostream>
+
+inline auto& cout = std::cout;
+inline auto& cerr = std::cerr;
+
+using streambuf = std::streambuf;
+using ostream = std::ostream;
+
+template <class _Elem, class _Traits>
+std::basic_ostream<_Elem, _Traits>& endl(std::basic_ostream<_Elem, _Traits>& _Ostr)
+{
+    return std::endl(_Ostr);
+}
+
+template <class _Elem, class _Traits>
+std::basic_ostream<_Elem, _Traits>& flush(std::basic_ostream<_Elem, _Traits>& _Ostr)
+{
+    return std::flush(_Ostr);
+}
+
+#endif

GeneralsMD/Code/Libraries/Source/WWVegas/WWLib/sha.cpp

@@ -39,11 +39,7 @@
  * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 #include	"sha.h"
-#ifdef USING_STLPORT
-#include	<iostream.h>
-#else
-#include	<iostream>
-#endif
+#include	<Utility/iostream_adapter.h>
 #include	<stdlib.h>
 
 

GeneralsMD/Code/Tools/CRCDiff/CRCDiff.cpp

@@ -20,7 +20,7 @@
 #include "expander.h"
 #include "KVPair.h"
 #include "misc.h"
-#include <iostream>
+#include <Utility/iostream_adapter.h>
 #include <list>
 #include <stdlib.h>
 #include <stdio.h>

GeneralsMD/Code/Tools/Launcher/CMakeLists.txt

@@ -65,6 +65,7 @@ target_compile_definitions(z_launcher PRIVATE
 
 target_link_libraries(z_launcher PRIVATE
     comctl32
+    gz_utility
     safedisc
 )
 

GeneralsMD/Code/Tools/Launcher/streamer.cpp

@@ -22,17 +22,29 @@
   #include <windows.h>
 #endif
 
+#if defined(USING_STLPORT) || (defined(_MSC_VER) && _MSC_VER < 1300)
+#define STREAMER_UNBUFFERED unbuffered()
+#else
+#define STREAMER_UNBUFFERED 0
+#endif
 
-Streamer::Streamer() : streambuf()
+Streamer::Streamer() : streambuf(), Output_Device(NULL), Buf(NULL)
 {
+#if defined(USING_STLPORT) || (defined(_MSC_VER) && _MSC_VER < 1300)
   int state=unbuffered();
   unbuffered(0);  // 0 = buffered, 1 = unbuffered
+#else
+  static_assert(STREAMER_UNBUFFERED==0, "std::streambuf is assumed to be buffered by default");
+#endif
 }
 
 Streamer::~Streamer()
 {
-  sync();
-  delete[](base());
+  ///////// calling sync seems to cause crashes here on Win32
+  //sync();
+  /////////
+  if (Buf)
+    delete[] Buf;
 }
 
 int Streamer::setOutputDevice(OutputDevice *device)
@@ -45,7 +57,6 @@ int Streamer::setOutputDevice(OutputDevice *device)
 // put n chars from string into buffer
 int Streamer::xsputn(const char* buf, int size) //implementation of sputn
 {
-
   if (size<=0)  // Nothing to do
     return(0);
 
@@ -66,7 +77,6 @@ int Streamer::xsputn(const char* buf, int size) //implementation of sputn
 // Flush the buffer and make more room if needed
 int Streamer::overflow(int c)
 {
-
   if (c==EOF)
     return(sync());
   if ((pbase()==0) && (doallocate()==0))
@@ -75,7 +85,7 @@ int Streamer::overflow(int c)
     return(EOF);
   else {
     sputc(c);
-    if ((unbuffered() && c=='\n' || pptr() >= epptr())
+    if ((STREAMER_UNBUFFERED && c=='\n' || pptr() >= epptr())
         && sync()==EOF) {
       return(EOF);
     }
@@ -91,27 +101,30 @@ int Streamer::underflow(void)
 
 int Streamer::doallocate()
 {
-
-  if (base()==NULL)
+  if (Buf==NULL)
   {
-    char *buf=new char[(2*STREAMER_BUFSIZ)];   // deleted by destructor
-    memset(buf,0,2*STREAMER_BUFSIZ);
+    Buf=new char[(2*STREAMER_BUFSIZ)];   // deleted by destructor
+    memset(Buf,0,2*STREAMER_BUFSIZ);
 
     // Buffer
+#if defined(USING_STLPORT) || (defined(_MSC_VER) && _MSC_VER < 1300)
     setb(
-       buf,         // base pointer
-       buf+STREAMER_BUFSIZ,  // ebuf pointer (end of buffer);
+       Buf,         // base pointer
+       Buf+STREAMER_BUFSIZ,  // ebuf pointer (end of buffer);
        0);          // 0 = manual deletion of buff 
+#else
+    pubsetbuf(Buf, 2*STREAMER_BUFSIZ);
+#endif
 
     // Get area
     setg(
-        buf,   // eback 
-        buf,   // gptr
-        buf);  // egptr
+        Buf,   // eback 
+        Buf,   // gptr
+        Buf);  // egptr
 
-    buf+=STREAMER_BUFSIZ;
+    Buf+=STREAMER_BUFSIZ;
     // Put area
-    setp(buf,buf+STREAMER_BUFSIZ);
+    setp(Buf,Buf+STREAMER_BUFSIZ);
     return(1);
   }
   else
@@ -132,7 +145,7 @@ int Streamer::sync()
     Output_Device->print(pbase(),wlen);
   }
 
-  if (unbuffered()) {
+  if (STREAMER_UNBUFFERED) {
     setp(pbase(),pbase());
   }
   else {

GeneralsMD/Code/Tools/Launcher/streamer.h

@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <iostream.h>
+#include <Utility/iostream_adapter.h>
 #include <string.h>
 
 #include "odevice.h"
@@ -55,6 +55,7 @@ class Streamer : public streambuf
 
 
     OutputDevice  *Output_Device;
+    char *Buf;
 };
 
 #endif

GeneralsMD/Code/Tools/Launcher/wdebug.h

@@ -53,7 +53,7 @@ will you be ready to leave grasshopper.
 #ifndef WDEBUG_HEADER
 #define WDEBUG_HEADER
 
-#include <iostream.h>
+#include <Utility/iostream_adapter.h>
 #include "odevice.h"
 #include "streamer.h"
 #include <time.h>

GeneralsMD/Code/Tools/mangler/CMakeLists.txt

@@ -62,7 +62,7 @@ set_target_properties(z_manglerlib PROPERTIES OUTPUT_NAME manglerlib)
 target_sources(z_manglerlib PUBLIC ${MANGLERLIB_SRC})
 target_include_directories(z_manglerlib PRIVATE . wlib wnet)
 target_link_libraries(z_manglerlib PRIVATE wsock32)
-
+target_link_libraries(z_manglerlib PUBLIC gz_utility)
 
 # mangler app
 

GeneralsMD/Code/Tools/mangler/crc.cpp

@@ -17,7 +17,6 @@
 */
 
 
-#include <iostream>
 #include <signal.h>
 #ifdef _WINDOWS
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined

GeneralsMD/Code/Tools/mangler/mangler.cpp

@@ -17,7 +17,8 @@
 */
 
 
-#include <iostream.h>
+#include <Utility/iostream_adapter.h>
+
 #include <signal.h>
 #ifdef _WINDOWS
 #include <process.h> // *MUST* be included before ANY Wnet/Wlib headers if _REENTRANT is defined