mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 03:20:30 +00:00
ole32: IMoniker_IsRunning returns E_INVALIDARG when bindctx is NULL.
This commit is contained in:
parent
a2ae7a2b3d
commit
0ed4c6df24
|
@ -670,7 +670,7 @@ CompositeMonikerImpl_IsRunning(IMoniker* iface, IBindCtx* pbc,
|
|||
else{
|
||||
|
||||
if (pbc==NULL)
|
||||
return E_POINTER;
|
||||
return E_INVALIDARG;
|
||||
|
||||
/* If pmkToLeft and pmkNewlyRunning are both NULL, this method checks the ROT to see whether */
|
||||
/* the moniker is running. If so, the method returns S_OK; otherwise, it recursively calls */
|
||||
|
|
|
@ -561,7 +561,7 @@ static HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface,
|
|||
return S_OK;
|
||||
else {
|
||||
if (pbc==NULL)
|
||||
return E_POINTER;
|
||||
return E_INVALIDARG;
|
||||
|
||||
res=IBindCtx_GetRunningObjectTable(pbc,&rot);
|
||||
|
||||
|
|
|
@ -1495,7 +1495,6 @@ static void test_item_moniker(void)
|
|||
|
||||
/* IsRunning test */
|
||||
hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL);
|
||||
todo_wine
|
||||
ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr);
|
||||
|
||||
hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL);
|
||||
|
@ -1631,7 +1630,6 @@ static void test_generic_composite_moniker(void)
|
|||
|
||||
/* IsRunning test */
|
||||
hr = IMoniker_IsRunning(moniker, NULL, NULL, NULL);
|
||||
todo_wine
|
||||
ok(hr == E_INVALIDARG, "IMoniker_IsRunning should return E_INVALIDARG, not 0x%08x\n", hr);
|
||||
|
||||
hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL);
|
||||
|
@ -1645,7 +1643,6 @@ static void test_generic_composite_moniker(void)
|
|||
todo_wine
|
||||
ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08x\n", hr);
|
||||
|
||||
todo_wine
|
||||
hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown);
|
||||
ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08x\n", hr);
|
||||
|
||||
|
|
Loading…
Reference in a new issue