[ros-diffs] [tkreuzer] 56117: [SETUP16] Fix MSVC build

Author: tkreuzer
Date: Sun Mar 11 13:29:59 2012
New Revision: 56117

URL: http://svn.reactos.org/svn/reactos?rev=56117&view=rev
Log:
[SETUP16]
Fix MSVC build

Modified:
    trunk/reactos/base/applications/setup16/main.c

Modified: trunk/reactos/base/applications/setup16/main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/setup16/m...
==============================================================================
--- trunk/reactos/base/applications/setup16/main.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/setup16/main.c [iso-8859-1] Sun Mar 11 13:29:59 2012
@@ -26,13 +26,15 @@

BOOL DeleteDirectory(LPWSTR lpszDir)
 {
+    SHFILEOPSTRUCT fileop;
     DWORD len = wcslen(lpszDir);
     WCHAR *pszFrom = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR)); 
+    int ret;
+
     wcscpy(pszFrom, lpszDir);
     pszFrom[len] = 0;
     pszFrom[len+1] = 0;

-    SHFILEOPSTRUCT fileop;
     fileop.hwnd   = NULL;
     fileop.wFunc  = FO_DELETE;
     fileop.pFrom  = pszFrom;
@@ -42,7 +44,7 @@
     fileop.lpszProgressTitle     = NULL;
     fileop.hNameMappings         = NULL;

-    int ret = SHFileOperation(&fileop);
+    ret = SHFileOperation(&fileop);
     HeapFree(GetProcessHeap(), 0, &pszFrom);
     return (ret == 0);
 }
@@ -60,9 +62,6 @@
                        LPWSTR    lpCmdLine,
                        int       nCmdShow)
 {
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(nCmdShow);
-
     WCHAR szSetupPath[MAX_PATH];
     WCHAR szFileName[MAX_PATH];
     WCHAR szCabFileName[MAX_PATH];
@@ -76,6 +75,8 @@
     DWORD dwAttrib;
     PROCESS_INFORMATION processInfo;
     STARTUPINFO startupInfo;
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(nCmdShow);

GetCurrentDirectory(MAX_PATH, szSetupPath);
     wcscat(szSetupPath, L"\");
@@ -145,4 +146,4 @@
     return 0;
 }

-/* EOF */
+/* EOF */