Merge pull request #158 from Hoikas/login-fixes

Login fixes

Sources/Plasma/Apps/plClient/winmain.cpp

@@ -970,35 +970,38 @@ BOOL CALLBACK UruTOSDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 static void SaveUserPass (LoginDialogParam *pLoginParam, char *password)
 {
     uint32_t cryptKey[4];
-    ZeroMemory(cryptKey, sizeof(cryptKey));
+    memset(cryptKey, 0, sizeof(cryptKey));
     GetCryptKey(cryptKey, arrsize(cryptKey));
 
-    wchar_t wusername[kMaxAccountNameLength];
-    wchar_t wpassword[kMaxPasswordLength];
-
-    StrToUnicode(wusername, pLoginParam->username, arrsize(wusername));
+    plString theUser = _TEMP_CONVERT_FROM_LITERAL(pLoginParam->username);
+    plString thePass = (_TEMP_CONVERT_FROM_LITERAL(password)).Left(kMaxPasswordLength);
 
     // if the password field is the fake string then we've already
     // loaded the namePassHash from the file
-    if (StrCmp(password, FAKE_PASS_STRING) != 0)
+    if (thePass.Compare(FAKE_PASS_STRING) != 0)
     {
-        StrToUnicode(wpassword, password, arrsize(wpassword));
-
         wchar_t domain[15];
-        PathSplitEmail(wusername, nil, 0, domain, arrsize(domain), nil, 0, nil, 0, 0);
+        PathSplitEmail(_TEMP_CONVERT_TO_WCHAR_T(theUser), nil, 0, domain, arrsize(domain), nil, 0, nil, 0, 0);
 
         if (StrLen(domain) == 0 || StrCmpI(domain, L"gametap") == 0) {
             plSHA1Checksum shasum(StrLen(password) * sizeof(password[0]), (uint8_t*)password);
+            uint32_t* dest = reinterpret_cast<uint32_t*>(pLoginParam->namePassHash);
+            const uint32_t* from = reinterpret_cast<const uint32_t*>(shasum.GetValue());
 
-            memcpy(pLoginParam->namePassHash, shasum.GetValue(), sizeof(ShaDigest));
+            // I blame eap for this ass shit
+            dest[0] = hsToBE32(from[0]);
+            dest[1] = hsToBE32(from[1]);
+            dest[2] = hsToBE32(from[2]);
+            dest[3] = hsToBE32(from[3]);
+            dest[4] = hsToBE32(from[4]);
         }
         else
         {
-            CryptHashPassword(_TEMP_CONVERT_FROM_WCHAR_T(wusername), _TEMP_CONVERT_FROM_WCHAR_T(wpassword), pLoginParam->namePassHash);
+            CryptHashPassword(theUser, thePass, pLoginParam->namePassHash);
         }
     }
 
-    NetCommSetAccountUsernamePassword(wusername, pLoginParam->namePassHash);
+    NetCommSetAccountUsernamePassword(_TEMP_CONVERT_TO_WCHAR_T(theUser), pLoginParam->namePassHash);
     if (TGIsCider)
         NetCommSetAuthTokenAndOS(nil, L"mac");
     else

Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp

@@ -1037,7 +1037,7 @@ void NetCommSetMsgPreHandler (
 
 //============================================================================
 void NetCommSetAccountUsernamePassword (
-    wchar_t               username[],
+    const wchar_t       username[],
     const ShaDigest &   namePassHash
 ) {
     StrCopy(s_iniAccountUsername, username, arrsize(s_iniAccountUsername));

Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h

@@ -102,7 +102,7 @@ const ARRAY(NetCommPlayer) &        NetCommGetPlayerList ();
 unsigned                            NetCommGetPlayerCount ();
 bool                                NetCommIsLoginComplete ();
 void                                NetCommSetReadIniAccountInfo (bool readFromIni);
-void                                NetCommSetAccountUsernamePassword (wchar_t username[], const ShaDigest &  namePassHash);
+void                                NetCommSetAccountUsernamePassword (const wchar_t username[], const ShaDigest &  namePassHash);
 void                                NetCommSetAuthTokenAndOS (wchar_t authToken[], wchar_t os[]);
 ENetError                           NetCommGetAuthResult ();