Changeset 24020 for lang/c

Timestamp:

11/18/08 06:02:45 (5 years ago)

Author:

saturday06

Message:

foo

Location:

lang/c/AutoUpdater

Files:

• AutoUpdater.c (modified) (3 diffs)
• AutoUpdater.h (modified) (1 diff)
• Makefile.am (modified) (1 diff)
• Test.cpp (modified) (5 diffs)
• configure.ac (modified) (1 diff)

lang/c/AutoUpdater/AutoUpdater.c

@@ -14 +14 @@
   #define _T(text) text
 #elif defined(__CYGWIN__)
-  #define _tcsdup strdup
   #define _T(text) TEXT(text)
+  #if defined(UNICODE) || defined(_UNICODE)
+
+#include <wchar.h>
+static wchar_t *wcsdup(const wchar_t *s) {
+    size_t len;
+    len = wcslen(s) + 1;
+    wchar_t* buf = malloc(len * sizeof(wchar_t));
+    memcpy(buf, s, len * sizeof(wchar_t));
+    return buf;
+}
+
+    #define _tcsdup wcsdup
+  #else
+    #define _tcsdup strdup
+  #endif
 #else
   #include <tchar.h>
+  #ifdef _MSC_VER
+    #pragma comment(lib, "wininet.lib")
+  #endif
 #endif
 
@@ -472 +489 @@
 
     /*
-        Set ie = GetObject("new:{C08AFD90-F2A1-11D1-8455-00A0C91F3880}")        'IE7�ȍ~��
-        ie.Navigate "c:\\zipfile.zip"
-        Do While ie.Busy Or ie.ReadyState<>4
-            WScript.Sleep 100
-        Loop
-        ie.Document.Application.NameSpace("c:\\destination_dir\\").CopyHere ie.Document.Folder.Items()
+    Set ie = GetObject("new:{C08AFD90-F2A1-11D1-8455-00A0C91F3880}")
+    ie.Navigate "c:\\zipfile.zip"
+    Do While ie.Busy Or ie.ReadyState<>4
+        WScript.Sleep 100
+    Loop
+    ie.Document.Application.NameSpace("c:\\destination_dir\\").CopyHere ie.Document.Folder.Items()
     */
 
@@ -502 +519 @@
     // ---------------------------------------------
     {
+        OLECHAR clsid_str_pool[] = OLESTR("{C08AFD90-F2A1-11D1-8455-00A0C91F3880}");
+        LPOLESTR clsid_str = clsid_str_pool;
         CLSID clsid;
-        result = CLSIDFromString(OLESTR("{C08AFD90-F2A1-11D1-8455-00A0C91F3880}"), &clsid);
+
+        result = CLSIDFromString(clsid_str, &clsid);
         
         switch (result)

lang/c/AutoUpdater/AutoUpdater.h

@@ -8 +8 @@
 #include <stddef.h>
 
-#if (defined(WIN32) || defined(_WIN64) || defined(_WIN32_WCE)) && !defined(__CYGWIN__)
+#if (defined(WIN32) || defined(_WIN64) || defined(_WIN32_WCE) || defined(__CYGWIN__))
   //#define _WIN32_IE    0x0550 // mlang.dll
   //#define _WIN32_WINNT 0x0400

lang/c/AutoUpdater/Makefile.am

@@ -22 +22 @@
 test_CXXFLAGS = $(test_CFLAGS) -Weffc++
 test_LDFLAGS  = 
+test_LDADD    = 
 
+if WITH_OS_WINDOWS
+test_CFLAGS  += -DUNICODE
+test_LDADD   += -lole32 -loleaut32 -luuid -lwininet
+endif
 

lang/c/AutoUpdater/Test.cpp

@@ -1 @@
-
-
 #include "AutoUpdater.h"
 
@@ -10 +8 @@
 #include <string>
 
+#ifdef AU_WINDOWS
+#define _T TEXT
+#else
+#define _T(str) str 
+#endif
+
 #define CURRENT_VERSION 200
-#define SOURCE_URL "http://www.google.co.jp"
+#define SOURCE_URL _T("http://www.google.co.jp")
 
 char* get_random_data(size_t bytes) {
@@ -89 +93 @@
 }
 
-extern "C" extern void ziptest(void);
+extern "C" {
+    extern void ziptest(void);
+}
 
 int main() {
@@ -98 +104 @@
         ziptest();
     }
-
-    return 0;
 
     assert(AU_CreateSource(NULL, CURRENT_VERSION, SOURCE_URL) == AU_ERROR_INVALID_SOURCE);
@@ -111 +115 @@
     {
         AU_Source* source;
-        assert(AU_CreateSource(&source, CURRENT_VERSION, "http://www.google.co.jp:12345/foo") == AU_OK);
+        assert(AU_CreateSource(&source, CURRENT_VERSION, _T("http://www.google.co.jp:12345/foo")) == AU_OK);
         assert(AU_ReleaseSource(source) == AU_OK);
     }

lang/c/AutoUpdater/configure.ac

@@ -14 +14 @@
 AC_PROG_CXX
 
+case `uname -s` in
+    MINGW*)
+        with_os=windows
+        ;;
+    CYGWIN*)
+        with_os=windows
+        with_cygwin=yes
+        ;;
+    *)
+        with_os=unix
+        ;;
+esac
+
+AM_CONDITIONAL(WITH_CYGWIN,     test "$with_cygwin" = "yes")
+AM_CONDITIONAL(WITH_OS_WINDOWS, test "$with_os"  = "windows")
+AM_CONDITIONAL(WITH_OS_UNIX,    test "$with_os"  = "unix")
+
 # ---------------------------------------
 # Checks for libraries.