timamsk/Open-Shell-Menu
1
0
Fork 0
mirror of https://github.com/Open-Shell/Open-Shell-Menu.git synced 2026-06-17 12:50:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Utility: Fix clash with windows API

Browse Source
This commit is contained in:
ge0rdi
2026-05-30 23:20:09 +02:00
parent 9518c3b650
commit 14b1ed4f06
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Setup/Utility/ManualUninstall.cpp
+6 -6
View File
@@ -30,17 +30,17 @@
#ifdef SAFE_MODE #ifdef SAFE_MODE
#define RegDeleteTree2(x,y) 5 #define RegDeleteTree2(x,y) 5
#define RegDeleteValue2(x,y) 5 #define RegDeleteValue2(x,y) 5
#define DeleteFile2(x) (SetLastError(3), FALSE) #define DeleteFile3(x) (SetLastError(3), FALSE)
#define MoveFileEx2(x,y,z) (SetLastError(5), FALSE) #define MoveFileEx2(x,y,z) (SetLastError(5), FALSE)
#define SHFileOperation2(x) 0x78 #define SHFileOperation2(x) 0x78
#define RemoveDirectory2(x) FALSE #define RemoveDirectory3(x) FALSE
#else #else
#define RegDeleteTree2(x,y) RegDeleteTree(x,y) #define RegDeleteTree2(x,y) RegDeleteTree(x,y)
#define RegDeleteValue2(x,y) RegDeleteValue(x,y) #define RegDeleteValue2(x,y) RegDeleteValue(x,y)
#define DeleteFile2(x) DeleteFile(x) #define DeleteFile3(x) DeleteFile(x)
#define MoveFileEx2(x,y,z) MoveFileEx(x,y,z) #define MoveFileEx2(x,y,z) MoveFileEx(x,y,z)
#define SHFileOperation2(x) SHFileOperation(x) #define SHFileOperation2(x) SHFileOperation(x)
#define RemoveDirectory2(x) RemoveDirectory(x) #define RemoveDirectory3(x) RemoveDirectory(x)
#endif #endif
// files to delete from the Open-Shell folder // files to delete from the Open-Shell folder
@@ -777,7 +777,7 @@ static bool DeleteFileEx( const wchar_t *fname, bool bAllowDelay )
if (attribs&FILE_ATTRIBUTE_READONLY) if (attribs&FILE_ATTRIBUTE_READONLY)
SetFileAttributes(fname,attribs&~FILE_ATTRIBUTE_READONLY); SetFileAttributes(fname,attribs&~FILE_ATTRIBUTE_READONLY);
LogMessage(-1,L"Deleting file %s",fname); LogMessage(-1,L"Deleting file %s",fname);
if (!DeleteFile2(fname)) if (!DeleteFile3(fname))
{ {
int error=GetLastError(); int error=GetLastError();
if (error==ERROR_ACCESS_DENIED && bAllowDelay) if (error==ERROR_ACCESS_DENIED && bAllowDelay)
@@ -826,7 +826,7 @@ static void DeleteDirectoryEx( const wchar_t *path, bool bDelay )
else else
{ {
LogMessage(-1,L"Deleting directory %s",path); LogMessage(-1,L"Deleting directory %s",path);
if (!RemoveDirectory2(path)) if (!RemoveDirectory3(path))
{ {
int error=GetLastError(); int error=GetLastError();
bool bOldHasErrors=g_bHasErrors; bool bOldHasErrors=g_bHasErrors;