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

Alexandre Julliard : rpcrt4: Implement NdrPointerMemorySize and enable the corresponding tests.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: feeaf97c8162b95c0f7816f9d04da02fd7450eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=feeaf97c8162b95c0f7816f9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 28 11:52:36 2009 +0200 rpcrt4: Implement NdrPointerMemorySize and enable the corresponding tests. --- dlls/rpcrt4/ndr_marshall.c | 29 +++++++++++++++++++++++++---- dlls/rpcrt4/tests/ndr_marshall.c | 12 +----------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 1dfb661..4ba2c50 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1042,6 +1042,8 @@ static ULONG PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, } if (attr & RPC_FC_P_DEREF) { + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void*)); + pStubMsg->MemorySize += sizeof(void*); TRACE("deref\n"); } @@ -1554,10 +1556,14 @@ void WINAPI NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, ULONG WINAPI NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { - /* unsigned size = *(LPWORD)(pFormat+2); */ - FIXME("(%p,%p): stub\n", pStubMsg, pFormat); - PointerMemorySize(pStubMsg, pStubMsg->Buffer, pFormat); - return 0; + unsigned char *Buffer = pStubMsg->Buffer; + if (*pFormat != RPC_FC_RP) + { + ALIGN_POINTER(pStubMsg->Buffer, 4); + safe_buffer_increment(pStubMsg, 4); + } + ALIGN_LENGTH(pStubMsg->MemorySize, 4); + return PointerMemorySize(pStubMsg, Buffer, pFormat); } /*********************************************************************** @@ -6561,36 +6567,51 @@ static ULONG WINAPI NdrBaseTypeMemorySize( case RPC_FC_WCHAR: case RPC_FC_SHORT: case RPC_FC_USHORT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); safe_buffer_increment(pStubMsg, sizeof(USHORT)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(USHORT)); pStubMsg->MemorySize += sizeof(USHORT); return sizeof(USHORT); case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONG)); safe_buffer_increment(pStubMsg, sizeof(ULONG)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(ULONG)); pStubMsg->MemorySize += sizeof(ULONG); return sizeof(ULONG); case RPC_FC_FLOAT: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(float)); safe_buffer_increment(pStubMsg, sizeof(float)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(float)); pStubMsg->MemorySize += sizeof(float); return sizeof(float); case RPC_FC_DOUBLE: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(double)); safe_buffer_increment(pStubMsg, sizeof(double)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(double)); pStubMsg->MemorySize += sizeof(double); return sizeof(double); case RPC_FC_HYPER: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(ULONGLONG)); safe_buffer_increment(pStubMsg, sizeof(ULONGLONG)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(ULONGLONG)); pStubMsg->MemorySize += sizeof(ULONGLONG); return sizeof(ULONGLONG); case RPC_FC_ERROR_STATUS_T: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(error_status_t)); safe_buffer_increment(pStubMsg, sizeof(error_status_t)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(error_status_t)); pStubMsg->MemorySize += sizeof(error_status_t); return sizeof(error_status_t); case RPC_FC_ENUM16: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); safe_buffer_increment(pStubMsg, sizeof(USHORT)); + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(UINT)); pStubMsg->MemorySize += sizeof(UINT); return sizeof(UINT); case RPC_FC_IGNORE: + ALIGN_LENGTH(pStubMsg->MemorySize, sizeof(void *)); pStubMsg->MemorySize += sizeof(void *); return sizeof(void *); default: diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d562d09..0b8b655 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -217,9 +217,6 @@ static void test_pointer_marshal(const unsigned char *formattypes, StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; - if (0) - { - /* NdrPointerMemorySize crashes under Wine */ size = NdrPointerMemorySize( &StubMsg, formattypes ); ok(size == StubMsg.MemorySize, "%s: mem size %u size %u\n", msgpfx, StubMsg.MemorySize, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p len %d\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart, wiredatalen); @@ -247,7 +244,6 @@ static void test_pointer_marshal(const unsigned char *formattypes, ok(size == srcsize + 4 + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); else ok(size == srcsize + (srcsize == 8 ? 8 : 4), "%s: mem size %u\n", msgpfx, size); - } size = srcsize; if(formattypes[1] & 0x10) size += 4; @@ -493,7 +489,7 @@ static void test_simple_types(void) else *(unsigned int *)wiredata = (UINT_PTR)&i; *(unsigned short*)(wiredata + 4) = i; - test_pointer_marshal(fmtstr_up_enum16, &i, 2, wiredata, 6, NULL, 0, "up_enum16"); + test_pointer_marshal(fmtstr_up_enum16, &i, 4, wiredata, 6, NULL, 0, "up_enum16"); l = 0xcafebabe; if (use_pointer_ids) @@ -725,9 +721,6 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); ok(!memcmp(StubMsg.BufferStart, wiredata, wiredatalen), "%s: incorrectly marshaled %08x %08x %08x\n", msgpfx, *(DWORD*)StubMsg.BufferStart,*((DWORD*)StubMsg.BufferStart+1),*((DWORD*)StubMsg.BufferStart+2)); - if (0) - { - /* FIXME: Causes Wine to crash */ StubMsg.Buffer = StubMsg.BufferStart; StubMsg.MemorySize = 0; size = NdrSimpleStructMemorySize( &StubMsg, formattypes ); @@ -737,12 +730,9 @@ static void test_simple_struct_marshal(const unsigned char *formattypes, StubMsg.Buffer = StubMsg.BufferStart; size = NdrSimpleStructMemorySize( &StubMsg, formattypes ); -todo_wine { ok(size == StubMsg.MemorySize, "%s: size != MemorySize\n", msgpfx); -} ok(StubMsg.MemorySize == ((srcsize + 3) & ~3) + srcsize, "%s: mem size %u\n", msgpfx, size); ok(StubMsg.Buffer - StubMsg.BufferStart == wiredatalen, "%s: Buffer %p Start %p\n", msgpfx, StubMsg.Buffer, StubMsg.BufferStart); - } size = srcsize; /*** Unmarshalling first with must_alloc false ***/

1 0

Alexandre Julliard : rpcrt4: Fix compiler warnings on 64-bit.
by Alexandre Julliard 28 May '09

28 May '09

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

Ge van Geldorp : winetest: Use wininet if available.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 0fc9920be9f7f81e1d83029f9e2c6846b244d99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fc9920be9f7f81e1d83029f9… Author: Ge van Geldorp <ge(a)gse.nl> Date: Wed May 27 11:45:35 2009 +0200 winetest: Use wininet if available. --- programs/winetest/send.c | 222 ++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 203 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0fc9920be9f7f81e1d830…

1 0

Paul Vriens : msi/tests: Remove unused variable.
by Alexandre Julliard 28 May '09

28 May '09

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 28 May '09

28 May '09

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

Piotr Caban : jscript: Added implementation of Math_pow with less then 2 arguments.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: f77489acd55eded4b7dfb1f75d5c35660a0de328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77489acd55eded4b7dfb1f75… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed May 27 18:44:00 2009 +0200 jscript: Added implementation of Math_pow with less then 2 arguments. --- dlls/jscript/math.c | 4 ++-- dlls/jscript/tests/api.js | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 1969ff7..9d609e5 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -441,8 +441,8 @@ static HRESULT Math_pow(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *d TRACE("\n"); if(arg_cnt(dp) < 2) { - FIXME("unimplemented arg_cnt %d\n", arg_cnt(dp)); - return E_NOTIMPL; + if(retv) num_set_nan(retv); + return S_OK; } hres = to_number(dispex->ctx, get_arg(dp, 0), ei, &x); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c1da8c8..a17b067 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -618,6 +618,12 @@ ok(tmp === 2, "Math.pow(2, 2) = " + tmp); tmp = Math.pow(2, 2, 3); ok(tmp === 4, "Math.pow(2, 2, 3) = " + tmp); +tmp = Math.pow(2); +ok(isNaN(tmp), "Math.pow(2) is not NaN"); + +tmp = Math.pow(); +ok(isNaN(tmp), "Math.pow() is not NaN"); + tmp = Math.random(); ok(typeof(tmp) == "number", "typeof(tmp) = " + typeof(tmp)); ok(0 <= tmp && tmp <= 1, "Math.random() = " + tmp);

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

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

27 May '09

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 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