wine-devel November 2018

wine-devel@winehq.org

75 participants
771 discussions

[PATCH] krnl386.exe16: Fix a typo in comment.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/krnl386.exe16/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 4e7f7c4b33..44b1e759a7 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -549,7 +549,7 @@ INT16 WINAPI GetPrivateProfileString16( LPCSTR section, LPCSTR entry, if (!entry) { /* We have to return the list of keys in the section but without the values - * so we need to massage the results of GetPrivateProfileSectionA. + * so we need to message the results of GetPrivateProfileSectionA. */ UINT ret, oldlen = len, size = min( len, 1024 ); LPSTR data, src; -- 2.17.2

2 1

[PATCH] oleaut32: Fix a typo in FIXME() message.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/oleaut32/safearray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 01dbfc3417..64a5ab94d5 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -289,7 +289,7 @@ static HRESULT SAFEARRAY_DestroyData(SAFEARRAY *psa, ULONG ulStartCell) ULONG ulCellCount = SAFEARRAY_GetCellCount(psa); if (ulStartCell > ulCellCount) { - FIXME("unexpted ulcellcount %d, start %d\n",ulCellCount,ulStartCell); + FIXME("unexpected ulCellCount %d, start %d\n",ulCellCount,ulStartCell); return E_UNEXPECTED; } -- 2.17.2

1 0

[PATCH] kernel32/tests: Fix typos in ok() messages.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/kernel32/tests/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index f27bbdf2b5..331db9b23b 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1012,8 +1012,8 @@ static VOID test_GetCurrentThreadStackLimits(void) } pGetCurrentThreadStackLimits(&low, &high); - ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "exptected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); - ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "exptected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); + ok(low == (ULONG_PTR)NtCurrentTeb()->DeallocationStack, "expected %p, got %lx\n", NtCurrentTeb()->DeallocationStack, low); + ok(high == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase, "expected %p, got %lx\n", NtCurrentTeb()->Tib.StackBase, high); } static VOID test_GetThreadExitCode(void) -- 2.17.2

1 0

[PATCH] shell32: Fix a typo in comment.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/shell32/shfldr_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 66150f4ce8..22f568a592 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -288,7 +288,7 @@ LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path) * Now we can parse into namespaces implemented by shell extensions * * Behaviour on win98: lpszDisplayName=NULL -> crash -* lpszDisplayName="" -> returns mycoputer-pidl +* lpszDisplayName="" -> returns mycomputer-pidl * * FIXME * pdwAttributes is not set -- 2.17.2

1 0

[PATCH] ntdll/tests: Fix a typo in comment.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/ntdll/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 79344e7e74..b59d267618 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -374,7 +374,7 @@ todo_wine ok(!key, "key = %p\n", key); if (status == STATUS_SUCCESS) NtClose(key); - /* Calling without parent key requres full registry path. */ + /* Calling without parent key requires full registry path. */ pRtlCreateUnicodeStringFromAsciiz( &str, "Machine" ); InitializeObjectAttributes(&attr, &str, 0, 0, 0); key = (HANDLE)0xdeadbeef; -- 2.17.2

1 0

[PATCH] riched20/tests: Fix typos in ok() messages.
by Andrey Gusev 29 Nov '18

29 Nov '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 1aa08f89a4..0415be8b80 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -1013,9 +1013,9 @@ static void test_default_format(void) ITextHostImpl_TxGetCharFormat(host, &host_cf); ok(!lstrcmpW(host_cf->szFaceName, cf2.szFaceName), "got wrong font name: %s.\n", wine_dbgstr_w(cf2.szFaceName)); - ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expetced %d.\n", cf2.yHeight, host_cf->yHeight); + ok(cf2.yHeight == host_cf->yHeight, "got wrong yHeight: %d, expected %d.\n", cf2.yHeight, host_cf->yHeight); expected_effects = (cf2.dwEffects & ~(CFE_AUTOCOLOR | CFE_AUTOBACKCOLOR)); - ok(host_cf->dwEffects == expected_effects , "got wrong dwEffects: %x, expetced %x.\n", cf2.dwEffects, expected_effects); + ok(host_cf->dwEffects == expected_effects, "got wrong dwEffects: %x, expected %x.\n", cf2.dwEffects, expected_effects); ok(cf2.bPitchAndFamily == host_cf->bPitchAndFamily, "got wrong bPitchAndFamily: %x, expected %x.\n", cf2.bPitchAndFamily, host_cf->bPitchAndFamily); ok(cf2.bCharSet == host_cf->bCharSet, "got wrong bCharSet: %x, expected %x.\n", cf2.bCharSet, host_cf->bCharSet); -- 2.17.2

1 0

[PATCH 1/2] shell32/iconcache: Prevent the imagelists from going out of sync when loading an icon
by Gabriel Ivăncescu 29 Nov '18

29 Nov '18

When populating the imagelists cache with icons of different sizes, it can happen that only some icon sizes actually succeed the extraction, with others failing with a NULL handle. This is especially true with some broken "executable packers" where for example, a 32x32 icon loads okay, but a 16x16 fails. Even when PrivateExtractIconsW succeeds, the returned handle can still be NULL, leading to the ImageLists becoming out of sync. This fixes a regression, because at some point, we stopped failing if one icon failed to extract, so when SIC_IconAppend called ImageList_AddIcon with a NULL icon handle, it would go out of sync. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45696 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/iconcache.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 6107e0c..44422ab 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -364,13 +364,14 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) HICON hshortcuts[ARRAY_SIZE(hicons)] = { 0 }; unsigned int i; SIZE size; - int ret; + INT ret = -1; for (i = 0; i < ARRAY_SIZE(hicons); i++) { get_imagelist_icon_size( i, &size ); if (!PrivateExtractIconsW( sourcefile, index, size.cx, size.cy, &hicons[i], 0, 1, 0 )) WARN("Failed to load icon %d from %s.\n", index, debugstr_w(sourcefile)); + if (!hicons[i]) goto fail; } if (flags & GIL_FORSHORTCUT) @@ -403,6 +404,8 @@ static INT SIC_LoadIcon (const WCHAR *sourcefile, INT index, DWORD flags) } ret = SIC_IconAppend( sourcefile, index, hicons, flags ); + +fail: for (i = 0; i < ARRAY_SIZE(hicons); i++) DestroyIcon(hicons[i]); return ret; -- 2.19.1

2 7

TestBot news
by Francois Gouget 29 Nov '18

29 Nov '18

Yesterday I added an option to let the TestBot administrator decide whether to run all the tests in Wine for every Wine patch. I have not activated it yet. But I set it to run all of a dll's tests on Wine whenever that dll is patched. So for instance because job 43715 patched dinput the TestBot reran all of the dinput tests. In contrast, for dinput8 the patch only modified dinput8:dinput so only that test was rerun. And yes, this also illustrates that this mode does not take PARENTSRC into account (yet) :-( https://testbot.winehq.org/JobDetails.pl?Key=43715&f601=win32.report#k601 If this does not cause too many issues (false positives, long processing times) I'll change it to run all the tests all the time in a few days. The remaining todo list for the TestBot: * Add support for locales in Wine VMs. * Fix the performance issues caused by running all the tests on Wine for every Wine patch (I expect we can get by with just duplicating the Debian VM so we can run all the win32 tests on one host while another runs the module-level wow32 + wow64 + locale ones). * Allow submitting Windows test executables to run in Wine. * Allow specifying a locale for jobs running in Wine. * Better locale handling when submitting a job on the Windows VMs (duplicating the VM on the submit page is fine as long as there are only a couple locales but will get unwieldly as more are added). * Fix date/time handling on Wine VMs (the time is not updated when the task starts and risks getting too far off). * Support for Wine's other source repositories to limit the risk of misidentifying Wine patches. * Have the TestBot build its own WineTest executables. * Split the "Update Wine VMs" job in two so it does not hog the Debian VM for hours. * Testing vkd3d's patches... somehow. * Monitoring the VM disk sizes (the Debian one grows particularly fast). * Fix monitoring of WineTest log sizes. * Update the Windows VMs (Windows+TestAgentd). The Windows 10 one obviously but also the slow reverting ones (w7u 3mn, wvista 1mn, w864 1mn). * Automate creating locale snapshots for the Windows Ultimate VMs somehow (either via Ansible or through TestAgentd). * Add more locale snapshots for the Windows Ultimate VMs (w7u and wvistau64). * Remember the user's VM preferences for jobs. * Let users change their email, password, etc. * One day maybe: rewrite the web interface using "modern" technologies to avoid page reloads. -- Francois Gouget <fgouget(a)codeweavers.com>

1 1

[PATCH 1/2] kernel32/tests: Align SizeOfHeaders to FileAlignment
by Brendan McGrath 29 Nov '18

29 Nov '18

According to: https://docs.microsoft.com/en-us/windows/desktop/debug/pe-format#optional-h… SizeOfHeaders: The combined size of an MS-DOS stub, PE header, and section headers rounded up to a multiple of FileAlignment. This change also fixes two kernel loader tests currently failing under 64bit. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- This patch set fixes three of the four failing 64bit kernel32 loader tests. The remaining test that fails is due to the clr header being version 2.4 and wine only offering 64bit support for clr header version 2.5 and above. I couldn't find any documentation to state why that is so I've left the test as failing. dlls/kernel32/tests/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 01c7cfa8a911..aaaa39f601d4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1097,7 +1097,7 @@ static void test_Loader(void) nt64.OptionalHeader.MajorOperatingSystemVersion = 4; nt64.OptionalHeader.MajorImageVersion = 1; nt64.OptionalHeader.MajorSubsystemVersion = 4; - nt64.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER); + nt64.OptionalHeader.SizeOfHeaders = ALIGN_SIZE(sizeof(dos_header) + sizeof(nt64) + sizeof(IMAGE_SECTION_HEADER), nt64.OptionalHeader.FileAlignment); nt64.OptionalHeader.SizeOfImage = nt64.OptionalHeader.SizeOfHeaders + 0x1000; nt64.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; nt64.OptionalHeader.SizeOfStackReserve = 0x321000; @@ -1212,7 +1212,7 @@ static void test_Loader(void) nt32.OptionalHeader.MajorOperatingSystemVersion = 4; nt32.OptionalHeader.MajorImageVersion = 1; nt32.OptionalHeader.MajorSubsystemVersion = 4; - nt32.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER); + nt32.OptionalHeader.SizeOfHeaders = ALIGN_SIZE(sizeof(dos_header) + sizeof(nt32) + sizeof(IMAGE_SECTION_HEADER), nt32.OptionalHeader.FileAlignment); nt32.OptionalHeader.SizeOfImage = nt32.OptionalHeader.SizeOfHeaders + 0x1000; nt32.OptionalHeader.Subsystem = IMAGE_SUBSYSTEM_WINDOWS_CUI; nt32.OptionalHeader.SizeOfStackReserve = 0x321000; -- 2.17.1

3 5

[PATCH 1/2] libs/wine: Do not restrict base address of main thread on 64 bit mac os.
by Ken Thomases 29 Nov '18

29 Nov '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- libs/wine/loader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0af3b8e..8f40ea0 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -709,6 +709,7 @@ struct apple_stack_info * Callback for wine_mmap_enum_reserved_areas to allocate space for * the secondary thread's stack. */ +#ifndef _WIN64 static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) { struct apple_stack_info *info = arg; @@ -725,6 +726,7 @@ static int apple_alloc_thread_stack( void *base, size_t size, void *arg ) info->desired_size, PROT_READ|PROT_WRITE, MAP_FIXED ); return (info->stack != (void *)-1); } +#endif /*********************************************************************** * apple_create_wine_thread @@ -742,6 +744,7 @@ static void apple_create_wine_thread( void *init_func ) if (!pthread_attr_init( &attr )) { +#ifndef _WIN64 struct apple_stack_info info; /* Try to put the new thread's stack in the reserved area. If this @@ -753,6 +756,7 @@ static void apple_create_wine_thread( void *init_func ) wine_mmap_remove_reserved_area( info.stack, info.desired_size, 0 ); pthread_attr_setstackaddr( &attr, (char*)info.stack + info.desired_size ); } +#endif if (!pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_JOINABLE ) && !pthread_create( &thread, &attr, init_func, NULL )) -- 2.10.2

2 2

← Newer
1
...
4
5
6
7
8
9
10
...
78
Older →

Jump to page:

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-devel November 2018