oleaut32: Add tests for DispGetParam. Fix two issues that crashed the tests.

02dcc198 · James Hawkins · Alexandre Julliard · f3d194b3 · 02dcc198 · 02dcc198
Commit 02dcc198 authored Dec 04, 2009 by James Hawkins Committed by Alexandre Julliard Dec 07, 2009
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

dispatch.c dlls/oleaut32/dispatch.c +7 -0

Makefile.in dlls/oleaut32/tests/Makefile.in +1 -0

dispatch.c dlls/oleaut32/tests/dispatch.c +0 -0

No files found.
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -130,6 +130,13 @@ HRESULT WINAPI DispGetParam(

    TRACE("position=%d, cArgs=%d, cNamedArgs=%d\n",
          position, pdispparams->cArgs, pdispparams->cNamedArgs);
+
+    if (pdispparams->cArgs > 0 && !pdispparams->rgvarg)
+        return E_INVALIDARG;
+
+    if (!pvarResult)
+        return E_INVALIDARG;
+
    if (position < pdispparams->cArgs) {
      /* positional arg? */
      pos = pdispparams->cArgs - position - 1;

--- a/dlls/oleaut32/tests/Makefile.in
+++ b/dlls/oleaut32/tests/Makefile.in
@@ -6,6 +6,7 @@ TESTDLL   = oleaut32.dll
 IMPORTS   = oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 kernel32

 CTESTS = \
+	dispatch.c \
 	olefont.c \
 	olepicture.c \
 	safearray.c \

--- a/dlls/oleaut32/tests/dispatch.c
+++ b/dlls/oleaut32/tests/dispatch.c