July 2015 - Wine-Devel - list.winehq.org

[PATCH] Use asserts for mmap failure modes
by Michael Gilbert July 26, 2015

July 26, 2015

Hi, Using exit in shared libraries is a discouraged practice, and wine's mmap implementation currently does that. I attach a proposed change using asserts instead. Let me know if you have any feedback. Best wishes, Mike (btw I'm the debian wine maintainer)

2 2

re: Wine Stable
by Michael Gilbert July 25, 2015

July 25, 2015

Michael Stefaniuc wrote: > We already have a topic "Wine Stable Considered Harmful" for the > WineConf in September, see http://wiki.winehq.org/WineConf2015 "Considered Harmful" is also Considered Harmful ;) http://meyerweb.com/eric/comment/chech.html > On a high level view this are IMHO the good and bad things about the > current stable process in Wine: > > Good Bad > ---- --- > Code freeze/stabilization Way too old > Marketing Release slips with features slippage > Some distributions want it Distributions insist on using it > Bug reports for stable are ignored The other good is that we can plan on shipping a stabilized (bug fixed, well tested) version of the package, rather than whichever version happened to be released at the time of the Debian freeze. The whole point of having both stable and development versions of the package in Debian is so the user can have a choice. Either go with the stable, well tested version, or go with a snapshot from the date of the freeze. Best wishes, Mike

1 0

Re: psapi/tests: Don't check for exact value (try 2)
by Sebastian Lackner July 25, 2015

July 25, 2015

On 23.07.2015 22:50, André Hentschel wrote: > --- > dlls/psapi/tests/psapi_main.c | 59 +++++++++++++------------------------------ > 1 file changed, 17 insertions(+), 42 deletions(-) > > diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c > index cebfc5f..1ee30d2 100644 > --- a/dlls/psapi/tests/psapi_main.c > +++ b/dlls/psapi/tests/psapi_main.c > @@ -194,6 +194,11 @@ static void test_GetModuleInformation(void) > ok(info.lpBaseOfDll == hMod, "lpBaseOfDll=%p hMod=%p\n", info.lpBaseOfDll, hMod); > } > > +#define ADMITTED_ERROR (64) > +#define CHECK_MARGIN(perf, sys) \ > + ok(perf >= max(sys, ADMITTED_ERROR) - ADMITTED_ERROR && perf <= sys + ADMITTED_ERROR, \ > + "expected approximately " #perf "=%u but got %u\n", sys, (ULONG)perf) > + > static void test_GetPerformanceInfo(void) > { > PERFORMANCE_INFORMATION info; > @@ -227,36 +232,16 @@ static void test_GetPerformanceInfo(void) > ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); > ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); > > - ok(info.CommitTotal == sys_performance_info->TotalCommittedPages, > - "expected info.CommitTotal=%u but got %u\n", > - sys_performance_info->TotalCommittedPages, (ULONG)info.CommitTotal); > - > - ok(info.CommitLimit == sys_performance_info->TotalCommitLimit, > - "expected info.CommitLimit=%u but got %u\n", > - sys_performance_info->TotalCommitLimit, (ULONG)info.CommitLimit); > - > - ok(info.CommitPeak == sys_performance_info->PeakCommitment, > - "expected info.CommitPeak=%u but got %u\n", > - sys_performance_info->PeakCommitment, (ULONG)info.CommitPeak); > - > - ok(info.PhysicalAvailable >= max(sys_performance_info->AvailablePages, 25) - 25 && > - info.PhysicalAvailable <= sys_performance_info->AvailablePages + 25, > - "expected approximately info.PhysicalAvailable=%u but got %u\n", > - sys_performance_info->AvailablePages, (ULONG)info.PhysicalAvailable); > + CHECK_MARGIN(info.CommitTotal, sys_performance_info->TotalCommittedPages); > + CHECK_MARGIN(info.CommitLimit, sys_performance_info->TotalCommitLimit); > + CHECK_MARGIN(info.CommitPeak, sys_performance_info->PeakCommitment); > + CHECK_MARGIN(info.PhysicalAvailable, sys_performance_info->AvailablePages); > > /* TODO: info.SystemCache not checked yet - to which field(s) does this value correspond to? */ > > - ok(info.KernelTotal == sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, > - "expected info.KernelTotal=%u but got %u\n", > - sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelTotal); > - > - ok(info.KernelPaged == sys_performance_info->PagedPoolUsage, > - "expected info.KernelPaged=%u but got %u\n", > - sys_performance_info->PagedPoolUsage, (ULONG)info.KernelPaged); > - > - ok(info.KernelNonpaged == sys_performance_info->NonPagedPoolUsage, > - "expected info.KernelNonpaged=%u but got %u\n", > - sys_performance_info->NonPagedPoolUsage, (ULONG)info.KernelNonpaged); > + CHECK_MARGIN(info.KernelTotal, sys_performance_info->PagedPoolUsage + sys_performance_info->NonPagedPoolUsage); > + CHECK_MARGIN(info.KernelPaged, sys_performance_info->PagedPoolUsage); > + CHECK_MARGIN(info.KernelNonpaged, sys_performance_info->NonPagedPoolUsage); > > /* compare with values from SYSTEM_BASIC_INFORMATION */ > size = 0; > @@ -264,13 +249,8 @@ static void test_GetPerformanceInfo(void) > ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); > ok(size >= sizeof(SYSTEM_BASIC_INFORMATION), "incorrect length %d\n", size); > > - ok(info.PhysicalTotal == sys_basic_info.MmNumberOfPhysicalPages, > - "expected info.PhysicalTotal=%u but got %u\n", > - sys_basic_info.MmNumberOfPhysicalPages, (ULONG)info.PhysicalTotal); > - > - ok(info.PageSize == sys_basic_info.PageSize, > - "expected info.PageSize=%u but got %u\n", > - sys_basic_info.PageSize, (ULONG)info.PageSize); > + CHECK_MARGIN(info.PhysicalTotal, sys_basic_info.MmNumberOfPhysicalPages); I think we can safely assume that the total physical memory does not change between two calls. > + CHECK_MARGIN(info.PageSize, sys_basic_info.PageSize); The pagesize should usually also match exactly. > > /* compare with values from SYSTEM_PROCESS_INFORMATION */ > size = 0; > @@ -297,14 +277,9 @@ static void test_GetPerformanceInfo(void) > } > HeapFree(GetProcessHeap(), 0, sys_process_info); > > - ok(info.HandleCount == handle_count, > - "expected info.HandleCount=%u but got %u\n", handle_count, info.HandleCount); > - > - ok(info.ProcessCount == process_count, > - "expected info.ProcessCount=%u but got %u\n", process_count, info.ProcessCount); > - > - ok(info.ThreadCount == thread_count, > - "expected info.ThreadCount=%u but got %u\n", thread_count, info.ThreadCount); > + CHECK_MARGIN(info.HandleCount, handle_count); > + CHECK_MARGIN(info.ProcessCount, process_count); > + CHECK_MARGIN(info.ThreadCount, thread_count); A tolerance of 64 (especially for process/threads) basically disables these tests. A smaller tolerance would already be sufficient to avoid random test failures. > } > } > >

1 0

Re: user32/tests: Also check against the low word of hSubMenu (try 2)
by Marvin July 25, 2015

July 25, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15565 Your paranoid android. === w2003std (32 bit menu) === menu.c:2545: Test failed: id 202: expected fState 0, got 0003 menu.c:2545: Test failed: id 202: expected fState 0, got 1000

1 0

Re: [PATCH 14/21] api-ms-win-crt-multibyte-l1-1-0: Add stub dll.
by Sebastian Lackner July 25, 2015

July 25, 2015

On 23.07.2015 21:47, Martin Storsjo wrote: > +@ stdcall __p__mbcasemap() ucrtbase.__p__mbcasemap This (and a couple of other redirects) should probably be declared as cdecl, similar to how its done in all other msvcr* dlls. You have to update the hack in tools/make_specfiles for this to work properly, for example like that: --- snip --- @@ -376,7 +376,7 @@ sub update_spec_file($) if ($parent{callconv} ne "stub" || $parent{args}) { my $callconv = $parent{callconv} ne "stub" ? $parent{callconv} : - $parent{spec} =~ /msvc/ ? "cdecl" : "stdcall"; # hack + $parent{spec} =~ /(msvc|ucrtbase)/ ? "cdecl" : "stdcall"; # hack $_ = sprintf "$descr{ordinal} %s %s%s", $callconv, $flags, $func; if ($parent{target} =~ /$group_head\./) # use the same forward as parent if possible --- snip --- Please note that this is the first patch affected by this problem.

2 1

Re: user32: Hide horizontal Listbox scroll bar if no horizontal extent is set.
by Marvin July 24, 2015

July 24, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15534 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:709: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:944: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

2 1

Re: [PATCH 1/2] user32: Initialize buffer before sending WM_GETTEXT
by Marvin July 24, 2015

July 24, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15535 Your paranoid android. === wvistau64 (32 bit win) === win.c:7546: Test failed: transparent window didn't get WM_NCHITTEST message win.c:7547: Test failed: button under static window didn't get WM_LBUTTONUP

2 1

Re: [PATCH 8/9] d2d1: Bitmap values are always premultiplied in practice.
by Marvin July 23, 2015

July 23, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15531 Your paranoid android. === wvistau64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w2008s64 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w7u (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w8 (32 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === wvistau64 (64 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2. === w2008s64 (64 bit d2d1) === d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x2/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xa/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0xb/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1b/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x1c/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1d/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1e/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x1f/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x20/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x1. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x41/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x2. d2d1.c:1613: Test failed: Got unexpected hr 0x80070057, for format 0x57/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x58/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x1. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x2. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5a/0x3. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0. d2d1.c:1616: Test failed: Got unexpected hr 0x80070057, for format 0x5b/0x2.

1 0

Re: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument().
by Nikolay Sivov July 23, 2015

July 23, 2015

On 14.07.2015 16:31, Zhenbo Li wrote: > Hi Nikolay, > > 2015-07-14 20:17 GMT+08:00 Nikolay Sivov <bunglehead(a)gmail.com>: >> In principle this is most likely fine, but I'd really prefer to have similar >> test for all node types that support this method, so we can move a check >> directly to node_get_owner_doc(). For those additional tests it would be >> better to add a new test function called test_get_ownerDocument(). Next step >> would be to make this test run on all document versions (3, 4 and 6), but >> that should be a separate patch, and I'm not asking you to work on it. > > Thanks for your reply. > I agree with you that move the check into node_get_owner_doc might be > more general > > Do you mean I should write a helper function like: > > #define test_get_ownerDocument_call(el,doc) > _test_get_ownerDocument_call(__LINE__,el,doc) > static void _test_get_ownerDocument_call(unsigned line, IXMLDOMElement > *element, IXMLDOMDocument *doc) > { > IXMLDOMDocument *owner; > HRESULT r; > r = IXMLDOMElement_get_ownerDocument( element, NULL ); > ok( r == E_INVALIDARG, "got %08x, expected E_INVALIDARG\n", r); > > owner = NULL; > r = IXMLDOMElement_get_ownerDocument( element, &owner ); > ok( r == S_OK, "get_ownerDocument return code\n"); > ok( owner != doc, "get_ownerDocument return\n"); > IXMLDOMDocument_Release(owner); > } > > No, helper like that won't work, because the point is to check how all node types work, not just elements. What I meant is to have a separate test_* function in START_TEST() that will load a document with all node types you need and iterating through them call get_ownderDocument.

2 3

Scan-build report uploaded
by André Hentschel July 22, 2015

July 22, 2015

Hi, in case someone is interested, i've uploaded a scan-build here: http://dawncrow.de/scan-build-2015-07-20-200148-28114-1/ Wine source is from last Friday

2 2

Re: [PATCH 4/4] mshtml: Add IHTMLXMLHttpRequest::statusText property implementation.
by Jacek Caban July 22, 2015

July 22, 2015

Hi Zhenbo, On 22/07/15 17:34, Zhenbo Li wrote: > + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); > + *p = SysAllocStringLen(NULL, len); > + if(!*p) { > + nsACString_Finish(nscstr); > + return E_OUTOFMEMORY; > + } > + MultiByteToWideChar(CP_ACP, 0, str, -1, *p, len); I didn't catch it earlier, but this should use CP_UTF8. Cheers, Jacek

1 0

1.7.48 release delayed
by Alexandre Julliard July 22, 2015

July 22, 2015

Folks, I'm out to my brother's wedding for a few days, so there won't be a release this Friday. I'm planning to release 1.7.48 early next week, probably on Tuesday. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/3] setupapi: SetupDiGetClassDevsEx returns INVALID_HANDLE_VALUE on error.
by Nikolay Sivov July 22, 2015

July 22, 2015

On 22.07.2015 12:57, Dmitry Timoshkov wrote: > --- > dlls/setupapi/devinst.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c > index b084a5e..5a18937 100644 > --- a/dlls/setupapi/devinst.c > +++ b/dlls/setupapi/devinst.c > @@ -2340,7 +2340,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p > if (!(flags & DIGCF_ALLCLASSES) && !class) > { > SetLastError(ERROR_INVALID_PARAMETER); > - return NULL; > + return INVALID_HANDLE_VALUE; > } > if (flags & unsupportedFlags) > WARN("unsupported flags %08x\n", flags & unsupportedFlags); > How about a test for this and next one?

2 1

Re: winhttp: Implement WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT.
by Dmitry Timoshkov July 22, 2015

July 22, 2015

Huw Davies <huw(a)codeweavers.com> wrote: > + case WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: > + TRACE("WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: %p\n", *(HANDLE *)buffer); > + session->unload_event = *(HANDLE *)buffer; > + return TRUE; I admit, that adding another case that doesn't check input buffer size doesn't change much, but it has to stop at some point, rather sooner than later. -- Dmitry.

1 0

Skyrim hang on exit: Any news?
by Theodore Dubois July 21, 2015

July 21, 2015

When you quit to desktop from Skyrim, it hangs. This is bug 34041. It's still a bug, but it has not been touched by anyone from Codewaevers since 2013 (as far as I can tell.) Clearly, it's low priority. Any news? ~Theodore

2 1

Re: user32/tests: Test for caption width of 13 on japanese W7
by Marvin July 21, 2015

July 21, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15482 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2489: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2502: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: ntdll: Don't touch SecurityCookie when the pointer is outside of the image
by Michael Müller July 21, 2015

July 21, 2015

Am 21.07.2015 um 20:33 schrieb André Hentschel: > + if (loadcfg && loadcfg_size >= sizeof(*loadcfg) && > + (ULONG_PTR)ptr > loadcfg->SecurityCookie &&loadcfg->SecurityCookie < (ULONG_PTR)ptr + total_size) > set_security_cookie((ULONG_PTR *)loadcfg->SecurityCookie); Your check doesn't take the size of the security cookie into account. If the cookie would only be partially inside of the image area, the check would still succeed although not all memory is writable. The check for the lower limit should be (<= instead of >): (ULONG_PTR)ptr <= loadcfg->SecurityCookie Is it possible to have an unmapped space between mapped sections? According to the NT section header it should be possible, but I am not sure if Wine fills this area.

2 1

Re: dwrite: Remove unused initializer (Clang)
by Nikolay Sivov July 21, 2015

July 21, 2015

Looks good, thanks.

1 0

Re: user32/tests: Test for caption width of 13 on japanese W7
by Huw Davies July 21, 2015

July 21, 2015

On 21 Jul 2015, at 19:32, André Hentschel wrote: > --- a/dlls/user32/tests/sysparams.c > +++ b/dlls/user32/tests/sysparams.c > @@ -1554,8 +1554,9 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ > > ok( Ncmcur.iCaptionWidth == 8 || > Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */ > + Ncmcur.iCaptionWidth == 13 || /* Win7 japanese */ > Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme, the value never changes */ > - "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); > + "CaptionWidth: %d expected 8, 12, 13 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); > ok( Ncmcur.iScrollWidth == 8, > "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth); > ok( Ncmcur.iScrollHeight == 8, I deliberately haven't fixed it like this because it has already become untenable. I suspect it should be compared to the height of the default gui font, or something like that. Huw.

1 0

[PATCH v2 00/15] AppUserModelID support
by Jonas Kümmerlin July 21, 2015

July 21, 2015

Changes since the last version: - Feedback by Vincent Porvik, Nikolay Sivov and GOUJON Alexandre has been incorporated. - Where appropriate, bigger patches have been split into smaller chunks. - All required features are now implemented: You can try it out by installing LibreOffice using the MSI package, set the windows version to Win7 in winecfg and observe the new fancy desktop file matching performed by your desktop shell. (assuming your shell does this; Gnome3 and Unity do, XFCE and LXDE don't) - While Gnome3 works great, KDE hasn't been exactly cooperative so far. It now gets the grouping right, but ignores the StartupWMClass key in the desktop files, so pinning and fancy high-res icons won't work. This is most likely not fixable on our side, at least not without further research. I am still not happy with the PROPVARIANT (de)serialization code (patches 4 and 5, hope the mailing list won't eat it this time). The ole32 <-> propsys interfacing has been implemented as Nikolay Sivov suggested, but I'm not really happy with it. The new (de)serialization code also caused a weird regression in MSI.dll which I haven't been able to track down yet. I'm currently leaning towards moving the new code to propsys.dll and leaving ole32.dll untouched, even though that would result in two different implementations of basically the same thing. Does anyone have strong opinions on this matter? Rationale: AppUserModelIDs can be used to match open windows to shortcuts in order to make the Win7 Taskbar happen. The idea is similar to WM_CLASS in X11/freedesktop.org environments: Add the AppUserModelID to every window and every shortcut and let the shell figure out the matching. The shell can then do fancy things like pinning the app or showing a high quality icon. While most windows apps rely on the fallback algorithm of doing the shortcut<->window mapping via the full path to the executable, some applications, like LibreOffice, are making use of the AppUserModelID feature to appear as a set of different applications (Writer, Calc, ...) while sharing the same exe file (soffice.bin). Modern freedesktop.org shells work very similar to the Win7 Taskbar in this regard (using the X11 WM_CLASS attribute and the StartupWMClass= deskop entry key), and the goal is to have wine apps appear like any native app: With a high-res icon and pinnable. Jonas Kümmerlin (15): shell32: Implement process-wide explicit AppUserModelID propsys: Implement several PropVariantInit*() functions propsys: Extend PropVariantCompareEx() ole32: Rework property (de)serialization propsys: Implement Stg(De)SerializePropVariant propsys: Implement named properties on the in-memory property store propsys: Implement serialization of the in-memory property store propsys: Implement IPersistStream on the in-memory property store propsys: Partially implement property stringification shell32: Properly implement IPropertyStore for shell links shell32: Implement window property store (SHGetPropertyStoreForWindow) winex11.drv,user32,shell32 Use AppUserModelID to populate WM_CLASS propsys: Partially implement/stub IPropertyDescription msi: Write shortcut properties winemenubuilder: Save AppUserModelID as StartupWMClass dlls/msi/Makefile.in | 2 +- dlls/msi/action.c | 120 ++ dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 75 +- dlls/msi/tests/automation.c | 1 - dlls/msi/tests/suminfo.c | 4 +- dlls/ole32/stg_prop.c | 1717 +++++++++++++++++++++++----- dlls/ole32/tests/propvariant.c | 86 +- dlls/propsys/Makefile.in | 4 +- dlls/propsys/propdesc.c | 537 +++++++++ dlls/propsys/propdesc_builtin_data.c | 85 ++ dlls/propsys/propstore.c | 1062 ++++++++++++++++- dlls/propsys/propsys.spec | 36 +- dlls/propsys/propsys_classes.idl | 7 +- dlls/propsys/propsys_main.c | 6 - dlls/propsys/propsys_private.h | 23 + dlls/propsys/propvar.c | 889 +++++++++++++- dlls/propsys/tests/Makefile.in | 2 +- dlls/propsys/tests/propstore.c | 403 ++++++- dlls/propsys/tests/propsys.c | 709 +++++++++++- dlls/shell32/Makefile.in | 1 + dlls/shell32/shell32.spec | 2 + dlls/shell32/shell32_main.c | 109 +- dlls/shell32/shelllink.c | 218 +++- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/appusermodel.c | 272 +++++ dlls/shell32/tests/shell32_test.h | 9 + dlls/shell32/tests/shelllink.c | 123 ++ dlls/shell32/winpropstore.c | 303 +++++ dlls/user32/message.c | 2 +- dlls/user32/user_private.h | 5 +- dlls/winex11.drv/window.c | 160 ++- include/propidl.idl | 6 + include/propsys.idl | 1 + include/propvarutil.h | 105 +- include/shellapi.h | 1 + include/shobjidl.idl | 6 + include/strsafe.h | 17 + include/winbase.h | 2 + include/wine/server_protocol.h | 59 +- programs/winemenubuilder/winemenubuilder.c | 123 +- server/protocol.def | 38 + server/request.h | 35 + server/trace.c | 47 + server/window.c | 148 +++ 45 files changed, 7098 insertions(+), 465 deletions(-) create mode 100644 dlls/propsys/propdesc.c create mode 100644 dlls/propsys/propdesc_builtin_data.c create mode 100644 dlls/shell32/tests/appusermodel.c create mode 100644 dlls/shell32/winpropstore.c -- 2.4.3

4 22

Re: include: Add stuff related to WSAPoll() (try 4)
by Alexandre Julliard July 21, 2015

July 21, 2015

Bruno Jesus <00cpxxx(a)gmail.com> writes: > Use Sebastian's idea of not naming the struct since only WSAPOLLFD is > used anyway. This is still causing a lot of warnings on mingw: In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:117:0: warning: "POLLERR" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:293:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:118:0: warning: "POLLHUP" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:294:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:119:0: warning: "POLLNVAL" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:295:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:124:0: warning: "POLLPRI" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:291:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:125:0: warning: "POLLIN" redefined In file included from ../../../wine/dlls/jsproxy/main.c:20:0: ../../../wine/include/wine/port.h:290:0: note: this is the location of the previous definition In file included from ../../../wine/include/ws2tcpip.h:22:0, from ../../../wine/dlls/jsproxy/main.c:34: ../../../wine/include/winsock2.h:126:0: warning: "POLLOUT" redefined -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] regsvr32: change regsvr32 to a GUI program.
by Nikolay Sivov July 21, 2015

July 21, 2015

On 21.07.2015 12:26, Hao Peng wrote: > --- > programs/regsvr32/Makefile.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > -APPMODE = -mconsole -municode > +APPMODE = -mwindows -municode Why do you need this?

2 1

Re: [PATCH] advapi32: test and fix ChangeServiceConfig2 when given a zero length or a null description (try2, resend)
by Marvin July 20, 2015

July 20, 2015

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=15399 Your paranoid android. === w7u (32 bit service) === service.c:1421: Test failed: Active services mismatch 1 service.c:1422: Test failed: Inactive services mismatch 4294967295

3 3

Re: odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString
by Alistair Leslie-Hughes July 20, 2015

July 20, 2015

On 19/07/15 21:10, Nikolay Sivov wrote: > Based on patch by Alistair Leslie-Hughes > Here is a modified version of the patch you sent. This patch includes test cases for SQLGetPrivateProfileStringW. There was an error in my logic with the entry parameter which I have also corrected. When the entry parameter is NULL, it returns the list of keys, in the format keyname\0keyname\0. I've tested two application which now work correctly with the attached patch. Happy to hear any feedback. Best Regards Alistair.

2 1

Re: kernel32/editline: Enabling/disabling Insert Mode via the user dialog should take effect immediately
by Sebastian Lackner July 20, 2015

July 20, 2015

On 20.07.2015 04:02, Hugh McMaster wrote: > Currently, if Insert Mode is enabled/disabled via the user dialog, > the new console mode does not take effect until after > CONSOLE_Readline is called again. > > On Windows, this change takes effect immediately. > --- > dlls/kernel32/editline.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c > index 7664b55..581ea7c 100644 > --- a/dlls/kernel32/editline.c > +++ b/dlls/kernel32/editline.c > @@ -987,6 +987,10 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) > } > } > > + GetConsoleMode(hConsoleIn, &mode); > + ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == > + (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS) ? 1 : 0; You can remove the " ? 1 : 0" here, the value is already BOOL. > + > if (func) > (func)(&ctx); > else if (!(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED)) >

2 1