Author: winesync Date: Fri Jul 27 13:03:12 2007 New Revision: 27897
URL: http://svn.reactos.org/svn/reactos?rev=27897&view=rev Log: Autosyncing with Wine HEAD
Modified: trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/advpack/install.c
Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?r... ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c (original) +++ trunk/reactos/dll/win32/advpack/files.c Fri Jul 27 13:03:12 2007 @@ -331,7 +331,6 @@ 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 @@ 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)
Modified: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.c... ============================================================================== --- trunk/reactos/dll/win32/advpack/install.c (original) +++ trunk/reactos/dll/win32/advpack/install.c Fri Jul 27 13:03:12 2007 @@ -512,8 +512,7 @@ /* 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);