From d1b7be6a5b93ea58be9e9c20753aa19a4aceeba5 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 11 Mar 2012 13:29:59 +0000
Subject: [PATCH] [SETUP16] Fix MSVC build

svn path=/trunk/; revision=56117
---
 reactos/base/applications/setup16/main.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/reactos/base/applications/setup16/main.c b/reactos/base/applications/setup16/main.c
index 78aed7e6486..f6cd5e875b5 100644
--- a/reactos/base/applications/setup16/main.c
+++ b/reactos/base/applications/setup16/main.c
@@ -26,13 +26,15 @@ static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Par
 
 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 @@ BOOL DeleteDirectory(LPWSTR lpszDir)
     fileop.lpszProgressTitle     = NULL;
     fileop.hNameMappings         = NULL;
 
-    int ret = SHFileOperation(&fileop);
+    ret = SHFileOperation(&fileop);
     HeapFree(GetProcessHeap(), 0, &pszFrom);
     return (ret == 0);
 }
@@ -60,9 +62,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
                        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 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
     DWORD dwAttrib;
     PROCESS_INFORMATION processInfo;
     STARTUPINFO startupInfo;
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(nCmdShow);
     
     GetCurrentDirectory(MAX_PATH, szSetupPath);
     wcscat(szSetupPath, L"\\");
@@ -145,4 +146,4 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
     return 0;
 }
 
-/* EOF */
\ No newline at end of file
+/* EOF */