WIN32 updates.

diff --git a/include/yaz-ir-assoc.h b/include/yaz-ir-assoc.h
index a939e34..7d07142 100644 (file)
--- a/include/yaz-ir-assoc.h
+++ b/include/yaz-ir-assoc.h
@@ -3,7 +3,7 @@
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  * 
- * $Id: yaz-ir-assoc.h,v 1.9 2000-05-10 11:36:58 ian Exp $
+ * $Id: yaz-ir-assoc.h,v 1.10 2000-09-06 14:23:45 adam Exp $
  */
 
 #include <yaz-z-assoc.h>
@@ -57,7 +57,7 @@ class YAZ_EXPORT Yaz_IR_Assoc: public Yaz_Z_Assoc {
     int send_initRequest(char* pRefId=NULL);
     int send_searchRequest(Yaz_Z_Query *query, char* pResultSetId = NULL, char* pRefId = NULL);
     int send_presentRequest(int start, int number, char* pResultSetId = NULL, char* pRefId = NULL);
-    int send_deleteResultSetRequest(char* pResultSetId = NULL, char* pRefId = NULL);
+    int send_deleteResultSetRequest(char* pResultSetId = 0, char* pRefId = 0);
     
     /// Recv Services
     virtual void recv_initRequest(Z_InitRequest *initRequest);

diff --git a/src/yaz-client.cpp b/src/yaz-client.cpp
index 98f13dc..e5eff81 100644 (file)
--- a/src/yaz-client.cpp
+++ b/src/yaz-client.cpp
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-client.cpp,v $
- * Revision 1.12  2000-09-04 08:59:16  adam
+ * Revision 1.13  2000-09-06 14:23:45  adam
+ * WIN32 updates.
+ *
+ * Revision 1.12  2000/09/04 08:59:16  adam
  * Changed call to logging functions (yaz_ added).
  *
  * Revision 1.11  2000/07/04 13:48:49  adam
@@ -702,4 +705,5 @@ int main(int argc, char **argv)
        exit (1);
     if (z.interactive(&mySocketManager))
        exit (1);
+    return 0;
 }

diff --git a/src/yaz-ir-assoc.cpp b/src/yaz-ir-assoc.cpp
index 1148c50..6753fc9 100644 (file)
--- a/src/yaz-ir-assoc.cpp
+++ b/src/yaz-ir-assoc.cpp
@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-ir-assoc.cpp,v $
- * Revision 1.12  2000-05-10 11:36:58  ian
+ * Revision 1.13  2000-09-06 14:23:45  adam
+ * WIN32 updates.
+ *
+ * Revision 1.12  2000/05/10 11:36:58  ian
  * Added default parameters for refid to request functions.
  * Added default parameter for result set name to search and present request.
  * Commented out forced logging of PDU contents.
@@ -73,6 +75,7 @@ void Yaz_IR_Assoc::get_databaseNames (int *num, char ***list)
     *list = m_databaseNames;
 }
 
+typedef char *charp;
 void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
 {
     int i;
@@ -81,7 +84,8 @@ void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
        delete [] m_databaseNames[i];
     delete [] m_databaseNames;
     m_num_databaseNames = num;
-    m_databaseNames = new (char*) [num];
+
+    m_databaseNames = new char *[num];
     for (i = 0; i<m_num_databaseNames; i++)
     {
        m_databaseNames[i] = new char[strlen(list[i])+1];
@@ -91,7 +95,7 @@ void Yaz_IR_Assoc::set_databaseNames (int num, const char **list)
 
 void Yaz_IR_Assoc::set_databaseNames(const char *dblist, const char *sep)
 {
-    const char **list = new (const char*) [strlen(dblist)];
+    const char **list = new const char* [strlen(dblist)];
     char *dbtmp = new char[strlen(dblist)+1];
     strcpy(dbtmp, dblist);
     int num = 0;
@@ -422,14 +426,13 @@ int Yaz_IR_Assoc::send_initRequest(char* pRefId)
     return send_Z_PDU(apdu);
 }
 
-int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId = NULL, char* pRefId = NULL)
+int Yaz_IR_Assoc::send_deleteResultSetRequest(char* pResultSetId, char* pRefId)
 {
     char* ResultSetIds[1];
 
     Z_APDU *apdu = create_Z_PDU(Z_APDU_deleteResultSetRequest);
     Z_DeleteResultSetRequest *req = apdu->u.deleteResultSetRequest;
 
-
     if ( pResultSetId )
     {
         *req->deleteFunction = Z_DeleteResultSetRequest_list;

diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp
index 84f4238..289a52b 100644 (file)
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-pdu-assoc.cpp,v $
- * Revision 1.11  2000-09-04 08:29:22  adam
+ * Revision 1.12  2000-09-06 14:23:45  adam
+ * WIN32 updates.
+ *
+ * Revision 1.11  2000/09/04 08:29:22  adam
  * Fixed memory leak(s). Added re-use of associations, rather than
  * re-init, when maximum number of targets are in use.
  *
@@ -174,6 +177,7 @@ void Yaz_PDU_Assoc::socketNotify(int event)
                m_destroyed = &destroyed;
 
                m_PDU_Observer->recv_PDU(m_input_buf, res);
+                m_destroyed = 0;
                if (destroyed)   // it really was destroyed, return now.
                    return;
            } while (m_cs && cs_more (m_cs));
@@ -393,6 +397,8 @@ void Yaz_PDU_Assoc::socket(IYaz_PDU_Observer *observer, int fd)
 }
 
 #if 1
+
+// Single-threaded... Only useful for non-blocking handlers
 void Yaz_PDU_Assoc::childNotify(int fd)
 {
     /// Clone PDU Observable (keep socket manager)
@@ -407,40 +413,56 @@ void Yaz_PDU_Assoc::childNotify(int fd)
 #else
 
 #include <yaz-socket-manager.h>
-#include <pthread.h>
 
-class thread_info {
-    Yaz_SocketManager *socketManager;
-    IYaz_PDU_Observable *
-
-};
+#ifdef WIN32
+#include <process.h>
+#else
+#include <pthread.h>
+#endif
 
-static void *events(void *p)
+void
+#ifdef WIN32
+__cdecl
+#endif 
+    events(void *p)
 {
     Yaz_SocketManager *s = (Yaz_SocketManager *) p;
-    
+
+    logf (LOG_LOG, "thread started");
     while (s->processEvent() > 0)
        ;
+    logf (LOG_LOG, "thread finished");
+#ifdef WIN32
+#else
     return 0;
+#endif
 }
 
 void Yaz_PDU_Assoc::childNotify(int fd)
 {
-    Yaz_SocketManager *socket_observable = new Yaz_SocketManager;  
-    IYaz_PDU_Observable *new_observable = clone();
+    Yaz_SocketManager *socket_observable = new Yaz_SocketManager;
+    Yaz_PDU_Assoc *new_observable = new Yaz_PDU_Assoc (socket_observable);
     
-    m_socketObservable = socket_observable;
-
     /// Clone PDU Observer
     IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable);
     
     /// Attach new socket to it
     new_observable->socket(observer, fd);
-    
+
+#ifdef WIN32
+    long t_id;
+    t_id = _beginthread (events, 0, socket_observable);
+    if (t_id == -1)
+    {
+        logf (LOG_FATAL|LOG_ERRNO, "_beginthread failed");
+        exit (1);
+    }
+#else
     pthread_t type;
 
     int id = pthread_create (&type, 0, events, socket_observable);
     logf (LOG_LOG, "pthread_create returned id=%d", id);
+#endif
 }
+// Threads end
 #endif
-

diff --git a/win/yazclient/yazclient.dsp b/win/yazclient/yazclient.dsp
index c63ef19..ade1ecf 100644 (file)
--- a/win/yazclient/yazclient.dsp
+++ b/win/yazclient/yazclient.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="yazclient" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
@@ -17,12 +17,12 @@ CFG=yazclient - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "yazclient - Win32 Release" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "yazclient - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "yazclient - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -50,12 +50,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Release
 ProjDir=.
 TargetName=yazclient
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 
@@ -73,7 +73,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x406 /d "_DEBUG"
 # ADD RSC /l 0x406 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -81,12 +81,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Debug
 ProjDir=.
 TargetName=yazclient
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 

diff --git a/win/yazproxy/yazproxy.dsp b/win/yazproxy/yazproxy.dsp
index bf05ac3..1df1cc0 100644 (file)
--- a/win/yazproxy/yazproxy.dsp
+++ b/win/yazproxy/yazproxy.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="yazproxy" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
@@ -17,12 +17,12 @@ CFG=yazproxy - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "yazproxy - Win32 Release" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "yazproxy - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "yazproxy - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -49,12 +49,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Release
 ProjDir=.
 TargetName=yazproxy
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 
@@ -69,9 +69,10 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x406 /d "_DEBUG"
 # ADD RSC /l 0x406 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -79,12 +80,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Debug
 ProjDir=.
 TargetName=yazproxy
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 

diff --git a/win/yazserver/yazserver.dsp b/win/yazserver/yazserver.dsp
index 6d1d5d8..7b78366 100644 (file)
--- a/win/yazserver/yazserver.dsp
+++ b/win/yazserver/yazserver.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="yazserver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
@@ -17,12 +17,12 @@ CFG=yazserver - Win32 Debug
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "yazserver - Win32 Release" (based on\
- "Win32 (x86) Console Application")
+!MESSAGE "yazserver - Win32 Release" (based on "Win32 (x86) Console Application")
 !MESSAGE "yazserver - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -50,12 +50,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /machine:I386 /libpath:"../yazxx/release" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Release
 ProjDir=.
 TargetName=yazserver
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 
@@ -70,9 +70,10 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x406 /d "_DEBUG"
 # ADD RSC /l 0x406 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -80,12 +81,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yazxx.lib yaz.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../yazxx/debug" /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Debug
 ProjDir=.
 TargetName=yazserver
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 

diff --git a/win/yazxx.dsw b/win/yazxx.dsw
index 4ae92c5..34de816 100644 (file)
--- a/win/yazxx.dsw
+++ b/win/yazxx.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 5.00
+Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################

diff --git a/win/yazxx/yazxx.dsp b/win/yazxx/yazxx.dsp
index 92d84f4..08aac52 100644 (file)
--- a/win/yazxx/yazxx.dsp
+++ b/win/yazxx/yazxx.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="yazxx" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
@@ -22,6 +22,7 @@ CFG=yazxx - Win32 Debug
 !MESSAGE 
 
 # Begin Project
+# PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
@@ -42,8 +43,8 @@ RSC=rc.exe
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
 # ADD CPP /nologo /MT /W3 /GX /O2 /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x406 /d "NDEBUG"
 # ADD RSC /l 0x406 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -51,12 +52,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"../../../yaz/release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Release
 ProjDir=.
 TargetName=yazxx
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 
@@ -74,9 +75,9 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../include" /I "../../../yaz/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
 # ADD BASE RSC /l 0x406 /d "_DEBUG"
 # ADD RSC /l 0x406 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -84,12 +85,12 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../yaz/debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib yaz.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../yaz/lib"
 # Begin Special Build Tool
 OutDir=.\Debug
 ProjDir=.
 TargetName=yazxx
-SOURCE=$(InputPath)
+SOURCE="$(InputPath)"
 PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\..\..\bin
 # End Special Build Tool
 
@@ -139,5 +140,13 @@ SOURCE="..\..\include\yaz-socket-manager.h"
 
 SOURCE="..\..\include\yaz-socket-observer.h"
 # End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-assoc.cpp"
+# End Source File
+# Begin Source File
+
+SOURCE="..\..\src\yaz-z-query.cpp"
+# End Source File
 # End Target
 # End Project