May 2009 - Wine-Commits - list.winehq.org

Paul Vriens : msi/tests: Remove unused variable.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: db355b4903427ee45a50e54eabf56748ba08d0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db355b4903427ee45a50e54ea… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed May 27 17:14:54 2009 +0200 msi/tests: Remove unused variable. --- dlls/msi/tests/package.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f986125..a9eef76 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11224,7 +11224,6 @@ static void test_MsiGetProductProperty(void) CHAR prodcode[MAX_PATH]; CHAR prod_squashed[MAX_PATH]; HKEY prodkey, userkey, props; - LPSTR usersid; DWORD size; LONG res; UINT r; @@ -11242,7 +11241,6 @@ static void test_MsiGetProductProperty(void) lstrcatA(path, "\\"); create_test_guid(prodcode, prod_squashed); - get_user_sid(&usersid); r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Piotr Caban : jscript: Fixed memory leak.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: 3327d17109f11face4c559a17bb4b86f02dc9d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3327d17109f11face4c559a17… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 18:43:17 2009 +0200 jscript: Fixed memory leak. --- dlls/jscript/regexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e79fee4..fe552b1 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3396,7 +3396,7 @@ HRESULT regexp_match(DispatchEx *dispex, const WCHAR *str, DWORD len, BOOL gflag } if(FAILED(hres)) - return hres; + break; if(ret_size == i) { if(ret)

1 0

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

May 28, 2009

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

Alexandre Julliard : rpcrt4: Fix compiler warnings on 64-bit.
by Alexandre Julliard May 28, 2009

May 28, 2009

Module: wine Branch: master Commit: aded9e4091ca48068ecbcba2c48cea3844fc8b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aded9e4091ca48068ecbcba2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 11:56:30 2009 +0200 rpcrt4: Fix compiler warnings on 64-bit. --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++------ dlls/rpcrt4/rpc_transport.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 4ba2c50..0d12843 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -102,9 +102,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); } while(0) #define STD_OVERFLOW_CHECK(_Msg) do { \ - TRACE("buffer=%d/%d\n", _Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer, _Msg->BufferLength); \ + TRACE("buffer=%d/%d\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ - ERR("buffer overflow %d bytes\n", _Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength)); \ + ERR("buffer overflow %d bytes\n", (ULONG)(_Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength))); \ } while (0) #define NDR_POINTER_ID_BASE 0x20000 @@ -3289,7 +3289,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%x\n", pStubMsg->PointerBufferMark - pStubMsg->Buffer); + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); pointer_buffer_mark_set = 1; /* restore the original buffer length */ @@ -3375,7 +3375,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = pStubMsg->Buffer; - TRACE("difference = 0x%x\n", pStubMsg->PointerBufferMark - saved_buffer); + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); pointer_buffer_mark_set = 1; /* restore the original buffer */ @@ -3851,7 +3851,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%x\n", pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer); + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); pointer_buffer_mark_set = 1; /* restore fields */ @@ -3929,7 +3929,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, size = pStubMsg->MemorySize; pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; - TRACE("difference = 0x%x\n", pStubMsg->Buffer - saved_buffer); + TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - saved_buffer)); if (!pStubMsg->PointerBufferMark) { /* save it for use by embedded pointer code later */ diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index d078d69..8e8ce16 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2568,7 +2568,7 @@ static int rpcrt4_ncacn_http_write(RpcConnection *Connection, DWORD bytes_written; BOOL ret; - httpc->last_sent_time = ~0UL; /* disable idle packet sending */ + httpc->last_sent_time = ~0U; /* disable idle packet sending */ ret = InternetWriteFile(httpc->in_request, buffer, count, &bytes_written); httpc->last_sent_time = GetTickCount(); TRACE("%p %p %u -> %s\n", httpc->in_request, buffer, count, ret ? "TRUE" : "FALSE");

1 0

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

May 28, 2009

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 : rpcrt4/tests: Comment out a couple of tests that crash on older Windows versions.
by Alexandre Julliard May 28, 2009

May 28, 2009

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

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

May 27, 2009

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 May 27, 2009

May 27, 2009

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

Nikolay Sivov : comctl32/ipaddress: Skip test on Win95 with common controls 4.70.
by Alexandre Julliard May 27, 2009

May 27, 2009

Module: wine Branch: master Commit: 8921b936a8db4f1ed45109a99e59c8fdabdc5a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8921b936a8db4f1ed45109a99… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 27 16:02:47 2009 +0400 comctl32/ipaddress: Skip test on Win95 with common controls 4.70. --- dlls/comctl32/tests/ipaddress.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index d04223c..85f92b1 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -33,8 +33,6 @@ static HWND create_ipaddress_control (void) handle = CreateWindowEx(0, WC_IPADDRESS, NULL, WS_BORDER|WS_VISIBLE, 0, 0, 0, 0, NULL, NULL, NULL, NULL); - assert(handle); - return handle; } @@ -45,6 +43,11 @@ static void test_get_set_text(void) INT r; hwnd = create_ipaddress_control(); + if (!hwnd) + { + win_skip("IPAddress control not implemented\n"); + return; + } /* check text just after creation */ r = GetWindowText(hwnd, ip, sizeof(ip)/sizeof(CHAR));

1 0

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

May 27, 2009

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