diff --git a/reactos/dll/win32/advpack/files.c b/reactos/dll/win32/advpack/files.c index 134ed1c5d70..163f994cdf1 100644 --- a/reactos/dll/win32/advpack/files.c +++ b/reactos/dll/win32/advpack/files.c @@ -331,7 +331,6 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) DWORD fattrs = GetFileAttributesW(fname); HRESULT ret = E_FAIL; - static const WCHAR backslash[] = {'\\',0}; static const WCHAR asterisk[] = {'*',0}; static const WCHAR dot[] = {'.',0}; static const WCHAR dotdot[] = {'.','.',0}; @@ -344,11 +343,7 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags) int fname_len = lstrlenW(fname); /* Generate a path with wildcard suitable for iterating */ - if (lstrcmpW(CharPrevW(fname, fname + fname_len), backslash)) - { - lstrcpyW(fname + fname_len, backslash); - ++fname_len; - } + if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; lstrcpyW(fname + fname_len, asterisk); if ((hFindFile = FindFirstFileW(fname, &w32fd)) != INVALID_HANDLE_VALUE) diff --git a/reactos/dll/win32/advpack/install.c b/reactos/dll/win32/advpack/install.c index b7e997c477a..c5a5df00cda 100644 --- a/reactos/dll/win32/advpack/install.c +++ b/reactos/dll/win32/advpack/install.c @@ -512,8 +512,7 @@ static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, /* release the install instance information */ 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_filename);