Module: wine Branch: master Commit: 3324137f7257418e63f30f4b877154c4106522cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3324137f7257418e63f30f4b8...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Feb 3 20:45:42 2020 +0100
wscript/tests: Get rid of strcmp_wa.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
programs/wscript/tests/run.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 96ce03044c..9e5021c55d 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -74,13 +74,6 @@ static const GUID CLSID_TestObj = static const char *script_name; 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) { const WCHAR *pos = NULL, *current = str; @@ -143,19 +136,19 @@ static HRESULT WINAPI Dispatch_GetIDsOfNames(IDispatch *iface, REFIID riid, unsigned i;
for(i=0; i<cNames; i++) { - if(!strcmp_wa(rgszNames[i], "ok")) { + if(!lstrcmpW(rgszNames[i], L"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; - }else if(!strcmp_wa(rgszNames[i], "reportSuccess")) { + }else if(!lstrcmpW(rgszNames[i], L"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; - }else if(!strcmp_wa(rgszNames[i], "wscriptPath")) { + }else if(!lstrcmpW(rgszNames[i], L"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; - }else if(!strcmp_wa(rgszNames[i], "wscriptScriptFullName")) { + }else if(!lstrcmpW(rgszNames[i], L"wscriptScriptFullName")) { rgDispId[i] = DISPID_TESTOBJ_WSCRIPTSCRIPTFULLNAME; }else { ok(0, "unexpected name %s\n", wine_dbgstr_w(rgszNames[i]));