Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-15 09:38:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COM_APITEST]

Browse source 
Use explicit W calls.
All the code is unicode-based.

svn path=/trunk/; revision=69830
This commit is contained in:
Sylvain Petreolle 2015-11-07 11:59:23 +00:00
parent 3856465848
commit 9eec8dc5b9
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rostests/apitests/com/com_apitest.c
View file

@ -443,7 +443,7 @@ TestModuleRegistry(
HKEY hKeyClasses; HKEY hKeyClasses;
LONG result; LONG result;
result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Classes\\CLSID", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Classes\\CLSID", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyClasses);
ok(result == NO_ERROR, "Failed to open classes key, error %lu\n", result); ok(result == NO_ERROR, "Failed to open classes key, error %lu\n", result);
if (!myskip(result == NO_ERROR, "No classes key\n")) if (!myskip(result == NO_ERROR, "No classes key\n"))
{ {
@ -464,20 +464,20 @@ TestModuleRegistry(
if (myskip(NT_SUCCESS(status), "No guid string\n")) if (myskip(NT_SUCCESS(status), "No guid string\n"))
continue; continue;
result = RegOpenKeyEx(hKeyClasses, clsid.Buffer, 0, KEY_ENUMERATE_SUB_KEYS, &hKey); result = RegOpenKeyExW(hKeyClasses, clsid.Buffer, 0, KEY_ENUMERATE_SUB_KEYS, &hKey);
ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result);
RtlFreeUnicodeString(&clsid); RtlFreeUnicodeString(&clsid);
if (myskip(result == NO_ERROR, "No key\n")) if (myskip(result == NO_ERROR, "No key\n"))
continue; continue;
result = RegOpenKeyEx(hKey, L"InProcServer32", 0, KEY_QUERY_VALUE, &hKeyServer); result = RegOpenKeyExW(hKey, L"InProcServer32", 0, KEY_QUERY_VALUE, &hKeyServer);
ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result);
RegCloseKey(hKey); RegCloseKey(hKey);
if (myskip(result == NO_ERROR, "No key\n")) if (myskip(result == NO_ERROR, "No key\n"))
continue; continue;
dataSize = sizeof(data); dataSize = sizeof(data);
result = RegQueryValueEx(hKeyServer, NULL, NULL, &type, (PBYTE)data, &dataSize); result = RegQueryValueExW(hKeyServer, NULL, NULL, &type, (PBYTE)data, &dataSize);
ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result);
if (!myskip(result == NO_ERROR, "No module name\n")) if (!myskip(result == NO_ERROR, "No module name\n"))
{ {
@ -492,7 +492,7 @@ TestModuleRegistry(
} }
dataSize = sizeof(data); dataSize = sizeof(data);
result = RegQueryValueEx(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)data, &dataSize); result = RegQueryValueExW(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)data, &dataSize);
ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result);
if (!myskip(result == NO_ERROR, "No ThreadingModel\n")) if (!myskip(result == NO_ERROR, "No ThreadingModel\n"))
{ {
@ -523,7 +523,7 @@ TestManualInstantiation(
PCCLASS_AND_INTERFACES class; PCCLASS_AND_INTERFACES class;
HRESULT (__stdcall *DllGetClassObject)(REFCLSID, REFIID, PVOID *); HRESULT (__stdcall *DllGetClassObject)(REFCLSID, REFIID, PVOID *);
DllGetClassObject = (PVOID)GetProcAddress(GetModuleHandle(ModuleName), "DllGetClassObject"); DllGetClassObject = (PVOID)GetProcAddress(GetModuleHandleW(ModuleName), "DllGetClassObject");
ok(DllGetClassObject != NULL, "DllGetClassObject not found in %ls, error %lu\n", ModuleName, GetLastError()); ok(DllGetClassObject != NULL, "DllGetClassObject not found in %ls, error %lu\n", ModuleName, GetLastError());
if (myskip(DllGetClassObject != NULL, "No DllGetClassObject\n")) if (myskip(DllGetClassObject != NULL, "No DllGetClassObject\n"))
return; return;
@ -580,7 +580,7 @@ TestInterfaceRegistry(
HKEY hKeyInterface; HKEY hKeyInterface;
LONG result; LONG result;
result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Classes\\Interface", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyInterface); result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Classes\\Interface", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyInterface);
ok(result == NO_ERROR, "Failed to open interface key, error %lu\n", result); ok(result == NO_ERROR, "Failed to open interface key, error %lu\n", result);
if (!myskip(result == NO_ERROR, "No interface key\n")) if (!myskip(result == NO_ERROR, "No interface key\n"))
{ {
@ -601,7 +601,7 @@ TestInterfaceRegistry(
if (myskip(NT_SUCCESS(status), "No guid string\n")) if (myskip(NT_SUCCESS(status), "No guid string\n"))
continue; continue;
result = RegOpenKeyEx(hKeyInterface, iid.Buffer, 0, KEY_QUERY_VALUE, &hKey); result = RegOpenKeyExW(hKeyInterface, iid.Buffer, 0, KEY_QUERY_VALUE, &hKey);
if (iface->noreg) if (iface->noreg)
{ {
ok(result == ERROR_FILE_NOT_FOUND, "RegOpenKeyEx returned %lu for %s\n", result, iface->name); ok(result == ERROR_FILE_NOT_FOUND, "RegOpenKeyEx returned %lu for %s\n", result, iface->name);
@ -616,7 +616,7 @@ TestInterfaceRegistry(
continue; continue;
dataSize = sizeof(data); dataSize = sizeof(data);
result = RegQueryValueEx(hKey, NULL, NULL, &type, (PBYTE)data, &dataSize); result = RegQueryValueExW(hKey, NULL, NULL, &type, (PBYTE)data, &dataSize);
ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", iface->name, result); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", iface->name, result);
if (!myskip(result == NO_ERROR, "No module name\n")) if (!myskip(result == NO_ERROR, "No module name\n"))
{ {

1
rostests/apitests/com/com_apitest.h
View file

@ -17,7 +17,6 @@
#define COBJMACROS #define COBJMACROS
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define UNICODE
#include <wine/test.h> #include <wine/test.h>
#include <objbase.h> #include <objbase.h>
#include <objsafe.h> #include <objsafe.h>