Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-30 22:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[VBSCRIPT] Sync with Wine Staging 1.9.23. CORE-12409

Browse source 
svn path=/trunk/; revision=73298
This commit is contained in:
Amine Khaldi 2016-11-17 23:15:02 +00:00
parent d110b7df27
commit a8e3a0bea0
3 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
reactos/dll/win32/vbscript/global.c
View file

@ -1020,10 +1020,47 @@ static HRESULT Global_MidB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) static HRESULT Global_StrComp(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)
{ {
FIXME("\n"); BSTR left, right;
return E_NOTIMPL; int mode, ret;
HRESULT hres;
short val;
TRACE("(%s %s ...)\n", debugstr_variant(args), debugstr_variant(args+1));
assert(args_cnt == 2 || args_cnt == 3);
if (args_cnt == 3) {
hres = to_int(args+2, &mode);
if(FAILED(hres))
return hres;
if (mode != 0 && mode != 1) {
FIXME("unknown compare mode = %d\n", mode);
return E_FAIL;
}
}
else
mode = 0;
hres = to_string(args, &left);
if(FAILED(hres))
return hres;
hres = to_string(args+1, &right);
if(FAILED(hres))
{
SysFreeString(left);
return hres;
}
ret = mode ? strcmpiW(left, right) : strcmpW(left, right);
val = ret < 0 ? -1 : (ret > 0 ? 1 : 0);
SysFreeString(left);
SysFreeString(right);
return return_short(res, val);
} }
static HRESULT Global_LCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) static HRESULT Global_LCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

2
reactos/dll/win32/vbscript/interp.c
View file

@ -177,7 +177,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
if(!item->disp) { if(!item->disp) {
IUnknown *unk; IUnknown *unk;
hres = IActiveScriptSite_GetItemInfo(ctx->script->site, name, SCRIPTINFO_IUNKNOWN, &unk, NULL); hres = IActiveScriptSite_GetItemInfo(ctx->script->site, item->name, SCRIPTINFO_IUNKNOWN, &unk, NULL);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("GetItemInfo failed: %08x\n", hres); WARN("GetItemInfo failed: %08x\n", hres);
continue; continue;

2
reactos/media/doc/README.WINE
View file

@ -191,7 +191,7 @@ reactos/dll/win32/url # Synced to WineStaging-1.9.11
reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23
reactos/dll/win32/usp10 # Synced to WineStaging-1.9.23 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.23
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 reactos/dll/win32/vbscript # Synced to WineStaging-1.9.23
reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/version # Synced to WineStaging-1.9.11
reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11 reactos/dll/win32/vssapi # Synced to WineStaging-1.9.11
reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16 reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.16