Changeset 38443 for lang/c/NetworkUpdater/trunk/Build/Copy.cpp

Timestamp:

09/09/10 01:18:46 (3 years ago)

Author:

saturday06

Message:

madx

Files:

• lang/c/NetworkUpdater/trunk/Build/Copy.cpp (modified) (42 diffs)

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

@@ -85 +85 @@
         int complete;
         int exit;
-        Data() {
-            memset(this, 0, sizeof(*this));
-        }
     };
     Handle mutex;
@@ -96 +93 @@
         SharedMemory& sharedMemory;
     public:
-        Locker(SharedMemory& sharedMemory_): sharedMemory(sharedMemory_) {
+        Locker(SharedMemory& sharedMemory_) : sharedMemory(sharedMemory_) {
             sharedMemory.lock();
         }
@@ -103 +100 @@
         }
     };
+
     void lock() {
         WaitForSingleObject(mutex, WAIT_LIMIT);
@@ -109 +107 @@
         ReleaseMutex(mutex);
     }
-    SharedMemory() {
-        size_t i = 0;
-        size_t len = 0;
-        
-        len = GetCurrentDirectory(0, NULL);
+    SharedMemory() : mutex(NULL), map(NULL) {
+        size_t len = GetCurrentDirectory(0, NULL);
         String<> name(len);
         if (!name) {
@@ -121 +116 @@
         GetCurrentDirectory(len, name);
         Log(_T("cd=%s"), (TCHAR*)name);
-        for (i = 0; i + 1 < len; ++i) {
+        for (size_t i = 0; i + 1 < len; ++i) {
             if (!IsCharAlphaNumeric(name[i])) {
                 name[i] = _T('.');
@@ -128 +123 @@
         name[0] = _T('M');
         Log(_T("mapping name=%s"), static_cast<TCHAR*>(name));
-        
+
         map = CreateFileMapping(
-            INVALID_HANDLE_VALUE,
-            NULL,
-            PAGE_READWRITE,
-            0,
-            1024,
-            name);
+                  INVALID_HANDLE_VALUE,
+                  NULL,
+                  PAGE_READWRITE,
+                  0,
+                  1024,
+                  name);
 
         name[0] = _T('X');
@@ -146 +141 @@
 
     Data read() {
-        Data data;
-        memset(&data, 0, sizeof(data));
+        Data data = {};
         Data* r = (Data*)MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0);
         if (r) {
-                        data = *r;
+            data = *r;
             UnmapViewOfFile(r);
         }
@@ -159 +153 @@
         Data* w = (Data*)MapViewOfFile(map, FILE_MAP_WRITE, 0, 0, 0);
         if (w) {
-                        *w = data;
+            *w = data;
             UnmapViewOfFile(w);
         }
@@ -167 +161 @@
 TCHAR* PathAppendDup(const TCHAR* base, const TCHAR* append)
 {
-    TCHAR* result = NULL;
-    size_t result_len = 0;
-
-    result_len = lstrlen(base) + 1 + lstrlen(append) + 1;
+    size_t result_len = lstrlen(base) + 1 + lstrlen(append) + 1;
     if (result_len <= MAX_PATH + 1) {
         result_len = MAX_PATH + 1;
     }
-    result = (TCHAR*)calloc(result_len * sizeof(TCHAR), 1);
+    
+    TCHAR* result = (TCHAR*)calloc(result_len * sizeof(TCHAR), 1);
     if (!result) {
         return NULL;
@@ -208 +200 @@
         }
     } else if (message == WM_TIMER) {
-        SharedMemory::Data m; 
+        SharedMemory::Data m;
         {
             SharedMemory::Locker locker(*data->shared);
@@ -229 +221 @@
             ++data->rest;
         }
-        
+
         if (!data->progress_complete) {
             /* step progress bar */
             if ((m.complete && data->count >= m.copyed)
-                || data->count >= data->thread.num_files) {
+                    || data->count >= data->thread.num_files) {
                 /* num_files is unreliable but PBM_SETRANGE == (0, num_files) */
 
@@ -239 +231 @@
                 InvalidateRect(hWnd, NULL, FALSE);
 
-                Log(L"Progress Complete: complete=%d,count=%d,copyed=%d,num_files=%d", 
-                        m.complete,
-                        data->count,
-                        m.copyed,
-                        data->thread.num_files);
+                Log(L"Progress Complete: complete=%d,count=%d,copyed=%d,num_files=%d",
+                    m.complete,
+                    data->count,
+                    m.copyed,
+                    data->thread.num_files);
             }
             data->count = m.copyed;
@@ -277 +269 @@
     WNDCLASSEX wc;
     HMONITOR monitor = NULL;
-    POINT monitor_point = {0, 0};
+    POINT monitor_point = {};
     SharedMemory shared;
-    ProgressWindowData data;
-    memset(&data, 0, sizeof(data));
+    ProgressWindowData data = {};
     data.shared = &shared;
     data.thread = thread;
-    
+
     instance = GetModuleHandle(NULL);
 
@@ -335 +326 @@
 
     data.progress = CreateWindow(_T("msctls_progress32"), _T("Progress"),
-                                /*WS_BORDER |*/ WS_CHILD /*| PBS_MARQUEE*/, 15, 15, 270, 20,
-                                window, NULL, GetModuleHandle(NULL), NULL);
+                                 /*WS_BORDER |*/ WS_CHILD /*| PBS_MARQUEE*/, 15, 15, 270, 20,
+                                 window, NULL, GetModuleHandle(NULL), NULL);
     SetProp(window, PROGRESS_WINDOW_DATA_PROP, &data);
 
-    SendMessage(data.progress, PBM_SETRANGE, (WPARAM)0, MAKELPARAM(0, thread.num_files)); 
+    SendMessage(data.progress, PBM_SETRANGE, (WPARAM)0, MAKELPARAM(0, thread.num_files));
     SendMessage(data.progress, PBM_SETSTEP, (WPARAM)1, 0);
 
@@ -367 +358 @@
     ShowWindow(data.progress, SW_SHOW);
 
-        {
+    {
         OSVERSIONINFO osvi;
         osvi.dwOSVersionInfoSize = sizeof(osvi);
         GetVersionEx(&osvi);
         if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && osvi.dwMajorVersion >= 6) {
-                        SetTimer(window, 0, 600, NULL);
+            SetTimer(window, 0, 600, NULL);
         } else {
-                    SetTimer(window, 0, 200, NULL);
-        }
-        }
+            SetTimer(window, 0, 200, NULL);
+        }
+    }
 
     ShowWindow(window, SW_SHOW);
     UpdateWindow(window);
 
-    for (;;) {
+    for (;; ) {
         MSG msg;
         BOOL result = GetMessage(&msg, NULL, 0, 0);
@@ -409 +400 @@
     }
 
-    String<> glob = PathAppendDup(from, _T("*"));
+    String<> glob(PathAppendDup(from, _T("*")));
     if (!glob) {
         Log(_T("CopyDirectory(): (!glob)"));
@@ -416 +407 @@
 
     HANDLE hFind = FindFirstFile(glob, &find_data);
-    struct CleanUp { HANDLE h; ~CleanUp() { FindClose(h); } } cleanUp = {hFind}; (void)cleanUp;
+    struct CleanUp {
+        HANDLE h;
+        ~CleanUp() {
+            FindClose(h);
+        }
+    } cleanUp = {hFind};
+    (void)cleanUp;
 
     if (!hFind) {
@@ -422 +419 @@
         return FALSE;
     }
-    
+
 
     do {
@@ -433 +430 @@
         }
 
-        String<> next_from = PathAppendDup(from, find_data.cFileName);
-        String<> next_to = PathAppendDup(to, find_data.cFileName);
+        String<> next_from(PathAppendDup(from, find_data.cFileName));
+        String<> next_to(PathAppendDup(to, find_data.cFileName));
 
         /* Log(_T("%s -> %s"), next_from, next_to); */
@@ -440 +437 @@
         if (FILE_ATTRIBUTE_DIRECTORY & find_data.dwFileAttributes) {
             if (CreateDirectory(next_to, NULL) || GetLastError() == ERROR_ALREADY_EXISTS) {
-               
+
                 result = result && CopyDirectory(next_from, next_to, shared);
             } else {
@@ -448 +445 @@
         } else if(!CopyFile(next_from, next_to, FALSE)) {
             Log(_T("file error"));
-            result = FALSE;        
+            result = FALSE;
         }
 
@@ -496 +493 @@
     CreateProcess(NULL, command, NULL, NULL, FALSE, 0, NULL, cd, &si, &pi);
     e = GetLastError();
-    Log(_T("CreateProcess(): \r\n command=%s \r\n cd=%s \r\n error=0x%x"), command, cd, e);
+    Log(_T("CreateProcess(): \r\n command=%s \r\n cd=%s \r\n error=0x%x"), (TCHAR*)command, (TCHAR*)cd, e);
     CloseHandle(pi.hThread);
     CloseHandle(pi.hProcess);
@@ -546 +543 @@
         }
         GetTempPath(len, system_temp_path);
-        Log(_T("system_temp_path=%s"), system_temp_path);
+        Log(_T("system_temp_path=%s"), (TCHAR*)system_temp_path);
     }
 
@@ -557 +554 @@
         }
         GetCurrentDirectory(len, my_dir);
-        Log(_T("my_dir=%s"), my_dir);
+        Log(_T("my_dir=%s"), (TCHAR*)my_dir);
     }
 
@@ -576 +573 @@
 
     e = GetLastError();
-    Log(_T("CreateProcess(): \r\n command=%s \r\n cd=%s \r\n error=0x%x"), clean_command, system_temp_path, e);
+    Log(_T("CreateProcess(): \r\n command=%s \r\n cd=%s \r\n error=0x%x"), (TCHAR*)clean_command, (TCHAR*)system_temp_path, e);
 }
 
@@ -587 +584 @@
     DWORD bytes_got = 0;
     DWORD written = 0;
-    Handle config_file = CreateFile(ADMIN_OUTPUT_FILE_NAME, GENERIC_READ, FILE_SHARE_READ, NULL,
-                                  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    Handle config_file(CreateFile(ADMIN_OUTPUT_FILE_NAME, GENERIC_READ, FILE_SHARE_READ, NULL,
+                                  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL));
     e = GetLastError();
     if (config_file == INVALID_HANDLE_VALUE) {
@@ -596 +593 @@
 
     bytes = GetFileSize(config_file, NULL);
-    String<> data;
-    data.reserveBytes(bytes + (/* null terminate */ sizeof(TCHAR)));
+    String<> data((TCHAR*)calloc(bytes + (/* null terminate */ sizeof(TCHAR)), 1));
     if (!data) {
         return;
@@ -631 +627 @@
             CoUninitialize();
         }
-    } cleanUp;
+    } cleanUp; (void)cleanUp;
 
     CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
@@ -649 +645 @@
 
     Log(_T("ShellExecuteEx(): return=0x%x, GetLastError()=0x%x, hInstApp=0x%x"),
-            se, e, hInstApp);
+        se, e, hInstApp);
 
     if(!se || hInstApp <= 32) {
@@ -662 +658 @@
         Log(_T("WAIT_OBJECT_0"));
         break;
-    case WAIT_ABANDONED:  
+    case WAIT_ABANDONED:
         Log(_T("WAIT_ABANDONED"));
         break;
@@ -683 +679 @@
         TCHAR name[1024];
         Sleep(20);
-        wsprintf(name, _T("NetworkUpdater.AccessCheck.%x.%x.txt"), 
-            GetCurrentThreadId(), GetTickCount() - retry);
-        String<> check_path = PathAppendDup(dir, name);
+        wsprintf(name, _T("NetworkUpdater.AccessCheck.%x.%x.txt"),
+                 GetCurrentThreadId(), GetTickCount() - retry);
+        String<> check_path(PathAppendDup(dir, name));
         if (!check_path) {
             return 0;
@@ -693 +689 @@
         }
         if (check_path) {
-            Handle check = CreateFile(
-                check_path, GENERIC_WRITE | DELETE, 0, NULL, CREATE_NEW, 
-                FILE_ATTRIBUTE_HIDDEN | FILE_FLAG_DELETE_ON_CLOSE, NULL);
+            Handle check(CreateFile(
+                               check_path, GENERIC_WRITE | DELETE, 0, NULL, CREATE_NEW,
+                               FILE_ATTRIBUTE_HIDDEN | FILE_FLAG_DELETE_ON_CLOSE, NULL));
             if (check != INVALID_HANDLE_VALUE) {
                 TCHAR data[] = _T("write test data");
@@ -730 +726 @@
 
     memset(&thread_data, 0, sizeof(thread_data));
-    
+
     {
         int num_args = 0;
@@ -753 +749 @@
     Log(_T("***** UpdaterProcess start: pid=0x%x *****"), GetCurrentProcessId());
 
-    { /* read config file */
-        TCHAR* lines[8];
-        size_t i = 0;
-        size_t data_count = 0;
-        unsigned line = 0;
-        DWORD bytes = 0;
-        DWORD bytes_got = 0;
+    {   /* read config file */
         config_file = CreateFile(CONFIG_FILE_NAME, GENERIC_READ, FILE_SHARE_READ, NULL,
-                           OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-
-                if (!config_file) {
+                                 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+
+        if (!config_file) {
             Log(_T("config file not found"));
             goto clean_up;
         }
 
-        bytes = GetFileSize(config_file, NULL);
-        if (bytes == -1) {
+        DWORD bytes = GetFileSize(config_file, NULL);
+        if (bytes == (DWORD)-1) {
             DWORD e = GetLastError();
             Log(_T("!GetFileSize() error=0x%x"), e);
@@ -775 +765 @@
         }
 
-        data.reserveBytes(bytes + (/* null terminate */ sizeof(TCHAR)));
+        data = (TCHAR*)calloc(bytes + (/* null terminate */ sizeof(TCHAR)), 1);
         if (!data) {
             Log(_T("!data"));
@@ -781 +771 @@
         }
 
+        DWORD bytes_got = 0;
         if (ReadFile(config_file, data, bytes, &bytes_got, NULL) == 0) {
             DWORD e = GetLastError();
@@ -787 +778 @@
         }
 
-        data_count = (bytes / sizeof(data[0]));
-        memset(lines, 0, sizeof(lines));
-        for (i = 0; i < data_count; ++i) {
+        size_t data_count = (bytes / sizeof(data[0]));
+
+        TCHAR* lines[8] = {};
+        unsigned line = 0;
+        for (size_t i = 0; i < data_count; ++i) {
             if (data[i] == _T('\r')) {
                 data[i] = 0;
@@ -815 +808 @@
 
     Log(_T("read config file: \r\n pid=%s \r\n from=%s \r\n to=%s \r\n new_proc=%s \r\n new_cd=%s \r\n num_files=%s \r\n log=%s \r\n debug=%s"),
-            pid_string, update_from, update_to, new_program, new_program_cd, num_files_string, log_file_name, debug_string);
+        pid_string, update_from, update_to, new_program, new_program_cd, num_files_string, log_file_name, debug_string);
 
     if (lstrcmp(debug_string, DEBUG_SIGN) == 0) {
@@ -826 +819 @@
         CopyFile(DEFAULT_OUTPUT_FILE_NAME, log_file_name, FALSE);
         new_log_file = CreateFile(log_file_name, GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, NULL,
-                       OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+                                  OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
         if (new_log_file != INVALID_HANDLE_VALUE) {
             SetFilePointer(new_log_file, 0, 0, FILE_END);
             /*
-            SetStdHandle(STD_OUTPUT_HANDLE, new_log_file);
-            */
+               SetStdHandle(STD_OUTPUT_HANDLE, new_log_file);
+             */
             Log(_T("new log setup"));
             CloseHandle(log_file);
@@ -849 +842 @@
         }
     }
-    
+
     InitCommonControls();
 
-    
+
     thread_data.num_files = _ttoi(num_files_string);
     {
@@ -878 +871 @@
         GetVersionEx(&osvi);
         if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT &&
-            osvi.dwMajorVersion >= 6) {
+                osvi.dwMajorVersion >= 6) {
             LaunchAdminProcess();
 
@@ -941 +934 @@
 #endif
 }
-
-
-