Michael Stefaniuc : comsvcs/tests: Use wide-char string literals.
Alexandre Julliard
julliard at winehq.org
Thu Oct 1 15:50:30 CDT 2020
Module: wine
Branch: master
Commit: eadbba41246d26523cef48323deea46f2a45b310
URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadbba41246d26523cef48323deea46f2a45b310
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Wed Sep 30 23:14:50 2020 +0200
comsvcs/tests: Use wide-char string literals.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comsvcs/tests/comsvcs.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/comsvcs/tests/comsvcs.c b/dlls/comsvcs/tests/comsvcs.c
index ca59951c81..4e9471e734 100644
--- a/dlls/comsvcs/tests/comsvcs.c
+++ b/dlls/comsvcs/tests/comsvcs.c
@@ -176,9 +176,6 @@ static DWORD WINAPI com_thread(void *arg)
static void create_dispenser(void)
{
- static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0};
- static const WCHAR pool1[] = {'S','C','.','P','o','o','l',' ','1',' ','1',0};
- static const WCHAR data[] = {'d','a','t','a','1',0};
HRESULT hr;
IDispenserManager *dispenser = NULL;
IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL;
@@ -203,7 +200,7 @@ static void create_dispenser(void)
init_test_driver(&driver);
- hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder1);
+ hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder1);
ok(hr == S_OK, "got 0x%08x\n", hr);
/* The above call creates an MTA thread, but we need to wait for it to
@@ -214,11 +211,11 @@ static void create_dispenser(void)
GetExitCodeThread(thread, &ret);
ok(ret == S_OK, "got unexpected hr %#x\n", ret);
- hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool0, &holder2);
+ hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 0 0", &holder2);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(holder1 != holder2, "same holder object returned\n");
- hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, pool1, &holder3);
+ hr = IDispenserManager_RegisterDispenser(dispenser, &driver.IDispenserDriver_iface, L"SC.Pool 1 1", &holder3);
ok(hr == S_OK, "got 0x%08x\n", hr);
if(holder1)
@@ -226,7 +223,7 @@ static void create_dispenser(void)
SET_EXPECT(driver_CreateResource);
SET_EXPECT(driver_Release);
- str = SysAllocString(data);
+ str = SysAllocString(L"data1");
hr = IHolder_AllocResource(holder1, (RESTYPID)str, &resid);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(resid == 10, "got %d\n", (int)resid);
@@ -254,7 +251,7 @@ static void create_dispenser(void)
SET_EXPECT(driver_CreateResource);
SET_EXPECT(driver_Release);
- str = SysAllocString(data);
+ str = SysAllocString(L"data1");
hr = IHolder_AllocResource(holder2, (RESTYPID)str, &resid);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(resid == 10, "got %d\n", (int)resid);
More information about the wine-cvs
mailing list