Changeset 37967

Timestamp:

07/19/10 18:20:53 (3 years ago)

Author:

saturday06

Message:

moudamedaimiwakaran

Location:

lang/c/AutoUpdater/trunk

Files:

• AutoUpdater.c (modified) (8 diffs)
• UpdaterProcess.c (modified) (3 diffs)
• configure.ac (modified) (3 diffs)

lang/c/AutoUpdater/trunk/AutoUpdater.c

@@ -2 +2 @@
 #include "AutoUpdater.h"
 
+#include <winuser.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -19 +20 @@
 #pragma comment(lib, "shlwapi.lib")
 #if defined(_CRT_NONSTDC_DEPRECATE) && !defined(_CRT_NONSTDC_NO_WARNINGS) && !defined(_POSIX_)
-#define wcsdup _wcsdup
-#endif
-#endif
+/* #define wcsdup _wcsdup */
+#endif
+#endif
+
+#ifdef strdup
+#undef strdup
+#endif
+#ifdef _strdup
+#undef _strdup
+#endif
+#ifdef wcsdup
+#undef wcsdup
+#endif
+#ifdef _wcsdup
+#undef _wcsdup
+#endif
+
+#define strdup AUI_strdup
+#define wcsdup AUI_wcsdup
+#define _strdup AUI_strdup
+#define _wcsdup AUI_wcsdup
 
 #ifdef __CYGWIN__
@@ -28 +47 @@
 #  define GUID_NULL AUI_GUID_NULL
 #  define IID_IDispatch AUI_IID_IDispatch
-#  define strdup AUI_strdup
-#  define wcsdup AUI_wcsdup
 
 const GUID AUI_GUID_NULL = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0 }};
@@ -102 +119 @@
         va_start(ap,format);
 #if defined(UNICODE) || defined(_UNICODE)
-        vswprintf(buffer, count, format, ap);
+/*        vswprintf(buffer, count, format, ap);*/
+        vwsprintf(buffer, format, ap);
 #elif __STDC_VERSION__ >= 199901L
         vsnprintf(buffer, count, format, ap);
@@ -159 +177 @@
 } AUI_Context;
 
-const AU_Result AUI_SUCCESS = {1, 0, 0};
-const AU_Result AUI_IO_PENDING = {0, 1, 0};
+const AU_Result AUI_SUCCESS = {1, 0, AU_NO_ERROR};
+const AU_Result AUI_IO_PENDING = {0, 1, AU_NO_ERROR};
 
 AU_Result E(AU_Error error) {
-        AU_Result result = {0, 0, 0};
+        AU_Result result;
+    result.success = 0;
+    result.pending = 0;
         result.error = error;
     return result;
 }
+
 
 int AUI_IsBadReadPointer(const void* pointer, size_t bytes) {
@@ -808 +829 @@
         OLECHAR xpath[500];
         memset(xpath, 0, sizeof(xpath));
-        swprintf(xpath, sizeof(xpath) / sizeof(xpath[0]) /* MSVCRT */ -1,
+        wsprintf(xpath, /* TODO */
             OLESTR("/releases/release[not(@debug) or @debug <= %d][")
             OLESTR("not(@revision <= preceding-sibling::release[not(@debug) or @debug <= %d]/@revision) and ")
@@ -901 +922 @@
 }
 
+extern const size_t AUI_UPDATER_BYTES;
+extern const char AUI_UPDATER_DATA[];
 AU_Result AUI_ExtractBy7za(AUI_Context* context);
 
@@ -933 +956 @@
 
     {
-        extern const size_t AUI_UPDATER_BYTES;
-        extern const char AUI_UPDATER_DATA[];
         AU_Result r;
         FILE* f = NULL;

lang/c/AutoUpdater/trunk/UpdaterProcess.c

@@ -2 +2 @@
 
 #define _T(x) TEXT(x)
+
+int AUI_Debug(const TCHAR* format, ...);
+TCHAR* AUI_PathAppend(const TCHAR* base, const TCHAR* append);
 
 int AUI_Debug(const TCHAR* format, ...) {
@@ -15 +18 @@
         char* mb = 0;
         size_t mb_bytes = 0;
-        mb_bytes = WideCharToMultiByte(CP_ACP, 0, output, -1, NULL, 0, NULL, NULL);
+        mb_bytes = (size_t)WideCharToMultiByte(CP_ACP, 0, output, -1, NULL, 0, NULL, NULL);
+        if (!mb_bytes) {
+            return -1;
+        }
         mb = (char*)calloc(mb_bytes, 1);
-        WideCharToMultiByte(CP_ACP, 0, output, -1, mb, mb_bytes, NULL, NULL);
-
+        if (!WideCharToMultiByte(CP_ACP, 0, output, -1, mb, (int)mb_bytes, NULL, NULL)) {
+            return -1;
+        }
         /* hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); */
         hStdOut = CreateFile(_T("c:\\temp\\up.txt"), GENERIC_WRITE, 
@@ -34 +41 @@
 TCHAR* AUI_PathAppend(const TCHAR* base, const TCHAR* append) {
     TCHAR* result = NULL;
-    size_t result_len = 0;
+    int result_len = 0;
     
     result_len = lstrlen(base) + 1 + lstrlen(append) + 1;

lang/c/AutoUpdater/trunk/configure.ac

@@ -101 +101 @@
   -Wc++-compat
   -Wbad-function-cast  -Wmissing-declarations 
-  -Wmissing-parameter-type  -Wmissing-prototypes  -Wnested-externs 
-  -Wold-style-declaration  -Wold-style-definition 
-  -Wstrict-prototypes  -Wtraditional  -Wtraditional-conversion 
+  -Wmissing-parameter-type -Wnested-externs 
+  -Wstrict-prototypes 
   -Wdeclaration-after-statement -Wpointer-sign
 ])
+
+#-Wmissing-prototypes 
+#-Wtraditional  -Wtraditional-conversion 
+#-Wold-style-declaration  -Wold-style-definition 
 
 CXX_OPTIONS([
@@ -126 +129 @@
 COMMON_OPTIONS([
   -pedantic
-  -Waggregate-return 
   -Wextra  -Wall  -Waddress  -Warray-bounds 
   -Wcast-align  -Wcast-qual  
@@ -161 +163 @@
 ])
 # -Wsystem-headers 
+# -Waggregate-return 
 
 AC_CONFIG_FILES([Makefile])