Merge remote-tracking branch 'diafero/standalone'

.gitignore

@@ -8,6 +8,7 @@ tags
 *.swp
 *.o
 *.orig
+*.pyc
 
 Makefile
 CMakeCache.txt

Sources/Plasma/Apps/plClient/winmain.cpp

@@ -86,7 +86,6 @@ extern hsBool gUseBackgroundDownloader;
 
 enum
 {
-    kArgToDni,
     kArgSkipLoginDialog,
     kArgServerIni,
     kArgLocalData,
@@ -94,7 +93,6 @@ enum
 };
 
 static const CmdArgDef s_cmdLineArgs[] = {
-    { kCmdArgFlagged  | kCmdTypeBool,       L"ToDni",           kArgToDni   },
     { kCmdArgFlagged  | kCmdTypeBool,       L"SkipLoginDialog", kArgSkipLoginDialog },
     { kCmdArgFlagged  | kCmdTypeString,     L"ServerIni",       kArgServerIni },
     { kCmdArgFlagged  | kCmdTypeBool,       L"LocalData",       kArgLocalData   },
@@ -1008,6 +1006,8 @@ BOOL CALLBACK UruTOSDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
                 SetDlgItemText(hwndDlg, IDC_URULOGIN_EULATEXT, eulaData);
                 delete [] eulaData;
             }
+            else // no TOS found, go ahead
+                EndDialog(hwndDlg, true);
 
             break;
         }

Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp

@@ -153,6 +153,13 @@ static void ManifestCallback (
         return;
     }
 
+#ifndef PLASMA_EXTERNAL_RELEASE
+    if (entryCount == 0)  { // dataserver does not contain a patcher
+        s_downloadComplete = true;
+        return;
+    }
+#endif
+
     char ansi[MAX_PATH];
 
     // MD5 check current patcher against value in manifest

Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp

@@ -944,7 +944,7 @@ bool ManifestRequestTrans::Recv (
 
     dword numFiles = reply.numFiles;
     dword wcharCount = reply.wcharCount;
-    const wchar* curChar = reply.manifestData;
+    const wchar* curChar = reply.manifestData; // the pointer is not yet dereferenced here!
 
     // tell the server we got the data
     Cli2File_ManifestEntryAck manifestAck;
@@ -955,9 +955,9 @@ bool ManifestRequestTrans::Recv (
 
     m_conn->Send(&manifestAck, manifestAck.messageBytes);   
 
-    // if wcharCount is 2, the data only contains the terminator "\0\0" and we
+    // if wcharCount is 2 or less, the data only contains the terminator "\0\0" and we
     // don't need to convert anything (and we are done)
-    if ((IS_NET_ERROR(reply.result)) || (wcharCount == 2)) {
+    if ((IS_NET_ERROR(reply.result)) || (wcharCount <= 2)) {
         // we have a problem... or we have nothing to so, so we're done
         m_result    = reply.result;
         m_state     = kTransStateComplete;