mirror of
https://github.com/reactos/reactos.git
synced 2024-08-28 22:28:36 +00:00
[SETUP16]
Fix MSVC build svn path=/trunk/; revision=56117
This commit is contained in:
parent
b123382a03
commit
d1b7be6a5b
|
@ -26,13 +26,15 @@ static UINT WINAPI ExtCabCallback(PVOID Context, UINT Notification, UINT_PTR Par
|
||||||
|
|
||||||
BOOL DeleteDirectory(LPWSTR lpszDir)
|
BOOL DeleteDirectory(LPWSTR lpszDir)
|
||||||
{
|
{
|
||||||
|
SHFILEOPSTRUCT fileop;
|
||||||
DWORD len = wcslen(lpszDir);
|
DWORD len = wcslen(lpszDir);
|
||||||
WCHAR *pszFrom = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR));
|
WCHAR *pszFrom = HeapAlloc(GetProcessHeap(), 0, (len + 2) * sizeof(WCHAR));
|
||||||
|
int ret;
|
||||||
|
|
||||||
wcscpy(pszFrom, lpszDir);
|
wcscpy(pszFrom, lpszDir);
|
||||||
pszFrom[len] = 0;
|
pszFrom[len] = 0;
|
||||||
pszFrom[len+1] = 0;
|
pszFrom[len+1] = 0;
|
||||||
|
|
||||||
SHFILEOPSTRUCT fileop;
|
|
||||||
fileop.hwnd = NULL;
|
fileop.hwnd = NULL;
|
||||||
fileop.wFunc = FO_DELETE;
|
fileop.wFunc = FO_DELETE;
|
||||||
fileop.pFrom = pszFrom;
|
fileop.pFrom = pszFrom;
|
||||||
|
@ -42,7 +44,7 @@ BOOL DeleteDirectory(LPWSTR lpszDir)
|
||||||
fileop.lpszProgressTitle = NULL;
|
fileop.lpszProgressTitle = NULL;
|
||||||
fileop.hNameMappings = NULL;
|
fileop.hNameMappings = NULL;
|
||||||
|
|
||||||
int ret = SHFileOperation(&fileop);
|
ret = SHFileOperation(&fileop);
|
||||||
HeapFree(GetProcessHeap(), 0, &pszFrom);
|
HeapFree(GetProcessHeap(), 0, &pszFrom);
|
||||||
return (ret == 0);
|
return (ret == 0);
|
||||||
}
|
}
|
||||||
|
@ -60,9 +62,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
|
||||||
LPWSTR lpCmdLine,
|
LPWSTR lpCmdLine,
|
||||||
int nCmdShow)
|
int nCmdShow)
|
||||||
{
|
{
|
||||||
UNREFERENCED_PARAMETER(hPrevInstance);
|
|
||||||
UNREFERENCED_PARAMETER(nCmdShow);
|
|
||||||
|
|
||||||
WCHAR szSetupPath[MAX_PATH];
|
WCHAR szSetupPath[MAX_PATH];
|
||||||
WCHAR szFileName[MAX_PATH];
|
WCHAR szFileName[MAX_PATH];
|
||||||
WCHAR szCabFileName[MAX_PATH];
|
WCHAR szCabFileName[MAX_PATH];
|
||||||
|
@ -76,6 +75,8 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
|
||||||
DWORD dwAttrib;
|
DWORD dwAttrib;
|
||||||
PROCESS_INFORMATION processInfo;
|
PROCESS_INFORMATION processInfo;
|
||||||
STARTUPINFO startupInfo;
|
STARTUPINFO startupInfo;
|
||||||
|
UNREFERENCED_PARAMETER(hPrevInstance);
|
||||||
|
UNREFERENCED_PARAMETER(nCmdShow);
|
||||||
|
|
||||||
GetCurrentDirectory(MAX_PATH, szSetupPath);
|
GetCurrentDirectory(MAX_PATH, szSetupPath);
|
||||||
wcscat(szSetupPath, L"\\");
|
wcscat(szSetupPath, L"\\");
|
||||||
|
@ -145,4 +146,4 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* EOF */
|
/* EOF */
|
||||||
|
|
Loading…
Reference in a new issue