Changeset 680 for trunk/zoo-project/zoo-services

Timestamp:

Jun 24, 2015, 1:58:17 AM (9 years ago)

Author:

djay

Message:

Various fixes for Windows support: generate uuid using UuidCreate?, pass usid to the created process, call TerminateProcess? on dismiss request.

Location:

trunk/zoo-project/zoo-services/utils/status

Files:

• makefile.vc (modified) (1 diff)
• service.c (modified) (1 diff)

trunk/zoo-project/zoo-services/utils/status/makefile.vc

@@ -2 +2 @@
 !INCLUDE $(ZOOK_DIR)/nmake.opt
 
-FILES=$(ZOOK_DIR)/service_internal.obj $(ZOOK_DIR)/ulinet.obj
-!IFDEF JS_DIR
-FILES=$(FILES) $(ZOOK_DIR)$(JS_FILE)
-!ENDIF
-!IFDEF JDK_DIR
-FILES=$(FILES) $(ZOOK_DIR)$(JAVA_FILE)
-!ENDIF
-!IFDEF PY_DIR
-FILES=$(FILES) $(ZOOK_DIR)$(PY_FILE)
-!ENDIF
-!IFDEF MS_DIR
-FILES=$(FILES) $(ZOOK_DIR)$(MS_FILE)
-!ENDIF
-
 cgi-env/wps_status.zo: service.c
         $(CPP) /D_CRT_NONSTDC_NO_DEPRECATE -DWIN32 -DZOO_SERVICE $(CFLAGS) /c service.c
-        link /dll /out:cgi-env/wps_status.zo $(FILES) ./service.obj $(LDFLAGS) $(XSLT_DIR)\win32\bin.msvc\libxslt.lib /FORCE:MULTIPLE
+        link /dll /out:cgi-env/wps_status.zo $(FILES) ./service.obj $(LDFLAGS) $(XSLT_DIR)\win32\bin.msvc\libxslt.lib $(ZOOK_DIR)\libzoo_service.lib /FORCE:MULTIPLE
 
 clean:

trunk/zoo-project/zoo-services/utils/status/service.c

@@ -51 +51 @@
    * return the final ExecuteResponse stored on the Server file system.
    */
-#ifdef WIN32
-  __declspec(dllexport)
-#endif
-  int GetStatus(maps*& conf,maps*& inputs,maps*& outputs){
+  ZOO_DLL_EXPORT int GetStatus(maps*& conf,maps*& inputs,maps*& outputs){
     const char *params[4 + 1];
     int xmlLoadExtDtdDefaultValue;