Jacek Caban : oleaut32/tests: Use Unicode strings for file names.
Alexandre Julliard
julliard at winehq.org
Mon Feb 10 16:32:44 CST 2020
Module: wine
Branch: master
Commit: f7e357aa5f094367e59302f6c731eab2eb48b7af
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e357aa5f094367e59302f6c731eab2eb48b7af
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Feb 10 14:56:20 2020 +0100
oleaut32/tests: Use Unicode strings for file names.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/oleaut32/tests/typelib.c | 58 +++++++++++++++++--------------------------
1 file changed, 23 insertions(+), 35 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index 4ffbaa9e2d..2a84cd92e9 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -775,14 +775,14 @@ static void test_CreateDispTypeInfo(void)
SysFreeString(methdata[3].szName);
}
-static void write_typelib(int res_no, const char *filename)
+static void write_typelib(int res_no, const WCHAR *filename)
{
DWORD written;
HANDLE file;
HRSRC res;
void *ptr;
- file = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
+ file = CreateFileW( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 );
ok( file != INVALID_HANDLE_VALUE, "file creation failed\n" );
if (file == INVALID_HANDLE_VALUE) return;
res = FindResourceA( GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(res_no), "TYPELIB" );
@@ -820,11 +820,11 @@ static void test_invoke_func(ITypeInfo *typeinfo)
ok(hres == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hres);
}
-static const char *create_test_typelib(int res_no)
+static WCHAR *create_test_typelib(int res_no)
{
- static char filename[MAX_PATH];
+ static WCHAR filename[MAX_PATH];
- GetTempFileNameA( ".", "tlb", 0, filename );
+ GetTempFileNameW(L".", L"tlb", 0, filename);
write_typelib(res_no, filename);
return filename;
}
@@ -847,8 +847,7 @@ static void test_TypeInfo(void)
VARIANT var, res, args[2];
UINT count, i;
TYPEKIND kind;
- const char *filenameA;
- WCHAR filename[MAX_PATH];
+ const WCHAR *filename;
TYPEATTR *attr;
LONG l;
@@ -1029,8 +1028,7 @@ static void test_TypeInfo(void)
ITypeInfo_Release(pTypeInfo);
ITypeLib_Release(pTypeLib);
- filenameA = create_test_typelib(3);
- MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH);
+ filename = create_test_typelib(3);
hr = LoadTypeLib(filename, &pTypeLib);
ok(hr == S_OK, "got 0x%08x\n", hr);
@@ -1132,7 +1130,7 @@ static void test_TypeInfo(void)
ITypeInfo_Release(pTypeInfo);
ITypeLib_Release(pTypeLib);
- DeleteFileA(filenameA);
+ DeleteFileW(filename);
}
static int WINAPI int_func( int a0, int a1, int a2, int a3, int a4 )
@@ -4180,16 +4178,14 @@ static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc)
return href_type;
}
-static void test_dump_typelib(const char *name)
+static void test_dump_typelib(const WCHAR *name)
{
- WCHAR wszString[260];
ITypeInfo *info;
ITypeLib *lib;
int count;
int i;
- MultiByteToWideChar(CP_ACP, 0, name, -1, wszString, 260);
- OLE_CHECK(LoadTypeLib(wszString, &lib));
+ OLE_CHECK(LoadTypeLib(name, &lib));
printf("/*** Autogenerated data. Do not edit, change the generator above instead. ***/\n");
@@ -4797,15 +4793,13 @@ static const type_info info[] = {
expect_hex(U(*(elem)).paramdesc.wParamFlags, (info)->wParamFlags); \
}
-static void test_dump_typelib(const char *name)
+static void test_dump_typelib(const WCHAR *name)
{
- WCHAR wszName[MAX_PATH];
ITypeLib *typelib;
int ticount = ARRAY_SIZE(info);
int iface, func;
- MultiByteToWideChar(CP_ACP, 0, name, -1, wszName, MAX_PATH);
- ole_check(LoadTypeLibEx(wszName, REGKIND_NONE, &typelib));
+ ole_check(LoadTypeLibEx(name, REGKIND_NONE, &typelib));
expect_eq(ITypeLib_GetTypeInfoCount(typelib), ticount, UINT, "%d");
for (iface = 0; iface < ticount; iface++)
{
@@ -4998,8 +4992,7 @@ static void test_create_typelibs(void)
static void test_register_typelib(BOOL system_registration)
{
HRESULT hr;
- WCHAR filename[MAX_PATH];
- const char *filenameA;
+ WCHAR *filename;
ITypeLib *typelib;
WCHAR uuidW[40];
char key_name[MAX_PATH], uuid[40];
@@ -5043,8 +5036,7 @@ static void test_register_typelib(BOOL system_registration)
if (pIsWow64Process)
pIsWow64Process(GetCurrentProcess(), &is_wow64);
- filenameA = create_test_typelib(3);
- MultiByteToWideChar(CP_ACP, 0, filenameA, -1, filename, MAX_PATH);
+ filename = create_test_typelib(3);
hr = LoadTypeLibEx(filename, REGKIND_NONE, &typelib);
ok(hr == S_OK, "got %08x\n", hr);
@@ -5057,7 +5049,7 @@ static void test_register_typelib(BOOL system_registration)
{
win_skip("Insufficient privileges to register typelib in the registry\n");
ITypeLib_Release(typelib);
- DeleteFileA(filenameA);
+ DeleteFileW(filename);
return;
}
ok(hr == S_OK, "got %08x\n", hr);
@@ -5187,7 +5179,7 @@ static void test_register_typelib(BOOL system_registration)
}
ITypeLib_Release(typelib);
- DeleteFileA( filenameA );
+ DeleteFileW(filename);
}
static void test_LoadTypeLib(void)
@@ -5795,8 +5787,8 @@ static void test_LoadRegTypeLib(void)
DeleteFileA("main.manifest");
/* create typelib file */
- write_typelib(1, "test_actctx_tlb.tlb");
- write_typelib(3, "test_actctx_tlb2.tlb");
+ write_typelib(1, L"test_actctx_tlb.tlb");
+ write_typelib(3, L"test_actctx_tlb2.tlb");
hr = LoadRegTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, &tl);
ok(hr == TYPE_E_LIBNOTREGISTERED, "got 0x%08x\n", hr);
@@ -6377,8 +6369,7 @@ static void test_stub(void)
static void test_dep(void) {
HRESULT hr;
- const char *refFilename;
- WCHAR refFilenameW[MAX_PATH];
+ const WCHAR *refFilename;
ITypeLib *preftLib;
ITypeInfo *preftInfo;
char filename[MAX_PATH];
@@ -6398,9 +6389,7 @@ static void test_dep(void) {
trace("Starting typelib dependency tests\n");
refFilename = create_test_typelib(2);
- MultiByteToWideChar(CP_ACP, 0, refFilename, -1, refFilenameW, MAX_PATH);
-
- hr = LoadTypeLibEx(refFilenameW, REGKIND_NONE, &preftLib);
+ hr = LoadTypeLibEx(refFilename, REGKIND_NONE, &preftLib);
ok(hr == S_OK, "got %08x\n", hr);
hr = ITypeLib_GetTypeInfoOfGuid(preftLib, &IID_ISimpleIface, &preftInfo);
@@ -6447,8 +6436,7 @@ static void test_dep(void) {
ITypeInfo_Release(preftInfo);
ITypeLib_Release(preftLib);
-
- DeleteFileW(refFilenameW);
+ DeleteFileW(refFilename);
hr = LoadTypeLibEx(filenameW, REGKIND_NONE, &ptLib);
ok(hr == S_OK, "got: %x\n", hr);
@@ -6569,7 +6557,7 @@ static void test_DeleteImplType(void)
START_TEST(typelib)
{
- const char *filename;
+ const WCHAR *filename;
init_function_pointers();
@@ -6595,7 +6583,7 @@ START_TEST(typelib)
if ((filename = create_test_typelib(2)))
{
test_dump_typelib( filename );
- DeleteFileA( filename );
+ DeleteFileW( filename );
}
test_register_typelib(TRUE);
More information about the wine-cvs
mailing list