Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-20 15:35:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[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()

Browse source 
svn path=/trunk/; revision=69851
This commit is contained in:
Robert Naumann 2015-11-08 15:44:18 +00:00
parent 4888f694bd
commit 84b0040ce1
14 changed files with 32 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/browseui/lang/bg-BG.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/de-DE.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/en-US.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/es-ES.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/he-IL.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/it-IT.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/pl-PL.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/ro-RO.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/ru-RU.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/sq-AL.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/tr-TR.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/uk-UA.rc
View file

@ -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

4
reactos/dll/win32/browseui/lang/zh-CN.rc
View file

@ -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

16
reactos/dll/win32/browseui/travellog.cpp
View file

@ -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);