Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Text.
Alexandre Julliard
julliard at winehq.org
Tue Aug 25 16:16:56 CDT 2020
Module: wine
Branch: master
Commit: 4a588d394360bb175c28a656d88e5044eed8b7cd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a588d394360bb175c28a656d88e5044eed8b7cd
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Mon Aug 24 17:56:18 2020 +0300
msscript.ocx: Implement IScriptError::get_Text.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msscript.ocx/msscript.c | 20 ++++++++++++++++++--
dlls/msscript.ocx/tests/msscript.c | 31 ++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c
index 05e6121a58..89a18a085b 100644
--- a/dlls/msscript.ocx/msscript.c
+++ b/dlls/msscript.ocx/msscript.c
@@ -125,12 +125,14 @@ typedef struct {
LONG ref;
HRESULT number;
+ BSTR text;
BSTR source;
BSTR desc;
BSTR help_file;
DWORD help_context;
BOOLEAN info_filled;
+ BOOLEAN text_filled;
} ScriptError;
struct ScriptHost {
@@ -2140,6 +2142,15 @@ static void fill_error_info(ScriptError *error)
error->help_context = info.dwHelpContext;
}
+static void fill_error_text(ScriptError *error)
+{
+ if (error->text_filled) return;
+ error->text_filled = TRUE;
+
+ if (error->object)
+ IActiveScriptError_GetSourceLineText(error->object, &error->text);
+}
+
static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv)
{
ScriptError *This = impl_from_IScriptError(iface);
@@ -2306,9 +2317,11 @@ static HRESULT WINAPI ScriptError_get_Text(IScriptError *iface, BSTR *pbstrText)
{
ScriptError *This = impl_from_IScriptError(iface);
- FIXME("(%p)->(%p)\n", This, pbstrText);
+ TRACE("(%p)->(%p)\n", This, pbstrText);
- return E_NOTIMPL;
+ fill_error_text(This);
+ *pbstrText = SysAllocString(This->text);
+ return S_OK;
}
static HRESULT WINAPI ScriptError_get_Line(IScriptError *iface, LONG *plLine)
@@ -2340,17 +2353,20 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface)
IActiveScriptError_Release(This->object);
This->object = NULL;
}
+ SysFreeString(This->text);
SysFreeString(This->source);
SysFreeString(This->desc);
SysFreeString(This->help_file);
This->number = 0;
+ This->text = NULL;
This->source = NULL;
This->desc = NULL;
This->help_file = NULL;
This->help_context = 0;
This->info_filled = FALSE;
+ This->text_filled = FALSE;
return S_OK;
}
diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c
index 702fbb167a..bcd669fc6e 100644
--- a/dlls/msscript.ocx/tests/msscript.c
+++ b/dlls/msscript.ocx/tests/msscript.c
@@ -3348,6 +3348,9 @@ static void test_IScriptControl_get_Error(void)
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 = IScriptError_get_Text(error, &str);
+ ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
+ ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str));
str = SysAllocString(L"jscript");
hr = IScriptControl_put_Language(sc, str);
@@ -3374,6 +3377,10 @@ static void test_IScriptControl_get_Error(void)
ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr);
ok(str != NULL, "Error Description is (null).\n");
SysFreeString(str);
+ hr = IScriptError_get_Text(error, &str);
+ ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
+ ok(!lstrcmpW(str, L"this is an invalid line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str));
+ SysFreeString(str);
hr = IScriptError_Clear(error);
ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr);
@@ -3393,6 +3400,9 @@ static void test_IScriptControl_get_Error(void)
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 = IScriptError_get_Text(error, &str);
+ ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
+ ok(str == NULL, "Error Text is not (null), got %s.\n", wine_dbgstr_w(str));
hr = IScriptControl_get_Error(sc, &error2);
ok(hr == S_OK, "IScriptControl_get_Error failed: 0x%08x.\n", hr);
@@ -3458,9 +3468,10 @@ static void test_IScriptControl_get_Error(void)
SET_EXPECT(GetSourceLineText);
hr = IScriptError_get_Text(error, &str);
- todo_wine ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
- if (SUCCEEDED(hr)) SysFreeString(str);
- todo_wine CHECK_CALLED(GetSourceLineText);
+ ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
+ ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ CHECK_CALLED(GetSourceLineText);
SET_EXPECT(GetSourcePosition);
hr = IScriptError_get_Line(error, &x);
@@ -3493,9 +3504,10 @@ static void test_IScriptControl_get_Error(void)
SET_EXPECT(GetSourceLineText);
hr = IScriptError_get_Text(error, &str);
- todo_wine ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
- if (SUCCEEDED(hr)) SysFreeString(str);
- todo_wine CHECK_CALLED(GetSourceLineText);
+ ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
+ ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ CHECK_CALLED(GetSourceLineText);
SET_EXPECT(GetSourcePosition);
hr = IScriptError_get_Line(error, &x);
@@ -3527,9 +3539,10 @@ static void test_IScriptControl_get_Error(void)
SET_EXPECT(GetSourceLineText);
hr = IScriptError_get_Text(error, &str);
- todo_wine ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
- if (SUCCEEDED(hr)) SysFreeString(str);
- todo_wine CHECK_CALLED(GetSourceLineText);
+ ok(hr == S_OK, "IScriptError_get_Text failed: 0x%08x.\n", hr);
+ ok(!lstrcmpW(str, L"source line"), "Error Text is wrong, got %s.\n", wine_dbgstr_w(str));
+ SysFreeString(str);
+ CHECK_CALLED(GetSourceLineText);
SET_EXPECT(GetSourcePosition);
hr = IScriptError_get_Line(error, &x);
More information about the wine-cvs
mailing list