[BROWSEUI] Pass the Resource string directly instead of using an additional buffer...

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 38eeb89..f95ebc9 100644 (file)
--- 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 f804050..8cf4aa0 100644 (file)
--- 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 09f59ae..cff4d45 100644 (file)
--- 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 728ed71..6db0415 100644 (file)
--- 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 1f4ffb1..bc1db3e 100644 (file)
--- 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 c44ff41..13a7d2f 100644 (file)
--- 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 231955d..350d85c 100644 (file)
--- 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 845c103..4fa235b 100644 (file)
--- 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 7f6b17c..a4f9a43 100644 (file)
--- 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 13422f9..405cdae 100644 (file)
--- 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 a2458bc..337079e 100644 (file)
--- 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 37feac8..1d7041c 100644 (file)
--- 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 08b5ae0..5211825 100644 (file)
--- 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 896aff8..65516a4 100644 (file)
--- 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);