Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ADVPACK] files.c: Properly mark Wine diff

Browse source 
Addendum to 6eb8a1d (0.4.15-dev-6918).
This commit is contained in:
Serge Gautherie 2022-10-13 19:56:10 +02:00 • committed by Stanislav Motylkov
parent 49e07292ed
commit 7661f7826c
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/advpack/files.c
View file

@ -341,17 +341,13 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)
HANDLE hFindFile; HANDLE hFindFile;
WIN32_FIND_DATAW w32fd; WIN32_FIND_DATAW w32fd;
BOOL done = TRUE; BOOL done = TRUE;
int fname_len; int fname_len = lstrlenW(fname);
#ifdef __REACTOS__ #ifdef __REACTOS__
if (flags & ADN_DEL_IF_EMPTY) if (flags & ADN_DEL_IF_EMPTY)
{
goto deleteinitialdirectory; goto deleteinitialdirectory;
}
#endif #endif
/* Generate a path with wildcard suitable for iterating */ /* Generate a path with wildcard suitable for iterating */
fname_len = lstrlenW(fname);
if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\'; if (fname_len && fname[fname_len-1] != '\\') fname[fname_len++] = '\\';
lstrcpyW(fname + fname_len, asterisk); lstrcpyW(fname + fname_len, asterisk);
@ -381,7 +377,9 @@ static HRESULT DELNODE_recurse_dirtree(LPWSTR fname, DWORD flags)
{ {
#ifdef __REACTOS__ #ifdef __REACTOS__
deleteinitialdirectory: deleteinitialdirectory:
#endif
TRACE("%s: directory\n", debugstr_w(fname)); TRACE("%s: directory\n", debugstr_w(fname));
#ifdef __REACTOS__
SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL); SetFileAttributesW(fname, FILE_ATTRIBUTE_NORMAL);
if (RemoveDirectoryW(fname)) if (RemoveDirectoryW(fname))
#else #else
@ -454,7 +452,7 @@ HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags)
HRESULT ret = E_FAIL; HRESULT ret = E_FAIL;
TRACE("(%s, %d)\n", debugstr_w(pszFileOrDirName), dwFlags); TRACE("(%s, %d)\n", debugstr_w(pszFileOrDirName), dwFlags);
#ifdef __REACTOS__ #ifdef __REACTOS__
if (dwFlags & ~ADN_DEL_IF_EMPTY) if (dwFlags & ~ADN_DEL_IF_EMPTY)
FIXME("Flags %#x ignored!\n", dwFlags & ~ADN_DEL_IF_EMPTY); FIXME("Flags %#x ignored!\n", dwFlags & ~ADN_DEL_IF_EMPTY);