- wine-devel - winehq.org

Re: [1/2] include: Add ID3DXFragmentLinker interface
by Matteo Bruni 27 Jul '15

27 Jul '15

2015-07-23 11:11 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > > > Changelog: > include: Add ID3DXFragmentLinker interface > > > Best Regards > Alistair Leslie-Hughes > +typedef interface ID3DXFragmentLinker ID3DXFragmentLinker; You don't need that. > + STDMETHOD(GetDevice)(THIS_ IDirect3DDevice9 *device) PURE; This is wrong. > + STDMETHOD(LinkPixelShader)(THIS_ const char *profile, DWORD flags, const D3DXHANDLE *fragmenthandles, UINT fragments, IDirect3DVertexShader9 **shader, ID3DXBuffer **errors) PURE; This too. For reference, I checked the definitions with those from the March 2009 DirectX SDK.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs (try 3 - resend)
by Matteo Bruni 27 Jul '15

27 Jul '15

2015-07-23 11:09 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > + FIXME(" srcdata %p, srcdatasize %lu, sourcename %s, defines %p, includes %p, entrypoint %s, target %s, " Extra space at the start. But it's okay, not worth a resend IMHO. As followups you could make D3DCompile() forward to D3DCompile2() and you could try to implement D3DCompileFromFile(), probably via the new D3DReadFileToBlob() function.

1 0

Re: [PATCH 5/5] qcap/tests: Add COM tests for VfwCapture.
by Marvin 27 Jul '15

27 Jul '15

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=15590 Your paranoid android. === build (build) === Make failed

2 1

Re: user32: Hide horizontal Listbox scroll bar if no horizontal extent is set. (try 2)
by Marvin 26 Jul '15

26 Jul '15

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=15569 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

1 0

Re: widl: Don't output C++ default value if the argument is followed by another without default value.
by Michael Stefaniuc 26 Jul '15

26 Jul '15

Jacek, On 07/26/2015 05:07 PM, Jacek Caban wrote: > + /* Output default value only is all following arguments also have default value. */ should that be an "if"? ^^^ bye michael

2 1

Re: [PATCH 1/5] d3dx9/tests: Remove todo that succeeds now.
by Nikolay Sivov 26 Jul '15

26 Jul '15

On 25.07.2015 12:23, Józef Kucia wrote: > --- > dlls/d3dx9_36/tests/effect.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c > index 482f064..dd88b29 100644 > --- a/dlls/d3dx9_36/tests/effect.c > +++ b/dlls/d3dx9_36/tests/effect.c > @@ -156,7 +156,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) > ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > > hr = D3DXCreateEffect(device, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, &effect, NULL); > - todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); > if (FAILED(hr)) > { > skip("Failed to compile effect, skipping test.\n"); > Hi, Jozef. There's no failures currently http://test.winehq.org/data/tests/d3dx9_36:mesh.html, so I'm not sure why it succeeds for you.

2 1

[PATCH] Use asserts for mmap failure modes
by Michael Gilbert 26 Jul '15

26 Jul '15

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 26 Jul '15

26 Jul '15

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 26 Jul '15

26 Jul '15

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 25 Jul '15

25 Jul '15

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 25 Jul '15

25 Jul '15

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 24 Jul '15

24 Jul '15

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 24 Jul '15

24 Jul '15

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 23 Jul '15

23 Jul '15

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 23 Jul '15

23 Jul '15

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 22 Jul '15

22 Jul '15

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 22 Jul '15

22 Jul '15

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 22 Jul '15

22 Jul '15

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 22 Jul '15

22 Jul '15

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 22 Jul '15

22 Jul '15

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 22 Jul '15

22 Jul '15

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 21 Jul '15

21 Jul '15

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 21 Jul '15

21 Jul '15

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 21 Jul '15

21 Jul '15

Looks good, thanks.

1 0

Re: user32/tests: Test for caption width of 13 on japanese W7
by Huw Davies 21 Jul '15

21 Jul '15

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 21 Jul '15

21 Jul '15

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 21 Jul '15

21 Jul '15

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 21 Jul '15

21 Jul '15

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 20 Jul '15

20 Jul '15

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: kernel32/editline: Enabling/disabling Insert Mode via the user dialog should take effect immediately
by Sebastian Lackner 20 Jul '15

20 Jul '15

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

Re: odbccp32: Implement SQLGetPrivateProfileStringW/SQLGetPrivateProfileString
by Alistair Leslie-Hughes 20 Jul '15

20 Jul '15

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: [PATCH 3/4] msvcp110: Add tr2_sys__Last_write_time implementation and test.(resend)
by Piotr Caban 20 Jul '15

20 Jul '15

On 07/18/15 05:15, YongHao Hu wrote: > + /* test the formula */ > + file = CreateFileA("tr2_test_dir/f1", 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, > + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); > + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); > + ok(GetFileTime(file, 0, 0, &lwt), "GetFileTime failed\n"); > + CloseHandle(file); > + last_write_time = (((__int64)lwt.dwHighDateTime)<< 32) + lwt.dwLowDateTime; > + last_write_time -= TICKS_1601_TO_1970; > + last_write_time /= TICKSPERSEC; > + ok(last_write_time == newtime, "last_write_time after converting from FILETIME to UNIX Timestamp should equal to newtime\n"); There's no guarantee that the filesystem will store the time accurately. As far as I know the test will not work on fat file system. > + /* test negative time */ > + newtime = 1111111; > + p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", -newtime); > + last_write_time = p_tr2_sys__Last_write_time("tr2_test_dir/f1"); > + todo_wine ok(1844674407369-newtime+1 == last_write_time, "last_write_time expect %s, got %s\n", > + debugstr_longlong(1844674407369-newtime+1), debugstr_longlong(last_write_time)); You can't use debugstr_longlong 2 times inside one ok call. You can't use 64-bit constants this way. Also please avoid using "magic" constants. Is this test still failing on wine if unsigned __int64 is used in computations? > + /* maximum time */ > + newtime = 9223372036854775807; > + p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); > + todo_wine ok(1844674407369 == p_tr2_sys__Last_write_time("tr2_test_dir/f1"), "last_write_time expect 1844674407369, got %s\n", > + debugstr_longlong(p_tr2_sys__Last_write_time("tr2_test_dir/f1"))); I'm expecting it to fail on some filesystems. It would be nice to run this tests on fat32 filesystem. Cheers, Piotr

1 0

Re: [PATCH] user32/tests: Correct spelling of "Invisible".
by Marvin 20 Jul '15

20 Jul '15

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=15450 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10609: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [PATCH 2/4] msvcp110: Add tr2_sys__Stat and tr2_sys__Lstat implementation and test.(try 2)
by Piotr Caban 20 Jul '15

20 Jul '15

On 07/17/15 20:20, YongHao Hu wrote: > --- > dlls/msvcp110/msvcp110.spec | 8 +- > dlls/msvcp120/msvcp120.spec | 8 +- > dlls/msvcp120/tests/msvcp120.c | 142 > ++++++++++++++++++++++++++++++++++++ > dlls/msvcp120_app/msvcp120_app.spec | 8 +- > dlls/msvcp90/ios.c | 47 ++++++++++++ > 5 files changed, 201 insertions(+), 12 deletions(-) There's a compilation warning: msvcp120.c: In function 'test_tr2_sys__Stat': msvcp120.c:777:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] BYTE buf[sizeof(struct REPARSE_MOUNTPOINT_DATA_BUFFER) + MAX_PATH * sizeof(WCHAR)]; The tests are also not working for me on Windows 7: msvcp120.c:770: Test failed: CreateSymbolicLinkA failed msvcp120.c:771: Test failed: CreateSymbolicLinkA failed msvcp120.c:823: Test failed: tr2_sys__Stat(): test 6 expect: 2, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 6 expect: 2, got 1 msvcp120.c:823: Test failed: tr2_sys__Stat(): test 7 expect: 3, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 7 expect: 3, got 1 msvcp120.c:845: Test failed: expect tr2_test_dir/f1_link to exist msvcp120.c:846: Test failed: expect tr2_test_dir/dir_link to exist msvcp120: 380 tests executed (0 marked as todo, 8 failures), 0 skipped. There are some more test failures when tests are run from filesystem that doesn't support reparse points: msvcp120.c:621: Test failed: test_tr2_sys__Copy_file(): test 5 expect: 5, got 80 msvcp120.c:623: Test failed: test_tr2_sys__Copy_file(): test 11 expect: 3, got 2 msvcp120.c:770: Test failed: CreateSymbolicLinkA failed msvcp120.c:771: Test failed: CreateSymbolicLinkA failed msvcp120.c:785: Test failed: DeviceIoControl failed msvcp120.c:792: Test failed: DeviceIoControl failed msvcp120.c:823: Test failed: tr2_sys__Stat(): test 6 expect: 2, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 6 expect: 2, got 1 msvcp120.c:823: Test failed: tr2_sys__Stat(): test 7 expect: 3, got 1 msvcp120.c:834: Test failed: tr2_sys__Lstat(): test 7 expect: 3, got 1 msvcp120.c:845: Test failed: expect tr2_test_dir/f1_link to exist msvcp120.c:846: Test failed: expect tr2_test_dir/dir_link to exist msvcp120: 380 tests executed (0 marked as todo, 12 failures), 0 skipped.

2 2

Re: include: Add stuff related to WSAPoll() (try 3)
by Sebastian Lackner 20 Jul '15

20 Jul '15

On 17.07.2015 18:29, Bruno Jesus wrote: > Try to apply Matteo's idea to not redefine the struct when port.h was > already included. I can't test in mingw myself unfortunately. I don't think this will work properly. The Linux pollfd struct contains "fd" with type "int", but on Windows its defined as "SOCKET" (which has size of a pointer). My personal preference would be to just leave out the "struct pollfd" definition here, and only declare WSAPOLLFD. Basically: +typedef struct +{ + SOCKET fd; + SHORT events; + SHORT revents; +} WSAPOLLFD; Not sure if this would be an acceptable solution for the other devs though.

2 1

Re: [PATCH 3/4] msvcp110: Add tr2_sys__Last_write_time implementation and test.
by Piotr Caban 20 Jul '15

20 Jul '15

2 1

Re: msi/tests: Mark a test result on win2k3 as broken.
by Marvin 17 Jul '15

17 Jul '15

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=15404 Your paranoid android. === w7u (32 bit package) === The test timed out

1 0

Re: [4/4] user32: SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should return real font names.
by Marvin 17 Jul '15

17 Jul '15

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=15397 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2488: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: winemac.drv: Release mouse capture when destroying window specified in SetCapture call
by Ken Thomases 17 Jul '15

17 Jul '15

On Jul 17, 2015, at 5:54 AM, Piotr Caban <piotr(a)codeweavers.com> wrote: > --- > dlls/winemac.drv/window.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c > index c67ccd0..9d996ec 100644 > --- a/dlls/winemac.drv/window.c > +++ b/dlls/winemac.drv/window.c > @@ -1274,6 +1274,8 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) > > if (!(data = get_win_data(hwnd))) return; > > + if (hwnd == GetCapture()) macdrv_SetCapture(0, 0); > + > if (data->gl_view) macdrv_dispose_view(data->gl_view); > destroy_cocoa_window(data); > > Looks good to me. Thanks! -Ken

1 0

Re: [1/4] user32: Add a test to show that fonts returned by SystemParametersInfo(SPI_GETNONCLIENTMETRICS) should be listed b
by Marvin 17 Jul '15

17 Jul '15

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=15394 Your paranoid android. === w8 (32 bit sysparams) === sysparams.c:2488: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2501: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

1 0

Re: [PATCH 2/2] d3drm/tests: Add version specific tests for CreateDeviceFrom* methods. (try 3)
by Stefan Dösinger 17 Jul '15

17 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Sorry, there are always more issues to find :-( . Am 2015-07-16 um 18:08 schrieb Aaryaman Vasishta: > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > ... > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); The if check here is redundant. I expect Coverity to complain about this sooner or later... (version 2 and 3 are affected too) > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, clipper, &driver, 0, 0, &device3); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > ... > + /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ > + hr = IDirect3DRM3_CreateDeviceFromClipper(d3drm3, NULL, &driver, 0, 0, &device3); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); Does it return D3DRMERR_BADVALUE because clipper is NULL or because width / height are 0? Don't test two error conditions at once, unless both return a different error and you want to test the priority of the error handling. (version 2 and 3 are affected too) > + /* What happens if we don't pass D3DRMDEVICE_NOZBUFFER and still not attach our own depth surface? */ > + hr = IDirect3DRM3_CreateDeviceFromSurface(d3drm3, &driver, ddraw, surface, D3DRMDEVICE_NOZBUFFER, &device3); > + ok(SUCCEEDED(hr), "Cannot create IDirect3DRMDevice3 interface (hr = %x).\n", hr); Please also test what happens when you have an already attached depth surface and do *not* pass D3DRMDEVICE_NOZBUFFER. I suspect that it either works like version 2 (your surface is kept, no error), or that it returns an error (because AddAttachedSurface fails). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVqLmUAAoJEN0/YqbEcdMw3L8P/iqw4zcu9MbgJsfvM7MBLqZa OEbQ5SyYot/QTPqGL1TPujjLIkm4q557Ban2ZBcN3lPSWscJ5KQoo2sKedWfu/yi Y47Cvwqggrx7FUOpdNEdp4311eDQ3xo6wYklhzVAUXqQ4cZRmjm6clhMlIW1PPfX v2iJSNg4xTBqABH6xz+bapO29QpDqq5KuWTRtUuzGFZt9N1cvCzgNHRPmMtlpiCp ray9/trglSQzsqbyamRD5Tr9Cd8bpSgxrtF7juIVc1MEBISuJquN+Hv/I3qqKgUb SZkf3yDmEoKeRrCHgfESR9j9gkzH6Iy0R01GWIVdQCshyW36rNI6NwP8zBu9kaeq psHeFv0Rp0Ed4OKqc+WT+OwagEaH9TwBXmd/JruOiNMQK4/q4HOVvM/10jPG+/gP /PioGPETbISnMZqZBqSJkdw/NgKoiP8AnJKxYI8GNoAPnPbkktTZ+G0T4rRJkKX/ uYEoUma38cSs6Mv0t1Qb5mxMOl6ioeBnZlGF2WxnZkAOct4Xaww2EM7fPN0dqUP3 nDGd4dU4Sj66hrb5p3nb12K/iJ+skjT0beHWQfxPDhlL9NyLDLl/96XCB/sV5S8Y qJR3irxiFgSbcm+kGsSa24GV2B1gDDGeXFDEm6rZo37jlG3ASzoOnek9HqcSgBA1 scHWj2bMxjyM39oePaek =ve5C -----END PGP SIGNATURE-----

1 0

[PATCH 0/6] [WIP] AppUserModelID implementation
by Jonas Kümmerlin 16 Jul '15

16 Jul '15

Hi, I'm currently working on implementing AppUserModelID[1] support in Wine. It's far from finished, but it's slowly getting there, so I want to show it off and get some feedback. 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. At the moment, the following features are implemented and working: - SetCurrentProcessExplicitAppUserModelID - IPropertyStore implementation on IShellLink - Exporting the AppUserModelID as WM_CLASS in the X11 driver The following things are not yet implemented, but I expect to complete them in the following weeks: - The window-specific property store (SHGetPropertyStoreForWindow) - MSI support for shortcut properties - Extracting the AppUserModelID in winemenubuilder.exe The whole thing required me to implement a fair bit of infrastructure (mostly in propsys.dll), and I am afraid that more might follow. Since I am kinda new to wine development, I appreciate any early feedback and comments. Regards Jonas Kümmerlin [1] Application User Model IDs: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378459(v=vs.85).… Jonas Kümmerlin (6): shell32: Implement process-wide explicit AppUserModelID winex11.drv: Use process-wide AppUserModelID to populate WM_CLASS ole32, propsys: Rework PROPVARIANT (de)serialization propsys: Implement named properties, serialization on the in-memory store propsys: Partially implement property stringification shell32: Properly implement IPropertyStore for shell links dlls/ole32/ole32.spec | 3 + dlls/ole32/stg_prop.c | 1711 ++++++++++++++++++++++++++++++++----- dlls/ole32/tests/propvariant.c | 55 +- dlls/propsys/propstore.c | 1088 ++++++++++++++++++++++- dlls/propsys/propsys.spec | 34 +- dlls/propsys/propsys_classes.idl | 7 +- dlls/propsys/propvar.c | 821 +++++++++++++++++- dlls/propsys/tests/Makefile.in | 2 +- dlls/propsys/tests/propstore.c | 400 ++++++++- dlls/propsys/tests/propsys.c | 460 +++++++++- dlls/shell32/shell32.spec | 1 + dlls/shell32/shell32_main.c | 109 ++- dlls/shell32/shelllink.c | 218 +++-- dlls/shell32/tests/Makefile.in | 1 + dlls/shell32/tests/appusermodel.c | 108 +++ dlls/shell32/tests/shell32_test.h | 9 + dlls/shell32/tests/shelllink.c | 123 +++ dlls/winex11.drv/window.c | 72 +- include/propidl.idl | 10 + include/propvarutil.h | 106 ++- include/shobjidl.idl | 6 + include/winbase.h | 2 + 22 files changed, 4971 insertions(+), 375 deletions(-) create mode 100644 dlls/shell32/tests/appusermodel.c -- 2.4.3

4 22

Re: [PATCH 1/4] d3d9/tests: Add a windowed GetFrontBufferData test.
by Henri Verbeet 16 Jul '15

16 Jul '15

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/d3d9/tests/visual.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 92 insertions(+) > Testbot failures aside, GetFrontBufferData() is pretty unreliable. This will (potentially) fail if e.g. a different window is covering the test window. (And the ChildWindowFromPoint() in v2 doesn't help, because it only takes other Wine windows into account.)

2 11

Re: [PATCH 2/7] winex11.drv: implement DoDragDrop on top of XDND (try 2)
by Ken Thomases 16 Jul '15

16 Jul '15

Hi, On Jul 16, 2015, at 12:38 AM, Damjan Jovanovic <damjan.jov(a)gmail.com> wrote: > Implements DoDragDrop on top of XDND. > --- > dlls/winex11.drv/clipboard.c | 50 +++ > dlls/winex11.drv/event.c | 2 + > dlls/winex11.drv/x11drv.h | 7 + > dlls/winex11.drv/xdnd.c | 837 +++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 896 insertions(+) Since you removed the parts touching the user drivers from patch 1 (at my request; thanks), doesn't this patch need to add the entry point to the .spec file? -Ken

2 1

Re: [PATCH (try 2)] user32: Scroll listbox item completely into view on LB_SETCURSEL.
by Marvin 16 Jul '15

16 Jul '15

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=15351 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

1 0

Re: [1/4] msvcirt: Implement ios static locking (try 3)
by Piotr Caban 16 Jul '15

16 Jul '15

Hi Iván, On 07/15/15 21:29, Iván Matellanes wrote: > +CRITICAL_SECTION ios_static_lock; ... > +CRITICAL_SECTION ios_static_lock = { &ios_static_lock_debug, -1, 0, 0, 0, 0 }; This will not compile when Microsoft Visual Studio is used (variable redefinition). Please use "extern". Thanks, Piotr

1 0

Re: [4/8] vcomp: Implement stub for _vcomp_fork.
by Alexandre Julliard 16 Jul '15

16 Jul '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) > +{ > + __ms_va_list valist; > + > + TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); > + > + __ms_va_start(valist, wrapper); > + _vcomp_fork_call_wrapper(wrapper, nargs, valist); > + __ms_va_end(valist); > +} Using a valist for this is questionable, even more so in the next patch where you copy it around, and doesn't buy anything over doing it in assembly from the start. -- Alexandre Julliard julliard(a)winehq.org

2 5

Re: [PATCH] user32: Scroll listbox item completely into view on LB_SETCURSEL.
by Marvin 16 Jul '15

16 Jul '15

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=15347 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:711: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:946: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === w7u (32 bit listbox) === listbox.c:452: Test failed: expected vscroll 0, got 1 listbox.c:457: Test failed: expected vscroll 1, got 2 === wvistau64 (64 bit listbox) === listbox.c:711: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:946: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18

1 0

Re: [PATCH 3/8] winex11.drv: implement DoDragDrop on top of XDND
by Sebastian Lackner 16 Jul '15

16 Jul '15

On 04.07.2015 15:36, Damjan Jovanovic wrote: > Implements DoDragDrop on top of XDND. While some of DoDragDrop() and > supporting functions are copied from ole32, they were modified to be > non-blocking and event-driven. > > The clipboard is patched to allow searching its clipboard formats for > X11 atoms, export data in X11 format, and forward selection requests > for the XdndSelection selection to XDND. > > We support XDND version 3 to 5 (although we still need XdndProxy > support for version 4). XdndPosition messages are rate-limited to at > most 1 unreplied message and at least every 50 milliseconds apart, so > that we don't flood slow X11 clients like the spec warns. > > Damjan Jovanovic > --- > dlls/winex11.drv/clipboard.c | 50 +++ > dlls/winex11.drv/event.c | 2 + > dlls/winex11.drv/x11drv.h | 7 + > dlls/winex11.drv/xdnd.c | 829 ++++++++++++++++++++++++++++++++++++++++++- > 4 files changed, 887 insertions(+), 1 deletion(-) Thanks for working on this. Sorry for the delayed reply, I've been a bit busy during the last days. Not sure if you have already started improving the patches, but I'll just comment on this version. First of all, regarding patch 2, applying such a patch separately doesn't make much sense. Either the design is accepted (then it can be part of patch 3), or it needs additional work, but then its questionable if the function can be used without further modifications. At first I was planning to give line by line feedback on the patch, but I think you are more interested in general feedback about the design. One of the main disadvantages I see in the current approach is that there is a lot of code duplication in winex11 and ole32. It will get even worse as soon as someone starts implementing the same for winemac or other future backends. I am aware that Ken Thomases basically asked for such a solution, but I don't think its the right approach. There are basically two ways to solve it: * Either the code in winex11 has to be stripped down a lot. A more minimalistic solution has better chances to be accepted, and as soon as winemac contains a similar implementation, the code in ole32 could be removed. When we need a huge statemachine though, its better to avoid duplication. * Alternatively, instead of duplicating code, the winex11/winemac backend could provide a function pointer table or separate exports, with callbacks for things which can be done natively. Ole32 could use these callbacks to register the format, query if it dragging was finished, and so on. To avoid polling, the driver could also post window messages to the "TrackerWindow". If you need any help, feel free to ask. Also feel free to show proof-of-concept patches even when they are not finished yet, for example via IRC or wine-devel. As a side note, it looks like various parts of your patch lack proper locking, but thats not your fault, its already missing in the existing winex11 code. I'll see if I can clean up the existing code a bit to simplify the integration of such a new feature. Best regards, Sebastian

2 1

Re: [PATCH 2/2] d3drm: Add version specific tests for CreateDeviceFrom* methods. (try 2)
by Marvin 15 Jul '15

15 Jul '15

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=15326 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73

1 0

Re: [PATCH 1/2] d3drm/tests: Fix leaks while creating device in tests (Valgrind) (try 2)
by Marvin 15 Jul '15

15 Jul '15

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=15325 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB

1 0

WineConf 2015 RSVP
by Stefan Dösinger 15 Jul '15

15 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Jeremy Newman has set up a simple form to register for WineConf: https://www.winehq.org/wineconf/rsvp . If you're planning to attend the conference please fill out this form. This allows us to give the hotel a better guest estimate to prepare the conference room. The link can of course be found at the WineConf 2015 wiki page: http://wiki.winehq.org/WineConf2015 . Thanks, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVppXBAAoJEN0/YqbEcdMwlwIP/jmLTAGgjm++2oE4NtznKisw TKdclyHGxsi//iVSPJ3TGH+GZdjd1ymcnoNthIWxHJfnDBxm/eqeNDsyRcOEEtAg g/qgiTa1dToWdb9lkyJKqU7MJioYOnDXDruhn1C9+3LUVkQE1hdSvMlIq2+4iRoX s2A+pkT1Gz8qfn/QXjrReZ5ZswvqaqNTWvfBtXRKxzHw/IhtEA5KnNDyQAfB1GiM B5gbWr5GWe200LDnxAu4L0wduznnFA4GKPtdOYByFHGT3eXUShCB8q6vCTBIVvq3 grZSAdE08p7XLj9f41YIN/P5LpjB40zdvns/KxtkYOmLsCF49npLptQrbxgCqWqz +1W2mdcRKu8Y7EusLB+Oa9shwfgIMO2wiRIGiRvxRB2w3h4Yg3IvYMaha+YczYa3 4+iaDgSLwwfTi5OKhK0zV+8JYyWzWaSSRlBm0MFS407i+DHkFtTWtmktQrG20LGG tcdTWRlD02GvjxWbuF3iMDwk2DRJl9wAY4PH9Z2VyR15i3w2Bs00FmY+Td4L38GS otw4EozknMNd/MBv7ijWrDaiEw1GMrkhh1b+wbxKmw/Ac2x+tBNtcLM8R00PuxK3 corVb1WzkRbIjCNPpQ0YS2C/8OVFh/k0ScO5R5+au0L0FepUxKg91A94hOH0KJk/ waKBRJ23gYN55NlsIh8J =KVcj -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/5] d3drm: Add version specific tests for CreateDeviceFrom* methods.
by Marvin 15 Jul '15

15 Jul '15

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=15324 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73 === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409C73

1 0

Need a new subscriber password
by Aaryaman Vasishta 15 Jul '15

15 Jul '15

Hello, Please provide me with a new password as I've forgotten the old one for this list. Thanks! Jam

2 1

Re: [PATCH 1/5] d3drm/tests: Fix leaks while creating device in tests (Valgrind)
by Marvin 15 Jul '15

15 Jul '15

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=15323 Your paranoid android. === w2000pro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === wxppro (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB === w2003std (32 bit d3drm) === d3drm: unhandled exception c0000005 at 00409DAB

1 0

Re: [PATCH 1/5] d3drm/tests: Fix leaks while creating device in tests (Valgrind)
by Aaryaman Vasishta 15 Jul '15

15 Jul '15

This fixes bug #38913. https://bugs.winehq.org/show_bug.cgi?id=38913 On Wed, Jul 15, 2015 at 5:23 PM, Aaryaman Vasishta < jem456.vasishta(a)gmail.com> wrote: > --- > dlls/d3drm/tests/d3drm.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 1816214..8c1c9d6 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1999,10 +1999,14 @@ static void test_create_device_from_clipper(void) > > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 0, 0, &device2); > todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > + if (FAILED(hr)) > + IDirect3DRMDevice2_Release(device2); > > /* If NULL is passed for clipper, CreateDeviceFromClipper returns > D3DRMERR_BADVALUE */ > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 0, > 0, &device2); > todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == > D3DRMERR_BADVALUE, got %x.\n", hr); > + if (FAILED(hr)) > + IDirect3DRMDevice2_Release(device2); > > hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, > 300, 200, &device2); > ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = > %x).\n", hr); > -- > 2.3.2 (Apple Git-55) > >

1 1

Processing flags before files in regsvr32
by Hugh McMaster 15 Jul '15

15 Jul '15

After investigating bug 38870 [1], I came up with some possible solutions to this problem. 1. Duplicate argv. 2. Copy the filename argument into a dynamically allocated array. 3. Copy the filename's iteration number (the 'n' of argv[n]) into a dynamically allocated array. 4. Use NULL pointers after processing to determine whether an argument is a flag or a filename. Of these answers, option four is the lightest and easiest to implement. It is also efficient. The idea is to assign argv[i] = NULL after we have processed an argument that is a flag. So, I'm proposing something like this pseudo-code (there is an actual diff below): for (i = 1; i < argc; i++) { if (is a flag) { do something; argv[i] = NULL; } } for (i = 1; i < argc; i++) { if (argv[i]) /* only filenames are valid */ do something; } diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 449124f..ef895e0 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -270,8 +270,13 @@ int wmain(int argc, WCHAR* argv[]) output_write(STRING_USAGE); return 1; } + argv[i] = NULL; } - else + } + + for (i = 1; i < argc; i++) + { + if (argv[i]) { WCHAR *DllName = argv[i]; int res = 0; The proposed changes work correctly, both with a test DLL and also MediaInfo program from the bug. Any comments and suggestions are welcome. [1] https://bugs.winehq.org/show_bug.cgi?id=38870

2 2

Re: [4/7] msvcirt: Implement ios static locking (resend)
by Piotr Caban 15 Jul '15

15 Jul '15

On 07/13/15 21:39, Iván Matellanes wrote: > > +/* ?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A */ > +CRITICAL_SECTION ios_static_lock; > /* ?unsetf@ios@@QAEJJ@Z */ > @@ -1322,6 +1327,12 @@ static void init_io(void *base) > init_streambuf_rtti(base); > init_ios_rtti(base); > #endif > + InitializeCriticalSection(&ios_static_lock); > +} > + > +static void free_io(void) > +{ > + DeleteCriticalSection(&ios_static_lock); > } Please initialize the critical section statically (e.g. MSVCRT_file_cs is initialized that way in dlls/msvcrt/file.c). Thanks, Piotr

1 0

Re: [1/2] gdi32: EnumFontFamilies should enumerate substituted fonts when directly asked for.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > I.e. EnumFontFamilies(NULL) won't enumerate substituted fonts, but > EnumFontFamilies("MS Shell Dlg") will do. > > Part1 of the fix for bug 19289. It breaks the tests here: ../../../tools/runtest -q -P wine -T ../../.. -M gdiplus.dll -p gdiplus_test.exe.so font && touch font.ok font.c:756: Test failed: wrong face name MS Shell Dlg font.c:767: Test failed: wrong face name MS Shell Dlg -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: dwrite: Fix transform matrix usage for pixel snapping
by Marvin 14 Jul '15

14 Jul '15

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=15314 Your paranoid android. === wvistau64 (64 bit layout) === layout.c:3395: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 === w2008s64 (64 bit layout) === layout.c:3395: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859 layout.c:3408: Test failed: 27: got 12.001999, expected 12.002001, baseline 12.005859

1 0

Re: msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument().
by Nikolay Sivov 14 Jul '15

14 Jul '15

On 14.07.2015 15:09, Zhenbo Li wrote: > --- > dlls/msxml3/element.c | 2 ++ > dlls/msxml3/tests/domdoc.c | 3 +++ > 2 files changed, 5 insertions(+) > 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.

1 0

Re: [1/2] windowscodecs/tests: Add some tests for loading truncated GIF images.
by Vincent Povirk 13 Jul '15

13 Jul '15

Series looks good to me, but I'm not sure what you're trying to pull by putting an obviously correct fix in a patch labeled "tests".

2 1

Re: gdiplus: Move the burden of supporting GIF encoding to the WIC backend.
by Vincent Povirk 13 Jul '15

13 Jul '15

I don't have a strong opinion on this, but committing this before we have support in WIC seems a bit sideways? What we were doing before was broken, but this just makes it broken in a different way. Before, we weren't reporting all formats native does, but now we're reporting formats we can't encode. So, this is just going to break or fix applications at random?

2 1

Re: windowscodecs: Add support for 8bpp grayscale TIFF with 8bpp alpha.
by Vincent Povirk 13 Jul '15

13 Jul '15

Looks good to me, thanks.

1 0

Re: [PATCH 4/5] wined3d: Don't run check_filter() on core contexts.
by Henri Verbeet 13 Jul '15

13 Jul '15

On 10 July 2015 at 00:06, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > The code uses glBegin() / glEnd() and other APIs removed from core > profile. > --- > In theory we could fix check_filter() to work on core profile but it > doesn't seem to be useful there. I probably agree about the limited usefulness of check_filter() on core profiles, but at the same time it seems that most of the functionality needed to make it work there would be needed for other capability tests anyway.

3 3

Re: (resend 2)[2/5]hidclass.sys: Implement a report ring buffer
by Henri Verbeet 13 Jul '15

13 Jul '15

On 10 July 2015 at 21:39, Aric Stewart <aric(a)codeweavers.com> wrote: > +typedef struct __ReportRingBuffer Did you borrow this from somewhere? Identifiers starting with double underscore are reserved. (And using a single underscore instead isn't much better.) The naming is also inconsistent with the existing code. And I have to say that goes for much of the rest of the series as well. There seems to be no consistent style from one patch to the next, and sometimes within the same structure. (E.g. __WINE_ELEMENT, __WINE_HID_REPORT, etc.) And of course most of this patch is unused code until patch 5/5 when RingBuffer_Create() is actually called. > +struct __ReportRingBuffer* RingBuffer_Create(UINT buffer_size) > +{ > + ReportRingBuffer *ring; > + ring = HeapAlloc(GetProcessHeap(), 0, sizeof(*ring)); > + if (!ring) > + return NULL; > + ring->start = ring->end = 0; > + ring->size = 32; > + ring->buffer_size = buffer_size; > + ring->pointer_alloc = 5; > + ring->pointers = HeapAlloc(GetProcessHeap(), 0, sizeof(int) * 5); > + memset(ring->pointers, 0xff, sizeof(int) * 5); > + ring->buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size * ring->size); > + InitializeCriticalSection(&ring->lock); > + ring->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RingBuffer.lock"); > + return ring; > +} Why handle allocation failure for "ring", but not for "ring->pointers" and "ring->buffer"? Why did you pick "5" for the initial size of "ring->pointers"? Seems like an odd choice. > +VOID RingBuffer_Destroy(struct __ReportRingBuffer *ring) Why use "VOID"? Are you concerned "void" may not be available? > + if (size < 2 || size > 256 || size == ring->size) > + return; What's special about 2 and 256? And if this does nothing, why would you ever call the function like that? > + new_buffer = HeapAlloc(GetProcessHeap(), 0, ring->buffer_size * size); > + HeapFree(GetProcessHeap(), 0, ring->buffer); > + ring->buffer = new_buffer; Why bother with "new_buffer" if you're not going to handle failures?

2 2

Re: [PATCH 2/5] rpcrt4: Set CorrDespIncrement to the size of the (non-range) /robust payload.
by Dmitry Timoshkov 13 Jul '15

13 Jul '15

Huw Davies <huw(a)codeweavers.com> wrote: > +static void test_NdrCorrelationInitialize(void) > +{ > + MIDL_STUB_MESSAGE stub_msg; > + BYTE buf[256]; > + > + memset( &stub_msg, 0, sizeof(stub_msg) ); > + memset( buf, 0, sizeof(buf) ); > + > + NdrCorrelationInitialize( &stub_msg, buf, sizeof(buf), 0 ); > + ok( stub_msg.CorrDespIncrement == 2 || > + broken(stub_msg.CorrDespIncrement == 0), /* <= Win 2003 */ > + "got %d\n", stub_msg.CorrDespIncrement ); > + > + stub_msg.CorrDespIncrement = 1; > + NdrCorrelationInitialize( &stub_msg, buf, sizeof(buf), 0 ); > + ok( stub_msg.CorrDespIncrement == 1, "got %d\n", stub_msg.CorrDespIncrement ); > +} Probably having memset() calls before both tests would make it more convincing. -- Dmitry.

2 1

Re: (resend 2)[1/5]hidclass.sys: Implement helper IoCallMinidriver
by Henri Verbeet 13 Jul '15

13 Jul '15

On 10 July 2015 at 21:39, Aric Stewart <aric(a)codeweavers.com> wrote: > +NTSTATUS IoCallMinidriver(ULONG code, DEVICE_OBJECT *device, VOID *in_buff, ULONG in_size, VOID *out_buff, ULONG out_size) DECLSPEC_HIDDEN; This is unused until patch 3/5. It also seems like a really bad idea to name internal helper functions like Windows functions. > + if (out_size) > + { > + buffer = HeapAlloc(GetProcessHeap(), 0, out_size); > + memcpy(buffer, out_buff, out_size); > + } Either out_buff and out_size are really badly named, or this is really suspicious.

2 1

Re: [1/2] gdi32: EnumFontFamilies should enumerate substituted fonts when directly asked for.
by Marvin 13 Jul '15

13 Jul '15

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=15259 Your paranoid android. === w2000pro (32 bit font) === font.c:4054: Test failed: Times New Roman Baltic should be enumerated font.c:4056: Test failed: Times New Roman Baltic should be enumerated === wvistau64 (32 bit font) === The test timed out === wvistau64 (64 bit font) === The test timed out

1 0

Re: d3drm: Add stubs for IDirect3DRMDevice methods.
by Stefan Dösinger 13 Jul '15

13 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, You aren't returning the version 1 interface from QueryInterface. Am 2015-07-11 um 14:40 schrieb Aaryaman Vasishta: > if (IsEqualGUID(riid, &IID_IDirect3DRMDevice3)) > *out = (IUnknown*)&object->IDirect3DRMDevice3_iface; > - else > + else if (IsEqualGUID(riid, &IID_IDirect3DRMDevice2)) > *out = (IUnknown*)&object->IDirect3DRMDevice2_iface; > + else > + *out = (IUnknown*)&object->IDirect3DRMDevice_iface; You can call QueryInterface instead of doing GUID checks like this. Just initialize ref = 0, then call QI and you'll return a ref = 1 device. Another option, if you like this better, is to always return e.g. a IDirect3DRMDevice3 from Direct3DRMDevice_create, remove the riid parameter and do the QueryInterface in the caller. In this case init the refcount to 1 and call device3_Release in the caller after calling QI to obtain the right interface. The first 3 patches look good to me. I'll ack them tomorrow. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVok1NAAoJEN0/YqbEcdMwlFcQAJUgHXSjnseG9zIMJuKwiOoU K0IeSIAODnpT/+Mqc307owC7WBnKhTu4XLmZA1F7NxTxqdIcH85BsYx/LdLSeipq Y9KnTOg6dD00bNrujqyoZ5RmFI/pA+BXwhNXrwfbFg+RLr21ecQTpfRuDn3ENmPM VjWPHsfd4QIRqd+0Qo4LHAAS4UDmMm/avLdN+Gh5AOsDvOQYWW6reaerxYz6k61h rlkZwu1gLsSFTsA/PGz4W3nacVZkfcH8JourB80CJ/+bdPj1DfVImCpa2sx/WQ3g KMzwmR4MnS0n8/F2wGsqx/VMIKQ3zBblWVy4ZkZaMao6wA5IOoISSFXWrQlfUZrS GU5sRGwyVlaYK8qCzBOn3TdHhrrNLpg5hHkCqpN2JM1IgNYVaMevjZ+ISJhvaKXO GlQKwxOdB0M/SRWIPQ2261eQG/31lGEYm9ocu7i4USmNkaVZZCKlBt6wqsbmj6hF 7J2eU2KtfUoJwRozZRPaEdcKa0Xdp9AfrOrq4wilvEpIuUBI2leVVpOBQrbDD1c6 Z7/z8I1hmIw8ZPNl9NIIx7IyRrtnV3GBFG8rmWfRkHMMmIlZKqnC7+Yzgj5UF7Ai vr89VCzoAGj1Du/Xr8x5vmciLAdoRVNNTqV6QTPYqOgOQkodyls8RxH/IwM1sH/6 ZHUuK1kI7/vyX2WkYPi1 =1vdj -----END PGP SIGNATURE-----

3 3

Looking at Bugzilla Bug 38665 - Toontown Rewritten Launcher under Wine/FreeBSD gives "ValueError: Empty certificate data"
by Neel Chauhan 12 Jul '15

12 Jul '15

Hi, Can you please look at the Wine Bugzilla Bug 38665. The URL is: https://bugs.winehq.org/show_bug.cgi?id=38665 Thanks, Neel Chauhan

1 0

Re: (resend)[1/5]hidclass.sys: Implement helper IoCallMinidriver
by Dmitry Timoshkov 10 Jul '15

10 Jul '15

Aric Stewart <aric(a)codeweavers.com> wrote: > +HRESULT IoCallMinidriver(ULONG code, PDEVICE_OBJECT device, PVOID in_buff, ULONG in_size, PVOID out_buff, ULONG out_size) What 'HRESULT' is supposed to represent in the kernel space? (Especially when actually an NTSTATUS is being returned). That applies to all patches in the series. Also it would be nice to get rid of all LPJUNK style types used all over the place. -- Dmitry.

3 2

Re: [PATCH 5/5] wined3d: Don't install fog compatibility wrappers in core profile contexts.
by Stefan Dösinger 10 Jul '15

10 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-07-10 um 00:06 schrieb Matteo Bruni: > - if (!gl_info->supported[EXT_FOG_COORD]) > + if (!gl_info->supported[EXT_FOG_COORD] && gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) Shouldn't that depend on the chosen vertex pipeline implementation rather than the context type? I don't think we need those wrappers in legacy contexts if we're using GLSL for vertex processing. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVn66UAAoJEN0/YqbEcdMwwaMP/1NL3D/IB/tP6Ch1CH/SkwLc LVHe5/NZNTJNXCAj3EH+8yKvDZig3aC3yNemO+KZhu+UKdK4iOeoJeHGAxyu1Fa+ d4Vh8aMyG8QFfKDIiaRG8/qxL18HwBBVnp0KtAq2eOB8847XdL0sXGPW0SHiDaWZ 57oE3W85Ym1hfdn6RhRx0QGMFsLlil5d9vd6IF8yAXluItNNH+SDxdVmBwg2IfrA hpH6f5GcEtqG4VZd8ete6DwgEqEQDtvqdlRlcf/HTUSu8RF0Kr+y0SC00Q1NUfEb /QHboR9Vc1Uwca8MZqm9PgsT9aeZgHv5f7K79AewFUnHqj7ZckGM9ptHuPS2pWzM ChHNghvP22LCnhndKl71WJqFTCobGfjNwmD3+ffedBmu7UNLfl2hKSbQCpr3cCCa NDxKlUATuZWKpqJfGrcMbt10grgGolZfbGM99/ngQdeILZc7uwHXveGQJYlerrCz s89ey8dQydozL/sh9QCllcUI58DVE0DOx7rYlvI4/mZMD1+E131JAdIiqDWQYnS5 EVViK+uBXYWTGlTOg1btU9TK0gpzcBSCu3WEfV+BnjhZdR18jQfOzYD1hvy8c36A wBalWpvI6Iqbe/5f32MniyBFaJA2CCaqqZgd5sVx3Y0Y7mhfMk/kgC0vdc9h4tgh N77kUu44pDmGazZwxmjM =6Cds -----END PGP SIGNATURE-----

2 1

Re: msi/tests: Avoid test failures on win2k3.
by Marvin 10 Jul '15

10 Jul '15

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=15219 Your paranoid android. === wvistau64 (32 bit install) === The test timed out === w7u (32 bit install) === Failure running script in VM: timed out waiting for the child process

1 0

Re: crossover programs missing from source code
by Theodore Dubois 10 Jul '15

10 Jul '15

I'm not really interested in the source code, I just want to know what the programs do. And yes, I forgot about ntoskrnl, the only dll with an exe extension. I generated that list using ls, grep, and diff, and didn't look over it that carefully. ~Theodore On Jul 05, 2015, at 10:09 AM, Ben Klein <shacklein(a)gmail.com> wrote: In particular, all the cx* programs are Crossover-specific and should not appear in upstream wine at any point. On 6 July 2015 at 02:07, Vincent Povirk <madewokherd(a)gmail.com> wrote: The LGPL doesn't require us to publish the source code of individual .exe.so or .dll.so binaries if we're not basing them on LGPL code. I haven't checked the whole list, but most of these are programs CodeWeavers developed internally and thus controls the copyright on, and they mostly exist for integration with other components of CrossOver. That doesn't mean we can't or shouldn't publish the code, just that we probably haven't considered it. At the very least, I think we want to publish the source code of anything that exists for Windows compatibility. Note that ntoskrnl.exe is actually in the dlls/ directory of the Wine source tree, and it should be there in the CrossOver/Wine source code as well.

3 3

Re: Adding RID_TYPEHID RawInput support to user32
by Aric Stewart 10 Jul '15

10 Jul '15

On 7/6/15 10:53 AM, Nathan Schulte wrote: > On 07/06/2015 07:40 AM, Aric Stewart wrote: >> Hello there, Sorry for the delay I was away on vacation until today. >> >> Yes, RawInput support should go through hid.dll. That is actually part of the reason I am doing the hid work the ways I am doing it. I want to be able to fully and correctly support RawInput as well as dinput, xinput and winmm joysticks. >> >> For wine work, you can have all the user32 stuff using the hid.dll HidD_ and HidP_ functions as they can be considered user land work. If you find there are HidD_ or HidP_ function you need that are not implemented, then that can be done. >> >> Right now the hid.dll work has gotten in but I am just starting to get the underlying hid minidriver work in place. Without the minidriver work hid.dll will not do much. > > I found your recent discussion from April ("Wine Joysticks, seeking a plan"), as well as reviewed your current work to hid.dll. I've been learning about the stack as I go along, but it seems documented enough to get a grasp of. These are the minidrivers you're talking about? > > https://msdn.microsoft.com/en-us/library/windows/hardware/jj131707(v=vs.85)… > > You're thinking of creating one per platform/API (on the hosting side: Linux/evdev, (Unix/Linux?) X11, Unix/Mac *), or mirroring MS's setup? I'm not sure how the loading of those libraries works (I did see the HidRegisterMinidriver routine though), so maybe the question is inaccurate. So the next round of patches have been submitted so you can see my hidclass and minidriver work. The goal is to have all the system native minidriver be in the winehidminidriver.sys so that it can be independent from the graphics driver. Wine's hidclass.sys can handle multiple minidrivers in one service, so we should not need independent minidrivers for every platform. Which should be handy. > > On 07/06/2015 07:40 AM, Aric Stewart wrote: >> Yes all the user32 work will need to be done. >> >> Xinput is on my goal list also. Xinput should also be a client of hid.dll > > Sounds good. I'll try to help where I can. It sounds like I need to become more familiar with the system before I'm really useful. There are 3 places I can really use help. 1) Review patches: I always love good reviews on my patches. Leads to stronger code. 2) Above hid.dll: This is doing the development work on RawInput, Xinput, Dinput and such to become clients of the user level hid.dll functions to access joysticks and gamepads. This should mostly be learning the respective APIs and hooking them into HID. RawInput is probably the easiest as it does not do much with the HID reports other than just pass them on. 3) Linux minidrivers: I have implemented the OS/X minidriver because that is what I am most familiar with. There is work to implement the linux and linuxinput minidrivers. This is for someone familiar with or wants to become familiar with the lower level linux interfaces. -aric

3 7

wine CPU usage and CreateWaitableTimer
by andrea 09 Jul '15

09 Jul '15

Hi, I'm trying to understand why AppleWin uses 100% CPU when running in wine vs ~1% in Windows. my case is wine 1.7.43 vs Windows 7 https://appdb.winehq.org/objectManager.php?sClass=version&iId=29403 https://bugs.winehq.org/show_bug.cgi?id=34945 basically 97% time is spent in a WaitForSingleObject on a semaphore signalled by a DirectSound IReferenceClock via AdvisePeriodic. The timer period is set to 1 millisecond. I have tried an other Windows call to create the timer: CreateWaitableTimer The latter uses about 50% CPU, so it is much better, but still not very good. This is true even on a simple app that does nothing other than waiting for this timer all the time. Does anybody know 1) is this normal? should these waits be almost free like they are in Windows? 2) what is the best implemented timer in wine that can be used for a periodic event (~1ms)? Thanks

3 10

Re: [5/7] ntdll: Implement RtlDecompressFragment.
by Matteo Bruni 09 Jul '15

09 Jul '15

Hi, a bunch of nitpicks which you can take or ignore: 2015-07-09 3:07 GMT+02:00 Sebastian Lackner <sebastian(a)fds-team.de>: > Based on a patch by Michael Müller. > > For https://bugs.winehq.org/show_bug.cgi?id=37449 > > --- > dlls/ntdll/ntdll.spec | 2 > dlls/ntdll/rtl.c | 214 ++++++++++++++++++++++++++++++++++-- > dlls/ntdll/tests/rtl.c | 3 > dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 > 4 files changed, 210 insertions(+), 11 deletions(-) > > diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec > index 75dc647..ca3561d 100644 > --- a/dlls/ntdll/ntdll.spec > +++ b/dlls/ntdll/ntdll.spec > @@ -513,7 +513,7 @@ > @ stdcall RtlDecodePointer(ptr) > # @ stub RtlDecodeSystemPointer > @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) > -@ stub RtlDecompressFragment > +@ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) > @ stub RtlDefaultNpAcl > @ stub RtlDelete > @ stdcall RtlDeleteAce(ptr long) > diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c > index d9e448a..9a196d2 100644 > --- a/dlls/ntdll/rtl.c > +++ b/dlls/ntdll/rtl.c > @@ -1309,17 +1309,219 @@ NTSTATUS WINAPI RtlCompressBuffer(USHORT format, PUCHAR uncompressed, ULONG unco > } > } > > +/* decompress a single LZNT1 chunk */ > +static PUCHAR lznt1_decompress_chunk(UCHAR *dst, ULONG dst_size, UCHAR *src, ULONG src_size) PUCHAR -> UCHAR * > +{ > + UCHAR *src_cur = src, *src_end = src + src_size; > + UCHAR *dst_cur = dst, *dst_end = dst + dst_size; > + ULONG displacement_bits, length_bits; > + ULONG code_displacement, code_length; > + WORD flags, code; > + > + while (src_cur < src_end && dst_cur < dst_end) > + { > + flags = 0x8000 | *src_cur++; > + while ((flags & 0xFF00) && src_cur < src_end) It looks like we're mostly using lowercase in hex literals. > + { > + if (flags & 1) > + { > + /* backwards reference */ > + if (src_cur + sizeof(WORD) > src_end) > + return NULL; > + > + code = *(WORD *)src_cur; > + src_cur += sizeof(WORD); > + > + /* find length / displacement bits */ > + for (displacement_bits = 12; displacement_bits > 4; displacement_bits--) > + if ((1 << (displacement_bits - 1)) < dst_cur - dst) break; > + > + length_bits = 16 - displacement_bits; > + code_length = (code & ((1 << length_bits) - 1)) + 3; > + code_displacement = (code >> length_bits) + 1; > + > + if (dst_cur < dst + code_displacement) > + return NULL; > + > + /* copy bytes of chunk - we can't use memcpy() > + * since source and dest can be overlapping */ I would also mention that you can't use memmove() either because you actually want to copy any overlapping byte over and over again, as necessary. > + while (code_length--) > + { > + if (dst_cur >= dst_end) return dst_cur; > + *dst_cur = *(dst_cur - code_displacement); > + dst_cur++; > + } > + } > + else > + { > + /* uncompressed data */ > + if (dst_cur >= dst_end) return dst_cur; > + *dst_cur++ = *src_cur++; > + } > + flags >>= 1; > + } > + } > + > + return dst_cur; > +} > + > +/* decompress data encoded with LZNT1 */ > +static NTSTATUS lznt1_decompress(UCHAR *dst, ULONG dst_size, UCHAR *src, ULONG src_size, > + ULONG offset, ULONG *final_size, UCHAR *workspace) > +{ > + UCHAR *src_cur = src, *src_end = src + src_size; > + UCHAR *dst_cur = dst, *dst_end = dst + dst_size; > + ULONG chunk_size, block_size; > + WORD chunk_header; > + UCHAR *ptr; > + > + if (src_cur + sizeof(WCHAR) > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + /* skip over chunks which have a distance >= 0x1000 to the destination offset */ > + while (offset >= 0x1000 && src_cur + sizeof(WCHAR) <= src_end) > + { > + chunk_header = *(WORD *)src_cur; > + src_cur += sizeof(WCHAR); Why this mixing of WORD and WCHAR? They do match in practice but still... > + if (!chunk_header) goto out; > + chunk_size = (chunk_header & 0xFFF) + 1; > + > + if (src_cur + chunk_size > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + src_cur += chunk_size; > + offset -= 0x1000; > + } > + > + /* check if a chunk is included partially */ > + if (offset && src_cur + sizeof(WCHAR) <= src_end) > + { > + chunk_header = *(WORD *)src_cur; > + src_cur += sizeof(WCHAR); > + if (!chunk_header) goto out; > + chunk_size = (chunk_header & 0xFFF) + 1; > + > + if (src_cur + chunk_size > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + if (dst_cur >= dst_end) > + goto out; > + > + if (chunk_header & 0x8000) > + { > + /* compressed chunk */ > + if (!workspace) return STATUS_ACCESS_VIOLATION; > + ptr = lznt1_decompress_chunk(workspace, 0x1000, src_cur, chunk_size); I guess in theory you could avoid decompressing the whole chunk if you need less than the whole chunk to be decompressed. It's not strictly required though so if doing that makes the code too convoluted then ignore it. > + if (!ptr) return STATUS_BAD_COMPRESSION_BUFFER; > + if (ptr - workspace > offset) > + { > + block_size = min((ptr - workspace) - offset, dst_end - dst_cur); > + memcpy(dst_cur, workspace + offset, block_size); > + dst_cur += block_size; > + } > + } > + else > + { > + /* uncompressed chunk */ > + if (chunk_size > offset) > + { > + block_size = min(chunk_size - offset, dst_end - dst_cur); > + memcpy(dst_cur, src_cur + offset, block_size); > + dst_cur += block_size; > + } > + } > + > + src_cur += chunk_size; > + } > + > + /* remaining blocks */ > + while (src_cur + sizeof(WCHAR) <= src_end) > + { > + chunk_header = *(WORD *)src_cur; > + src_cur += sizeof(WCHAR); > + if (!chunk_header) goto out; > + chunk_size = (chunk_header & 0xFFF) + 1; > + > + if (src_cur + chunk_size > src_end) > + return STATUS_BAD_COMPRESSION_BUFFER; > + > + /* fill space with padding */ > + block_size = ((dst_cur - dst) + offset) & 0xFFF; > + if (block_size) > + { > + block_size = 0x1000 - block_size; > + if (dst_cur + block_size >= dst_end) > + goto out; > + memset(dst_cur, 0, block_size); > + dst_cur += block_size; > + } I'm probably dense but I don't follow this padding part. Don't you still need to memset to 0 the "remaining part" even if dst_end <= dst_cur + block_size (obviously stopping at dst_end) and then proceed to decompress the chunk? Unless you're not supposed to decompress the last chunk in that case? > + > + if (dst_cur >= dst_end) > + goto out; > + > + if (chunk_header & 0x8000) > + { > + /* compressed chunk */ > + dst_cur = lznt1_decompress_chunk(dst_cur, dst_end - dst_cur, src_cur, chunk_size); > + if (!dst_cur) return STATUS_BAD_COMPRESSION_BUFFER; > + } > + else > + { > + /* uncompressed chunk */ > + block_size = min(chunk_size, dst_end - dst_cur); > + memcpy(dst_cur, src_cur, block_size); > + dst_cur += block_size; > + } > + > + src_cur += chunk_size; > + } > + > +out: > + if (final_size) > + *final_size = dst_cur - dst; > + > + return STATUS_SUCCESS; > + > +} > + > +/****************************************************************************** > + * RtlDecompressFragment [NTDLL.@] > + */ > +NTSTATUS RtlDecompressFragment(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, > + PUCHAR compressed, ULONG compressed_size, ULONG offset, > + PULONG final_size, PVOID workspace) > +{ > + TRACE("0x%04x, %p, %u, %p, %u, %u, %p, %p\n", format, uncompressed, > + uncompressed_size, compressed, compressed_size, offset, final_size, workspace); > + > + switch (format & ~COMPRESSION_ENGINE_MAXIMUM) > + { > + case COMPRESSION_FORMAT_LZNT1: > + return lznt1_decompress(uncompressed, uncompressed_size, compressed, > + compressed_size, offset, final_size, workspace); > + > + case COMPRESSION_FORMAT_NONE: > + case COMPRESSION_FORMAT_DEFAULT: > + return STATUS_INVALID_PARAMETER; > + > + default: > + FIXME("format %u not implemented\n", format); > + return STATUS_UNSUPPORTED_COMPRESSION; > + } > +} > + > + > /****************************************************************************** > * RtlDecompressBuffer [NTDLL.@] > */ > -NTSTATUS WINAPI RtlDecompressBuffer(USHORT CompressionFormat, PUCHAR UncompressedBuffer, > - ULONG UncompressedBufferSize, PUCHAR CompressedBuffer, > - ULONG CompressedBufferSize, PULONG FinalUncompressedSize) > +NTSTATUS WINAPI RtlDecompressBuffer(USHORT format, PUCHAR uncompressed, ULONG uncompressed_size, > + PUCHAR compressed, ULONG compressed_size, PULONG final_size) > { > - FIXME("0x%04x, %p, %u, %p, %u, %p :stub\n", CompressionFormat, UncompressedBuffer, UncompressedBufferSize, > - CompressedBuffer, CompressedBufferSize, FinalUncompressedSize); > + TRACE("0x%04x, %p, %u, %p, %u, %p\n", format, uncompressed, > + uncompressed_size, compressed, compressed_size, final_size); > > - return STATUS_NOT_IMPLEMENTED; > + return RtlDecompressFragment(format, uncompressed, uncompressed_size, > + compressed, compressed_size, 0, final_size, NULL); > } > > /*********************************************************************** > diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c > index c6a7023..99fd413 100644 > --- a/dlls/ntdll/tests/rtl.c > +++ b/dlls/ntdll/tests/rtl.c > @@ -1663,11 +1663,8 @@ static void test_RtlCompressBuffer(void) > memset(buf2, 0x11, sizeof(buf2)); > status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf2, sizeof(buf2), > buf1, buf_size, &final_size); > - todo_wine > ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); > - todo_wine > ok(final_size == sizeof(test_buffer), "got wrong final_size %u\n", final_size); > - todo_wine > ok(!memcmp(buf2, test_buffer, sizeof(test_buffer)), "got wrong decoded data\n"); > ok(buf2[sizeof(test_buffer)] == 0x11, "too many bytes written\n"); > > diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > index 11d1c62..0bb7d04 100644 > --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec > @@ -977,7 +977,7 @@ > @ stub RtlCustomCPToUnicodeN > @ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) ntdll.RtlDecompressBuffer > @ stub RtlDecompressChunks > -@ stub RtlDecompressFragment > +@ stdcall RtlDecompressFragment(long ptr long ptr long long ptr ptr) ntdll.RtlDecompressFragment > @ stub RtlDelete > @ stdcall RtlDeleteAce(ptr long) ntdll.RtlDeleteAce > @ stdcall RtlDeleteAtomFromAtomTable(ptr long) ntdll.RtlDeleteAtomFromAtomTable > -- > 2.4.5 > >

2 1

Re: gdiplus: GdipConvertToEmfPlus parameter succ is optional
by Nikolay Sivov 09 Jul '15

09 Jul '15

Please add a test for this.

1 0

Re: libwine: Add support for tcc
by Alexandre Julliard 08 Jul '15

08 Jul '15

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -67,7 +67,7 @@ void DECLSPEC_NORETURN wine_switch_to_stack( void (*func)(void *), void *arg, vo > * Switch to the specified stack to call the function and return. > */ > > -#if defined(__i386__) && defined(__GNUC__) > +#if defined(__i386__) && (defined(__GNUC__) || defined(__TINYC__)) Are you planning to do this everywhere __GNUC__ is used? If so, this needs a better approach. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [7/7] msvcirt: Implement ios::unsetf
by Marvin 08 Jul '15

08 Jul '15

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=15160 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [6/7] msvcirt: Implement ios::setf
by Marvin 08 Jul '15

08 Jul '15

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=15159 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [5/7] msvcirt: Implement ios::flags
by Marvin 08 Jul '15

08 Jul '15

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=15158 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [4/7] msvcirt: Implement ios static locking (try 2)
by Marvin 08 Jul '15

08 Jul '15

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=15157 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [3/7] msvcirt: Implement ios stream locking (try 2)
by Marvin 08 Jul '15

08 Jul '15

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=15156 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [2/7] msvcirt: Implement ios object locking (try 2)
by Marvin 08 Jul '15

08 Jul '15

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=15155 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [1/7] msvcirt: Implement ios locking control (try 2)
by Marvin 08 Jul '15

08 Jul '15

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=15154 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [1/4] msvcirt: Implement ios locking control
by Piotr Caban 08 Jul '15

08 Jul '15

Hi Iván, On 07/07/15 21:00, Iván Matellanes wrote: > + /* locking */ > + ios_obj.do_lock = 1; > + p_ios_clrlock(&ios_obj); > + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); > + ios_obj.do_lock = 0; > + p_ios_clrlock(&ios_obj); > + ok(ios_obj.do_lock == 1, "expected 1 got %d\n", ios_obj.do_lock); > + p_ios_setlock(&ios_obj); > + ok(ios_obj.do_lock == 0, "expected 0 got %d\n", ios_obj.do_lock); > + ios_obj.do_lock = -1; > + p_ios_setlock(&ios_obj); > + ok(ios_obj.do_lock == -2, "expected -2 got %d\n", ios_obj.do_lock); Please add a test that shows what happens with this->sb->do_lock value when ios_setlock and ios_clrlock are called (it should also be updated). Thanks, Piotr

2 1

Re: [2/2] server: Add fallback to desktop keystate in get_key_state wineserver call.
by Marvin 08 Jul '15

08 Jul '15

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=15142 Your paranoid android. === wvistau64 (64 bit input) === input.c:731: Test failed: 0 (a4/0): 10 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): 11 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a0 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a2 from 01 -> 00 unexpected

1 0

Re: [PATCH 4/5] wined3d: Add a setting for the maximum OpenGL version to use.
by Henri Verbeet 08 Jul '15

08 Jul '15

On 6 July 2015 at 22:20, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > if (context_debug_output_enabled(gl_info)) > + ctx_flags = WGL_CONTEXT_DEBUG_BIT_ARB; > + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_MAJOR_VERSION_ARB; > + ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version >> 16; > + ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_MINOR_VERSION_ARB; > + ctx_attribs[ctx_attrib_idx++] = gl_info->selected_gl_version & 0xffff; > + if (gl_info->selected_gl_version >= MAKEDWORD_VERSION(3, 2)) > + ctx_flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; > + if (ctx_flags) > { > ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_FLAGS_ARB; > - ctx_attribs[ctx_attrib_idx++] = WGL_CONTEXT_DEBUG_BIT_ARB; > + ctx_attribs[ctx_attrib_idx++] = ctx_flags; > } > ctx_attribs[ctx_attrib_idx] = 0; > > if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) > { > - ERR("Failed to create a WGL context.\n"); > - context_release(ret); > - goto out; > + if (ctx_flags & WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB) > + { > + ctx_attribs[ctx_attrib_idx - 1] &= ~WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; > + if (!(ctx = gl_info->p_wglCreateContextAttribsARB(hdc, share_ctx, ctx_attribs))) > + { > + ERR("Failed to create a WGL context.\n"); > + context_release(ret); > + goto out; > + } > + } > } > } I think this is starting to become complex enough that we'd probably benefit from a helper function to be able to share some of this with wined3d_adapter_init(). > + glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); > + if (glGetError() != GL_NO_ERROR) > + context_profile = 0; Should this perhaps just check for gl_info->p_wglCreateContextAttribsARB instead of eating errors? > + for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) > + { > + if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) > + { > + if (supported_gl_versions[i] != wined3d_settings.max_gl_version) > + ERR_(winediag)("Requested GL version %u.%u which is unsupported, trying version %u.%u instead.\n", > + wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff, > + supported_gl_versions[i] >> 16, supported_gl_versions[i] & 0xffff); > + break; > + } > + } > + if (i == ARRAY_SIZE(supported_gl_versions)) > + { > + ERR_(winediag)("Requested invalid GL version %u.%u.\n", > + wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); > + i = ARRAY_SIZE(supported_gl_versions) - 1; > + } This is a bit different than what I had in mind. I think max_gl_version should just be a maximum, and e.g. specifying 4.4 should just result in 3.2 at the moment. I think the winediag message should just happen if the registry setting is set, regardless of its actual value. (Except possibly if it's equal to the default value.) I.e. we also want to know if someone sets e.g. 3.2 while the default is currently 1.0 when reporting a bug. > + if (!get_config_key(hkey, appkey, "MaxGLVersion", buffer, size)) > + { > + unsigned int major, minor; > + > + if (sscanf(buffer, "%u.%u", &major, &minor) == 2) > + wined3d_settings.max_gl_version = MAKEDWORD_VERSION(major, minor); > + else > + ERR_(winediag)("Couldn't parse the requested maximum OpenGL version.\n"); > + } I'd make this a DWORD, if nothing else for consistency with MaxShaderModelVS etc. Perhaps "MaxVersionGL" would also more consistent for the naming, I'm not sure.

2 6

Re: [1/2] user32/tests: Add tests for calling GetKeyState from thread without message queue.
by Sebastian Lackner 08 Jul '15

08 Jul '15

On 08.07.2015 13:31, Sebastian Lackner wrote: > For https://bugs.winehq.org/show_bug.cgi?id=27238 > > The test is marked as broken on VMs > Win2003, but manually testing confirms > that it still works the same way on Windows 7. There must be a difference > between simulated keyboard input and real keyboard input. > > NOTE: SendInput doesn't make a difference. > > --- > dlls/user32/tests/input.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 65 insertions(+) > The test failures on wvistau64 are not caused by my patch. Seems to be "just another random issue". ;) All tests passed on a second attempt: https://newtestbot.winehq.org/JobDetails.pl?Key=15143

1 0

Re: [1/2] user32/tests: Add tests for calling GetKeyState from thread without message queue.
by Marvin 08 Jul '15

08 Jul '15

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=15141 Your paranoid android. === wvistau64 (32 bit input) === input.c:731: Test failed: 0 (a4/0): 10 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): 11 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a0 from 01 -> 00 unexpected input.c:731: Test failed: 0 (a4/0): a2 from 01 -> 00 unexpected

1 0

Re: [PATCH 3/4] wined3d: Clip blits from / to the front buffer to the GL drawable.
by Henri Verbeet 08 Jul '15

08 Jul '15

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > -void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) > +BOOL surface_clip_drawable_coords(const struct wined3d_surface *surface, HWND window, > + RECT *screen_rect, RECT *other) Can we please call these "src_rect" and "dst_rect" instead of "screen_rect" and "other"? It probably wouldn't hurt to mention "blt" somewhere in the function name either. > + ClientToScreen(window, &offset); ... > - ScreenToClient(window, &offset); > - OffsetRect(rect, offset.x, offset.y); > + /* Finally, translate the screen coordinate rectangle to client coordinates. */ > + OffsetRect(screen_rect, -offset.x, -offset.y); That change seems pretty pointless. > +BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) "src_rect", "dst_rect".

2 2

Re: kernel32/tests: Attempt to avoid timeouts by increasing the baud rate.
by Marvin 08 Jul '15

08 Jul '15

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=15126 Your paranoid android. === w2000pro (32 bit comm) === comm.c:1552: test_AbortWaitCts timeout 500 handle 00000368 comm.c:1519: Changing CommMask on the fly for handle 00000368 after timeout 500 === w2008s64 (32 bit comm) === comm.c:861: Test failed: WaitCommEvent failed with a timeout comm.c:872: recovering after WAIT_TIMEOUT... comm.c:882: Test failed: WaitCommEvent error 0 comm.c:883: Test failed: WaitCommEvent: expected EV_TXEMPTY, got 0 comm.c:887: WaitCommEvent for EV_TXEMPTY took 1500 ms (timeout 1500) comm.c:888: Test failed: WaitCommEvent used 1500 ms for waiting comm.c:1552: test_AbortWaitCts timeout 500 handle 000000BC comm.c:1519: Changing CommMask on the fly for handle 000000BC after timeout 500

2 1

#include <hidclass.h>
by Aric Stewart 08 Jul '15

08 Jul '15

Hi, So when my patch for include/ddk/hidport.h got included Alexandre add this line to the top: #include <hidclass.h> The problem is that my hidclass.sys work stopped building for me. In file included from ../../../wine-git/dlls/hidclass.sys/hid.h:27: ../../../wine-git/include/ddk/hidport.h:22:10: error: 'hidclass.h' file not found with <angled> include; use "quotes" instead #include <hidclass.h> ^~~~~~~~~~~~ "hidclass.h" 1 error generated. Is this a problem with my build setup or something else? hidclass.h is located in include/ddk/hidclass.h thanks, -aric

2 1

Re: [PATCH 1/5] wined3d: Use the correct texture coordinates in swapchain_blit() in the non-glBlitFramebuffer, NP2 case.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 22:20, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c > index 146f5d6..141abc2 100644 > --- a/dlls/wined3d/swapchain.c > +++ b/dlls/wined3d/swapchain.c > @@ -280,21 +280,21 @@ HRESULT CDECL wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *s > > /* A GL context is provided by the caller */ > static void swapchain_blit(const struct wined3d_swapchain *swapchain, > - struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect) > + struct wined3d_context *context, unsigned int src_w, unsigned int src_h, > + const RECT *src_rect, const RECT *dst_rect) > { > struct wined3d_surface *backbuffer = surface_from_resource( > wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); > - UINT src_w = src_rect->right - src_rect->left; > - UINT src_h = src_rect->bottom - src_rect->top; > GLenum gl_filter; > const struct wined3d_gl_info *gl_info = context->gl_info; > RECT win_rect; > UINT win_h; > > - TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", > - swapchain, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); > + TRACE("swapchain %p, context %p, src_w %u, src_h %u, src_rect %s, dst_rect %s.\n", > + swapchain, context, src_w, src_h, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); > > - if (src_w == dst_rect->right - dst_rect->left && src_h == dst_rect->bottom - dst_rect->top) > + if (src_rect->right - src_rect->left == dst_rect->right - dst_rect->left > + && src_rect->bottom - src_rect->top == dst_rect->bottom - dst_rect->top) > gl_filter = GL_NEAREST; > else > gl_filter = GL_LINEAR; > @@ -528,7 +528,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT > if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) > FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); > > - swapchain_blit(swapchain, context, &src_rect, &dst_rect); > + swapchain_blit(swapchain, context, back_buffer->pow2Width, back_buffer->pow2Height, &src_rect, &dst_rect); > } > > if (swapchain->num_contexts > 1) I may be missing something subtle here, but wouldn't it be better to just replace src_w/wrc_h with backbuffer->pow2Width/backbuffer->powe2Height in the "if (backbuffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS)" block that scales the texture coordinates?

3 3

Re: [PATCH 4/4] wined3d: Always use screen-sized frontbuffers.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > --- > dlls/wined3d/device.c | 6 +++--- > dlls/wined3d/surface.c | 22 +++++++++++++++++----- > dlls/wined3d/swapchain.c | 27 +++++++++++++-------------- > 3 files changed, 33 insertions(+), 22 deletions(-) > Why would we want that?

2 1

Re: [PATCH 5/5] wined3d: Use GLSL 1.50 on core contexts.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 22:20, Matteo Bruni <mbruni(a)codeweavers.com> wrote: > static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, > const struct wined3d_shader_version *version) > { > - if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version->major >= 4) > + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) > + return "#version 150"; > + else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) > return "#version 130"; > else > return "#version 120"; Is GLSL 1.20 unavailable in core contexts? I only glanced over the spec, but didn't immediately see anything that explicitly makes earlier versions unavailable. What's a bit unfortunate about this is that drivers may decide to use different floating point rules (in particular wrt. multiplications by zero) depending on the GLSL version. IIRC at least r600g considered doing that at some point, although I'd have to check if that's currently the case.

2 1

Re: [PATCH 2/2] mshtml: Add IHTMLXMLHttpRequest::send() method implementation. (try 2)
by Marvin 07 Jul '15

07 Jul '15

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=15123 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [PATCH 2/4] d3d8/tests: Add a windowed GetFrontBufferData test.
by Henri Verbeet 07 Jul '15

07 Jul '15

On 6 July 2015 at 23:47, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > +/* Locks a given surface and returns the color at (x,y). It's the caller's > + * responsibility to only pass in lockable surfaces and valid x,y coordinates */ > +static DWORD get_pixel_color_from_surface(IDirect3DSurface8 *surface, UINT x, UINT y) In ddraw this is called get_surface_color(), the equivalent d3d10core function is called get_texture_color().

1 0

odbccp32: Implement SQLGetPrivateProfileString (try 7)
by Hugh McMaster 07 Jul '15

07 Jul '15

On Tuesday, 7 July 2015, 10:31 pm UTC+10, Nikolay Sivov wrote: >On 07.07.2015 11:15, Alistair Leslie-Hughes wrote: > >> + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); >> + >> + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > >cbRetBuffer is A-buffer length, you're still using it as W-buffer length. Unless I'm reading MSDN [1] incorrectly, this should work. cbRetBuffer is the size, in characters, of RetBuffer (i.e. the A-buffer). retval is the W-buffer. Its allocated byte size is double that of RetBuffer, but its size, in characters, is still the same.

2 2

Re: odbccp32: Implement SQLGetPrivateProfileString (try 7)
by Nikolay Sivov 07 Jul '15

07 Jul '15

On 07.07.2015 11:15, Alistair Leslie-Hughes wrote: > + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); > + > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); cbRetBuffer is A-buffer length, you're still using it as W-buffer length.

1 0

Re: msscript.ocx: Added IDispatch functions implementation.
by Dmitry Timoshkov 07 Jul '15

07 Jul '15

Hi Jacek, Jacek Caban <jacek(a)codeweavers.com> wrote: > + case DLL_PROCESS_DETACH: > + release_typelib(); > + break; There should be a check to avoid freeing resources on process termination to avoid possible deadlocks. -- Dmitry.

1 0

Re: shell32/tests: Try harder to close Open With window
by Marvin 07 Jul '15

07 Jul '15

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=15086 Your paranoid android. === w2000pro (32 bit shlexec) === shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2449: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 === wxppro (32 bit shlexec) === shlexec.c:1224: Test failed: expected 1 args, got 4 === w2003std (32 bit shlexec) === shlexec.c:1224: Test failed: expected 1 args, got 4

2 1

Re: [PATCH 2/4] d3d8/tests: Add a windowed GetFrontBufferData test.
by Marvin 07 Jul '15

07 Jul '15

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=15097 Your paranoid android. === w8 (32 bit visual) === visual.c:7637: Test failed: Got color 0xfffff913. visual.c:7639: Test failed: Got color 0xfffff913. visual.c:7641: Test failed: Got color 0xfffff913. visual.c:7643: Test failed: Got color 0xfffff913. visual.c:7646: Test failed: Got color 0xfffffa13. visual.c:7648: Test failed: Got color 0xfffffa13. visual.c:7650: Test failed: Got color 0xfffffa13. visual.c:7652: Test failed: Got color 0xfffefa13. visual.c:7655: Test failed: Got color 0xfffff913. visual.c:7657: Test failed: Got color 0xfffff913. visual.c:7659: Test failed: Got color 0xfffff913. visual.c:7661: Test failed: Got color 0xfffff913. visual.c:7664: Test failed: Got color 0xfffffa13. visual.c:7666: Test failed: Got color 0xfffef913. visual.c:7668: Test failed: Got color 0xfffffa13. visual.c:7670: Test failed: Got color 0xfffef913.

1 0

Re: [PATCH 1/4] d3d9/tests: Add a windowed GetFrontBufferData test.
by Marvin 07 Jul '15

07 Jul '15

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=15096 Your paranoid android. === w8 (32 bit visual) === visual.c:19339: Test failed: Got color 0xff7170fb. visual.c:19341: Test failed: Got color 0xff7170fb. visual.c:19343: Test failed: Got color 0xff7170fb. visual.c:19345: Test failed: Got color 0xff7170fb. visual.c:19348: Test failed: Got color 0xff71fefb. visual.c:19350: Test failed: Got color 0xff71fefb. visual.c:19352: Test failed: Got color 0xff71fefb. visual.c:19354: Test failed: Got color 0xff71fefb. visual.c:19357: Test failed: Got color 0xff7f70fb. visual.c:19359: Test failed: Got color 0xff7f70fb. visual.c:19361: Test failed: Got color 0xffff70fb. visual.c:19363: Test failed: Got color 0xffff70fb. visual.c:19366: Test failed: Got color 0xff86fefb. visual.c:19368: Test failed: Got color 0xff85fefb. visual.c:19370: Test failed: Got color 0xfffffe90. visual.c:19372: Test failed: Got color 0xfffffe90.

1 0

Re: [1/2] ole32: Add a storage test using a custom ILockBytes.
by Marvin 07 Jul '15

07 Jul '15

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=15093 Your paranoid android. === w7u (32 bit storage32) === Failure running script in VM: timed out waiting for the child process

1 0

Re: [PATCH 3/8] winex11.drv: implement DoDragDrop on top of XDND
by Ken Thomases 06 Jul '15

06 Jul '15

On Jul 4, 2015, at 8:36 AM, Damjan Jovanovic <damjan.jov(a)gmail.com> wrote: > > Implements DoDragDrop on top of XDND. While some of DoDragDrop() and > supporting functions are copied from ole32, they were modified to be > non-blocking and event-driven. > > The clipboard is patched to allow searching its clipboard formats for > X11 atoms, export data in X11 format, and forward selection requests > for the XdndSelection selection to XDND. > > We support XDND version 3 to 5 (although we still need XdndProxy > support for version 4). XdndPosition messages are rate-limited to at > most 1 unreplied message and at least every 50 milliseconds apart, so > that we don't flood slow X11 clients like the spec warns. In set_XdndTypeList() and X11DRV_XDND_SelectionRequest(), you use FIXMEs for most unsupported format properties, but just a TRACE for dwAspect != DVASPECT_CONTENT. Is there a reason for that? > + * When we ask for feedback from the drop source, sometimes it will > + * do all the necessary work and sometimes it will not handle it > + * when that's the case, we must display the standard drag and drop > + * cursors. Copy-pasted typo. There should be a period after "handle it" and we should capitalize "when that's the case". (Or change to "When it doesn't handle it" to be clearer.) > + /* > + * All the return valued will stop the operation except the S_OK > + * return value. > + */ Copy-pasted typo: "return valued" should be "return values". > + /* > + * When keyboard messages are sent to windows on this thread, we > + * want to ignore notify the drop source that the state changed. > + * in the case of the Escape key, we also notify the drop source > + * we give it a special meaning. > + */ Copy-pasted typo: "ignore notify". I'm not sure if the fix is to just drop "ignore" or to expand the sentence to explain that we swallow key events except to notify the drop source about the Escape key. -Ken

1 0

Re: [PATCH 2/8] ole32/user32/winemac.drv/winex11.drv: try using native drag and drop if possible
by Ken Thomases 06 Jul '15

06 Jul '15

Hi, > On Jul 4, 2015, at 8:36 AM, Damjan Jovanovic <damjan.jov(a)gmail.com> wrote: > > If possible, try using the drag and drop implemented by the native > windowing system instead of the one implemented by our ole32. This > patch just provides the framework, the next patch actually implements > all drag and drop over XDND. Thanks for doing this redesign. For this patch, is it necessary to add the driver entry point to the user drivers (winemac, winex11)? Since the null driver already returns E_NOTIMPL, it would seem the user drivers don't need to provide an entry point that just does the same thing. Is there a reason there's no loaderdrv_DoDragDrop()? Is it not possible for DoDragDrop() to be called before the driver has been loaded? -Ken

1 0

Re: [PATCH 1/2] shell32/tests: Win XP splits the args if there are spaces in the path.
by Marvin 06 Jul '15

06 Jul '15

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=15076 Your paranoid android. === w2000pro (32 bit shlexec) === shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 shlexec.c:2447: Test failed: ShellExecuteEx(mask="0x500", file="C:\Documents and Settings\winetest\Local Settings\Temp\wt1.tmp\test file.sde") failed: rc=33 err=1400 === w8 (32 bit shlexec) === shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.shlexec.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\wtD96A.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\wtD96A.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:2115: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtD94A.tmp\wtD96A.tmp" Exec") succeeded: rc=42

2 1

Re: [2/10]hidclass.sys: add hidclass.sys
by Henri Verbeet 06 Jul '15

06 Jul '15

I didn't really look at the rest of the series, but here are a few things that caught my eye. On 6 July 2015 at 17:46, Aric Stewart <aric(a)codeweavers.com> wrote: > +struct list minidriver_list = LIST_INIT(minidriver_list); You don't seem to access this outside of main.c anywhere in this series, and it seems somewhat unlikely that you'll ever have to. Shouldn't this just be static? > +static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) "void" > + TRACE("Driver Unload\n"); > + LIST_FOR_EACH_ENTRY_SAFE(md, next, &minidriver_list, minidriver, entry) > + { > + if (md->minidriver.DriverObject == driver) > + { > + if (md->DriverUnload) > + md->DriverUnload(md->minidriver.DriverObject); > + list_remove(&md->entry); > + break; > + } > + } > +} Did you intend to use find_minidriver() here? > +minidriver* find_minidriver(DRIVER_OBJECT* driver) > +{ > + minidriver *md; > + LIST_FOR_EACH_ENTRY(md, &minidriver_list, minidriver, entry) > + { > + if (md->minidriver.DriverObject == driver) > + return md; > + } > + return NULL; > +} As the code currently is this isn't actually used until patch 10/10. You could potentially use it from UnloadDriver() as mentioned above, but it should still initially be static in that case. Your '*' placement is inconsistent. > +NTSTATUS WINAPI HidRegisterMinidriver(PHID_MINIDRIVER_REGISTRATION registration) "HID_MINIDRIVER_REGISTRATION *registration" > +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) > +{ > + switch(fdwReason) > + { > + case DLL_PROCESS_ATTACH: > + DisableThreadLibraryCalls(hInstDLL); > + break; > + } > + return TRUE; > +} As long as you don't do anything special in here, you don't need an explicit DllMain(). (But if you did, "void *" instead of LPVOID, and parameter naming.) > +/* These are from hidport.h but are only used here anyway */ > +typedef struct _HID_MINIDRIVER_REGISTRATION { The brace placement is inconsistent with the rest of the code. > + ULONG Revision; > + PDRIVER_OBJECT DriverObject; > + PUNICODE_STRING RegistryPath; "UNICODE_STRING *RegistryPath;" > + ULONG DeviceExtensionSize; > + BOOLEAN DevicesArePolled; > + UCHAR Reserved[3]; > +} HID_MINIDRIVER_REGISTRATION, *PHID_MINIDRIVER_REGISTRATION; If this is really only used inside hidclass.sys, you shouldn't need the PHID_MINIDRIVER_REGISTRATION typedef. > +NTSTATUS WINAPI HidRegisterMinidriver(PHID_MINIDRIVER_REGISTRATION MinidriverRegistration); The whitespace is odd here. Also, "HID_MINIDRIVER_REGISTRATION *registration". > +typedef struct _minidriver > +{ > + struct list entry; > + > + HID_MINIDRIVER_REGISTRATION minidriver; > + > + PDRIVER_UNLOAD DriverUnload; > +} minidriver; I suppose it's somewhat up to personal style, but you don't need a typedef for this. Aside from saving you from typing "struct" a few times it only obfuscates the code. I suspect some of the imports and includes aren't actually used until later in the series, but I didn't explicitly check that.

1 0

Re: [PATCH 2/2] shell32/tests: Win 2k doesn't cope with spaces in the path.
by Marvin 06 Jul '15

06 Jul '15

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=15077 Your paranoid android. === w8 (32 bit shlexec) === shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc") WaitForSingleObject returned 258 shlexec.c:1545: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc") failed: rc=33 err=2 shlexec.c:1577: Test failed: argvA4 expected 'C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.shlexec.noassoc', but key not found or empty shlexec.c:139: Test failed: ShellExecute(verb="", file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\wtDFB4.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:139: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\wtDFB4.tmp" Exec") WaitForSingleObject returned 258 shlexec.c:2115: Test failed: ShellExecute(file="C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\test file.noassoc", params="shlexec "C:\Users\winetest\AppData\Local\Temp\wtDF64.tmp\wtDFB4.tmp" Exec") succeeded: rc=42

1 0

Wine Gecko 2.40-beta1
by Jacek Caban 06 Jul '15

06 Jul '15

Hi all, It's time for another Wine Gecko update. I uploaded new builds to SourceForge. The new version is updated to use upcoming Firefox 40 engine and brings a few Wine-specific fixes. It also adds support for building with MSVC, contributed by Austin. If you want to test it, just build Wine with the attached patch. Wine will download Gecko for you. All feedback is appreciated. Thanks, Jacek

1 0

Re: [PATCH 2/3]: msvcp110: Add tr2_sys__Rename implementation and test.(try 3)
by Piotr Caban 06 Jul '15

06 Jul '15

On 07/05/15 20:49, YongHao Hu wrote: > + if(!strcmp(old_path, new_path) || MoveFileExA(old_path, new_path, MOVEFILE_COPY_ALLOWED)) The comparison of paths doesn't look right. Why have you added it? Cheers, Piotr

2 1

Adding RID_TYPEHID RawInput support to user32
by Nathan Schulte 06 Jul '15

06 Jul '15

(Apologies if double posting; I wasn't sub'd the first time and it wasn't in the archives.) I'm working to extend Wine's RawInput implementation to support gamepads/controllers (and possibly joysticks, or any non-keyboard/mouse HID device). I found this on the wine-patches list: Vincas Miliūnas wrote: > A comment about going beyond mouse/keyboard for raw input:Other > devices then mouse&keyboard produce undocumented blobs of bytes;to > interpret them, functions from the hid.dll are used. Currently > theyare unimplemented stubs in WINE as well as not the problem I am > solving.There is a recent article about this subject - Using the Raw > Input APIto Process Joystick Input > -http://www.codeproject.com/KB/game/RawInputJoystick.aspx Does this imply then, that if one was to add support for "raw" rawinput (RIM_TYPEHID device type) it could be used in conjunction with a native hid.dll and software that required RIM_TYPEHID input (for e.g. game controllers in games) would start working? Nathan Schulte (me; original post) wrote: > Also, could one create an adaptation from some joystick input libraries > (evdev/x11,rawhid) and make it conform to the API in the CodeProject > example, making modifications similar to Henri Verbeet's for mouse and > keyboard and have built-in support for this? > > (Henri Verbeet's rawinput contributions: > http://source.winehq.org/git/wine.git/?a=search&st=commit&s=rawinput) > > I see that Wine already has support for joysticks in some other > fashion (the gamepad I'm working with shows up in the `wine control` > Game Controller testing interface), and I bet it's a good idea to > leverage that adaptation (those adaptations...) than to start adding > my own. > > Any direction here would be appreciated. I think I understand the > separation between the wineserver (mainly server/queue.c) and the > dlls (dlls/user32/*), but I see that there are other "dlls" that > don't use (or don't appear to use, given my probably incorrect > understanding) wineserver for their adaptation, and instead talk > directly with the Linux libs to do their work (I'm assuming). It looks like what I was was seeing was "Wine drivers," (winejoystick.drv, for winmm's joystick bits, and DirectInput's joystick bits). Should I follow that route, or should I plumb this through wineserver, like the rawinput keyboard and mouse? Why are those plumbed through wineserver? Are they shared resources, and if so, why doesn't that matter for winmm and DirectInput? I'm thinking this should be fairly easy to get working, by enumerating the rawhid devices and just piping the data through. I'm not sure how well the native hid.dll will work though; can anyone comment? Any help is welcome, as it means my patches are more likely to make it upstream and benefit others. I'm wondering if there's an architecture diagram/doc somewhere to help me understand how the system works. Thanks, -- Nate

3 3

crossover programs missing from source code
by Theodore Dubois 05 Jul '15

05 Jul '15

The following programs in Crossover are absent from the source code download: assocscan autorun ctfmon cxcplinfo cxdummy cxinstallfonts cxmanip cxmklnk cxnative cxwget ddhelp extract findfast icwconn1 imjpmig maildoff mdm mosearch netscape ntoskrnl pstores qttask reboot sendwndcmd winewrapper Can I get an explanation for each of these? ~Theodore

4 3

Re: XInput [1/4]: Implement XInputGetState
by Stefan Dösinger 05 Jul '15

05 Jul '15

Am 09.07.2009 um 02:58 schrieb Michael Gruber: > This patch series implements parts of the XInput library. You can use > this to play games that support Xbox 360 Controllers. To be able to > use this you will need to have your Controller working on Linux via > the xpad kernel driver and the event interface. It will not work on > any OS other than Linux. It supports gamepads, should work with > guitars and wheels, but will not work with dance-mats. > <1-XInputGetState.patch> Is it possible to implement XInput on top of DirectInput? DirectInput already has some internal abstraction layers for differnet joystick APIs, and has basic support for OSX joysticks. Does DInput have enough capabilities to access all the Xbox controller's features? My gut says no, otherwise MS wouldn't have created a new lib. I guess its worth checking though.

5 6

Re: [4/7] ntdll/tests: Add basic tests for threadpool wait objects.
by Marvin 05 Jul '15

05 Jul '15

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=15039 Your paranoid android. === w7u (32 bit threadpool) === threadpool.c:734: Test failed: WaitForSingleObject returned 258

2 1

Re: ole32: Accept STG_E_UNIMPLEMENTEDFUNCTION when ILockBytes implementation doesn't support locking.
by Nikolay Sivov 04 Jul '15

04 Jul '15

On 03.07.2015 10:27, Dmitry Timoshkov wrote: > Some custom implementations return it instead of STG_E_INVALIDFUNCTION. > --- > dlls/ole32/storage32.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c > index 220e17e..aa53758 100644 > --- a/dlls/ole32/storage32.c > +++ b/dlls/ole32/storage32.c > @@ -5015,7 +5015,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) > hr = StorageImpl_LockRegionSync(This, offset, cb, LOCK_ONLYONCE); > > /* If the ILockBytes doesn't support locking that's ok. */ > - if (hr == STG_E_INVALIDFUNCTION) return S_OK; > + if (hr == STG_E_INVALIDFUNCTION || hr == STG_E_UNIMPLEMENTEDFUNCTION) return S_OK; > else if (FAILED(hr)) return hr; > > hr = S_OK; > It looks like StorageImpl_LockRegionSync should be fixed instead to filter some error codes. Could you add a test with external ILockBytes implementation that does that?

3 7

Re: [PATCH 5/6]: msvcp110: Add tr2_sys__Lstat implementation and test.(resend)
by Piotr Caban 04 Jul '15

04 Jul '15

On 07/03/15 06:00, YongHaoHu wrote: > +/* ?_Lstat@sys@tr2@std@@YA?AW4file_type@123@PBDAAH@Z */ > +/* ?_Lstat@sys@tr2@std@@YA?AW4file_type@123@PEBDAEAH@Z */ > +file_type tr2_sys__Lstat(char const* path, int *err_code) > +{ > + DWORD attr; > + TRACE("(%s %p)\n", debugstr_a(path), err_code); > + if(!path) { > + *err_code = ERROR_INVALID_PARAMETER; > + return status_unknown; > + } > + > + attr = GetFileAttributesA(path); > + if(attr == INVALID_FILE_ATTRIBUTES) > + return stat_set_error(err_code); > + if(attr & FILE_ATTRIBUTE_REPARSE_POINT) > + FIXME("reparse point is not supported yet\n"); > + > + *err_code = ERROR_SUCCESS; > + return (attr & FILE_ATTRIBUTE_DIRECTORY)?directory_file:regular_file; > +} What's the reason for not calling tr2_sys__Stat function here? Thanks, Piotr

2 3

Adding RID_TYPEHID RawInput support to user32
by Nathan Schulte 03 Jul '15

03 Jul '15

I'm working to extend Wine's RawInput implementation to support gamepads/controllers (and possibly joysticks, or any non-keyboard/mouse HID device). I found this on the wine-patches list: Vincas Miliūnas wrote: > A comment about going beyond mouse/keyboard for raw input:> Other devices then mouse&keyboard produce undocumented blobs of bytes;> to interpret them, functions from the hid.dll are used. Currently they> are unimplemented stubs in WINE as well as not the problem I am solving.> There is a recent article about this subject - Using the Raw Input API> to Process Joystick Input -> http://www.codeproject.com/KB/game/RawInputJoystick.aspx Does this imply then, that if one was to add support for "raw" rawinput (RIM_TYPEHID device type) it could be used in conjunction with a native hid.dll and software that required RIM_TYPEHID input (for e.g. game controllers in games) would start working? Also, could one create an adaptation from some joystick input libraries (evdev/x11) and make it conform to the API in the CodeProject example, making modifications similar to Henri Verbeet's and have built-in support for this? (Henri Verbeet's rawinput contributions: http://source.winehq.org/git/wine.git/?a=search&st=commit&s=rawinput) I see that Wine already has support for joysticks in some other fashion (the gamepad I'm working with shows up in the `wine control` Game Controller testing interface), and I bet it's a good idea to leverage that adaptation (those adaptations...) than to start adding my own. Any direction here would be appreciated. I think I understand the separation between the wineserver (mainly server/queue.c) and the dlls (dlls/user32/*), but I see that there are other "dlls" that don't use (or don't appear to use, given my probably incorrect understanding) wineserver for their adaptation, and instead talk directly with the Linux libs to do their work (I'm assuming). Any help is welcome, as it means my patches are more likely to make it upstream and benefit others. I'm wondering if there's an architecture diagram/doc somewhere to help me understand how the system works. Thanks, -- Nate

1 0

Re: [PATCH 1/2] d3drm: Add stubs for IDirect3DRMDevice methods.
by Stefan Dösinger 03 Jul '15

03 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-07-01 um 01:03 schrieb Aaryaman Vasishta: > +static ULONG WINAPI d3drm_device1_AddRef(IDirect3DRMDevice *iface) > +{ > + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); > + ULONG refcount = InterlockedIncrement(&device->ref); > + > + TRACE("%p increasing refcount to %u.\n", iface, refcount); > + > + return refcount; > +} > + > +static ULONG WINAPI d3drm_device1_Release(IDirect3DRMDevice *iface) > +{ > + struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); > + > + return IDirect3DRMDevice2_Release(&device->IDirect3DRMDevice2_iface); > +} Why are you forwarding Release to d3drmdevice2 but not Addref? I think we should look again at moving the IUnknown methods to Device3, so we don't thunk to the middle child and stay consistent with the other methods. Please send an extra patch before this one that migrates the code to device3. I remember we already looked at this. If this failed in some spectacular way please remind me :-) . Is there a logic behind which method forwards to device3 and which just returns E_NOTIMPL? -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVk+jzAAoJEN0/YqbEcdMwL/MP/jmYjvhWcVOosMP2FyKVaezA c4SqCONBE+xPvhmC97IfPXZ8wJQUjH0tt5CjZN2JZTY0yw50bEM4JHDfC1pPjF3O IX4qKllp0UeAeNCNKu64a8rxYT2kLRwLp7zs+GO7YygwimKy9DAMxUCW5+IP4DiB bsO1wTcSWlCHQ8c4ikUou6aIY/npJ+UqVS8DNGl5m1cLw6oUdzZMvcurSooH2LUv 1oq4XC1DQe/wx3Ob826xY8w/2v6CM0JDAgAT1dGqxIWDS5DNzsKj9P8oKEso/C8c thpZdsIvgQLEkfmKgN6wRh9h03aAMVHbXoSmGVihaapSspF7299DYrDyoiQvYxEq k+SgAMqHAtAzfXkQto9n0f8FjiLEJzbFu9WMoKLJmjdk7hpH8CXPsoioA/o8xNDA 8dB9LxITlJuK5oEUczGhdrnN144Ml8AkZbs+DBcvTdHvaOaY7urL2sZ6/QuvGtAY IGGeUnPW2VBMGpg1YlSn9OmziBibrjKOVtXHVmbwYQhZhXOcfzgMT+QBBV2eQ/pQ 0tmDnUk93+ungNnc4slfLZo+uZ8/8kvPRMv8fYPcQjkcXOIRCobup4bqx3vrQVWT zOx05HKBDQihZAxZuHynFaNqA5E1QbhbPac0BsOSLk8r4zSKx58BgNLBYWz51oe6 NN959TJY84womG8/lfFc =jkwG -----END PGP SIGNATURE-----

2 1

Re: [2/2] shell32/tests: Destroy shell view windows.
by Nikolay Sivov 03 Jul '15

03 Jul '15

On 02.07.2015 13:36, Thomas Faber wrote: > When calling IShellView::CreateViewWindow, the window itself takes > references to the shell view and related objects (e.g. for a drop > target). This means just calling IShellView::Release is not enough to > properly clean up, the window needs to be destroyed as well. > Could you please also add a test that shows window is still being alive after IShellView was released? It could be a separate patch.

2 1

Re: [PATCH 4/6]: msvcp110: Add tr2_sys__Stat implementation and test.(try 2)
by Piotr Caban 03 Jul '15

03 Jul '15

On 07/03/15 05:59, YongHaoHu wrote: > +static file_type stat_set_error(int *err_code) > +{ > + file_type ret; > + > + switch(GetLastError()) { > + case ERROR_FILE_NOT_FOUND: > + case ERROR_BAD_NETPATH: > + case ERROR_INVALID_NAME: > + case ERROR_BAD_PATHNAME: > + case ERROR_PATH_NOT_FOUND: > + ret = file_not_found; > + *err_code = ERROR_SUCCESS; > + break; > + case ERROR_SUCCESS: > + ret = regular_file; > + *err_code = ERROR_SUCCESS; > + break; Why are you handling ERROR_SUCCESS here? stat_set_error function is only called in case of error. Are you planning to reuse this function somewhere else? If not it might be part of tr2_sys__Stat function. Thanks, Piotr

1 0

Re: [PATCH 2/6]: msvcp110: Add tr2_sys__Rename implementation and test. (try 2)
by Piotr Caban 03 Jul '15

03 Jul '15

On 07/03/15 05:56, YongHaoHu wrote: > + if(MoveFileExA(old_path, new_path, MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED)) According to my testing MOVEFILE_REPLACE_EXISTING flag should not be used here. Thanks, Piotr

1 0

Re: [PATCH 1/6]: msvcp110: Add tr2_sys__Copy_file implementation and test.(try 2)
by YongHaoHu 03 Jul '15

03 Jul '15

Hi, all. Found a mistake of tr2_sys__Copy_file, please ignore this patch. Thank you. On 15/7/3 上午11:55, YongHaoHu wrote: > try2 : > Add is_todo in test. > Delete useless SetLastError. > > --- > dlls/msvcp110/msvcp110.spec | 4 +-- > dlls/msvcp120/msvcp120.spec | 4 +-- > dlls/msvcp120/tests/msvcp120.c | 59 > +++++++++++++++++++++++++++++++++++++ > dlls/msvcp120_app/msvcp120_app.spec | 4 +-- > dlls/msvcp90/ios.c | 10 +++++++ > 5 files changed, 75 insertions(+), 6 deletions(-) > >

1 0

Re: [6/12] ntdll/tests: Add tests for threadpool timer merging.
by Sebastian Lackner 03 Jul '15

03 Jul '15

On 03.07.2015 01:59, Sebastian Lackner wrote: > --- > dlls/ntdll/tests/threadpool.c | 117 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 117 insertions(+) > The test failure on Windows 7 seems to be random, it worked fine on a second run (and also on several test runs before): https://newtestbot.winehq.org/JobDetails.pl?Key=14968 If it occurs too often in practice we can increase the timeouts, but for now I think it should be fine. BTW: Forgot to mention, the Sleeps() in this patch are necessary because there is no way to do any other kind of synchronization with the Windows internal timer queue thread.

1 0

Re: [6/12] ntdll/tests: Add tests for threadpool timer merging.
by Marvin 03 Jul '15

03 Jul '15

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=14965 Your paranoid android. === w7u (32 bit threadpool) === threadpool.c:856: Test failed: WaitForSingleObject returned 258 threadpool.c:897: Test failed: expected that ticks are nonzero threadpool.c:899: Test failed: expected that timers are merged

1 0

Re: [PATCH 2/4] wined3d: Implement vertex blending in glsl_vertex_pipe.
by Stefan Dösinger 02 Jul '15

02 Jul '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I like this patchset. I can't find anything wrong in it, but Matteo knows the fixed function pipeline replacement better than I do, so I'll wait for his comments. I tested it with various DirectX SDK samples (bend from dx7, SkinnedMesh and VertexBlend from dx8). It works very well, but I noticed a lighting oddity in SkinnedMesh. The lighting differs slightly between your code ("D3D non-indexed" option) and the test program's vertex shader or d3dx9's software vertex blending ("D3D indexed (VS)" / "Software Skinning"). This difference cannot be seen on Windows. I have attached screenshots. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVlPPNAAoJEN0/YqbEcdMwUcIP/jwJsie6/93Ui3RQTqjT8oOP q0ips3E83dHpi0ceL8xXujr0pyO1x7cVuUX+hZ7Tf08bZu86FpieKZkTYZxRKbKj V5+x/bVlWGM+ogB06E7tHx2oM8tBFlh10wwh9M/QnitjtzCM+E3WKfE01W5NsRRL csUMxE1mBHvnp08Me2CZyzgtVWwQuTWH6IMUtmqQPfOmmOgzIoofjjRowjhZovFi D9cufKD/D+CBsuv/Py5AMYWfjv7gTZqB09sotaIzYWuyI/e6GRRFT2wzX1yOIl+I fhOr3AsHeFLWOAYd41DjMuqmqvQ5e/UigYxkDtssOCHVig7VtaQ0RKTEv6mMfDF4 6Ljgyi7RdGrgle41cDo6DBXTr0WZw6Y2eTLs0G+WCNkJ8/OMR9hLAt/YBg1mPEPo QUNTsqwNQ1Poxuxmo5fWqD0MhLAao7Wgm6dZTiECNPNNBsC91XRYR9jXF29xaB3h 3ekVCTdtI1+wUQolGw1/HZ7whaHkWGrxOY4qqiZsgYRYz1yl52Bt4sJDJYUHknbd GZ4JRkVQXD86D5txRLf500e03QCmDTXxjqEKSsNBNCtcpER1mp+3Hs/SImp/adRr 3tNuEMJduA/5jm27Nt+K13DwsazQXCJMDv5dTYlggBI9c3dhFDmjXNNGSvrvkBkf xW9FbSiHRRDoLR3UMuoR =Ghq/ -----END PGP SIGNATURE-----

2 1

Re: [3/3] msvcirt: Implement ios constructors and assignment
by Marvin 02 Jul '15

02 Jul '15

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=14949 Your paranoid android. === wvistau64 (64 bit msvcirt) === No test summary line found === w2008s64 (64 bit msvcirt) === No test summary line found

1 0

Re: [2/3] msvcirt/tests: Add initial tests for ios
by Marvin 02 Jul '15

02 Jul '15

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=14948 Your paranoid android. === wvistau64 (64 bit msvcirt) === No test summary line found === w2008s64 (64 bit msvcirt) === No test summary line found

1 0

A wrapper around the GTK+ rendering engine
by Ivan Akulinchev 02 Jul '15

02 Jul '15

Hello, I just want to thank you for Wine and show you my own uxtheme.dll implementation, which uses the GTK+ rendering engine. Thus Wine applications look really native for users. Here is the link: https://github.com/akulinchev/uxthemegtk (see the screenshots at the bottom of the page) If you want, I can help you to add it to the Wine code. If not, I will develop it alone as a third-party project, but then I have a question: what is the best way to replace a Wine library? I think, I shouldn't change anything in /usr/lib/wine. I know about "native libs", but it's an ELF binary, not PE. Regards, Ivan

5 8

Re: [PATCH 4/4] d3d9/tests: Add basic tests for vertex blending.
by Henri Verbeet 02 Jul '15

02 Jul '15

On 2 July 2015 at 08:26, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > + static const float quad_upper_right[] = > + { > + -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + -1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + 1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, > + }, I think it's slightly more readable to specify these as e.g. static const struct { struct vec3 position; struct vec3 blendweights; } quad_upper_right[] = { ... }, instead of an otherwise unstructured collection of floats. You can also potentially fold these into the tests[] array. > + static const struct { > + const float *vertex_data; > + const POINT *quad_points; > + const POINT *empty_points; > + } > + tests[] = Position of the upper brace.

1 0

Re: [PATCH 2/4] wined3d: Implement vertex blending in glsl_vertex_pipe.
by Henri Verbeet 02 Jul '15

02 Jul '15

On 2 July 2015 at 08:26, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > @@ -3071,7 +3075,7 @@ static inline BOOL shader_constant_is_local(const struct wined3d_shader *shader, > > void get_identity_matrix(struct wined3d_matrix *mat) DECLSPEC_HIDDEN; > void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, > - struct wined3d_matrix *mat) DECLSPEC_HIDDEN; > + int i, struct wined3d_matrix *mat) DECLSPEC_HIDDEN; I think we'll want the index to be unsigned. (Also applies to shader_glsl_ffp_vertex_normalmatrix_uniform() in patch 112562) Looks pretty good otherwise.

1 0

Re: [PATCH 1/2] comctl32: Set the default separator width when notifying a -ve cmd id.
by Marvin 02 Jul '15

02 Jul '15

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=14914 Your paranoid android. === wvistau64 (64 bit toolbar) === toolbar.c:519: Test failed: Images count mismatch - 26 vs 10 toolbar.c:519: Test failed: Icon size mismatch - 8x8 vs 20x20 toolbar.c:523: Test failed: Images count mismatch - 28 vs 22 toolbar.c:523: Test failed: Icon size mismatch - 16x16 vs 20x20 toolbar.c:533: Test failed: Icon size mismatch - 8x8 vs 16x16 toolbar.c:536: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:544: Test failed: Images count mismatch - 8 vs 13 toolbar.c:544: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:548: Test failed: Images count mismatch - 208 vs 13 toolbar.c:548: Test failed: Icon size mismatch - 1x1 vs 16x16 toolbar.c:551: Test failed: Images count mismatch - 208 vs 13 toolbar.c:551: Test failed: Icon size mismatch - 1x5 vs 16x16 toolbar.c:554: Test failed: Images count mismatch - 41 vs 13 toolbar.c:554: Test failed: Icon size mismatch - 5x1 vs 16x16 toolbar.c:1331: Test failed: Icon size mismatch - 14x12 vs 16x15

2 1

Re: [PATCH 2/2] comctl32: Implement the legacy notifications during restore.
by Marvin 01 Jul '15

01 Jul '15

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=14915 Your paranoid android. === wvistau64 (64 bit toolbar) === toolbar.c:584: Test failed: Images count mismatch - 26 vs 10 toolbar.c:584: Test failed: Icon size mismatch - 8x8 vs 20x20 toolbar.c:588: Test failed: Images count mismatch - 28 vs 22 toolbar.c:588: Test failed: Icon size mismatch - 16x16 vs 20x20 toolbar.c:598: Test failed: Icon size mismatch - 8x8 vs 16x16 toolbar.c:601: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:609: Test failed: Images count mismatch - 8 vs 13 toolbar.c:609: Test failed: Icon size mismatch - 30x30 vs 16x16 toolbar.c:613: Test failed: Images count mismatch - 208 vs 13 toolbar.c:613: Test failed: Icon size mismatch - 1x1 vs 16x16 toolbar.c:616: Test failed: Images count mismatch - 208 vs 13 toolbar.c:616: Test failed: Icon size mismatch - 1x5 vs 16x16 toolbar.c:619: Test failed: Images count mismatch - 41 vs 13 toolbar.c:619: Test failed: Icon size mismatch - 5x1 vs 16x16 toolbar.c:1396: Test failed: Icon size mismatch - 14x12 vs 16x15

1 0

Re: ieframe: implement clicking on Properties
by Jacek Caban 01 Jul '15

01 Jul '15

Hi Jared, On 06/30/15 16:00, Jared Smudde wrote: > When the user clicks on the properties menu in ieframe, launch inetcpl.cpl. > > dlls/ieframe/iexplore.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c > index 08bb167..c1d0d74 100644 > --- a/dlls/ieframe/iexplore.c > +++ b/dlls/ieframe/iexplore.c > @@ -402,6 +402,11 @@ static void ie_dialog_about(HWND hwnd) > DestroyIcon(icon); > } > > +static void ie_dialog_properties(HWND hwnd) > +{ > + ShellExecuteW(hwnd, NULL, L"inetcpl.cpl", NULL, NULL, 0); > +} I think that we should call inetcpl.cpl functions directly here (probably LaunchInternetControlPanel). Also, you can't use L"" for strings due to compatibility problems, see how other strings are declared. > + > static void add_tb_separator(HWND hwnd) > { > TBBUTTON btn; > @@ -629,6 +634,10 @@ static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPAR > case ID_BROWSE_QUIT: > ShowWindow(hwnd, SW_HIDE); > break; > + > + case ID_BROWSE_PROPERTIES: > + ie_dialog_properties(hwnd); > + break; Broken indention. Thanks, Jacek

1 0

Re: [PATCH 8/8] comctl32: Implement the legacy notifications during restore.
by Marvin 01 Jul '15

01 Jul '15

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=14894 Your paranoid android. === wvistau64 (64 bit toolbar) === No test summary line found === w2008s64 (64 bit toolbar) === No test summary line found

2 1

Re: kernel32: K32EnumProcessModules: Handle NULL pointer gracefully.
by Alex Henrie 01 Jul '15

01 Jul '15

> diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c > index f495e81..5461881 100644 > --- a/dlls/kernel32/module.c > +++ b/dlls/kernel32/module.c > @@ -1226,6 +1226,12 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, > if (!init_module_iterator(&iter, process)) > return FALSE; > > + if (!lphModule) > + { > + SetLastError(ERROR_NOACCESS); > + return FALSE; > + } > + > if (!needed) > { > SetLastError(ERROR_NOACCESS); Wouldn't it be easier to write "if (!lphModule || !needed)"? Adding a test or two would also be nice. -Alex

2 1

odbccp32: Implement SQLGetPrivateProfileString (try 6 - resend)
by Hugh McMaster 01 Jul '15

01 Jul '15

>+ LONG ret = 0; >+ HKEY hkey; >+ DWORD size = 0; >+ BOOL usedefault = TRUE; >+ /* snip */ >+ clear_errors(); >+ >+ if(!cbRetBuffer) >+ return 0; >+ >+ if(RetBuffer) >+ RetBuffer[0] = 0; >+ >+ if(!lpszSection || !lpszEntry || !lpszDefault || !RetBuffer || !cbRetBuffer) >+ return ret; You are checking "if (!cbRetBuffer)" twice. Same in the next function. You don't need to clear RetBuffer. RegGetValue adds a null terminating character if it doesn't already exist. You also "return 0" and "return ret". They are the same at the moment, so be consistent. >+size = cbRetBuffer; >+if(RegGetValueW(hkeysect, NULL, lpszEntry, RRF_RT_REG_SZ, &type, RetBuffer, &size) == ERROR_SUCCESS) cbRetBuffer is the size in characters of the buffer pointed to by RetBuffer.[1] size needs to be in bytes, so unless RetBuffer uses char, this is wrong. >+ ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); >+ if(ret) >+ { >+ WideCharToMultiByte(CP_ACP, 0, retval, -1, RetBuffer, ret+1, NULL, NULL); >+ } This doesn't look right to me. "ret+1" should be the size, in bytes, of RetBuffer. [2] [1] https://msdn.microsoft.com/en-us/library/windows/desktop/ms724868%28v=vs.85… [2] https://msdn.microsoft.com/en-us/library/windows/desktop/dd374130%28v=vs.85…

1 0

Re: [PATCH 1/6]: msvcp110: Add tr2_sys__Copy_file implementation and test.
by Piotr Caban 01 Jul '15

01 Jul '15

On 06/27/15 19:49, YongHaoHu wrote: > + ret = p_tr2_sys__Copy_file(tests[i].source, tests[i].dest, tests[i].fail_if_exists); > + ok(ret == GetLastError(), "test_tr2_sys__Copy_file(): test %d expect: %d, got %d\n", i+1, GetLastError(), ret); > + ok(errno == 0xdeadbeef, "test_tr2_sys__Copy_file(): test %d errno expect 0xdeadbeef, got %d\n", i+1, errno); Please check the return value of the function explicitly. Currently your implementation returns error while it should succeed and it's not visible in the tests. Thanks, Piotr

2 6

Proposal: to make binfmt-misc with wine workable and make Wine compadiblity modes more like Windows compadiblity mode.
by Peter Dolding 01 Jul '15

01 Jul '15

For binfmt-misc to be workable a few things need to be known. 1) What version of wine 2) What wineprefix 3) What setting overrides. None of these can be done by environmental vars because binfmt-misc might be directly executing the file. Windows compadiblity mode does not use the registry like wine does. Instead it done in two horible halves. Half 1. The application manifest file. The mainfest file may be embedded in the .exe file or be .exe.mainfest https://msdn.microsoft.com/en-us/library/windows/desktop/hh848036%28v=vs.85… Yes this is where you set what version of Windows application was designed to run with. So running XP mode on Windows 7 is here. Half 2. Application Compatilibity Database This is where it gets horible using shims on particular executables to make broken executables work. Also when this gets too large starts slowing windows down as it searching the database to make applications work. Yes reason some old applications don't work with Windows 10 that worked with 7 is that their entries were deleted from this database. To solve the problem I think we could get away with just Half the manifest can include library overrides and some windows configuration tweaks. But we have problems the include library information wine needs because of native and built-in libraries. Due to the fact wine is running on Linux and other OS's some of the configuration tweaks are going to be wine dependant. So we need another schema. http://wiki.winehq.org/UsefulRegistryKeys Because if Microsoft manifest would tolerate alien schema really everything under software\wine\appdefaults could be moved from the registry to the manifest. Advantage 1 this can be write protected per application and second advantage possibility of embedding in the exe itself. Also for binfmt-misc support have in the schema the means to record wineprefix and wine to use. So the program starting wine applications by binfmt-misc looks for either a mainfest or a winemainfest file in the same directory as the exe to see what wine environment the application should be running with. If there is no configured environment possibly ask user what wineprefix they do what to run the application with. What I do not know is if Microsoft application manifest file will tolerate an alien schema. Don't have different versions of Windows to test if Microsoft application manifest with a alien schema parts works or just causes windows to throw error or just results in the manifest being complete ignored. Now if Microsoft application manifest will not tolerate alien I have to ask would creating own own like exe.winemainfest be acceptable. I do hope Microsoft application manifest will tolerate alien because it would be really useful to have applications with a manifest a values saying what versions of wine they were tested with by the maker. Currently there is no way for a application vendor to record in the application they tested with wine. A lot of ways putting what shim modifications the application need in the manifest would also remove having to look up a huge database. Getting binfmt-misc working also will remove having to use setcap on wineloader instead of the .exe. Also would make if someone set a capicapity limitation by logind not break every wine application just because a few application where needing privileged operation.. So this alteration would be getting closer to how Windows does stuff and in the process making Linux integration better. Peter Dolding

4 7

Re: [PATCH 2/2] msvcp90: Implement time_get<char> ctors and dtors (try 2)
by Alexandre Julliard 01 Jul '15

01 Jul '15

Daniel Lehman <dlehman(a)esri.com> writes: > Try2: > - remove cast for Locinfo > - handle failed new() > - change 'unsigned int refs' to 'MSVCP_size_t refs' to match the rest of the file It doesn't work here: ../../../tools/runtest -q -P wine -T ../../.. -M msvcp60.dll -p msvcp60_test.exe.so ios && touch ios.ok wine: Unhandled page fault on write access to 0xd8003304 at address 0x7bc4e659 (thread 0009), starting debugger... Unhandled exception: page fault on write access to 0xd8003304 in 32-bit code (0x7bc4e659). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7bc4e659 ESP:0032f4e4 EBP:0032f688 EFLAGS:00010216( R- -- I -A-P- ) EAX:d8003300 EBX:7bcc3540 ECX:00010000 EDX:75003300 ESI:00331c40 EDI:00000018 Stack dump: 0x0032f4e4: 00000000 0032f688 7bc4e4ab 00000000 0x0032f4f4: 00330000 00000000 00000000 00330000 0x0032f504: 00000000 00000002 00000014 00000000 0x0032f514: 7bc6b946 0032f540 00330014 00000000 0x0032f524: 7b8c57ac 0032f558 7bc6ad4a f7532361 0x0032f534: f75324a1 7ed54740 7bc6ad4a 7b810000 Backtrace: =>0 0x7bc4e659 RtlAllocateHeap+0x1e9(heap=<couldn't compute location>, flags=<couldn't compute location>, size=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/../../include/wine/list.h:100] in ntdll (0x0032f688) 1 0x7eceb358 msvcrt_heap_alloc+0x57() in msvcrt (0x0032f6b8) 2 0x7eceb51c MSVCRT_operator_new+0x4b() in msvcrt (0x0032f6d8) 3 0x7eba526d locale__Locimp__Makexloc+0x49c(locinfo=0x32f780, cat=0x3f, locimp=0x3316d8, loc=(nil)) [/home/julliard/wine/wine/dlls/msvcp60/../msvcp90/locale.c:10584] in msvcp60 (0x0032f72c) 4 0x7eba5707 locale__Locimp__Makeloc+0x56(locinfo=0x32f780, cat=0x3f, locimp=0x3316d8, loc=(nil)) [/home/julliard/wine/wine/dlls/msvcp60/../msvcp90/locale.c:10617] in msvcp60 (0x0032f75c) 5 0x7eba5aba locale_ctor_cstr+0xb9(this=0x32f840, locname="German", cat=0x3f) [/home/julliard/wine/wine/dlls/msvcp60/../msvcp90/locale.c:10791] in msvcp60 (0x0032f7dc) 6 0x7eff37a4 test_num_get_get_double+0x353() [/home/julliard/wine/wine/dlls/msvcp60/tests/ios.c:910] in msvcp60_test (0x0032fc78) 7 0x7eff7212 func_ios+0xd91() [/home/julliard/wine/wine/dlls/msvcp60/tests/ios.c:1645] in msvcp60_test (0x0032fd58) 8 0x7eff3063 main+0x352(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/msvcp60/tests/../../../include/wine/test.h:584] in msvcp60_test (0x0032fe08) 9 0x7effac1f __wine_spec_exe_entry+0x6e(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in msvcp60_test (0x0032fe58) 10 0x7b85b55c call_process_entry+0xb() in kernel32 (0x0032fe78) 11 0x7b85c4ea start_process+0x59(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1104] in kernel32 (0x0032fea8) 12 0x7bc7a0b0 call_thread_func_wrapper+0xb() in ntdll (0x0032fec8) 13 0x7bc7cdc1 call_thread_func+0xb0(entry=0x7b85c490, arg=0x7ffdf000, frame=0x32ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2732] in ntdll (0x0032ffa8) 14 0x7bc7a08e call_thread_entry_point+0x11() in ntdll (0x0032ffc8) 15 0x7bc51b87 start_process+0x16(kernel_start=0x7b85c490) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2868] in ntdll (0x0032ffe8) 16 0xf75fd21d wine_call_on_stack+0x1c() in libwine.so.1 (0x00000000) 17 0xf75fd380 wine_switch_to_stack+0x1f(func=0x7bc51b70, arg=0x7b85c490, stack=0x330000) [/home/julliard/wine/wine/libs/wine/port.c:59] in libwine.so.1 (0xffb94238) 18 0x7bc56ef1 LdrInitializeThunk+0x1f0(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:2922] in ntdll (0xffb94278) 19 0x7b862213 __wine_kernel_init+0x9b2() [/home/julliard/wine/wine/dlls/kernel32/process.c:1276] in kernel32 (0xffb95168) 20 0x7bc57cb3 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3131] in ntdll (0xffb951e8) 21 0xf75fae83 wine_init+0x2c2(argc=0x3, argv=0xffb95724, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:958] in libwine.so.1 (0xffb95238) 22 0x7bf00d6a main+0x79(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:247] in <wine-loader> (0xffb95678) 23 0xf741ca63 __libc_start_main+0xf2() in libc.so.6 (0x00000000) 0x7bc4e659 RtlAllocateHeap+0x1e9 [/home/julliard/wine/wine/dlls/ntdll/../../include/wine/list.h:100] in ntdll: movl %edx,0x4(%eax) 100 elem->next->prev = elem->prev; -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: windowscodecs: Fix build failure on OSX.
by Austin English 30 Jun '15

30 Jun '15

On Tue, Jun 30, 2015 at 2:02 PM, Sebastian Lackner <sebastian(a)fds-team.de> wrote: > The build failure unfortunately was introduced by my last patch > http://source.winehq.org/git/wine.git/commit/863f432a7d73b8b480a742fcbaf01d… > > Somehow I missed that this part is OSX specific and tested on Linux only - sorry for > the trouble. :/ The patch was tested by jam__ on IRC, would be nice if someone could > double check that no other warnings were introduced by my original commit. > > --- > dlls/windowscodecs/icnsformat.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c > index 54c7707..5d48a1a 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - IWICBitmapFrameEncode_Release(&This->encoder->IWICBitmapFrameEncode_iface); > + IWICBitmapEncoder_Release(&This->encoder->IWICBitmapEncoder_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > -- > 2.4.4 > > With your patch applied, the build is fixed for me. There are 5 warnings, but they're unrelated to your patch (deprecated warnings): Austins-Mac-mini:windowscodecs austin$ make gcc -m32 -c -o icnsformat.o icnsformat.c -I. -I../../include -I/opt/local/include/libpng16 -D__WINESRC__ \ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body \ -Wignored-qualifiers -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith \ -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -I/usr/X11/include -I/opt/local/include \ -I/usr/local/include -g -O2 icnsformat.c:430:11: warning: 'PtrToHand' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] ret = PtrToHand(This->icns_image, &handle, This->size * This->size * 4); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1772:1: note: 'PtrToHand' has been explicitly marked deprecated here PtrToHand( ^ icnsformat.c:439:5: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle(handle); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:526:13: warning: 'DisposeHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] DisposeHandle((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1278:1: note: 'DisposeHandle' has been explicitly marked deprecated here DisposeHandle(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:550:43: warning: 'NewHandle' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] This->icns_family = (IconFamilyHandle)NewHandle(0); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:451:1: note: 'NewHandle' has been explicitly marked deprecated here NewHandle(Size byteCount) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ icnsformat.c:667:19: warning: 'GetHandleSize' is deprecated: first deprecated in OS X 10.8 [-Wdeprecated-declarations] buffer_size = GetHandleSize((Handle)This->icns_family); ^ /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/MacMemory.h:1356:1: note: 'GetHandleSize' has been explicitly marked deprecated here GetHandleSize(Handle h) __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0, __MAC_10_8, __IPHONE_NA, __IPHONE_NA); ^ 5 warnings generated. -- -Austin

1 0

Re: odbccp32: Implement SQLGetPrivateProfileString (try 6 - resend)
by Nikolay Sivov 30 Jun '15

30 Jun '15

> + sect = heap_strdupAtoW(lpszSection); > + entry = heap_strdupAtoW(lpszEntry); > + string = heap_strdupAtoW(lpszDefault); > + file = heap_strdupAtoW(lpszFilename); > + retval = heap_alloc(cbRetBuffer*sizeof(WCHAR)); > + > + ret = SQLGetPrivateProfileStringW(sect, entry, string, retval, cbRetBuffer, file); > + if(ret) > + { > + WideCharToMultiByte(CP_ACP, 0, retval, -1, RetBuffer, ret+1, NULL, NULL); > + } > + > + heap_free(sect); > + heap_free(entry); > + heap_free(string); > + heap_free(file); > + > + heap_free(retval); I think it's still the same issue as last time - you're using WCHAR vs CHAR buffer lengths wrong, it might work for this function as long as it's always called with simple strings. But in general WideCharToMultiByte should not be used like that: 'cbRetBuffer' you got here is A-buffer length, yet you allocate W-buffer of this length. Later when you convert W->A you use return value from W-call as A-buffer length.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs (try 2)
by Matteo Bruni 30 Jun '15

30 Jun '15

2015-06-30 11:01 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > Removed #if > Corrected FIXME to be consistent with the reset of the file. > > Changelog: > d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs > > > Best Regards > Alistair Leslie-Hughes I guess it's good enough for me. For your following patches: avoid LPxxx types, watch your whitespaces, no need to manually add '\n' in the middle of trace strings.

1 0

Re: [PATCH 0/8] advapi32: Fail on missing value or val_count parameters. (was advapi32: Fix RegEnumValueW when enumerating long values)
by Nikolay Sivov 30 Jun '15

30 Jun '15

On 30.06.2015 15:37, Bernhard Übelacker wrote: > Bug #38796: > RegEnumValue currently returns wrong minimum expected data_count when called without proper > value or val_count when the retrieved data (+overhead) exceeds the fixed buffer > variable in RegEnumValue. > > This series of patches does following: > - Add tests to cover calls to RegEnumValue without proper value and val_count parameters. > I think it's better to have tests committed first and change all other places after that.

1 0

Re: [PATCH 4/6]: msvcp110: Add tr2_sys__Stat implementation and test.
by Piotr Caban 30 Jun '15

30 Jun '15

On 06/27/15 19:50, YongHaoHu wrote: > +static file_type stat_set_error(int *err_code) > +{ > + file_type ret; > + *err_code = ERROR_SUCCESS; > + > + switch(GetLastError()) { > + case ERROR_FILE_NOT_FOUND: > + case ERROR_BAD_NETPATH: > + case ERROR_INVALID_NAME: > + case ERROR_BAD_PATHNAME: > + case ERROR_PATH_NOT_FOUND: > + ret = file_not_found; > + break; > + case ERROR_BAD_DEV_TYPE: > + ret = regular_file; > + break; > + default: > + ret = status_unknown; Shouldn't err_code be set to GetLastError in default case? You end up setting it to ERROR_SUCCESS in every case except if path is NULL. Why are you handling ERROR_BAD_DEV_TYPE error here? > + TRACE("(%s %p)\n", debugstr_a(path), err_code); > + DWORD attr; This will produce a compilation warning. Cheers, Piotr

2 4

Re: ntdll: Randomize security cookie when available (try 4)
by Alexandre Julliard 30 Jun '15

30 Jun '15

André Hentschel <nerv(a)dawncrow.de> writes: > @@ -1278,6 +1281,26 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz > } > } > > + > + /* randomize security cookie */ > + > + if (IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG < nt->OptionalHeader.NumberOfRvaAndSizes && > + (pos = nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress)) > + { > + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg = (IMAGE_LOAD_CONFIG_DIRECTORY *)(ptr + pos); > + ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; > + struct timeval tv; > + > + gettimeofday( &tv, NULL ); > + srand( tv.tv_usec * getpid() ); > + *cookie = rand(); That's not much better. It doesn't make sense to reset the seed on every call. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH]winecfg: Double click in dlls list to edit overides. (try 4)
by Nikolay Sivov 30 Jun '15

30 Jun '15

On 29.06.2015 12:35, Hao Peng wrote: > Add a feature to winecfg. User can double click in dlls list to edit > overides of selected item. > > superseded all earlier patches. > > --- > programs/winecfg/libraries.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > + case CBN_DBLCLK: > + if (LOWORD(wParam) == IDC_DLLS_LIST) > + { > + int index; > + POINT p; > + if (GetCursorPos(&p) && ScreenToClient((HWND)lParam, &p)) > + { > + index = SendDlgItemMessageW(hDlg, IDC_DLLS_LIST, > + LB_ITEMFROMPOINT, 0, MAKELPARAM(p.x, p.y)); > + if (!HIWORD(index)) > + on_edit_click(hDlg); > + } > + } > + break; Correct me if I'm wrong, but I don't think you get CBN_DBLCLK unless clicked on an item. Quick test with ControlSpy on Windows confirms that. And by the time you get CBN_DBLCLK something is always selected I think, which makes all that cursor complexity redundant.

2 2

Re: winedbg: Add be_xpoint_FAIL=-1 to enum be_xpoint_type.
by Michael Stefaniuc 30 Jun '15

30 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Thanks Gerald, On 06/30/2015 01:12 AM, Gerald Pfeifer wrote: > This replaces my original submission with a different approach. > > Recall this is about clang 3.4.1 complaining as follows: > > gdbproxy.c:2147:23: warning: comparison of constant -1 with > expression of type 'enum be_xpoint_type' is always false > > In my original submission I noted that "I see two ways to address > this: adding a dummy set to -1 to the enum, or casting the enum to > int before comparing against -1". > > Michael kindly provided feeback to go with the former approach. > This patch does that. (Thanks, Michael!) but can you please change the magic -1 to be_xpoint_FAIL too? > > Gerald --- programs/winedbg/be_cpu.h | 2 +- 1 file changed, 1 > insertion(+), 1 deletion(-) > > diff --git a/programs/winedbg/be_cpu.h b/programs/winedbg/be_cpu.h > index 889f638..c95ed7c 100644 --- a/programs/winedbg/be_cpu.h +++ > b/programs/winedbg/be_cpu.h @@ -20,7 +20,7 @@ > > enum be_cpu_addr {be_cpu_addr_pc, be_cpu_addr_stack, > be_cpu_addr_frame}; enum be_xpoint_type {be_xpoint_break, > be_xpoint_watch_exec, be_xpoint_watch_read, - > be_xpoint_watch_write}; + > be_xpoint_watch_write, be_xpoint_FAIL=-1}; I'd rather have be_xpoint_FAIL as first element in the enum. > struct backend_cpu { const DWORD machine; bye michael -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iD8DBQFVklO10ei8kcpE1VERAnKJAKCDf9tLHh2u4/mHPqdwjXTB/ol8MACcDQOx 1UIk4kBN8htbqwT0Wi3z5bo= =M6XR -----END PGP SIGNATURE-----

1 0

Re: [4/14]hid: Implement HidP_GetCaps
by Alexandre Julliard 30 Jun '15

30 Jun '15

Aric Stewart <aric(a)codeweavers.com> writes: > --- /dev/null > +++ b/include/wine/hid.h > @@ -0,0 +1,80 @@ > +/* > + * Wine internal HID structures > + * You shouldn't need a global header for internal structures. -- Alexandre Julliard julliard(a)winehq.org

5 7

Re: new patch
by Marvin 30 Jun '15

30 Jun '15

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=14843 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: [3/4] shell32: Release shell folders obtained via IFolderView_GetFolder.
by Matteo Bruni 29 Jun '15

29 Jun '15

2015-06-29 23:10 GMT+02:00 Thomas Faber <thomas.faber(a)reactos.org>: > As a consequence of the previous patch, Wine now leaks shell folder > references after calling GetFolder. This fixes the call sites to > release them. I think it would be better to merge this with the previous patch, to avoid the temporary regression.

1 0

Re: [4/4] shell32/tests: Remove a misleading test.
by Nikolay Sivov 29 Jun '15

29 Jun '15

Whole series looks good to me, thanks for working on this. On 30.06.2015 0:57, Thomas Faber wrote: > This removes the aforementioned test. Yes, this test was my doing. I guess I misinterpreted results, and static desktop impl hid the issue. By the way, regarding GetFolder(), msdn says that IShellItemArray is also supported, we probably can easily get away be using SHCreateShellItemArray; but that is a separate thing of course, that deserves its own patch and tests.

1 0

Re: d3dx9_36 [try 2]: Save multiplications and divisions to improve performance
by Matteo Bruni 29 Jun '15

29 Jun '15

2015-06-25 23:45 GMT+02:00 David Adam <david.adam.cnrs(a)gmail.com>: > Hi, > > I added a test with 65000 sides. All the test pass with a native d3dx9_36 > dll. You should have mentioned that the new test doesn't pass with the previous implementation, which is what makes this patch really convincing. So this patch is okay to me. Also notice that this in practice doesn't save any multiplication in the loop, at least with my version of GCC: the multiplication 2.0f * D3DX_PI was precalculated at compile time. A better patch title mentioning D3DXCreatePolygon would be nice. The tests generally have some room for improvement. As a followup it would be nice to try and improve them, maybe by replacing the comparison function with one which allows for a relative error and makes it possible to choose a potentially different error value for each test (to be able to lower those as much as possible). I would like to point you to some other place in Wine where the float comparison is done right but, on the spot, I only found relative_error + expect_color macros from d3dx9_36/tests/math.c which are really ugly. FWIW https://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbe… seems to be a good read on the subject.

1 0

Re: d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs
by Matteo Bruni 29 Jun '15

29 Jun '15

2015-06-27 8:41 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > These functions are only supported with d3dcompiler version 46 and above. > > Changelog: > d3dcompiler: Add D3DCompileFromFile, D3DCompile2 stubs > > > Best Regards > Alistair Leslie-Hughes I don't think you need to encompass the function definitions in an #if D3D_COMPILER_VERSION since they won't be exported anyway by the spec files for version < 46. Can you use a format like the one used in D3DCompile() for the tracing of function parameters in the FIXME?

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 9 resend).
by Marvin 29 Jun '15

29 Jun '15

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=14829 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 7 resend).
by Marvin 29 Jun '15

29 Jun '15

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=14828 Your paranoid android. === build (build) === Patch failed to apply

1 0

Re: d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 9).
by Marvin 29 Jun '15

29 Jun '15

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=14826 Your paranoid android. === build (build) === Patch failed to apply

1 0

Wiki is down
by Rosanne DiMesio 29 Jun '15

29 Jun '15

Http://wiki.winehq.org leads to a bluehost.com page that says "There is no website configured at this address" and links to specific wiki pages produce 404: File not found. -- Rosanne DiMesio <dimesio(a)earthlink.net>

4 3

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 8).
by Stefan Dösinger 29 Jun '15

29 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-28 um 11:14 schrieb Aaryaman Vasishta: > + if (FAILED(IDirectDraw2_CreateSurface(ddraw, &surface_desc, ds, NULL))) > + continue; > + > + hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds); > + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); > + if (FAILED(hr)) > + continue; You're leaking the depth surface in this case. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVkUYtAAoJEN0/YqbEcdMwCt4P/09yNvjELjIyH5T/5HRdUWm4 LoJLtK/OhmlwdaHCvsShqImde4IjszHm/wzL7sIokNxXJ9zDOvmFPjQ+8jcyBJoG ZPNGB7o2QT1RqVhgXRBJkAGWkrG7Pwd6oTShibKmbxySsTVuol62hcjqSZkZshCz 6iO/9MwhzW1KdpHrVGbXcKAQZzPg8rsqDb+97k5350FYdJFFd0935WOCUiNfHOuu iqAm6V3sJbcQ3SBxJN5l2vPLG2m4j40307fEFNJor9jOkFOGv9RnxzGCp2O+gUcV h6n6l/bmznT/lVl4IedUFYkxIQUgdGIMoUXZfgs5MZZYhuaUrR9XxeNlv7oJrcVQ i1fp3pjEQldw7X4KQXqlwzOn7CvVZTtSqH4D4Glyn/3rHFD0V9fIWINg6Fj/Nd73 fZf8TAHM45WqQ+9ueVmnaYGdkUhN0bq8JDE2QfCKUfXNIOC8j5vLgJ7NC5YhC7xc WtOAsXxF7RRVmbQbfMUYOWJcMWR9XUbTNGyWQhWsiWx92rz3n1m7C3e+K9fp2F2P Eybs30FWbPuKuBxvEy0Ws1bA1xY+my1iD/mQN4YEc1aet2X/YpZ4EqYSWOzwKLM/ FuAchmQFwo7Hyr+9nrAc47441ENMBdQQ/dpAS90wGy/uQPJURj08LFt3EWDjXy/O bkMhBscSpcPpizrksvna =U/er -----END PGP SIGNATURE-----

1 0

Re: vbscript: Treat empty regexp pattern the same way as NULL pattern.
by Marvin 29 Jun '15

29 Jun '15

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=14818 Your paranoid android. === w2000pro (32 bit) === No test summary line found === wxppro (32 bit) === No test summary line found === w2003std (32 bit) === No test summary line found === wvistau64 (32 bit) === No test summary line found === w2008s64 (32 bit) === No test summary line found === w7u (32 bit) === No test summary line found === w8 (32 bit) === No test summary line found === wvistau64 (64 bit) === No test summary line found === w2008s64 (64 bit) === No test summary line found

1 0

Re: [1/2] user32/tests: Add some tests to show that WS_CLIPCHILDREN doesn't exclude children from update region.
by Marvin 29 Jun '15

29 Jun '15

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=14817 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10561: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [1/2] qcap: Distinguish interface and implementation pointer for VfwCapture output pin.
by Nikolay Sivov 29 Jun '15

29 Jun '15

On 29.06.2015 9:08, Sebastian Lackner wrote: > - BasePin *pin; > + VfwPinImpl *pin; > > TRACE("destroying everything\n"); > if (This->init) > @@ -226,10 +236,10 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) > qcap_driver_stop(This->driver_info, &This->filter.state); > qcap_driver_destroy(This->driver_info); > } > - pin = (BasePin*) This->pOutputPin; > - if (pin->pConnectedTo != NULL) > + pin = impl_from_IPin(This->pOutputPin); > + if (pin->pin.pin.pConnectedTo != NULL) > { > - IPin_Disconnect(pin->pConnectedTo); > + IPin_Disconnect(pin->pin.pin.pConnectedTo); This is not better than it is now, 'pOutputPin' is IPin* so you should be using public methods. > if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) > - *ppv = This; > + *ppv = &This->pin.pin.IPin_iface; This could as well say 'iface'.

2 3

Re: [PATCH 2/6]: msvcp110: Add tr2_sys__Rename implementation and test.
by Piotr Caban 29 Jun '15

29 Jun '15

On 06/27/15 19:50, YongHaoHu wrote: > + ok(GetFileInformationByHandle(h2, &info2), "GetFileInformationByHandle failed\n"); > + CloseHandle(h2); > + ok(info1.nFileIndexHigh == info2.nFileIndexHigh > + && info1.nFileIndexLow == info2.nFileIndexLow, > + "test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1); This test is not working when run from VirtualBox share. Could you please run the tests inside temp directroy? Thanks, Piotr

1 0

Re: [1/2] qcap: Distinguish interface and implementation pointer for VfwCapture output pin.
by Michael Stefaniuc 29 Jun '15

29 Jun '15

On 06/29/2015 08:08 AM, Sebastian Lackner wrote: > --- dlls/qcap/vfwcapture.c | 42 > ++++++++++++++++++++++++++---------------- 1 file changed, 26 > insertions(+), 16 deletions(-) > > diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index > 7804a3d..31620c0 100644 --- a/dlls/qcap/vfwcapture.c +++ > b/dlls/qcap/vfwcapture.c @@ -557,7 +567,7 @@ PPB_Load( > IPersistPropertyBag * iface, IPropertyBag *pPropBag, > var.__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.ulVal ); if > (This->driver_info) { - pin = (VfwPinImpl > *)This->pOutputPin; + pin = > impl_from_IPin(This->pOutputPin); impl_from_IFoo() is just for the interface pointer of a method. For internal stuff the object pointer should be passed or stored instead. For application provided interface pointers an unsafe_impl_from_IFoo() should be used. bye michael

1 0

Re: qmgr: Fix WINHTTP_OPTION_CONTEXT_VALUE data pointer (Coverity)
by Hans Leidekker 29 Jun '15

29 Jun '15

> On 27 Jun 2015, at 09:57, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Hans, does it look right? Yes, thanks.

1 0

Re: [2/2] windowscodecs: Distinguish interface and implementation pointer for IcnsEncoder.
by Nikolay Sivov 29 Jun '15

29 Jun '15

On 29.06.2015 9:08, Sebastian Lackner wrote: > --- > dlls/windowscodecs/icnsformat.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c > index 5ce44a2..3f24e91 100644 > --- a/dlls/windowscodecs/icnsformat.c > +++ b/dlls/windowscodecs/icnsformat.c > @@ -179,7 +179,7 @@ static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) > if (This->icns_image != NULL) > HeapFree(GetProcessHeap(), 0, This->icns_image); > > - IUnknown_Release((IUnknown*)This->encoder); > + IUnknown_Release(&This->encoder->IWICBitmapFrameEncode_iface); > HeapFree(GetProcessHeap(), 0, This); > } > > @@ -489,7 +489,7 @@ static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFII > if (IsEqualIID(&IID_IUnknown, iid) || > IsEqualIID(&IID_IWICBitmapEncoder, iid)) > { > - *ppv = This; > + *ppv = &This->IWICBitmapEncoder_iface; > } > else > { > @@ -639,7 +639,7 @@ static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, > frameEncode->committed = FALSE; > *ppIFrameEncode = &frameEncode->IWICBitmapFrameEncode_iface; > This->outstanding_commits++; > - IUnknown_AddRef((IUnknown*)This); > + IUnknown_AddRef(&This->IWICBitmapEncoder_iface); > > end: > LeaveCriticalSection(&This->lock); > @@ -725,8 +725,8 @@ HRESULT IcnsEncoder_CreateInstance(REFIID iid, void** ppv) > InitializeCriticalSection(&This->lock); > This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock"); > > - ret = IUnknown_QueryInterface((IUnknown*)This, iid, ppv); > - IUnknown_Release((IUnknown*)This); > + ret = IUnknown_QueryInterface(&This->IWICBitmapEncoder_iface, iid, ppv); > + IUnknown_Release(&This->IWICBitmapEncoder_iface); > > return ret; > } > Please use proper wrappers for that.

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (unmodified resend).
by Stefan Dösinger 28 Jun '15

28 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, Here's something for future reference. I believe Henri mentioned the same thing for a different place already. I don't think a resend is necessary for this, you can fix this when you add this test for d3drm1 and d3drm3. Am 2015-06-27 um 18:38 schrieb Aaryaman Vasishta: > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) > + { > + ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper); > + IDirectDrawClipper_Release(d3drm_clipper); > + } You don't really need the if (SUCCEEDED(hr)) here. You're unconditionally expecting GetClipper to return a clipper in the ok() line above. If it doesn't return one the test already failed, and there's no need to bother about preventing follow-up failures or crashes. (Yeah, we have many instances in the code of things like these, e.g. if (SUCCEEDED(hr)) after BeginScene / EndScene. They should ideally be fixe d.) > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); Same thing here. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVj5yEAAoJEN0/YqbEcdMwi+oP/0uFOap9QRVWMILPN/PrupVO g3IR6KBx+QNf/mzkOEyP6rQVbZx0UUlHlQ16v0ftziediL73qpQfRKSIxf135THH ji6+DK0xHUvBNSz6XDSZjDky/cTtnTO0IRdRqZlL4Cd+y46GF04hwoiuIijnx1Fd +AHurqTvEBgYepc+oEPgQRh2q/OApxUs3kMTPXzK9rPIp2SKZwpcJ8NMkYhaGMRC FXEOq/lfaanQbgQdcPqavMgHBDCOR9xvhgSsPktUlCtltsrNJ/1INyRHHfbt8F1k Yg5yfXdxvaThkWy5pNlAeatPZFhYzJIiyECvol7MXymHSP4zMDlF+WoG9V21fHOR aYCA5lplQY3P7+0r0Nv7rQgtqWoo/mx6ntgm3Etl7MBKV5+ED8RNVPCWCkBV4j/y EXWJe8RLj+a0pHIA+sTop0Yym+F00/6SPH6sJcHnqqSo1W34FFnpzH5ddV3oNst0 8fVjYNLyQwdo9k2z5DVf1ZJQk87dk3Rg6bzZpofwhOd3NEmNr1f8kMDLCYNbs5GK jr1QdyLtFCpxoqqDu1iE2174SZgECXkDU6DJQE99BVtNs9QcIx9pqNXmHbLXXDyX akHSKWeDQrZpMOSZI/XZxlXhhVdxeGRJGdkZmzr4H1Qpu4kHA5OgOaXBGVRIoUNg ii/ChTzxObM40BdpuaH+ =5Y9W -----END PGP SIGNATURE-----

1 0

Re: [PATCH 3/6]: msvcp110: Add tr2_sys__Statvfs implementation and test.
by Nikolay Sivov 28 Jun '15

28 Jun '15

On 27.06.2015 20:50, YongHaoHu wrote: > +typedef struct { > + ULONGLONG capacity; > + ULONGLONG free; > + ULONGLONG available; > +} space_info; > + Is this documented somewhere? > + info.capacity = ((ULONGLONG)(total.HighPart)<< 32) + total.LowPart; > + info.free = ((ULONGLONG)(free.HighPart)<< 32) + free.LowPart; > + info.available = ((ULONGLONG)(available.HighPart)<< 32) + available.LowPart; I don't think you'll need this if you used QuadPart.

2 1

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 7).
by Stefan Dösinger 27 Jun '15

27 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-27 um 18:38 schrieb Aaryaman Vasishta: > +static IDirect3DDevice2 *create_device(IDirectDraw2 *ddraw, HWND window, IDirectDrawSurface **ds) > ... > + if (FAILED(IDirectDraw2_CreateSurface(ddraw, &surface_desc, ds, NULL))) > + continue; > + > + hr = IDirectDrawSurface_AddAttachedSurface(surface, *ds); > + ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); > + IDirectDrawSurface_Release(*ds); should release the depth stencil surface in the success case because you're passing it out of the function. The other patches are OK. I'll ack them on monday on IRC, including a fixed version of patch 3 if it is on wine-patches by then. Cheers, Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVjwwxAAoJEN0/YqbEcdMwz+sP/1+Lme2ItbNjmvKnCwtSWdul tcMr9DkNrjkyUMsM1Glzgoll5XphGRj+4M6ZnPTrLU5i4qlZ8w6MWm8kkrQK3h12 KWhfYEhWBahqBTDva7dulThM6TvzHrvq7pK8ObfmDdWlchhv4Y89hksSIlIdGUD8 7QuEx7EvcutcEnaNFZI5yCtOGEvUNAK4GYzFPWYNnFjDpgq7567TBh5oXdFkyQsT 3wKOf8Uxt5O9/2f5E+7cYyOLC+BR6YM4uGarnma2eqQIzTUOXySm7UYA0gJ3KRw6 9OtzWUyIPw5Iz2CkVkP5M5o9srtkSVungsCg6aQSQIcbGaedvhu9K0G4fFJxVqWJ zmntVVp4yQzP+yov9NHEYOvX1rAkO9V3RudeVfe2sytxHNYYC7hwTR8lXLaM0WF6 fbWx32k8+6o0JP02PgkZFHBhlYZLN5a1deYFTpUFsW0YhUKNrRXAwV9MuVMihreC MmNbnE7DnnrX/vYkxh6MHAnkCFM6/uMy9M8jvTEuzpr0mhCfjn50mbv/lgUK3WiV leUda/RCBmfiM4YPJkhV3qytikRL5EPouB5LcvCR7xjpKT83TBnKOphCRgLPVBrR 2uuJ5orV8M+V9g67zXYibkaeh3yBr8w8vuvTz/L638zkdjshJJmQ/L/51FL0t9Qk 1FEipapwnAjq4NOKJvJi =+VK0 -----END PGP SIGNATURE-----

1 0

Re: user32: Limit number of hooks called recursively.
by Marvin 26 Jun '15

26 Jun '15

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=14749 Your paranoid android. === wvistau64 (64 bit msg) === msg.c:10595: Test failed: expected PeekMessage to return FALSE, got 1

1 0

Re: [PATCH] msvcp90: Implement time_get<char> ctors and dtors
by Piotr Caban 26 Jun '15

26 Jun '15

On 06/26/15 16:51, Daniel Lehman wrote: > + days = _Locinfo__Getdays((_Locinfo *)locinfo); Could you please change _Locinfo__Getdays header and make the cast there? Thanks to it we will much _Locinfo__Getdays mangled name. Also _Locinfo__W_Getmonths, _Locinfo__Getmonths and _Locinfo__W_Getdays header needs to be fixed. This will make this cast not needed. > + len = strlen(days)+1; > + this->days = MSVCRT_operator_new(len); > + if(this->days) Please handle allocation failures as it's done in other locale classes. > time_get_char* __thiscall time_get_char_ctor_locinfo(time_get_char *this, > const _Locinfo *locinfo, unsigned int refs) > { > - FIXME("(%p %p %d) stub\n", this, locinfo, refs); > + TRACE("(%p %p %d)\n", this, locinfo, refs); > + locale_facet_ctor_refs(&this->facet, refs); > this->facet.vtable = &MSVCP_time_get_char_vtable; > + time_get_char__Init(this, locinfo); > return NULL; > } You forgot to return THIS here. Thanks, Piotr

2 2

Re: [PATCH 2/2] msvcp90: Copy name in _Getctype (Valgrind) (try2)
by Piotr Caban 26 Jun '15

26 Jun '15

On 06/24/15 16:46, Daniel Lehman wrote: > + name = ___lc_locale_name_func()[LC_COLLATE]; > + size = wcslen(name)+1; > + ret->name = malloc(size*sizeof(*name)); > + if (!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); > + memcpy(ret->name, name, size*sizeof(*name)); This will not work if ___lc_locale_name_func()[LC_COLLATE] is NULL. Thanks, Piotr

2 2

Re: [PATCH 2/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromSurface (try 6).
by Stefan Dösinger 26 Jun '15

26 Jun '15

Hi, > + ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); Style-only issue: You're just checking one flag here, so ok(dwCaps & ZBUFFER, "..."); is enough > + IDirectDrawSurface_Release(surface); > + > + memset(&desc, 0, sizeof(desc)); > + desc.dwSize = sizeof(desc); > + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; > + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; > + desc.dwWidth = rc.right; > + desc.dwHeight = rc.bottom; > + > + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); > + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); Minor issue: I don't think there's a reason to destroy and recreate the surface. > + IDirectDrawSurface_Release(d3drm_ds); > + IDirectDrawSurface_Release(d3drm_surface); > + IDirectDrawSurface_Release(ds); What happens to the depth buffer here? Does it remain attached? Stefan

2 3

Re: [PATCH 3/4] dmband: Remove the extraneous IUnknown from DMBandTrack
by Jacek Caban 26 Jun '15

26 Jun '15

Hi Michael, On 06/26/15 00:18, Michael Stefaniuc wrote: > @@ -97,22 +41,47 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr > } > > static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, > - void **ppobj) > + void **ret_iface) > { > IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); > - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); > + > + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || > + IsEqualIID(riid, &IID_IDirectMusicTrack8)) > + *ret_iface = iface; > + else if (IsEqualIID(riid, &IID_IPersistStream)) > + *ret_iface = &This->PersistStreamVtbl; > + else { > + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); > + return E_NOINTERFACE; > + } The patch is obviously fine and the problem exists in current code, but QI is supposed to set output interface on error and such assumption is common for callers. It would be nice to fix that when you rewrite QI ;) Cheers, Jacek

2 1

Re: [2/14]hid: break HidD_ functions out into their own module
by Charles Davis 26 Jun '15

26 Jun '15

> On Jun 25, 2015, at 9:15 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > --- a/dlls/hid/main.c > +++ b/dlls/hid/main.c > @@ -39,43 +35,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) > { > switch(fdwReason) > { > - case DLL_WINE_PREATTACH: > - return FALSE; /* prefer native version */ This is minor, but I don’t think we should prefer the builtin hid.dll until we’re done implementing it. Chip

2 1

Re: [1/14]include: add ddk/hidclass.h
by Charles Davis 26 Jun '15

26 Jun '15

> On Jun 25, 2015, at 9:15 AM, Aric Stewart <aric(a)codeweavers.com> wrote: > @@ -0,0 +1,63 @@ […] > +#ifndef __HIDCLASS_H > +#define __HIDCLASS_H […] > +DEFINE_GUID (GUID_DEVINTERFACE_HID, \ > + 0x4D1E55B2L, 0xF16F, 0x11CF, 0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30); Correct me if I’m wrong, but I think this should go outside the header guard. That way, you can usefully include this definition multiple times, and one of those times you can define INITGUID to get a real definition. Chip

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 6).
by Stefan Dösinger 25 Jun '15

25 Jun '15

Hi, This patch looks good to me. Stefan > Am 25.06.2015 um 22:42 schrieb Aaryaman Vasishta <jem456.vasishta(a)gmail.com>: > > --- > dlls/d3drm/tests/d3drm.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 202 insertions(+) > > diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c > index 5dcfddc..666150f 100644 > --- a/dlls/d3drm/tests/d3drm.c > +++ b/dlls/d3drm/tests/d3drm.c > @@ -1947,6 +1947,207 @@ static void test_frame_qi(void) > IDirect3DRM_Release(d3drm1); > } > > +static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) > +{ > + IDirectDrawSurface **primary = context; > + > + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) > + { > + *primary = surface; > + return DDENUMRET_CANCEL; > + } > + IDirectDrawSurface_Release(surface); > + > + return DDENUMRET_OK; > +} > + > +static void test_create_device_from_clipper(void) > +{ > + DDSCAPS caps = { DDSCAPS_ZBUFFER }; > + IDirect3DRM *d3drm1 = NULL; > + IDirect3DRM2 *d3drm2 = NULL; > + IDirectDraw *ddraw = NULL; > + IUnknown *unknown = NULL; > + IDirect3DRMDevice2 *device2 = NULL; > + IDirect3DDevice2 *d3ddevice2 = NULL; > + IDirectDrawClipper *clipper = NULL, *d3drm_clipper = NULL; > + IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_primary = NULL; > + IDirectDrawSurface7 *surface7 = NULL; > + DDSURFACEDESC desc, surface_desc; > + DWORD expected_flags; > + HWND window; > + GUID driver = IID_IDirect3DRGBDevice; > + HRESULT hr; > + ULONG ref1, ref2, ref3, cref1, cref2; > + RECT rc; > + > + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 500, 400, 0, 0, 0, 0); > + GetClientRect(window, &rc); > + hr = DirectDrawCreateClipper(0, &clipper, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDrawClipper interface (hr = %x).\n", hr); > + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); > + ok(hr == DD_OK, "Cannot set HWnd to Clipper (hr = %x).\n", hr); > + > + hr = Direct3DRMCreate(&d3drm1); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); > + ref1 = get_refcount((IUnknown *)d3drm1); > + cref1 = get_refcount((IUnknown *)clipper); > + > + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); > + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); > + ref2 = get_refcount((IUnknown *)d3drm2); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > + > + /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 0, 0, &device2); > + todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); > + ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); > + ref3 = get_refcount((IUnknown *)d3drm1); > + todo_wine ok(ref3 > ref1, "expected ref3 > ref1, got ref1 = %u , ref3 = %u.\n", ref1, ref3); > + ref3 = get_refcount((IUnknown *)d3drm2); > + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); > + cref2 = get_refcount((IUnknown *)clipper); > + todo_wine ok(cref2 > cref1, "expected cref2 > cref1, got cref1 = %u , cref2 = %u.\n", cref1, cref2); > + > + /* Fetch immediate mode device in order to access render target */ > + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > + todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); > + if (FAILED(hr)) > + goto cleanup; > + > + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); > + > + hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper); > + ok(hr == DDERR_NOCLIPPERATTACHED, "Expected hr == DDERR_NOCLIPPERATTACHED, got %x.\n", hr); > + > + /* Check if CreateDeviceFromClipper creates a primary surface and attaches the clipper to it */ > + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); > + ok(hr == DD_OK, "Cannot get IDirectDrawSurface7 interface (hr = %x).\n", hr); > + IDirectDrawSurface7_GetDDInterface(surface7, (void **)&unknown); > + hr = IUnknown_QueryInterface(unknown, &IID_IDirectDraw, (void **)&ddraw); > + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); > + IUnknown_Release(unknown); > + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, > + NULL, &d3drm_primary, surface_callback); > + ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr); > + ok(d3drm_primary != NULL, "No primary surface was enumerated.\n"); > + hr = IDirectDrawSurface_GetClipper(d3drm_primary, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) > + { > + ok(d3drm_clipper == clipper, "Expected clipper returned == %p, got %p.\n", clipper , d3drm_clipper); > + IDirectDrawClipper_Release(d3drm_clipper); > + } > + if (d3drm_primary) > + IDirectDrawSurface_Release(d3drm_primary); > + IDirectDrawSurface7_Release(surface7); > + IDirectDraw_Release(ddraw); > + > + /* Check properties of render target and depth surface */ > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); > + ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); > + > + ok((surface_desc.dwWidth == 300) && (surface_desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", > + surface_desc.dwWidth, surface_desc.dwHeight); > + ok((surface_desc.ddsCaps.dwCaps & (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE)) == (DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE), > + "Expected caps containing %x, got %x.\n", DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE, surface_desc.ddsCaps.dwCaps); > + expected_flags = DDSD_PIXELFORMAT | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; > + ok(surface_desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, surface_desc.dwFlags); > + > + hr = DirectDrawCreate(NULL, &ddraw, NULL); > + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); > + desc.dwSize = sizeof(desc); > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + ok(desc.ddpfPixelFormat.dwRGBBitCount == surface_desc.ddpfPixelFormat.dwRGBBitCount, "Expected %u bpp, got %u bpp.\n", > + surface_desc.ddpfPixelFormat.dwRGBBitCount, desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds); > + ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); > + > + desc.dwSize = sizeof(desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); > + ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); > + > + ok((desc.dwWidth == 300) && (desc.dwHeight == 200), "Expected surface dimentions = 300, 200, got %u, %u.\n", > + desc.dwWidth, desc.dwHeight); > + ok((desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) == DDSCAPS_ZBUFFER, "Expected caps containing %x, got %x.\n", DDSCAPS_ZBUFFER, desc.ddsCaps.dwCaps); > + expected_flags = DDSD_ZBUFFERBITDEPTH | DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH; > + ok(desc.dwFlags == expected_flags, "Expected %x for flags, got %x.\n", expected_flags, desc.dwFlags); > + ok(desc.dwZBufferBitDepth == 16, "Expected 16 for Z buffer bit depth, got %u.\n", desc.dwZBufferBitDepth); > + ok(desc.ddpfPixelFormat.dwStencilBitMask == 0, "Expected 0 stencil bits, got %x.\n", desc.ddpfPixelFormat.dwStencilBitMask); > + > + /* Release old objects and check refcount of device and clipper */ > + IDirectDrawSurface_Release(ds); > + ds = NULL; > + IDirectDrawSurface_Release(surface); > + surface = NULL; > + IDirect3DDevice2_Release(d3ddevice2); > + d3ddevice2 = NULL; > + IDirect3DRMDevice2_Release(device2); > + ref3 = get_refcount((IUnknown *)d3drm1); > + ok(ref1 == ref3, "expected ref1 == ref3, got ref1 = %u, ref3 = %u.\n", ref1, ref3); > + ref3 = get_refcount((IUnknown *)d3drm2); > + ok(ref3 == ref2, "expected ref3 == ref2, got ref2 = %u , ref3 = %u.\n", ref2, ref3); > + cref2 = get_refcount((IUnknown *)clipper); > + todo_wine ok(cref1 == cref2, "expected cref1 == cref2, got cref1 = %u, cref2 = %u.\n", cref1, cref2); > + > + /* Test if render target format follows the screen format */ > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + hr = IDirectDraw_SetDisplayMode(ddraw, desc.dwWidth, desc.dwHeight, 16); > + ok(hr == DD_OK, "Cannot set display mode to 16bpp (hr = %x).\n", hr); > + > + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); > + ok(hr == DD_OK, "Cannot get IDirectDraw display mode (hr = %x)\n", hr); > + ok(desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16 bpp, got %u.\n", desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, rc.right, rc.bottom, &device2); > + ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); > + > + hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3ddevice2); > + todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); > + if (FAILED(hr)) > + goto cleanup; > + > + hr = IDirect3DDevice2_GetRenderTarget(d3ddevice2, &surface); > + ok(hr == DD_OK, "Cannot get surface to the render target (hr = %x).\n", hr); > + > + surface_desc.dwSize = sizeof(surface_desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc); > + ok(hr == DD_OK, "Cannot get surface desc structure (hr = %x).\n", hr); > + todo_wine ok(surface_desc.ddpfPixelFormat.dwRGBBitCount == 16, "Expected 16bpp, got %ubpp.\n", > + surface_desc.ddpfPixelFormat.dwRGBBitCount); > + > + hr = IDirectDraw2_RestoreDisplayMode(ddraw); > + ok(SUCCEEDED(hr), "RestoreDisplayMode failed, hr %#x.\n", hr); > + > +cleanup: > + if (ds) > + IDirectDrawSurface_Release(ds); > + if (surface) > + IDirectDrawSurface_Release(surface); > + if (d3ddevice2) > + IDirect3DDevice2_Release(d3ddevice2); > + if (device2) > + IDirect3DRMDevice2_Release(device2); > + if (d3drm2) > + IDirect3DRM2_Release(d3drm2); > + if (d3drm1) > + IDirect3DRM_Release(d3drm1); > + if (clipper) > + IDirectDrawClipper_Release(clipper); > + if (ddraw) > + IDirectDraw_Release(ddraw); > + DestroyWindow(window); > +} > + > START_TEST(d3drm) > { > test_MeshBuilder(); > @@ -1964,4 +2165,5 @@ START_TEST(d3drm) > test_frame_mesh_materials(); > test_d3drm_qi(); > test_frame_qi(); > + test_create_device_from_clipper(); > } > -- > 1.9.3 (Apple Git-50) > > >

1 0

RE: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 5).
by Aaryaman Vasishta 25 Jun '15

25 Jun '15

> > This is by no means a full review, just a couple of obvious things I noticed. > > On 24 June 2015 at 17:02, Aaryaman Vasishta <jem456.vasishta at gmail.com <https://www.winehq.org/mailman/listinfo/wine-devel>> wrote: > >* +static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) > *>* +{ > *>* + IDirectDrawClipper *d3drm_clipper = NULL; > *Initializing this to NULL is pointless, you initialize it before all > uses with the IDirectDrawSurface_GetClipper() call below. > > >* + if (context) > *>* + { > *"context" should always be non-NULL here. > > >* + hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper); > *>* + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > *>* + if (SUCCEEDED(hr)) > *You have an ok() one line above that states "hr == DD_OK" at this > point. If the GetClipper() call failed you'd get a test failure. > > Once you've found the primary you can of course return DDENUMRET_CANCEL. > > I think you're making things too complicated though. I'd just call > EnumSurfaces() with "&primary" as context pointer, set it in the > callback, and then just do the rest of the tests after EnumSurfaces() > returns, instead of trying to fit those into the callback. > > Thank you for the suggestions! I have decided to return the primary surface directly, and set it to NULL if it doesn't exist via the context, something like this, which seems to run fine on my windows machine: > static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, > DDSURFACEDESC *desc, void **context) > { > IDirectDrawClipper *d3drm_clipper; > HRESULT hr; > > if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) > { > *context = surface; > return DDENUMRET_CANCEL; > } > IDirectDrawSurface_Release(surface); > > return DDENUMRET_OK; > } > Then in the tests, simply check if the context returned is NULL, if yes then perform related tests on it inside the test. Thank you!

1 1

Re: [3/14]hid: translated HidD_ functions to their IOCTLs
by Nikolay Sivov 25 Jun '15

25 Jun '15

On 25.06.2015 18:15, Aric Stewart wrote: > BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) > { > - FIXME("(%p %p %u) stub\n", HidDeviceObject, ReportBuffer, ReportBufferLength); > - return FALSE; > + TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); > + return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL, NULL); > } I can't say I know anything about that, but this looks like a typo, maybe it should use IOCTL_HID_SET_FEATURE?

1 0

Re: d3dx9-36: Save multiplications to improve performance
by Matteo Bruni 25 Jun '15

25 Jun '15

2015-06-25 4:07 GMT+02:00 David Adam <david.adam.cnrs(a)gmail.com>: > Hello, > > with my dual-core, for sides=65000 the gain is about 40%. It probably has more to do with avoiding the division than the multiplication. Can you add a test for a polygon with that many faces and see if the result matches native better with the simplification or without?

1 0

Re: [1/3] d3dcompiler: Share the source with d3dcompiler_46 (try 2)
by Matteo Bruni 25 Jun '15

25 Jun '15

2015-06-25 12:30 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > Hi, > Rename define to D3D_COMPILER_VERSION > > Changelog: > d3dcompiler: Share the source with d3dcompiler_46 > > > Best Regards > Alistair Leslie-Hughes Series looks good to me, thanks!

1 0

Re: [PATCH 1/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromClipper (try 5).
by Henri Verbeet 25 Jun '15

25 Jun '15

This is by no means a full review, just a couple of obvious things I noticed. On 24 June 2015 at 17:02, Aaryaman Vasishta <jem456.vasishta(a)gmail.com> wrote: > +static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) > +{ > + IDirectDrawClipper *d3drm_clipper = NULL; Initializing this to NULL is pointless, you initialize it before all uses with the IDirectDrawSurface_GetClipper() call below. > + if (context) > + { "context" should always be non-NULL here. > + hr = IDirectDrawSurface_GetClipper(surface, &d3drm_clipper); > + ok(hr == DD_OK, "Cannot get attached clipper from primary surface (hr = %x).\n", hr); > + if (SUCCEEDED(hr)) You have an ok() one line above that states "hr == DD_OK" at this point. If the GetClipper() call failed you'd get a test failure. Once you've found the primary you can of course return DDENUMRET_CANCEL. I think you're making things too complicated though. I'd just call EnumSurfaces() with "&primary" as context pointer, set it in the callback, and then just do the rest of the tests after EnumSurfaces() returns, instead of trying to fit those into the callback.

1 0

Re: wineboot: Create MachineGuid registry value.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > The MachineGuid registry key should exist even without calling CryptAcquireContextW. > Optionally we could remove the remove the corresponding code from advapi32 afterwards. This doesn't need to run at every boot, so you can probably stick it into the registration of some crypto dll like wintrust. And please also remove the advapi32 code. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [1/3] wininet/tests: Add tests for overriding host header.
by Marvin 25 Jun '15

25 Jun '15

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=14698 Your paranoid android. === w7u (32 bit http) === http.c:2891: Test failed: HttpSendRequest failed http.c:2896: Test failed: HttpQueryInfo failed http.c:2897: Test failed: got status 0, expected 200 http.c:5813: Test failed: HttpAddRequestHeadersA failed 12019 http.c:5819: Test failed: HttpQueryInfoA failed 12019 http.c:5820: Test failed: header missing

1 0

Re: [1/3] wininet/tests: Add tests for overriding host header.
by Sebastian Lackner 25 Jun '15

25 Jun '15

On 25.06.2015 12:27, Sebastian Lackner wrote: > From: Michael Müller <michael(a)fds-team.de> > > --- > dlls/wininet/tests/http.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 109 insertions(+) > The testbot already shows a test failure on Win7, but it seems to be random. It doesn't occur in a second run: https://newtestbot.winehq.org/JobDetails.pl?Key=14699.

1 0

Re: [PATCH (resend)] cmd: Consistently wrap lines to 75 characters.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Alex Henrie <alexhenrie24(a)gmail.com> writes: > 75 characters is the maximum length of a line before gettext breaks it, > so this convention will cause each translatable string to fit snugly > into the po files. It's also about what we were doing anyway, just not > consistently. > > The biggest advantage to consistent line wrapping is that translators > will no longer have to guess where they should insert line breaks. You'll need to also update the duplicate text in programs/start, and it would be nice if you could try to fix at least some of the translations so that we don't have to invalidate all of them. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: d3drm: Mark DllCanUnloadNow and DllGetClassObject as private.
by Alexandre Julliard 25 Jun '15

25 Jun '15

Sebastian Lackner <sebastian(a)fds-team.de> writes: > @@ -19,5 +19,5 @@ > @ stdcall D3DRMVectorScale(ptr ptr float) > @ stdcall D3DRMVectorSubtract(ptr ptr ptr) > @ stdcall Direct3DRMCreate(ptr) > -@ stub DllCanUnloadNow > -@ stub DllGetClassObject > +@ stub -private DllCanUnloadNow > +@ stub -private DllGetClassObject Private is not useful on a stub. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] cmd: fix invalid "else if" execution (try2)
by Marvin 25 Jun '15

25 Jun '15

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=14664 Your paranoid android. === wxppro (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 693 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 694 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 695 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 696 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 697 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 698 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 699 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 700 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 702 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 703 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 704 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 707 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 708 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 709 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 715 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 716 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 717 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 718 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 719 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 721 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 722 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 723 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 724 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 725 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 727 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 731 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 732 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 734 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 735 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 740 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 741 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 745 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 747 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 748 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 755 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 756 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 757 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 761 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 762 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 763 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 764 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 765 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 767 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 768 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 769 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 770 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 774 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 775 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 776 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\winetest\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 783 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1367 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1368 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1369 (got 'C:\Documents and Settings\winetest\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1370 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1371 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1372 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1376 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1379 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1380 (got 'C:\Documents and Settings\winetest\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1384 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1385 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === w2003std (32 bit) === batch.c:312: Test failed: unexpected char 0x47 position 0 in line 692 (got 'Got unexpected result: "C:\Documents"', wanted 'Plain directory enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 693 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 694 (got 'Got unexpected result: "C:\Documents"', wanted 'File enumeration from provided root') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 695 (got 'Got unexpected result: "C:\Documents"', wanted 'Mixed enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 696 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted 'Mixed enumeration from provided root') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 697 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted 'With duplicates enumeration') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 698 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted 'Strip missing wildcards, keep unwildcarded names') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 699 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted 'for /R passed') batch.c:312: Test failed: unexpected char 0x50 position 0 in line 700 (got 'Plain directory enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 701 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 702 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 703 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 704 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 705 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 706 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 707 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 708 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 709 (got 'File enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 710 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 711 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 712 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 713 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 714 (got 'File enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 715 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 716 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 717 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 718 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 719 (got 'Mixed enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 720 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 721 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 722 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 723 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 724 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 725 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 726 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 727 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 728 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 729 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 730 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 731 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x4d position 0 in line 732 (got 'Mixed enumeration from provided root', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 733 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 734 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 735 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 736 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 737 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 738 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 739 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 740 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 741 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 742 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 743 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 744 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\."', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x57 position 0 in line 745 (got 'With duplicates enumeration', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 746 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 747 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 748 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 749 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 750 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 751 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 752 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 753 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 754 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 755 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 756 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 757 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 758 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 759 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 760 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 761 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 762 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 763 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 764 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 765 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 766 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 767 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 768 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 769 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\fred"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x53 position 0 in line 770 (got 'Strip missing wildcards, keep unwildcarded names', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 771 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 772 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 773 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 774 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 775 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x47 position 0 in line 776 (got 'Got unexpected result: "C:\Documents"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 777 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 778 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 779 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\baz\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 780 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\bazbaz"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 781 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\foo\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 782 (got 'Found missing result: "C:\Documents and Settings\Administrator\My Documents\foobar\jim"', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x66 position 0 in line 783 (got 'for /R passed', wanted '--- Complex wildcards unix and windows slash') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1367 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1368 (got 'value2', wanted '2set1endvalue1') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1369 (got 'C:\Documents and Settings\Administrator\My Documents\foobar\foodir2', wanted '@drive@@path@foobar\foodir3') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1370 (got 'value1', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1371 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1372 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1373 (got '--- Extra endlocal in called batch', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1374 (got '--- Extra endlocal in called batch', wanted '@drive@@path@foobar') batch.c:312: Test failed: unexpected char 0x46 position 0 in line 1376 (got 'Finished:', wanted 'value2') batch.c:312: Test failed: unexpected char 0x76 position 0 in line 1379 (got 'value1', wanted 'value2') batch.c:312: Test failed: unexpected char 0x43 position 0 in line 1380 (got 'C:\Documents and Settings\Administrator\My Documents\foobar', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1381 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'Finished:') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1382 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1383 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar\foodir2') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1384 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted 'value1') batch.c:312: Test failed: unexpected char 0x2d position 0 in line 1385 (got '--- endlocal in called function rather than batch pgm is ineffective', wanted '@drive@@path@foobar') === wvistau64 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'') === w8 (32 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--------'', wanted ''--a------'@or_broken@'%~ai'') === wvistau64 (64 bit) === batch.c:312: Test failed: unexpected char 0x27 position 0 in line 318 (got ''--a--c---'', wanted ''--a------'@or_broken@'%~ai'')

2 2

Re: ntdll: Randomize security cookie when available (try 3)
by Alexandre Julliard 25 Jun '15

25 Jun '15

André Hentschel <nerv(a)dawncrow.de> writes: > + /* randomize security cookie */ > + > + if (IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG < nt->OptionalHeader.NumberOfRvaAndSizes && > + (pos = nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG].VirtualAddress)) > + { > + IMAGE_LOAD_CONFIG_DIRECTORY *loadcfg = (IMAGE_LOAD_CONFIG_DIRECTORY *)(ptr + pos); > + ULONG_PTR *cookie = (ULONG_PTR *)loadcfg->SecurityCookie; > + > + srand( time( NULL ) ); > + *cookie = rand(); This won't be random at all. -- Alexandre Julliard julliard(a)winehq.org

1 0

When/how to build separate debug symbol files
by Ken Thomases 25 Jun '15

25 Jun '15

Hi, I'm investigating how to best make Wine build and install debug symbol files on OS X. My understanding is that, on Linux, the distros usually provide a separate package for a user to install Wine's debug symbols. From recent work in dbghelp, I'm guessing such a package installs debug symbol files next to the corresponding binary or in a .debug subdirectory next to it. Is that correct? How do packagers generate such separate debug symbol files? Is it a special option (make target?) in Wine's build process? Or is it a post-processing step after Wine is built and installed to a staging directory? How does this interact with stripping during building for the non-debug-symbol, normal Wine package? For what it's worth, I'm working on make dbghelp support DWARF-2 debug info on OS X <https://bugs.winehq.org/show_bug.cgi?id=22384>. On OS X, the normal link step does not transfer the DWARF-2 debug info from the object files to the file binary. Rather, you have to execute a separate command, dsymutil, to "link" the debug info, but that ends up in a separate file, not the binary. So, the first part is figuring out when to invoke dsymutil and where to put the debug symbol file. The second part is having dbghelp find that debug symbol file. I think I have a handle on the second part. The first part is what I'm trying to figure out. The dsymutil depends on references from the linked binary to the original object files from which it was created. Those references are in the STABS info. So, it has to be invoked 1) at a point where those object files are accessible, and 2) before the binary has been stripped of the necessary references. A problem that may be unique to OS X is how to support debugging when running Wine build from source, either run from the build tree or installed by the user. Since the debug information isn't easily accessible unless the separate dsymutil step was done, we may want to do it at link time, not just at install time. Unfortunately, that largely defeats the point of separating out debug linking from normal linking, which was to save time and disk space. Thanks, Ken

3 3

Re: Wine developer frustration (was Re: ntdll: Improve stub of NtQueryEaFile.)
by Alex Henrie 25 Jun '15

25 Jun '15

2015-06-18 2:08 GMT-06:00 Alexandre Julliard <julliard(a)winehq.org>: > So now I want to take a step back, and take the time to look at what we > are doing wrong, and listen to new ideas. I'd like to encourage > everyone, but especially people who are disgruntled or have given up > hope that we'd ever change, to send (either in this thread or by private > mail) their suggestions for what we should be doing differently, and how. As a relatively new Wine developer, I submitted a UTF-7 implementation copied from ReactOS, but it was rejected without explanation. After some prodding, I was told that I needed to rewrite the code from scratch.[2] Then, after I rewrote the patches, I was told to put the implementation in kernel32 instead of libwine.[3] The next patchset was ignored, but I finally got a couple of cryptic messages about a buffer overflow and table-based tests.[4][5] Later I got more cryptic messages about needing more tests, but again I was not told what needed to be tested, just "think about it".[6][7] Finally I was told "this isn't going anywhere",[9] "you have nowhere near enough tests"[10] and "if you're too stupid to know what you're doing wrong then you shouldn't contribute".[11] The above process literally lasted from January to December 2012. After that, I was so upset with the Wine project and AJ in particular that I did not submit a single patch to Wine for more than a year.[12] When I finally decided to try submitting the UTF-7 patches again in October 2014, I begged AJ for feedback and once again got nothing specific.[13] In desperation, I turned to IRC and was invited to participate in Wine Staging. They patiently provided specific, line-by-line feedback and even helped rewrite the code in a couple of places. They also accepted the code into their fork to get some real-world testing.[14] By the end of November 2014 (less than two months later!) the patchset was accepted into mainline Wine.[12] Wine has been one of the worst, if not the worst, open source project I have ever worked with. (I think it's a tie between Wine and Qt's QSerialPort module, but that's another story.) My UTF-7 experience illustrates exactly why we need Wine Staging or something like it: Without the detailed feedback that the Wine Staging developers provided, this feature would have never been accepted. Furthermore, I would not have learned the tips and tricks that I needed to know to write acceptable patches in the future. The idea that all discussion and development needs to happen on wine-devel and wine-patches in order to gain trust is BS. AJ was unwilling to take more than a glance at the UTF-7 patches until they had gone through probably a hundred iterations on GitHub and the wine-staging IRC channel. In my experience, AJ is far more likely to accept a patch done right the first time than a patch submitted 12 times because the submitter keeps finding problems with it. Alexandre, the best thing you could do differently is to provide verbose feedback on every patch. You have been working on Wine for a very long time and what is obvious to you is not obvious to everyone else. If you don't have time to write feedback yourself, ask another Wine developer to do it. Ideally we would have a list of trusted advisors for each program and DLL, people who are available to answer questions in their areas of expertise. It would also be a good idea to notice new developers, assign tutors to them, and have the tutors welcome the new developers and offer to answer questions. Please understand that I like Wine, I want to attract new Wine developers, and I want to see it become the most popular Windows API implementation. I hope you can take this email as constructive criticism without it negatively affecting my Julliard Rank™ ;-) -Alex [1] https://www.winehq.org/pipermail/wine-devel/2012-January/093705.html [2] https://www.winehq.org/pipermail/wine-devel/2012-May/095451.html [3] https://www.winehq.org/pipermail/wine-devel/2012-July/096531.html [4] https://www.winehq.org/pipermail/wine-devel/2012-August/096867.html [5] https://www.winehq.org/pipermail/wine-devel/2012-August/096872.html [6] https://www.winehq.org/pipermail/wine-devel/2012-September/096901.html [7] https://www.winehq.org/pipermail/wine-devel/2012-September/096910.html [8] https://www.winehq.org/pipermail/wine-devel/2012-December/097994.html [9] https://www.winehq.org/pipermail/wine-devel/2012-December/098015.html [10] https://www.winehq.org/pipermail/wine-devel/2012-December/098036.html [11] https://www.winehq.org/pipermail/wine-devel/2012-December/098051.html [12] https://source.winehq.org/git/wine.git/?a=search&h=HEAD&st=author&s=Alex+He… [13] https://www.winehq.org/pipermail/wine-devel/2014-October/105402.html [14] https://github.com/wine-compholio/wine-staging/commit/04467e7e68b12850349fb…

6 6

Re: d3dcompiler: Share the source with d3dcompiler_46
by Matteo Bruni 24 Jun '15

24 Jun '15

2015-06-24 12:15 GMT+02:00 Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>: > diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in > index 08c5145..41c98f7 100644 > --- a/dlls/d3dcompiler_46/Makefile.in > +++ b/dlls/d3dcompiler_46/Makefile.in > @@ -1,6 +1,24 @@ > MODULE = d3dcompiler_46.dll > +IMPORTS = dxguid uuid > +EXTRALIBS = $(LIBWPP) > +EXTRADEFS = -D_D3DCOMPILER_VER=46 That define isn't used yet, right? I guess you can keep it around but maybe call it D3D_COMPILER_VERSION since there is such a define in recent d3dcompiler.h from the SDK. Or just drop it for the time being and reintroduce it when there will be a need to distinguish the version we're compiling for from the shared code. Otherwise it looks fine to me. Maybe rename d3dcompiler_43_main.c to just main.c? That change can be a separate patch.

1 0

Re: [PATCH 1/2] msvcp90: Set _Locimp vtable in _Locimp ctors (Valgrind) (try2) (was: msvcp90: Call _Locimp vector dtor (Valgrind))
by Piotr Caban 24 Jun '15

24 Jun '15

On 06/24/15 16:46, Daniel Lehman wrote: > +DEFINE_RTTI_DATA0(locale__Locimp, 0, ".?AV_Locimp@locale@std@@") There should be: DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp@locale@std@@") Cheers, Piotr

1 0

Re: [PATCH] cmd: fix invalid "else if" execution
by Frédéric Delanoy 24 Jun '15

24 Jun '15

On Tue, Jun 23, 2015 at 11:33 PM, Thomas Faller <tfaller1(a)gmx.de> wrote: > > Fix for: https://bugs.winehq.org/show_bug.cgi?id=37478 > > --- > programs/cmd/builtins.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) You should add a test case. -- Frédéric Delanoy

1 0

Re: [PATCH 2/2] msvcp90: Copy name in _Getctype (Valgrind)
by Piotr Caban 24 Jun '15

24 Jun '15

On 06/23/15 22:57, Daniel Lehman wrote: > + name = ___lc_locale_name_func()[LC_COLLATE]; > + size = wcslen(name)+1; > + ret->name = malloc(size*sizeof(*name)); > + if (!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); > + memcpy(ret->name, name, size); There should be size*sizeof(*name) in memcpy. Also please rename the variable to len if it's used to store length (or store buffer size in it). Thanks, Piotr

1 0

Re: [PATCH 1/2] msvcp90: Call _Locimp vector dtor (Valgrind)
by Piotr Caban 24 Jun '15

24 Jun '15

Hi, the bug is caused by incorrect vtable being set in locale__Locimp_ctor_transparent and locale__Locimp_copy_ctor functions. The locale_facet vtable is correct and should not be changed. Cheers, Piotr

1 0

Re: [PATCH 3/3] d3drm/tests: Add test for IDirect3DRM*::CreateDeviceFromD3D (try 4).
by Stefan Dösinger 24 Jun '15

24 Jun '15

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2015-06-23 um 20:19 schrieb Aaryaman Vasishta: > + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, coop_level); > + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); As long as you're always passing coop_level = DDSCL_NORMAL I don't think there's a need for the parameter. > + if (coop_level & DDSCL_NORMAL) > + { > + IDirectDrawClipper *clipper; > + > + hr = IDirectDraw2_CreateClipper(ddraw, 0, &clipper, NULL); > + ok(SUCCEEDED(hr), "Failed to create clipper, hr %#x.\n", hr); > + hr = IDirectDrawClipper_SetHWnd(clipper, 0, window); > + ok(SUCCEEDED(hr), "Failed to set clipper window, hr %#x.\n", hr); > + hr = IDirectDrawSurface_SetClipper(surface, clipper); > + ok(SUCCEEDED(hr), "Failed to set surface clipper, hr %#x.\n", hr); > + IDirectDrawClipper_Release(clipper); > + } I wonder why the ddraw test is setting a clipper on the offscreen surface. It should not have an effect. Henri, do you remember why this is done? > + hr = IDirect3D2_QueryInterface(d3d2, &IID_IDirectDraw, (void**)&ddraw); Why aren't you using the existing ddraw1 interface variable? > + primary_surface_found = FALSE; > + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, > + NULL, NULL, surface_callback); > + ok(hr == DD_OK, "Failed to enumerate surfaces (hr = %x).\n", hr); > + ok(!primary_surface_found, "Primary surface shouldn't be created by CreateDeviceFromD3D.\n"); > + IDirectDraw_Release(ddraw); > + > + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &ds); > + ok(hr == DD_OK, "Cannot get attached depth surface (hr = %x).\n", hr); > + > + desc.dwSize = sizeof(desc); > + hr = IDirectDrawSurface_GetSurfaceDesc(ds, &desc); > + ok(hr == DD_OK, "Cannot get z surface desc structure (hr = %x).\n", hr); I think here it would be interesting to confirm that the Z surface is the one created by create_device(). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJVicS1AAoJEN0/YqbEcdMwYNkQAIJL8xzJEd4WjLNzIw8wIuq3 BZiLV8SZIVTlCgZERHQQ46CqtG1MZ4JdZEOvEQpw1pGK0Keq3xTgPE7LLgNZzXx6 fg0Xm1CT9MwWalbj31HelKMB7yHnxTNHhE2oDncDboITI26kxL46IdCsTwJZD9cc yg65kkluHAUyT3+7+k7FFu7ZP3mQUOxnim4YkI3jx48Ls6snhMz6RZwTygZdJXvR eQ0pD/tMdGN/wDBy+y+Dehn2yWScbRgoO1GCqOLH4/L6y8rlAdLMSMZv4HWVN74m cAvpxKC0nketkROouNkDcHrjEhFbL3DnBeNRfd5IfnORgHjwZipqqv7dXhGWELZL R7ZpjtLEzV5/dL2pDjZri3j6Xpi5vZRhlMdiKAvCcNNYfFtXJcZSwlK0AP8ek1SF Lhr3RiOmY0RQ7a2K0Z0UqXCNr+vibBEsfBLdqhuTsC4ipMSzygo0J9dCVIoM9VOl SqjtXo0N6YdzZR0IGpSDuE/uCy33vu1D4ykqyW7UBGkT2CUNTVxfUEPkERnr26E0 h11OrBrNKoNSlxaeg1IcVdh9iipabkAF+iL5XqDsXzT/45TrvBvKsYYL+eRSSbtE q94hxYKMupoIHFtsx62wwhVZUYsf/8x27662aDmY3LmixAb8iOR08lo2JhKczOSZ mootefOFvk8PZPkF5Z8G =Zo0P -----END PGP SIGNATURE-----

2 2

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