marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wscript/tests: Get rid of strcmp_wa. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Jacek Caban 2020-02-03 20:45:42 +01:00 committed by Alexandre Julliard
parent ddfae943e6
commit 3324137f72
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
programs/wscript/tests/run.c
View File

@ -74,13 +74,6 @@ static const GUID CLSID_TestObj =
static const char *script_name; static const char *script_name;
static HANDLE wscript_process; static HANDLE wscript_process;
static int strcmp_wa(LPCWSTR strw, const char *stra)
{
WCHAR buf[512];
MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, ARRAY_SIZE(buf));
return lstrcmpW(strw, buf);
}
static const WCHAR* mystrrchr(const WCHAR *str, WCHAR ch) static const WCHAR* mystrrchr(const WCHAR *str, WCHAR ch)
{ {
const WCHAR *pos = NULL, *current = str; const WCHAR *pos = NULL, *current = str;
@ -143,19 +136,19 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid,
unsigned i; unsigned i;
for(i=0; i<cNames; i++) { for(i=0; i<cNames; i++) {
if(!strcmp_wa(rgszNames[i], "ok")) { if(!lstrcmpW(rgszNames[i], L"ok")) {
rgDispId[i] = DISPID_TESTOBJ_OK; rgDispId[i] = DISPID_TESTOBJ_OK;
}else if(!strcmp_wa(rgszNames[i], "trace")) { }else if(!lstrcmpW(rgszNames[i], L"trace")) {
rgDispId[i] = DISPID_TESTOBJ_TRACE; rgDispId[i] = DISPID_TESTOBJ_TRACE;
}else if(!strcmp_wa(rgszNames[i], "reportSuccess")) { }else if(!lstrcmpW(rgszNames[i], L"reportSuccess")) {
rgDispId[i] = DISPID_TESTOBJ_REPORTSUCCESS; rgDispId[i] = DISPID_TESTOBJ_REPORTSUCCESS;
}else if(!strcmp_wa(rgszNames[i], "wscriptFullName")) { }else if(!lstrcmpW(rgszNames[i], L"wscriptFullName")) {
rgDispId[i] = DISPID_TESTOBJ_WSCRIPTFULLNAME; rgDispId[i] = DISPID_TESTOBJ_WSCRIPTFULLNAME;
}else if(!strcmp_wa(rgszNames[i], "wscriptPath")) { }else if(!lstrcmpW(rgszNames[i], L"wscriptPath")) {
rgDispId[i] = DISPID_TESTOBJ_WSCRIPTPATH; rgDispId[i] = DISPID_TESTOBJ_WSCRIPTPATH;
}else if(!strcmp_wa(rgszNames[i], "wscriptScriptName")) { }else if(!lstrcmpW(rgszNames[i], L"wscriptScriptName")) {
rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTNAME; rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTNAME;
}else if(!strcmp_wa(rgszNames[i], "wscriptScriptFullName")) { }else if(!lstrcmpW(rgszNames[i], L"wscriptScriptFullName")) {
rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME; rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME;
}else { }else {
ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i])); ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i]));