From 4226e548662339ea1ca37b45385a7cf9b237ff1e Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:07:43 +0200 Subject: 3.8 --- shared/IFileOperation/FileOperation_Vista.vcproj | 409 ---------------------- shared/IFileOperation/FileOperation_Vista.vcxproj | 234 +++++++++++++ shared/IFileOperation/dllmain.cpp | 2 +- shared/IFileOperation/fileOp.cpp | 4 +- 4 files changed, 238 insertions(+), 411 deletions(-) delete mode 100644 shared/IFileOperation/FileOperation_Vista.vcproj create mode 100644 shared/IFileOperation/FileOperation_Vista.vcxproj (limited to 'shared/IFileOperation') diff --git a/shared/IFileOperation/FileOperation_Vista.vcproj b/shared/IFileOperation/FileOperation_Vista.vcproj deleted file mode 100644 index 1d224649..00000000 --- a/shared/IFileOperation/FileOperation_Vista.vcproj +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/shared/IFileOperation/FileOperation_Vista.vcxproj b/shared/IFileOperation/FileOperation_Vista.vcxproj new file mode 100644 index 00000000..1cbb4a28 --- /dev/null +++ b/shared/IFileOperation/FileOperation_Vista.vcxproj @@ -0,0 +1,234 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Vista IFileOperation + {70394AEF-5897-4911-AFA1-82EAF0581EFA} + ShadowDll + Win32Proj + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + Unicode + true + Windows7.1SDK + + + DynamicLibrary + Unicode + Windows7.1SDK + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\ + OBJ\$(ProjectName)_$(Configuration)_$(Platform)\ + false + .\ + OBJ\$(ProjectName)_$(Configuration)_$(Platform)\ + false + .\ + OBJ\$(ProjectName)_$(Configuration)_$(Platform)\ + false + .\ + OBJ\$(ProjectName)_$(Configuration)_$(Platform)\ + false + FileOperation_$(Platform) + FileOperation_$(Platform) + FileOperation_$(Platform) + FileOperation_$(Platform) + + + + $(IntDir)Build.html + + + Disabled + _DEBUG;_WINDOWS;_USRDLL;FILE_OP_DLL_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + EditAndContinue + 4100 + + + $(OutDir)$(TargetName)$(TargetExt) + true + true + $(IntDir)$(TargetName).pdb + Windows + + + $(IntDir)$(TargetName).lib + MachineX86 + + + + + $(IntDir)Build.html + + + X64 + + + Disabled + _DEBUG;_WINDOWS;_USRDLL;FILE_OP_DLL_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level4 + true + ProgramDatabase + 4100 + + + $(OutDir)$(TargetName)$(TargetExt) + true + true + $(IntDir)$(TargetName).pdb + Windows + + + $(IntDir)$(TargetName).lib + MachineX64 + + + + + $(IntDir)Build.html + + + MaxSpeed + true + NDEBUG;_WINDOWS;_USRDLL;FILE_OP_DLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level4 + true + ProgramDatabase + Speed + 4100 + + + $(OutDir)$(TargetName)$(TargetExt) + true + false + Windows + true + true + UseLinkTimeCodeGeneration + + + $(IntDir)$(TargetName).lib + MachineX86 + + + + + $(IntDir)Build.html + + + X64 + + + MaxSpeed + true + NDEBUG;_WINDOWS;_USRDLL;FILE_OP_DLL_EXPORTS;%(PreprocessorDefinitions) + MultiThreaded + true + + + Level4 + true + ProgramDatabase + Speed + 4100 + + + $(OutDir)$(TargetName)$(TargetExt) + true + false + Windows + true + true + UseLinkTimeCodeGeneration + + + $(IntDir)$(TargetName).lib + MachineX64 + + + + + + + false + + + false + + + false + + + false + + + + + + + + + + \ No newline at end of file diff --git a/shared/IFileOperation/dllmain.cpp b/shared/IFileOperation/dllmain.cpp index 7db39bff..8dae897a 100644 --- a/shared/IFileOperation/dllmain.cpp +++ b/shared/IFileOperation/dllmain.cpp @@ -14,7 +14,7 @@ BOOL APIENTRY DllMain( HMODULE hModule, LPVOID lpReserved ) { - switch (ul_reason_for_call) + switch (ul_reason_for_call) { case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: diff --git a/shared/IFileOperation/fileOp.cpp b/shared/IFileOperation/fileOp.cpp index 732fb9b5..761ec06d 100644 --- a/shared/IFileOperation/fileOp.cpp +++ b/shared/IFileOperation/fileOp.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include void writeString(const std::wstring& input, wchar_t* output, size_t outputBufferLen) @@ -57,6 +57,8 @@ public: item_->Release(); } private: + ReleaseAtExit(const ReleaseAtExit&); + ReleaseAtExit& operator=(const ReleaseAtExit&); T*& item_; }; -- cgit