December 2017 - Wine-Commits

Michael Stefaniuc : shell32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard Dec. 28, 2017

Dec. 28, 2017

Module: wine Branch: master Commit: fd0251996f941552d8613324a222388939aba464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd0251996f941552d8613324… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 28 00:50:32 2017 +0100 shell32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 387eecb..f667431 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -1898,7 +1898,7 @@ static const struct knownFolderDef known_folders[] = { { 0 } }; #undef KNOWN_FOLDER -BOOL known_folder_found[sizeof(known_folders)/sizeof(known_folders[0])-1]; +BOOL known_folder_found[ARRAY_SIZE(known_folders)-1]; static BOOL is_in_strarray(const WCHAR *needle, const char *hay) { @@ -1914,7 +1914,7 @@ static BOOL is_in_strarray(const WCHAR *needle, const char *hay) if(strcmp(hay, "(null)") == 0 && !needle) return TRUE; - ret = MultiByteToWideChar(CP_ACP, 0, hay, -1, wstr, sizeof(wstr)/sizeof(wstr[0])); + ret = MultiByteToWideChar(CP_ACP, 0, hay, -1, wstr, ARRAY_SIZE(wstr)); if(ret == 0) { ok(0, "Failed to convert string\n"); @@ -1967,7 +1967,7 @@ static void check_known_folder(IKnownFolderManager *mgr, KNOWNFOLDERID *folderId ok_(__FILE__, known_folder->line)(hr == S_OK, "cannot get known folder definition for %s\n", known_folder->sFolderId); if(SUCCEEDED(hr)) { - ret = MultiByteToWideChar(CP_ACP, 0, known_folder->sName, -1, sName, sizeof(sName)/sizeof(sName[0])); + ret = MultiByteToWideChar(CP_ACP, 0, known_folder->sName, -1, sName, ARRAY_SIZE(sName)); ok_(__FILE__, known_folder->line)(ret != 0, "cannot convert known folder name \"%s\" to wide characters\n", known_folder->sName); ok_(__FILE__, known_folder->line)(lstrcmpW(kfd.pszName, sName)==0, "invalid known folder name returned for %s: %s expected, but %s retrieved\n", known_folder->sFolderId, wine_dbgstr_w(sName), wine_dbgstr_w(kfd.pszName)); @@ -2063,10 +2063,10 @@ static void test_knownFolders(void) GetWindowsDirectoryW( sWinDir, MAX_PATH ); - GetTempPathW(sizeof(sExamplePath)/sizeof(sExamplePath[0]), sExamplePath); + GetTempPathW(ARRAY_SIZE(sExamplePath), sExamplePath); lstrcatW(sExamplePath, sExample); - GetTempPathW(sizeof(sExample2Path)/sizeof(sExample2Path[0]), sExample2Path); + GetTempPathW(ARRAY_SIZE(sExample2Path), sExample2Path); lstrcatW(sExample2Path, sExample2); lstrcpyW(sSubFolderPath, sExamplePath); @@ -2172,7 +2172,7 @@ static void test_knownFolders(void) ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); ok(folder == NULL, "got %p\n", folder); - for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) + for(i=0; i < ARRAY_SIZE(known_folder_found); ++i) known_folder_found[i] = FALSE; hr = IKnownFolderManager_GetFolderIds(mgr, &folders, &nCount); @@ -2180,7 +2180,7 @@ static void test_knownFolders(void) for(i=0;i<nCount;++i) check_known_folder(mgr, &folders[i]); - for(i=0; i<sizeof(known_folder_found)/sizeof(known_folder_found[0]); ++i) + for(i=0; i < ARRAY_SIZE(known_folder_found); ++i) if(!known_folder_found[i]) trace("Known folder %s not found on current platform\n", known_folders[i].sFolderId); @@ -2554,7 +2554,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[MAX_PATH - 1] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res2 = ExpandEnvironmentStringsA(names[i], expectedA, MAX_PATH); res = DoEnvironmentSubstA(bufferA, MAX_PATH); @@ -2585,7 +2585,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res2 = ExpandEnvironmentStringsA(bufferA, expectedA, MAX_PATH); res = DoEnvironmentSubstA(bufferA, len + 1); @@ -2606,7 +2606,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); /* ANSI version failed without an extra byte, as documented on msdn */ res = DoEnvironmentSubstA(bufferA, len); @@ -2629,7 +2629,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[len + 2] = 0; lstrcpyA(bufferA, names[i]); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res = DoEnvironmentSubstA(bufferA, len - 1); ok(!HIWORD(res) && (LOWORD(res) == (len - 1)), @@ -2650,7 +2650,7 @@ static void test_DoEnvironmentSubst(void) memset(bufferA, '#', MAX_PATH - 1); bufferA[MAX_PATH - 1] = 0; lstrcpyA(bufferA, does_not_existA); - MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, sizeof(bufferW)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufferA, MAX_PATH, bufferW, ARRAY_SIZE(bufferW)); res2 = lstrlenA(does_not_existA) + 1; res = DoEnvironmentSubstA(bufferA, MAX_PATH); @@ -2701,7 +2701,7 @@ if (0) ok(!ret, "got %d\n", ret); } - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); /* Using short name only first */ nameW[0] = 0;

1 0

Alexandre Julliard : kernel32/tests: Add missing todos for 64-bit.
by Alexandre Julliard Dec. 28, 2017

Dec. 28, 2017

Module: wine Branch: master Commit: decf34e0e81faf344e8b9e6af3fb5925dbc91289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=decf34e0e81faf344e8b9e6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 28 13:03:56 2017 +0100 kernel32/tests: Add missing todos for 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 06193fa..1ee6210 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -985,24 +985,28 @@ static void test_Loader(void) nt32.OptionalHeader.AddressOfEntryPoint = 0x1000; section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + todo_wine ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); nt32.OptionalHeader.SizeOfCode = 0; nt32.OptionalHeader.AddressOfEntryPoint = 0; section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE; status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + todo_wine ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); nt32.OptionalHeader.SizeOfCode = 0x1000; nt32.OptionalHeader.AddressOfEntryPoint = 0; section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + todo_wine ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); nt32.OptionalHeader.SizeOfCode = 0; nt32.OptionalHeader.AddressOfEntryPoint = 0; section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + todo_wine ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); }

1 0

Piotr Caban : msvcrt: Remove unused variables.
by Alexandre Julliard Dec. 28, 2017

Dec. 28, 2017

Module: wine Branch: master Commit: 45c4fc7c6ca13eec4ae965b1cbcf3b37e9f5e99a URL: https://source.winehq.org/git/wine.git/?a=commit;h=45c4fc7c6ca13eec4ae965b1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 28 11:11:20 2017 +0100 msvcrt: Remove unused variables. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 712b330..5a02418 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -32,17 +32,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); int MSVCRT___argc = 0; static int argc_expand; static int wargc_expand; -unsigned int MSVCRT_basemajor = 0;/* FIXME: */ -unsigned int MSVCRT_baseminor = 0;/* FIXME: */ -unsigned int MSVCRT_baseversion = 0; /* FIXME: */ unsigned int MSVCRT__commode = 0; unsigned int MSVCRT__fmode = 0; -unsigned int MSVCRT_osmajor = 0;/* FIXME: */ -unsigned int MSVCRT_osminor = 0;/* FIXME: */ -unsigned int MSVCRT_osmode = 0;/* FIXME: */ unsigned int MSVCRT__osver = 0; unsigned int MSVCRT__osplatform = 0; -unsigned int MSVCRT_osversion = 0; /* FIXME: */ unsigned int MSVCRT__winmajor = 0; unsigned int MSVCRT__winminor = 0; unsigned int MSVCRT__winver = 0; @@ -338,16 +331,8 @@ void msvcrt_init_args(void) MSVCRT__winminor = osvi.dwMinorVersion; MSVCRT__osver = osvi.dwBuildNumber; MSVCRT__osplatform = osvi.dwPlatformId; - MSVCRT_osversion = MSVCRT__winver; - MSVCRT_osmajor = MSVCRT__winmajor; - MSVCRT_osminor = MSVCRT__winminor; - MSVCRT_baseversion = MSVCRT__osver; - MSVCRT_baseminor = MSVCRT_baseversion & 0xFF; - MSVCRT_basemajor = (MSVCRT_baseversion >> 8) & 0xFF; - TRACE( "winver %08x winmajor %08x winminor %08x osver%08x baseversion %08x basemajor %08x baseminor %08x\n", - MSVCRT__winver, MSVCRT__winmajor, MSVCRT__winminor, MSVCRT__osver, MSVCRT_baseversion, - MSVCRT_basemajor, MSVCRT_baseminor); - TRACE( "osversion %08x osmajor %08x osminor %08x\n", MSVCRT_osversion, MSVCRT_osmajor, MSVCRT_osminor); + TRACE( "winver %08x winmajor %08x winminor %08x osver %08x\n", + MSVCRT__winver, MSVCRT__winmajor, MSVCRT__winminor, MSVCRT__osver); MSVCRT__HUGE = HUGE_VAL; MSVCRT___setlc_active = 0;

1 0

Alexandre Julliard : ntdll: NtQuerySection takes SIZE_T parameters.
by Alexandre Julliard Dec. 28, 2017

Dec. 28, 2017

Module: wine Branch: master Commit: d108ff79d5550051357ec4a8609a56a63a68b9d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d108ff79d5550051357ec4a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 28 13:04:20 2017 +0100 ntdll: NtQuerySection takes SIZE_T parameters. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 10 +++++----- dlls/kernel32/tests/virtual.c | 22 +++++++++++++++------- dlls/ntdll/virtual.c | 2 +- include/winternl.h | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 1ee6210..7267fad 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -52,7 +52,7 @@ static DWORD page_size; static NTSTATUS (WINAPI *pNtCreateSection)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const LARGE_INTEGER *, ULONG, ULONG, HANDLE ); -static NTSTATUS (WINAPI *pNtQuerySection)(HANDLE, SECTION_INFORMATION_CLASS, void *, ULONG, ULONG *); +static NTSTATUS (WINAPI *pNtQuerySection)(HANDLE, SECTION_INFORMATION_CLASS, void *, SIZE_T, SIZE_T *); static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static NTSTATUS (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -239,7 +239,7 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE { SECTION_BASIC_INFORMATION info; SECTION_IMAGE_INFORMATION image; - ULONG info_size = 0xdeadbeef; + SIZE_T info_size = (SIZE_T)0xdeadbeef << 16; NTSTATUS status; HANDLE file, mapping; ULONG file_size; @@ -265,7 +265,7 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE } status = pNtQuerySection( mapping, SectionImageInformation, &image, sizeof(image), &info_size ); ok( !status, "%u: NtQuerySection failed err %x\n", id, status ); - ok( info_size == sizeof(image), "%u: NtQuerySection wrong size %u\n", id, info_size ); + ok( info_size == sizeof(image), "%u: NtQuerySection wrong size %lu\n", id, info_size ); if (nt_header->OptionalHeader.Magic == (sizeof(void *) > sizeof(int) ? IMAGE_NT_OPTIONAL_HDR64_MAGIC : IMAGE_NT_OPTIONAL_HDR32_MAGIC)) { @@ -405,10 +405,10 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, int line ) if (!status) { SECTION_BASIC_INFORMATION info; - ULONG info_size = 0xdeadbeef; + SIZE_T info_size = 0xdeadbeef; NTSTATUS ret = pNtQuerySection( map, SectionBasicInformation, &info, sizeof(info), &info_size ); ok( !ret, "NtQuerySection failed err %x\n", ret ); - ok( info_size == sizeof(info), "NtQuerySection wrong size %u\n", info_size ); + ok( info_size == sizeof(info), "NtQuerySection wrong size %lu\n", info_size ); ok( info.Attributes == (SEC_IMAGE | SEC_FILE), "NtQuerySection wrong attr %x\n", info.Attributes ); ok( info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", info.BaseAddress ); ok( info.Size.QuadPart == file_size, "NtQuerySection wrong size %x%08x / %08x\n", diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index b1424c6..4a449fd 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -46,7 +46,7 @@ static NTSTATUS (WINAPI *pNtCreateSection)(HANDLE *, ACCESS_MASK, const OBJECT_A const LARGE_INTEGER *, ULONG, ULONG, HANDLE ); static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static DWORD (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); -static NTSTATUS (WINAPI *pNtQuerySection)(HANDLE, SECTION_INFORMATION_CLASS, void *, ULONG, ULONG *); +static NTSTATUS (WINAPI *pNtQuerySection)(HANDLE, SECTION_INFORMATION_CLASS, void *, SIZE_T, SIZE_T *); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); @@ -502,7 +502,7 @@ static void test_MapViewOfFile(void) BOOL ret; SIZE_T size; NTSTATUS status; - ULONG info_size; + SIZE_T info_size; LARGE_INTEGER map_size; SetLastError(0xdeadbeef); @@ -722,10 +722,11 @@ static void test_MapViewOfFile(void) CloseHandle( mapping ); mapping = OpenFileMappingA( FILE_MAP_READ | SECTION_QUERY, FALSE, name ); ok( mapping != 0, "OpenFileMapping FILE_MAP_READ error %u\n", GetLastError() ); + info_size = (SIZE_T)0xdeadbeef << 16; status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, sizeof(section_info), &info_size ); ok( !status, "NtQuerySection failed err %x\n", status ); - ok( info_size == sizeof(section_info), "NtQuerySection wrong size %u\n", info_size ); + ok( info_size == sizeof(section_info), "NtQuerySection wrong size %lu\n", info_size ); ok( section_info.Attributes == SEC_COMMIT, "NtQuerySection wrong attr %08x\n", section_info.Attributes ); ok( section_info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", section_info.BaseAddress ); @@ -764,7 +765,7 @@ static void test_MapViewOfFile(void) status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, sizeof(section_info), &info_size ); ok( !status, "NtQuerySection failed err %x\n", status ); - ok( info_size == sizeof(section_info), "NtQuerySection wrong size %u\n", info_size ); + ok( info_size == sizeof(section_info), "NtQuerySection wrong size %lu\n", info_size ); ok( section_info.Attributes == SEC_COMMIT, "NtQuerySection wrong attr %08x\n", section_info.Attributes ); ok( section_info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", section_info.BaseAddress ); @@ -1070,7 +1071,7 @@ static void test_MapViewOfFile(void) status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, sizeof(section_info), &info_size ); ok( !status, "NtQuerySection failed err %x\n", status ); - ok( info_size == sizeof(section_info), "NtQuerySection wrong size %u\n", info_size ); + ok( info_size == sizeof(section_info), "NtQuerySection wrong size %lu\n", info_size ); ok( section_info.Attributes == SEC_FILE, "NtQuerySection wrong attr %08x\n", section_info.Attributes ); ok( section_info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", section_info.BaseAddress ); @@ -1163,7 +1164,7 @@ static void test_MapViewOfFile(void) status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, sizeof(section_info), &info_size ); ok( !status, "NtQuerySection failed err %x\n", status ); - ok( info_size == sizeof(section_info), "NtQuerySection wrong size %u\n", info_size ); + ok( info_size == sizeof(section_info), "NtQuerySection wrong size %lu\n", info_size ); ok( section_info.Attributes == SEC_FILE, "NtQuerySection wrong attr %08x\n", section_info.Attributes ); ok( section_info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", section_info.BaseAddress ); @@ -1178,7 +1179,7 @@ static void test_MapViewOfFile(void) status = pNtQuerySection( mapping, SectionBasicInformation, &section_info, sizeof(section_info), &info_size ); ok( !status, "NtQuerySection failed err %x\n", status ); - ok( info_size == sizeof(section_info), "NtQuerySection wrong size %u\n", info_size ); + ok( info_size == sizeof(section_info), "NtQuerySection wrong size %lu\n", info_size ); ok( section_info.Attributes == SEC_FILE, "NtQuerySection wrong attr %08x\n", section_info.Attributes ); ok( section_info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", section_info.BaseAddress ); @@ -1236,6 +1237,13 @@ static void test_MapViewOfFile(void) ok( status == STATUS_SECTION_NOT_IMAGE, "NtQuerySection failed err %x\n", status ); status = pNtQuerySection( mapping, SectionImageInformation, &image_info, sizeof(image_info)+1, NULL ); ok( status == STATUS_SECTION_NOT_IMAGE, "NtQuerySection failed err %x\n", status ); + if (sizeof(SIZE_T) > sizeof(int)) + { + status = pNtQuerySection( mapping, SectionImageInformation, &image_info, + sizeof(image_info) + ((SIZE_T)0x10000000 << 8), NULL ); + todo_wine + ok( status == STATUS_ACCESS_VIOLATION, "NtQuerySection wrong err %x\n", status ); + } CloseHandle(mapping); SetFilePointer(file, 0, NULL, FILE_BEGIN); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 8c4fe3b..d077eb7 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -3161,7 +3161,7 @@ NTSTATUS WINAPI NtUnmapViewOfSection( HANDLE process, PVOID addr ) * ZwQuerySection (NTDLL.@) */ NTSTATUS WINAPI NtQuerySection( HANDLE handle, SECTION_INFORMATION_CLASS class, void *ptr, - ULONG size, ULONG *ret_size ) + SIZE_T size, SIZE_T *ret_size ) { NTSTATUS status; pe_image_info_t image_info; diff --git a/include/winternl.h b/include/winternl.h index 322d111..21353d8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2321,7 +2321,7 @@ NTSYSAPI NTSTATUS WINAPI NtQueryObject(HANDLE, OBJECT_INFORMATION_CLASS, PVOID, NTSYSAPI NTSTATUS WINAPI NtQueryOpenSubKeys(POBJECT_ATTRIBUTES,PULONG); NTSYSAPI NTSTATUS WINAPI NtQueryPerformanceCounter(PLARGE_INTEGER, PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtQuerySecurityObject(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,ULONG,PULONG); -NTSYSAPI NTSTATUS WINAPI NtQuerySection(HANDLE,SECTION_INFORMATION_CLASS,PVOID,ULONG,PULONG); +NTSYSAPI NTSTATUS WINAPI NtQuerySection(HANDLE,SECTION_INFORMATION_CLASS,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtQuerySemaphore(HANDLE,SEMAPHORE_INFORMATION_CLASS,PVOID,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySymbolicLinkObject(HANDLE,PUNICODE_STRING,PULONG); NTSYSAPI NTSTATUS WINAPI NtQuerySystemEnvironmentValue(PUNICODE_STRING,PWCHAR,ULONG,PULONG);

1 0

Nikolay Sivov : user32/tests: Add some tests for A/ W auto conversion in case of mismatching window vs dialog procedure types.
by Alexandre Julliard Dec. 28, 2017

Dec. 28, 2017

Module: wine Branch: master Commit: 41a76447dd51c758bf2395b7f8cf6790dd714499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41a76447dd51c758bf2395b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 28 15:23:05 2017 +0300 user32/tests: Add some tests for A/W auto conversion in case of mismatching window vs dialog procedure types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 198 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8bf76f1..f7aae80 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1236,8 +1236,195 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, return FALSE; } -static void test_DialogBoxParamA(void) +static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; +static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + if (msg == WM_SETTEXT) + { + if (IsWindowUnicode(hdlg)) + { + WCHAR *text = (WCHAR *)lparam; + todo_wine + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + } + else + { + char *textA = (char *)lparam; + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } + } + + return DefWindowProcW(hdlg, msg, wparam, lparam); +} + +static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_SETTEXT) + { + if (IsWindowUnicode(hdlg)) + { + WCHAR *text = (WCHAR *)lparam; + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + } + else + { + char *textA = (char *)lparam; + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } + } + + return DefWindowProcA(hdlg, msg, wparam, lparam); +} + +static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ULONG_PTR dlgproc, originalproc; + WCHAR buffW[64]; + char buff[64]; + BOOL ret; + INT len; + + switch (msg) + { + case WM_INITDIALOG: + ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + + originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(originalproc == (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", originalproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgproc, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = SetWindowLongPtrA(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA); + ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextW(hdlg, testtextW); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + todo_wine + ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %#x, %#x, len %d\n", + (BYTE)buff[0], (BYTE)buff[1], len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, 64); + todo_wine + ok(!lstrcmpW(buffW, testtextW) && len == 0, "Unexpected window text %s, len %d\n", wine_dbgstr_w(buffW), len); + + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW); + ok(IsWindowUnicode(hdlg), "Expected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextA(hdlg, "WndText"); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + ok(buff[0] == 0 && buff[1] == 'A' && len == 0, "Unexpected window text %#x, %#x, len %d\n", + (BYTE)buff[0], (BYTE)buff[1], len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(buffW[0] == 'W' && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", + buffW[0], buffW[1], len); + + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); + EndDialog(hdlg, -123); + return TRUE; + } + return FALSE; +} + +static INT_PTR CALLBACK test_aw_conversion_dlgproc2(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + ULONG_PTR dlgproc, originalproc; + WCHAR buffW[64]; + char buff[64]; + BOOL ret; + INT len; + + switch (msg) + { + case WM_INITDIALOG: + ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); + + originalproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(originalproc != (ULONG_PTR)test_aw_conversion_dlgproc2, "Unexpected dlg proc %#lx.\n", originalproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgproc2, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = SetWindowLongPtrA(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocW); + ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocW, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextA(hdlg, "WndText"); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, 64); + ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %s, len %d\n", + wine_dbgstr_w(buffW), len); + + dlgproc = SetWindowLongPtrW(hdlg, DWLP_DLGPROC, (UINT_PTR)test_aw_conversion_dlgprocA); + ok(!IsWindowUnicode(hdlg), "Unexpected unicode window.\n"); + + dlgproc = GetWindowLongPtrW(hdlg, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + dlgproc = GetWindowLongPtrA(hdlg, DWLP_DLGPROC); + ok(dlgproc != (ULONG_PTR)test_aw_conversion_dlgprocA, "Unexpected dlg proc %#lx.\n", dlgproc); + + ret = SetWindowTextW(hdlg, testtextW); + todo_wine + ok(ret, "Failed to set window text.\n"); + + memset(buff, 'A', sizeof(buff)); + len = GetWindowTextA(hdlg, buff, sizeof(buff)); + todo_wine + ok(!strcmp(buff, "WndText") && len == 0, "Unexpected window text %s, len %d\n", buff, len); + + memset(buffW, 0xff, sizeof(buffW)); + len = GetWindowTextW(hdlg, buffW, sizeof(buffW)/sizeof(buffW[0])); + todo_wine + ok(buffW[0] == 0 && buffW[1] == 0xffff && len == 0, "Unexpected window text %#x, %#x, len %d\n", + buffW[0], buffW[1], len); + + SetWindowLongPtrA(hdlg, DWLP_DLGPROC, originalproc); + EndDialog(hdlg, -123); + return TRUE; + } + return FALSE; +} + +static void test_DialogBoxParam(void) +{ + static const WCHAR nameW[] = {'T','E','S','T','_','E','M','P','T','Y','_','D','I','A','L','O','G',0}; INT_PTR ret; HWND hwnd_invalid = (HWND)0x4444; @@ -1290,6 +1477,13 @@ static void test_DialogBoxParamA(void) ok(ret == IDOK, "Expected IDOK\n"); DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); + + /* WM_SETTEXT handling in case of A/W dialog procedures vs A/W dialog window. */ + ret = DialogBoxParamW(GetModuleHandleA(NULL), nameW, 0, test_aw_conversion_dlgproc, 0); + ok(ret == -123, "Unexpected ret value %ld.\n", ret); + + ret = DialogBoxParamA(GetModuleHandleA(NULL), "TEST_EMPTY_DIALOG", 0, test_aw_conversion_dlgproc2, 0); + ok(ret == -123, "Unexpected ret value %ld.\n", ret); } static void test_DisabledDialogTest(void) @@ -1580,7 +1774,7 @@ START_TEST(dialog) test_focus(); test_GetDlgItem(); test_GetDlgItemText(); - test_DialogBoxParamA(); + test_DialogBoxParam(); test_DisabledDialogTest(); test_MessageBoxFontTest(); test_SaveRestoreFocus();

1 0

Nikolay Sivov : comctl32/tests: Test some return values (Coverity).
by Alexandre Julliard Dec. 28, 2017

Dec. 28, 2017

Module: wine Branch: master Commit: 60f5712b81667a878cffefa2d906458802189f86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f5712b81667a878cffefa2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 28 15:20:17 2017 +0300 comctl32/tests: Test some return values (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index e0251a9..d72e22a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -836,8 +836,11 @@ static const IStreamVtbl Test_Stream_Vtbl = static void init_memstream(struct memstream *stream) { + HRESULT hr; + stream->IStream_iface.lpVtbl = &Test_Stream_Vtbl; - CreateStreamOnHGlobal(NULL, TRUE, &stream->stream); + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream->stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); } static void cleanup_memstream(struct memstream *stream) @@ -995,7 +998,8 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN hr = GetHGlobalFromStream(stream.stream, &hglobal); ok(hr == S_OK, "%s: Failed to get hglobal, %#x\n", comment, hr); - IStream_Stat(stream.stream, &stat, STATFLAG_NONAME); + hr = IStream_Stat(stream.stream, &stat, STATFLAG_NONAME); + ok(hr == S_OK, "Stat() failed, hr %#x.\n", hr); data = GlobalLock(hglobal);

1 0

Alex Henrie : ddraw/tests: Recognise E_NOTIMPL returned from UpdateOverlay () on VMware as broken.
by Alexandre Julliard Dec. 27, 2017

Dec. 27, 2017

Module: wine Branch: master Commit: 2a0f704d9b165959223a9da91edf4df76860b893 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0f704d9b165959223a9da9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 27 17:30:15 2017 +0100 ddraw/tests: Recognise E_NOTIMPL returned from UpdateOverlay() on VMware as broken. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 12 +++++++++++- dlls/ddraw/tests/ddraw2.c | 12 +++++++++++- dlls/ddraw/tests/ddraw4.c | 12 +++++++++++- dlls/ddraw/tests/ddraw7.c | 12 +++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index db54abd..2c4410a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -123,6 +123,15 @@ static BOOL ddraw_is_intel(IDirectDraw *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -8666,7 +8675,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d2382d1..89d0d7e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -125,6 +125,15 @@ static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -9800,7 +9809,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index caa3ced..fa1178d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -131,6 +131,15 @@ static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw) +{ + DDDEVICEIDENTIFIER identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11262,7 +11271,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface4_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */ diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f1568bb..fdfac69 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -145,6 +145,15 @@ static BOOL ddraw_is_intel(IDirectDraw7 *ddraw) && identifier.dwVendorId == 0x8086; } +static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw) +{ + DDDEVICEIDENTIFIER2 identifier; + + return strcmp(winetest_platform, "wine") + && ddraw_get_identifier(ddraw, &identifier) + && identifier.dwVendorId == 0x15ad; +} + static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw, unsigned int width, unsigned int height, DWORD format) { @@ -11220,7 +11229,8 @@ static void test_offscreen_overlay(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n",hr); hr = IDirectDrawSurface7_UpdateOverlay(overlay, NULL, offscreen, NULL, DDOVER_SHOW, NULL); - ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()), + ok(SUCCEEDED(hr) || broken(hr == DDERR_OUTOFCAPS && dwm_enabled()) + || broken(hr == E_NOTIMPL && ddraw_is_vmware(ddraw)), "Failed to update overlay, hr %#x.\n", hr); /* Try to overlay the primary with a non-overlay surface. */

1 0

Alexandre Julliard : kernel32/tests: Add tests for the ImageContainsCode flag.
by Alexandre Julliard Dec. 27, 2017

Dec. 27, 2017

Module: wine Branch: master Commit: 69a332fd03049a1e5d2c30f62e951d39905668d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69a332fd03049a1e5d2c30f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 27 18:37:56 2017 +0100 kernel32/tests: Add tests for the ImageContainsCode flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 69 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index b320af7..3bb754a 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -325,10 +325,21 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE "%u: ImageFileSize wrong %08x / %08x\n", id, image.ImageFileSize, file_size ); ok( image.CheckSum == nt_header->OptionalHeader.CheckSum, "%u: CheckSum wrong %08x / %08x\n", id, image.CheckSum, nt_header->OptionalHeader.CheckSum ); + if (nt_header->OptionalHeader.SizeOfCode || nt_header->OptionalHeader.AddressOfEntryPoint) + todo_wine + ok( image.ImageContainsCode == TRUE, "%u: ImageContainsCode wrong %u\n", id, + image.ImageContainsCode ); + else if ((nt_header->OptionalHeader.SectionAlignment % page_size) || + (nt_header->FileHeader.NumberOfSections == 1 && + (section.Characteristics & IMAGE_SCN_MEM_EXECUTE))) + todo_wine + ok( image.ImageContainsCode == TRUE || broken(!image.ImageContainsCode), /* <= win8 */ + "%u: ImageContainsCode wrong %u\n", id, image.ImageContainsCode ); + else + ok( !image.ImageContainsCode, "%u: ImageContainsCode wrong %u\n", id, image.ImageContainsCode ); /* FIXME: needs more work: */ /* image.GpValue */ /* image.ImageFlags */ - /* image.ImageContainsCode */ map_size.QuadPart = (nt_header->OptionalHeader.SizeOfImage + page_size - 1) & ~(page_size - 1); status = pNtQuerySection( mapping, SectionBasicInformation, &info, sizeof(info), NULL ); @@ -873,6 +884,38 @@ static void test_Loader(void) todo_wine ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); + + nt64.OptionalHeader.SizeOfCode = 0; + nt64.OptionalHeader.AddressOfEntryPoint = 0x1000; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, __LINE__ ); + todo_wine + ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), + "NtCreateSection error %08x\n", status ); + + nt64.OptionalHeader.SizeOfCode = 0; + nt64.OptionalHeader.AddressOfEntryPoint = 0; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, __LINE__ ); + todo_wine + ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), + "NtCreateSection error %08x\n", status ); + + nt64.OptionalHeader.SizeOfCode = 0x1000; + nt64.OptionalHeader.AddressOfEntryPoint = 0; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, __LINE__ ); + todo_wine + ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), + "NtCreateSection error %08x\n", status ); + + nt64.OptionalHeader.SizeOfCode = 0; + nt64.OptionalHeader.AddressOfEntryPoint = 0; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, __LINE__ ); + todo_wine + ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), + "NtCreateSection error %08x\n", status ); } else { @@ -917,6 +960,30 @@ static void test_Loader(void) status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); todo_wine ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + nt32.OptionalHeader.SizeOfCode = 0; + nt32.OptionalHeader.AddressOfEntryPoint = 0x1000; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + nt32.OptionalHeader.SizeOfCode = 0; + nt32.OptionalHeader.AddressOfEntryPoint = 0; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + nt32.OptionalHeader.SizeOfCode = 0x1000; + nt32.OptionalHeader.AddressOfEntryPoint = 0; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); + + nt32.OptionalHeader.SizeOfCode = 0; + nt32.OptionalHeader.AddressOfEntryPoint = 0; + section.Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_CNT_CODE; + status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, __LINE__ ); + ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); } nt_header.FileHeader.Machine = orig_machine; /* restore it for the next tests */

1 0

Henri Verbeet : ddraw/tests: Introduce an ARRAY_SIZE macro to ddraw7 as well.
by Alexandre Julliard Dec. 27, 2017

Dec. 27, 2017

Module: wine Branch: master Commit: 053272d66554dafe54ad0b3f76c1920c4590f46e URL: https://source.winehq.org/git/wine.git/?a=commit;h=053272d66554dafe54ad0b3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 27 17:30:13 2017 +0100 ddraw/tests: Introduce an ARRAY_SIZE macro to ddraw7 as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 167 +++++++++++++++++++++++----------------------- 1 file changed, 82 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=053272d66554dafe54ad…

1 0

Nikolay Sivov : comctl32/tests: Enable tests for version 6 imagelist serialization format.
by Alexandre Julliard Dec. 27, 2017

Dec. 27, 2017

Module: wine Branch: master Commit: 8f2fd923283b6eb072388251c34417e0a3256ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f2fd923283b6eb072388251… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 27 13:51:38 2017 +0300 comctl32/tests: Enable tests for version 6 imagelist serialization format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 259 +++++++++++++++++++++++----------------- 1 file changed, 148 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f2fd923283b6eb07238…

1 0