mirror of
https://github.com/reactos/reactos.git
synced 2024-07-04 11:44:33 +00:00
Autosyncing with Wine HEAD
svn path=/trunk/; revision=27897
This commit is contained in:
parent
1cda0af518
commit
933a0dc886
|
@ -331,7 +331,6 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)
|
||||||
DWORD fattrs = GetFileAttributesW(fname);
|
DWORD fattrs = GetFileAttributesW(fname);
|
||||||
HRESULT ret = E_FAIL;
|
HRESULT ret = E_FAIL;
|
||||||
|
|
||||||
static const WCHAR backslash[] = {'\\',0};
|
|
||||||
static const WCHAR asterisk[] = {'*',0};
|
static const WCHAR asterisk[] = {'*',0};
|
||||||
static const WCHAR dot[] = {'.',0};
|
static const WCHAR dot[] = {'.',0};
|
||||||
static const WCHAR dotdot[] = {'.','.',0};
|
static const WCHAR dotdot[] = {'.','.',0};
|
||||||
|
@ -344,11 +343,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)
|
||||||
int fname_len = lstrlenW(fname);
|
int fname_len = lstrlenW(fname);
|
||||||
|
|
||||||
/* Generate a path with wildcard suitable for iterating */
|
/* Generate a path with wildcard suitable for iterating */
|
||||||
if (lstrcmpW(CharPrevW(fname, fname + fname_len), backslash))
|
if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\';
|
||||||
{
|
|
||||||
lstrcpyW(fname + fname_len, backslash);
|
|
||||||
++fname_len;
|
|
||||||
}
|
|
||||||
lstrcpyW(fname + fname_len, asterisk);
|
lstrcpyW(fname + fname_len, asterisk);
|
||||||
|
|
||||||
if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE)
|
if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE)
|
||||||
|
|
|
@ -512,8 +512,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec,
|
||||||
/* release the install instance information */
|
/* release the install instance information */
|
||||||
static void install_release(const ADVInfo *info)
|
static void install_release(const ADVInfo *info)
|
||||||
{
|
{
|
||||||
if (info->hinf && info->hinf != INVALID_HANDLE_VALUE)
|
SetupCloseInfFile(info->hinf);
|
||||||
SetupCloseInfFile(info->hinf);
|
|
||||||
|
|
||||||
HeapFree(GetProcessHeap(), 0, info->inf_path);
|
HeapFree(GetProcessHeap(), 0, info->inf_path);
|
||||||
HeapFree(GetProcessHeap(), 0, info->inf_filename);
|
HeapFree(GetProcessHeap(), 0, info->inf_filename);
|
||||||
|
|
Loading…
Reference in a new issue