Ticket #4441: patch.diff

binaries/data/mods/public/gui/credits/texts/programming.json

@@ -144 +144 @@
             {"nick": "Offensive ePeen", "name": "Jared Ryan Bills"},
             {"nick": "Ols", "name": "Oliver Whiteman"},
             {"nick": "olsner", "name": "Simon Brenner"},
+            {"nick": "OMGtechy", "name": "Joshua Gerrard"},
             {"nick": "otero"},
             {"name": "Nick Owens"},
             {"nick": "Palaxin", "name": "David A. Freitag"},

source/lib/sysdep/gfx.cpp

@@ -1 @@
-/* Copyright (c) 2015 Wildfire Games
+/* Copyright (c) 2017 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -34 +34 @@
 # include "lib/sysdep/os/win/wgfx.h"
 #endif
 
+namespace {
+    // takes no ownership
+    struct ReplacementPhrase {
+        const wchar_t* longPhrase;
+        const wchar_t* shortPhrase;
+    };
 
+    void ShortenWideStringPrefix(std::wstring& toShorten,
+                                 ReplacementPhrase phrase) {
+
+        const size_t phraseLength = wcslen(phrase.longPhrase);
+
+        // we only care if it matches the start of the string,
+        // hence the 0 == ... rather than npos != ...
+        const bool startsWithPhrase = (0 == toShorten.find(phrase.longPhrase,
+                                                           0, // start at character 0
+                                                           phraseLength));
+
+        if(startsWithPhrase) {
+                toShorten.replace(0,
+                                  phraseLength,
+                                  phrase.shortPhrase);
+        }
+    }
+
+    template <size_t ArraySize>
+    void ShortenWideStringPrefixes(std::wstring& toShorten,
+                                   std::array<ReplacementPhrase, ArraySize> phrases) {
+        for(auto phrase : phrases) {
+            ShortenWideStringPrefix(toShorten, phrase);
+        } 
+    }
+}
+
 namespace gfx {
 
 std::wstring CardName()
 {
-    // GL_VENDOR+GL_RENDERER are good enough here, so we don't use wgfx_CardName,
-    // plus that can cause crashes with Nvidia Optimus and some netbooks
-    // see http://trac.wildfiregames.com/ticket/1952
-    //     http://trac.wildfiregames.com/ticket/1575
-    wchar_t cardName[128];
-    const char* vendor   = (const char*)glGetString(GL_VENDOR);
-    const char* renderer = (const char*)glGetString(GL_RENDERER);
-    // (happens if called before ogl_Init or between glBegin and glEnd.)
-    if(!vendor || !renderer)
-        return L"";
-    swprintf_s(cardName, ARRAY_SIZE(cardName), L"%hs %hs", vendor, renderer);
+    std::wstring cardName;
 
+    {
+        // GL_VENDOR+GL_RENDERER are good enough here, so we don't use wgfx_CardName,
+        // plus that can cause crashes with Nvidia Optimus and some netbooks
+        // see http://trac.wildfiregames.com/ticket/1952
+        //     http://trac.wildfiregames.com/ticket/1575
+        const char* const vendor   = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+        const char* const renderer = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
+
+        // (happens if called before ogl_Init or between glBegin and glEnd.)
+        if(!vendor || !renderer) {
+            return L"";
+        }
+
+        wchar_t cardNameBuffer[128];
+        swprintf_s(cardNameBuffer, ARRAY_SIZE(cardNameBuffer), L"%hs %hs", vendor, renderer);
+
+        cardName.assign(cardNameBuffer);
+    }
+
     // remove crap from vendor names. (don't dare touch the model name -
     // it's too risky, there are too many different strings)
-#define SHORTEN(what, charsToKeep)\
-    if(!wcsncmp(cardName, what, ARRAY_SIZE(what)-1))\
-        memmove(cardName+charsToKeep, cardName+ARRAY_SIZE(what)-1, (wcslen(cardName)-(ARRAY_SIZE(what)-1)+1)*sizeof(wchar_t));
-    SHORTEN(L"ATI Technologies Inc.", 3);
-    SHORTEN(L"NVIDIA Corporation", 6);
-    SHORTEN(L"S3 Graphics", 2);                 // returned by EnumDisplayDevices
-    SHORTEN(L"S3 Graphics, Incorporated", 2);   // returned by GL_VENDOR
-#undef SHORTEN
 
+    ShortenWideStringPrefixes(
+        cardName,
+        std::array<ReplacementPhrase, 4> {
+            ReplacementPhrase { L"ATI Technologies Inc.", L"ATI" },
+                              { L"NVIDIA Corporation", L"NVIDIA" },
+                              { L"S3 Graphics", L"S3" },          // returned by EnumDisplayDevices
+                              { L"S3 Graphics, Incorporated", L"S3" } // returned by GL_VENDOR
+        }
+    );
+
     return cardName;
 }