wine-commits December 2017

wine-commits@winehq.org

2 participants
450 discussions

Alexandre Julliard : kernel32/tests: Add tests for the ImageContainsCode flag.
by Alexandre Julliard 27 Dec '17

27 Dec '17

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

Alexandre Julliard : kernel32/tests: Build the dll path in the create_test_dll helper function.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: c1487e49383242d81497d88ee2d942d3c39b3436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1487e49383242d81497d88e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 27 18:36:34 2017 +0100 kernel32/tests: Build the dll path in the create_test_dll helper function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 0dd37cc..b320af7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -164,13 +164,18 @@ static const char filler[0x1000]; static const char section_data[0x10] = "section data"; static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, - const IMAGE_NT_HEADERS *nt_header, const char *dll_name ) + const IMAGE_NT_HEADERS *nt_header, char dll_name[MAX_PATH] ) { + char temp_path[MAX_PATH]; DWORD dummy, size, file_align; HANDLE hfile; BOOL ret; + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "ldr", 0, dll_name); + hfile = CreateFileA(dll_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); + ok( hfile != INVALID_HANDLE_VALUE, "failed to create %s err %u\n", dll_name, GetLastError() ); if (hfile == INVALID_HANDLE_VALUE) return 0; SetLastError(0xdeadbeef); @@ -369,18 +374,13 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE /* helper to test image section mapping */ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, int line ) { - char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; LARGE_INTEGER size; HANDLE file, map; NTSTATUS status; ULONG file_size; - GetTempPathA(MAX_PATH, temp_path); - GetTempFileNameA(temp_path, "ldr", 0, dll_name); - file_size = create_test_dll( &dos_header, sizeof(dos_header), nt_header, dll_name ); - ok( file_size, "could not create %s\n", dll_name); file = CreateFileA(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); @@ -549,7 +549,6 @@ static void test_Loader(void) DWORD file_size; HANDLE h; HMODULE hlib, hlib_as_data_file; - char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; SIZE_T size; BOOL ret; @@ -560,12 +559,8 @@ static void test_Loader(void) /* prevent displaying of the "Unable to load this DLL" message box */ SetErrorMode(SEM_FAILCRITICALERRORS); - GetTempPathA(MAX_PATH, temp_path); - for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { - GetTempFileNameA(temp_path, "ldr", 0, dll_name); - nt_header = nt_header_template; nt_header.FileHeader.NumberOfSections = td[i].number_of_sections; nt_header.FileHeader.SizeOfOptionalHeader = td[i].size_of_optional_header; @@ -576,11 +571,6 @@ static void test_Loader(void) nt_header.OptionalHeader.SizeOfHeaders = td[i].size_of_headers; file_size = create_test_dll( &dos_header, td[i].size_of_dos_header, &nt_header, dll_name ); - if (!file_size) - { - ok(0, "could not create %s\n", dll_name); - break; - } SetLastError(0xdeadbeef); hlib = LoadLibraryA(dll_name);

1 0

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

27 Dec '17

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

Nikolay Sivov : usp10/tests: Add missing return value tests (Coverity).
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: ee04cb5475e4d1e3b1b4588c9b92e126aafb5e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee04cb5475e4d1e3b1b4588c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 23 13:22:28 2017 +0300 usp10/tests: Add missing return value tests (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 55bec7f..35cdec5 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3150,6 +3150,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP() failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==1,"%i should return 0(%i) and 1(%i)\n",iX,piCP,piTrailing); } for (iX = 9; iX < 16; iX++) @@ -3157,6 +3158,7 @@ static void test_ScriptXtoX(void) WORD clust = 0; INT advance = 16; hr = ScriptXtoCP(iX, 1, 1, &clust, psva, &advance, &sa, &piCP, &piTrailing); + ok(hr == S_OK, "ScriptXtoCP() failed, hr %#x.\n", hr); ok(piCP==0 && piTrailing==0,"%i should return 0(%i) and 0(%i)\n",iX,piCP,piTrailing); }

1 0

Gijs Vermeulen : msvcrt: Add _get_[winmajor|winminor|osver].
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: wine Branch: master Commit: 43034dee45b7e62c86665c53a14c7a0559722fd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43034dee45b7e62c86665c53… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Dec 27 00:52:27 2017 +0100 msvcrt: Add _get_[winmajor|winminor|osver]. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcrt/data.c | 30 ++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index dd80131..5aa93e5 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -548,7 +548,7 @@ @ cdecl _get_invalid_parameter_handler() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -@ stub _get_osver +@ cdecl _get_osver(ptr) MSVCRT__get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -558,8 +558,8 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_winmajor -@ stub _get_winminor +@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor +@ cdecl _get_winminor(ptr) MSVCRT__get_winminor @ stub _get_winver @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 5de80f4..712b330 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -746,3 +746,33 @@ MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) return wide_command_line = s; } + +/********************************************************************* + * _get_winmajor (MSVCRT.@) + */ +int CDECL MSVCRT__get_winmajor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winmajor; + return 0; +} + +/********************************************************************* + * _get_winminor (MSVCRT.@) + */ +int CDECL MSVCRT__get_winminor(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__winminor; + return 0; +} + +/********************************************************************* + * _get_osver (MSVCRT.@) + */ +int CDECL MSVCRT__get_osver(int* value) +{ + if (!MSVCRT_CHECK_PMT(value != NULL)) return MSVCRT_EINVAL; + *value = MSVCRT__osver; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2f20699..15d9ffc 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -508,13 +508,13 @@ @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform -# stub _get_osver(ptr) +@ cdecl _get_osver(ptr) MSVCRT__get_osver @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() # stub _get_wenviron(ptr) -# stub _get_winmajor(ptr) -# stub _get_winminor(ptr) +@ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor +@ cdecl _get_winminor(ptr) MSVCRT__get_winminor # stub _get_winver(ptr) @ cdecl _get_wpgmptr(ptr) @ cdecl _get_terminate() MSVCRT__get_terminate

1 0

Francois Gouget : testbot: Add a history record when a child process died.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: tools Branch: master Commit: d52d59c56bb595cc3fa5287d4828c1b07255672d URL: https://source.winehq.org/git/tools.git/?a=commit;h=d52d59c56bb595cc3fa5287… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 27 12:14:49 2017 +0100 testbot: Add a history record when a child process died. The Job scheduler may notice that a VM's child process died. In such a case add a history record so the VM's previous status record can be anotated appropriately. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + 2 files changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index a2427cc..4ed6e03 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -519,6 +519,7 @@ sub ScheduleOnHost($$$$) { if (!$VM->HasRunningChild()) { + $VM->RecordResult($Records, "boterror process died"); my $ErrMessage = $VM->RunMonitor(); return $ErrMessage if (defined $ErrMessage); } diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 11f087f..1f91d26 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -179,6 +179,7 @@ sub UpdateStatus($$) $VM->Status('dirty'); $VM->ChildPid(undef); $VM->Save(); + $VM->RecordResult(undef, "boterror process died"); } # else it looks like this is not our VM anymore

1 0

Francois Gouget : testbot: Add a history record when a task is canceled.
by Alexandre Julliard 27 Dec '17

27 Dec '17

Module: tools Branch: master Commit: f21d2d15572579292fd924c4c1c162bd56ee87d0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f21d2d15572579292fd924c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 27 12:14:21 2017 +0100 testbot: Add a history record when a task is canceled. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 73fc34e..a2427cc 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -258,6 +258,7 @@ sub Cancel($) $VM->KillChild(); ($EProperty, $EMessage) = $VM->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); + $VM->RecordResult(undef, "canceled"); } } }

1 0

Nikolay Sivov : scrrun/tests: Add a helper to construct test file path.
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: 80a74873ada242570d23d1361a0a191e5c4b4b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a74873ada242570d23d136… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 26 21:28:12 2017 +0300 scrrun/tests: Add a helper to construct test file path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 2e3406d..d0c448c 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -46,6 +46,7 @@ static inline ULONG get_refcount(IUnknown *iface) static const WCHAR crlfW[] = {'\r','\n',0}; static const char utf16bom[] = {0xff,0xfe,0}; +static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -239,7 +240,6 @@ static void test_createfolder(void) static void test_textstream(void) { - static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; ITextStream *stream; VARIANT_BOOL b; DWORD written; @@ -1451,10 +1451,18 @@ static void test_DriveCollection(void) IDriveCollection_Release(drives); } -static void test_CreateTextFile(void) +static void get_temp_filepath(const WCHAR *filename, WCHAR *path, WCHAR *dir) { static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; + + GetTempPathW(MAX_PATH, path); + lstrcatW(path, scrrunW); + lstrcpyW(dir, path); + lstrcatW(path, filename); +} + +static void test_CreateTextFile(void) +{ WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[10]; ITextStream *stream; BSTR nameW, str; @@ -1462,10 +1470,7 @@ static void test_CreateTextFile(void) HRESULT hr; BOOL ret; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); /* dir doesn't exist */ nameW = SysAllocString(pathW); @@ -1533,8 +1538,6 @@ static void test_CreateTextFile(void) static void test_WriteLine(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH]; WCHAR buffW[MAX_PATH], buff2W[MAX_PATH]; char buffA[MAX_PATH]; @@ -1545,10 +1548,7 @@ static void test_WriteLine(void) HRESULT hr; BOOL ret; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -1607,8 +1607,6 @@ static void test_WriteLine(void) static void test_ReadAll(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR aW[] = {'A',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; @@ -1618,10 +1616,7 @@ static void test_ReadAll(void) BOOL ret; BSTR str; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError()); @@ -1741,8 +1736,6 @@ todo_wine static void test_Read(void) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; static const WCHAR aW[] = {'A',0}; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; @@ -1752,10 +1745,7 @@ static void test_Read(void) BOOL ret; BSTR str; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); - lstrcatW(pathW, scrrunW); - lstrcpyW(dirW, pathW); - lstrcatW(pathW, testfileW); + get_temp_filepath(testfileW, pathW, dirW); ret = CreateDirectoryW(dirW, NULL); ok(ret, "got %d, %d\n", ret, GetLastError());

1 0

Alex Henrie : msvcrt: Don' t include MSVC 10.0+ math functions in SOs for older DLLs.
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: 86597db8349189fdd0c2165e126d37eec8a996b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86597db8349189fdd0c2165e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Dec 22 10:38:56 2017 -0700 msvcrt: Don't include MSVC 10.0+ math functions in SOs for older DLLs. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 7fb4666..89400f8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -130,7 +130,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef _WIN64 +#if defined(_WIN64) && _MSVCR_VER>=120 /********************************************************************* * _set_FMA3_enable (MSVCR120.@) */ @@ -813,13 +813,15 @@ MSVCRT_long CDECL MSVCRT_labs( MSVCRT_long n ) return n >= 0 ? n : -n; } +#if _MSVCR_VER>=100 /********************************************************************* - * llabs (MSVCRT.@) + * llabs (MSVCR100.@) */ MSVCRT_longlong CDECL MSVCRT_llabs( MSVCRT_longlong n ) { return n >= 0 ? n : -n; } +#endif /********************************************************************* * _abs64 (MSVCRT.@) @@ -1227,6 +1229,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask return 0; } +#if _MSVCR_VER>=120 /********************************************************************* * fegetenv (MSVCR120.@) */ @@ -1237,7 +1240,9 @@ int CDECL MSVCRT_fegetenv(MSVCRT_fenv_t *env) env->status = _statusfp(); return 0; } +#endif +#if _MSVCR_VER>=140 /********************************************************************* * __fpe_flt_rounds (UCRTBASE.@) */ @@ -1259,6 +1264,9 @@ int CDECL __fpe_flt_rounds(void) #endif } } +#endif + +#if _MSVCR_VER>=120 /********************************************************************* * fegetround (MSVCR120.@) @@ -1279,6 +1287,8 @@ int CDECL MSVCRT_fesetround(int round_mode) return 0; } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * _copysign (MSVCRT.@) */ @@ -1315,6 +1325,7 @@ void CDECL _fpreset(void) #endif } +#if _MSVCR_VER>=120 /********************************************************************* * fesetenv (MSVCR120.@) */ @@ -1382,6 +1393,7 @@ int CDECL MSVCRT_fesetenv(const MSVCRT_fenv_t *env) #endif return 1; } +#endif /********************************************************************* * _isnan (MSVCRT.@) @@ -1469,8 +1481,10 @@ double CDECL MSVCRT__yn(int order, double num) return retval; } +#if _MSVCR_VER>=120 + /********************************************************************* - * _nearbyint (MSVCRT.@) + * _nearbyint (MSVCR120.@) */ double CDECL MSVCRT_nearbyint(double num) { @@ -1482,7 +1496,7 @@ double CDECL MSVCRT_nearbyint(double num) } /********************************************************************* - * _nearbyintf (MSVCRT.@) + * _nearbyintf (MSVCR120.@) */ float CDECL MSVCRT_nearbyintf(float num) { @@ -1493,6 +1507,8 @@ float CDECL MSVCRT_nearbyintf(float num) #endif } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * _nextafter (MSVCRT.@) */ @@ -1888,8 +1904,9 @@ MSVCRT_ldiv_t CDECL MSVCRT_ldiv(MSVCRT_long num, MSVCRT_long denom) } #endif /* ifdef __i386__ */ +#if _MSVCR_VER>=100 /********************************************************************* - * lldiv (MSVCRT.@) + * lldiv (MSVCR100.@) */ MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) { @@ -1900,6 +1917,7 @@ MSVCRT_lldiv_t CDECL MSVCRT_lldiv(MSVCRT_longlong num, MSVCRT_longlong denom) return ret; } +#endif #ifdef __i386__ @@ -2624,6 +2642,8 @@ MSVCRT_longlong CDECL MSVCR120_llrintl(LDOUBLE x) return MSVCR120_llrint(x); } +#if _MSVCR_VER>=120 + /********************************************************************* * round (MSVCR120.@) */ @@ -3126,6 +3146,8 @@ LDOUBLE CDECL MSVCR120_atanhl(LDOUBLE x) return MSVCR120_atanh(x); } +#endif /* _MSVCR_VER>=120 */ + /********************************************************************* * _scalb (MSVCRT.@) * scalbn (MSVCR120.@) @@ -3146,6 +3168,8 @@ float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) return MSVCRT_ldexp(num, power); } +#if _MSVCR_VER>=120 + /********************************************************************* * scalbnl (MSVCR120.@) * scalblnl (MSVCR120.@) @@ -3337,3 +3361,5 @@ double CDECL _except1(DWORD fpe, _FP_OPERATION_CODE op, double arg, double res, return res; } + +#endif /* _MSVCR_VER>=120 */

1 0

Alexandre Julliard : ntdll: Round the pthread stack size to a page boundary.
by Alexandre Julliard 26 Dec '17

26 Dec '17

Module: wine Branch: master Commit: 6fe15e6c41180ceebc7095ee64930e7c40635e5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fe15e6c41180ceebc7095ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 26 10:14:38 2017 +0100 ntdll: Round the pthread stack size to a page boundary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/thread.c | 5 +++-- dlls/ntdll/virtual.c | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 170eefe..53280a4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3149,7 +3149,7 @@ void WINAPI LdrInitializeThunk( void *kernel_start, ULONG_PTR unknown2, RemoveEntryList( &wm->ldr.InMemoryOrderModuleList ); InsertHeadList( &peb->LdrData->InMemoryOrderModuleList, &wm->ldr.InMemoryOrderModuleList ); - if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, 0 )) != STATUS_SUCCESS) + if ((status = virtual_alloc_thread_stack( NtCurrentTeb(), 0, 0, NULL )) != STATUS_SUCCESS) { ERR( "Main exe initialization for %s failed, status %x\n", debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), status ); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 80bca0c..32a385f 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -168,7 +168,7 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_create_builtin_view( void *base ) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, - SIZE_T commit_size, SIZE_T extra_size ) DECLSPEC_HIDDEN; + SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; extern void virtual_clear_thread_stack( void *stack_end ) DECLSPEC_HIDDEN; extern BOOL virtual_handle_stack_fault( void *addr ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 479b8d6..66beeb0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -540,6 +540,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * DWORD tid = 0; int request_pipe[2]; NTSTATUS status; + SIZE_T extra_stack = PTHREAD_STACK_MIN; if (process != NtCurrentProcess()) { @@ -618,7 +619,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * info->entry_point = start; info->entry_arg = param; - if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit, PTHREAD_STACK_MIN ))) + if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit, &extra_stack ))) goto error; thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; @@ -630,7 +631,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * pthread_attr_init( &attr ); pthread_attr_setstack( &attr, teb->DeallocationStack, - (char *)teb->Tib.StackBase + PTHREAD_STACK_MIN - (char *)teb->DeallocationStack ); + (char *)teb->Tib.StackBase + extra_stack - (char *)teb->DeallocationStack ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info )) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 22965d0..8c4fe3b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1758,12 +1758,12 @@ NTSTATUS virtual_create_builtin_view( void *module ) /*********************************************************************** * virtual_alloc_thread_stack */ -NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T extra_size ) +NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) { struct file_view *view; NTSTATUS status; sigset_t sigset; - SIZE_T size; + SIZE_T size, extra_size = 0; if (!reserve_size || !commit_size) { @@ -1775,6 +1775,7 @@ NTSTATUS virtual_alloc_thread_stack( TEB *teb, SIZE_T reserve_size, SIZE_T commi size = max( reserve_size, commit_size ); if (size < 1024 * 1024) size = 1024 * 1024; /* Xlib needs a large stack */ size = (size + 0xffff) & ~0xffff; /* round to 64K boundary */ + if (pthread_size) *pthread_size = extra_size = max( page_size, ROUND_SIZE( 0, *pthread_size )); server_enter_uninterrupted_section( &csVirtual, &sigset );

1 0

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 December 2017