February 2016 - Wine-Commits

Sebastian Lackner : ntoskrnl.exe: Use debugstr_us() to trace UNICODE_STRING.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: e177f869394783743d46cac47d200c659b620990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e177f869394783743d46cac47… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:23:05 2016 +0100 ntoskrnl.exe: Use debugstr_us() to trace UNICODE_STRING. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1b04060..3bee2bf 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1258,8 +1258,8 @@ NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_o ULONG drv_size, PDRIVER_OBJECT dev_obj, PCM_RESOURCE_LIST dev_list, ULONG dev_size, BOOLEAN overwrite, PBOOLEAN detected) { - FIXME("(%s %p %p %u %p %p %u %d %p) stub\n", debugstr_w(name? name->Buffer : NULL), - drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected); + FIXME( "(%s, %p, %p, %u, %p, %p, %u, %d, %p): stub\n", debugstr_us(name), + drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected ); return STATUS_NOT_IMPLEMENTED; }

1 0

Sebastian Lackner : ntoskrnl.exe: Fix calling convention of ObfReferenceObject.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 2748d4b7719dcf1c32a5aecff51105e236c07a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2748d4b7719dcf1c32a5aecff… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:22:52 2016 +0100 ntoskrnl.exe: Fix calling convention of ObfReferenceObject. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 28 ++++++++++++++++++---------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1fba0af..1b04060 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1985,13 +1985,6 @@ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes ) FIXME( "stub: %p, %lu\n", BaseAddress, NumberOfBytes ); } -/*********************************************************************** - * ObfReferenceObject (NTOSKRNL.EXE.@) - */ -VOID WINAPI ObfReferenceObject(PVOID Object) -{ - FIXME("(%p): stub\n", Object); -} /*********************************************************************** * ObReferenceObjectByHandle (NTOSKRNL.EXE.@) @@ -2021,17 +2014,32 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, return STATUS_NOT_IMPLEMENTED; } + +/*********************************************************************** + * ObfReferenceObject (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( ObfReferenceObject ) +void WINAPI __regs_ObfReferenceObject( void *obj ) +#else +void WINAPI ObfReferenceObject( void *obj ) +#endif +{ + FIXME( "(%p): stub\n", obj ); +} + + /*********************************************************************** * ObfDereferenceObject (NTOSKRNL.EXE.@) */ #ifdef DEFINE_FASTCALL1_ENTRYPOINT DEFINE_FASTCALL1_ENTRYPOINT( ObfDereferenceObject ) -void WINAPI __regs_ObfDereferenceObject( VOID *obj ) +void WINAPI __regs_ObfDereferenceObject( void *obj ) #else -void WINAPI ObfDereferenceObject( VOID *obj ) +void WINAPI ObfDereferenceObject( void *obj ) #endif { - FIXME( "stub: %p\n", obj ); + FIXME( "(%p): stub\n", obj ); } diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6aa7456..1414c53 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -49,7 +49,7 @@ @ stub KiAcquireSpinLock @ stub KiReleaseSpinLock @ stdcall -norelay ObfDereferenceObject(ptr) -@ stdcall ObfReferenceObject(ptr) +@ stdcall -norelay ObfReferenceObject(ptr) @ stub RtlPrefetchMemoryNonTemporal @ cdecl -i386 -norelay RtlUlongByteSwap() ntdll.RtlUlongByteSwap @ cdecl -ret64 RtlUlonglongByteSwap(int64) ntdll.RtlUlonglongByteSwap

1 0

Sebastian Lackner : ntoskrnl.exe: Fix calling convention of InterlockedPushEntrySList.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: be0e86c526ad623f25ea179057467494431b5356 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0e86c526ad623f25ea17905… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:22:21 2016 +0100 ntoskrnl.exe: Fix calling convention of InterlockedPushEntrySList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7938893..1fba0af 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1430,6 +1430,20 @@ PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) /*********************************************************************** + * InterlockedPushEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL2_ENTRYPOINT +DEFINE_FASTCALL2_ENTRYPOINT( NTOSKRNL_InterlockedPushEntrySList ) +PSLIST_ENTRY WINAPI __regs_NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPushEntrySList( PSLIST_HEADER list, PSLIST_ENTRY entry ) +#endif +{ + return InterlockedPushEntrySList( list, entry ); +} + + +/*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f34fd88..6aa7456 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -34,7 +34,7 @@ @ stdcall -norelay InterlockedExchangeAdd(ptr long) NTOSKRNL_InterlockedExchangeAdd @ stdcall -norelay InterlockedIncrement(ptr) NTOSKRNL_InterlockedIncrement @ stdcall -norelay InterlockedPopEntrySList(ptr) NTOSKRNL_InterlockedPopEntrySList -@ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList +@ stdcall -norelay InterlockedPushEntrySList(ptr ptr) NTOSKRNL_InterlockedPushEntrySList @ stub IoAssignDriveLetters @ stub IoReadPartitionTable @ stub IoSetPartitionInformation

1 0

Sebastian Lackner : ntoskrnl.exe: Fix calling convention of InterlockedPopEntrySList.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 8ae681101f0adf3cf3f84c5a45540e2f2f5df69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ae681101f0adf3cf3f84c5a4… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 09:21:43 2016 +0100 ntoskrnl.exe: Fix calling convention of InterlockedPopEntrySList. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7e043be..7938893 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1416,6 +1416,20 @@ LONG WINAPI NTOSKRNL_InterlockedIncrement( LONG volatile *dest ) /*********************************************************************** + * InterlockedPopEntrySList (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( NTOSKRNL_InterlockedPopEntrySList ) +PSLIST_ENTRY WINAPI __regs_NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) +#else +PSLIST_ENTRY WINAPI NTOSKRNL_InterlockedPopEntrySList( PSLIST_HEADER list ) +#endif +{ + return InterlockedPopEntrySList( list ); +} + + +/*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1319ada..f34fd88 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -33,7 +33,7 @@ @ stdcall -norelay InterlockedExchange(ptr long) NTOSKRNL_InterlockedExchange @ stdcall -norelay InterlockedExchangeAdd(ptr long) NTOSKRNL_InterlockedExchangeAdd @ stdcall -norelay InterlockedIncrement(ptr) NTOSKRNL_InterlockedIncrement -@ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList +@ stdcall -norelay InterlockedPopEntrySList(ptr) NTOSKRNL_InterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList @ stub IoAssignDriveLetters @ stub IoReadPartitionTable

1 0

Francois Gouget : shell32/tests: Fix an ok() call so it shows which DDE test caused the failure.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 43fe3574f479234f77d25fcb14505233cb66fa33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fe3574f479234f77d25fcb1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Feb 14 00:24:43 2016 +0100 shell32/tests: Fix an ok() call so it shows which DDE test caused the failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 11b7e57..d719c9c 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2469,9 +2469,9 @@ static void test_dde(void) } okShell(32 < rc, "failed: rc=%lu err=%u\n", rc, GetLastError()); if (test->ddeexec) - ok(waitforinputidle_count == 1, "WaitForInputIdle() was called %u times\n", waitforinputidle_count); + okShell(waitforinputidle_count == 1, "WaitForInputIdle() was called %u times\n", waitforinputidle_count); else - ok(waitforinputidle_count == 0, "WaitForInputIdle() was called %u times for a non-DDE case\n", waitforinputidle_count); + okShell(waitforinputidle_count == 0, "WaitForInputIdle() was called %u times for a non-DDE case\n", waitforinputidle_count); if (32 < rc) {

1 0

Sebastian Lackner : kernel32/tests: Fix flags passed to VirtualFree in multiple tests.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: f94755f719c6989a132d3da6f759e236ae24c774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94755f719c6989a132d3da6f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:26:25 2016 +0100 kernel32/tests: Fix flags passed to VirtualFree in multiple tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/virtual.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 53dc04b..58ddddf 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3104,7 +3104,7 @@ static void test_read_write(void) "wrong error %u\n", GetLastError() ); ok( bytes == 0, "read %x bytes\n", bytes ); - VirtualFree( mem, 0, MEM_FREE ); + VirtualFree( mem, 0, MEM_RELEASE ); ret = CloseHandle(hFile); ok( ret, "CloseHandle: error %d\n", GetLastError()); diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index c35f4db..38c0675 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -147,8 +147,8 @@ static void test_VirtualAllocEx(void) b = pVirtualFreeEx(hProcess, addr1, 0, MEM_RELEASE); ok(b != 0, "VirtualFreeEx, error %u\n", GetLastError()); - VirtualFree( src, 0, MEM_FREE ); - VirtualFree( dst, 0, MEM_FREE ); + VirtualFree( src, 0, MEM_RELEASE ); + VirtualFree( dst, 0, MEM_RELEASE ); /* * The following tests parallel those in test_VirtualAlloc() @@ -1755,11 +1755,11 @@ static void test_write_watch(void) ok( !ret, "ResetWriteWatch failed %u\n", ret ); } - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_WRITE_WATCH, PAGE_READWRITE ); ok( base != NULL, "VirtualAlloc failed %u\n", GetLastError() ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); base = VirtualAlloc( 0, size, MEM_WRITE_WATCH, PAGE_READWRITE ); ok( !base, "VirtualAlloc succeeded\n" ); @@ -1803,7 +1803,7 @@ static void test_write_watch(void) "wrong count %lu\n", count ); if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); } #ifdef __i386__ @@ -1948,7 +1948,7 @@ static void test_guard_page(void) ok( success, "VirtualUnlock failed %u\n", GetLastError() ); } - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); /* combined guard page / write watch tests */ if (!pGetWriteWatch || !pResetWriteWatch) @@ -2054,7 +2054,7 @@ static void test_guard_page(void) todo_wine ok( results[0] == base || broken(results[0] == (void *)0xdeadbeef) /* Windows 8 */, "wrong result %p\n", results[0] ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); } static DWORD WINAPI stack_commit_func( void *arg ) @@ -2128,8 +2128,8 @@ static void test_stack_commit(void) pNtCurrentTeb()->Tib.StackBase = old_stack_base; pNtCurrentTeb()->Tib.StackLimit = old_stack_limit; - VirtualFree( new_stack, 0, MEM_FREE ); - VirtualFree( call_on_stack, 0, MEM_FREE ); + VirtualFree( new_stack, 0, MEM_RELEASE ); + VirtualFree( call_on_stack, 0, MEM_RELEASE ); } DWORD num_execute_fault_calls; @@ -2564,7 +2564,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) success = UnregisterClassA( cls_name, GetModuleHandleA(0) ); ok( success, "UnregisterClass failed %u\n", GetLastError() ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); /* Repeat the tests from above with MEM_WRITE_WATCH protected memory. */ @@ -2753,7 +2753,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) success = UnregisterClassA( cls_name, GetModuleHandleA(0) ); ok( success, "UnregisterClass failed %u\n", GetLastError() ); - VirtualFree( base, 0, MEM_FREE ); + VirtualFree( base, 0, MEM_RELEASE ); out: if (restore_flags) @@ -2943,7 +2943,7 @@ static void test_VirtualProtect(void) exec_prot = 1 << (i + 4); } - VirtualFree(base, 0, MEM_FREE); + VirtualFree(base, 0, MEM_RELEASE); } static BOOL is_mem_writable(DWORD prot) @@ -3044,7 +3044,7 @@ static void test_VirtualAlloc_protection(void) ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); ok(ptr == base, "%d: VirtualAlloc failed %d\n", i, GetLastError()); - VirtualFree(base, 0, MEM_FREE); + VirtualFree(base, 0, MEM_RELEASE); } else {

1 0

Sebastian Lackner : kernel32/tests: Ensure VirtualAlloc tests do not depend on previous memory allocations.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 1e624c5aaa7d66438d297965576e2046b6e71b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e624c5aaa7d66438d2979655… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:25:48 2016 +0100 kernel32/tests: Ensure VirtualAlloc tests do not depend on previous memory allocations. Following tests try to allocate memory at (char *)addr1 + 0x1000. We expect that no memory is mapped at this location. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index f47a54c..c35f4db 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -383,9 +383,13 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); - addr1 = VirtualAlloc(0, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + /* memory returned by VirtualAlloc should be aligned to 64k */ + addr1 = VirtualAlloc(0, 0x2000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); ok(addr1 != NULL, "VirtualAlloc failed\n"); ok(!((ULONG_PTR)addr1 & 0xffff), "returned memory %p is not aligned to 64k\n", addr1); + ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); + addr2 = VirtualAlloc(addr1, 0x1000, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); + ok(addr2 == addr1, "VirtualAlloc returned %p, expected %p\n", addr2, addr1); /* allocation conflicts because of 64k align */ size = 0x1000;

1 0

Sebastian Lackner : kernel32/tests: Add a test to show that VirtualFree fails with type MEM_FREE.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 24641d8e44b3816709436b360d18f81164b8ff26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24641d8e44b3816709436b360… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:24:30 2016 +0100 kernel32/tests: Add a test to show that VirtualFree fails with type MEM_FREE. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index e614bde..f47a54c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -369,6 +369,11 @@ static void test_VirtualAlloc(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + SetLastError(0xdeadbeef); + ok(!VirtualFree(addr1, 0, MEM_FREE), "VirtualFree should fail with type MEM_FREE\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "got %d, expected ERROR_INVALID_PARAMETER\n", GetLastError()); + ok(VirtualFree(addr1, 0x10000, MEM_DECOMMIT), "VirtualFree failed\n"); /* if the type is MEM_RELEASE, size must be 0 */

1 0

Sebastian Lackner : kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 1bebee9c1b119d727991aee50451e36e0865f927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bebee9c1b119d727991aee50… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 13 22:24:06 2016 +0100 kernel32/tests: Add test to show that CompareStringW aborts on first non-matching character. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4a9e540..6726fb9 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1798,6 +1798,36 @@ static void test_CompareStringA(void) "ret %d, error %d, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); } +static void test_CompareStringW(void) +{ + WCHAR *str1, *str2; + SYSTEM_INFO si; + DWORD old_prot; + BOOL success; + char *buf; + int ret; + + GetSystemInfo(&si); + buf = VirtualAlloc(NULL, si.dwPageSize * 4, MEM_COMMIT, PAGE_READWRITE); + ok(buf != NULL, "VirtualAlloc failed with %u\n", GetLastError()); + success = VirtualProtect(buf + si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + success = VirtualProtect(buf + 3 * si.dwPageSize, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(success, "VirtualProtect failed with %u\n", GetLastError()); + + str1 = (WCHAR *)(buf + si.dwPageSize - sizeof(WCHAR)); + str2 = (WCHAR *)(buf + 3 * si.dwPageSize - sizeof(WCHAR)); + *str1 = 'A'; + *str2 = 'B'; + + /* CompareStringW should abort on the first non-matching character */ + ret = CompareStringW(CP_ACP, 0, str1, 100, str2, 100); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + + success = VirtualFree(buf, 0, MEM_RELEASE); + ok(success, "VirtualFree failed with %u\n", GetLastError()); +} + struct comparestringex_test { const char *locale; DWORD flags; @@ -4791,6 +4821,7 @@ START_TEST(locale) test_GetCurrencyFormatA(); /* Also tests the W version */ test_GetNumberFormatA(); /* Also tests the W version */ test_CompareStringA(); + test_CompareStringW(); test_CompareStringEx(); test_LCMapStringA(); test_LCMapStringW();

1 0

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard Feb. 15, 2016

Feb. 15, 2016

Module: wine Branch: master Commit: 26d0a0a081ae71048b5932c3972bd62d7149af1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26d0a0a081ae71048b5932c39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 13 13:32:28 2016 +0900 opengl32: Update to the current OpenGL spec. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/make_opengl | 1 + dlls/opengl32/opengl_ext.c | 325 +- dlls/opengl32/opengl_norm.c | 92 +- include/wine/wgl.h | 11118 +++++++++++++++++++++--------------------- include/wine/wgl_driver.h | 49 +- 5 files changed, 6063 insertions(+), 5522 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26d0a0a081ae71048b593…

1 0