Fix regression in engine detection for some cases (bug 5963, r=asherkin).
Fix regression in engine detection for some cases (
bug 5963, r=asherkin).
1.1 --- a/loader/gamedll.cpp Sun Oct 13 13:55:35 2013 -0400
1.2 +++ b/loader/gamedll.cpp Thu Oct 24 13:24:22 2013 -0400
1.3 @@ -70,10 +70,7 @@
1.4
1.5 game_info_detected = -1;
1.6
1.7 - if (!mm_GetGameName(game_name, sizeof(game_name)))
1.8 - {
1.9 - return false;
1.10 - }
1.11 + mm_GetGameName(game_name, sizeof(game_name));
1.12
1.13 if (!mm_GetFileOfAddress((void*)mm_DetectGameInformation, mm_path, sizeof(mm_path)))
1.14 {
2.1 --- a/loader/loader.cpp Sun Oct 13 13:55:35 2013 -0400
2.2 +++ b/loader/loader.cpp Thu Oct 24 13:24:22 2013 -0400
2.3 @@ -191,7 +191,7 @@
2.4 return mm_GetLibAddress(mm_library, name);
2.5 }
2.6
2.7 -bool
2.8 +void
2.9 mm_GetGameName(char *buffer, size_t size)
2.10 {
2.11 buffer[0] = '\0';
2.12 @@ -217,7 +217,6 @@
2.13
2.14 LocalFree(wargv);
2.15
2.16 - return buffer[0] != 0;
2.17 #elif defined __APPLE__
2.18 int argc = *_NSGetArgc();
2.19 char **argv = *_NSGetArgv();
2.20 @@ -234,7 +233,6 @@
2.21 break;
2.22 }
2.23
2.24 - return buffer[0] != 0;
2.25 #elif defined __linux__
2.26 FILE *pFile = fopen("/proc/self/cmdline", "rb");
2.27 if (!pFile)
2.28 @@ -262,10 +260,14 @@
2.29 free(arg);
2.30 fclose(pFile);
2.31
2.32 - return buffer[0] != 0;
2.33 #else
2.34 #error unsupported platform
2.35 #endif
2.36 +
2.37 + if (buffer[0] == 0)
2.38 + {
2.39 + strncpy(buffer, ".", size);
2.40 + }
2.41 }
2.42
2.43 MetamodBackend
3.1 --- a/loader/loader.h Sun Oct 13 13:55:35 2013 -0400
3.2 +++ b/loader/loader.h Thu Oct 24 13:24:22 2013 -0400
3.3 @@ -116,7 +116,7 @@
3.4 extern void
3.5 mm_LogFatal(const char *message, ...);
3.6
3.7 -extern bool
3.8 +extern void
3.9 mm_GetGameName(char *buffer, size_t size);
3.10
3.11 extern MetamodBackend
4.1 --- a/loader/serverplugin.cpp Sun Oct 13 13:55:35 2013 -0400
4.2 +++ b/loader/serverplugin.cpp Thu Oct 24 13:24:22 2013 -0400
4.3 @@ -88,10 +88,7 @@
4.4 /* Backend should already filled in if loaded as gamedll */
4.5 if (gamedll_bridge == NULL)
4.6 {
4.7 - if (!mm_GetGameName(game_name, sizeof(game_name)))
4.8 - {
4.9 - return false;
4.10 - }
4.11 + mm_GetGameName(game_name, sizeof(game_name));
4.12
4.13 mm_backend = mm_DetermineBackend(engineFactory, game_name);
4.14 }