Changeset 38413

Timestamp:

09/05/10 03:52:54 (3 years ago)

Author:

saturday06

Message:

mendo3

Location:

lang/c/NetworkUpdater/trunk/Build

Files:

• Copy.cpp (modified) (30 diffs)
• MSW.am (modified) (1 diff)
• Nodefaultlib.h (modified) (3 diffs)
• UnCab.cpp (modified) (12 diffs)

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

@@ -3 +3 @@
 #endif
 
+#undef  STRICT
+#define STRICT
 #define _WIN32_WINNT 0x0500 /* Windows 2000 */
 
@@ -60 +62 @@
         SYSTEMTIME st;
         int len = 0;
-        TCHAR* buf = NULL;
+        Buffer<TCHAR> buf;
         GetLocalTime(&st);
         len = GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, time_format, NULL, 0);
         if (len >= 1) {
-            buf = (TCHAR*)calloc(len * sizeof(TCHAR), 1);
+            buf.setBytes(len * sizeof(TCHAR));
             if (buf) {
                 GetTimeFormat(LOCALE_USER_DEFAULT, 0, &st, time_format, buf, len);
                 WriteFile(StdOut, buf, (len - 1) * sizeof(buf[0]), &written, NULL);
-                free(buf);
             }
         }
@@ -89 +90 @@
         }
     };
-    HANDLE mutex;
-    HANDLE map;
+    Handle mutex;
+    Handle map;
 
 public:
@@ -103 +104 @@
         }
     };
-    void lock() const {
+    void lock() {
         WaitForSingleObject(mutex, WAIT_LIMIT);
     }
-    void unlock() const {
+    void unlock() {
         ReleaseMutex(mutex);
     }
     SharedMemory() {
-        TCHAR* name = NULL;
         size_t i = 0;
         size_t len = 0;
         
         len = GetCurrentDirectory(0, NULL);
-        name = (TCHAR*)calloc((len + (/* object sign */ 1)) * sizeof(TCHAR), 1);
+        Buffer<TCHAR> name(len);
         if (!name) {
             Log(_T("calloc() name failed"));
-            goto clean_up;
+            return;
         }
         GetCurrentDirectory(len, name);
-        Log(_T("cd=%s"), name);
+        Log(_T("cd=%s"), (TCHAR*)name);
         for (i = 0; i < len; ++i) {
             if (!IsCharAlphaNumeric(name[i])) {
@@ -128 +128 @@
         }
         name[0] = _T('M');
-        Log(_T("mapping name=%s"), name);
+        Log(_T("mapping name=%s"), static_cast<TCHAR*>(name));
         
         map = CreateFileMapping(
@@ -139 +139 @@
 
         name[0] = _T('X');
-        Log(_T("mutex name=%s"), name);
+        Log(_T("mutex name=%s"), static_cast<TCHAR*>(name));
         mutex = CreateMutex(NULL, FALSE, name);
-
-    clean_up:
-        free(name);
     }
 
     ~SharedMemory() {
-        if (map) {
-            CloseHandle(map);
-        }
-        if (mutex) {
-            CloseHandle(mutex);
-        }
-    }
-
-    Data read() const {
+    }
+
+    Data read() {
         Data data;
         memset(&data, 0, sizeof(data));
-        void* read = NULL;
-        read = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0);
-        if (read) {
-            memcpy(&data, read, sizeof(data));
-            UnmapViewOfFile(read);
+        void* r = NULL;
+        r = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0);
+        if (r) {
+            memcpy(&data, r, sizeof(data));
+            UnmapViewOfFile(r);
         }
         return data;
     }
 
-    void write(Data data) const {
-        void* write = NULL;
-        write = MapViewOfFile(map, FILE_MAP_WRITE, 0, 0, 0);
-        if (write) {
-            memcpy(write, &data, sizeof(data));
-            UnmapViewOfFile(write);
+    void write(Data data) {
+        void* w = NULL;
+        w = MapViewOfFile(map, FILE_MAP_WRITE, 0, 0, 0);
+        if (w) {
+            memcpy(w, &data, sizeof(data));
+            UnmapViewOfFile(w);
         }
     }
@@ -413 +404 @@
 BOOL CopyDirectory(const TCHAR* from, const TCHAR* to, SharedMemory& shared)
 {
-    TCHAR* glob = NULL;
     WIN32_FIND_DATA find_data;
-    HANDLE hFind = NULL;
     BOOL result = TRUE;
 
@@ -423 +412 @@
     }
 
-    glob = PathAppendDup(from, _T("*"));
+    Buffer<TCHAR> glob(PathAppendDup(from, _T("*")));
     if (!glob) {
         Log(_T("CopyDirectory(): (!glob)"));
@@ -429 +418 @@
     /* Log(_T("glob: %s"), glob); */
 
-    hFind = FindFirstFile(glob, &find_data);
-    if (hFind == INVALID_HANDLE_VALUE) {
+    Handle hFind(FindFirstFile(glob, &find_data));
+    if (!hFind) {
         Log(_T("CopyDirectory(): (hFind == INVALID_HANDLE_VALUE)"));
         return FALSE;
@@ -436 +425 @@
 
     do {
-        TCHAR* next_from = NULL;
-        TCHAR* next_to = NULL;
-
         /* Log(_T("<%s>"), find_data.cFileName); */
         if (lstrcmp(find_data.cFileName, _T(".")) == 0) {
@@ -447 +433 @@
         }
 
-        next_from = PathAppendDup(from, find_data.cFileName);
-        next_to = PathAppendDup(to, find_data.cFileName);
+        Buffer<TCHAR> next_from(PathAppendDup(from, find_data.cFileName));
+        Buffer<TCHAR> next_to(PathAppendDup(to, find_data.cFileName));
 
         /* Log(_T("%s -> %s"), next_from, next_to); */
@@ -473 +459 @@
             }
         }
-
-        free(next_to);
-        free(next_from);
     } while(FindNextFile(hFind, &find_data));
 
-    FindClose(hFind);
-    free(glob);
     return result;
 }
 
-
-
-void LaunchMainProcess2(const TCHAR* path, const TCHAR* cd, int complete)
-{
-    BOOL se = FALSE;
-    DWORD e = 0;
-    int hInstApp = 0;
-    SHELLEXECUTEINFO sei;
-    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
-
-    memset(&sei, 0, sizeof(sei));
-    sei.cbSize = sizeof(sei);
-    sei.fMask  = 0;
-    sei.lpFile = path;
-    sei.lpVerb = _T("open");
-    sei.lpDirectory = cd;
-    if (complete) {
-        sei.lpParameters = _T("UPDATE_COMPLETE");
-    } else {
-        sei.lpParameters = _T("UPDATE_ERROR");
-    }
-    Log(_T("ShellExecuteEx(): lpFile=%s, lpDirectory=%s"), sei.lpFile, sei.lpDirectory);
-    se = ShellExecuteEx(&sei);
-    e = GetLastError();
-    hInstApp = (int)sei.hInstApp; /* http://msdn.microsoft.com/en-us/library/bb762154%28VS.85%29.aspx */
-
-    Log(_T("ShellExecuteEx(): return=0x%x, GetLastError()=0x%x, hInstApp=0x%x"),
-            se, e, hInstApp);
-
-    if(!se || hInstApp <= 32) {
-        Log(_T("ShellExecuteEx(): error"));
-        goto clean_up;
-    }
-
-    Log(_T("ShellExecuteEx(): OK"));
-
-clean_up:
-    CoUninitialize();
-}
 
 void LaunchMainProcess(const TCHAR* path, const TCHAR* cd, int complete)
@@ -533 +475 @@
     TCHAR error_arg[] = _T("UPDATE_ERROR");
     int command_len = 0;
-    TCHAR* command = NULL;
 
     if (complete) {
@@ -544 +485 @@
     command_len += lstrlen(arg);
 
-    command = (TCHAR*)calloc(1, (unsigned)command_len * sizeof(TCHAR));
+    Buffer<TCHAR> command((unsigned)command_len);
     if (!command) {
         goto clean_up;
@@ -559 +500 @@
     CloseHandle(pi.hProcess);
 clean_up:
-    free(command);
+    ;
 }
 
@@ -567 +508 @@
     PROCESS_INFORMATION pi;
     DWORD e = 0;
-    TCHAR comspec[MAX_PATH];
     TCHAR clean_command_format[] = _T("\"%s\" /c rd /s /q \"%s\"");
-    TCHAR* clean_command = NULL;
-    TCHAR* my_dir = NULL;
+
     size_t clean_command_len = 0;
-    TCHAR* system_temp_path = NULL;
+    Buffer<TCHAR> clean_command;
+    Buffer<TCHAR> my_dir;
+    Buffer<TCHAR> system_temp_path;
+    Buffer<TCHAR> comspec;
+    Handle hProcess;
+    Handle hThread;
 
     memset(&pi, 0, sizeof(pi));
 
-    if (GetEnvironmentVariable(_T("COMSPEC"), comspec, sizeof(comspec) / sizeof(comspec[0])) == 0) {
-        Log(_T("no COMSPEC environment variable"));
-        goto clean_up;
-    }
+    {
+        size_t len = GetEnvironmentVariable(_T("COMSPEC"), NULL, 0);
+        if (len) {
+            Log(_T("no COMSPEC environment variable"));
+            return;
+        }
+        comspec.setBytes(len * sizeof(comspec[0]));
+        if (!comspec) {
+            Log(_T("calloc() comspec failed"));
+            return;
+        }
+        if (GetEnvironmentVariable(_T("COMSPEC"), comspec, len) == 0) {
+            Log(_T("no COMSPEC environment variable 2"));
+            return;
+        }
+    }
+
 
     {
         size_t len = GetTempPath(0, NULL);
-        system_temp_path = (TCHAR*)calloc(1, len * sizeof(TCHAR));
+        system_temp_path.setBytes(len * sizeof(TCHAR));
         if (!system_temp_path) {
             Log(_T("calloc() system_temp_path failed"));
-            goto clean_up;
+            return;
         }
         GetTempPath(len, system_temp_path);
@@ -594 +551 @@
     {
         size_t len = GetCurrentDirectory(0, NULL);
-        my_dir = (TCHAR*)calloc(1, len * sizeof(TCHAR));
+        my_dir.setBytes(len * sizeof(TCHAR));
         if (!my_dir) {
             Log(_T("calloc() my_dir failed"));
-            goto clean_up;
+            return;
         }
         GetCurrentDirectory(len, my_dir);
@@ -604 +561 @@
 
     clean_command_len = lstrlen(comspec) + lstrlen(clean_command_format) + lstrlen(my_dir);
-    clean_command = (TCHAR*)calloc(clean_command_len * sizeof(TCHAR), 1);
+    clean_command.setBytes(clean_command_len * sizeof(TCHAR));
     if (!clean_command) {
-        goto clean_up;
-    }
-    wsprintf(clean_command, clean_command_format, comspec, my_dir);
+        return;
+    }
+    wsprintf(clean_command, clean_command_format, (TCHAR*)comspec, (TCHAR*)my_dir);
 
     memset(&si, 0, sizeof(si));
@@ -615 +572 @@
     si.wShowWindow = SW_HIDE;
     CreateProcess(NULL, clean_command, NULL, NULL, FALSE, 0, NULL, system_temp_path, &si, &pi);
+    hProcess = pi.hProcess;
+    hThread = pi.hThread;
+
     e = GetLastError();
     Log(_T("CreateProcess(): \r\n command=%s \r\n cd=%s \r\n error=0x%x"), clean_command, system_temp_path, e);
-
-clean_up:
-    if (pi.hThread) {
-        CloseHandle(pi.hThread);
-    }
-    if (pi.hProcess) {
-        CloseHandle(pi.hProcess);
-    }
-    free(system_temp_path);
-    free(my_dir);
-    free(clean_command);
 }
 
@@ -637 +586 @@
     DWORD bytes = 0;
     DWORD bytes_got = 0;
-    TCHAR* data = NULL;
     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) {
         Log(_T("admin log open error 0x%x"), e);
-        goto log_end;
+        return;
     }
 
     bytes = GetFileSize(config_file, NULL);
-    data = (TCHAR*)calloc(1, bytes + (/* null terminate */ sizeof(TCHAR)));
+    Buffer<char> data(bytes + (/* null terminate */ sizeof(TCHAR)));
     if (!data) {
-        goto log_end;
+        return;
     }
 
@@ -656 +604 @@
         e = GetLastError();
         Log(_T("admin log read error 0x%x"), e);
-        goto log_end;
+        return;
     }
     Log(_T("--- admin mode log start ---"));
@@ -665 +613 @@
         Log(_T("--- admin mode log error error=0x%x, written=0x%x ---"), e, written);
     }
-
-log_end:
-    free(data);
-    CloseHandle(config_file);
 }
 
@@ -678 +622 @@
     SHELLEXECUTEINFO sei;
     size_t len = 33000;
-    TCHAR* my_path = NULL;
+    Buffer<TCHAR> my_path(len);
+    Handle hProcess;
+
+    struct CleanUp {
+        ~CleanUp() {
+            OutputAdminLog();
+            CoUninitialize();
+        }
+    } CleanUp;
 
     CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
-    my_path = (TCHAR*)calloc(len * sizeof(TCHAR), 1);
-    GetModuleFileName(GetModuleHandle(NULL), my_path, len);
+    GetModuleFileName(GetModuleHandle(NULL), my_path, len - (1 /* for null terminate */));
 
     memset(&sei, 0, sizeof(sei));
@@ -694 +645 @@
     e = GetLastError();
     hInstApp = (int)sei.hInstApp; /* http://msdn.microsoft.com/en-us/library/bb762154%28VS.85%29.aspx */
+    hProcess = sei.hProcess;
 
     Log(_T("ShellExecuteEx(): return=0x%x, GetLastError()=0x%x, hInstApp=0x%x"),
@@ -700 +652 @@
     if(!se || hInstApp <= 32) {
         Log(_T("ShellExecuteEx(): error"));
-        goto clean_up;
+        return;
     }
 
@@ -723 +675 @@
         break;
     }
-
-clean_up:
-    if (sei.hProcess) {
-        CloseHandle(sei.hProcess);
-    }
-
-    CoUninitialize();
-    free(my_path);
-
-    OutputAdminLog();
 }
 
 int WriteCheck(const TCHAR* dir) {
     unsigned int retry = 0;
-    TCHAR* check_path = NULL;
     for (retry = 10; retry != 0; --retry) {
         TCHAR name[1024];
@@ -743 +684 @@
         wsprintf(name, _T("NetworkUpdater.AccessCheck.%1!x!.%2!x!.txt"), 
             GetCurrentThreadId(), GetTickCount() - retry);
-        free(check_path);
-        check_path = PathAppendDup(dir, name);
+        Buffer<TCHAR> check_path(PathAppendDup(dir, name));
+        if (!check_path) {
+            return 0;
+        }
         if (PathFileExists(check_path)) {
             continue;
         }
         if (check_path) {
-            HANDLE check = CreateFile(
+            Handle check(CreateFile(
                 check_path, GENERIC_WRITE | DELETE, 0, NULL, CREATE_NEW, 
-                FILE_ATTRIBUTE_HIDDEN | FILE_FLAG_DELETE_ON_CLOSE, NULL);
+                FILE_ATTRIBUTE_HIDDEN | FILE_FLAG_DELETE_ON_CLOSE, NULL));
             if (check != INVALID_HANDLE_VALUE) {
                 TCHAR data[] = _T("write test data");
                 DWORD written = 0;
                 if (WriteFile(check, data, lstrlen(data) * sizeof(data[0]), &written, NULL)) {
-                    CloseHandle(check);
                     break;
                 }
-                CloseHandle(check);
-            }
-        }
-    }
-    free(check_path);
+            }
+        }
+    }
 
     return (retry != 0);
@@ -770 +710 @@
 int main(void)
 {
-    HANDLE thread = NULL;
-    HANDLE config_file    = INVALID_HANDLE_VALUE;
-    HANDLE caller_process = NULL;
-    TCHAR* data = NULL;
+    Handle thread;
+    Handle config_file;
+    Handle caller_process;
+    Buffer<TCHAR> data;
     const TCHAR* new_program      = NULL;
     const TCHAR* new_program_cd   = NULL;
@@ -828 +768 @@
 
         bytes = GetFileSize(config_file, NULL);
-        data = (TCHAR*)calloc(1, bytes + (/* null terminate */ sizeof(TCHAR)));
+        data.setBytes(bytes + (/* null terminate */ sizeof(TCHAR)));
         if (!data) {
             goto clean_up;
@@ -965 +905 @@
     }
 
-    if (config_file != INVALID_HANDLE_VALUE) {
-        CloseHandle(config_file);
-    }
-
-    if (caller_process) {
-        CloseHandle(caller_process);
-    }
-
-    if (thread) {
-        CloseHandle(thread);
-    }
-
     if (data) {
         free(data);

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

@@ -17 +17 @@
            -fstack-protector -Wno-missing-field-initializers
 
-copy_SOURCES  = Copy.c
+copy_SOURCES  = Copy.cpp
 copy_CPPFLAGS = -DUNICODE -D_UNICODE -DSTRICT
-copy_CFLAGS   = -O0 -g $(C_WARNINGS)
+copy_CXXFLAGS = -O0 -g $(CXX_WARNINGS)
 copy_LDFLAGS  = -Wl,-nostdlib -L/usr/lib/w32api
 

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

@@ -1 +1 @@
 
-#define calloc(num, size) NUI_calloc(num, size)
-#define free(memblock)    NUI_free(memblock)
+#define calloc(num, size) ((void*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, num * size))
+#define free(memblock)    (void)(memblock ? HeapFree(GetProcessHeap(), 0, memblock): 0)
 #define _wcsdup(s)        NUI_wcsdup(s)
 #define wcsdup(s)         NUI_wcsdup(s)
@@ -36 +36 @@
     }
     return dest;
-}
-
-/* http://msdn.microsoft.com/en-US/library/3f8w183e%28v=VS.80%29.aspx */
-void *NUI_calloc(size_t num, size_t size)
-{
-    return (void*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, num * size);
-}
-
-/* http://msdn.microsoft.com/en-US/library/we1whae7%28v=VS.80%29.aspx */
-void NUI_free(void *memblock)
-{
-    if (memblock) {
-        HeapFree(GetProcessHeap(), 0, memblock);
-    }
 }
 
@@ -87 +73 @@
     return num;
 }
+
+
+#ifdef __cplusplus
+
+#include <boost/utility.hpp>
+
+class Handle {
+    HANDLE h;
+
+public:
+    Handle(Handle& s) : h(NULL) {
+        DuplicateHandle(GetCurrentProcess(),
+            s.h,
+            GetCurrentProcess(),
+            &h,
+            0,
+            FALSE,
+            DUPLICATE_SAME_ACCESS);
+    }
+
+    Handle(HANDLE h_) : h(h_) {
+    }
+
+    Handle() : h(NULL) {
+    }
+
+    ~Handle() {
+        if (*this) {
+            CloseHandle(h);
+        }
+    }
+
+    operator HANDLE() {
+        return h;
+    }
+
+    operator bool() {
+        return h != INVALID_HANDLE_VALUE && h != NULL;
+    }
+
+    template <typename U> operator U() {
+        return static_cast<U>(h);
+    }
+};
+
+template <typename T = char>
+class Buffer {
+    T* b;
+
+    explicit Buffer(const Buffer&) {
+    }
+
+    Buffer& operator=(const Buffer&) {
+        b = NULL;
+        return *this;
+    }
+
+public:
+    
+    Buffer(size_t s) : b(NULL) {
+        setBytes(s * sizeof(T));
+    }
+
+    Buffer(T* b_) : b(b_) {
+    }
+
+    Buffer& operator=(TCHAR* b_) {
+        b = b_;
+        return *this;
+    }
+
+    Buffer() : b(NULL) {
+    }
+
+    ~Buffer() {
+        free(b);
+    }
+
+    void setBytes(size_t bytes) {
+        b = (T*)calloc(bytes, 1);
+    }
+
+    operator T*() {
+        return b;
+    }
+
+    operator bool() {
+        return b != NULL;
+    }
+
+    template <typename U> operator U() {
+        return static_cast<U>(b);
+    }
+};
+
+#endif
+

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

@@ +1 @@
+#ifndef _UNICODE
+#error
+#endif
+
+#undef  STRICT
+#define STRICT
+
 #include <stdio.h>
 #include <windows.h>
@@ -20 +27 @@
 FNSEEK(SeekProc);
 
-BOOL StartFDI(char* lpszOutputDirectory, char* lpszFileName);
-
 int _tmain(int argc, TCHAR** argv)
 {
-    BOOL bResult = FALSE;
-
     if (argc < 2) {
         //printf("invalid argument count\n");
@@ -31 +34 @@
     }
 
+    ERF erf;
+    HFDI hfdi = FDICreate(AllocProc, FreeProc, OpenProc, ReadProc, WriteProc, CloseProc, SeekProc, cpu80386, &erf);
+    if (hfdi == NULL) {
+        //printf("FDICreate() failed erfOper=0x%x\n", erf.erfOper);
+        return FALSE;
+    }
+
     char dir[] = ".\\";
-    char* file = NUI_TCharToMultiByteDup(argv[1]);
+    Buffer<char> file = NUI_TCharToMultiByteDup(argv[1]);
+    
+    if (!FDICopy(hfdi, file, dir, 0, NotifyProc, NULL, NULL)) {
+        //printf("FDICopy() failed erfOper=0x%x\n", erf.erfOper);
+    }
 
-    bResult = StartFDI(dir, file);
-    if (bResult) {
-        //printf("failed\n");
-    }
-    return !bResult;
+    FDIDestroy(hfdi);
 }
 
@@ -54 +64 @@
 }
 
-BOOL StartFDI(char* lpszDirectoryName, char* lpszFileName)
-{
-    ERF erf;
-    BOOL bResult = FALSE;
-
-    HFDI hfdi = FDICreate(AllocProc, FreeProc, OpenProc, ReadProc, WriteProc, CloseProc, SeekProc, cpu80386, &erf);
-    if (hfdi == NULL) {
-        //printf("FDICreate() failed erfOper=0x%x\n", erf.erfOper);
-        return FALSE;
-    }
-
-    bResult = FDICopy(hfdi, lpszFileName, lpszDirectoryName, 0, NotifyProc, NULL, NULL);
-    if (!bResult) {
-        //printf("FDICopy() failed erfOper=0x%x\n", erf.erfOper);
-    }
-
-    FDIDestroy(hfdi);
-
-    return bResult;
-}
-
 FNFDINOTIFY(NotifyProc)
 {
@@ -80 +69 @@
 
     case fdintCOPY_FILE: {
-        char szFileName[1024];
-        lstrcpyA(szFileName, pfdin->psz1);
-        HANDLE hFile = CreateFileA(szFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-        if (hFile == INVALID_HANDLE_VALUE) {
+        Buffer<char> path(lstrlenA(pfdin->psz1) + (1 /* null terminate */));
+        if (!path) {
+            return -1;
+        }
+        lstrcpyA(path, pfdin->psz1);
+        HANDLE file = CreateFileA(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+        if (file == INVALID_HANDLE_VALUE) {
             //printf("CreateFileA() failed szFileName=%s\n", szFileName);
             return -1;
         }
-
-        return (int)hFile;
+        return (int)file;
     }
 
     case fdintCLOSE_FILE_INFO: {
-        char szFileName[1024];
         FILETIME fileTime;
         FILETIME localFileTime;
@@ -102 +92 @@
         CloseHandle((HANDLE)pfdin->hf);
 
-        lstrcpyA(szFileName, pfdin->psz1);
-        SetFileAttributesA(szFileName, pfdin->attribs);
+        Buffer<char> path(lstrlenA(pfdin->psz1) + (1 /* null terminate */));
+        lstrcpyA(path, pfdin->psz1);
+        SetFileAttributesA(path, pfdin->attribs);
 
         return TRUE;
@@ -128 +119 @@
 FNOPEN(OpenProc)
 {
-    HANDLE hFile = NULL;
     DWORD dwDesiredAccess = 0; 
     DWORD dwCreationDisposition = 0;
@@ -134 +124 @@
     UNREFERENCED_PARAMETER(pmode);
 
-    if ( oflag & _O_RDWR )
-    {
+    if (oflag & _O_RDWR) {
         dwDesiredAccess = GENERIC_READ | GENERIC_WRITE;
-    }
-    else if ( oflag & _O_WRONLY )
-    {
+    } else if (oflag & _O_WRONLY) {
         dwDesiredAccess = GENERIC_WRITE;
-    }
-    else
-    {
+    } else {
         dwDesiredAccess = GENERIC_READ;
     }
 
-    if ( oflag & _O_CREAT )
-    {
+    if (oflag & _O_CREAT) {
         dwCreationDisposition = CREATE_ALWAYS;
-    }
-    else
-    {
+    } else {
         dwCreationDisposition = OPEN_EXISTING;
     }
 
-    hFile = CreateFileA(pszFile, 
+    HANDLE hFile = CreateFileA(pszFile, 
                         dwDesiredAccess,
                         FILE_SHARE_READ,
@@ -172 +154 @@
 {
     DWORD dwBytesRead = 0;
-    if (ReadFile((HANDLE)hf, pv, cb, &dwBytesRead, NULL) == FALSE)
-    {
+    if (ReadFile((HANDLE)hf, pv, cb, &dwBytesRead, NULL) == FALSE) {
         dwBytesRead = (DWORD)-1L;
     }    
@@ -183 +164 @@
 {
     DWORD dwBytesWritten = 0;
-    if (WriteFile((HANDLE)hf, pv, cb, &dwBytesWritten, NULL) == FALSE)
-    {
+    if (WriteFile((HANDLE)hf, pv, cb, &dwBytesWritten, NULL) == FALSE) {
         dwBytesWritten = (DWORD)-1;
     }
@@ -192 +172 @@
 FNCLOSE(CloseProc)
 {
-    return ( CloseHandle((HANDLE)hf) == TRUE ) ? 0 : -1;
+    return (CloseHandle((HANDLE)hf) == TRUE) ? 0 : -1;
 }
-
 
 FNSEEK(SeekProc)
@@ -200 +179 @@
     return SetFilePointer((HANDLE)hf, dist, 0, seektype);
 }
-
-
-
-