system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 00:40:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

msscript.ocx: Implement IScriptError::get_HelpContext.

Browse source 
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>
This commit is contained in:
Gabriel Ivăncescu 2020-08-24 17:56:17 +03:00 committed by Alexandre Julliard
parent 79378814e4
commit 7bc6740a92
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/msscript.ocx/msscript.c
View file

@ -128,6 +128,7 @@ typedef struct {
BSTR source;
BSTR desc;
BSTR help_file;
DWORD help_context;
BOOLEAN info_filled;
} ScriptError;
@ -2136,6 +2137,7 @@ static void fill_error_info(ScriptError *error)
error->source = info.bstrSource;
error->desc = info.bstrDescription;
error->help_file = info.bstrHelpFile;
error->help_context = info.dwHelpContext;
}
static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv)
@ -2293,9 +2295,11 @@ static HRESULT WINAPI ScriptError_get_HelpContext(IScriptError *iface, LONG *plH
{
ScriptError *This = impl_from_IScriptError(iface);
FIXME("(%p)->(%p)\n", This, plHelpContext);
TRACE("(%p)->(%p)\n", This, plHelpContext);
return E_NOTIMPL;
fill_error_info(This);
*plHelpContext = This->help_context;
return S_OK;
}
static HRESULT WINAPI ScriptError_get_Text(IScriptError *iface, BSTR *pbstrText)
@ -2344,6 +2348,7 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface)
This->source = NULL;
This->desc = NULL;
This->help_file = NULL;
This->help_context = 0;
This->info_filled = FALSE;
return S_OK;

9
dlls/msscript.ocx/tests/msscript.c
View file

@ -3345,6 +3345,9 @@ static void test_IScriptControl_get_Error(void)
hr = IScriptError_get_HelpFile(error, &str);
ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr);
ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str));
hr = IScriptError_get_HelpContext(error, &x);
ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr);
ok(x == 0, "Error HelpContext is not 0, got %d.\n", x);
str = SysAllocString(L"jscript");
hr = IScriptControl_put_Language(sc, str);
@ -3387,6 +3390,9 @@ static void test_IScriptControl_get_Error(void)
hr = IScriptError_get_HelpFile(error, &str);
ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr);
ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str));
hr = IScriptError_get_HelpContext(error, &x);
ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr);
ok(x == 0, "Error HelpContext is not 0, got %d.\n", x);
hr = IScriptControl_get_Error(sc, &error2);
ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr);
@ -3446,6 +3452,9 @@ static void test_IScriptControl_get_Error(void)
hr = IScriptError_get_HelpFile(error, &str);
ok(hr == S_OK, "IScriptError_get_HelpFile failed: 0x%08x.\n", hr);
ok(str == NULL, "Error HelpFile is not (null), got %s.\n", wine_dbgstr_w(str));
hr = IScriptError_get_HelpContext(error, &x);
ok(hr == S_OK, "IScriptError_get_HelpContext failed: 0x%08x.\n", hr);
ok(x == 0, "Error HelpContext is not 0, got %d.\n", x);
SET_EXPECT(GetSourceLineText);
hr = IScriptError_get_Text(error, &str);