From 66aff886f3a68fdfe40e2c0bcdad2fbd053d4ca2 Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Mon, 1 Feb 2010 07:13:19 +0000
Subject: [PATCH] removed FORCEINLINE from PhConcatStrings2

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@2780 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 2.x/trunk/ProcessHacker/basesup.c        | 32 ++++++++++++++++++++
 2.x/trunk/ProcessHacker/include/phbase.h | 37 ++++--------------------
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/2.x/trunk/ProcessHacker/basesup.c b/2.x/trunk/ProcessHacker/basesup.c
index fe10538d3..a430876cf 100644
--- a/2.x/trunk/ProcessHacker/basesup.c
+++ b/2.x/trunk/ProcessHacker/basesup.c
@@ -553,6 +553,38 @@ PPH_STRING PhConcatStrings_V(
     return string;
 }
 
+/**
+ * Concatenates two strings.
+ *
+ * \param String1 The first string.
+ * \param String2 The second string.
+ */
+PPH_STRING PhConcatStrings2(
+    __in PWSTR String1,
+    __in PWSTR String2
+    )
+{
+    PPH_STRING string;
+    SIZE_T length1;
+    SIZE_T length2;
+
+    length1 = wcslen(String1) * sizeof(WCHAR);
+    length2 = wcslen(String2) * sizeof(WCHAR);
+    string = PhCreateStringEx(NULL, length1 + length2);
+    memcpy(
+        string->Buffer,
+        String1,
+        length1
+        );
+    memcpy(
+        &string->Buffer[length1 / sizeof(WCHAR)],
+        String2,
+        length2
+        );
+
+    return string;
+}
+
 /**
  * Creates a string using format specifiers.
  *
diff --git a/2.x/trunk/ProcessHacker/include/phbase.h b/2.x/trunk/ProcessHacker/include/phbase.h
index cf594959b..c5799a5a5 100644
--- a/2.x/trunk/ProcessHacker/include/phbase.h
+++ b/2.x/trunk/ProcessHacker/include/phbase.h
@@ -264,6 +264,11 @@ PPH_STRING PhConcatStrings_V(
     __in va_list ArgPtr
     );
 
+PPH_STRING PhConcatStrings2(
+    __in PWSTR String1,
+    __in PWSTR String2
+    );
+
 PPH_STRING PhFormatString(
     __in PWSTR Format,
     ...
@@ -338,38 +343,6 @@ FORCEINLINE PPH_STRING PhDuplicateString(
     return PhCreateStringEx(String->Buffer, String->Length);
 }
 
-/**
- * Concatenates two strings.
- *
- * \param String1 The first string.
- * \param String2 The second string.
- */
-FORCEINLINE PPH_STRING PhConcatStrings2(
-    __in PWSTR String1,
-    __in PWSTR String2
-    )
-{
-    PPH_STRING string;
-    SIZE_T length1;
-    SIZE_T length2;
-
-    length1 = wcslen(String1) * sizeof(WCHAR);
-    length2 = wcslen(String2) * sizeof(WCHAR);
-    string = PhCreateStringEx(NULL, length1 + length2);
-    memcpy(
-        string->Buffer,
-        String1,
-        length1
-        );
-    memcpy(
-        &string->Buffer[length1 / sizeof(WCHAR)],
-        String2,
-        length2
-        );
-
-    return string;
-}
-
 /**
  * Compares two strings.
  *