wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Alexandre Julliard : rpcrt4/tests: Enable some tests that no longer crash Wine.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 49f1433cdcdb8414c9b54669aff13308c24259de URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f1433cdcdb8414c9b54669a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 11:41:12 2009 +0200 rpcrt4/tests: Enable some tests that no longer crash Wine. --- dlls/rpcrt4/tests/ndr_marshall.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ded87a8..d562d09 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -957,11 +957,7 @@ static void test_simple_struct(void) else *(unsigned int *)wiredata = (UINT_PTR)&s1; memcpy(wiredata + 4, &s1, wiredatalen); - if (0) - { - /* one of the unmarshallings crashes Wine */ test_pointer_marshal(fmtstr_simple_struct, &s1, 24, wiredata, 28, NULL, 0, "struct"); - } /* zero the entire structure, including the hole */ memset(&ps1, 0, sizeof(ps1)); @@ -988,14 +984,14 @@ static void test_simple_struct(void) test_simple_struct_marshal(fmtstr_pointer_struct + 4, &ps1, 17, wiredata + 4, 17, ps1_cmp, 2, "pointer_struct"); if (use_pointer_ids) + { *(unsigned int *)wiredata = 0x20000; + *(unsigned int *)(wiredata + 8) = 0x20004; + *(unsigned int *)(wiredata + 12) = 0x20008; + } else *(unsigned int *)wiredata = (UINT_PTR)&ps1; - if (0) - { - /* one of the unmarshallings crashes Wine */ test_pointer_marshal(fmtstr_pointer_struct, &ps1, 17, wiredata, 21, ps1_cmp, 2, "pointer_struct"); - } } static void test_fullpointer_xlat(void)

1 0

Alexandre Julliard : rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: bb18c5ab0764e078608406a4879252b045796298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb18c5ab0764e078608406a48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:38:17 2009 +0200 rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions. --- dlls/rpcrt4/tests/ndr_marshall.c | 56 +++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 339d3c9..ded87a8 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -301,21 +301,24 @@ todo_wine { NdrPointerFree(&StubMsg, mem, formattypes); /* again pass address of NULL ptr, but pretend we're a server */ - mem = NULL; - StubMsg.Buffer = StubMsg.BufferStart; - StubMsg.IsClient = 0; - ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); - ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - if (formattypes[2] == 0xd /* FC_ENUM16 */) - ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); - else - ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); - ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); - ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); - ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); - if (formattypes[2] != 0xd /* FC_ENUM16 */) { - ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; + if (0) /* crashes on Win9x and NT4 */ + { + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + StubMsg.IsClient = 0; + ptr = NdrPointerUnmarshall( &StubMsg, &mem, formattypes, 0 ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + if (formattypes[2] == 0xd /* FC_ENUM16 */) + ok(mem != StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem points to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); + else + ok(mem == StubMsg.BufferStart + wiredatalen - srcsize, "%s: mem doesn't point to buffer %p %p\n", msgpfx, mem, StubMsg.BufferStart); + ok(!cmp(mem, memsrc, size), "%s: incorrectly unmarshaled\n", msgpfx); + ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); + ok(StubMsg.MemorySize == 0, "%s: memorysize %d\n", msgpfx, StubMsg.MemorySize); + if (formattypes[2] != 0xd /* FC_ENUM16 */) { + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + my_alloc_called = 0; + } } } HeapFree(GetProcessHeap(), 0, mem_orig); @@ -770,16 +773,19 @@ todo_wine { Passing a NULL ptr while we're a client && !must_alloc crashes on Windows, so we won't do that. */ - mem = NULL; - StubMsg.IsClient = 0; - StubMsg.Buffer = StubMsg.BufferStart; - ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, 0 ); - ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); - ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx); - ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); - ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); - my_alloc_called = 0; - ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + if (0) /* crashes on Win9x and NT4 */ + { + mem = NULL; + StubMsg.IsClient = 0; + StubMsg.Buffer = StubMsg.BufferStart; + ptr = NdrSimpleStructUnmarshall( &StubMsg, &mem, formattypes, FALSE ); + ok(ptr == NULL, "%s: ret %p\n", msgpfx, ptr); + ok(mem == StubMsg.BufferStart, "%s: mem not equal buffer\n", msgpfx); + ok(!cmp(mem, memsrc, srcsize), "%s: incorrectly unmarshaled\n", msgpfx); + ok(my_alloc_called == num_additional_allocs, "%s: my_alloc got called %d times\n", msgpfx, my_alloc_called); + my_alloc_called = 0; + ok(StubMsg.MemorySize == 0, "%s: memorysize touched in unmarshal\n", msgpfx); + } /*** now must_alloc is true ***/

1 0

Alexandre Julliard : rpcrt4: Fix the PSFactoryBuffer proxy refcounting, with tests.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 7571c1fd5397bd59de3f88f2d5ab89bdd07a496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7571c1fd5397bd59de3f88f2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:25:10 2009 +0200 rpcrt4: Fix the PSFactoryBuffer proxy refcounting, with tests. --- dlls/rpcrt4/cproxy.c | 13 +++----- dlls/rpcrt4/tests/cstub.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index a677ca0..f5fb6f3 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -147,11 +147,11 @@ HRESULT StdProxy_Construct(REFIID riid, if (stubless) { CInterfaceStubVtbl *svtbl = ProxyInfo->pStubVtblList[Index]; - unsigned long i, count = svtbl->header.DispatchTableCount; + ULONG i, count = svtbl->header.DispatchTableCount; /* Maybe the original vtbl is just modified directly to point at * ObjectStublessClientXXX thunks in real Windows, but I don't like it */ - TRACE("stubless thunks: count=%ld\n", count); + TRACE("stubless thunks: count=%d\n", count); This->thunks = HeapAlloc(GetProcessHeap(),0,sizeof(struct StublessThunk)*count); This->PVtbl = HeapAlloc(GetProcessHeap(),0,sizeof(LPVOID)*count); for (i=0; i<count; i++) { @@ -159,7 +159,7 @@ HRESULT StdProxy_Construct(REFIID riid, if (vtbl->Vtbl[i] == (LPVOID)-1) { PFORMAT_STRING fs = stubless->ProcFormatString + stubless->FormatStringOffset[i]; unsigned bytes = *(const WORD*)(fs+8) - STACK_ADJUST; - TRACE("method %ld: stacksize=%d\n", i, bytes); + TRACE("method %d: stacksize=%d\n", i, bytes); FILL_STUBLESS(thunk, i, bytes) This->PVtbl[i] = thunk; } @@ -172,6 +172,7 @@ HRESULT StdProxy_Construct(REFIID riid, else This->PVtbl = vtbl->Vtbl; + if (!pUnkOuter) pUnkOuter = (IUnknown *)This; This->lpVtbl = &StdProxy_Vtbl; /* one reference for the proxy */ This->RefCount = 1; @@ -183,11 +184,7 @@ HRESULT StdProxy_Construct(REFIID riid, This->pChannel = NULL; *ppProxy = (LPRPCPROXYBUFFER)&This->lpVtbl; *ppvObj = &This->PVtbl; - /* if there is no outer unknown then the caller will control the lifetime - * of the proxy object through the proxy buffer, so no need to increment the - * ref count of the proxy object */ - if (pUnkOuter) - IUnknown_AddRef((IUnknown *)*ppvObj); + IUnknown_AddRef((IUnknown *)*ppvObj); IPSFactoryBuffer_AddRef(pPSFactory); return S_OK; diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 69d5ea7..4ef70c2 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -613,6 +613,74 @@ static IUnknownVtbl create_stub_test_fail_vtbl = NULL }; +struct dummy_unknown +{ + const IUnknownVtbl *vtbl; + LONG ref; +}; + +static HRESULT WINAPI dummy_QueryInterface(IUnknown *This, REFIID iid, void **ppv) +{ + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI dummy_AddRef(LPUNKNOWN iface) +{ + struct dummy_unknown *this = (struct dummy_unknown *)iface; + return InterlockedIncrement( &this->ref ); +} + +ULONG WINAPI dummy_Release(LPUNKNOWN iface) +{ + struct dummy_unknown *this = (struct dummy_unknown *)iface; + return InterlockedDecrement( &this->ref ); +} + +static IUnknownVtbl dummy_unknown_vtbl = +{ + dummy_QueryInterface, + dummy_AddRef, + dummy_Release +}; +static struct dummy_unknown dummy_unknown = { &dummy_unknown_vtbl, 0 }; + +static void create_proxy_test( IPSFactoryBuffer *ppsf, REFIID iid, const void *expected_vtbl ) +{ + IRpcProxyBuffer *proxy = NULL; + IUnknown *iface = NULL; + HRESULT r; + ULONG count; + + r = IPSFactoryBuffer_CreateProxy(ppsf, NULL, iid, &proxy, (void **)&iface); + ok( r == S_OK, "IPSFactoryBuffer_CreateProxy failed %x\n", r ); + ok( *(void **)iface == expected_vtbl, "wrong iface pointer %p/%p\n", *(void **)iface, expected_vtbl ); + count = IUnknown_Release( iface ); + ok( count == 1, "wrong refcount %u\n", count ); + count = IRpcProxyBuffer_Release( proxy ); + ok( count == 0, "wrong refcount %u\n", count ); + + dummy_unknown.ref = 4; + r = IPSFactoryBuffer_CreateProxy(ppsf, (IUnknown *)&dummy_unknown, iid, &proxy, (void **)&iface); + ok( r == S_OK, "IPSFactoryBuffer_CreateProxy failed %x\n", r ); + ok( dummy_unknown.ref == 5, "wrong refcount %u\n", dummy_unknown.ref ); + ok( *(void **)iface == expected_vtbl, "wrong iface pointer %p/%p\n", *(void **)iface, expected_vtbl ); + count = IUnknown_Release( iface ); + ok( count == 4, "wrong refcount %u\n", count ); + ok( dummy_unknown.ref == 4, "wrong refcount %u\n", dummy_unknown.ref ); + count = IRpcProxyBuffer_Release( proxy ); + ok( count == 0, "wrong refcount %u\n", count ); + ok( dummy_unknown.ref == 4, "wrong refcount %u\n", dummy_unknown.ref ); +} + +static void test_CreateProxy( IPSFactoryBuffer *ppsf ) +{ + create_proxy_test( ppsf, &IID_if1, if1_proxy_vtbl.Vtbl ); + create_proxy_test( ppsf, &IID_if2, if2_proxy_vtbl.Vtbl ); + create_proxy_test( ppsf, &IID_if3, if3_proxy_vtbl.Vtbl ); + create_proxy_test( ppsf, &IID_if4, if4_proxy_vtbl.Vtbl ); +} + static void test_CreateStub(IPSFactoryBuffer *ppsf) { IUnknownVtbl *vtbl = &create_stub_test_vtbl; @@ -951,6 +1019,7 @@ START_TEST( cstub ) ppsf = test_NdrDllGetClassObject(); test_NdrStubForwardingFunction(); + test_CreateProxy(ppsf); test_CreateStub(ppsf); test_Connect(ppsf); test_Disconnect(ppsf);

1 0

Alexandre Julliard : rpcrt4/tests: Fix a number of 64-bit issues in the ndr_marshall test.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 36965f5726e828ce3a34bc156356ee60b88b5ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36965f5726e828ce3a34bc156… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:18:35 2009 +0200 rpcrt4/tests: Fix a number of 64-bit issues in the ndr_marshall test. --- dlls/rpcrt4/tests/ndr_marshall.c | 80 +++++++++++++++++++------------------ 1 files changed, 41 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36965f5726e828ce3a34b…

1 0

Alexandre Julliard : include: Fix the packing of the MIDL_STUB_MESSAGE structure on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: cdbd3fdc6ab7e83336690ede6c8f7860f935846e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbd3fdc6ab7e83336690ede6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:17:32 2009 +0200 include: Fix the packing of the MIDL_STUB_MESSAGE structure on 64-bit. --- include/rpcndr.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 10aac4c..78c9a47 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -170,7 +170,6 @@ typedef struct _NDR_PIPE_MESSAGE *PNDR_PIPE_MESSAGE; typedef struct _NDR_ASYNC_MESSAGE *PNDR_ASYNC_MESSAGE; typedef struct _NDR_CORRELATION_INFO *PNDR_CORRELATION_INFO; -#include <pshpack4.h> typedef struct _MIDL_STUB_MESSAGE { PRPC_MESSAGE RpcMsg; @@ -247,7 +246,6 @@ typedef struct _MIDL_STUB_MESSAGE INT_PTR Reserved51_4; INT_PTR Reserved51_5; } MIDL_STUB_MESSAGE, *PMIDL_STUB_MESSAGE; -#include <poppack.h> typedef void * (__RPC_API * GENERIC_BINDING_ROUTINE)(void *); typedef void (__RPC_API * GENERIC_UNBIND_ROUTINE)(void *, unsigned char *);

1 0

Alexandre Julliard : ntdll: Try any address in map_image no matter what the failure was for a fixed address .
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 54ac26b7af68630d1e1f90693937206cf2f208f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ac26b7af68630d1e1f90693… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 27 21:17:09 2009 +0200 ntdll: Try any address in map_image no matter what the failure was for a fixed address. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0475bd9..33918ca 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1004,7 +1004,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz status = map_view( &view, base, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE ); - if (status == STATUS_CONFLICTING_ADDRESSES) + if (status != STATUS_SUCCESS) status = map_view( &view, NULL, total_size, mask, FALSE, VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY | VPROT_IMAGE );

1 0

Maik Schulz : website: German translation for WWN 357 news item plus small fix in WWN 355 translation
by Maik Schulz 27 May '09

27 May '09

Module: website Branch: master Commit: c9c0387cd85a6b362cab90ae00d6d5b1954a7b1d URL: http://source.winehq.org/git/website.git/?a=commit;h=c9c0387cd85a6b362cab90… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Thu May 28 00:58:48 2009 +0200 website: German translation for WWN 357 news item plus small fix in WWN 355 translation --- news/de/2009010901.xml | 2 +- news/de/2009052701.xml | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/news/de/2009010901.xml b/news/de/2009010901.xml index 397bc24..24caa59 100644 --- a/news/de/2009010901.xml +++ b/news/de/2009010901.xml @@ -1,5 +1,5 @@ <news> - <date>January 09, 2009</date> + <date>9. Januar 2009</date> <title>World Wine News Ausgabe 355</title> <body> <a href="{$root}/wwn/355">WWN Ausgabe 355</a> wurde heute veröffentlicht. diff --git a/news/de/2009052701.xml b/news/de/2009052701.xml new file mode 100644 index 0000000..010e276 --- /dev/null +++ b/news/de/2009052701.xml @@ -0,0 +1,14 @@ +<news> + <date>27. Mai 2009</date> + <title>World Wine News Ausgabe 357</title> + <body> + <a href="{$root}/wwn/357">WWN Ausgabe 357</a> wurde heute veröffentlicht. + <ul> +<li><a href="{$root}/wwn/357#News: WWN Resurrection">Neuigkeiten: WWN Auferstehung</a></li> +<li><a href="{$root}/wwn/357#A Working DIB Engine">Eine funktionierende DIB Engine</a></li> +<li><a href="{$root}/wwn/357#The future of Max's DIB Engine">Die Zukunft von Maxs DIB Engine</a></li> +<li><a href="{$root}/wwn/357#An Interview on DirectX 10">Ein Interview zum Thema DirectX 10</a></li> +<li><a href="{$root}/wwn/357#XInput 2 Spec ">XInput 2 Spezifikation</a></li> +</ul> + </body> +</news>

1 0

Zachary Goldberg : WWN 357
by Jeremy Newman 27 May '09

27 May '09

Module: website Branch: master Commit: e8466eb9b540fe142997151fbae7f9d2df73819b URL: http://source.winehq.org/git/website.git/?a=commit;h=e8466eb9b540fe14299715… Author: Zachary Goldberg <zgold(a)bluesata.com> Date: Wed May 27 09:20:49 2009 -0400 WWN 357 --- news/en/2009052701.xml | 14 + wwn/en/wn20090527_357.xml | 4254 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 4268 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=e8466eb9b540fe1429…

1 0

Paul Vriens : mshtml: Match IE8 implementation.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 79fcaa78357b87e550f0d65fe832d300fd5ca694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79fcaa78357b87e550f0d65fe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 27 13:21:25 2009 +0200 mshtml: Match IE8 implementation. --- dlls/mshtml/htmlnode.c | 5 +++++ dlls/mshtml/tests/dom.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 32b0801..720bbfe 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -157,6 +157,11 @@ static HRESULT WINAPI HTMLDOMChildrenCollection_item(IHTMLDOMChildrenCollection TRACE("(%p)->(%d %p)\n", This, index, ppItem); + if (ppItem) + *ppItem = NULL; + else + return E_POINTER; + nsIDOMNodeList_GetLength(This->nslist, &length); if(index < 0 || index >= length) return E_INVALIDARG; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index aaf1a39..497fc0a 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4456,15 +4456,17 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(node); } - disp = (void*)0xdeadbeef; + hres = IHTMLDOMChildrenCollection_item(child_col, length - 1, NULL); + ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + + hres = IHTMLDOMChildrenCollection_item(child_col, length, NULL); + ok(hres == E_POINTER, "item failed: %08x, expected E_POINTER\n", hres); + hres = IHTMLDOMChildrenCollection_item(child_col, 6000, &disp); ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); - ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); - disp = (void*)0xdeadbeef; hres = IHTMLDOMChildrenCollection_item(child_col, length, &disp); ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); - ok(disp == (void*)0xdeadbeef, "disp=%p\n", disp); test_child_col_disp(child_col);

1 0

Paul Vriens : msi/tests: Prevent crash when ConvertSidToStringSidA is not available.
by Alexandre Julliard 27 May '09

27 May '09

Module: wine Branch: master Commit: 45c00da4967ee98fc0fddfecec621248364b141f URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c00da4967ee98fc0fddfece… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 27 11:10:07 2009 +0200 msi/tests: Prevent crash when ConvertSidToStringSidA is not available. --- dlls/msi/tests/install.c | 20 +++++++++----------- dlls/msi/tests/package.c | 37 +++++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 2e03bf4..a554e34 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -40,6 +40,8 @@ static UINT (WINAPI *pMsiSourceListEnumSourcesA) static UINT (WINAPI *pMsiSourceListGetInfoA) (LPCSTR, LPCSTR, MSIINSTALLCONTEXT, DWORD, LPCSTR, LPSTR, LPDWORD); +static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); + static HMODULE hsrclient = 0; static BOOL (WINAPI *pSRRemoveRestorePoint)(DWORD); static BOOL (WINAPI *pSRSetRestorePointA)(RESTOREPOINTINFOA*, STATEMGRSTATUS*); @@ -1316,6 +1318,7 @@ static int CDECL fci_delete(char *pszFile, int *err, void *pv) static void init_functionpointers(void) { HMODULE hmsi = GetModuleHandleA("msi.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); #define GET_PROC(mod, func) \ p ## func = (void*)GetProcAddress(mod, #func); \ @@ -1326,6 +1329,8 @@ static void init_functionpointers(void) GET_PROC(hmsi, MsiSourceListEnumSourcesA); GET_PROC(hmsi, MsiSourceListGetInfoA); + GET_PROC(hadvapi32, ConvertSidToStringSidA); + hsrclient = LoadLibraryA("srclient.dll"); GET_PROC(hsrclient, SRRemoveRestorePoint); GET_PROC(hsrclient, SRSetRestorePointA); @@ -1352,21 +1357,14 @@ static LPSTR get_user_sid(LPSTR *usersid) BYTE buf[1024]; DWORD size; PTOKEN_USER user; - static HMODULE hadvapi32 = NULL; - static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); - *usersid = NULL; - if (!hadvapi32) + if (!pConvertSidToStringSidA) { - hadvapi32 = GetModuleHandleA("advapi32.dll"); - pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); - if (!pConvertSidToStringSidA) - { - win_skip("ConvertSidToStringSidA is not available\n"); - return NULL; - } + win_skip("ConvertSidToStringSidA is not available\n"); + return NULL; } + *usersid = NULL; OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); GetTokenInformation(token, TokenUser, buf, size, &size); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 21795d5..f986125 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -34,27 +34,38 @@ char CURR_DIR[MAX_PATH]; static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); +static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); + +static void init_functionpointers(void) +{ + HMODULE hmsi = GetModuleHandleA("msi.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + +#define GET_PROC(mod, func) \ + p ## func = (void*)GetProcAddress(mod, #func); + + GET_PROC(hmsi, MsiApplyMultiplePatchesA); + + GET_PROC(hadvapi32, ConvertSidToStringSidA); + +#undef GET_PROC +} + + static LPSTR get_user_sid(LPSTR *usersid) { HANDLE token; BYTE buf[1024]; DWORD size; PTOKEN_USER user; - static HMODULE hadvapi32 = NULL; - static BOOL (WINAPI *pConvertSidToStringSidA)(PSID, LPSTR*); - *usersid = NULL; - if (!hadvapi32) + if (!pConvertSidToStringSidA) { - hadvapi32 = GetModuleHandleA("advapi32.dll"); - pConvertSidToStringSidA = (void *)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); - if (!pConvertSidToStringSidA) - { - win_skip("ConvertSidToStringSidA is not available\n"); - return NULL; - } + win_skip("ConvertSidToStringSidA is not available\n"); + return NULL; } + *usersid = NULL; OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &token); size = sizeof(buf); GetTokenInformation(token, TokenUser, buf, size, &size); @@ -11622,9 +11633,7 @@ static void test_MsiApplyPatch(void) START_TEST(package) { - HMODULE hmsi = GetModuleHandleA("msi.dll"); - - pMsiApplyMultiplePatchesA = (void *)GetProcAddress(hmsi, "MsiApplyMultiplePatchesA"); + init_functionpointers(); GetCurrentDirectoryA(MAX_PATH, CURR_DIR);

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2009