Gabriel Ivăncescu : msscript.ocx: Implement IScriptError::get_Source.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7b46eb1ef70abf87a598da748e0804533ddbc4fc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7b46eb1ef70abf87a598da748e0804533ddbc4fc

Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date:   Mon Aug 24 17:56:14 2020 +0300

msscript.ocx: Implement IScriptError::get_Source.

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       | 10 ++++++++--
 dlls/msscript.ocx/tests/msscript.c | 23 +++++++++++++++++++----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c
index 0b316afa89..30125af7f3 100644
--- a/dlls/msscript.ocx/msscript.c
+++ b/dlls/msscript.ocx/msscript.c
@@ -125,6 +125,7 @@ typedef struct {
     LONG ref;
 
     HRESULT number;
+    BSTR source;
 
     BOOLEAN info_filled;
 } ScriptError;
@@ -2130,6 +2131,7 @@ static void fill_error_info(ScriptError *error)
         info.pfnDeferredFillIn(&info);
 
     error->number = info.scode;
+    error->source = info.bstrSource;
 }
 
 static HRESULT WINAPI ScriptError_QueryInterface(IScriptError *iface, REFIID riid, void **ppv)
@@ -2254,9 +2256,11 @@ static HRESULT WINAPI ScriptError_get_Source(IScriptError *iface, BSTR *pbstrSou
 {
     ScriptError *This = impl_from_IScriptError(iface);
 
-    FIXME("(%p)->(%p)\n", This, pbstrSource);
+    TRACE("(%p)->(%p)\n", This, pbstrSource);
 
-    return E_NOTIMPL;
+    fill_error_info(This);
+    *pbstrSource = SysAllocString(This->source);
+    return S_OK;
 }
 
 static HRESULT WINAPI ScriptError_get_Description(IScriptError *iface, BSTR *pbstrDescription)
@@ -2324,8 +2328,10 @@ static HRESULT WINAPI ScriptError_Clear(IScriptError *iface)
         IActiveScriptError_Release(This->object);
         This->object = NULL;
     }
+    SysFreeString(This->source);
 
     This->number = 0;
+    This->source = NULL;
 
     This->info_filled = FALSE;
     return S_OK;
diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c
index 4a885204e7..d42ce9ed78 100644
--- a/dlls/msscript.ocx/tests/msscript.c
+++ b/dlls/msscript.ocx/tests/msscript.c
@@ -3336,6 +3336,9 @@ static void test_IScriptControl_get_Error(void)
     hr = IScriptError_get_Number(error, &x);
     ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr);
     ok(x == 0, "Error Number is not 0, got %d.\n", x);
+    hr = IScriptError_get_Source(error, &str);
+    ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
+    ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str));
 
     str = SysAllocString(L"jscript");
     hr = IScriptControl_put_Language(sc, str);
@@ -3354,6 +3357,10 @@ static void test_IScriptControl_get_Error(void)
     hr = IScriptError_get_Number(error, &x);
     ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr);
     todo_wine ok(x > 1000, "Error Number is wrong, got %d.\n", x);
+    hr = IScriptError_get_Source(error, &str);
+    ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
+    ok(str != NULL, "Error Source is (null).\n");
+    SysFreeString(str);
 
     hr = IScriptError_Clear(error);
     ok(hr == S_OK, "IScriptError_Clear failed: 0x%08x.\n", hr);
@@ -3361,6 +3368,9 @@ static void test_IScriptControl_get_Error(void)
     hr = IScriptError_get_Number(error, &x);
     ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr);
     ok(x == 0, "Error Number is not 0, got %d.\n", x);
+    hr = IScriptError_get_Source(error, &str);
+    ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
+    ok(str == NULL, "Error Source 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);
@@ -3411,6 +3421,9 @@ static void test_IScriptControl_get_Error(void)
         ok(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr);
         ok(x == 0, "Error Number is not 0, got %d.\n", x);
         CHECK_CALLED(GetExceptionInfo);
+        hr = IScriptError_get_Source(error, &str);
+        ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
+        ok(str == NULL, "Error Source is not (null), got %s.\n", wine_dbgstr_w(str));
 
         SET_EXPECT(GetSourceLineText);
         hr = IScriptError_get_Text(error, &str);
@@ -3439,8 +3452,9 @@ static void test_IScriptControl_get_Error(void)
         CHECK_CALLED(GetExceptionInfo);
         CHECK_CALLED(DeferredFillIn);
         hr = IScriptError_get_Source(error, &str);
-        todo_wine ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
-        if (SUCCEEDED(hr)) SysFreeString(str);
+        ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
+        ok(!lstrcmpW(str, L"foobar"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str));
+        SysFreeString(str);
         hr = IScriptError_get_Description(error, &str);
         todo_wine ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr);
         if (SUCCEEDED(hr)) SysFreeString(str);
@@ -3472,8 +3486,9 @@ static void test_IScriptControl_get_Error(void)
         ok(x == 0xbeef, "Error Number is not 0xbeef, got 0x%04x.\n", x);
         CHECK_CALLED(GetExceptionInfo);
         hr = IScriptError_get_Source(error, &str);
-        todo_wine ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
-        if (SUCCEEDED(hr)) SysFreeString(str);
+        ok(hr == S_OK, "IScriptError_get_Source failed: 0x%08x.\n", hr);
+        ok(!lstrcmpW(str, L"source"), "Error Source is wrong, got %s.\n", wine_dbgstr_w(str));
+        SysFreeString(str);
         hr = IScriptError_get_Description(error, &str);
         todo_wine ok(hr == S_OK, "IScriptError_get_Description failed: 0x%08x.\n", hr);
         if (SUCCEEDED(hr)) SysFreeString(str);