wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Nikolay Sivov : ntdll/tests: Add some tests for VM regions splitting.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: afdfb382d8f196473bcafc5a9f0268bdc0b7284a URL: https://source.winehq.org/git/wine.git/?a=commit;h=afdfb382d8f196473bcafc5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 15:05:21 2022 +0300 ntdll/tests: Add some tests for VM regions splitting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/tests/virtual.c | 102 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index f8bb3e97c86..24c87c46d26 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -272,12 +272,27 @@ static void test_NtAllocateVirtualMemory(void) ok(!!status, "Unexpected status %08lx.\n", status); } -static void test_NtAllocateVirtualMemoryEx(void) +#define check_region_size(p, s) check_region_size_(p, s, __LINE__) +static void check_region_size_(void *p, SIZE_T s, unsigned int line) { - void *addr1, *addr2; + MEMORY_BASIC_INFORMATION mbi; NTSTATUS status; SIZE_T size; + memset(&mbi, 0, sizeof(mbi)); + status = NtQueryVirtualMemory( NtCurrentProcess(), p, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok_(__FILE__,line)( !status, "Unexpected return value %08lx\n", status ); + ok_(__FILE__,line)( size == sizeof(mbi), "Unexpected return value.\n"); + ok_(__FILE__,line)( mbi.RegionSize == s, "Unexpected size %Iu, expected %Iu.\n", mbi.RegionSize, s); +} + +static void test_NtAllocateVirtualMemoryEx(void) +{ + SIZE_T size, size2; + char *p, *p1, *p2; + NTSTATUS status; + void *addr1; + if (!pNtAllocateVirtualMemoryEx) { win_skip("NtAllocateVirtualMemoryEx() is missing\n"); @@ -291,7 +306,7 @@ static void test_NtAllocateVirtualMemoryEx(void) ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); size = 0; - status = NtFreeVirtualMemory(NtCurrentProcess(), &addr2, &size, MEM_RELEASE); + status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); /* specifying a count of >0 with NULL parameters should fail */ @@ -322,6 +337,87 @@ static void test_NtAllocateVirtualMemoryEx(void) status = NtFreeVirtualMemory(NtCurrentProcess(), &addr1, &size, MEM_RELEASE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); } + + /* Placeholder region splitting. */ + + /* Split in three regions. */ + addr1 = NULL; + size = 0x10000; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (status == STATUS_SUCCESS) + { + p = addr1; + p1 = p + size / 2; + p2 = p1 + size / 4; + size2 = size / 4; + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + check_region_size(p, size / 2); + check_region_size(p1, size / 4); + check_region_size(p2, size - size / 2 - size / 4); + + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } + + /* Split in two regions, specifying lower part. */ + addr1 = NULL; + size = 0x10000; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (status == STATUS_SUCCESS) + { + p1 = addr1; + p2 = p1 + size / 4; + size2 = size / 4; + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(p1 == addr1, "Unexpected address.\n"); + + check_region_size(p1, size / 4); + check_region_size(p2, size - size / 4); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } + + /* Split in two regions, specifying second half. */ + addr1 = NULL; + size = 0x10000; + status = pNtAllocateVirtualMemoryEx(NtCurrentProcess(), &addr1, &size, MEM_RESERVE | MEM_RESERVE_PLACEHOLDER, + PAGE_NOACCESS, NULL, 0); + todo_wine + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + + if (status == STATUS_SUCCESS) + { + p1 = addr1; + p2 = p1 + size / 2; + + size2 = size / 2; + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(p2 == p1 + size / 2, "Unexpected address.\n"); + check_region_size(p1, size / 2); + check_region_size(p2, size / 2); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + } } struct test_stack_size_thread_args

1 0

Nikolay Sivov : kernelbase/tests: Add some more tests for region splitting.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: f98d4f3ef1a6e3d60dc09256d38cfdb513063231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98d4f3ef1a6e3d60dc09256… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 14:36:53 2022 +0300 kernelbase/tests: Add some more tests for region splitting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/tests/process.c | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index bb1de49049d..62debfb9861 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -128,10 +128,23 @@ static void test_MapViewOfFile3(void) ok(ret, "Failed to delete a test file.\n"); } +#define check_region_size(p, s) check_region_size_(p, s, __LINE__) +static void check_region_size_(void *p, SIZE_T s, unsigned int line) +{ + MEMORY_BASIC_INFORMATION info; + SIZE_T ret; + + memset(&info, 0, sizeof(info)); + ret = VirtualQuery(p, &info, sizeof(info)); + ok_(__FILE__,line)(ret == sizeof(info), "Unexpected return value.\n"); + ok_(__FILE__,line)(info.RegionSize == s, "Unexpected size %Iu, expected %Iu.\n", info.RegionSize, s); +} + static void test_VirtualAlloc2(void) { void *placeholder1, *placeholder2, *view1, *view2, *addr; MEMORY_BASIC_INFORMATION info; + char *p, *p1, *p2; HANDLE section; SIZE_T size; BOOL ret; @@ -194,6 +207,54 @@ static void test_VirtualAlloc2(void) VirtualFree(placeholder1, 0, MEM_RELEASE); VirtualFree(placeholder2, 0, MEM_RELEASE); + + /* Split in three regions. */ + p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); + ok(!!p, "Failed to create a placeholder range.\n"); + + p1 = p + size / 2; + p2 = p1 + size / 4; + ret = VirtualFree(p1, size / 4, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p, size / 2); + check_region_size(p1, size / 4); + check_region_size(p2, 2 * size - size / 2 - size / 4); + ret = VirtualFree(p, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p1, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p2, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + + /* Split in two regions, specifying lower part. */ + p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); + ok(!!p, "Failed to create a placeholder range.\n"); + + p1 = p; + p2 = p + size / 2; + ret = VirtualFree(p1, size / 2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p1, size / 2); + check_region_size(p2, 2 * size - size / 2); + ret = VirtualFree(p1, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p2, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + + /* Split in two regions, specifying second half. */ + p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); + ok(!!p, "Failed to create a placeholder range.\n"); + + p1 = p; + p2 = p + size; + ret = VirtualFree(p2, size, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p1, size); + check_region_size(p2, size); + ret = VirtualFree(p1, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); + ret = VirtualFree(p2, 0, MEM_RELEASE); + ok(ret, "Failed to release a region.\n"); } static void test_VirtualAllocFromApp(void)

1 0

Nikolay Sivov : kernelbase: Implement VirtualAlloc2FromApp().
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 03fde5c002c7cb4a7a8aa26a5d64bf8516352542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03fde5c002c7cb4a7a8aa26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 13:36:37 2022 +0300 kernelbase: Implement VirtualAlloc2FromApp(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 1 + dlls/kernelbase/memory.c | 32 +++++++++++++++++++-- dlls/kernelbase/tests/process.c | 63 +++++++++++++++++++++++++++++++++-------- include/winbase.h | 1 + 4 files changed, 83 insertions(+), 14 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7109628a678..d4b5b5d3eb8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1707,6 +1707,7 @@ # @ stub VerifyPackageRelativeApplicationId # @ stub VerifyScripts @ stdcall VirtualAlloc2(long ptr long long long ptr long) +@ stdcall VirtualAlloc2FromApp(long ptr long long long ptr long) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) @ stdcall VirtualAllocExNuma(long ptr long long long long) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index cac456d01be..736d3642995 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -358,6 +358,35 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2( HANDLE process, void *addr, SIZE_ return ret; } +static BOOL is_exec_prot( DWORD protect ) +{ + return protect == PAGE_EXECUTE || protect == PAGE_EXECUTE_READ || protect == PAGE_EXECUTE_READWRITE + || protect == PAGE_EXECUTE_WRITECOPY; +} + +/*********************************************************************** + * VirtualAlloc2FromApp (kernelbase.@) + */ +LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAlloc2FromApp( HANDLE process, void *addr, SIZE_T size, + DWORD type, DWORD protect, MEM_EXTENDED_PARAMETER *parameters, ULONG count ) +{ + LPVOID ret = addr; + + TRACE_(virtual)( "addr %p, size %p, type %#lx, protect %#lx, params %p, count %lu.\n", addr, (void *)size, type, protect, + parameters, count ); + + if (is_exec_prot( protect )) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return NULL; + } + + if (!process) process = GetCurrentProcess(); + if (!set_ntstatus( NtAllocateVirtualMemoryEx( process, &ret, &size, type, protect, parameters, count ))) + return NULL; + return ret; +} + /*********************************************************************** * VirtualAllocFromApp (kernelbase.@) @@ -369,8 +398,7 @@ LPVOID WINAPI DECLSPEC_HOTPATCH VirtualAllocFromApp( void *addr, SIZE_T size, TRACE_(virtual)( "addr %p, size %p, type %#lx, protect %#lx.\n", addr, (void *)size, type, protect ); - if (protect == PAGE_EXECUTE || protect == PAGE_EXECUTE_READ || protect == PAGE_EXECUTE_READWRITE - || protect == PAGE_EXECUTE_WRITECOPY) + if (is_exec_prot( protect )) { SetLastError( ERROR_INVALID_PARAMETER ); return NULL; diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 90c4c4c26e1..bb1de49049d 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -34,6 +34,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); static LPVOID (WINAPI *pMapViewOfFile3)(HANDLE, HANDLE, PVOID, ULONG64 offset, SIZE_T size, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static LPVOID (WINAPI *pVirtualAlloc2)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); +static LPVOID (WINAPI *pVirtualAlloc2FromApp)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); static void test_CompareObjectHandles(void) @@ -197,6 +198,14 @@ static void test_VirtualAlloc2(void) static void test_VirtualAllocFromApp(void) { + static const DWORD prot[] = + { + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + }; + unsigned int i; BOOL ret; void *p; @@ -212,18 +221,46 @@ static void test_VirtualAllocFromApp(void) ret = VirtualFree(p, 0, MEM_RELEASE); ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); + for (i = 0; i < ARRAY_SIZE(prot); ++i) + { + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, prot[i]); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); + } +} + +static void test_VirtualAlloc2FromApp(void) +{ + static const DWORD prot[] = + { + PAGE_EXECUTE, + PAGE_EXECUTE_READ, + PAGE_EXECUTE_READWRITE, + PAGE_EXECUTE_WRITECOPY, + }; + unsigned int i; + void *addr; + BOOL ret; + + if (!pVirtualAlloc2FromApp) + { + win_skip("VirtualAlloc2FromApp is not available.\n"); + return; + } + + addr = pVirtualAlloc2FromApp(NULL, NULL, 0x1000, MEM_COMMIT, PAGE_READWRITE, NULL, 0); + ok(!!addr, "Failed to allocate, error %lu.\n", GetLastError()); + ret = VirtualFree(addr, 0, MEM_RELEASE); + ok(ret, "Unexpected return value %d, error %lu.\n", ret, GetLastError()); + + for (i = 0; i < ARRAY_SIZE(prot); ++i) + { + SetLastError(0xdeadbeef); + addr = pVirtualAlloc2FromApp(NULL, NULL, 0x1000, MEM_COMMIT, prot[i], NULL, 0); + ok(!addr && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + addr, GetLastError()); + } } static void init_funcs(void) @@ -234,6 +271,7 @@ static void init_funcs(void) X(CompareObjectHandles); X(MapViewOfFile3); X(VirtualAlloc2); + X(VirtualAlloc2FromApp); X(VirtualAllocFromApp); #undef X } @@ -246,4 +284,5 @@ START_TEST(process) test_MapViewOfFile3(); test_VirtualAlloc2(); test_VirtualAllocFromApp(); + test_VirtualAlloc2FromApp(); } diff --git a/include/winbase.h b/include/winbase.h index a400816c4d3..bf191153ddc 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2756,6 +2756,7 @@ WINBASEAPI BOOL WINAPI VerifyVersionInfoW(LPOSVERSIONINFOEXW,DWORD,DWORDL #define VerifyVersionInfo WINELIB_NAME_AW(VerifyVersionInfo) WINBASEAPI LPVOID WINAPI VirtualAlloc(LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAlloc2(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); +WINBASEAPI LPVOID WINAPI VirtualAlloc2FromApp(HANDLE,LPVOID,SIZE_T,DWORD,DWORD,MEM_EXTENDED_PARAMETER*,ULONG); WINBASEAPI LPVOID WINAPI VirtualAllocEx(HANDLE,LPVOID,SIZE_T,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocExNuma(HANDLE,void*,SIZE_T,DWORD,DWORD,DWORD); WINBASEAPI LPVOID WINAPI VirtualAllocFromApp(LPVOID,SIZE_T,DWORD,DWORD);

1 0

Nikolay Sivov : kernelbase/tests: Move VirtualAllocFromApp() tests.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 3dcb85f56d4c5489a1010feebaa59bf5b8162ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcb85f56d4c5489a1010fee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 3 13:04:33 2022 +0300 kernelbase/tests: Move VirtualAllocFromApp() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/virtual.c | 36 --------------------------- dlls/kernelbase/tests/process.c | 54 ++++++++++++++++++++++++++++++++++------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 6d4d34e2e81..9b3c8228a3f 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -50,7 +50,6 @@ static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); -static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); /* ############################### */ @@ -454,39 +453,6 @@ static void test_VirtualAlloc(void) ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n"); } -static void test_VirtualAllocFromApp(void) -{ - void *p; - BOOL ret; - if (!pVirtualAllocFromApp) - { - win_skip("VirtualAllocFromApp is not available.\n"); - return; - } - - p = GetProcAddress(hkernel32, "VirtualAllocFromApp"); - ok(!p, "Found VirtualAllocFromApp in kernel32.dll.\n"); - - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_READWRITE); - ok(p && GetLastError() == 0xdeadbeef, "Got unexpected mem %p, GetLastError() %lu.\n", p, GetLastError()); - ret = VirtualFree(p, 0, MEM_RELEASE); - ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); - - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); - SetLastError(0xdeadbeef); - p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); - ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", - p, GetLastError()); -} - static void test_MapViewOfFile(void) { static const char testfile[] = "testfile.xxx"; @@ -4304,7 +4270,6 @@ START_TEST(virtual) pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); - pVirtualAllocFromApp = (void *)GetProcAddress( hkernelbase, "VirtualAllocFromApp" ); GetSystemInfo(&si); trace("system page size %#lx\n", si.dwPageSize); @@ -4319,7 +4284,6 @@ START_TEST(virtual) test_VirtualProtect(); test_VirtualAllocEx(); test_VirtualAlloc(); - test_VirtualAllocFromApp(); test_MapViewOfFile(); test_NtAreMappedFilesTheSame(); test_CreateFileMapping(); diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index b83a25015b2..90c4c4c26e1 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -34,6 +34,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); static LPVOID (WINAPI *pMapViewOfFile3)(HANDLE, HANDLE, PVOID, ULONG64 offset, SIZE_T size, ULONG, ULONG, MEM_EXTENDED_PARAMETER *, ULONG); static LPVOID (WINAPI *pVirtualAlloc2)(HANDLE, void *, SIZE_T, DWORD, DWORD, MEM_EXTENDED_PARAMETER *, ULONG); +static PVOID (WINAPI *pVirtualAllocFromApp)(PVOID, SIZE_T, DWORD, DWORD); static void test_CompareObjectHandles(void) { @@ -194,20 +195,55 @@ static void test_VirtualAlloc2(void) VirtualFree(placeholder2, 0, MEM_RELEASE); } -START_TEST(process) +static void test_VirtualAllocFromApp(void) { - HMODULE hmod; + BOOL ret; + void *p; - hmod = GetModuleHandleA("kernel32.dll"); - pCompareObjectHandles = (void *)GetProcAddress(hmod, "CompareObjectHandles"); - ok(!pCompareObjectHandles, "expected CompareObjectHandles only in kernelbase.dll\n"); + if (!pVirtualAllocFromApp) + { + win_skip("VirtualAllocFromApp is not available.\n"); + return; + } - hmod = GetModuleHandleA("kernelbase.dll"); - pCompareObjectHandles = (void *)GetProcAddress(hmod, "CompareObjectHandles"); - pMapViewOfFile3 = (void *)GetProcAddress(hmod, "MapViewOfFile3"); - pVirtualAlloc2 = (void *)GetProcAddress(hmod, "VirtualAlloc2"); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_READWRITE); + ok(p && GetLastError() == 0xdeadbeef, "Got unexpected mem %p, GetLastError() %lu.\n", p, GetLastError()); + ret = VirtualFree(p, 0, MEM_RELEASE); + ok(ret, "Got unexpected ret %#x, GetLastError() %lu.\n", ret, GetLastError()); + + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READ); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); + SetLastError(0xdeadbeef); + p = pVirtualAllocFromApp(NULL, 0x1000, MEM_RESERVE, PAGE_EXECUTE_READWRITE); + ok(!p && GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected mem %p, GetLastError() %lu.\n", + p, GetLastError()); +} + +static void init_funcs(void) +{ + HMODULE hmod = GetModuleHandleA("kernelbase.dll"); + +#define X(f) { p##f = (void*)GetProcAddress(hmod, #f); } + X(CompareObjectHandles); + X(MapViewOfFile3); + X(VirtualAlloc2); + X(VirtualAllocFromApp); +#undef X +} + +START_TEST(process) +{ + init_funcs(); test_CompareObjectHandles(); test_MapViewOfFile3(); test_VirtualAlloc2(); + test_VirtualAllocFromApp(); }

1 0

Nikolay Sivov : secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity).
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: e44a9d2c2f26bac43321433ff6fc027373119852 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44a9d2c2f26bac43321433f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 4 18:05:53 2022 +0300 secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index bc0867ca94b..5b4fb196aca 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -589,8 +589,9 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, } params.key_size = key_size; params.key_blob = key_blob; - if (GNUTLS_CALL( allocate_certificate_credentials, &params )) goto fail; + status = GNUTLS_CALL( allocate_certificate_credentials, &params ); free(key_blob); + if (status) goto fail; handle = schan_alloc_handle(creds, SCHAN_HANDLE_CRED); if (handle == SCHAN_INVALID_HANDLE) goto fail; @@ -609,7 +610,6 @@ static SECURITY_STATUS schan_AcquireClientCredentials(const void *schanCred, fail: free(creds); - free(key_blob); return SEC_E_INTERNAL_ERROR; }

1 0

Piotr Caban : wow64: Fix NtQueryDirectoryObject wrapper.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: 70d119b7b4f379a2d040ebefa5b79ce2606cdb0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d119b7b4f379a2d040ebef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jun 4 20:18:02 2022 +0200 wow64: Fix NtQueryDirectoryObject wrapper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wow64/sync.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index d4122ddf3f3..578ef57201f 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -769,26 +769,32 @@ NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) BOOLEAN restart = get_ulong( &args ); ULONG *context = get_ptr( &args ); ULONG *retlen = get_ptr( &args ); + ULONG retsize; NTSTATUS status; DIRECTORY_BASIC_INFORMATION *info; - ULONG size = size32 + sizeof(*info) - sizeof(*info32); + ULONG size = size32 + 2 * sizeof(*info) - 2 * sizeof(*info32); if (!single_entry) FIXME( "not implemented\n" ); info = Wow64AllocateTemp( size ); - status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, NULL ); + status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, &retsize ); if (!status) { - info32->ObjectName.Buffer = PtrToUlong( info32 + 1 ); + info32->ObjectName.Buffer = PtrToUlong( info32 + 2 ); info32->ObjectName.Length = info->ObjectName.Length; info32->ObjectName.MaximumLength = info->ObjectName.MaximumLength; info32->ObjectTypeName.Buffer = info32->ObjectName.Buffer + info->ObjectName.MaximumLength; info32->ObjectTypeName.Length = info->ObjectTypeName.Length; info32->ObjectTypeName.MaximumLength = info->ObjectTypeName.MaximumLength; + memset( info32 + 1, 0, sizeof(*info32) ); size = info->ObjectName.MaximumLength + info->ObjectTypeName.MaximumLength; - memcpy( info32 + 1, info + 1, size ); - if (retlen) *retlen = sizeof(*info32) + size; + memcpy( info32 + 2, info + 2, size ); + if (retlen) *retlen = 2 * sizeof(*info32) + size; } + else if (retlen && status == STATUS_BUFFER_TOO_SMALL) + *retlen = retsize - 2 * sizeof(*info) + 2 * sizeof(*info32); + else if (retlen && status == STATUS_NO_MORE_ENTRIES) + *retlen = 0; return status; }

1 0

Nikolay Sivov : windows.gaming.input: Fix a leak on error path (Coverity).
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: wine Branch: master Commit: ea4c506cd75feb6a5c4791c7f7cc453237249c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4c506cd75feb6a5c4791c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 5 10:03:47 2022 +0300 windows.gaming.input: Fix a leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windows.gaming.input/async.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 2cb6e51c9c5..8483f301b83 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -335,6 +335,7 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper IInspectable *outer, IWineAsyncInfoImpl **out ) { struct async_info *impl; + HRESULT hr; if (!(impl = calloc( 1, sizeof(struct async_info) ))) return E_OUTOFMEMORY; impl->IWineAsyncInfoImpl_iface.lpVtbl = &async_impl_vtbl; @@ -346,7 +347,11 @@ static HRESULT async_info_create( IUnknown *invoker, IUnknown *param, async_oper impl->handler = HANDLER_NOT_SET; impl->status = Started; if (!(impl->async_run_work = CreateThreadpoolWork( async_info_callback, &impl->IWineAsyncInfoImpl_iface, NULL ))) - return HRESULT_FROM_WIN32( GetLastError() ); + { + hr = HRESULT_FROM_WIN32( GetLastError() ); + free( impl ); + return hr; + } if ((impl->invoker = invoker)) IUnknown_AddRef( impl->invoker ); if ((impl->param = param)) IUnknown_AddRef( impl->param );

1 0

Francois Gouget : winetest: Apply a couple of spelling fixes.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: d773793d717dc2cbac0550580ce10b3e6eb1dc76 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d773793d717dc2cbac05505… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 6 05:56:04 2022 +0200 winetest: Apply a couple of spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-patterns | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 0bad351..0bab171 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1477,7 +1477,7 @@ EOF <li>Related bugs should have the source and testcase keywords, and their description should contain module:unit, module/unit or module/tests/unit. </ul> -The patterns are grouped according to the likelyhood that they contain new failures: +The patterns are grouped according to the likelihood that they contain new failures: <ul>"; my @listids = ("summary", "recent", "newmode", "regular", "old", @@ -1499,7 +1499,7 @@ EOF $tests{0}->{desc} .= "</ul>"; if (!$nolist) { - my @table = ("<details><summary>Page cutomization</summary> + my @table = ("<details><summary>Page customization</summary> <div class='detailsbox'>This section lets you select the reports to show on this page. <label><input id='reruns' type='checkbox' checked> Hide WineTest reruns</label> "); if (!$subpage or $subpage eq "-tb-win")

1 0

Francois Gouget : testbot/cgi: Tweak the CollectionBlock master columns iterations.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 729f60d174304629b3f848c7f597044ec4a870f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=729f60d174304629b3f848c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 6 02:59:33 2022 +0200 testbot/cgi: Tweak the CollectionBlock master columns iterations. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index 336c7cd..e8156a1 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -243,7 +243,7 @@ sub GetDetailsLink($$) my ($MasterColNames, $MasterColValues) = $Row->{Item}->GetMasterCols(); if (defined $MasterColNames) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Row->{DetailsLink} .= "&". $MasterColNames->[$ColIndex] ."=". uri_escape($MasterColValues->[$ColIndex]); @@ -385,7 +385,7 @@ sub GenerateFormStart($) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0..scalar @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { print "<div><input type='hidden' name='", $MasterColNames->[$ColIndex], "' value='", $self->escapeHTML($MasterColValues->[$ColIndex]), @@ -684,7 +684,7 @@ sub OnAction($$) my ($MasterColNames, $MasterColValues) = $self->{Collection}->GetMasterCols(); if (defined($MasterColNames)) { - foreach my $ColIndex (0 .. @$MasterColNames - 1) + foreach my $ColIndex (0..$#{$MasterColNames}) { $Target .= ($ColIndex == 0 ? "?" : "&") . $MasterColNames->[$ColIndex] . "=" . uri_escape($MasterColValues->[$ColIndex]);

1 0

Francois Gouget : testbot: Simplify building a slash-separated Item identifiers.
by Alexandre Julliard 06 Jun '22

06 Jun '22

Module: tools Branch: master Commit: 8c1869ddae04fe3582e46f79cc4e56c3ee600d41 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8c1869ddae04fe3582e46f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 6 02:59:28 2022 +0200 testbot: Simplify building a slash-separated Item identifiers. This also fixes the task id in the GetReportNames() error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- testbot/lib/ObjectModel/Item.pm | 19 +++++++++++++++++++ testbot/lib/WineTestBot/Steps.pm | 3 +-- testbot/lib/WineTestBot/Tasks.pm | 13 +++++-------- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index ab72ac1..af1123a 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -205,7 +205,7 @@ if (%DeletedVMs) { if (exists $DeletedVMs{$Task->VM->Name}) { - Trace "Keeping the ", $Task->VM->Name, " VM for task ", join("/", @{$Task->GetMasterKey()}), "\n"; + Trace "Keeping the ", $Task->VM->Name, " VM for task ", $Task->GetSlashKey(), "\n"; delete $DeletedVMs{$Task->VM->Name}; last if (!%DeletedVMs); } diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 0b1da92..39c80cc 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -350,6 +350,25 @@ sub GetMasterKey($) return (\@MasterColNames, \@MasterColValues); } +=pod +=over 12 + +=item C<GetSlashKey()> + +Returns a string containing all the slash-separated key components. + +This can be used to display the key in the GUI or to build file paths (assuming +the key components can be trusted). + +=back +=cut + +sub GetSlashKey($) +{ + my ($self) = @_; + return join("/", @{$self->GetMasterKey()}); # drops the column names +} + sub ResetModified($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index d2e2831..48d0209 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -128,8 +128,7 @@ sub Validate($) sub GetDir($) { my ($self) = @_; - my ($JobId, $StepNo) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/$StepNo"; + return "$DataDir/jobs/". $self->GetSlashKey(); } sub CreateDir($) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index c80b432..a7d9e82 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -91,8 +91,7 @@ sub InitializeNew($$) sub GetDir($) { my ($self) = @_; - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; - return "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; + return "$DataDir/jobs/". $self->GetSlashKey(); } sub CreateDir($) @@ -118,13 +117,11 @@ sub GetReportNames($) return ($ErrMessage, undef, undef) if (defined $ErrMessage); if (!@$Missions) { - my @TaskKey = $self->GetMasterKey(); - return ("Task @TaskKey has no mission", undef, undef); + return ("Task ". $self->GetSlashKey() ." has no mission", undef, undef); } if (@$Missions > 1) { - my @TaskKey = $self->GetMasterKey(); - return ("Task @TaskKey should not have missions for multiple tasks\n", undef); + return ("Task ". $self->GetSlashKey() ." should not have missions for multiple tasks\n", undef); } my $TaskMissions = $Missions->[0]; @@ -275,7 +272,6 @@ sub UpdateStatus($$) if ($Status eq "running" and ($VM->Status ne "running" or !$VM->HasRunningChild())) { - my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $OldUMask = umask(002); my $TaskDir = $self->CreateDir(); if (open TASKLOG, ">>", "$TaskDir/testbot.log") @@ -286,7 +282,8 @@ sub UpdateStatus($$) umask($OldUMask); require WineTestBot::Log; - WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); + WineTestBot::Log::LogMsg("Child process for task ", $self->GetSlashKey(), + " died unexpectedly\n"); # A crash probably indicates a bug in the task script but getting stuck # could happen due to network issues. So requeue the task like its script

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
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 June 2022