diff --git a/include/usvfs.h b/include/usvfs.h index ca0350a..03e8111 100644 --- a/include/usvfs.h +++ b/include/usvfs.h @@ -59,50 +59,44 @@ extern "C" { /** * removes all virtual mappings */ -DLLEXPORT void WINAPI ClearVirtualMappings(); +DLLEXPORT void WINAPI usvfsClearVirtualMappings(); /** * link a file virtually * @note: the directory the destination file resides in has to exist - at least virtually. */ -DLLEXPORT BOOL WINAPI VirtualLinkFile(LPCWSTR source, LPCWSTR destination, unsigned int flags); +DLLEXPORT BOOL WINAPI usvfsVirtualLinkFile(LPCWSTR source, LPCWSTR destination, unsigned int flags); /** * link a directory virtually. This static variant recursively links all files individually, change notifications * are used to update the information. * @param failIfExists if true, this call fails if the destination directory exists (virtually or physically) */ -DLLEXPORT BOOL WINAPI VirtualLinkDirectoryStatic(LPCWSTR source, LPCWSTR destination, unsigned int flags); +DLLEXPORT BOOL WINAPI usvfsVirtualLinkDirectoryStatic(LPCWSTR source, LPCWSTR destination, unsigned int flags); /** * connect to a virtual filesystem as a controller, without hooking the calling process. Please note that * you can only be connected to one vfs, so this will silently disconnect from a previous vfs. */ -[[deprecated("deprecated, use usvfsConnectVFS()")]] -DLLEXPORT BOOL WINAPI ConnectVFS(const USVFSParameters *parameters); - DLLEXPORT BOOL WINAPI usvfsConnectVFS(const usvfsParameters* p); /** * @brief create a new VFS. This is similar to ConnectVFS except it guarantees * the vfs is reset before use. */ -[[deprecated("deprecated, use usvfsCreateVFS()")]] -DLLEXPORT BOOL WINAPI CreateVFS(const USVFSParameters *parameters); - DLLEXPORT BOOL WINAPI usvfsCreateVFS(const usvfsParameters* p); /** * disconnect from a virtual filesystem. This removes hooks if necessary */ -DLLEXPORT void WINAPI DisconnectVFS(); +DLLEXPORT void WINAPI usvfsDisconnectVFS(); -DLLEXPORT void WINAPI GetCurrentVFSName(char *buffer, size_t size); +DLLEXPORT void WINAPI usvfsGetCurrentVFSName(char *buffer, size_t size); /** * retrieve a list of all processes connected to the vfs */ -DLLEXPORT BOOL WINAPI GetVFSProcessList(size_t *count, LPDWORD processIDs); +DLLEXPORT BOOL WINAPI usvfsGetVFSProcessList(size_t *count, LPDWORD processIDs); // retrieve a list of all processes connected to the vfs, stores an array // of `count` elements in `*buffer` @@ -116,12 +110,12 @@ DLLEXPORT BOOL WINAPI GetVFSProcessList(size_t *count, LPDWORD processIDs); // running, probably some internal error // - ERROR_NOT_ENOUGH_MEMORY: malloc() failed // -DLLEXPORT BOOL WINAPI GetVFSProcessList2(size_t* count, DWORD** buffer); +DLLEXPORT BOOL WINAPI usvfsGetVFSProcessList2(size_t* count, DWORD** buffer); /** * spawn a new process that can see the virtual file system. The signature is identical to CreateProcess */ -DLLEXPORT BOOL WINAPI CreateProcessHooked( +DLLEXPORT BOOL WINAPI usvfsCreateProcessHooked( LPCWSTR lpApplicationName, LPWSTR lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, BOOL bInheritHandles, @@ -133,7 +127,7 @@ DLLEXPORT BOOL WINAPI CreateProcessHooked( * FIXME There is currently no way to unblock from the caller side * FIXME retrieves log messages from all instances, the logging queue is not separated */ -DLLEXPORT bool WINAPI GetLogMessages(LPSTR buffer, size_t size, bool blocking = false); +DLLEXPORT bool WINAPI usvfsGetLogMessages(LPSTR buffer, size_t size, bool blocking = false); /** * retrieves a readable representation of the vfs tree @@ -143,19 +137,19 @@ DLLEXPORT bool WINAPI GetLogMessages(LPSTR buffer, size_t size, bool blocking = * this value will have been updated to contain the required size, * even if this is bigger than the buffer size */ -DLLEXPORT BOOL WINAPI CreateVFSDump(LPSTR buffer, size_t *size); +DLLEXPORT BOOL WINAPI usvfsCreateVFSDump(LPSTR buffer, size_t *size); /** * adds an executable to the blacklist so it doesn't get exposed to the virtual * file system * @param executableName name of the executable */ -DLLEXPORT VOID WINAPI BlacklistExecutable(LPWSTR executableName); +DLLEXPORT VOID WINAPI usvfsBlacklistExecutable(LPWSTR executableName); /** * clears the executable blacklist */ -DLLEXPORT VOID WINAPI ClearExecutableBlacklist(); +DLLEXPORT VOID WINAPI usvfsClearExecutableBlacklist(); /** * adds a file suffix to a list to skip during file linking @@ -189,21 +183,21 @@ DLLEXPORT VOID WINAPI usvfsClearSkipDirectories(); * adds a library to be force loaded when the given process is injected * @param */ -DLLEXPORT VOID WINAPI ForceLoadLibrary(LPWSTR processName, LPWSTR libraryPath); +DLLEXPORT VOID WINAPI usvfsForceLoadLibrary(LPWSTR processName, LPWSTR libraryPath); /** * clears all previous calls to ForceLoadLibrary */ -DLLEXPORT VOID WINAPI ClearLibraryForceLoads(); +DLLEXPORT VOID WINAPI usvfsClearLibraryForceLoads(); /** * print debugging info about the vfs. The format is currently not fixed and may * change between usvfs versions */ -DLLEXPORT VOID WINAPI PrintDebugInfo(); +DLLEXPORT VOID WINAPI usvfsPrintDebugInfo(); //#if defined(UNITTEST) || defined(_WINDLL) -DLLEXPORT void WINAPI InitLogging(bool toLocal = false); +DLLEXPORT void WINAPI usvfsInitLogging(bool toLocal = false); //#endif /** @@ -211,26 +205,12 @@ DLLEXPORT void WINAPI InitLogging(bool toLocal = false); */ DLLEXPORT void __cdecl InitHooks(LPVOID userData, size_t userDataSize); -[[deprecated("deprecated, use usvfsCreateParameters()")]] -DLLEXPORT void WINAPI USVFSInitParameters(USVFSParameters *parameters, - const char *instanceName, - bool debugMode, - LogLevel logLevel, - CrashDumpsType crashDumpsType, - const char *crashDumpsPath); - -/** -* @brief Used to change parameters which can be changed in runtime -*/ -[[deprecated("deprecated, use usvfsUpdateParameters()")]] -DLLEXPORT void WINAPI USVFSUpdateParams(LogLevel level, CrashDumpsType type); - // the instance and shm names are not updated // DLLEXPORT void WINAPI usvfsUpdateParameters(usvfsParameters* p); -DLLEXPORT int WINAPI CreateMiniDump(PEXCEPTION_POINTERS exceptionPtrs, CrashDumpsType type, const wchar_t* dumpPath); +DLLEXPORT int WINAPI usvfsCreateMiniDump(PEXCEPTION_POINTERS exceptionPtrs, CrashDumpsType type, const wchar_t* dumpPath); -DLLEXPORT const char* WINAPI USVFSVersionString(); +DLLEXPORT const char* WINAPI usvfsVersionString(); } diff --git a/src/usvfs_dll/hookcontext.h b/src/usvfs_dll/hookcontext.h index e28af1d..06e2d95 100644 --- a/src/usvfs_dll/hookcontext.h +++ b/src/usvfs_dll/hookcontext.h @@ -195,11 +195,6 @@ class HookContext } // namespace -// exposed only to unit tests for easier testability -extern "C" [[deprecated("deprecated, use usvfsCreateHookContext()")]] -DLLEXPORT usvfs::HookContext *__cdecl CreateHookContext( - const USVFSParameters ¶ms, HMODULE module); - extern "C" DLLEXPORT usvfs::HookContext* WINAPI usvfsCreateHookContext( const usvfsParameters& params, HMODULE module); diff --git a/src/usvfs_dll/hooks/kernel32.cpp b/src/usvfs_dll/hooks/kernel32.cpp index d2fe639..a9a6b32 100644 --- a/src/usvfs_dll/hooks/kernel32.cpp +++ b/src/usvfs_dll/hooks/kernel32.cpp @@ -1635,7 +1635,7 @@ VOID WINAPI usvfs::hook_ExitProcess(UINT exitCode) // nor does any pre/post call macro LOG_CALL().PARAM(exitCode); - DisconnectVFS(); + usvfsDisconnectVFS(); // HookManager::instance().removeHook("ExitProcess"); // PRE_REALCALL diff --git a/src/usvfs_dll/hooks/ntdll.cpp b/src/usvfs_dll/hooks/ntdll.cpp index ebef41f..e701752 100644 --- a/src/usvfs_dll/hooks/ntdll.cpp +++ b/src/usvfs_dll/hooks/ntdll.cpp @@ -1466,7 +1466,7 @@ NTSTATUS WINAPI usvfs::hook_NtTerminateProcess( GetProcessId(ProcessHandle) == GetCurrentProcessId(); if (isCurrentProcess) { - DisconnectVFS(); + usvfsDisconnectVFS(); } res = ::NtTerminateProcess(ProcessHandle, ExitStatus); diff --git a/src/usvfs_dll/usvfs.cpp b/src/usvfs_dll/usvfs.cpp index b84c85b..7ce0e9f 100644 --- a/src/usvfs_dll/usvfs.cpp +++ b/src/usvfs_dll/usvfs.cpp @@ -194,13 +194,13 @@ void InitLoggingInternal(bool toConsole, bool connectExistingSHM) } -void WINAPI InitLogging(bool toConsole) +void WINAPI usvfsInitLogging(bool toConsole) { InitLoggingInternal(toConsole, false); } -extern "C" DLLEXPORT bool WINAPI GetLogMessages(LPSTR buffer, size_t size, - bool blocking) +extern "C" DLLEXPORT bool WINAPI usvfsGetLogMessages( + LPSTR buffer, size_t size, bool blocking) { buffer[0] = '\0'; try { @@ -223,19 +223,6 @@ void SetLogLevel(LogLevel level) spdlog::get("hooks")->set_level(ConvertLogLevel(level)); } -// deprecated -// -void WINAPI USVFSUpdateParams(LogLevel level, CrashDumpsType type) -{ - auto* p = usvfsCreateParameters(); - - usvfsSetLogLevel(p, level); - usvfsSetCrashDumpType(p, type); - - usvfsUpdateParameters(p); - usvfsFreeParameters(p); -} - void WINAPI usvfsUpdateParameters(usvfsParameters* p) { spdlog::get("usvfs")->info( @@ -329,7 +316,7 @@ int createMiniDumpImpl(PEXCEPTION_POINTERS exceptionPtrs, CrashDumpsType type, c return 6; } -int WINAPI CreateMiniDump(PEXCEPTION_POINTERS exceptionPtrs, CrashDumpsType type, const wchar_t* dumpPath) +int WINAPI usvfsCreateMiniDump(PEXCEPTION_POINTERS exceptionPtrs, CrashDumpsType type, const wchar_t* dumpPath) { if (type == CrashDumpsType::None) return 0; @@ -394,7 +381,7 @@ LONG WINAPI VEHandler(PEXCEPTION_POINTERS exceptionPtrs) trampPool.setBlock(true); } - CreateMiniDump(exceptionPtrs, usvfs_dump_type, usvfs_dump_path.c_str()); + usvfsCreateMiniDump(exceptionPtrs, usvfs_dump_type, usvfs_dump_path.c_str()); return EXCEPTION_CONTINUE_SEARCH; } @@ -462,22 +449,12 @@ void __cdecl InitHooks(LPVOID parameters, size_t) } -void WINAPI GetCurrentVFSName(char *buffer, size_t size) +void WINAPI usvfsGetCurrentVFSName(char *buffer, size_t size) { ush::strncpy_sz(buffer, context->callParameters().currentSHMName, size); } -// deprecated -// -BOOL WINAPI CreateVFS(const USVFSParameters *oldParams) -{ - const usvfsParameters p(*oldParams); - const auto r = usvfsCreateVFS(&p); - - return r; -} - BOOL WINAPI usvfsCreateVFS(const usvfsParameters* p) { usvfs::HookContext::remove(p->instanceName); @@ -485,16 +462,6 @@ BOOL WINAPI usvfsCreateVFS(const usvfsParameters* p) } -// deprecated -// -BOOL WINAPI ConnectVFS(const USVFSParameters *oldParams) -{ - const usvfsParameters p(*oldParams); - const auto r = usvfsConnectVFS(&p); - - return r; -} - BOOL WINAPI usvfsConnectVFS(const usvfsParameters* params) { if (spdlog::get("usvfs").get() == nullptr) { @@ -503,7 +470,7 @@ BOOL WINAPI usvfsConnectVFS(const usvfsParameters* params) } try { - DisconnectVFS(); + usvfsDisconnectVFS(); context = new usvfs::HookContext(*params, dllModule); return TRUE; @@ -514,7 +481,7 @@ BOOL WINAPI usvfsConnectVFS(const usvfsParameters* params) } -void WINAPI DisconnectVFS() +void WINAPI usvfsDisconnectVFS() { if (spdlog::get("usvfs").get() == nullptr) { // create temporary logger so we don't get null-pointer exceptions @@ -560,7 +527,7 @@ bool processStillActive(DWORD pid) } -BOOL WINAPI GetVFSProcessList(size_t *count, LPDWORD processIDs) +BOOL WINAPI usvfsGetVFSProcessList(size_t *count, LPDWORD processIDs) { if (count == nullptr) { SetLastError(ERROR_INVALID_PARAMETER); @@ -586,7 +553,7 @@ BOOL WINAPI GetVFSProcessList(size_t *count, LPDWORD processIDs) return TRUE; } -BOOL WINAPI GetVFSProcessList2(size_t* count, DWORD** buffer) +BOOL WINAPI usvfsGetVFSProcessList2(size_t* count, DWORD** buffer) { if (!count || !buffer) { SetLastError(ERROR_INVALID_PARAMETER); @@ -615,7 +582,7 @@ BOOL WINAPI GetVFSProcessList2(size_t* count, DWORD** buffer) return TRUE; } -void WINAPI ClearVirtualMappings() +void WINAPI usvfsClearVirtualMappings() { context->redirectionTable()->clear(); context->inverseTable()->clear(); @@ -699,7 +666,7 @@ static bool fileNameInSkipDirectories(const std::string& directoryNameUtf8, return false; } -BOOL WINAPI VirtualLinkFile(LPCWSTR source, LPCWSTR destination, +BOOL WINAPI usvfsVirtualLinkFile(LPCWSTR source, LPCWSTR destination, unsigned int flags) { // TODO difference between winapi and ntdll api regarding system32 vs syswow64 @@ -763,7 +730,7 @@ static usvfs::shared::TreeFlags convertRedirectionFlags(unsigned int flags) return result; } -BOOL WINAPI VirtualLinkDirectoryStatic(LPCWSTR source, LPCWSTR destination, unsigned int flags) +BOOL WINAPI usvfsVirtualLinkDirectoryStatic(LPCWSTR source, LPCWSTR destination, unsigned int flags) { // TODO change notification not yet implemented try { @@ -814,7 +781,7 @@ BOOL WINAPI VirtualLinkDirectoryStatic(LPCWSTR source, LPCWSTR destination, unsi continue; } - VirtualLinkDirectoryStatic((sourceW + file.fileName).c_str(), + usvfsVirtualLinkDirectoryStatic((sourceW + file.fileName).c_str(), (destinationW + file.fileName).c_str(), flags); } } else { @@ -862,7 +829,7 @@ BOOL WINAPI VirtualLinkDirectoryStatic(LPCWSTR source, LPCWSTR destination, unsi } -BOOL WINAPI CreateProcessHooked(LPCWSTR lpApplicationName +BOOL WINAPI usvfsCreateProcessHooked(LPCWSTR lpApplicationName , LPWSTR lpCommandLine , LPSECURITY_ATTRIBUTES lpProcessAttributes , LPSECURITY_ATTRIBUTES lpThreadAttributes @@ -911,7 +878,7 @@ BOOL WINAPI CreateProcessHooked(LPCWSTR lpApplicationName } -BOOL WINAPI CreateVFSDump(LPSTR buffer, size_t *size) +BOOL WINAPI usvfsCreateVFSDump(LPSTR buffer, size_t *size) { assert(size != nullptr); std::ostringstream output; @@ -926,13 +893,13 @@ BOOL WINAPI CreateVFSDump(LPSTR buffer, size_t *size) } -VOID WINAPI BlacklistExecutable(LPWSTR executableName) +VOID WINAPI usvfsBlacklistExecutable(LPWSTR executableName) { context->blacklistExecutable(executableName); } -VOID WINAPI ClearExecutableBlacklist() +VOID WINAPI usvfsClearExecutableBlacklist() { context->clearExecutableBlacklist(); } @@ -962,19 +929,19 @@ VOID WINAPI usvfsClearSkipDirectories() } -VOID WINAPI ForceLoadLibrary(LPWSTR processName, LPWSTR libraryPath) +VOID WINAPI usvfsForceLoadLibrary(LPWSTR processName, LPWSTR libraryPath) { context->forceLoadLibrary(processName, libraryPath); } -VOID WINAPI ClearLibraryForceLoads() +VOID WINAPI usvfsClearLibraryForceLoads() { context->clearLibraryForceLoads(); } -VOID WINAPI PrintDebugInfo() +VOID WINAPI usvfsPrintDebugInfo() { spdlog::get("usvfs") ->warn("===== debug {} =====", context->redirectionTable().shmName()); @@ -997,38 +964,7 @@ VOID WINAPI PrintDebugInfo() ->warn("===== / debug {} =====", context->redirectionTable().shmName()); } - -// deprecated -// -void WINAPI USVFSInitParameters(USVFSParameters *parameters, - const char *instanceName, bool debugMode, - LogLevel logLevel, - CrashDumpsType crashDumpsType, - const char *crashDumpsPath) -{ - parameters->debugMode = debugMode; - parameters->logLevel = logLevel; - parameters->crashDumpsType = crashDumpsType; - - strncpy_s(parameters->instanceName, instanceName, _TRUNCATE); - if (crashDumpsPath && *crashDumpsPath && strlen(crashDumpsPath) < _countof(parameters->crashDumpsPath)) { - memcpy(parameters->crashDumpsPath, crashDumpsPath, strlen(crashDumpsPath)+1); - parameters->crashDumpsType = crashDumpsType; - } - else { - // crashDumpsPath invalid or overflow of USVFSParameters variable so disable crash dumps: - parameters->crashDumpsPath[0] = 0; - parameters->crashDumpsType = CrashDumpsType::None; - } - // we can't use the whole buffer as we need a few bytes to store a running - // counter - strncpy_s(parameters->currentSHMName, 60, instanceName, _TRUNCATE); - memset(parameters->currentInverseSHMName, '\0', _countof(parameters->currentInverseSHMName)); - _snprintf(parameters->currentInverseSHMName, 60, "inv_%s", instanceName); -} - - -const char* WINAPI USVFSVersionString() +const char* WINAPI usvfsVersionString() { return USVFS_VERSION_STRING; } diff --git a/test/tvfs_test/main.cpp b/test/tvfs_test/main.cpp index 4a36d4e..4387255 100644 --- a/test/tvfs_test/main.cpp +++ b/test/tvfs_test/main.cpp @@ -75,13 +75,26 @@ static std::shared_ptr logger() return result; } +auto defaultUsvfsParams(const char* instanceName = "usvfs_test") { + std::unique_ptr parameters{ + usvfsCreateParameters(), &usvfsFreeParameters }; + + usvfsSetInstanceName(parameters.get(), instanceName); + usvfsSetDebugMode(parameters.get(), true); + usvfsSetLogLevel(parameters.get(), LogLevel::Debug); + usvfsSetCrashDumpType(parameters.get(), CrashDumpsType::None); + usvfsSetCrashDumpPath(parameters.get(), ""); + + return std::move(parameters); +} + class USVFSTest : public testing::Test { public: void SetUp() { SHMLogger::create("usvfs"); // need to initialize logging in the context of the dll - InitLogging(); + usvfsInitLogging(); } void TearDown() { @@ -101,11 +114,10 @@ class USVFSTestWithReroute : public testing::Test void SetUp() { SHMLogger::create("usvfs"); // need to initialize logging in the context of the dll - InitLogging(); + usvfsInitLogging(); - USVFSParameters params; - USVFSInitParameters(¶ms, "usvfs_test", true, LogLevel::Debug, CrashDumpsType::None, ""); - m_Context.reset(CreateHookContext(params, ::GetModuleHandle(nullptr))); + auto params = defaultUsvfsParams(); + m_Context.reset(usvfsCreateHookContext(*params, ::GetModuleHandle(nullptr))); usvfs::RedirectionTreeContainer &tree = m_Context->redirectionTable(); tree.addFile(ush::string_cast(VIRTUAL_FILEW, ush::CodePage::UTF8).c_str() , usvfs::RedirectionDataLocal(REAL_FILEA)); @@ -127,14 +139,13 @@ class USVFSTestAuto : public testing::Test { public: void SetUp() { - USVFSParameters params; - USVFSInitParameters(¶ms, "usvfs_test_fixture", true, LogLevel::Debug, CrashDumpsType::None, ""); - ConnectVFS(¶ms); + auto params = defaultUsvfsParams(); + usvfsConnectVFS(params.get()); SHMLogger::create("usvfs"); } void TearDown() { - DisconnectVFS(); + usvfsDisconnectVFS(); std::array buffer; while (SHMLogger::instance().tryGet(buffer.data(), buffer.size())) { @@ -204,9 +215,8 @@ TEST_F(USVFSTest, GetFileAttributesHookReportsCorrectErrorOnMissingFile) { ASSERT_NO_THROW({ try { - USVFSParameters params; - USVFSInitParameters(¶ms, "usvfs_test", true, LogLevel::Debug, CrashDumpsType::None, ""); - std::unique_ptr ctx(CreateHookContext(params, ::GetModuleHandle(nullptr))); + auto params = defaultUsvfsParams(); + std::unique_ptr ctx(usvfsCreateHookContext(*params, ::GetModuleHandle(nullptr))); DWORD res = usvfs::hook_GetFileAttributesW(VIRTUAL_FILEW); ASSERT_EQ(INVALID_FILE_ATTRIBUTES, res); @@ -220,9 +230,8 @@ TEST_F(USVFSTest, GetFileAttributesHookReportsCorrectErrorOnMissingFile) TEST_F(USVFSTest, GetFileAttributesHookRedirectsFile) { - USVFSParameters params; - USVFSInitParameters(¶ms, "usvfs_test", true, LogLevel::Debug, CrashDumpsType::None, ""); - std::unique_ptr ctx(CreateHookContext(params, ::GetModuleHandle(nullptr))); + auto params = defaultUsvfsParams(); + std::unique_ptr ctx(usvfsCreateHookContext(*params, ::GetModuleHandle(nullptr))); usvfs::RedirectionTreeContainer &tree = ctx->redirectionTable(); tree.addFile(ush::string_cast(VIRTUAL_FILEW, ush::CodePage::UTF8).c_str() @@ -293,10 +302,8 @@ HANDLE hooked_NtOpenFile(LPWSTR path, ACCESS_MASK accessMask, ULONG shareAccess, TEST_F(USVFSTest, NtQueryDirectoryFileRegularFile) { - USVFSParameters params; - USVFSInitParameters(¶ms, "usvfs_test", true, LogLevel::Debug, CrashDumpsType::None, ""); - std::unique_ptr ctx(CreateHookContext(params, ::GetModuleHandle(nullptr))); - + auto params = defaultUsvfsParams(); + std::unique_ptr ctx(usvfsCreateHookContext(*params, ::GetModuleHandle(nullptr))); HANDLE hdl = hooked_NtOpenFile( L"C:\\" @@ -325,9 +332,8 @@ TEST_F(USVFSTest, NtQueryDirectoryFileRegularFile) TEST_F(USVFSTest, NtQueryDirectoryFileFindsVirtualFile) { - USVFSParameters params; - USVFSInitParameters(¶ms, "usvfs_test", true, LogLevel::Debug, CrashDumpsType::None, ""); - std::unique_ptr ctx(CreateHookContext(params, ::GetModuleHandle(nullptr))); + auto params = defaultUsvfsParams(); + std::unique_ptr ctx(usvfsCreateHookContext(*params, ::GetModuleHandle(nullptr))); usvfs::RedirectionTreeContainer &tree = ctx->redirectionTable(); tree.addFile(L"C:\\np.exe", usvfs::RedirectionDataLocal(REAL_FILEA)); @@ -363,7 +369,7 @@ TEST_F(USVFSTest, NtQueryDirectoryFileFindsVirtualFile) TEST_F(USVFSTestAuto, CannotCreateLinkToFileInNonexistantDirectory) { - ASSERT_EQ(FALSE, VirtualLinkFile(REAL_FILEW, L"c:/this_directory_shouldnt_exist/np.exe", FALSE)); + ASSERT_EQ(FALSE, usvfsVirtualLinkFile(REAL_FILEW, L"c:/this_directory_shouldnt_exist/np.exe", FALSE)); } TEST_F(USVFSTestAuto, CanCreateMultipleLinks) @@ -371,8 +377,8 @@ TEST_F(USVFSTestAuto, CanCreateMultipleLinks) static LPCWSTR outFile = LR"(C:\np.exe)"; static LPCWSTR outDir = LR"(C:\logs)"; static LPCWSTR outDirCanonizeTest = LR"(C:\.\not/../logs\.\a\.\b\.\c\..\.\..\.\..\)"; - ASSERT_EQ(TRUE, VirtualLinkFile(REAL_FILEW, outFile, 0)); - ASSERT_EQ(TRUE, VirtualLinkDirectoryStatic(REAL_DIRW, outDir, 0)); + ASSERT_EQ(TRUE, usvfsVirtualLinkFile(REAL_FILEW, outFile, 0)); + ASSERT_EQ(TRUE, usvfsVirtualLinkDirectoryStatic(REAL_DIRW, outDir, 0)); // both file and dir exist and have the correct type ASSERT_NE(INVALID_FILE_ATTRIBUTES, usvfs::hook_GetFileAttributesW(outFile)); diff --git a/test/usvfs_test/usvfs_test_base.cpp b/test/usvfs_test/usvfs_test_base.cpp index 45a33b4..b8d6828 100644 --- a/test/usvfs_test/usvfs_test_base.cpp +++ b/test/usvfs_test/usvfs_test_base.cpp @@ -108,16 +108,23 @@ class usvfs_connector { std::wcout << "Connecting VFS..." << std::endl; - USVFSParameters params; - USVFSInitParameters(¶ms, "usvfs_test", false, LogLevel::Debug, CrashDumpsType::None, ""); - InitLogging(false); - CreateVFS(¶ms); + std::unique_ptr parameters{ + usvfsCreateParameters(), &usvfsFreeParameters }; + + usvfsSetInstanceName(parameters.get(), "usvfs_test"); + usvfsSetDebugMode(parameters.get(), false); + usvfsSetLogLevel(parameters.get(), LogLevel::Debug); + usvfsSetCrashDumpType(parameters.get(), CrashDumpsType::None); + usvfsSetCrashDumpPath(parameters.get(), ""); + + usvfsInitLogging(false); + usvfsCreateVFS(parameters.get()); m_log_thread = std::thread(&usvfs_connector::usvfs_logger, this); } ~usvfs_connector() { - DisconnectVFS(); + usvfsDisconnectVFS(); m_exit_signal.set_value(); m_log_thread.join(); } @@ -147,7 +154,7 @@ class usvfs_connector { fprintf(log, "Updating VFS mappings:\n"); - ClearVirtualMappings(); + usvfsClearVirtualMappings(); for (const auto& map : mappings) { const string& source = usvfs_test_base::SOURCE_LABEL + @@ -158,17 +165,17 @@ class usvfs_connector { { case map_type::dir: fprintf(log, " mapdir: %s => %s\n", source.c_str(), destination.c_str()); - VirtualLinkDirectoryStatic(map.source.c_str(), map.destination.c_str(), LINKFLAG_RECURSIVE); + usvfsVirtualLinkDirectoryStatic(map.source.c_str(), map.destination.c_str(), LINKFLAG_RECURSIVE); break; case map_type::dircreate: fprintf(log, " mapdircreate: %s => %s\n", source.c_str(), destination.c_str()); - VirtualLinkDirectoryStatic(map.source.c_str(), map.destination.c_str(), LINKFLAG_CREATETARGET|LINKFLAG_RECURSIVE); + usvfsVirtualLinkDirectoryStatic(map.source.c_str(), map.destination.c_str(), LINKFLAG_CREATETARGET|LINKFLAG_RECURSIVE); break; case map_type::file: fprintf(log, " mapfile: %s => %s\n", source.c_str(), destination.c_str()); - VirtualLinkFile(map.source.c_str(), map.destination.c_str(), LINKFLAG_RECURSIVE); + usvfsVirtualLinkFile(map.source.c_str(), map.destination.c_str(), LINKFLAG_RECURSIVE); break; } } @@ -184,7 +191,7 @@ class usvfs_connector { si.cb = sizeof(si); PROCESS_INFORMATION pi{ 0 }; - if (!CreateProcessHooked(NULL, commandline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + if (!usvfsCreateProcessHooked(NULL, commandline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) throw_testWinFuncFailed("CreateProcessHooked", string_cast(commandline, CodePage::UTF8).c_str()); WaitForSingleObject(pi.hProcess, INFINITE); @@ -214,7 +221,7 @@ class usvfs_connector { int noLogCycles = 0; std::chrono::milliseconds wait_for; do { - if (GetLogMessages(buf, size, false)) { + if (usvfsGetLogMessages(buf, size, false)) { fwrite(buf, 1, strlen(buf), m_usvfs_log); fwrite("\n", 1, 1, m_usvfs_log); fflush(m_usvfs_log); @@ -228,7 +235,7 @@ class usvfs_connector { wait_for = std::chrono::milliseconds(0); } while (m_exit_future.wait_for(wait_for) == std::future_status::timeout); - while (GetLogMessages(buf, size, false)) { + while (usvfsGetLogMessages(buf, size, false)) { fwrite(buf, 1, strlen(buf), m_usvfs_log); fwrite("\n", 1, 1, m_usvfs_log); } diff --git a/vsbuild/asmjit.vcxproj b/vsbuild/asmjit.vcxproj index 4334bf0..8d734c8 100644 --- a/vsbuild/asmjit.vcxproj +++ b/vsbuild/asmjit.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -98,12 +90,6 @@ 10.0 - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -124,12 +110,6 @@ true Unicode - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -155,10 +135,6 @@ - - - - @@ -171,10 +147,6 @@ - - - - @@ -189,12 +161,6 @@ - - - Disabled - ASMJIT_STATIC;%(PreprocessorDefinitions) - - Disabled @@ -204,12 +170,6 @@ Default - - - Disabled - ASMJIT_STATIC;%(PreprocessorDefinitions) - - Disabled diff --git a/vsbuild/fmt.vcxproj b/vsbuild/fmt.vcxproj index 4ea1731..6b0fae1 100644 --- a/vsbuild/fmt.vcxproj +++ b/vsbuild/fmt.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -67,12 +53,6 @@ true Unicode - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -98,10 +78,6 @@ - - - - @@ -114,10 +90,6 @@ - - - - @@ -132,11 +104,6 @@ - - - Disabled - - Disabled @@ -145,11 +112,6 @@ Default - - - Disabled - - Disabled diff --git a/vsbuild/shared.vcxproj b/vsbuild/shared.vcxproj index 5d3584a..abef70d 100644 --- a/vsbuild/shared.vcxproj +++ b/vsbuild/shared.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -67,12 +53,6 @@ true Unicode - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,15 +110,6 @@ - - - Disabled - stdcpp17 - Use - pch.h - pch.h - - Disabled @@ -161,15 +122,6 @@ MultiThreadedDebug - - - Disabled - stdcpp17 - Use - pch.h - pch.h - - Disabled @@ -258,11 +210,9 @@ - Create Create Create Create - Create Create Create Create diff --git a/vsbuild/shared_test.vcxproj b/vsbuild/shared_test.vcxproj index cea9665..dc39bfb 100644 --- a/vsbuild/shared_test.vcxproj +++ b/vsbuild/shared_test.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,15 +110,6 @@ - - - Disabled - stdcpp17 - - - Console - - Disabled @@ -164,15 +125,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - stdcpp17 - - - Console - - Disabled diff --git a/vsbuild/spdlog.vcxproj b/vsbuild/spdlog.vcxproj index 0237754..086e188 100644 --- a/vsbuild/spdlog.vcxproj +++ b/vsbuild/spdlog.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - MultiByte - Application true @@ -67,12 +53,6 @@ true MultiByte - - Application - true - v143 - MultiByte - Application true @@ -98,10 +78,6 @@ - - - - @@ -114,10 +90,6 @@ - - - - @@ -156,24 +128,12 @@ true - - - Disabled - true - - Disabled true - - - Disabled - true - - Disabled diff --git a/vsbuild/test_file_operations.vcxproj b/vsbuild/test_file_operations.vcxproj index db04bd7..53cc92e 100644 --- a/vsbuild/test_file_operations.vcxproj +++ b/vsbuild/test_file_operations.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,16 +110,6 @@ - - - Disabled - stdcpp17 - - - Console - ntdll.lib;%(AdditionalDependencies) - - Disabled @@ -166,16 +126,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - stdcpp17 - - - Console - ntdll.lib;%(AdditionalDependencies) - - Disabled diff --git a/vsbuild/testinject_bin.vcxproj b/vsbuild/testinject_bin.vcxproj index bf671da..54335ba 100644 --- a/vsbuild/testinject_bin.vcxproj +++ b/vsbuild/testinject_bin.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,15 +110,6 @@ - - - Disabled - stdcpp17 - - - Console - - Disabled @@ -164,15 +125,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - stdcpp17 - - - Console - - Disabled diff --git a/vsbuild/testinject_dll.vcxproj b/vsbuild/testinject_dll.vcxproj index 4ad2892..9ab91ff 100644 --- a/vsbuild/testinject_dll.vcxproj +++ b/vsbuild/testinject_dll.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - DynamicLibrary - true - v143 - Unicode - DynamicLibrary true @@ -67,12 +53,6 @@ true Unicode - - DynamicLibrary - true - v143 - Unicode - DynamicLibrary true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,12 +110,6 @@ - - - Disabled - stdcpp17 - - Disabled @@ -160,12 +124,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - stdcpp17 - - Disabled diff --git a/vsbuild/thooklib.vcxproj b/vsbuild/thooklib.vcxproj index 72c1e8a..109edd9 100644 --- a/vsbuild/thooklib.vcxproj +++ b/vsbuild/thooklib.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -67,12 +53,6 @@ true Unicode - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,15 +110,6 @@ - - - Disabled - stdcpp17 - Use - pch.h - pch.h - - Disabled @@ -160,15 +121,6 @@ MultiThreadedDebug - - - Disabled - stdcpp17 - Use - pch.h - pch.h - - Disabled @@ -258,11 +210,9 @@ - Create Create Create Create - Create Create Create Create diff --git a/vsbuild/thooklib_test.vcxproj b/vsbuild/thooklib_test.vcxproj index 5d8063f..fc7404c 100644 --- a/vsbuild/thooklib_test.vcxproj +++ b/vsbuild/thooklib_test.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,15 +110,6 @@ - - - Disabled - stdcpp17 - - - Console - - Disabled @@ -164,15 +125,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - stdcpp17 - - - Console - - Disabled diff --git a/vsbuild/tinjectlib.vcxproj b/vsbuild/tinjectlib.vcxproj index 25acdc9..8176cb0 100644 --- a/vsbuild/tinjectlib.vcxproj +++ b/vsbuild/tinjectlib.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -67,12 +53,6 @@ true Unicode - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,12 +110,6 @@ - - - Disabled - stdcpp17 - - Disabled @@ -154,12 +118,6 @@ MultiThreadedDebug - - - Disabled - stdcpp17 - - Disabled diff --git a/vsbuild/tinjectlib_test.vcxproj b/vsbuild/tinjectlib_test.vcxproj index f6372bb..935c163 100644 --- a/vsbuild/tinjectlib_test.vcxproj +++ b/vsbuild/tinjectlib_test.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,14 +110,6 @@ - - - Disabled - - - Console - - Disabled @@ -162,14 +124,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - - - Console - - Disabled diff --git a/vsbuild/tvfs_test.vcxproj b/vsbuild/tvfs_test.vcxproj index 9510667..2452afd 100644 --- a/vsbuild/tvfs_test.vcxproj +++ b/vsbuild/tvfs_test.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,16 +110,6 @@ - - - Disabled - ..\src\usvfs_dll;%(AdditionalIncludeDirectories) - - - Console - usvfs_$(PlatformShortName).dll - - Disabled @@ -165,16 +125,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - ..\src\usvfs_dll;%(AdditionalIncludeDirectories) - - - Console - usvfs_$(PlatformShortName).dll - - Disabled diff --git a/vsbuild/udis86.vcxproj b/vsbuild/udis86.vcxproj index dc4f2dc..e67425d 100644 --- a/vsbuild/udis86.vcxproj +++ b/vsbuild/udis86.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -67,12 +53,6 @@ true Unicode - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -139,9 +109,6 @@ - - PrepareForBuild - PrepareForBuild @@ -151,9 +118,6 @@ PrepareForBuild - - PrepareForBuild - PrepareForBuild @@ -163,24 +127,6 @@ PrepareForBuild - - - Disabled - C:\Games\MO2\build\usvfs_clean\udis86\libudis86;%(AdditionalIncludeDirectories) - - - python ..\udis86\scripts\ud_itab.py ..\udis86\docs\x86\optable.xml ..\udis86\libudis86 - - - Building udis86 optable - - - ..\udis86\libudis86\itab.c;..\udis86\libudis86\itab.h - - - ..\udis86\docs\x86\optable.xml;..\udis86\scripts\ud_itab.py;..\udis86\scripts\ud_opcode.py - - Disabled @@ -202,24 +148,6 @@ ..\udis86\docs\x86\optable.xml;..\udis86\scripts\ud_itab.py;..\udis86\scripts\ud_opcode.py - - - Disabled - C:\Games\MO2\build\usvfs_clean\udis86\libudis86;%(AdditionalIncludeDirectories) - - - python ..\udis86\scripts\ud_itab.py ..\udis86\docs\x86\optable.xml ..\udis86\libudis86 - - - Building udis86 optable - - - ..\udis86\libudis86\itab.c;..\udis86\libudis86\itab.h - - - ..\udis86\docs\x86\optable.xml;..\udis86\scripts\ud_itab.py;..\udis86\scripts\ud_opcode.py - - Disabled diff --git a/vsbuild/usvfs_dll.vcxproj b/vsbuild/usvfs_dll.vcxproj index 469f02c..f95aff2 100644 --- a/vsbuild/usvfs_dll.vcxproj +++ b/vsbuild/usvfs_dll.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - DynamicLibrary - true - v143 - Unicode - DynamicLibrary true @@ -67,12 +53,6 @@ true Unicode - - DynamicLibrary - true - v143 - Unicode - DynamicLibrary true @@ -98,12 +78,6 @@ - - - - - - @@ -122,12 +96,6 @@ - - - - - - @@ -147,11 +115,6 @@ - - ..\lib\ - usvfs_$(PlatformShortName) - Build - ..\lib\ usvfs_$(PlatformShortName) @@ -169,11 +132,6 @@ Build false - - ..\lib\ - usvfs_$(PlatformShortName) - Build - ..\lib\ usvfs_$(PlatformShortName) @@ -191,30 +149,6 @@ Build false - - - Disabled - BUILDING_USVFS_DLL;%(PreprocessorDefinitions) - Use - pch.h - pch.h - - - Shlwapi.lib;Version.lib;%(AdditionalDependencies) - - - stage_helper.cmd "$(TargetName)" "$(TargetPath)" "$(STAGING_DLL)\$(TargetFileName)" "$(TargetDir)$(TargetName).lib" "$(STAGING_LIB)\$(TargetName).lib" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(TargetName).pdb" - - - Staging - - - $(STAGING_DLL)\$(TargetFileName) - - - $(TargetPath) - - Disabled @@ -242,30 +176,6 @@ $(TargetPath) - - - Disabled - BUILDING_USVFS_DLL;%(PreprocessorDefinitions) - Use - pch.h - pch.h - - - Shlwapi.lib;Version.lib;%(AdditionalDependencies) - - - stage_helper.cmd "$(TargetName)" "$(TargetPath)" "$(STAGING_DLL)\$(TargetFileName)" "$(TargetDir)$(TargetName).lib" "$(STAGING_LIB)\$(TargetName).lib" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(TargetName).pdb" - - - Staging - - - $(STAGING_DLL)\$(TargetFileName) - - - $(TargetPath) - - Disabled @@ -427,17 +337,13 @@ - Create Create - pch.h pch.h Create Create pch.h pch.h - Create Create - pch.h pch.h Create Create diff --git a/vsbuild/usvfs_helper.vcxproj b/vsbuild/usvfs_helper.vcxproj index d788505..7db6a9c 100644 --- a/vsbuild/usvfs_helper.vcxproj +++ b/vsbuild/usvfs_helper.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -67,12 +53,6 @@ true Unicode - - StaticLibrary - true - v143 - Unicode - StaticLibrary true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,12 +110,6 @@ - - - Disabled - BUILDING_USVFS_DLL;%(PreprocessorDefinitions) - - Disabled @@ -155,12 +119,6 @@ MultiThreadedDebug - - - Disabled - BUILDING_USVFS_DLL;%(PreprocessorDefinitions) - - Disabled diff --git a/vsbuild/usvfs_proxy.vcxproj b/vsbuild/usvfs_proxy.vcxproj index 18d3af3..eca7f96 100644 --- a/vsbuild/usvfs_proxy.vcxproj +++ b/vsbuild/usvfs_proxy.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,12 +78,6 @@ - - - - - - @@ -122,12 +96,6 @@ - - - - - - @@ -147,11 +115,6 @@ - - ..\bin\ - $(ProjectName)_$(PlatformShortName) - Build - ..\bin\ $(ProjectName)_$(PlatformShortName) @@ -169,10 +132,6 @@ Build false - - ..\bin\ - $(ProjectName)_$(PlatformShortName) - ..\bin\ $(ProjectName)_$(PlatformShortName) @@ -189,17 +148,6 @@ false Build - - - Disabled - - - Staging - stage_helper.cmd "$(ProjectName)" "$(TargetPath)" "$(STAGING_EXE)\$(ProjectName).exe" "$(TargetDir)$(TargetName).pdb" "$(STAGING_PDB)\$(ProjectName).pdb" - $(STAGING_EXE)\$(ProjectName).exe - $(TargetPath) - - Disabled @@ -214,11 +162,6 @@ $(TargetPath) - - - Disabled - - Disabled diff --git a/vsbuild/usvfs_test.vcxproj b/vsbuild/usvfs_test.vcxproj index e24af47..9d2cd0c 100644 --- a/vsbuild/usvfs_test.vcxproj +++ b/vsbuild/usvfs_test.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,16 +110,6 @@ - - - Disabled - ..\src\usvfs_dll;%(AdditionalIncludeDirectories) - - - Console - usvfs_$(PlatformShortName).dll - - Disabled @@ -165,16 +125,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - ..\src\usvfs_dll;%(AdditionalIncludeDirectories) - - - Console - usvfs_$(PlatformShortName).dll - - Disabled diff --git a/vsbuild/usvfs_test_runner.vcxproj b/vsbuild/usvfs_test_runner.vcxproj index 9fa3104..17e8b32 100644 --- a/vsbuild/usvfs_test_runner.vcxproj +++ b/vsbuild/usvfs_test_runner.vcxproj @@ -9,10 +9,6 @@ DebugTest x64 - - Debug - Win32 - ReleaseTest Win32 @@ -25,10 +21,6 @@ Release Win32 - - Debug - x64 - Release x64 @@ -41,12 +33,6 @@ 10.0 - - Application - true - v143 - Unicode - Application true @@ -67,12 +53,6 @@ true Unicode - - Application - true - v143 - Unicode - Application true @@ -98,11 +78,6 @@ - - - - - @@ -118,11 +93,6 @@ - - - - - @@ -140,14 +110,6 @@ - - - Disabled - - - Console - - Disabled @@ -162,14 +124,6 @@ %(AdditionalLibraryDirectories);$(GTEST_LIBDIR);$(GTEST_PATH)\build$(PLATFORM_32)\lib - - - Disabled - - - Console - - Disabled