From 216d4ac983fe57396d585ce6fd97f21bd978f68f Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 2 Feb 2013 17:54:30 -0500 Subject: [PATCH 1/3] HACK fix client path joining --- Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp index ec2ebf70..a5957d6b 100644 --- a/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp +++ b/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp @@ -966,7 +966,7 @@ void UruStartProc (void * param) { //fprintf(stderr, "URUPlayer StartProc gamePath is:%ws\n", workDir); wchar_t cmdLine[MAX_PATH]; - StrPrintf(cmdLine, arrsize(cmdLine), L"%s%s %s", workDir, s_clientExeName, info->cmdLine); + StrPrintf(cmdLine, arrsize(cmdLine), L"%s\\%s %s", workDir, s_clientExeName, info->cmdLine); // Create the named event so the client won't restart us (Windows will clean it up when we exit) HANDLE hPatcherEvent = CreateEventW(nil, TRUE, FALSE, L"UruPatcherEvent"); From 0192c7eecdee7e7f40d07b9621f96049826935db Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 2 Feb 2013 17:55:01 -0500 Subject: [PATCH 2/3] Fix rename fail --- Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp index 2daca544..0367ebed 100644 --- a/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp +++ b/Sources/Plasma/PubUtilLib/plResMgr/plRegistryKeyList.cpp @@ -79,7 +79,7 @@ plKeyImp* plRegistryKeyList::FindKey(const plUoid& uoid) const if (objectID <= fKeys.size()) { #ifdef PLASMA_EXTERNAL_RELEASE - return fStaticKeys[objectID-1]; + return fKeys[objectID-1]; #else // If this is an internal release, our objectIDs might not match // because of local data. Verify that we have the right key by From fe06eed2592430e213d6d003f75695efbc3f80fe Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 2 Feb 2013 17:58:25 -0500 Subject: [PATCH 3/3] Shit, I'm not even testing that. --- Sources/Plasma/Apps/plClient/winmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Plasma/Apps/plClient/winmain.cpp b/Sources/Plasma/Apps/plClient/winmain.cpp index 4b73806c..85670e79 100644 --- a/Sources/Plasma/Apps/plClient/winmain.cpp +++ b/Sources/Plasma/Apps/plClient/winmain.cpp @@ -1237,7 +1237,7 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC if (!eventExists) // if it is missing, assume patcher wasn't launched { - cmdLine << plString::FromWchar(s_patcherExeName); + cmdLine << "\\" << plString::FromWchar(s_patcherExeName); GetAuthSrvHostnames(&addrs); if(strlen(addrs[0]))