Changeset 37963

Timestamp:

07/19/10 16:35:46 (3 years ago)

Author:

saturday06

Message:

auto delete

Location:

lang/c/AutoUpdater/trunk

Files:

• Makefile.am (modified) (2 diffs)
• UpdaterProcess.c (modified) (8 diffs)

lang/c/AutoUpdater/trunk/Makefile.am

@@ -1 @@
-bin_PROGRAMS = test updater
+bin_PROGRAMS = test updater wtest
 
 test_SOURCES   = Test.cpp AutoUpdater.c
@@ -5 +5 @@
 
 updater_SOURCES = UpdaterProcess.c
-
+wtest_SOURCES = wtest.c

lang/c/AutoUpdater/trunk/UpdaterProcess.c

@@ -93 +93 @@
 
                 if (FILE_ATTRIBUTE_DIRECTORY & find_data.dwFileAttributes) {
-            AUI_Debug(_T("dir\n"));
+            AUI_Debug(_T("dir error\n"));
             result = result && CreateDirectory(to2, NULL) && CopyDirectory(from2, to2);
         } else if(!CopyFile(from2, to2, FALSE)) {
-            AUI_Debug(_T("file\n"));
+            AUI_Debug(_T("file error\n"));
             result = FALSE;
                 }
@@ -108 +108 @@
         FindClose(hFind);
     HeapFree(GetProcessHeap(), 0, glob);
-        return TRUE;
+        return result;
 }
 
@@ -117 +117 @@
     DWORD bytes_got = 0;
     TCHAR* data = NULL;
-    TCHAR* lines[5] = {0};
+    TCHAR* lines[5] = {NULL, NULL, NULL, NULL, NULL};
     DWORD pid = 0;
     int complete = 0;
+    TCHAR* clean_command = NULL;
+    TCHAR* temp_path = NULL;
+    TCHAR* command = NULL;
 
     AUI_Debug(_T("***** UpdaterProcess start: pid=0x%x *****\n"), GetCurrentProcessId());
+    {
+        size_t temp_path_chars = GetTempPath(0, NULL);
+        temp_path = (TCHAR*)HeapAlloc(GetProcessHeap(), 
+            HEAP_ZERO_MEMORY, (temp_path_chars * sizeof(TCHAR)));
+        if (!temp_path) {
+            goto clean_up;
+        }
+        GetTempPath(temp_path_chars, temp_path);
+    }
 
     hFile = CreateFile(_T("updater.txt"), GENERIC_READ, 0, NULL, 
@@ -131 +143 @@
 
     bytes = GetFileSize(hFile, NULL);
-    data = (TCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bytes + sizeof(TCHAR));
+    data = (TCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bytes + (/* null terminate */ sizeof(TCHAR)));
     if (!data) {
         goto clean_up;
@@ -177 +189 @@
     }
 
+
+    {   
+        TCHAR comspec[MAX_PATH];
+        TCHAR rd_command[] = _T("\"%s\" /c rd /s /q \"%s\"");
+        size_t clean_command_len = 0;
+        if (GetEnvironmentVariable(_T("COMSPEC"), comspec, sizeof(comspec) / sizeof(comspec[0])) == 0) {
+            goto clean_up;
+        }
+
+        clean_command_len = lstrlen(comspec) + lstrlen(rd_command) + lstrlen(lines[4]);
+        clean_command = (TCHAR*)HeapAlloc(GetProcessHeap(), 
+            HEAP_ZERO_MEMORY, clean_command_len * sizeof(TCHAR));
+        if (!clean_command) {
+            goto clean_up;
+        }
+        wsprintf(clean_command, rd_command, comspec, lines[4]); 
+    }
+
     AUI_Debug(L"waiting\n");
     hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE, pid);
@@ -190 +220 @@
 
 clean_up:
-    {
-        STARTUPINFO si;
-        PROCESS_INFORMATION pi;
-        DWORD e = 0;
-        TCHAR* command = NULL;
+    if (lines[3] && lines[4]) {
         TCHAR* arg = NULL;
-        TCHAR complete_arg[] = _T(" UPDATE_COMPLETE");
-        TCHAR error_arg[] = _T(" UPDATE_ERROR");
+        TCHAR command_format[] = _T("\"%s\" %s");
+        TCHAR complete_arg[] = _T("UPDATE_COMPLETE");
+        TCHAR error_arg[] = _T("UPDATE_ERROR");
         int command_len = 0;
         SetLastError(0);
@@ -205 +232 @@
             arg = error_arg;
         }
-        command_len = lstrlen(lines[3]);
-        command_len += 2; /* double quotation */
+        command_len = lstrlen(command_format);
+        command_len += lstrlen(lines[3]);
         command_len += lstrlen(arg);
 
         command = (TCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (unsigned)command_len * sizeof(TCHAR));
-        lstrcat(command, _T("\""));
-        lstrcat(command, lines[3]);
-        lstrcat(command, _T("\""));
-        lstrcat(command, arg);
-
+        if (command) {
+            wsprintf(command, command_format, lines[3], arg);
+        }
+    }
+
+    if (command && lines[4]) {
+        STARTUPINFO si;
+        PROCESS_INFORMATION pi;
+        DWORD e;
         memset(&si, 0, sizeof(si));
         si.cb = sizeof(si);
@@ -223 +254 @@
         AUI_Debug(_T("CreateProcess(): command=%s, cd=%s, error=%d\n"), command, lines[4], e);
 
+        CloseHandle(pi.hThread);
+        CloseHandle(pi.hProcess);
+    }
+
+    CloseHandle(hFile);
+    CloseHandle(hProcess);
+
+    if (clean_command) {
+        STARTUPINFO si;
+        PROCESS_INFORMATION pi;
+        memset(&si, 0, sizeof(si));
+        si.cb = sizeof(si);
+        si.dwFlags = STARTF_USESHOWWINDOW; 
+        si.wShowWindow = SW_HIDE; 
+        memset(&pi, 0, sizeof(pi));
+        CreateProcess(NULL, clean_command, NULL, NULL, FALSE, 0, NULL, temp_path, &si, &pi);
+        /*
             CloseHandle(pi.hThread);
             CloseHandle(pi.hProcess);
-
-        /* HeapFree(GetProcessHeap(), 0, command); */
-    }
-
-    CloseHandle(hFile);
-    CloseHandle(hProcess);
-
+        */
+    }
+
+    /*
     if (data) {
         HeapFree(GetProcessHeap(), 0, data);
     }
-
-/*
-    {
-        memset(&si, 0, sizeof(si));
-        si.cb = sizeof(si);
-        memset(&pi, 0, sizeof(pi));
-
-        CreateProcess(NULL, command, NULL, NULL, FALSE, 0, NULL, lines[4], &si, &pi);
-        e = GetLastError();
-        AUI_Debug(_T("CreateProcess(): command=%s, cd=%s, error=%d\n"), command, lines[4], e);
-
-            CloseHandle(pi.hThread);
-            CloseHandle(pi.hProcess);
-
-    }
-*/
+    if (command) {
+        HeapFree(GetProcessHeap(), 0, command);
+    }
+    if (clean_command) {
+        HeapFree(GetProcessHeap(), 0, clean_command);
+    }
+    if (temp_path) {
+        HeapFree(GetProcessHeap(), 0, clean_cd);
+    }
+    */    
 
     return 0;