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

msscript.ocx: Implement IScriptModuleCollection::get_Count. 

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Gabriel Ivăncescu 2020-06-15 16:00:04 +03:00 committed by Alexandre Julliard
parent 8007d19c27
commit 67ef515174
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/msscript.ocx/msscript.c
View File

@ -893,9 +893,12 @@ static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection *
{
ScriptControl *This = impl_from_IScriptModuleCollection(iface);
FIXME("(%p)->(%p)\n", This, plCount);
TRACE("(%p)->(%p)\n", This, plCount);
return E_NOTIMPL;
if (!plCount) return E_POINTER;
*plCount = This->module_count;
return S_OK;
}
static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name,

12
dlls/msscript.ocx/tests/msscript.c
View File

@ -2331,11 +2331,11 @@ static void test_IScriptControl_get_Modules(void)
ok(hr == S_OK, "IScriptControl_get_Modules failed: 0x%08x.\n", hr);
hr = IScriptModuleCollection_get_Count(mods, NULL);
todo_wine ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr);
ok(hr == E_POINTER, "IScriptModuleCollection_get_Count returned: 0x%08x.\n", hr);
count = 0;
hr = IScriptModuleCollection_get_Count(mods, &count);
todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr);
todo_wine ok(count == 1, "count is not 1, got %d.\n", count);
ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr);
ok(count == 1, "count is not 1, got %d.\n", count);
V_VT(&var) = VT_I4;
V_I4(&var) = -1;
@ -2372,7 +2372,7 @@ static void test_IScriptControl_get_Modules(void)
SysFreeString(str);
hr = IScriptModuleCollection_get_Count(mods, &count);
todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr);
ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr);
todo_wine ok(count == 3, "count is not 3, got %d.\n", count);
V_VT(&var) = VT_I4;
V_I4(&var) = count + 1;
@ -2411,8 +2411,8 @@ static void test_IScriptControl_get_Modules(void)
SysFreeString(str);
hr = IScriptModuleCollection_get_Count(mods, &count);
todo_wine ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr);
todo_wine ok(count == 1, "count is not 1, got %d.\n", count);
ok(hr == S_OK, "IScriptModuleCollection_get_Count failed: 0x%08x.\n", hr);
ok(count == 1, "count is not 1, got %d.\n", count);
IScriptModuleCollection_Release(mods);
IScriptControl_Release(sc);