This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/common/IPC.h b/src/common/IPC.h | |
| index cab883f..d1fcaee 100644 | |
| --- a/src/common/IPC.h | |
| +++ b/src/common/IPC.h | |
| @@ -209,7 +209,7 @@ template<> struct SerializeTraits<std::string> { | |
| }; | |
| // IPC message, which automatically serializes and deserializes objects | |
| -template<typename... T> class Message { | |
| +template<uint32_t Major, uint32_t Minor, typename... T> class Message { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/common/IPC.h b/src/common/IPC.h | |
| index c3dbc5c..38778a1 100644 | |
| --- a/src/common/IPC.h | |
| +++ b/src/common/IPC.h | |
| @@ -46,9 +46,86 @@ Maryland 20850 USA. | |
| #include "../engine/qcommon/q_shared.h" | |
| #include "../engine/qcommon/qcommon.h" | |
| +namespace IPC { | |
| + |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/engine/framework/FileSystem.cpp b/src/engine/framework/FileSystem.cpp | |
| index b5680f5..8f07a99 100644 | |
| --- a/src/engine/framework/FileSystem.cpp | |
| +++ b/src/engine/framework/FileSystem.cpp | |
| @@ -2418,8 +2418,9 @@ const char* FS_LoadedPaks() | |
| static char info[BIG_INFO_STRING]; | |
| info[0] = '\0'; | |
| for (const FS::PakInfo& x: FS::PakPath::GetLoadedPaks()) { | |
| + // If we have a pk3dir, don't allow clients to connect | |
| if (!x.checksum) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- 1 2014-02-15 13:33:58.360191787 +0100 | |
| +++ 2 2014-02-15 13:34:06.070281930 +0100 | |
| @@ -1,46 +1,46 @@ | |
| - | |
| +# BasedOnStyle: Google | |
| --- | |
| ... | |
| -AccessModifierOffset: -4 | |
| +AccessModifierOffset: -1 | |
| AlignEscapedNewlinesLeft: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/common/IPC.h b/src/common/IPC.h | |
| index f2af815..0706646 100644 | |
| --- a/src/common/IPC.h | |
| +++ b/src/common/IPC.h | |
| @@ -119,6 +119,13 @@ public: | |
| void Close(); | |
| + OSHandleType ReleaseHandle() | |
| + { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/engine/framework/VirtualMachine.cpp b/src/engine/framework/VirtualMachine.cpp | |
| index b2fe6c7..2ec2493 100644 | |
| --- a/src/engine/framework/VirtualMachine.cpp | |
| +++ b/src/engine/framework/VirtualMachine.cpp | |
| @@ -134,7 +134,7 @@ static std::pair<IPC::OSHandleType, IPC::Socket> InternalLoadModule(std::pair<IP | |
| PROCESS_INFORMATION processInfo; | |
| memset(&startupInfo, 0, sizeof(startupInfo)); | |
| startupInfo.cb = sizeof(startupInfo); | |
| - if (!CreateProcessW(NULL, &wcmdline[0], NULL, NULL, TRUE, CREATE_SUSPENDED | CREATE_BREAKAWAY_FROM_JOB | DETACHED_PROCESS, NULL, NULL, &startupInfo, &processInfo)) { | |
| + if (!CreateProcessW(NULL, &wcmdline[0], NULL, NULL, TRUE, CREATE_SUSPENDED | CREATE_BREAKAWAY_FROM_JOB | DETACHED_PROCESS, "", NULL, &startupInfo, &processInfo)) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/common/IPC.h b/src/common/IPC.h | |
| index d494e2f..f9b60d2 100644 | |
| --- a/src/common/IPC.h | |
| +++ b/src/common/IPC.h | |
| @@ -496,7 +496,7 @@ template<> struct SerializeTraits<SharedMemory> { | |
| }; | |
| // Message ID to indicate an RPC return | |
| -const uint32_t ID_RETURN = 0xffffffffu; | |
| +const uint32_t ID_RETURN = 0xffffffff; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/common/CommonSyscalls.h b/src/common/CommonSyscalls.h | |
| index 680207d..32d1ee4 100644 | |
| --- a/src/common/CommonSyscalls.h | |
| +++ b/src/common/CommonSyscalls.h | |
| @@ -67,9 +67,7 @@ namespace VM { | |
| }; | |
| // ExecuteMsg | |
| - typedef IPC::SyncMessage< | |
| - IPC::Message<IPC::Id<COMMAND, EXECUTE>, std::string> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/engine/framework/FileSystem.cpp b/src/engine/framework/FileSystem.cpp | |
| index 84b8a0b..4622773 100644 | |
| --- a/src/engine/framework/FileSystem.cpp | |
| +++ b/src/engine/framework/FileSystem.cpp | |
| @@ -648,27 +648,26 @@ namespace Path { | |
| bool IsValid(Str::StringRef path, bool allowDir) | |
| { | |
| - bool nonAlphaNum = true; | |
| + char prev = '/'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/engine/framework/FileSystem.cpp b/src/engine/framework/FileSystem.cpp | |
| index 95287e0..1a60afd 100644 | |
| --- a/src/engine/framework/FileSystem.cpp | |
| +++ b/src/engine/framework/FileSystem.cpp | |
| @@ -2398,7 +2398,9 @@ int FS_GetFileList(const char* path, const char* extension, char* listBuf, int b | |
| return 0; | |
| int numFiles; | |
| - char** list = FS_ListFiles(path, extension, &numFiles); | |
| + char buffer[1024] = "game/"; |
OlderNewer