wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Sebastian Lackner : ntdll: Implement FileRenameInformation support.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 857d436784dcc677bbbda905437c93cf61f1ddb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857d436784dcc677bbbda9054… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 20 10:25:15 2015 +0200 ntdll: Implement FileRenameInformation support. --- dlls/ntdll/file.c | 44 ++++++++++++++++- dlls/ntdll/tests/file.c | 76 +++++++++++++++-------------- include/wine/server_protocol.h | 30 +++++++++--- server/fd.c | 105 ++++++++++++++++++++++++++++++++++++++++- server/protocol.def | 12 ++++- server/request.h | 15 ++++-- server/trace.c | 16 +++++-- 7 files changed, 244 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=857d436784dcc677bbbda…

1 0

Sebastian Lackner : ntdll/tests: Add additional tests for FileRenameInformation.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 6899eade5dc34beda51752cbf6e434f4e5364ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6899eade5dc34beda51752cbf… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 20 10:24:41 2015 +0200 ntdll/tests: Add additional tests for FileRenameInformation. --- dlls/ntdll/tests/file.c | 547 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 540 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6899eade5dc34beda5175…

1 0

Jianqiu Zhang : ntdll/tests: Add basic tests for FileRenameInformation.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: a5b58144a555ed67219c9ba0c8f65f3fd6607977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b58144a555ed67219c9ba0c… Author: Jianqiu Zhang <zhangjianqiu_133(a)yeah.net> Date: Thu Aug 20 10:24:32 2015 +0200 ntdll/tests: Add basic tests for FileRenameInformation. --- dlls/ntdll/tests/file.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d215d09..f143834 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1435,6 +1435,111 @@ static void test_file_all_information(void) CloseHandle( h ); } +static void test_file_rename_information(void) +{ + static const WCHAR fooW[] = {'f','o','o',0}; + WCHAR tmp_path[MAX_PATH], oldpath[MAX_PATH], newpath[MAX_PATH]; + FILE_RENAME_INFORMATION *fri; + UNICODE_STRING name_str; + IO_STATUS_BLOCK io; + BOOL fileDeleted; + HANDLE handle; + NTSTATUS res; + + GetTempPathW( MAX_PATH, tmp_path ); + + /* oldpath is a file, newpath doesn't exist */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + DeleteFileW( newpath ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Replace = FALSE; + fri->RootDir = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( fileDeleted, "file should not exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + DeleteFileW( oldpath ); + DeleteFileW( newpath ); + + /* oldpath is a file, newpath is a file, Replace = FALSE */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Replace = FALSE; + fri->RootDir = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); + todo_wine ok( U(io).Status == 0xdeadbeef, "io.Status expected 0xdeadbeef, got %x\n", U(io).Status ); + todo_wine ok( res == STATUS_OBJECT_NAME_COLLISION, "res expected STATUS_OBJECT_NAME_COLLISION, got %x\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + DeleteFileW( oldpath ); + DeleteFileW( newpath ); + + /* oldpath is a file, newpath is a file, Replace = TRUE */ + res = GetTempFileNameW( tmp_path, fooW, 0, oldpath ); + ok( res != 0, "failed to create temp file\n" ); + handle = CreateFileW( oldpath, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( handle != INVALID_HANDLE_VALUE, "CreateFileW failed\n" ); + + res = GetTempFileNameW( tmp_path, fooW, 0, newpath ); + ok( res != 0, "failed to create temp file\n" ); + pRtlDosPathNameToNtPathName_U( newpath, &name_str, NULL, NULL ); + fri = HeapAlloc( GetProcessHeap(), 0, sizeof(FILE_RENAME_INFORMATION) + name_str.Length ); + fri->Replace = TRUE; + fri->RootDir = NULL; + fri->FileNameLength = name_str.Length; + memcpy( fri->FileName, name_str.Buffer, name_str.Length ); + pRtlFreeUnicodeString( &name_str ); + + U(io).Status = 0xdeadbeef; + res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformation ); + todo_wine ok( U(io).Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %x\n", U(io).Status ); + todo_wine ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %x\n", res ); + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + todo_wine ok( fileDeleted, "file should not exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + + CloseHandle( handle ); + HeapFree( GetProcessHeap(), 0, fri ); + DeleteFileW( oldpath ); + DeleteFileW( newpath ); +} + static void test_file_both_information(void) { IO_STATUS_BLOCK io; @@ -2858,6 +2963,7 @@ START_TEST(file) test_file_name_information(); test_file_full_size_information(); test_file_all_name_information(); + test_file_rename_information(); test_file_disposition_information(); test_query_volume_information_file(); test_query_attribute_information_file();

1 0

Dmitry Timoshkov : advapi32/tests: Add a test to show that THREAD_QUERY_INFORMATION should grant THREAD_QUERY_LIMITED_INFORMATION.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 48ed6a6f3ec8871b1ec8fed6f5ea16f9c17edb40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ed6a6f3ec8871b1ec8fed6f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 20 16:13:27 2015 +0800 advapi32/tests: Add a test to show that THREAD_QUERY_INFORMATION should grant THREAD_QUERY_LIMITED_INFORMATION. --- dlls/advapi32/tests/security.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 70aa949..5d52fab 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5495,6 +5495,16 @@ todo_wine CloseHandle(dup); } + SetLastError( 0xdeadbeef ); + ret = DuplicateHandle(GetCurrentProcess(), thread, GetCurrentProcess(), &dup, + THREAD_QUERY_INFORMATION, FALSE, 0); + ok(ret, "DuplicateHandle error %d\n", GetLastError()); + access = get_obj_access(dup); + ok(access == (THREAD_QUERY_INFORMATION | THREAD_QUERY_LIMITED_INFORMATION) /* Vista+ */ || + access == THREAD_QUERY_INFORMATION /* before Vista */, + "expected THREAD_QUERY_INFORMATION|THREAD_QUERY_LIMITED_INFORMATION, got %#x\n", access); + CloseHandle(dup); + TerminateThread(thread, 0); CloseHandle(thread); }

1 0

Sebastian Lackner : include: Add definition for FILE_LINK_INFORMATION struct.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: d5f8dd3aac184fe5d32f8f8d18929192cb496bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f8dd3aac184fe5d32f8f8d1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 20 09:22:07 2015 +0200 include: Add definition for FILE_LINK_INFORMATION struct. --- include/winternl.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/winternl.h b/include/winternl.h index 7ab1bd8..2b10f8d 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -567,6 +567,13 @@ typedef struct _FILE_RENAME_INFORMATION { WCHAR FileName[1]; } FILE_RENAME_INFORMATION, *PFILE_RENAME_INFORMATION; +typedef struct _FILE_LINK_INFORMATION { + BOOLEAN ReplaceIfExists; + HANDLE RootDirectory; + ULONG FileNameLength; + WCHAR FileName[1]; +} FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION; + typedef struct _FILE_NAMES_INFORMATION { ULONG NextEntryOffset; ULONG FileIndex;

1 0

Dmitry Timoshkov : kernel32/tests: Add some tests for THREAD_QUERY_LIMITED_INFORMATION.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 8738cea7de118819c96c05345a713f3b8e72a4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8738cea7de118819c96c05345… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 20 14:55:21 2015 +0800 kernel32/tests: Add some tests for THREAD_QUERY_LIMITED_INFORMATION. --- dlls/kernel32/tests/thread.c | 102 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 95 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index bb6faa0..4cf8577 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -28,11 +28,14 @@ /* the tests intentionally pass invalid pointers and need an exception handler */ #define WINE_NO_INLINE_STRING +#include <ntstatus.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winnt.h> #include <winerror.h> #include <winnls.h> +#include <winternl.h> #include "wine/test.h" /* THREAD_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ @@ -95,6 +98,7 @@ static PTP_WORK (WINAPI *pCreateThreadpoolWork)(PTP_WORK_CALLBACK,PVOID,PTP_CALL static void (WINAPI *pSubmitThreadpoolWork)(PTP_WORK); static void (WINAPI *pWaitForThreadpoolWorkCallbacks)(PTP_WORK,BOOL); static void (WINAPI *pCloseThreadpoolWork)(PTP_WORK); +static NTSTATUS (WINAPI *pNtQueryInformationThread)(HANDLE,THREADINFOCLASS,PVOID,ULONG,PULONG); static HANDLE create_target_process(const char *arg) { @@ -1686,9 +1690,91 @@ static void test_reserved_tls(void) } } +static void test_thread_info(void) +{ + char buf[4096]; + static const ULONG info_size[] = + { + sizeof(THREAD_BASIC_INFORMATION), /* ThreadBasicInformation */ + sizeof(KERNEL_USER_TIMES), /* ThreadTimes */ + sizeof(ULONG), /* ThreadPriority */ + sizeof(ULONG), /* ThreadBasePriority */ + sizeof(ULONG_PTR), /* ThreadAffinityMask */ + sizeof(HANDLE), /* ThreadImpersonationToken */ + sizeof(THREAD_DESCRIPTOR_INFORMATION), /* ThreadDescriptorTableEntry */ + sizeof(BOOLEAN), /* ThreadEnableAlignmentFaultFixup */ + 0, /* ThreadEventPair_Reusable */ + sizeof(ULONG_PTR), /* ThreadQuerySetWin32StartAddress */ + sizeof(ULONG), /* ThreadZeroTlsCell */ + sizeof(LARGE_INTEGER), /* ThreadPerformanceCount */ + sizeof(ULONG), /* ThreadAmILastThread */ + sizeof(ULONG), /* ThreadIdealProcessor */ + sizeof(ULONG), /* ThreadPriorityBoost */ + sizeof(ULONG_PTR), /* ThreadSetTlsArrayAddress */ + sizeof(ULONG), /* ThreadIsIoPending */ + sizeof(BOOLEAN), /* ThreadHideFromDebugger */ + /* FIXME: Add remaining classes */ + }; + HANDLE thread; + ULONG i, status, ret_len, size; + + if (!pOpenThread) + { + win_skip("OpenThread is not available on this platform\n"); + return; + } + + if (!pNtQueryInformationThread) + { + win_skip("NtQueryInformationThread is not available on this platform\n"); + return; + } + + thread = pOpenThread(THREAD_QUERY_LIMITED_INFORMATION, FALSE, GetCurrentThreadId()); + if (!thread) + { + win_skip("THREAD_QUERY_LIMITED_INFORMATION is not supported on this platform\n"); + return; + } + + for (i = 0; i < sizeof(info_size)/sizeof(info_size[0]); i++) + { + size = info_size[i]; + if (!size) size = sizeof(buf); + ret_len = 0; + status = pNtQueryInformationThread(thread, i, buf, info_size[i], &ret_len); + if (status == STATUS_NOT_IMPLEMENTED) continue; + if (status == STATUS_INVALID_INFO_CLASS) continue; + if (status == STATUS_UNSUCCESSFUL) continue; + + switch (i) + { + case ThreadBasicInformation: + case ThreadTimes: + case ThreadAmILastThread: + case ThreadPriorityBoost: +todo_wine + ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + case ThreadDescriptorTableEntry: +todo_wine + ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + default: + ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); + break; + } + } + + CloseHandle(thread); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE ntdll = GetModuleHandleA("ntdll.dll"); /* Neither Cygwin nor mingW export OpenThread, so do a dynamic check so that the compile passes */ @@ -1717,23 +1803,24 @@ static void init_funcs(void) X(WaitForThreadpoolWorkCallbacks); X(CloseThreadpoolWork); #undef X + +#define X(f) p##f = (void*)GetProcAddress(ntdll, #f) + if (ntdll) + { + X(NtQueryInformationThread); + X(RtlGetThreadErrorMode); + } +#undef X } START_TEST(thread) { - HINSTANCE ntdll; int argc; char **argv; argc = winetest_get_mainargs( &argv ); init_funcs(); - ntdll=GetModuleHandleA("ntdll.dll"); - if (ntdll) - { - pRtlGetThreadErrorMode=(void *)GetProcAddress(ntdll,"RtlGetThreadErrorMode"); - } - if (argc >= 3) { if (!strcmp(argv[2], "sleep")) @@ -1760,6 +1847,7 @@ START_TEST(thread) return; } + test_thread_info(); test_reserved_tls(); test_CreateRemoteThread(); test_CreateThread_basic();

1 0

Dmitry Timoshkov : kernel32/tests: Add some tests for PROCESS_QUERY_LIMITED_INFORMATION.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 49f43c39fd3ce050f85d9d6d8ed664acdc2c71d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49f43c39fd3ce050f85d9d6d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 20 11:06:38 2015 +0800 kernel32/tests: Add some tests for PROCESS_QUERY_LIMITED_INFORMATION. --- dlls/kernel32/tests/process.c | 187 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49f43c39fd3ce050f85d9…

1 0

Dmitry Timoshkov : kernel32/tests: Fix compilation with PSDK.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 27664e3c59baef6df4c15e37ea90b016981fc487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27664e3c59baef6df4c15e37e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 20 11:06:32 2015 +0800 kernel32/tests: Fix compilation with PSDK. --- dlls/kernel32/tests/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 113ec35..8cf88d5 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2176,7 +2176,7 @@ static void _create_process(int line, const char *command, LPPROCESS_INFORMATION char buffer[MAX_PATH]; STARTUPINFOA si = {0}; - snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, command); + sprintf(buffer, "\"%s\" tests/process.c %s", selfname, command); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, pi); ok_(__FILE__, line)(ret, "CreateProcess error %u\n", GetLastError()); @@ -2302,7 +2302,7 @@ static void test_TerminateJobObject(void) static void test_QueryInformationJobObject(void) { - char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])]; + char buf[sizeof(JOBOBJECT_BASIC_PROCESS_ID_LIST) + sizeof(ULONG_PTR) * 4]; PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf; JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info; JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation; @@ -2599,7 +2599,7 @@ static void test_jobInheritance(HANDLE job) return; } - snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); + sprintf(buffer, "\"%s\" tests/process.c %s", selfname, "exit"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcessA error %u\n", GetLastError()); @@ -2631,7 +2631,7 @@ static void test_BreakawayOk(HANDLE job) return; } - snprintf(buffer, MAX_PATH, "\"%s\" tests/process.c %s", selfname, "exit"); + sprintf(buffer, "\"%s\" tests/process.c %s", selfname, "exit"); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n");

1 0

Dmitry Timoshkov : ntdll: Do not fail to relocate an image if the size of relocation block is 0.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: wine Branch: master Commit: 7386de357f61094d6a32dbd3c0ab8bbed3436f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7386de357f61094d6a32dbd3c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 20 13:08:07 2015 +0800 ntdll: Do not fail to relocate an image if the size of relocation block is 0. --- dlls/ntdll/loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4404938..8a43310 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1680,14 +1680,16 @@ static NTSTATUS perform_relocations( void *module, SIZE_T len ) relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; - if ((nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) || - !relocs->VirtualAddress || !relocs->Size) + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) { WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", base, module ); return STATUS_CONFLICTING_ADDRESSES; } + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + if (nt->FileHeader.NumberOfSections > sizeof(protect_old)/sizeof(protect_old[0])) return STATUS_INVALID_IMAGE_FORMAT;

1 0

André Hentschel : winetest: Put Win10 results in their own group.
by Alexandre Julliard 20 Aug '15

20 Aug '15

Module: tools Branch: master Commit: b052b83e3b1a690d93a442ce67f0b62db96992be URL: http://source.winehq.org/git/tools.git/?a=commit;h=b052b83e3b1a690d93a442ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 19 21:53:45 2015 +0200 winetest: Put Win10 results in their own group. --- winetest/build-index | 3 ++- winetest/dissect | 6 ++++++ winetest/gather | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index 900b144..cacd05f 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -44,6 +44,7 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win10 = (name => "Win10"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -52,7 +53,7 @@ my %solaris = (name => "Solaris"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); diff --git a/winetest/dissect b/winetest/dissect index cd24fc3..7a40234 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -206,6 +206,12 @@ if ($plid==1 && $major==4) { } elsif ($minor == 2 || $minor == 3) { $version = "win8"; } + } elsif ($major==10) { + if ($minor == 0) { + if ($product==1) { + $version = "win10"; + } + } } } elsif ($plid==3) { #$version = "ce$major$minor"; diff --git a/winetest/gather b/winetest/gather index 5b56b61..74c6734 100755 --- a/winetest/gather +++ b/winetest/gather @@ -101,6 +101,7 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win10 = (name => "Win10"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -110,12 +111,12 @@ my %wine = (name => "Wine"); # Map dissect's IDs to the above hashes my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k, - xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, win8=>\%win8, + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, win8=>\%win8, win10=>\%win10, unknown=>\%unknown, wine=>\%wine, linux=>\%linux, mac=>\%mac, bsd=>\%bsd, solaris=>\%solaris); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%win8, \%win10, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated";

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
51
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 August 2015