shlwapi: Move strings used by StrFromTimeInterval to resources.

dlls/shlwapi/resource.h

@@ -21,6 +21,9 @@
 #define WINE_SHLWAPI_RESOURCE_H
 
 #define IDS_BYTES_FORMAT 64
+#define IDS_TIME_INTERVAL_HOURS 65
+#define IDS_TIME_INTERVAL_MINUTES 66
+#define IDS_TIME_INTERVAL_SECONDS 67
 
 /* These numbers match native ID's and shouldn't be abitrarily changed */
 #define IDD_ERR_DIALOG    0x1200

dlls/shlwapi/shlwapi_De.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld Bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_En.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Eo.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Es.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Fi.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Fr.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Hu.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_It.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Ja.rc

@@ -37,4 +37,7 @@ FONT 9, "MS UI Gothic"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Ko.rc

@@ -38,4 +38,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld 바이트"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Nl.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_No.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld byte"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Pl.rc

@@ -38,4 +38,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bajtw"
+    IDS_TIME_INTERVAL_HOURS    " godz."
+    IDS_TIME_INTERVAL_MINUTES  " min."
+    IDS_TIME_INTERVAL_SECONDS  " s"
 }

dlls/shlwapi/shlwapi_Pt.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/shlwapi_Tr.rc

@@ -37,4 +37,7 @@ FONT 8, "MS Shell Dlg"
 STRINGTABLE DISCARDABLE
 {
     IDS_BYTES_FORMAT    "%ld bytes"
+    IDS_TIME_INTERVAL_HOURS    " hr"
+    IDS_TIME_INTERVAL_MINUTES  " min"
+    IDS_TIME_INTERVAL_SECONDS  " sec"
 }

dlls/shlwapi/string.c

@@ -1996,14 +1996,14 @@ inline static int SHLWAPI_FormatSignificant(LPWSTR lpszNum, int dwDigits)
  * Internal helper for StrFromTimeIntervalW.
  */
 static int WINAPI SHLWAPI_WriteTimeClass(LPWSTR lpszOut, DWORD dwValue,
-                                         LPCWSTR lpszClass, int iDigits)
+                                         UINT uClassStringId, int iDigits)
 {
   WCHAR szBuff[64], *szOut = szBuff + 32;
 
   szOut = SHLWAPI_WriteReverseNum(szOut, dwValue);
   iDigits = SHLWAPI_FormatSignificant(szOut + 1, iDigits);
   *szOut = ' ';
-  strcpyW(szBuff + 32, lpszClass);
+  LoadStringW(shlwapi_hInstance, uClassStringId, szBuff + 32, 32);
   strcatW(lpszOut, szOut);
   return iDigits;
 }
@@ -2064,9 +2064,6 @@ INT WINAPI StrFromTimeIntervalA(LPSTR lpszStr, UINT cchMax, DWORD dwMS,
 INT WINAPI StrFromTimeIntervalW(LPWSTR lpszStr, UINT cchMax, DWORD dwMS,
                                 int iDigits)
 {
-  static const WCHAR szHr[] = {' ','h','r','\0'};
-  static const WCHAR szMin[] = {' ','m','i','n','\0'};
-  static const WCHAR szSec[] = {' ','s','e','c','\0'};
   INT iRet = 0;
 
   TRACE("(%p,%d,%ld,%d)\n", lpszStr, cchMax, dwMS, iDigits);
@@ -2092,13 +2089,13 @@ INT WINAPI StrFromTimeIntervalW(LPWSTR lpszStr, UINT cchMax, DWORD dwMS,
     szCopy[0] = '\0';
 
     if (dwHours)
-      iDigits = SHLWAPI_WriteTimeClass(szCopy, dwHours, szHr, iDigits);
+      iDigits = SHLWAPI_WriteTimeClass(szCopy, dwHours, IDS_TIME_INTERVAL_HOURS, iDigits);
 
     if (dwMinutes && iDigits)
-      iDigits = SHLWAPI_WriteTimeClass(szCopy, dwMinutes, szMin, iDigits);
+      iDigits = SHLWAPI_WriteTimeClass(szCopy, dwMinutes, IDS_TIME_INTERVAL_MINUTES, iDigits);
 
     if (iDigits) /* Always write seconds if we have significant digits */
-      SHLWAPI_WriteTimeClass(szCopy, dwMS, szSec, iDigits);
+      SHLWAPI_WriteTimeClass(szCopy, dwMS, IDS_TIME_INTERVAL_SECONDS, iDigits);
 
     lstrcpynW(lpszStr, szCopy, cchMax);
     iRet = strlenW(lpszStr);