Ticket #2007: CGuiManager.patch

gui/GUIManager.cpp

@@ -117 +117 @@
     page.gui.reset(new CGUI());
     page.gui->Initialize();
 
-    VfsPath path = VfsPath("gui") / page.name;
+    VfsPath guiPath("gui");
+    VfsPath path = guiPath / page.name;
     page.inputs.insert(path);
 
     CXeromyces xero;
@@ -136 +137 @@
         return;
     }
 
+    // @note 2013.06.26 - pulled this outside the loop so it acts like a proper buffer
+    CStrW name;
+
     XERO_ITER_EL(root, node)
     {
         if (node.GetNodeName() != elmt_include)
@@ -144 +148 @@
             continue;
         }
 
-        CStrW name (node.GetText().FromUTF8());
+        node.GetTextW(name);
 
         PROFILE2("load gui xml");
         PROFILE2_ATTR("name: %ls", name.c_str());
 
         TIMER(name.c_str());
-        VfsPath path = VfsPath("gui") / name;
+        path = guiPath / name;
         page.gui->LoadXmlFile(path, page.inputs);
     }
 
@@ -171 +175 @@
 
 Status CGUIManager::ReloadChangedFiles(const VfsPath& path)
 {
-    for (PageStackType::iterator it = m_PageStack.begin(); it != m_PageStack.end(); ++it)
+    PageStackType::iterator end = m_PageStack.end();
+    for (PageStackType::iterator it = m_PageStack.begin(); it != end; ++it)
     {
         if (it->inputs.count(path))
         {
@@ -261 +266 @@
 {
     PROFILE3("gui tick");
 
-    // Save an immutable copy so iterators aren't invalidated by tick handlers
-    PageStackType pageStack = m_PageStack;
-
-    for (PageStackType::iterator it = pageStack.begin(); it != pageStack.end(); ++it)
+    // @note Using i to avoid iterator invalidation when scripts PushPage/SwitchPage
+    // @note Need to always check m_PageStack.size()
+    for (int i = 0; i < m_PageStack.size(); ++i)
     {
-        m_CurrentGUI = it->gui;
-        it->gui->TickObjects();
+        m_CurrentGUI = m_PageStack[i].gui;
+        m_CurrentGUI->TickObjects();
     }
     m_CurrentGUI.reset();
 }
@@ -276 +280 @@
 {
     PROFILE3_GPU("gui");
 
-    for (PageStackType::iterator it = m_PageStack.begin(); it != m_PageStack.end(); ++it)
+    PageStackType::iterator end = m_PageStack.end();
+    for (PageStackType::iterator it = m_PageStack.begin(); it != end; ++it)
         it->gui->Draw();
 }
 
 void CGUIManager::UpdateResolution()
 {
-    for (PageStackType::iterator it = m_PageStack.begin(); it != m_PageStack.end(); ++it)
+    PageStackType::iterator end = m_PageStack.end();
+    for (PageStackType::iterator it = m_PageStack.begin(); it != end; ++it)
         it->gui->UpdateResolution();
 }
 

ps/XML/XeroXMB.cpp

@@ -199 +199 @@
     if (m_Pointer == NULL || *(int*)(m_Pointer + 20) == 0)
         return CStr8();
 
+    // @note - This is really nasty stuff. Should read up on: http://www.joelonsoftware.com/articles/Unicode.html
     return CStrW(utf16string((utf16_t*)(m_Pointer + 28))).ToUTF8();
 }
 
+void XMBElement::GetTextW(CStrW& out) const
+{
+    // Return empty string if there's no text
+    if (m_Pointer == NULL || *(int*)(m_Pointer + 20) == 0)
+    {
+        out.clear();
+        return;
+    }
+    out = CStrW(utf16string((utf16_t*)(m_Pointer + 28)));
+}
+
 int XMBElement::GetLineNumber() const
 {
     // Make sure there actually was some text to record the line of

ps/XML/XeroXMB.h

@@ -179 +179 @@
     XMBElementList GetChildNodes() const;
     XMBAttributeList GetAttributes() const;
     CStr8 GetText() const;
+    void GetTextW(CStrW& out) const;
     // Returns the line number of the text within this element,
     // or -1 if there is no text
     int GetLineNumber() const;