Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix move for readonly folder and file. for now it is a small hack for readonly folders, Small Cleanup in the code, thx w3seek for the help with SetFileAttribs code.

Browse source 
svn path=/trunk/; revision=18130
This commit is contained in:
Magnus Olsen 2005-09-27 21:49:18 +00:00
parent 6c01ff3c32
commit 6653931c3d
1 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
reactos/lib/kernel32/file/move.c
View file

@ -21,6 +21,19 @@
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/
static BOOL
RemoveReadOnlyAttributeW(IN LPCWSTR lpFileName)
{
DWORD Attributes;
Attributes = GetFileAttributesW(lpFileName);
if (Attributes != INVALID_FILE_ATTRIBUTES)
{
return SetFileAttributesW(lpFileName,Attributes -
(Attributes & ~FILE_ATTRIBUTE_READONLY));
}
return FALSE;
}
static BOOL
AdjustFileAttributes (
@ -478,26 +491,15 @@ MoveFileWithProgressW (
{
FindClose(hFile);
/* delete folder */
size = GetFullPathNameW(lpExistingFileName2, MAX_PATH,(LPWSTR) lpDeleteFile, NULL);
if (size>MAX_PATH)
{
lpDeleteFile = (LPCWSTR) HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,
(VOID *) lpDeleteFile,size);
if (lpDeleteFile == NULL)
{
Result = FALSE;
goto FreeMemAndExit;
}
GetFullPathNameW(lpExistingFileName2, size,(LPWSTR) lpDeleteFile, NULL);
}
/* delete folder */
DPRINT("MoveFileWithProgressW : folder : %s\n",lpDeleteFile);
Result = RemoveDirectoryW(lpDeleteFile);
Result = RemoveReadOnlyAttributeW(lpExistingFileName2);
if (Result == FALSE)
break;
Result = RemoveDirectoryW(lpExistingFileName2);
if (Result == FALSE)
break;
@ -547,7 +549,18 @@ MoveFileWithProgressW (
}
}
wcscpy( (WCHAR *)&lpExistingFileName2[size2-3],findBuffer.cFileName);
wcscpy( (WCHAR *)&lpExistingFileName2[size2-3],findBuffer.cFileName);
/* FIXME
* RemoveReadOnlyAttributeW(lpExistingFileName2); is a hack
* for to move readonly folders
*/
wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\0");
RemoveReadOnlyAttributeW(lpExistingFileName2);
/* Continue */
wcscpy( (WCHAR *)&lpExistingFileName2[size2+size-3],L"\\*.*\0");
@ -651,6 +664,10 @@ MoveFileWithProgressW (
DPRINT("MoveFileWithProgressW : Delete file : %S : %S\n",lpDeleteFile, lpNewFileName2);
Result = RemoveReadOnlyAttributeW(lpDeleteFile);
if (Result == FALSE)
break;
Result = DeleteFileW(lpDeleteFile);
if (Result == FALSE)
{