From: Robert Naumann <gonzomdx@gmail.com>
Date: Sun, 8 Nov 2015 15:44:18 +0000 (+0000)
Subject: [BROWSEUI] Pass the Resource string directly instead of using an additional buffer... 
X-Git-Tag: ReactOS-0.4.0~207
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=84b0040ce14cab006501559b7901a5e11be410b4

[BROWSEUI] Pass the Resource string directly instead of using an additional buffer. Remove the NULL characters from the strings. Fix return value handling of LoadStringW()

svn path=/trunk/; revision=69851
---

diff --git a/reactos/dll/win32/browseui/lang/bg-BG.rc b/reactos/dll/win32/browseui/lang/bg-BG.rc
index 38eeb893e0a..f95ebc9784d 100644
--- a/reactos/dll/win32/browseui/lang/bg-BG.rc
+++ b/reactos/dll/win32/browseui/lang/bg-BG.rc
@@ -264,8 +264,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/de-DE.rc b/reactos/dll/win32/browseui/lang/de-DE.rc
index f804050961b..8cf4aa06e79 100644
--- a/reactos/dll/win32/browseui/lang/de-DE.rc
+++ b/reactos/dll/win32/browseui/lang/de-DE.rc
@@ -282,8 +282,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Zurück zu %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Zurück zu %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 
diff --git a/reactos/dll/win32/browseui/lang/en-US.rc b/reactos/dll/win32/browseui/lang/en-US.rc
index 09f59ae9702..cff4d453a2c 100644
--- a/reactos/dll/win32/browseui/lang/en-US.rc
+++ b/reactos/dll/win32/browseui/lang/en-US.rc
@@ -282,8 +282,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/es-ES.rc b/reactos/dll/win32/browseui/lang/es-ES.rc
index 728ed71f9d1..6db0415c422 100644
--- a/reactos/dll/win32/browseui/lang/es-ES.rc
+++ b/reactos/dll/win32/browseui/lang/es-ES.rc
@@ -265,8 +265,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Volver a %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Volver a %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/he-IL.rc b/reactos/dll/win32/browseui/lang/he-IL.rc
index 1f4ffb1e1a7..bc1db3e4235 100644
--- a/reactos/dll/win32/browseui/lang/he-IL.rc
+++ b/reactos/dll/win32/browseui/lang/he-IL.rc
@@ -266,8 +266,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/it-IT.rc b/reactos/dll/win32/browseui/lang/it-IT.rc
index c44ff413608..13a7d2f9864 100644
--- a/reactos/dll/win32/browseui/lang/it-IT.rc
+++ b/reactos/dll/win32/browseui/lang/it-IT.rc
@@ -264,8 +264,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/pl-PL.rc b/reactos/dll/win32/browseui/lang/pl-PL.rc
index 231955d3a2c..350d85c4126 100644
--- a/reactos/dll/win32/browseui/lang/pl-PL.rc
+++ b/reactos/dll/win32/browseui/lang/pl-PL.rc
@@ -272,8 +272,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/ro-RO.rc b/reactos/dll/win32/browseui/lang/ro-RO.rc
index 845c1039beb..4fa235b0470 100644
--- a/reactos/dll/win32/browseui/lang/ro-RO.rc
+++ b/reactos/dll/win32/browseui/lang/ro-RO.rc
@@ -266,8 +266,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Înapoi la %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Înapoi la %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/ru-RU.rc b/reactos/dll/win32/browseui/lang/ru-RU.rc
index 7f6b17c799e..a4f9a431c5d 100644
--- a/reactos/dll/win32/browseui/lang/ru-RU.rc
+++ b/reactos/dll/win32/browseui/lang/ru-RU.rc
@@ -266,8 +266,8 @@ END
 
 STRINGTABLE
 BEGIN
-  IDS_BACK "Back to %s\0"
-  IDS_FORWARD "Forward to %s\0"
+  IDS_BACK "Back to %s"
+  IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/sq-AL.rc b/reactos/dll/win32/browseui/lang/sq-AL.rc
index 13422f95ea3..405cdae628c 100644
--- a/reactos/dll/win32/browseui/lang/sq-AL.rc
+++ b/reactos/dll/win32/browseui/lang/sq-AL.rc
@@ -283,8 +283,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/tr-TR.rc b/reactos/dll/win32/browseui/lang/tr-TR.rc
index a2458bc2e4c..337079ed81f 100644
--- a/reactos/dll/win32/browseui/lang/tr-TR.rc
+++ b/reactos/dll/win32/browseui/lang/tr-TR.rc
@@ -264,8 +264,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/uk-UA.rc b/reactos/dll/win32/browseui/lang/uk-UA.rc
index 37feac86107..1d7041c2c81 100644
--- a/reactos/dll/win32/browseui/lang/uk-UA.rc
+++ b/reactos/dll/win32/browseui/lang/uk-UA.rc
@@ -266,8 +266,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/lang/zh-CN.rc b/reactos/dll/win32/browseui/lang/zh-CN.rc
index 08b5ae02c7f..52118251813 100644
--- a/reactos/dll/win32/browseui/lang/zh-CN.rc
+++ b/reactos/dll/win32/browseui/lang/zh-CN.rc
@@ -284,8 +284,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_BACK "Back to %s\0"
-    IDS_FORWARD "Forward to %s\0"
+    IDS_BACK "Back to %s"
+    IDS_FORWARD "Forward to %s"
 END
 
 STRINGTABLE
diff --git a/reactos/dll/win32/browseui/travellog.cpp b/reactos/dll/win32/browseui/travellog.cpp
index 896aff8b091..65516a4efcc 100644
--- a/reactos/dll/win32/browseui/travellog.cpp
+++ b/reactos/dll/win32/browseui/travellog.cpp
@@ -428,7 +428,6 @@ HRESULT STDMETHODCALLTYPE CTravelLog::GetToolTipText(IUnknown *punk, int iOffset
     CTravelEntry                            *destinationEntry;
     wchar_t                                 tempString[MAX_PATH];
     wchar_t                                 templateString[200];
-    wchar_t                                 *resourceString;
     HRESULT                                 hResult;
 
     if (pwzText == NULL)
@@ -443,19 +442,16 @@ HRESULT STDMETHODCALLTYPE CTravelLog::GetToolTipText(IUnknown *punk, int iOffset
         return hResult;
     if (iOffset < 0)
     {
-        hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(),
-                            IDS_BACK, (wchar_t*)&resourceString, 0);
-        if (FAILED_UNEXPECTEDLY(hResult))
-            return hResult;
+        if(LoadStringW(_AtlBaseModule.GetResourceInstance(),
+                            IDS_BACK, templateString, sizeof(templateString) / sizeof(wchar_t)) == 0)
+            return HRESULT_FROM_WIN32(GetLastError());
     }
     else
     {
-        hResult = LoadStringW(_AtlBaseModule.GetResourceInstance(),
-                            IDS_FORWARD, (wchar_t*)&resourceString, 0);
-        if (FAILED_UNEXPECTEDLY(hResult))
-            return hResult;
+        if(LoadStringW(_AtlBaseModule.GetResourceInstance(),
+                            IDS_FORWARD, templateString, sizeof(templateString) / sizeof(wchar_t)) == 0)
+            return HRESULT_FROM_WIN32(GetLastError());
     }
-    wcscpy(templateString, resourceString);
     _snwprintf(pwzText, cchText, templateString, tempString);
 
     TRACE("CTravelLog::GetToolTipText for IUnknown punk=%p at offset=%d returning L\"%S\"\n", punk, iOffset, pwzText);