Changeset 37991

Timestamp:

07/21/10 00:17:26 (3 years ago)

Author:

saturday06

Message:

icon copying

Location:

lang/c/AutoUpdater/trunk/recipes

Files:

• Copy.c (modified) (6 diffs)
• Copy.vcproj (modified) (1 diff)
• extracter/7za/7za.h (modified) (1 diff)
• icon.txt (added)

lang/c/AutoUpdater/trunk/recipes/Copy.c

@@ -16 +16 @@
 }
 
+HANDLE LogFile = INVALID_HANDLE_VALUE;
+
 int AUI_Debug(const TCHAR* format, ...) {
     TCHAR output[1024]; /* http://msdn.microsoft.com/en-us/library/ms647550%28VS.85%29.aspx */
@@ -23 +25 @@
     va_end(ap);
     OutputDebugString(output);
-    {
-        HANDLE hStdOut = INVALID_HANDLE_VALUE;
+    if (LogFile != INVALID_HANDLE_VALUE) {
         DWORD written = 0;
-        char* mb = 0;
-        size_t mb_bytes = 0;
-        mb_bytes = (size_t)WideCharToMultiByte(CP_ACP, 0, output, -1, NULL, 0, NULL, NULL);
-        if (!mb_bytes) {
-            return -1;
-        }
-        mb = (char*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mb_bytes);
-        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, 
-            0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-        if (hStdOut == INVALID_HANDLE_VALUE) {
-            return -1;
-        }
-        SetFilePointer(hStdOut, 0, 0, FILE_END); 
-        WriteFile(hStdOut, mb, mb_bytes, &written, NULL);
-        CloseHandle(hStdOut);
+        WriteFile(LogFile, output, lstrlen(output) * sizeof(output[0]), &written, NULL);
+        FlushFileBuffers(LogFile);
     }
     return 0;
@@ -143 +127 @@
     TCHAR* clean_command = NULL;
     TCHAR* temp_path = NULL;
+    TCHAR* log_full_path = NULL;
+    PVOID log_name = NULL;
     TCHAR* command = NULL;
 
-    AUI_Debug(_T("***** UpdaterProcess start: pid=0x%x *****\n"), GetCurrentProcessId());
     {
         size_t temp_path_chars = GetTempPath(0, NULL);
@@ -156 +141 @@
     }
 
+    {
+        unsigned int pid = 0;
+        pid = GetCurrentProcessId();
+        if (FormatMessage(
+                FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                _T("AutoUpdaterLog.%1!x!.txt"),
+                0,
+                0,
+                (TCHAR*)&log_name,
+                0,
+                (va_list*)&pid)) {
+            log_full_path = AUI_PathAppend(temp_path, (TCHAR*)log_name);
+            if (log_full_path) {
+                LogFile = CreateFile(log_full_path, GENERIC_WRITE, 
+                    FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+            }
+        }
+    }
+
+    AUI_Debug(_T("***** UpdaterProcess start: pid=0x%x *****\n"), GetCurrentProcessId());
+
+
     hFile = CreateFile(_T("AutoUpdater.txt"), GENERIC_READ, 0, NULL, 
         OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 
     if (hFile == INVALID_HANDLE_VALUE) {
+        AUI_Debug(_T("config file not found\n"));
         goto clean_up;
     }
@@ -292 +300 @@
         }
 
+    if (log_name) {
+        LocalFree(log_name);
+    }
+
     if (clean_command) {
         STARTUPINFO si;
@@ -306 +318 @@
     }
 
+    if (LogFile != INVALID_HANDLE_VALUE) {
+        CloseHandle(LogFile);
+        if (complete) {
+            //DeleteFile(log_full_path);
+        }
+    }
 
     /*
+
+    if (log_full_path) {
+        HeapFree(GetProcessHeap(), 0, log_full_path);
+    }
+
     if (data) {
         HeapFree(GetProcessHeap(), 0, data);

lang/c/AutoUpdater/trunk/recipes/Copy.vcproj

@@ -207 +207 @@
                         >
                         <File
-                                RelativePath=".\Copy.ico"
-                                >
-                        </File>
-                        <File
                                 RelativePath=".\Copy.rc"
                                 >

lang/c/AutoUpdater/trunk/recipes/extracter/7za/7za.h

@@ -16 +16 @@
 
     {
+        DWORD exit_code = 0;
         STARTUPINFO si;
         PROCESS_INFORMATION pi;
-        TCHAR command[] = _T("extracter.exe x -y -oextracted archive_file");
+        TCHAR command[] = _T("extracter.exe x -y -oextracted ArchiveFile");
         memset(&si, 0, sizeof(si));
         si.cb = sizeof(si);
         memset(&pi, 0, sizeof(pi));
-        CreateProcess(context->extracter_file_path, command, NULL, NULL, FALSE, 0, NULL, context->temp_dir_path, &si, &pi);
-        WaitForSingleObject(pi.hProcess, INFINITE);
+        if (CreateProcess(context->extracter_file_path, command, 
+                NULL, NULL, FALSE, 0, NULL, 
+                context->temp_dir_path, &si, &pi)) {
+
+            WaitForSingleObject(pi.hProcess, INFINITE);
+            if (GetExitCodeProcess(pi.hProcess, &exit_code)) {
+                if (exit_code == EXIT_SUCCESS) {
+                    r = AUI_SUCCESS;
+                }
+            }
+        }
                 CloseHandle(pi.hThread);
                 CloseHandle(pi.hProcess);
     }
-    return AUI_SUCCESS;
+    return r;
 }