Changeset 37930 for lang/c/AutoUpdater/trunk/AutoUpdater.c

Timestamp:

07/14/10 22:44:27 (3 years ago)

Author:

saturday06

Message:

a

Files:

• lang/c/AutoUpdater/trunk/AutoUpdater.c (modified) (16 diffs)

lang/c/AutoUpdater/trunk/AutoUpdater.c

@@ -21 +21 @@
 #define wcsdup(x) _wcsdup(x)
 #endif
+#endif
+
+#ifdef __CYGWIN__
+
+#  define _T(x) TEXT(x)
+#  define GUID_NULL AUI_GUID_NULL
+#  define IID_IDispatch AUI_IID_IDispatch
+
+const GUID AUI_GUID_NULL = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0 }};
+const GUID AUI_IID_IDispatch = {0x00020400, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}};
+
+#  if defined(UNICODE) || defined(_UNICODE)
+#    include <wchar.h>
+#    define _tcslen wcslen
+#    define _tcsdup wcsdup
+#    define _tcscpy wcscpy
+#    define _tcscat wcscat
+#    define _tfopen(x, y) (NULL)
+#    define _vstprintf vswprintf
+#  else
+#    define _tcslen strlen
+#    define _tcsdup AUI_strdup
+#    define _tcscpy strcpy
+#    define _tcscat strcat
+#    define _tfopen fopen
+#    define _vstprintf vsprintf
+#  endif
+
+#endif
+
+#if ! __STDC_WANT_SECURE_LIB__
+#define _tfopen_s(x, y, z) {*x = _tfopen(y, z);}
+#define _tcscpy_s(x, y, z) _tcscpy(x, z)
+#define _tcscat_s(x, y, z) _tcscat(x, z)
 #endif
 
@@ -54 +88 @@
 #if __STDC_WANT_SECURE_LIB__
     result = _vstprintf_s(buffer, count, format, ap);
+#elif defined(UNICODE) || defined(_UNICODE)
+    result = vswprintf(buffer, count - 1, format, ap);
 #else
     if (count == 0) {
@@ -62 +98 @@
     }
     memset(buffer, 0, count * sizeof(TCHAR));
-#if __CYGWIN__
-    result = _vstprintf(buffer, format, ap);
-#else
-    result = _vsntprintf(buffer, count - 1, format, ap);
-#endif
+    result = vsnprintf(buffer, format, ap);
 #endif
     va_end(ap); 
     return result;
 }
-
-
-#ifdef __CYGWIN__
-
-#  define _T(x) TEXT(x)
-#  define GUID_NULL AUI_GUID_NULL
-#  define IID_IDispatch AUI_IID_IDispatch
-
-const GUID AUI_GUID_NULL = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
-const GUID AUI_IID_IDispatch = { 0x00020400, 0, 0, { '\xc0', 0, 0, 0, 0, 0, 0, '\x46'} };
-
-#  if defined(UNICODE) || defined(_UNICODE)
-#    include <wchar.h>
-#    define _tcslen wcslen
-#    define _tcsdup wcsdup
-#    define _tcscpy wcscpy
-#    define _tcscat wcscat
-#    define _tfopen fopen
-#    define _vstprintf vswprintf
-#  else
-#    define _tcslen strlen
-#    define _tcsdup AUI_strdup
-#    define _tcscpy strcpy
-#    define _tcscat strcat
-#    define _tfopen fopen
-#    define _vstprintf vsprintf
-#  endif
-
-#endif
-
-#if ! __STDC_WANT_SECURE_LIB__
-#define _tfopen_s(x, y, z) {*x = _tfopen(y, z);}
-#define _tcscpy_s(x, y, z) _tcscpy(x, z)
-#define _tcscat_s(x, y, z) _tcscat(x, z)
-#endif
-
 
 typedef struct AUI_DownloadContext_ {
@@ -141 +137 @@
 } AUI_Context;
 
-const static AU_Result AUI_SUCCESS = {1, 0, 0};
-const static AU_Result AUI_IO_PENDING = {0, 1, 0};
+static const AU_Result AUI_SUCCESS = {1, 0, 0};
+static const AU_Result AUI_IO_PENDING = {0, 1, 0};
 
 static AU_Result E(AU_Error error) {
@@ -698 +694 @@
     IDispatch* descriptionNode = NULL;
 
-    // --------------------------------------------------------------
-    // CoInitialize
-    // --------------------------------------------------------------
     {
         result = CoInitialize(NULL);
@@ -708 +701 @@
             break;
         case S_FALSE:
-            // CoInitialize: The COM library is already initialized on this thread
+            /* CoInitialize: The COM library is already initialized on this thread */
             break;
         case RPC_E_CHANGED_MODE:
-            // CoInitialize: A previous call to CoInitializeEx specified the concurrency model for this thread as multithread apartment (MTA). If running Windows 2000, this could also mean that a change from neutral-threaded apartment to single-threaded apartment occurred.
-            break;
-        }
-    }
-
-    // --------------------------------------------------------------
-    // var Microsoft_XMLDOM = new ActiveXObject("Microsoft.XMLDOM")
-    // --------------------------------------------------------------
+            /* CoInitialize: A previous call to CoInitializeEx specified the concurrency model for this thread as multithread apartment (MTA). If running Windows 2000, this could also mean that a change from neutral-threaded apartment to single-threaded apartment occurred. */
+            break;
+        }
+    }
+
+    /* var Microsoft_XMLDOM = new ActiveXObject("Microsoft.XMLDOM") */
     {
         OLECHAR clsid_str[] = OLESTR("Microsoft.XMLDOM");
@@ -728 +719 @@
         {
         case NOERROR:
-            //The CLSID was obtained successfully.
+            /* The CLSID was obtained successfully. */
             break;
         case E_INVALIDARG:
@@ -734 +725 @@
             break;
         case CO_E_CLASSSTRING:
-            //The class string was improperly formatted.
+            /* The class string was improperly formatted. */
             return;
             break;
         case REGDB_E_CLASSNOTREG:
-            //The CLSID corresponding to the class string was not found in the registry.
+            /* The CLSID corresponding to the class string was not found in the registry. */
             return;
             break;
         case REGDB_E_READREGDB:
-            //The registry could not be opened for reading.
+            /* The registry could not be opened for reading. */
             return;
             break;
         default:
-            //
             return;
             break;
@@ -762 +752 @@
             break;
         case REGDB_E_CLASSNOTREG:
-            //Debug("");
             return;
             break;
         case CLASS_E_NOAGGREGATION:
-            //Debug("This class cannot be created as part of an aggregate");
+            /* This class cannot be created as part of an aggregate */
             return;
             break;
         case E_NOINTERFACE:
-            //Debug("The specified class does not implement the requested interface, or the controlling IUnknown does not expose the requested interface");
+            /* The specified class does not implement the requested interface, or the controlling IUnknown does not expose the requested interface */
             return;
             break;
         default:
-            //Debug("CoCreateInstance unknown error: " << result);
+            /* unknown error: */
             return;
             break;
@@ -781 +770 @@
         if (Microsoft_XMLDOM == NULL)
         {
-            //Debug("pDispatch is NULL");
-        }
-    }
-    // --------------------------------------------------------------
-    // Microsoft_XMLDOM.async = false
-    // --------------------------------------------------------------
-    {
+            return;
+        }
+    }
+
+    
+    { /* Microsoft_XMLDOM.async = false */
         args[0].vt = VT_BOOL;
         args[0].boolVal = VARIANT_FALSE;
@@ -793 +781 @@
     }
 
-    // --------------------------------------------------------------
-    // Microsoft_XMLDOM.load("file.xml")
-    // --------------------------------------------------------------
-    {
+    
+    { /* Microsoft_XMLDOM.load("file.xml") */
         args[0].vt = VT_BSTR;
-        //args[0].bstrVal = SysAllocString(OLESTR("c:/Documents and Settings/saturday06/My Documents/My Dropbox/jsxml.xml"));
+        /* args[0].bstrVal = SysAllocString(OLESTR("c:/Documents and Settings/saturday06/My Documents/My Dropbox/jsxml.xml")); */
                 args[0].bstrVal = SysAllocString(OLESTR("D:/Documents/My Dropbox/jsxml.xml"));
         result = AUI_AutoWrap(DISPATCH_METHOD, &returnValue, Microsoft_XMLDOM, OLESTR("load"), 1, args);
@@ -810 +796 @@
     }
 
-    // --------------------------------------------------------------
-    // Microsoft_XMLDOM.setProperty("SelectionLanguage", "XPath");
-    // --------------------------------------------------------------
-    {
+    { /* Microsoft_XMLDOM.setProperty("SelectionLanguage", "XPath"); */
         args[0].vt = VT_BSTR;
         args[0].bstrVal = SysAllocString(OLESTR("SelectionLanguage"));
@@ -829 +812 @@
         }
     }
-
-    // --------------------------------------------------------------
-    // var documentElement = Microsoft_XMLDOM.documentElement
-    // --------------------------------------------------------------
-    {
+    
+    { /* var documentElement = Microsoft_XMLDOM.documentElement */
         result = AUI_AutoWrap(DISPATCH_PROPERTYGET, &returnValue, Microsoft_XMLDOM, OLESTR("documentElement"), 0, NULL);
         if (FAILED(result)) {
@@ -845 +825 @@
     }
 
-    // --------------------------------------------------------------
-    // var releaseNode = documentElement.selectSingleNode("...");
-    // --------------------------------------------------------------
-    {
+    { /* var releaseNode = documentElement.selectSingleNode("..."); */
 #define DEBUG_CONDITION OLESTR("not(@debug) or @debug < 1")
         OLECHAR cond[] = 
@@ -872 +849 @@
         VariantClear(&returnValue);
     }
-
-    // --------------------------------------------------------------
-    // var urlNode = releaseNode.selectSingleNode("url");
-    // --------------------------------------------------------------
-    {
+    
+    { /* var urlNode = releaseNode.selectSingleNode("url"); */
         args[0].vt = VT_BSTR;
         args[0].bstrVal = SysAllocString(OLESTR("url"));
@@ -894 +868 @@
     }
 
-    // --------------------------------------------------------------
-    // urlNode.text;
-    // --------------------------------------------------------------
-    {
+    { /* urlNode.text; */
         result = AUI_AutoWrap(DISPATCH_PROPERTYGET, &returnValue, urlNode, OLESTR("text"), 0, NULL);
         if (FAILED(result)) {