wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Sebastian Lackner : msvcp60/tests: Use brackets to protect arguments in call_func macros.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: e9b70edab607cc87ed769bf6df5b578def489c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b70edab607cc87ed769bf6d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:17:30 2016 +0100 msvcp60/tests: Use brackets to protect arguments in call_func macros. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/string.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 3ed1480..2cbf025 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -128,14 +128,14 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)a,(const void*)b) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)a,\ - (const void*)b,(const void*)c) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d) -#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d,(const void*)e) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) #else

1 0

Sebastian Lackner : msvcrt/tests: Use brackets to protect arguments in call_func2 macro.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 340f1615bd01645c2f8747c6bcaa5f3e3409bd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=340f1615bd01645c2f8747c6b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:17:07 2016 +0100 msvcrt/tests: Use brackets to protect arguments in call_func2 macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/cpp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index e67e344..e3f7f99 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -146,7 +146,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else

1 0

Sebastian Lackner : msvcp100/tests: Use brackets to protect arguments in call_func2 macro.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 5fd226ac06332990a1e4c93653384e60e88959ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd226ac06332990a1e4c9365… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:16:53 2016 +0100 msvcp100/tests: Use brackets to protect arguments in call_func2 macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/tests/misc.c | 2 +- dlls/msvcp100/tests/string.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/tests/misc.c b/dlls/msvcp100/tests/misc.c index 4740951..e85bf10 100644 --- a/dlls/msvcp100/tests/misc.c +++ b/dlls/msvcp100/tests/misc.c @@ -83,7 +83,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else diff --git a/dlls/msvcp100/tests/string.c b/dlls/msvcp100/tests/string.c index eb02bc5..c963169 100644 --- a/dlls/msvcp100/tests/string.c +++ b/dlls/msvcp100/tests/string.c @@ -67,7 +67,7 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) #else

1 0

Charles Davis : winebuild: When building implibs, invoke dlltool with a machine type.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 2ea17846b8dbaf7d3c78f3c4d1a37e2de4b2e81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ea17846b8dbaf7d3c78f3c4d… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 11 03:20:27 2016 -0700 winebuild: When building implibs, invoke dlltool with a machine type. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 13596a4..d3aa41b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1329,6 +1329,7 @@ void output_import_lib( DLLSPEC *spec, char **argv ) { struct strarray *args; char *def_file; + const char *as_flags, *m_flag; if (target_platform != PLATFORM_WINDOWS) fatal_error( "Unix-style import libraries not supported yet\n" ); @@ -1342,7 +1343,23 @@ void output_import_lib( DLLSPEC *spec, char **argv ) output_file = NULL; args = find_tool( "dlltool", NULL ); + switch (target_cpu) + { + case CPU_x86: + m_flag = "i386"; + as_flags = "--as-flags=--32"; + break; + case CPU_x86_64: + m_flag = "i386:x86-64"; + as_flags = "--as-flags=--64"; + break; + default: + m_flag = NULL; + break; + } strarray_add( args, "-k", "-l", output_file_name, "-d", def_file, NULL ); + if (m_flag) + strarray_add( args, "-m", m_flag, as_flags, NULL ); spawn( args ); strarray_free( args );

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: af41733890b09d61bc49fcf8f2e5af3c0dc573fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=af41733890b09d61bc49fcf8f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Feb 11 08:11:22 2016 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 730d45e..e4a3f46 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-02-09 21:07+0300\n" +"PO-Revision-Date: 2016-02-11 08:10+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11623,22 +11623,16 @@ msgid "(Default)" msgstr "(numatytoji)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Ar tikrai norite pašalinti šias reikšmes?" +msgstr "Ar tikrai norite pašalinti registro reikšmę „%1“?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Ar tikrai norite pašalinti reikšmę „%s“?" +msgstr "Ar tikrai norite pašalinti visas registro „%1“ reikšmes?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Ar tikrai norite pašalinti „%1“?" +msgstr "Ar tikrai norite pašalinti registro raktą „%1“?" #: regedit.rc:34 msgid "&Registry"

1 0

Sebastian Lackner : crypt32/tests: Remove duplicate test.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 818a1b14f210e7759b831d905c5bd6f78fd49401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818a1b14f210e7759b831d905… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 07:19:10 2016 +0100 crypt32/tests: Remove duplicate test. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index da32a74..58a27df 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3627,7 +3627,6 @@ static void testVerifyRevocation(void) "expected CRYPT_E_NO_REVOCATION_CHECK or CRYPT_E_REVOCATION_OFFLINE, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); - ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); /* Now add a CRL to the hCrlStore */ revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL);

1 0

Sebastian Lackner : avifil32/tests: Remove a couple of unnecessary tests.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: ec010ce3615d38be79d8f20cbca9a649c5ae2a55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec010ce3615d38be79d8f20cb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 07:12:01 2016 +0100 avifil32/tests: Remove a couple of unnecessary tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/tests/api.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/avifil32/tests/api.c b/dlls/avifil32/tests/api.c index 552a356..137062ad8 100644 --- a/dlls/avifil32/tests/api.c +++ b/dlls/avifil32/tests/api.c @@ -371,11 +371,6 @@ static void test_default_data(void) create_avi_file(&cah, filename); res = AVIFileOpenA(&pFile, filename, OF_SHARE_DENY_WRITE, 0L); - ok(res != AVIERR_BADFORMAT, "Unable to open file: error1=%u\n", AVIERR_BADFORMAT); - ok(res != AVIERR_MEMORY, "Unable to open file: error2=%u\n", AVIERR_MEMORY); - ok(res != AVIERR_FILEREAD, "Unable to open file: error3=%u\n", AVIERR_FILEREAD); - ok(res != AVIERR_FILEOPEN, "Unable to open file: error4=%u\n", AVIERR_FILEOPEN); - ok(res != REGDB_E_CLASSNOTREG, "Unable to open file: error5=%u\n", REGDB_E_CLASSNOTREG); ok(res == 0, "Unable to open file: error=%u\n", res); res = AVIFileGetStream(pFile, &pStream0, 0, 0);

1 0

Sebastian Lackner : ntdll: Skip unused import descriptors when loading libraries.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: b89f88841e38e0adc0cd6f35e6e62b00ba19ec41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89f88841e38e0adc0cd6f35e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Feb 10 17:38:28 2016 +0100 ntdll: Skip unused import descriptors when loading libraries. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index bf1d365..a0049fe 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -564,7 +564,7 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * * Import the dll specified by the given import descriptor. * The loader_section must be locked while calling this function. */ -static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path ) +static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LPCWSTR load_path, WINE_MODREF **pwm ) { NTSTATUS status; WINE_MODREF *wmImp; @@ -586,6 +586,13 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else import_list = thunk_list; + if (!import_list->u1.Ordinal) + { + WARN( "Skipping unused import %s\n", name ); + *pwm = NULL; + return TRUE; + } + while (len && name[len-1] == ' ') len--; /* remove trailing spaces */ if (len * sizeof(WCHAR) < sizeof(buffer)) @@ -597,7 +604,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else /* need to allocate a larger buffer */ { WCHAR *ptr = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (!ptr) return NULL; + if (!ptr) return FALSE; ascii_to_unicode( ptr, name, len ); ptr[len] = 0; status = load_dll( load_path, ptr, 0, &wmImp ); @@ -612,7 +619,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d else ERR("Loading library %s (which is needed by %s) failed (error %x).\n", name, debugstr_w(current_modref->ldr.FullDllName.Buffer), status); - return NULL; + return FALSE; } /* unprotect the import address table since it can be located in @@ -693,7 +700,8 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d done: /* restore old protection of the import address table */ NtProtectVirtualMemory( NtCurrentProcess(), &protect_base, &protect_size, protect_old, &protect_old ); - return wmImp; + *pwm = wmImp; + return TRUE; } @@ -901,8 +909,11 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { - if (!(wm->deps[i] = import_dll( wm->ldr.BaseAddress, &imports[i], load_path ))) + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &wm->deps[i] )) + { + wm->deps[i] = NULL; status = STATUS_DLL_NOT_FOUND; + } } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Sebastian Lackner : kernel32: Forward InterlockedPushListSList[Ex] to ntdll.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 49051392d79b1e0e0760f1649a47a1d70dcc11d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49051392d79b1e0e0760f1649… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:54:55 2016 +0100 kernel32: Forward InterlockedPushListSList[Ex] to ntdll. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-interlocked-l1-1-0.spec | 2 +- .../api-ms-win-core-interlocked-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec index 9c6d25c..8b2d3ac 100644 --- a/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-1-0/api-ms-win-core-interlocked-l1-1-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) kernel32.InterlockedPushListSList @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec index f1fbd94..c3e2d0c 100644 --- a/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec +++ b/dlls/api-ms-win-core-interlocked-l1-2-0/api-ms-win-core-interlocked-l1-2-0.spec @@ -8,5 +8,5 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement @ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList -@ stub InterlockedPushListSListEx +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) kernel32.InterlockedPushListSListEx @ stdcall QueryDepthSList(ptr) kernel32.QueryDepthSList diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b0a6361..9bb3181 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -957,7 +957,8 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -# @ stub InterlockedPushListSList +@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList +@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) ntdll.RtlInterlockedPushListSListEx @ stub InvalidateConsoleDIBits @ stdcall InvalidateNLSCache() @ stdcall IsBadCodePtr(ptr)

1 0

Sebastian Lackner : kernel32/tests: Add tests for RtlInterlockedPushListSList[Ex].
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 32f72989b6bec7f79f434bffc2d4b10358b18a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f72989b6bec7f79f434bffc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 03:53:49 2016 +0100 kernel32/tests: Add tests for RtlInterlockedPushListSList[Ex]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 126 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index e2aa3a1..325e1ff 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -28,6 +28,9 @@ #include "wine/test.h" +#undef __fastcall +#define __fastcall __stdcall + static BOOL (WINAPI *pChangeTimerQueueTimer)(HANDLE, HANDLE, ULONG, ULONG); static HANDLE (WINAPI *pCreateTimerQueue)(void); static BOOL (WINAPI *pCreateTimerQueueTimer)(PHANDLE, HANDLE, WAITORTIMERCALLBACK, @@ -61,6 +64,48 @@ static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_ static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pNtWaitForSingleObject)(HANDLE, BOOLEAN, const LARGE_INTEGER *); static NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); +static PSLIST_ENTRY (__fastcall *pRtlInterlockedPushListSList)(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count); +static PSLIST_ENTRY (WINAPI *pRtlInterlockedPushListSListEx)(PSLIST_HEADER list, PSLIST_ENTRY first, + PSLIST_ENTRY last, ULONG count); + +#ifdef __i386__ + +#include "pshpack1.h" +struct fastcall_thunk +{ + BYTE pop_edx; /* popl %edx (ret addr) */ + BYTE pop_eax; /* popl %eax (func) */ + BYTE pop_ecx; /* popl %ecx (param 1) */ + BYTE xchg[3]; /* xchgl (%esp),%edx (param 2) */ + WORD jmp_eax; /* jmp *%eax */ +}; +#include "poppack.h" + +static void * (WINAPI *call_fastcall_func4)(void *func, const void *a, const void *b, const void *c, const void *d); + +static void init_fastcall_thunk(void) +{ + struct fastcall_thunk *thunk = VirtualAlloc(NULL, sizeof(*thunk), MEM_COMMIT, PAGE_EXECUTE_READWRITE); + thunk->pop_edx = 0x5a; /* popl %edx */ + thunk->pop_eax = 0x58; /* popl %eax */ + thunk->pop_ecx = 0x59; /* popl %ecx */ + thunk->xchg[0] = 0x87; /* xchgl (%esp),%edx */ + thunk->xchg[1] = 0x14; + thunk->xchg[2] = 0x24; + thunk->jmp_eax = 0xe0ff; /* jmp *%eax */ + call_fastcall_func4 = (void *)thunk; +} + +#define call_func4(func, a, b, c, d) call_fastcall_func4(func, (const void *)(a), \ + (const void *)(b), (const void *)(c), (const void *)(d)) + +#else /* __i386__ */ + +#define init_fastcall_thunk() do { } while(0) +#define call_func4(func, a, b, c, d) func(a, b, c, d) + +#endif /* __i386__ */ static void test_signalandwait(void) { @@ -276,6 +321,7 @@ static void test_slist(void) size = QueryDepthSList(&slist_header); ok(size == 0, "Expected size == 0, got %u\n", size); + /* test PushEntry, PopEntry and Flush */ entry = InterlockedPushEntrySList(&slist_header, &item1.entry); ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); size = QueryDepthSList(&slist_header); @@ -313,6 +359,83 @@ static void test_slist(void) entry = InterlockedPopEntrySList(&slist_header); ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + /* test RtlInterlockedPushListSList */ + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = call_func4(pRtlInterlockedPushListSList, &slist_header, &item2.entry, &item1.entry, 42); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 43, "Expected size == 43, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 42, "Expected size == 42, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 41, "Expected size == 41, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 40, "Expected size == 40, got %u\n", size); + + entry = InterlockedPopEntrySList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 40, "Expected size == 40, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + size = QueryDepthSList(&slist_header); + ok(size == 40 || broken(size == 0) /* >= Win 8 */, "Expected size == 40, got %u\n", size); + + entry = InterlockedPushEntrySList(&slist_header, &item1.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + + /* test RtlInterlockedPushListSListEx */ + if (pRtlInterlockedPushListSListEx) + { + entry = InterlockedPushEntrySList(&slist_header, &item3.entry); + ok(entry == NULL, "Expected entry == NULL, got %p\n", entry); + entry = pRtlInterlockedPushListSListEx(&slist_header, &item2.entry, &item1.entry, 42); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 43, "Expected size == 43, got %u\n", size); + + entry = InterlockedFlushSList(&slist_header); + ok(entry != NULL, "Expected entry != NULL, got %p\n", entry); + item = CONTAINING_RECORD(entry, struct item, entry); + ok(item->value == 2, "Expected item->value == 2, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 1, "Expected item->value == 1, got %u\n", item->value); + item = CONTAINING_RECORD(item->entry.Next, struct item, entry); + ok(item->value == 3, "Expected item->value == 3, got %u\n", item->value); + size = QueryDepthSList(&slist_header); + ok(size == 0, "Expected size == 0, got %u\n", size); + } + else + win_skip("RtlInterlockedPushListSListEx not available, skipping tests\n"); + + /* test with a lot of items */ for (i = 0; i < 65536; i++) { item = HeapAlloc(GetProcessHeap(), 0, sizeof(*item)); @@ -2561,6 +2684,8 @@ START_TEST(sync) pNtFreeVirtualMemory = (void *)GetProcAddress(hntdll, "NtFreeVirtualMemory"); pNtWaitForSingleObject = (void *)GetProcAddress(hntdll, "NtWaitForSingleObject"); pNtWaitForMultipleObjects = (void *)GetProcAddress(hntdll, "NtWaitForMultipleObjects"); + pRtlInterlockedPushListSList = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSList"); + pRtlInterlockedPushListSListEx = (void *)GetProcAddress(hntdll, "RtlInterlockedPushListSListEx"); argc = winetest_get_mainargs( &argv ); if (argc >= 3) @@ -2572,6 +2697,7 @@ START_TEST(sync) return; } + init_fastcall_thunk(); test_signalandwait(); test_mutex(); test_slist();

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
76
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 February 2016