Merge remote-tracking branch 'upstream/master'

rdoeffinger · May 8, 2020 · 3d41d4c · 3d41d4c
2 parents 30f8057 + a0d82bc
commit 3d41d4c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/impl11/ddraw/PrimarySurface.cpp b/impl11/ddraw/PrimarySurface.cpp
@@ -1185,7 +1185,11 @@ void PrimarySurface::RenderText()
 			continue;
 		}
 
-		std::wstring wtext = string_towstring(xwaText.text);
+		char t[2];
+		t[0] = xwaText.textChar;
+		t[1] = 0;
+
+		std::wstring wtext = string_towstring(t);
 
 		if (wtext.empty())
 		{

diff --git a/impl11/ddraw/XwaDrawTextHook.cpp b/impl11/ddraw/XwaDrawTextHook.cpp
@@ -11,11 +11,7 @@ void RenderCharHook(short x, short y, unsigned char fw, unsigned char fh, char c
 	xwaText.positionY = y;
 	xwaText.color = color;
 	xwaText.fontSize = fh;
-
-	char t[2];
-	t[0] = c;
-	t[1] = 0;
-	xwaText.text = t;
+	xwaText.textChar = c;
 
 	g_xwa_text.push_back(xwaText);
 }
@@ -50,7 +46,7 @@ void ComputeMetricsHook()
 			std::wstring wtext = string_towstring(t);
 
 			ComPtr<IDWriteTextLayout> layout;
-			dwriteFactory->CreateTextLayout(wtext.c_str(), 1, textFormat, 100, 100, &layout);
+			dwriteFactory->CreateTextLayout(wtext.c_str(), wtext.length(), textFormat, 100, 100, &layout);
 
 			DWRITE_TEXT_METRICS m{};
 			layout->GetMetrics(&m);

diff --git a/impl11/ddraw/XwaDrawTextHook.h b/impl11/ddraw/XwaDrawTextHook.h
@@ -9,7 +9,7 @@ struct XwaText
 	int positionY;
 	unsigned int color;
 	int fontSize;
-	std::string text;
+	char textChar;
 };
 
 extern std::vector<XwaText> g_xwa_text;

diff --git a/impl11/ddraw/utils.cpp b/impl11/ddraw/utils.cpp
@@ -23,7 +23,16 @@ std::string wchar_tostring(LPCWSTR text)
 
 std::wstring string_towstring(const std::string& text)
 {
-	return std::wstring(text.begin(), text.end());
+	std::wstringstream path;
+	path << text.c_str();
+	return path.str();
+}
+
+std::wstring string_towstring(const char* text)
+{
+	std::wstringstream path;
+	path << text;
+	return path.str();
 }
 
 #if LOGGER

diff --git a/impl11/ddraw/utils.h b/impl11/ddraw/utils.h
@@ -5,6 +5,7 @@
 
 std::string wchar_tostring(LPCWSTR text);
 std::wstring string_towstring(const std::string& text);
+std::wstring string_towstring(const char* text);
 
 #if LOGGER