dxdiagn: Fix a string resource so its format placeholders can be reordered.

Francois Gouget fgouget at free.fr
Sat Nov 19 08:10:13 CST 2011


---
 dlls/dxdiagn/dxdiagn.rc |    2 +-
 dlls/dxdiagn/provider.c |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/dxdiagn/dxdiagn.rc b/dlls/dxdiagn/dxdiagn.rc
index e25b3c5..b37d314 100644
--- a/dlls/dxdiagn/dxdiagn.rc
+++ b/dlls/dxdiagn/dxdiagn.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 STRINGTABLE
 {
     IDS_REGIONAL_SETTING    "Regional Setting"
-    IDS_PAGE_FILE_FORMAT    "%uMB used, %uMB available"
+    IDS_PAGE_FILE_FORMAT    "%1!u!MB used, %2!u!MB available"
 }
 
 #define WINE_FILEDESCRIPTION_STR "Wine DxDiag 8"
diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c
index a881ea7..bb4ce08 100644
--- a/dlls/dxdiagn/provider.c
+++ b/dlls/dxdiagn/provider.c
@@ -598,6 +598,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
     OSVERSIONINFOW info;
     DWORD count, usedpage_mb, availpage_mb;
     WCHAR buffer[MAX_PATH], computer_name[MAX_COMPUTERNAME_LENGTH + 1], print_buf[200], localized_pagefile_fmt[200];
+    DWORD_PTR args[2];
 
     hr = add_ui4_property(node, dwDirectXVersionMajor, 9);
     if (FAILED(hr))
@@ -678,7 +679,11 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node)
     usedpage_mb = (DWORD)((msex.ullTotalPageFile - msex.ullAvailPageFile) / (1024 * 1024));
     availpage_mb = (DWORD)(msex.ullAvailPageFile / (1024 * 1024));
     LoadStringW(dxdiagn_instance, IDS_PAGE_FILE_FORMAT, localized_pagefile_fmt, sizeof(localized_pagefile_fmt)/sizeof(WCHAR));
-    snprintfW(print_buf, sizeof(print_buf)/sizeof(WCHAR), localized_pagefile_fmt, usedpage_mb, availpage_mb);
+    args[0] = usedpage_mb;
+    args[1] = availpage_mb;
+    FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                   localized_pagefile_fmt, 0, 0, print_buf,
+                   sizeof(print_buf)/sizeof(*print_buf), (__ms_va_list*)args);
 
     hr = add_bstr_property(node, szPageFileLocalized, print_buf);
     if (FAILED(hr))
-- 
1.7.7.1




More information about the wine-patches mailing list