[PATCH] combase/tests: Link directly to combase.
Zebediah Figura
z.figura12 at gmail.com
Wed Apr 14 22:19:09 CDT 2021
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/combase/tests/Makefile.in | 1 +
dlls/combase/tests/roapi.c | 59 +----
dlls/combase/tests/string.c | 443 +++++++++++++++------------------
include/roapi.h | 2 +
4 files changed, 208 insertions(+), 297 deletions(-)
diff --git a/dlls/combase/tests/Makefile.in b/dlls/combase/tests/Makefile.in
index ca6c48f3f2e..1c3d77725b3 100644
--- a/dlls/combase/tests/Makefile.in
+++ b/dlls/combase/tests/Makefile.in
@@ -1,4 +1,5 @@
TESTDLL = combase.dll
+IMPORTS = combase
C_SRCS = \
roapi.c \
diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c
index b9cb476aafe..1efcc801dcb 100644
--- a/dlls/combase/tests/roapi.c
+++ b/dlls/combase/tests/roapi.c
@@ -26,38 +26,8 @@
#include "initguid.h"
#include "roapi.h"
-
#include "wine/test.h"
-static HRESULT (WINAPI *pRoActivateInstance)(HSTRING, IInspectable **);
-static HRESULT (WINAPI *pRoInitialize)(RO_INIT_TYPE);
-static void (WINAPI *pRoUninitialize)(void);
-static HRESULT (WINAPI *pRoGetActivationFactory)(HSTRING, REFIID, void **);
-
-static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *);
-static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING);
-
-#define SET(x) p##x = (void*)GetProcAddress(hmod, #x)
-
-static BOOL init_functions(void)
-{
- HMODULE hmod = LoadLibraryA("combase.dll");
- if (!hmod)
- {
- win_skip("Failed to load combase.dll, skipping tests\n");
- return FALSE;
- }
- SET(RoActivateInstance);
- SET(RoInitialize);
- SET(RoUninitialize);
- SET(RoGetActivationFactory);
-
- SET(WindowsCreateString);
- SET(WindowsDeleteString);
-
- return TRUE;
-}
-
static void test_ActivationFactories(void)
{
HRESULT hr;
@@ -65,47 +35,38 @@ static void test_ActivationFactories(void)
IActivationFactory *factory = NULL;
IInspectable *inspect = NULL;
- if(!pRoGetActivationFactory || !pRoActivateInstance)
- {
- win_skip("RoGetActivationFactory not available\n");
- return;
- }
-
- hr = pWindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument",
+ hr = WindowsCreateString(L"Windows.Data.Xml.Dom.XmlDocument",
ARRAY_SIZE(L"Windows.Data.Xml.Dom.XmlDocument") - 1, &str);
ok(hr == S_OK, "got %08x\n", hr);
- hr = pWindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str2);
+ hr = WindowsCreateString(L"Does.Not.Exist", ARRAY_SIZE(L"Does.Not.Exist") - 1, &str2);
ok(hr == S_OK, "got %08x\n", hr);
- hr = pRoInitialize(RO_INIT_MULTITHREADED);
+ hr = RoInitialize(RO_INIT_MULTITHREADED);
ok(hr == S_OK, "got %08x\n", hr);
- hr = pRoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory);
+ hr = RoGetActivationFactory(str2, &IID_IActivationFactory, (void **)&factory);
ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr);
- hr = pRoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory);
+ hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory);
todo_wine ok(hr == S_OK, "got %08x\n", hr);
if(factory)
IActivationFactory_Release(factory);
- hr = pRoActivateInstance(str2, &inspect);
+ hr = RoActivateInstance(str2, &inspect);
ok(hr == REGDB_E_CLASSNOTREG, "got %08x\n", hr);
- hr = pRoActivateInstance(str, &inspect);
+ hr = RoActivateInstance(str, &inspect);
todo_wine ok(hr == S_OK, "got %08x\n", hr);
if(inspect)
IInspectable_Release(inspect);
- pWindowsDeleteString(str2);
- pWindowsDeleteString(str);
- pRoUninitialize();
+ WindowsDeleteString(str2);
+ WindowsDeleteString(str);
+ RoUninitialize();
}
START_TEST(roapi)
{
- if (!init_functions())
- return;
-
test_ActivationFactories();
}
diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c
index a84973ff56b..5ebf669a426 100644
--- a/dlls/combase/tests/string.c
+++ b/dlls/combase/tests/string.c
@@ -27,57 +27,6 @@
#include "wine/test.h"
-static HRESULT (WINAPI *pWindowsCompareStringOrdinal)(HSTRING, HSTRING, INT32 *);
-static HRESULT (WINAPI *pWindowsConcatString)(HSTRING, HSTRING, HSTRING *);
-static HRESULT (WINAPI *pWindowsCreateString)(LPCWSTR, UINT32, HSTRING *);
-static HRESULT (WINAPI *pWindowsCreateStringReference)(LPCWSTR, UINT32, HSTRING_HEADER *, HSTRING *);
-static HRESULT (WINAPI *pWindowsDeleteString)(HSTRING);
-static HRESULT (WINAPI *pWindowsDeleteStringBuffer)(HSTRING_BUFFER);
-static HRESULT (WINAPI *pWindowsDuplicateString)(HSTRING, HSTRING *);
-static UINT32 (WINAPI *pWindowsGetStringLen)(HSTRING);
-static LPCWSTR (WINAPI *pWindowsGetStringRawBuffer)(HSTRING, UINT32 *);
-static BOOL (WINAPI *pWindowsIsStringEmpty)(HSTRING);
-static HRESULT (WINAPI *pWindowsPreallocateStringBuffer)(UINT32, WCHAR **, HSTRING_BUFFER *);
-static HRESULT (WINAPI *pWindowsPromoteStringBuffer)(HSTRING_BUFFER, HSTRING *);
-static HRESULT (WINAPI *pWindowsStringHasEmbeddedNull)(HSTRING, BOOL *);
-static HRESULT (WINAPI *pWindowsSubstring)(HSTRING, UINT32, HSTRING *);
-static HRESULT (WINAPI *pWindowsSubstringWithSpecifiedLength)(HSTRING, UINT32, UINT32, HSTRING *);
-static HRESULT (WINAPI *pWindowsTrimStringEnd)(HSTRING, HSTRING, HSTRING *);
-static HRESULT (WINAPI *pWindowsTrimStringStart)(HSTRING, HSTRING, HSTRING *);
-
-#define SET(x) p##x = (void*)GetProcAddress(hmod, #x)
-
-static BOOL init_functions(void)
-{
- HMODULE hmod = LoadLibraryA("combase.dll");
- if (!hmod)
- {
- win_skip("Failed to load combase.dll, skipping tests\n");
- return FALSE;
- }
- SET(WindowsCompareStringOrdinal);
- SET(WindowsConcatString);
- SET(WindowsCreateString);
- SET(WindowsCreateStringReference);
- SET(WindowsDeleteString);
- SET(WindowsDeleteStringBuffer);
- SET(WindowsDuplicateString);
- SET(WindowsGetStringLen);
- SET(WindowsGetStringRawBuffer);
- SET(WindowsIsStringEmpty);
- SET(WindowsPreallocateStringBuffer);
- SET(WindowsPromoteStringBuffer);
- SET(WindowsStringHasEmbeddedNull);
- SET(WindowsSubstring);
- SET(WindowsSubstringWithSpecifiedLength);
- SET(WindowsTrimStringEnd);
- SET(WindowsTrimStringStart);
- return TRUE;
-}
-
-#undef SET
-
-
#define check_string(str, content, length, has_null) _check_string(__LINE__, str, content, length, has_null)
static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length, BOOL has_null)
{
@@ -86,16 +35,16 @@ static void _check_string(int line, HSTRING str, LPCWSTR content, UINT32 length,
UINT32 out_length;
LPCWSTR ptr;
- ok_(__FILE__, line)(pWindowsIsStringEmpty(str) == empty, "WindowsIsStringEmpty failed\n");
- ok_(__FILE__, line)(pWindowsStringHasEmbeddedNull(str, &out_null) == S_OK, "pWindowsStringHasEmbeddedNull failed\n");
+ ok_(__FILE__, line)(WindowsIsStringEmpty(str) == empty, "WindowsIsStringEmpty failed\n");
+ ok_(__FILE__, line)(WindowsStringHasEmbeddedNull(str, &out_null) == S_OK, "WindowsStringHasEmbeddedNull failed\n");
ok_(__FILE__, line)(out_null == has_null, "WindowsStringHasEmbeddedNull failed\n");
- ok_(__FILE__, line)(pWindowsGetStringLen(str) == length, "WindowsGetStringLen failed\n");
- ptr = pWindowsGetStringRawBuffer(str, &out_length);
+ ok_(__FILE__, line)(WindowsGetStringLen(str) == length, "WindowsGetStringLen failed\n");
+ ptr = WindowsGetStringRawBuffer(str, &out_length);
/* WindowsGetStringRawBuffer should return a non-null, null terminated empty string
* even if str is NULL. */
ok_(__FILE__, line)(ptr != NULL, "WindowsGetStringRawBuffer returned null\n");
ok_(__FILE__, line)(out_length == length, "WindowsGetStringRawBuffer returned incorrect length\n");
- ptr = pWindowsGetStringRawBuffer(str, NULL);
+ ptr = WindowsGetStringRawBuffer(str, NULL);
ok_(__FILE__, line)(ptr != NULL, "WindowsGetStringRawBuffer returned null\n");
ok_(__FILE__, line)(ptr[length] == '\0', "WindowsGetStringRawBuffer doesn't return a null terminated buffer\n");
ok_(__FILE__, line)(memcmp(ptr, content, sizeof(*content) * length) == 0, "Incorrect string content\n");
@@ -113,80 +62,80 @@ static void test_create_delete(void)
HSTRING_HEADER header;
/* Test normal creation of a string */
- ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
check_string(str, input_string, 6, FALSE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
/* Test error handling in WindowsCreateString */
- ok(pWindowsCreateString(input_string, 6, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsCreateString(NULL, 6, &str) == E_POINTER, "Incorrect error handling\n");
+ ok(WindowsCreateString(input_string, 6, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsCreateString(NULL, 6, &str) == E_POINTER, "Incorrect error handling\n");
/* Test handling of a NULL string */
- ok(pWindowsDeleteString(NULL) == S_OK, "Failed to delete null string\n");
+ ok(WindowsDeleteString(NULL) == S_OK, "Failed to delete null string\n");
/* Test creation of a string reference */
- ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
check_string(str, input_string, 6, FALSE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
/* Test error handling in WindowsCreateStringReference */
/* Strings to CreateStringReference must be null terminated with the correct
* length. According to MSDN this should be E_INVALIDARG, but it returns
* 0x80000017 in practice. */
- ok(FAILED(pWindowsCreateStringReference(input_string, 5, &header, &str)), "Incorrect error handling\n");
+ ok(FAILED(WindowsCreateStringReference(input_string, 5, &header, &str)), "Incorrect error handling\n");
/* If the input string is non-null, it must be null-terminated even if the
* length is zero. */
- ok(FAILED(pWindowsCreateStringReference(input_string, 0, &header, &str)), "Incorrect error handling\n");
- ok(pWindowsCreateStringReference(input_string, 6, NULL, &str) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsCreateStringReference(input_string, 6, &header, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsCreateStringReference(NULL, 6, &header, &str) == E_POINTER, "Incorrect error handling\n");
+ ok(FAILED(WindowsCreateStringReference(input_string, 0, &header, &str)), "Incorrect error handling\n");
+ ok(WindowsCreateStringReference(input_string, 6, NULL, &str) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsCreateStringReference(input_string, 6, &header, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsCreateStringReference(NULL, 6, &header, &str) == E_POINTER, "Incorrect error handling\n");
/* Test creating a string without a null-termination at the specified length */
- ok(pWindowsCreateString(input_string, 3, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string, 3, &str) == S_OK, "Failed to create string\n");
check_string(str, input_string, 3, FALSE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
/* Test an empty string */
- ok(pWindowsCreateString(L"", 0, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(L"", 0, &str) == S_OK, "Failed to create string\n");
ok(str == NULL, "Empty string not a null string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateString(input_string, 0, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string, 0, &str) == S_OK, "Failed to create string\n");
ok(str == NULL, "Empty string not a null string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateStringReference(L"", 0, &header, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateStringReference(L"", 0, &header, &str) == S_OK, "Failed to create string\n");
ok(str == NULL, "Empty string not a null string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateString(NULL, 0, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(NULL, 0, &str) == S_OK, "Failed to create string\n");
ok(str == NULL, "Empty string not a null string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateStringReference(NULL, 0, &header, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateStringReference(NULL, 0, &header, &str) == S_OK, "Failed to create string\n");
ok(str == NULL, "Empty string not a null string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
}
static void test_duplicate(void)
{
HSTRING str, str2;
HSTRING_HEADER header;
- ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
- ok(pWindowsDuplicateString(str, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string\n");
+ ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsDuplicateString(str, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string\n");
ok(str == str2, "Duplicated string created new string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
- ok(pWindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string\n");
+ ok(WindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
+ ok(WindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string\n");
ok(str != str2, "Duplicated string ref didn't create new string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
- ok(pWindowsDuplicateString(NULL, &str2) == S_OK, "Failed to duplicate NULL string\n");
+ ok(WindowsDuplicateString(NULL, &str2) == S_OK, "Failed to duplicate NULL string\n");
ok(str2 == NULL, "Duplicated string created new string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
}
static void test_access(void)
@@ -198,22 +147,22 @@ static void test_access(void)
check_string(NULL, NULL, 0, FALSE);
/* Test strings with embedded null chars */
- ok(pWindowsCreateString(input_embed_null, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_embed_null, 6, &str) == S_OK, "Failed to create string\n");
check_string(str, input_embed_null, 6, TRUE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateStringReference(input_embed_null, 6, &header, &str) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_embed_null, 6, &header, &str) == S_OK, "Failed to create string ref\n");
check_string(str, input_embed_null, 6, TRUE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
/* Test normal creation of a string with trailing null */
- ok(pWindowsCreateString(input_string, 7, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string, 7, &str) == S_OK, "Failed to create string\n");
check_string(str, input_string, 7, TRUE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateStringReference(input_string, 7, &header, &str) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string, 7, &header, &str) == S_OK, "Failed to create string ref\n");
check_string(str, input_string, 7, TRUE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
}
static void test_string_buffer(void)
@@ -225,43 +174,43 @@ static void test_string_buffer(void)
HSTRING str;
/* Test creation of an empty buffer */
- ok(pWindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
+ ok(WindowsPreallocateStringBuffer(0, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
ok(ptr != NULL, "Empty string didn't return a buffer pointer\n");
- ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n");
+ ok(WindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n");
ok(str == NULL, "Empty string isn't a null string\n");
check_string(str, L"", 0, FALSE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteStringBuffer(NULL) == S_OK, "Failed to delete null string buffer\n");
+ ok(WindowsDeleteStringBuffer(NULL) == S_OK, "Failed to delete null string buffer\n");
/* Test creation and deletion of string buffers */
- ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
- ok(pWindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n");
+ ok(WindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
+ ok(WindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n");
/* Test creation and promotion of string buffers */
- ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
+ ok(WindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
ok(ptr[6] == '\0', "Preallocated string buffer didn't have null termination\n");
memcpy(ptr, input_string, 6 * sizeof(*input_string));
- ok(pWindowsPromoteStringBuffer(buf, NULL) == E_POINTER, "Incorrect error handling\n");
- ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n");
+ ok(WindowsPromoteStringBuffer(buf, NULL) == E_POINTER, "Incorrect error handling\n");
+ ok(WindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n");
check_string(str, input_string, 6, FALSE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
/* Test error handling in preallocation */
- ok(pWindowsPreallocateStringBuffer(6, NULL, &buf) == E_POINTER, "Incorrect error handling\n");
- ok(pWindowsPreallocateStringBuffer(6, &ptr, NULL) == E_POINTER, "Incorrect error handling\n");
+ ok(WindowsPreallocateStringBuffer(6, NULL, &buf) == E_POINTER, "Incorrect error handling\n");
+ ok(WindowsPreallocateStringBuffer(6, &ptr, NULL) == E_POINTER, "Incorrect error handling\n");
- ok(pWindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
+ ok(WindowsPreallocateStringBuffer(6, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
ptr[6] = 'a'; /* Overwrite the buffer's null termination, promotion should fail */
- ok(pWindowsPromoteStringBuffer(buf, &str) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n");
+ ok(WindowsPromoteStringBuffer(buf, &str) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsDeleteStringBuffer(buf) == S_OK, "Failed to delete string buffer\n");
/* Test strings with trailing null chars */
- ok(pWindowsPreallocateStringBuffer(7, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
+ ok(WindowsPreallocateStringBuffer(7, &ptr, &buf) == S_OK, "Failed to preallocate string buffer\n");
memcpy(ptr, input_string, 7 * sizeof(*input_string));
- ok(pWindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n");
+ ok(WindowsPromoteStringBuffer(buf, &str) == S_OK, "Failed to promote string buffer\n");
check_string(str, input_string, 7, TRUE);
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
}
static void test_substring(void)
@@ -270,76 +219,76 @@ static void test_substring(void)
HSTRING_HEADER header;
/* Test substring of string buffers */
- ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
- ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring\n");
+ ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring\n");
check_string(substr, output_substring, 4, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 2, 3, &substr) == S_OK, "Failed to create substring\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 2, 3, &substr) == S_OK, "Failed to create substring\n");
check_string(substr, output_substring, 3, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
/* Test duplication of string using substring */
- ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
- ok(pWindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring\n");
+ ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring\n");
ok(str != substr, "Duplicated string didn't create new string\n");
check_string(substr, input_string, 6, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 0, 6, &substr) == S_OK, "Failed to create substring\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 0, 6, &substr) == S_OK, "Failed to create substring\n");
ok(str != substr, "Duplicated string didn't create new string\n");
check_string(substr, input_string, 6, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
/* Test substring of string reference */
- ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
- ok(pWindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring of string ref\n");
+ ok(WindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
+ ok(WindowsSubstring(str, 2, &substr) == S_OK, "Failed to create substring of string ref\n");
check_string(substr, output_substring, 4, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 2, 3, &substr) == S_OK, "Failed to create substring of string ref\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 2, 3, &substr) == S_OK, "Failed to create substring of string ref\n");
check_string(substr, output_substring, 3, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
/* Test duplication of string reference using substring */
- ok(pWindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
- ok(pWindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring of string ref\n");
+ ok(WindowsCreateStringReference(input_string, 6, &header, &str) == S_OK, "Failed to create string ref\n");
+ ok(WindowsSubstring(str, 0, &substr) == S_OK, "Failed to create substring of string ref\n");
ok(str != substr, "Duplicated string ref didn't create new string\n");
check_string(substr, input_string, 6, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 0, 6, &substr) == S_OK, "Failed to create substring of string ref\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 0, 6, &substr) == S_OK, "Failed to create substring of string ref\n");
ok(str != substr, "Duplicated string ref didn't create new string\n");
check_string(substr, input_string, 6, FALSE);
- ok(pWindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(substr) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref\n");
/* Test get substring of empty string */
- ok(pWindowsSubstring(NULL, 0, &substr) == S_OK, "Failed to duplicate NULL string\n");
+ ok(WindowsSubstring(NULL, 0, &substr) == S_OK, "Failed to duplicate NULL string\n");
ok(substr == NULL, "Substring created new string\n");
- ok(pWindowsSubstringWithSpecifiedLength(NULL, 0, 0, &substr) == S_OK, "Failed to duplicate NULL string\n");
+ ok(WindowsSubstringWithSpecifiedLength(NULL, 0, 0, &substr) == S_OK, "Failed to duplicate NULL string\n");
ok(substr == NULL, "Substring created new string\n");
/* Test get empty substring of string */
- ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
- ok(pWindowsSubstring(str, 6, &substr) == S_OK, "Failed to create substring\n");
+ ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsSubstring(str, 6, &substr) == S_OK, "Failed to create substring\n");
ok(substr == NULL, "Substring created new string\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 6, 0, &substr) == S_OK, "Failed to create substring\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 6, 0, &substr) == S_OK, "Failed to create substring\n");
ok(substr == NULL, "Substring created new string\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
/* Test handling of using too high start index or length */
- ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
- ok(pWindowsSubstring(str, 7, &substr) == E_BOUNDS, "Incorrect error handling\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 7, 0, &substr) == E_BOUNDS, "Incorrect error handling\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 6, 1, &substr) == E_BOUNDS, "Incorrect error handling\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 7, ~0U, &substr) == E_BOUNDS, "Incorrect error handling\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsSubstring(str, 7, &substr) == E_BOUNDS, "Incorrect error handling\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 7, 0, &substr) == E_BOUNDS, "Incorrect error handling\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 6, 1, &substr) == E_BOUNDS, "Incorrect error handling\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 7, ~0U, &substr) == E_BOUNDS, "Incorrect error handling\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
/* Test handling of a NULL string */
- ok(pWindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
- ok(pWindowsSubstring(str, 7, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsSubstringWithSpecifiedLength(str, 7, 0, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsDeleteString(str) == S_OK, "Failed to delete string\n");
+ ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string\n");
+ ok(WindowsSubstring(str, 7, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsSubstringWithSpecifiedLength(str, 7, 0, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsDeleteString(str) == S_OK, "Failed to delete string\n");
}
static void test_concat(void)
@@ -348,53 +297,53 @@ static void test_concat(void)
HSTRING_HEADER header1, header2;
/* Test concatenation of string buffers */
- ok(pWindowsCreateString(input_string1, 3, &str1) == S_OK, "Failed to create string\n");
- ok(pWindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string1, 3, &str1) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n");
- ok(pWindowsConcatString(str1, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsConcatString(str1, NULL, &concat) == S_OK, "Failed to concatenate string\n");
+ ok(WindowsConcatString(str1, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsConcatString(str1, NULL, &concat) == S_OK, "Failed to concatenate string\n");
ok(str1 == concat, "Concatenate created new string\n");
check_string(concat, input_string1, 3, FALSE);
- ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
- ok(pWindowsConcatString(NULL, str2, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsConcatString(NULL, str2, &concat) == S_OK, "Failed to concatenate string\n");
+ ok(WindowsConcatString(NULL, str2, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsConcatString(NULL, str2, &concat) == S_OK, "Failed to concatenate string\n");
ok(str2 == concat, "Concatenate created new string\n");
check_string(concat, input_string2, 3, FALSE);
- ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
- ok(pWindowsConcatString(str1, str2, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsConcatString(str1, str2, &concat) == S_OK, "Failed to concatenate string\n");
+ ok(WindowsConcatString(str1, str2, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsConcatString(str1, str2, &concat) == S_OK, "Failed to concatenate string\n");
check_string(concat, input_string, 6, FALSE);
- ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
/* Test concatenation of string references */
- ok(pWindowsCreateStringReference(input_string1, 3, &header1, &str1) == S_OK, "Failed to create string ref\n");
- ok(pWindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string1, 3, &header1, &str1) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
- ok(pWindowsConcatString(str1, NULL, &concat) == S_OK, "Failed to concatenate string\n");
+ ok(WindowsConcatString(str1, NULL, &concat) == S_OK, "Failed to concatenate string\n");
ok(str1 != concat, "Concatenate string ref didn't create new string\n");
check_string(concat, input_string1, 3, FALSE);
- ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
- ok(pWindowsConcatString(NULL, str2, &concat) == S_OK, "Failed to concatenate string\n");
+ ok(WindowsConcatString(NULL, str2, &concat) == S_OK, "Failed to concatenate string\n");
ok(str2 != concat, "Concatenate string ref didn't create new string\n");
check_string(concat, input_string2, 3, FALSE);
- ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
- ok(pWindowsConcatString(str1, str2, &concat) == S_OK, "Failed to concatenate string\n");
+ ok(WindowsConcatString(str1, str2, &concat) == S_OK, "Failed to concatenate string\n");
check_string(concat, input_string, 6, FALSE);
- ok(pWindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(concat) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
- ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n");
/* Test concatenation of two empty strings */
- ok(pWindowsConcatString(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsConcatString(NULL, NULL, &concat) == S_OK, "Failed to concatenate string\n");
+ ok(WindowsConcatString(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsConcatString(NULL, NULL, &concat) == S_OK, "Failed to concatenate string\n");
ok(concat == NULL, "Concatenate created new string\n");
}
@@ -405,56 +354,56 @@ static void test_compare(void)
INT32 res;
/* Test comparison of string buffers */
- ok(pWindowsCreateString(input_string1, 3, &str1) == S_OK, "Failed to create string\n");
- ok(pWindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string1, 3, &str1) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n");
- ok(pWindowsCompareStringOrdinal(str1, str1, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str1, str1, &res) == S_OK, "Failed to compare string\n");
ok(res == 0, "Expected 0, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str1, str2, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str1, str2, &res) == S_OK, "Failed to compare string\n");
ok(res == -1, "Expected -1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str2, str1, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str2, str1, &res) == S_OK, "Failed to compare string\n");
ok(res == 1, "Expected 1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str2, str2, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str2, str2, &res) == S_OK, "Failed to compare string\n");
ok(res == 0, "Expected 0, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str1, NULL, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str1, NULL, &res) == S_OK, "Failed to compare string\n");
ok(res == 1, "Expected 1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(NULL, str1, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(NULL, str1, &res) == S_OK, "Failed to compare string\n");
ok(res == -1, "Expected -1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str2, NULL, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str2, NULL, &res) == S_OK, "Failed to compare string\n");
ok(res == 1, "Expected 1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(NULL, str2, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(NULL, str2, &res) == S_OK, "Failed to compare string\n");
ok(res == -1, "Expected -1, got %d\n", res);
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
/* Test comparison of string references */
- ok(pWindowsCreateStringReference(input_string1, 3, &header1, &str1) == S_OK, "Failed to create string ref\n");
- ok(pWindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string1, 3, &header1, &str1) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
- ok(pWindowsCompareStringOrdinal(str1, str1, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str1, str1, &res) == S_OK, "Failed to compare string\n");
ok(res == 0, "Expected 0, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str1, str2, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str1, str2, &res) == S_OK, "Failed to compare string\n");
ok(res == -1, "Expected -1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str2, str1, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str2, str1, &res) == S_OK, "Failed to compare string\n");
ok(res == 1, "Expected 1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str2, str2, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str2, str2, &res) == S_OK, "Failed to compare string\n");
ok(res == 0, "Expected 0, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str1, NULL, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str1, NULL, &res) == S_OK, "Failed to compare string\n");
ok(res == 1, "Expected 1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(NULL, str1, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(NULL, str1, &res) == S_OK, "Failed to compare string\n");
ok(res == -1, "Expected -1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(str2, NULL, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(str2, NULL, &res) == S_OK, "Failed to compare string\n");
ok(res == 1, "Expected 1, got %d\n", res);
- ok(pWindowsCompareStringOrdinal(NULL, str2, &res) == S_OK, "Failed to compare string\n");
+ ok(WindowsCompareStringOrdinal(NULL, str2, &res) == S_OK, "Failed to compare string\n");
ok(res == -1, "Expected -1, got %d\n", res);
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
- ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n");
/* Test comparison of two empty strings */
- ok(pWindowsCompareStringOrdinal(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsCompareStringOrdinal(NULL, NULL, &res) == S_OK, "Failed to compare NULL string\n");
+ ok(WindowsCompareStringOrdinal(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsCompareStringOrdinal(NULL, NULL, &res) == S_OK, "Failed to compare NULL string\n");
ok(res == 0, "Expected 0, got %d\n", res);
}
@@ -464,76 +413,74 @@ static void test_trim(void)
HSTRING_HEADER header1, header2;
/* Test trimming of string buffers */
- ok(pWindowsCreateString(input_string, 6, &str1) == S_OK, "Failed to create string\n");
- ok(pWindowsCreateString(input_string1, 3, &str2) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string, 6, &str1) == S_OK, "Failed to create string\n");
+ ok(WindowsCreateString(input_string1, 3, &str2) == S_OK, "Failed to create string\n");
- ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
check_string(trimmed, input_string2, 3, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
ok(trimmed == str1, "Trimmed string created new string\n");
check_string(trimmed, input_string, 6, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
- ok(pWindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
+ ok(WindowsCreateString(input_string2, 3, &str2) == S_OK, "Failed to create string\n");
- ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
ok(trimmed == str1, "Trimmed string created new string\n");
check_string(trimmed, input_string, 6, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
check_string(trimmed, input_string1, 3, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
/* Test trimming of string references */
- ok(pWindowsCreateStringReference(input_string, 6, &header1, &str1) == S_OK, "Failed to create string ref\n");
- ok(pWindowsCreateStringReference(input_string1, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string, 6, &header1, &str1) == S_OK, "Failed to create string ref\n");
+ ok(WindowsCreateStringReference(input_string1, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
- ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
check_string(trimmed, input_string2, 3, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
ok(trimmed != str1, "Trimmed string ref didn't create new string\n");
check_string(trimmed, input_string, 6, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
- ok(pWindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsCreateStringReference(input_string2, 3, &header2, &str2) == S_OK, "Failed to create string ref\n");
- ok(pWindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsTrimStringStart(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
ok(trimmed != str1, "Trimmed string ref didn't create new string\n");
check_string(trimmed, input_string, 6, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsTrimStringEnd(str1, str2, &trimmed) == S_OK, "Failed to trim string\n");
check_string(trimmed, input_string1, 3, FALSE);
- ok(pWindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(trimmed) == S_OK, "Failed to delete string\n");
- ok(pWindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
- ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str2) == S_OK, "Failed to delete string ref\n");
+ ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string ref\n");
/* Test handling of NULL strings */
- ok(pWindowsCreateString(input_string, 6, &str1) == S_OK, "Failed to create string\n");
- ok(pWindowsTrimStringStart(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsTrimStringStart(NULL, str1, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsTrimStringStart(NULL, NULL, &trimmed) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsTrimStringStart(NULL, str1, &trimmed) == S_OK, "Failed to trim empty string\n");
+ ok(WindowsCreateString(input_string, 6, &str1) == S_OK, "Failed to create string\n");
+ ok(WindowsTrimStringStart(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsTrimStringStart(NULL, str1, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsTrimStringStart(NULL, NULL, &trimmed) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsTrimStringStart(NULL, str1, &trimmed) == S_OK, "Failed to trim empty string\n");
ok(trimmed == NULL, "Trimming created new string\n");
- ok(pWindowsTrimStringEnd(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsTrimStringEnd(NULL, str1, NULL) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsTrimStringEnd(NULL, NULL, &trimmed) == E_INVALIDARG, "Incorrect error handling\n");
- ok(pWindowsTrimStringEnd(NULL, str1, &trimmed) == S_OK, "Failed to trim empty string\n");
+ ok(WindowsTrimStringEnd(NULL, NULL, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsTrimStringEnd(NULL, str1, NULL) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsTrimStringEnd(NULL, NULL, &trimmed) == E_INVALIDARG, "Incorrect error handling\n");
+ ok(WindowsTrimStringEnd(NULL, str1, &trimmed) == S_OK, "Failed to trim empty string\n");
ok(trimmed == NULL, "Trimming created new string\n");
- ok(pWindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
+ ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n");
}
START_TEST(string)
{
- if (!init_functions())
- return;
test_create_delete();
test_duplicate();
test_access();
diff --git a/include/roapi.h b/include/roapi.h
index 9f717e88e34..bcaa8e9fea0 100644
--- a/include/roapi.h
+++ b/include/roapi.h
@@ -42,6 +42,8 @@ typedef HRESULT (WINAPI *PFNGETACTIVATIONFACTORY)(HSTRING, IActivationFactory **
extern "C" {
#endif
+HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance);
+HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_factory);
HRESULT WINAPI RoInitialize(RO_INIT_TYPE type);
void WINAPI RoUninitialize(void);
--
2.30.2
More information about the wine-devel
mailing list