From bc18a6c289c5ae8d90d5bf9fb8b23041183a52a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= <jerome.gardou@reactos.org>
Date: Sat, 31 Dec 2011 17:29:42 +0000
Subject: [PATCH] [NEWINFLIB] - better fix for non standard use of swprintf, by
 Thomas Faber

svn path=/trunk/; revision=54795
---
 reactos/lib/newinflib/CMakeLists.txt |  8 ++++----
 reactos/lib/newinflib/infget.c       | 14 ++++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/reactos/lib/newinflib/CMakeLists.txt b/reactos/lib/newinflib/CMakeLists.txt
index 7d38008ddb4..08e569606b7 100644
--- a/reactos/lib/newinflib/CMakeLists.txt
+++ b/reactos/lib/newinflib/CMakeLists.txt
@@ -20,10 +20,10 @@ else()
         infhostput.c
         infhostrtl.c)
 
-    add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST)
-    if(NOT MSVC)
-        add_compile_flags("-Wpointer-arith -Wwrite-strings")
-    endif()
+    add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_NON_CONFORMING_SWPRINTFS)
     add_library(inflibhost ${GLOBAL_FILES} ${SOURCE})
+    if(NOT MSVC)
+        add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings")
+    endif()
     target_link_libraries(inflibhost unicode)
 endif()
diff --git a/reactos/lib/newinflib/infget.c b/reactos/lib/newinflib/infget.c
index 26522804525..666f71232da 100644
--- a/reactos/lib/newinflib/infget.c
+++ b/reactos/lib/newinflib/infget.c
@@ -48,10 +48,9 @@ InfpGetSubstitutionString(PINFCACHE Inf,
 
     if (Inf->LanguageId != 0)
     {
-        _snwprintf(StringLangId,
-                   13,
-                   L"Strings.%04hx",
-                   Inf->LanguageId);
+        swprintf(StringLangId,
+                 L"Strings.%04hx",
+                 Inf->LanguageId);
 
         Status = InfpFindFirstLine(Inf,
                                    StringLangId,
@@ -59,10 +58,9 @@ InfpGetSubstitutionString(PINFCACHE Inf,
                                    &Context);
         if (Status != INF_STATUS_SUCCESS)
         {
-            _snwprintf(StringLangId,
-                       13,
-                       L"Strings.%04hx",
-                       MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL));
+            swprintf(StringLangId,
+                     L"Strings.%04hx",
+                     MAKELANGID(PRIMARYLANGID(Inf->LanguageId), SUBLANG_NEUTRAL));
 
             Status = InfpFindFirstLine(Inf,
                                        StringLangId,