Commit 7fe67b15 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard

rpcrt4: Change the test of CStdStubBuffer->pPSFactory to only test for the field not being NULL.

The address varies on older versions of Windows and isn't really important.
parent 40660894
...@@ -619,15 +619,13 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf) ...@@ -619,15 +619,13 @@ static void test_CreateStub(IPSFactoryBuffer *ppsf)
IUnknown *obj = (IUnknown*)&vtbl; IUnknown *obj = (IUnknown*)&vtbl;
IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK); IRpcStubBuffer *pstub = create_stub(ppsf, &IID_if1, obj, S_OK);
CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub; CStdStubBuffer *cstd_stub = (CStdStubBuffer*)pstub;
const CInterfaceStubHeader *header = ((const CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1; const CInterfaceStubHeader *header = &CONTAINING_RECORD(cstd_stub->lpVtbl, const CInterfaceStubVtbl, Vtbl)->header;
ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n"); ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n");
ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount); ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount);
/* 0xdeadbeef returned from create_stub_test_QI */ /* 0xdeadbeef returned from create_stub_test_QI */
ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject);
ok(cstd_stub->pPSFactory == ppsf || ok(cstd_stub->pPSFactory != NULL, "pPSFactory was NULL\n");
broken(cstd_stub->pPSFactory == (void *)0x00001000) /* Win9x & NT4 */,
"pPSFactory was %p instead of %p\n", cstd_stub->pPSFactory, ppsf);
vtbl = &create_stub_test_fail_vtbl; vtbl = &create_stub_test_fail_vtbl;
pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE); pstub = create_stub(ppsf, &IID_if1, obj, E_NOINTERFACE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment