Nikolay Sivov : ole32: Handle null argument in OleIsRunning().
Alexandre Julliard
julliard at winehq.org
Fri Apr 8 10:50:58 CDT 2011
Module: wine
Branch: master
Commit: 0c33682330dae057e5984a5f2d19ac119fb14c5f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c33682330dae057e5984a5f2d19ac119fb14c5f
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Apr 8 13:31:33 2011 +0400
ole32: Handle null argument in OleIsRunning().
---
dlls/ole32/ole2.c | 8 +++++---
dlls/ole32/tests/ole2.c | 14 +++++++++++---
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c
index d5fd2c2..3254619 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -2628,15 +2628,17 @@ HRESULT WINAPI OleDoAutoConvert(LPSTORAGE pStg, LPCLSID pClsidNew)
/******************************************************************************
* OleIsRunning [OLE32.@]
*/
-BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject)
+BOOL WINAPI OleIsRunning(LPOLEOBJECT object)
{
IRunnableObject *pRunnable;
HRESULT hr;
BOOL running;
- TRACE("(%p)\n", pObject);
+ TRACE("(%p)\n", object);
- hr = IOleObject_QueryInterface(pObject, &IID_IRunnableObject, (void **)&pRunnable);
+ if (!object) return FALSE;
+
+ hr = IOleObject_QueryInterface(object, &IID_IRunnableObject, (void **)&pRunnable);
if (FAILED(hr))
return TRUE;
running = IRunnableObject_IsRunning(pRunnable);
diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c
index 8961186..f38af3b 100644
--- a/dlls/ole32/tests/ole2.c
+++ b/dlls/ole32/tests/ole2.c
@@ -1784,20 +1784,28 @@ static void test_runnable(void)
{ NULL, 0 }
};
+ BOOL ret;
IOleObject *object = &OleObject;
+ /* null argument */
+ ret = OleIsRunning(NULL);
+ ok(ret == FALSE, "got %d\n", ret);
+
expected_method_list = methods_query_runnable;
- ok(OleIsRunning(object), "Object should be running\n");
+ ret = OleIsRunning(object);
+ ok(ret == TRUE, "Object should be running\n");
CHECK_NO_EXTRA_METHODS();
g_isRunning = FALSE;
expected_method_list = methods_query_runnable;
- ok(OleIsRunning(object) == FALSE, "Object should not be running\n");
+ ret = OleIsRunning(object);
+ ok(ret == FALSE, "Object should not be running\n");
CHECK_NO_EXTRA_METHODS();
g_showRunnable = FALSE; /* QueryInterface(IID_IRunnableObject, ...) will fail */
expected_method_list = methods_no_runnable;
- ok(OleIsRunning(object), "Object without IRunnableObject should be running\n");
+ ret = OleIsRunning(object);
+ ok(ret == TRUE, "Object without IRunnableObject should be running\n");
CHECK_NO_EXTRA_METHODS();
g_isRunning = TRUE;
More information about the wine-cvs
mailing list