Merge remote-tracking branch 'upstream/master' into next

Author: patrikjuvonen

Client/cefweb/CWebApp.cpp

@@ -26,6 +26,9 @@ void CWebApp::OnBeforeCommandLineProcessing(const CefString& process_type, CefRe
     // command_line->AppendSwitch("disable-d3d11");
     command_line->AppendSwitch("enable-begin-frame-scheduling");
 
+    // browser-signin switch(or lack thereof) produces crashes when GOOGLE API keys are present in the OS registry
+    command_line->AppendSwitchWithValue("allow-browser-signin", "false");
+
     if (process_type.empty())
     {
         command_line->AppendSwitchWithValue("autoplay-policy", "no-user-gesture-required");

Client/core/CChat.cpp

@@ -63,6 +63,7 @@ CChat::CChat(CGUI* pManager, const CVector2D& vecPosition)
     m_ePositionVertical = Chat::Position::Vertical::TOP;
     m_eTextAlign = Chat::Text::Align::LEFT;
     m_iSelectedInputHistoryEntry = -1;
+    m_iCharacterLimit = m_iDefaultCharacterLimit;
 
     // Background area
     m_pBackground = m_pManager->CreateStaticImage();
@@ -714,7 +715,7 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
                         {
                             // Check size if it's ok, then output
                             SString strOutput = strCurrentInput.replace(iFound, std::string::npos, strPlayerName);
-                            if (MbUTF8ToUTF16(strOutput).size() < CHAT_MAX_CHAT_LENGTH)
+                            if (MbUTF8ToUTF16(strOutput).size() < m_iCharacterLimit)
                             {
                                 bSuccess = true;
                                 m_strLastPlayerNamePart = strPlayerNamePart;
@@ -745,7 +746,7 @@ bool CChat::CharacterKeyHandler(CGUIKeyEventArgs KeyboardArgs)
                 m_strLastPlayerName.clear();
 
             // If we haven't exceeded the maximum number of characters per chat message, append the char to the message and update the input control
-            if (MbUTF8ToUTF16(m_strInputText).size() < CHAT_MAX_CHAT_LENGTH)
+            if (MbUTF8ToUTF16(m_strInputText).size() < m_iCharacterLimit)
             {
                 if (KeyboardArgs.codepoint >= 32)
                 {
@@ -865,7 +866,7 @@ void CChat::UpdateGUI()
     m_pBackground->SetSize(m_vecBackgroundSize);
 
     // Make sure there is enough room for all the lines
-    uint uiMaxNumLines = g_pCore->GetGraphics()->GetViewportHeight() / std::max(1.f, CChat::GetFontHeight(m_vecScale.fY)) - 3;
+    uint uiMaxNumLines = g_pCore->GetGraphics()->GetViewportHeight() / std::max(1.f, CChat::GetFontHeight(m_vecScale.fY)) - m_iMaxInputLines;
     if (m_uiNumLines > uiMaxNumLines)
         SetNumLines(uiMaxNumLines);
 
@@ -967,7 +968,7 @@ void CChat::SetInputText(const char* szText)
 
     CChatLine* pLine = NULL;
 
-    while (szRemainingText && m_InputLine.m_ExtraLines.size() < 3)
+    while (szRemainingText && m_InputLine.m_ExtraLines.size() < m_iMaxInputLines)
     {
         m_InputLine.m_ExtraLines.resize(m_InputLine.m_ExtraLines.size() + 1);
         CChatLine& line = *(m_InputLine.m_ExtraLines.end() - 1);
@@ -1077,6 +1078,11 @@ void CChat::DrawTextString(const char* szText, CRect2D DrawArea, float fZ, CRect
     }
 }
 
+void CChat::SetCharacterLimit(int charLimit)
+{
+    m_iCharacterLimit = charLimit;
+}
+
 CChatLine::CChatLine()
 {
     m_bActive = false;

Client/core/CChat.h

@@ -19,7 +19,6 @@ class CChatLineSection;
 #define CHAT_WIDTH 320                                   // Chatbox default width
 #define CHAT_TEXT_COLOR CColor(235, 221, 178)            // Chatbox default text color
 #define CHAT_MAX_LINES 100                               // Chatbox maximum chat lines
-#define CHAT_MAX_CHAT_LENGTH 96                          // Chatbox maximum chat message length
 #define CHAT_BUFFER 1024                                 // Chatbox buffer size
 #define CHAT_INPUT_HISTORY_LENGTH 128                    // Chatbox input history length
 
@@ -203,6 +202,11 @@ class CChat
     void SetChatFont(eChatFont Font);
     void OnModLoad();
 
+    void          SetCharacterLimit(int charLimit);
+    int           GetCharacterLimit() const { return m_iCharacterLimit; }
+    constexpr int GetDefaultCharacterLimit() const { return m_iDefaultCharacterLimit; }
+    constexpr int GetMaxCharacterLimit() const { return m_iMaxCharacterLimit; }
+
 private:
     void LoadCVars();
 
@@ -292,4 +296,9 @@ class CChat
     CTickCount m_lastRenderTargetCreationFail;
 
     bool m_bNickCompletion;
+
+    int                         m_iCharacterLimit;
+    static inline constexpr int m_iDefaultCharacterLimit = 96;
+    static inline constexpr int m_iMaxCharacterLimit = 255;
+    static inline constexpr int m_iMaxInputLines = 5;
 };

Client/core/CCore.cpp

@@ -504,6 +504,47 @@ bool CCore::IsChatInputEnabled()
     return false;
 }
 
+bool CCore::SetChatboxCharacterLimit(int charLimit)
+{
+    CChat* pChat = m_pLocalGUI->GetChat();
+
+    if (!pChat)
+        return false;
+
+    pChat->SetCharacterLimit(charLimit);
+    return true;
+}
+
+void CCore::ResetChatboxCharacterLimit()
+{
+    CChat* pChat = m_pLocalGUI->GetChat();
+
+    if (!pChat)
+        return;
+
+    pChat->SetCharacterLimit(pChat->GetDefaultCharacterLimit());
+}
+
+int CCore::GetChatboxCharacterLimit()
+{
+    CChat* pChat = m_pLocalGUI->GetChat();
+
+    if (!pChat)
+        return 0;
+
+    return pChat->GetCharacterLimit();
+}
+
+int CCore::GetChatboxMaxCharacterLimit()
+{
+    CChat* pChat = m_pLocalGUI->GetChat();
+
+    if (!pChat)
+        return 0;
+
+    return pChat->GetMaxCharacterLimit();
+}
+
 bool CCore::IsSettingsVisible()
 {
     if (m_pLocalGUI)
@@ -1280,6 +1321,9 @@ void CCore::OnModUnload()
 
     // Destroy tray icon
     m_pTrayIcon->DestroyTrayIcon();
+
+    // Reset chatbox character limit
+    ResetChatboxCharacterLimit();
 }
 
 void CCore::RegisterCommands()

Client/core/CCore.h

@@ -125,6 +125,10 @@ class CCore : public CCoreInterface, public CSingleton<CCore>
     bool IsChatInputEnabled();
     bool ClearChat();
     void OnGameTimerUpdate();
+    bool SetChatboxCharacterLimit(int charLimit);
+    void ResetChatboxCharacterLimit();
+    int  GetChatboxCharacterLimit();
+    int  GetChatboxMaxCharacterLimit();
 
     // Screenshots
     void TakeScreenShot();

Client/loader-proxy/exports.def

@@ -0,0 +1,196 @@
+; Do not edit this file manually because it has been generated by generator.cpp
+
+EXPORTS
+    CloseDriver=__EXPORT__0__ @4
+    DefDriverProc=__EXPORT__1__ @5
+    DriverCallback=__EXPORT__2__ @6
+    DrvGetModuleHandle=__EXPORT__3__ @7
+    GetDriverModuleHandle=__EXPORT__4__ @8
+    NotifyCallbackData=__EXPORT__5__ @9
+    OpenDriver=__EXPORT__6__ @10
+    PlaySound=__EXPORT__7__ @11
+    PlaySoundA=__EXPORT__8__ @12
+    PlaySoundW=__EXPORT__9__ @13
+    SendDriverMessage=__EXPORT__10__ @14
+    WOW32DriverCallback=__EXPORT__11__ @15
+    WOW32ResolveMultiMediaHandle=__EXPORT__12__ @16
+    WOWAppExit=__EXPORT__13__ @17
+    aux32Message=__EXPORT__14__ @18
+    auxGetDevCapsA=__EXPORT__15__ @19
+    auxGetDevCapsW=__EXPORT__16__ @20
+    auxGetNumDevs=__EXPORT__17__ @21
+    auxGetVolume=__EXPORT__18__ @22
+    auxOutMessage=__EXPORT__19__ @23
+    auxSetVolume=__EXPORT__20__ @24
+    joy32Message=__EXPORT__21__ @25
+    joyConfigChanged=__EXPORT__22__ @26
+    joyGetDevCapsA=__EXPORT__23__ @27
+    joyGetDevCapsW=__EXPORT__24__ @28
+    joyGetNumDevs=__EXPORT__25__ @29
+    joyGetPos=__EXPORT__26__ @30
+    joyGetPosEx=__EXPORT__27__ @31
+    joyGetThreshold=__EXPORT__28__ @32
+    joyReleaseCapture=__EXPORT__29__ @33
+    joySetCapture=__EXPORT__30__ @34
+    joySetThreshold=__EXPORT__31__ @35
+    mci32Message=__EXPORT__32__ @36
+    mciDriverNotify=__EXPORT__33__ @37
+    mciDriverYield=__EXPORT__34__ @38
+    mciExecute=__EXPORT__35__ @3
+    mciFreeCommandResource=__EXPORT__36__ @39
+    mciGetCreatorTask=__EXPORT__37__ @40
+    mciGetDeviceIDA=__EXPORT__38__ @41
+    mciGetDeviceIDFromElementIDA=__EXPORT__39__ @42
+    mciGetDeviceIDFromElementIDW=__EXPORT__40__ @43
+    mciGetDeviceIDW=__EXPORT__41__ @44
+    mciGetDriverData=__EXPORT__42__ @45
+    mciGetErrorStringA=__EXPORT__43__ @46
+    mciGetErrorStringW=__EXPORT__44__ @47
+    mciGetYieldProc=__EXPORT__45__ @48
+    mciLoadCommandResource=__EXPORT__46__ @49
+    mciSendCommandA=__EXPORT__47__ @50
+    mciSendCommandW=__EXPORT__48__ @51
+    mciSendStringA=__EXPORT__49__ @52
+    mciSendStringW=__EXPORT__50__ @53
+    mciSetDriverData=__EXPORT__51__ @54
+    mciSetYieldProc=__EXPORT__52__ @55
+    mid32Message=__EXPORT__53__ @56
+    midiConnect=__EXPORT__54__ @57
+    midiDisconnect=__EXPORT__55__ @58
+    midiInAddBuffer=__EXPORT__56__ @59
+    midiInClose=__EXPORT__57__ @60
+    midiInGetDevCapsA=__EXPORT__58__ @61
+    midiInGetDevCapsW=__EXPORT__59__ @62
+    midiInGetErrorTextA=__EXPORT__60__ @63
+    midiInGetErrorTextW=__EXPORT__61__ @64
+    midiInGetID=__EXPORT__62__ @65
+    midiInGetNumDevs=__EXPORT__63__ @66
+    midiInMessage=__EXPORT__64__ @67
+    midiInOpen=__EXPORT__65__ @68
+    midiInPrepareHeader=__EXPORT__66__ @69
+    midiInReset=__EXPORT__67__ @70
+    midiInStart=__EXPORT__68__ @71
+    midiInStop=__EXPORT__69__ @72
+    midiInUnprepareHeader=__EXPORT__70__ @73
+    midiOutCacheDrumPatches=__EXPORT__71__ @74
+    midiOutCachePatches=__EXPORT__72__ @75
+    midiOutClose=__EXPORT__73__ @76
+    midiOutGetDevCapsA=__EXPORT__74__ @77
+    midiOutGetDevCapsW=__EXPORT__75__ @78
+    midiOutGetErrorTextA=__EXPORT__76__ @79
+    midiOutGetErrorTextW=__EXPORT__77__ @80
+    midiOutGetID=__EXPORT__78__ @81
+    midiOutGetNumDevs=__EXPORT__79__ @82
+    midiOutGetVolume=__EXPORT__80__ @83
+    midiOutLongMsg=__EXPORT__81__ @84
+    midiOutMessage=__EXPORT__82__ @85
+    midiOutOpen=__EXPORT__83__ @86
+    midiOutPrepareHeader=__EXPORT__84__ @87
+    midiOutReset=__EXPORT__85__ @88
+    midiOutSetVolume=__EXPORT__86__ @89
+    midiOutShortMsg=__EXPORT__87__ @90
+    midiOutUnprepareHeader=__EXPORT__88__ @91
+    midiStreamClose=__EXPORT__89__ @92
+    midiStreamOpen=__EXPORT__90__ @93
+    midiStreamOut=__EXPORT__91__ @94
+    midiStreamPause=__EXPORT__92__ @95
+    midiStreamPosition=__EXPORT__93__ @96
+    midiStreamProperty=__EXPORT__94__ @97
+    midiStreamRestart=__EXPORT__95__ @98
+    midiStreamStop=__EXPORT__96__ @99
+    mixerClose=__EXPORT__97__ @100
+    mixerGetControlDetailsA=__EXPORT__98__ @101
+    mixerGetControlDetailsW=__EXPORT__99__ @102
+    mixerGetDevCapsA=__EXPORT__100__ @103
+    mixerGetDevCapsW=__EXPORT__101__ @104
+    mixerGetID=__EXPORT__102__ @105
+    mixerGetLineControlsA=__EXPORT__103__ @106
+    mixerGetLineControlsW=__EXPORT__104__ @107
+    mixerGetLineInfoA=__EXPORT__105__ @108
+    mixerGetLineInfoW=__EXPORT__106__ @109
+    mixerGetNumDevs=__EXPORT__107__ @110
+    mixerMessage=__EXPORT__108__ @111
+    mixerOpen=__EXPORT__109__ @112
+    mixerSetControlDetails=__EXPORT__110__ @113
+    mmDrvInstall=__EXPORT__111__ @114
+    mmGetCurrentTask=__EXPORT__112__ @115
+    mmTaskBlock=__EXPORT__113__ @116
+    mmTaskCreate=__EXPORT__114__ @117
+    mmTaskSignal=__EXPORT__115__ @118
+    mmTaskYield=__EXPORT__116__ @119
+    mmioAdvance=__EXPORT__117__ @120
+    mmioAscend=__EXPORT__118__ @121
+    mmioClose=__EXPORT__119__ @122
+    mmioCreateChunk=__EXPORT__120__ @123
+    mmioDescend=__EXPORT__121__ @124
+    mmioFlush=__EXPORT__122__ @125
+    mmioGetInfo=__EXPORT__123__ @126
+    mmioInstallIOProcA=__EXPORT__124__ @127
+    mmioInstallIOProcW=__EXPORT__125__ @128
+    mmioOpenA=__EXPORT__126__ @129
+    mmioOpenW=__EXPORT__127__ @130
+    mmioRead=__EXPORT__128__ @131
+    mmioRenameA=__EXPORT__129__ @132
+    mmioRenameW=__EXPORT__130__ @133
+    mmioSeek=__EXPORT__131__ @134
+    mmioSendMessage=__EXPORT__132__ @135
+    mmioSetBuffer=__EXPORT__133__ @136
+    mmioSetInfo=__EXPORT__134__ @137
+    mmioStringToFOURCCA=__EXPORT__135__ @138
+    mmioStringToFOURCCW=__EXPORT__136__ @139
+    mmioWrite=__EXPORT__137__ @140
+    mmsystemGetVersion=__EXPORT__138__ @141
+    mod32Message=__EXPORT__139__ @142
+    mxd32Message=__EXPORT__140__ @143
+    sndPlaySoundA=__EXPORT__141__ @144
+    sndPlaySoundW=__EXPORT__142__ @145
+    tid32Message=__EXPORT__143__ @146
+    timeBeginPeriod=__EXPORT__144__ @147
+    timeEndPeriod=__EXPORT__145__ @148
+    timeGetDevCaps=__EXPORT__146__ @149
+    timeGetSystemTime=__EXPORT__147__ @150
+    timeGetTime=__EXPORT__148__ @151
+    timeKillEvent=__EXPORT__149__ @152
+    timeSetEvent=__EXPORT__150__ @153
+    waveInAddBuffer=__EXPORT__151__ @154
+    waveInClose=__EXPORT__152__ @155
+    waveInGetDevCapsA=__EXPORT__153__ @156
+    waveInGetDevCapsW=__EXPORT__154__ @157
+    waveInGetErrorTextA=__EXPORT__155__ @158
+    waveInGetErrorTextW=__EXPORT__156__ @159
+    waveInGetID=__EXPORT__157__ @160
+    waveInGetNumDevs=__EXPORT__158__ @161
+    waveInGetPosition=__EXPORT__159__ @162
+    waveInMessage=__EXPORT__160__ @163
+    waveInOpen=__EXPORT__161__ @164
+    waveInPrepareHeader=__EXPORT__162__ @165
+    waveInReset=__EXPORT__163__ @166
+    waveInStart=__EXPORT__164__ @167
+    waveInStop=__EXPORT__165__ @168
+    waveInUnprepareHeader=__EXPORT__166__ @169
+    waveOutBreakLoop=__EXPORT__167__ @170
+    waveOutClose=__EXPORT__168__ @171
+    waveOutGetDevCapsA=__EXPORT__169__ @172
+    waveOutGetDevCapsW=__EXPORT__170__ @173
+    waveOutGetErrorTextA=__EXPORT__171__ @174
+    waveOutGetErrorTextW=__EXPORT__172__ @175
+    waveOutGetID=__EXPORT__173__ @176
+    waveOutGetNumDevs=__EXPORT__174__ @177
+    waveOutGetPitch=__EXPORT__175__ @178
+    waveOutGetPlaybackRate=__EXPORT__176__ @179
+    waveOutGetPosition=__EXPORT__177__ @180
+    waveOutGetVolume=__EXPORT__178__ @181
+    waveOutMessage=__EXPORT__179__ @182
+    waveOutOpen=__EXPORT__180__ @183
+    waveOutPause=__EXPORT__181__ @184
+    waveOutPrepareHeader=__EXPORT__182__ @185
+    waveOutReset=__EXPORT__183__ @186
+    waveOutRestart=__EXPORT__184__ @187
+    waveOutSetPitch=__EXPORT__185__ @188
+    waveOutSetPlaybackRate=__EXPORT__186__ @189
+    waveOutSetVolume=__EXPORT__187__ @190
+    waveOutUnprepareHeader=__EXPORT__188__ @191
+    waveOutWrite=__EXPORT__189__ @192
+    wid32Message=__EXPORT__190__ @193
+    wod32Message=__EXPORT__191__ @194
+    __NONAME__192__=__EXPORT__192__ @2 NONAME