admin/mirror-processhacker
1
0
Fork 0
mirror of https://github.com/mirror/processhacker synced 2026-06-08 16:03:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed FORCEINLINE from PhConcatStrings2

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/processhacker/code@2780 21ef857c-d57f-4fe0-8362-d861dc6d29cd
This commit is contained in:
wj32
2010-02-01 07:13:19 +00:00
parent 8a050e7c62
commit 66aff886f3
2 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2.x/trunk/ProcessHacker/basesup.c
+32
View File
@@ -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.
*
2.x/trunk/ProcessHacker/include/phbase.h
+5 -32
View File
@@ -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.
*