Changeset 38241

Timestamp:

08/10/10 11:09:46 (3 years ago)

Author:

saturday06

Message:

asdfaf

Location:

lang/c/NetworkUpdater/trunk/Build

Files:

• Common.h (modified) (2 diffs)
• Copy.c (modified) (13 diffs)
• MSW.c (modified) (8 diffs)
• Test.cpp (modified) (4 diffs)

lang/c/NetworkUpdater/trunk/Build/Common.h

@@ -76 +76 @@
     int pending;
 #ifdef NUI_WINDOWS
+    TCHAR* system_temp_dir_path;
     HANDLE extracter_process;
 #else
@@ -100 +101 @@
 void NUI_Unlock(NUI_SharedData* object);
 NU_Error NUI_Extract(NUI_ThreadData* object);
-NU_Error NUI_CreateTemporaryDirectory(TCHAR** result_dir);
+NU_Error NUI_CreateTemporaryDirectory(NUI_ThreadData* object);
 NU_Error NUI_Download(NUI_DownloadContext* object);
 NU_Error NUI_CreateDownloadContext(NUI_DownloadContext** context_output, const TCHAR* url, const TCHAR* file_path);

lang/c/NetworkUpdater/trunk/Build/Copy.c

@@ -4 +4 @@
 
 #include <windows.h>
+#ifndef __CYGWIN__
 #include <tchar.h>
+#else
+#define _T(x) TEXT(x)
+#endif
 #include <commctrl.h>
 
@@ -77 +81 @@
 }
 
+void NUI_PathRemoveFileSpec(TCHAR* path) {
+    size_t len = 0;
+    len = lstrlen(path);
+    for (; len != 0; --len) {
+        TCHAR c = path[len];
+        path[len] = 0;
+        if (c == _T('\\') || c == _T('/')) {
+            break;
+        }
+    }
+}
+
 BOOL CopyDirectory(const TCHAR* from, const TCHAR* to) {
     TCHAR* glob = NULL;
@@ -140 +156 @@
     TCHAR* update_from = NULL;
     TCHAR* update_to = NULL;
-    TCHAR* clean_after = NULL;
     TCHAR* pid_string = NULL;
     DWORD pid = 0;
     int complete = 0;
     TCHAR* clean_command = NULL;
-    TCHAR* temp_path = NULL;
-    TCHAR* log_full_path = NULL;
     PVOID log_name = NULL;
     TCHAR* command = NULL;
+    TCHAR* system_temp_path = NULL;
+    TCHAR* my_dir = NULL;
 
     InitCommonControls();
-
-    {
-        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);
-    }
 
     {
@@ -167 +172 @@
         if (FormatMessage(
                 FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
-                _T("NetworkUpdaterLog.%1!x!.txt"),
-                0,
-                0,
-                (TCHAR*)&log_name,
-                0,
-                (va_list*)&arg)) {
-            log_full_path = NUI_PathAppend(temp_path, (TCHAR*)log_name);
-            if (log_full_path) {
-                LogFile = CreateFile(log_full_path, GENERIC_WRITE, 
+                _T("NetworkUpdaterLog.%1!x!.txt"), 0, 0, (TCHAR*)&log_name, 0, (va_list*)&arg)) {
+            if (log_name) {
+                LogFile = CreateFile((const TCHAR*)log_name, GENERIC_WRITE, 
                     FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
             }
@@ -183 +182 @@
     NUI_Debug(_T("***** UpdaterProcess start: pid=0x%x *****\n"), GetCurrentProcessId());
 
+    {
+        size_t system_temp_path_chars = GetCurrentDirectory(0, NULL);
+        system_temp_path = (TCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, system_temp_path_chars * sizeof(TCHAR));
+        if (!system_temp_path) {
+            NUI_Debug(_T("calloc() system_temp_path failed\n"));
+            goto clean_up;
+        }
+        if (!GetCurrentDirectory(system_temp_path_chars, system_temp_path)) {
+            NUI_Debug(_T("GetCurrentDirectory()\n"));
+            goto clean_up;
+        }
+        NUI_Debug(_T("system_temp_path: %s\n"), system_temp_path);
+    }
+
+    {
+        /* http://msdn.microsoft.com/ja-jp/library/cc429127.aspx */
+        size_t size = 33000;
+        my_dir = (TCHAR*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size * sizeof(TCHAR));
+        if (!my_dir) {
+            NUI_Debug(_T("calloc() GetModuleFileName failed\n"));
+            goto clean_up;
+        }
+        if (!GetModuleFileName(GetModuleHandle(NULL), my_dir, size - 1)) {
+            NUI_Debug(_T("GetModuleFileName() failed\n"));
+            goto clean_up;
+        }
+        NUI_Debug(_T("GetModuleFileName(): %s\n"), my_dir);
+        NUI_PathRemoveFileSpec(my_dir);        
+        NUI_Debug(_T("NUI_PathRemoveFileSpec(): %s\n"), my_dir);
+        if (!SetCurrentDirectory(my_dir)) {
+            NUI_Debug(_T("SetCurrentDirectory() failed\n"));
+        }
+    }
 
     hFile = CreateFile(_T("NetworkUpdater.txt"), GENERIC_READ, 0, NULL, 
@@ -203 +235 @@
 
     {
-        TCHAR* lines[6];
+        TCHAR* lines[5];
         size_t i = 0;
         size_t data_count = (bytes / sizeof(data[0]));
@@ -228 +260 @@
         new_program    = lines[3];
         new_program_cd = lines[4];
-        clean_after    = lines[5];
     }
 
     NUI_Debug(_T("pid=%s, from=%s, to=%s\nnewproc=%s, cd=%s clean=%s\n"), 
-        pid_string, update_from, update_to, new_program, new_program_cd, clean_after);
+        pid_string, update_from, update_to, new_program, new_program_cd, my_dir);
     
     if (pid_string) {
@@ -246 +277 @@
     }
 
-    if (clean_after) {
+    if (my_dir) {
         TCHAR comspec[MAX_PATH];
         TCHAR rd_command[] = _T("\"%s\" /c rd /s /q \"%s\"");
@@ -254 +285 @@
         }
 
-        clean_command_len = lstrlen(comspec) + lstrlen(rd_command) + lstrlen(clean_after);
+        clean_command_len = lstrlen(comspec) + lstrlen(rd_command) + lstrlen(my_dir);
         clean_command = (TCHAR*)HeapAlloc(GetProcessHeap(), 
             HEAP_ZERO_MEMORY, clean_command_len * sizeof(TCHAR));
@@ -260 +291 @@
             goto clean_up;
         }
-        wsprintf(clean_command, rd_command, comspec, clean_after); 
+        wsprintf(clean_command, rd_command, comspec, my_dir); 
     }
 
@@ -275 +306 @@
     }
 
+    if (system_temp_path) {
+        SetCurrentDirectory(system_temp_path); /* XXX clean */
+    }
 clean_up:
     if (new_program && new_program_cd) {
@@ -334 +368 @@
         si.wShowWindow = SW_HIDE; 
         memset(&pi, 0, sizeof(pi));
-        NUI_Debug(_T("CreateProcess(del): command=%s, cd=%s\n"), clean_command, temp_path);
-        CreateProcess(NULL, clean_command, NULL, NULL, FALSE, 0, NULL, temp_path, &si, &pi);
+        NUI_Debug(_T("CreateProcess(del): command=%s, cd=%s\n"), clean_command, system_temp_path);
+        CreateProcess(NULL, clean_command, NULL, NULL, FALSE, 0, NULL, system_temp_path, &si, &pi);
             CloseHandle(pi.hThread);
             CloseHandle(pi.hProcess);
@@ -343 +377 @@
         CloseHandle(LogFile);
         if (complete) {
-            //DeleteFile(log_full_path);
+            /* DeleteFile(log_full_path); */
         }
     }

lang/c/NetworkUpdater/trunk/Build/MSW.c

@@ -191 +191 @@
 }
 
-NU_Error NUI_CreateTemporaryDirectory(TCHAR** result_dir) {
+NU_Error NUI_CreateTemporaryDirectory(NUI_ThreadData* object) {
     NU_Error error = NU_NO_ERROR;
     TCHAR* dir = NULL;
-    TCHAR* system_temp_path = NULL;
     TCHAR* temp_path = NULL;
     unsigned int retry = 0;
-
-    *result_dir = NULL;
 
 #ifdef __CYGWIN__
@@ -209 +206 @@
             goto clean_up;
         }
-        system_temp_path = (TCHAR*)calloc((size_t)bytes, 1);
+        object->system_temp_dir_path = (TCHAR*)calloc((size_t)bytes, 1);
         if (cygwin_conv_path(NUI_CCP_POSIX_TO_WIN,
-                             tmp, system_temp_path, (size_t)bytes)) {
+                             tmp, object->system_temp_dir_path, (size_t)bytes)) {
             error = NU_ERROR_BAD_ALLOC;
             goto clean_up;
@@ -219 +216 @@
     {
         size_t system_temp_path_chars = GetTempPath(0, NULL);
-        system_temp_path = (TCHAR*)calloc(system_temp_path_chars * sizeof(TCHAR), 1);
-        if (!system_temp_path) {
+        object->system_temp_dir_path = (TCHAR*)calloc(system_temp_path_chars * sizeof(TCHAR), 1);
+        if (!object->system_temp_dir_path) {
             error = NU_ERROR_BAD_ALLOC;
             goto clean_up;
         }
-        GetTempPath(system_temp_path_chars, system_temp_path);
+        GetTempPath(system_temp_path_chars, object->system_temp_dir_path);
     }
 #endif
@@ -246 +243 @@
         }
 
-        temp_path = NUI_PathAppendDup(system_temp_path, dir);
+        temp_path = NUI_PathAppendDup(object->system_temp_dir_path, dir);
         if (!temp_path) {
             error = NU_ERROR_BAD_ALLOC;
@@ -262 +259 @@
     }
 
-    *result_dir = temp_path;
+    object->temp_dir_path = temp_path;
     error = NU_NO_ERROR;
 clean_up:
-    if (system_temp_path) {
-        free(system_temp_path);
-    }
     if (dir) {
         free(dir);
@@ -1302 +1296 @@
             _T("%4!s!\r\n")
             _T("%5!s!\r\n")
-            _T("%6!s!\r\n"),        
+            ,        
             (unsigned int)GetCurrentProcessId(),
             object->extracted_dir_path,
             target,
             myname,
-            cd,
-            object->temp_dir_path);
+            cd);
     if (!allocated) {
         error = NU_ERROR_BAD_ALLOC;
@@ -1334 +1327 @@
         si.cb = sizeof(si);
         memset(&pi, 0, sizeof(pi));
-        CreateProcess(object->updater_file_path, NULL, NULL, NULL, FALSE, 0, NULL, object->temp_dir_path, &si, &pi);
+        CreateProcess(object->updater_file_path, NULL, NULL, NULL, FALSE, 0, NULL, object->system_temp_dir_path, &si, &pi);
         CloseHandle(pi.hThread);
         CloseHandle(pi.hProcess);
@@ -1406 +1399 @@
     }
 
-    error = NUI_CreateTemporaryDirectory(&data->temp_dir_path);
+    error = NUI_CreateTemporaryDirectory(data);
     if (error) {
         goto clean_up;

lang/c/NetworkUpdater/trunk/Build/Test.cpp

@@ -5 +5 @@
 #include <cassert>
 #include <cstdio>
-#include <unistd.h>
+
+#ifdef __unix__
+#  include <unistd.h>
+#else
+void sleep(int s) {
+    Sleep(s * 1000);
+}
+#endif
 
 #ifdef TEXT
@@ -43 +50 @@
         assert(NU_Destroy(&object2));
                 assert(!NU_StartSearch(&object1));
-                assert(object1.error == NU_ERROR_INVALID_OPTION);
+                assert(object1.error == NU_ERROR_INVALID_UPDATER);
     }
 
@@ -53 +60 @@
         assert(NU_Destroy(&object2));
                 assert(!NU_StartSearch(&object1));
-                assert(object1.error == NU_ERROR_INVALID_OPTION);
+                assert(object1.error == NU_ERROR_INVALID_UPDATER);
                 assert(!NU_StartSearch(&object2));
-                assert(object2.error == NU_ERROR_INVALID_OPTION);
+                assert(object2.error == NU_ERROR_INVALID_UPDATER);
     }
 
@@ -128 +135 @@
         assert(s->error == NU_ERROR_INVALID_UPDATER);
         free(s);
+    }
+
+    {
+        NU_NetworkUpdater object;
+        NU_Option valid_option;
+        memset(&valid_option, 0, sizeof(valid_option));
+        valid_option.url = CONTEXT_URL;
+        assert(NU_Create(&object, &valid_option));
+        assert(NU_Destroy(&object));
+    }
+
+    {
+        NU_NetworkUpdater o1, o2, o3;
+        NU_Option valid_option;
+        memset(&valid_option, 0, sizeof(valid_option));
+        valid_option.url = CONTEXT_URL;
+        assert(NU_Create(&o1, &valid_option));
+        assert(NU_Create(&o2, &valid_option));
+        assert(NU_Destroy(&o1));
+        assert(NU_Create(&o3, &valid_option));
+        assert(NU_Destroy(&o3));
+        assert(NU_Destroy(&o2));
+    }
+
+    {
+        NU_NetworkUpdater *o1, *o2, *o3;
+        NU_Option valid_option;
+        o1 = (NU_NetworkUpdater*)calloc(sizeof(NU_NetworkUpdater), 1);
+        o2 = (NU_NetworkUpdater*)calloc(sizeof(NU_NetworkUpdater), 1);
+        o3 = (NU_NetworkUpdater*)calloc(sizeof(NU_NetworkUpdater), 1);
+        assert(o1);
+        assert(o2);
+        assert(o3);
+        assert(NU_Create(o1, &valid_option));
+        assert(NU_Create(o2, &valid_option));
+        assert(NU_Destroy(o1));
+        assert(NU_Create(o3, &valid_option));
+        assert(NU_Destroy(o3));
+        assert(NU_Destroy(o2));
+        free(o1);
+        free(o2);
+        free(o3);
     }
 }