Changeset 1203

Timestamp:

2000-06-12T14:49:06+12:00 (24 years ago)

Author:

sjboddie

Message:

Made a few minor changes to get the local library compiling under VC++ 6.0
using the built-in STL (i.e. without the GSDL_USE_IOS_H pre-processor
definition set).

Location:

trunk/gsdl/src/w32server

Files:

• cgiwrapper.cpp (modified) (6 diffs)
• fnord.cpp (modified) (8 diffs)
• httpreq.cpp (modified) (1 diff)
• httpsrv.cpp (modified) (2 diffs)
• locate.cpp (modified) (2 diffs)
• netio.cpp (modified) (1 diff)
• netio.h (modified) (1 diff)
• settings.cpp (modified) (2 diffs)

trunk/gsdl/src/w32server/cgiwrapper.cpp

@@ +1 @@
+#include "text_t.h"
+
 #include <windows.h>
 #include <string.h>
@@ -77 +79 @@
   RequestInfoT *RInfo;
   ostream *casostr;
+#if !defined (GSDL_USE_IOS_H)
+  char buffer[256];
+#endif
 };
 
 textstreambuf::textstreambuf() {
   tsbreset();
+#if !defined (GSDL_USE_IOS_H)
+  setp (&buffer[0], &buffer[255]);
+#else
   if (base() == ebuf()) allocate();
   setp (base(), ebuf());
+#endif
 };
 
 int textstreambuf::sync () {
   if ((RInfo != NULL) && 
-      (Send_String_N(pbase(), out_waiting(), RInfo) < 0)) {
+      (Send_String_N(pbase(), pptr()-pbase(), RInfo) < 0)) {
     RInfo = NULL;
   }
@@ -93 +102 @@
   if (casostr != NULL) {
     char *thepbase=pbase();
-        for (int i=0;i<out_waiting();i++) (*casostr).put(thepbase[i]);
+    for (int i=0;i<(pptr()-pbase());i++) (*casostr).put(thepbase[i]);
   }
   
@@ -117 +126 @@
   int overflow (int ch);
   int underflow () {return EOF;}
+
+#if !defined (GSDL_USE_IOS_H)
+private:
+  char buffer[256];
+#endif
 };
 
 logstreambuf::logstreambuf () {
+#if !defined (GSDL_USE_IOS_H)
+  setp (&buffer[0], &buffer[255]);
+#else
   if (base() == ebuf()) allocate();
   setp (base(), ebuf());
+#endif
 }
 
@@ -127 +145 @@
   if (gsdl_keep_log || gsdl_show_console) {
     log_message ("LOCAL LIB MESSAGE: ");
-        log_message_N (pbase(), out_waiting());
+        log_message_N (pbase(), pptr()-pbase());
   }
 
@@ -304 +322 @@
 // returns 1 if successful, 0 if unsuccessful
 int gsdl_init () {
-  cerr = &logstream;
-  cout = &textstream;
+  cerr.rdbuf(&logstream);
+  cout.rdbuf(&textstream);
 
   // collection should be set to "" unless in 

trunk/gsdl/src/w32server/fnord.cpp

@@ -18 +18 @@
 The author can be contacted via Email at [email protected]
 */
+#include "text_t.h"
 #include <windows.h>
 #include <stdlib.h>
@@ -165 +166 @@
   if (coltitledc == NULL) {
     coltitledc = CreateCompatibleDC(pdc);
-    defcoltitlebitmap = SelectObject (coltitledc, coltitlebitmap);
+    defcoltitlebitmap = (HBITMAP)SelectObject (coltitledc, coltitlebitmap);
   }
   
   if (logodc == NULL) {
     logodc = CreateCompatibleDC(pdc);
-    deflogobitmap = SelectObject (logodc, logobitmap);
+    deflogobitmap = (HBITMAP)SelectObject (logodc, logobitmap);
   }
   
@@ -219 +220 @@
       statusRect.right = STATUSX+STATUSWIDTH;
       statusRect.bottom = STATUSY+STATUSHEIGHT;
-      FillRect(pdc, &statusRect, GetStockObject(WHITE_BRUSH));
+      FillRect(pdc, &statusRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
       
       int cury = STATUSY;
@@ -259 +260 @@
     infoRect.right = INFOX+INFOWIDTH;
     infoRect.bottom = INFOY+INFOHEIGHT;
-    FillRect(pdc, &infoRect, GetStockObject(WHITE_BRUSH));
+    FillRect(pdc, &infoRect, (HBRUSH)GetStockObject(WHITE_BRUSH));
     DrawText(pdc, infostring, -1, &infoRect, DT_CENTER);
   }
@@ -558 +559 @@
     // finally, get the host name (no error value
     // is returned from this function)
-    GetLocalName(Instance);
+    GetLocalName((HINSTANCE)Instance);
     
       } else {
@@ -596 +597 @@
   startbrowserdir[0] = '\0';
   netscapeneeded = 0;
-  int err = tryinitnetwork (Instance, MsgWindow, NULL);
-  //int err = 1;
+  //  int err = tryinitnetwork (Instance, MsgWindow, NULL);
+  int err = 1;
   
   // if an error occurred, try again with billsock
@@ -802 +803 @@
 
 
-int __stdcall WinMain(HANDLE Instance, HANDLE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
+int __stdcall WinMain(HINSTANCE Instance, HINSTANCE /*PrevInstance*/, LPSTR CmdLineStr, int /*CmdShow*/) {
   HWND MainWindow;  MSG Message;  WNDCLASS MainClass;  
   
@@ -813 +814 @@
   MainClass.hIcon     = LoadIcon(Instance, MAKEINTRESOURCE(TRAY_ICON));
   MainClass.hCursor   = LoadCursor(NULL, IDC_ARROW);
-  MainClass.hbrBackground = GetStockObject(WHITE_BRUSH);
+  MainClass.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
   MainClass.lpszMenuName = MAKEINTRESOURCE(Main_Menu);
   MainClass.lpszClassName = "Greenstone Digital Library Software";

trunk/gsdl/src/w32server/httpreq.cpp

@@ -18 +18 @@
 The author can be contacted via Email at [email protected]
 */
+#include "text_t.h"
 #include <windows.h>
 #include <stdlib.h>

trunk/gsdl/src/w32server/httpsrv.cpp

@@ -18 +18 @@
 The author can be contacted via Email at [email protected]
 */
+#include "text_t.h"
 #include <windows.h>
 #include <stdlib.h>
@@ -29 +30 @@
 #include "httpsrv.h"
 #include "locate.h"
-#include "settings.h"
 
 //Private Functions

trunk/gsdl/src/w32server/locate.cpp

@@ +1 @@
+#include "text_t.h"
 #include <windows.h>
 #include <stdio.h>
@@ -115 +116 @@
   scroll.bottom = text_rect.bottom;
   ScrollDC(dc,0,-nbits,&scroll,&clip,NULL,&update);
-  FillRect(dc,&update, GetStockObject(WHITE_BRUSH));
+  FillRect(dc,&update, (HBRUSH)GetStockObject(WHITE_BRUSH));
 }
 

trunk/gsdl/src/w32server/netio.cpp

@@ -103 +103 @@
 }
 
-char *GetLocalName(HANDLE hInstance) {
+char *GetLocalName(HINSTANCE hInstance) {
     // static in case it is written to after the function has finished
     // (I did not error checking on WSACancelAsyncRequest)

trunk/gsdl/src/w32server/netio.h

@@ -84 +84 @@
 Returns: A string containing the local address
 */
-char *GetLocalName(HANDLE hInstance);
+char *GetLocalName(HINSTANCE hInstance);
 
 // returns 0 on success, and a WSA error message on failure.

trunk/gsdl/src/w32server/settings.cpp

@@ +1 @@
+#include "text_t.h"
+
 #if defined(GSDL_USE_OBJECTSPACE)
 #  include <ospace\std\fstream>
@@ -367 +369 @@
   text_t key, value, section;
   char *cstr_value;
+#if defined (GSDL_USE_IOS_H)
   ifstream conf (conffile, ios::nocreate);
+#else
+  ifstream conf (conffile);
+#endif
   if (conf) {
     while (read_ini_line(conf, key, value) >= 0) {