Mikołaj Zalewski : shlwapi: Store the "%ld bytes" string as a resource.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Aug 18 05:40:38 CDT 2006
Module: wine
Branch: master
Commit: c0e6c94ab492d41b57fe00b243672f305ad14240
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0e6c94ab492d41b57fe00b243672f305ad14240
Author: Mikołaj Zalewski <mikolaj at zalewski.pl>
Date: Thu Aug 17 22:44:29 2006 +0200
shlwapi: Store the "%ld bytes" string as a resource.
---
dlls/shlwapi/resource.h | 2 ++
dlls/shlwapi/shlwapi_De.rc | 5 +++++
dlls/shlwapi/shlwapi_En.rc | 5 +++++
dlls/shlwapi/shlwapi_Eo.rc | 5 +++++
dlls/shlwapi/shlwapi_Es.rc | 5 +++++
dlls/shlwapi/shlwapi_Fi.rc | 5 +++++
dlls/shlwapi/shlwapi_Fr.rc | 5 +++++
dlls/shlwapi/shlwapi_Hu.rc | 5 +++++
dlls/shlwapi/shlwapi_It.rc | 5 +++++
dlls/shlwapi/shlwapi_Ja.rc | 5 +++++
dlls/shlwapi/shlwapi_Ko.rc | 5 +++++
dlls/shlwapi/shlwapi_Nl.rc | 5 +++++
dlls/shlwapi/shlwapi_No.rc | 5 +++++
dlls/shlwapi/shlwapi_Pt.rc | 5 +++++
dlls/shlwapi/shlwapi_Tr.rc | 5 +++++
dlls/shlwapi/string.c | 8 ++++++--
16 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/dlls/shlwapi/resource.h b/dlls/shlwapi/resource.h
index bd59505..c06dbf7 100644
--- a/dlls/shlwapi/resource.h
+++ b/dlls/shlwapi/resource.h
@@ -20,6 +20,8 @@
#ifndef WINE_SHLWAPI_RESOURCE_H
#define WINE_SHLWAPI_RESOURCE_H
+#define IDS_BYTES_FORMAT 64
+
/* These numbers match native ID's and shouldn't be abitrarily changed */
#define IDD_ERR_DIALOG 0x1200
#define IDS_ERR_USER_MSG 0x1201
diff --git a/dlls/shlwapi/shlwapi_De.rc b/dlls/shlwapi/shlwapi_De.rc
index 05258d5..1680b4a 100644
--- a/dlls/shlwapi/shlwapi_De.rc
+++ b/dlls/shlwapi/shlwapi_De.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Nein" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_En.rc b/dlls/shlwapi/shlwapi_En.rc
index 7d0e95c..a8d1980 100644
--- a/dlls/shlwapi/shlwapi_En.rc
+++ b/dlls/shlwapi/shlwapi_En.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Yes" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Eo.rc b/dlls/shlwapi/shlwapi_Eo.rc
index af63821..dcbcdaf 100644
--- a/dlls/shlwapi/shlwapi_Eo.rc
+++ b/dlls/shlwapi/shlwapi_Eo.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Jes" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Ne" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Es.rc b/dlls/shlwapi/shlwapi_Es.rc
index 469c08d..61782c9 100644
--- a/dlls/shlwapi/shlwapi_Es.rc
+++ b/dlls/shlwapi/shlwapi_Es.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Sí" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Fi.rc b/dlls/shlwapi/shlwapi_Fi.rc
index 4b79e5c..5ba5d3c 100644
--- a/dlls/shlwapi/shlwapi_Fi.rc
+++ b/dlls/shlwapi/shlwapi_Fi.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Kyllä" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Ei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Fr.rc b/dlls/shlwapi/shlwapi_Fr.rc
index f8be5e8..e84403d 100644
--- a/dlls/shlwapi/shlwapi_Fr.rc
+++ b/dlls/shlwapi/shlwapi_Fr.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Oui" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Non" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Hu.rc b/dlls/shlwapi/shlwapi_Hu.rc
index 7c4e6ca..52efedc 100644
--- a/dlls/shlwapi/shlwapi_Hu.rc
+++ b/dlls/shlwapi/shlwapi_Hu.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_It.rc b/dlls/shlwapi/shlwapi_It.rc
index a56f048..cdb113e 100644
--- a/dlls/shlwapi/shlwapi_It.rc
+++ b/dlls/shlwapi/shlwapi_It.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Si" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&No" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Ja.rc b/dlls/shlwapi/shlwapi_Ja.rc
index e39ca76..7ac8d41 100644
--- a/dlls/shlwapi/shlwapi_Ja.rc
+++ b/dlls/shlwapi/shlwapi_Ja.rc
@@ -33,3 +33,8 @@ FONT 9, "MS UI Gothic"
PUSHBUTTON L"‚Í‚¢(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"‚¢‚¢‚¦(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Ko.rc b/dlls/shlwapi/shlwapi_Ko.rc
index 7330724..92dab21 100644
--- a/dlls/shlwapi/shlwapi_Ko.rc
+++ b/dlls/shlwapi/shlwapi_Ko.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"¿¹(&Y)" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"¾Æ´Ï¿À(&N)" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Nl.rc b/dlls/shlwapi/shlwapi_Nl.rc
index 11e424f..5d25780 100644
--- a/dlls/shlwapi/shlwapi_Nl.rc
+++ b/dlls/shlwapi/shlwapi_Nl.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Nee" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_No.rc b/dlls/shlwapi/shlwapi_No.rc
index 435cfb5..3ca08a3 100644
--- a/dlls/shlwapi/shlwapi_No.rc
+++ b/dlls/shlwapi/shlwapi_No.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Ja" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Nei" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Pt.rc b/dlls/shlwapi/shlwapi_Pt.rc
index 64d28f3..c0fb168 100644
--- a/dlls/shlwapi/shlwapi_Pt.rc
+++ b/dlls/shlwapi/shlwapi_Pt.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Não" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/shlwapi_Tr.rc b/dlls/shlwapi/shlwapi_Tr.rc
index 139b3b0..a55641b 100644
--- a/dlls/shlwapi/shlwapi_Tr.rc
+++ b/dlls/shlwapi/shlwapi_Tr.rc
@@ -33,3 +33,8 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON L"&Evet" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON L"&Hayýr" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP
}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_BYTES_FORMAT "%ld bytes"
+}
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index b03bdfb..aafddd0 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -42,6 +42,8 @@ #include "ddeml.h"
#include "wine/unicode.h"
#include "wine/debug.h"
+#include "resource.h"
+
WINE_DEFAULT_DEBUG_CHANNEL(shell);
/* Get a function pointer from a DLL handle */
@@ -55,6 +57,7 @@ #define GET_FUNC(func, module, name, fai
} while (0)
extern HMODULE SHLWAPI_hmlang;
+extern HINSTANCE shlwapi_hInstance;
typedef HRESULT (WINAPI *fnpConvertINetUnicodeToMultiByte)(LPDWORD,DWORD,LPCWSTR,LPINT,LPSTR,LPINT);
static fnpConvertINetUnicodeToMultiByte pConvertINetUnicodeToMultiByte;
@@ -2230,7 +2233,6 @@ typedef struct tagSHLWAPI_BYTEFORMATS
*/
LPWSTR WINAPI StrFormatByteSizeW(LONGLONG llBytes, LPWSTR lpszDest, UINT cchMax)
{
- static const WCHAR wszBytes[] = {'%','l','d',' ','b','y','t','e','s',0};
static const WCHAR wsz3_0[] = {'%','3','.','0','f',0};
static const WCHAR wsz3_1[] = {'%','3','.','1','f',0};
static const WCHAR wsz3_2[] = {'%','3','.','2','f',0};
@@ -2272,7 +2274,9 @@ #define PB (KB*KB*KB*KB*KB)
if (llBytes < 1024) /* 1K */
{
- snprintfW(lpszDest, cchMax, wszBytes, (long)llBytes);
+ WCHAR wszBytesFormat[64];
+ LoadStringW(shlwapi_hInstance, IDS_BYTES_FORMAT, wszBytesFormat, 64);
+ snprintfW(lpszDest, cchMax, wszBytesFormat, (long)llBytes);
return lpszDest;
}
More information about the wine-cvs
mailing list