- wine-devel - winehq.org

Filling in ARM64 ABI structs
by Martin Storsjö 23 Aug '17

23 Aug '17

Hi, I've noticed that some of the ABI specific structs for ARM64 are incomplete or missing - namely _JUMP_BUFFER in include/msvcrt/setjmp.h (not yet available) and _CONTEXT (not missing but only has got made-up content so far) and associated CONTEXT_* defines, and structs like RUNTIME_FUNCTION and UNWIND_HISTORY_TABLE in include/winnt.h. As far as I know, these structs should be available in the win10 sdk. (MSDN doesn't have them but just says to refer to winnt.h for the CONTEXT struct at least). In order not to accidentally make myself uneligible for contributing code on these matters, I've tried to not look at the sdk. Can someone help out with completeing these data structures according to whatever clean-room guidelines are required? When looking at existing code with git blame, they mostly appear as such without any further explanation on how they were derived, so I'm taking the more cautious route here. // Martin

2 2

Re: [PATCH 3/3] d3d9/tests: Add test for SW shader in MVP mode.
by Marvin 23 Aug '17

23 Aug '17

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=32778 Your paranoid android. === w8 (32 bit visual) === visual.c:7975: Test failed: Input test: Quad 3(2crd-wrongidx) returned color 0x00ff00ff, expected 0x00ff0080 === w1064 (64 bit visual) === visual.c:8023: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors).

2 1

JACK driver for WINE
by Jeremy Banks 23 Aug '17

23 Aug '17

Hello all, I am wanting to output the audio from various applications run in WINE to the JACK server on my computer. I would prefer that WINE do this natively instead of routing across various wrapper setups with ALSA or PulseAudio. I have looked on the WINE wiki page for sound[1] and see that there was a JACK driver at one point, but it was removed when the driver architecture was changed. I am interested in trying to implement a driver to get WINE talking to JACK natively. The wiki says to ask on the mailing list before starting such a project, and so here I am. I have downloaded a local copy of the source repo and have started browsing through its contents. Being unfamiliar with the WINE codebase, which portions of the source should I start studying first? I am interested in studying the drivers for ALSA, OSS, and Pulse for comparison; do those live in a particular place in the source tree? I'm presently looking on the Wiki for other helpful information, but is there some particular documentation I should be studying for this endeavor? Regards, Jeremy Banks 1. https://wiki.winehq.org/Sound#Backend_information

3 4

Killing https://www.winehq.org/docs/wineusr-guide
by Austin English 22 Aug '17

22 Aug '17

Hi Rosanne, I saw on https://bugs.winehq.org/show_bug.cgi?id=43525 that wineusr-guide is deprecated (which I realized), but I didn't realize it was still up. Would you (or anyone else) be opposed to completely removing it? IMO it's doing more harm than good, especially without a deprecated notice on it. -- -Austin GPG: 14FB D7EA A041 937B

3 3

Re: [PATCH 4/4] mshtml: Added delayed DispatchEx init support and use it to expose IHTMLDOMNode3 from document node.
by Marvin 21 Aug '17

21 Aug '17

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=32755 Your paranoid android. === w7u (32 bit htmldoc) === htmldoc.c:2682: Test failed: unexpected call GetOverrideKeyPath

1 0

Re: [PATCH] evr: Add stubs for EnhancedVideoRenderer
by Alistair Leslie-Hughes 18 Aug '17

18 Aug '17

Hi Fabian, On 18/08/17 11:25, Fabian Maurer wrote: > + if (IsEqualGUID(riid, &IID_IUnknown) > + || IsEqualGUID(riid, &IID_IBaseFilter)) > + { Your missing some IID checks here. Alistair.

2 3

Re: [PATCH] evr: Add stubs for EnhancedVideoRenderer
by Nikolay Sivov 18 Aug '17

18 Aug '17

On 18.08.2017 4:25, Fabian Maurer wrote: > +static const IBaseFilterVtbl IBaseFilter_Vtbl = > +{ > + /*** IUnknown methods ***/ > + EnhancedVideoRendererImpl_QueryInterface, > + EnhancedVideoRendererImpl_AddRef, > + EnhancedVideoRendererImpl_Release, > + /*** IPersist methods ***/ > + EnhancedVideoRendererImpl_GetClassID, > + /*** IMediaFilter methods ***/ > + EnhancedVideoRendererImpl_Stop, > + EnhancedVideoRendererImpl_Pause, > + EnhancedVideoRendererImpl_Run, > + EnhancedVideoRendererImpl_GetState, > + EnhancedVideoRendererImpl_SetSyncSource, > + EnhancedVideoRendererImpl_GetSyncSource, > + /*** IBaseFilter methods ***/ > + EnhancedVideoRendererImpl_EnumPins, > + EnhancedVideoRendererImpl_FindPin, > + EnhancedVideoRendererImpl_QueryFilterInfo, > + EnhancedVideoRendererImpl_JoinFilterGraph, > + EnhancedVideoRendererImpl_QueryVendorInfo > +}; Shouldn't it use strmbase? > +HRESULT EnhancedVideoRendererImpl_Create(IUnknown *pUnkOuter, void **ppObj) > +{ > + EnhancedVideoRendererImpl *object; > + > + TRACE("(%p,%p)\n", pUnkOuter, ppObj); > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(EnhancedVideoRendererImpl)); > + if (!object) > + return E_OUTOFMEMORY; > + > + object->IBaseFilter_iface.lpVtbl = &IBaseFilter_Vtbl; > + object->ref = 1; > + > + *ppObj = &object->IBaseFilter_iface; > + > + return S_OK; > +} This needs at test for aggregation support. > +typedef struct { > + IBaseFilter IBaseFilter_iface; > + LONG ref; > +} EnhancedVideoRendererImpl; Does this need to be exposed? > + TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); > + Format looks wrong. > - case DLL_WINE_PREATTACH: > - return FALSE; /* prefer native version */ It still doesn't do anything. > +static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, void **ppobj) > +{ What does XF prefix stand for? Also please use consistent type names and formatting. > +/******************************************************************************* > + * Retrieves class object from a DLL object > + * > + * NOTES > + * Docs say returns STDAPI > + * > + * PARAMS > + * rclsid [I] CLSID for the class object > + * riid [I] Reference to identifier of interface for class object > + * ppv [O] Address of variable to receive interface pointer for riid > + * > + * RETURNS > + * Success: S_OK > + * Failure: CLASS_E_CLASSNOTAVAILABLE, E_OUTOFMEMORY, E_INVALIDARG, > + * E_UNEXPECTED > + */ > +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) I personally don't think this export needs a documentation header. > + if ( !IsEqualGUID( &IID_IClassFactory, riid ) > + && ! IsEqualGUID( &IID_IUnknown, riid) ) > + return E_NOINTERFACE; I think it's better to let QueryInterface handle this. > + for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) > + { > + if (IsEqualGUID(object_creation[i].clsid, rclsid)) > + break; > + } > + > + if (i == sizeof(object_creation)/sizeof(object_creation[0])) > + { > + FIXME("%s: no class found.\n", debugstr_guid(rclsid)); > + return CLASS_E_CLASSNOTAVAILABLE; > + } Does it support any other CLSIDs? This seems like too much. Static factory instance will work too I suppose.

2 3

Re: [1/2] user32/tests: Test DialogBoxParam using a dialog template with invalid control class.
by Sebastian Lackner 18 Aug '17

18 Aug '17

On 18.08.2017 13:41, Dmitry Timoshkov wrote: > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> > --- > dlls/user32/tests/dialog.c | 6 ++++++ > dlls/user32/tests/resource.rc | 6 ++++++ > 2 files changed, 12 insertions(+) > There is no need to resubmit, the patches are exactly identical to what Andrew submitted. Also, why the hell is there my sign-off? It is apparently not fine for you when Andrew wants to take responsiblity for your patches, but you expect me to take responsibility for it, without confirming that I'm fine with it first? For other people I would now start to explain that Wine Staging also accepts workarounds and imperfect patches, and that the addition to Wine Staging does not imply my sign-off, but I'm pretty sure you are well aware of it...

2 1

Re: [1/2] user32/tests: Test DialogBoxParam using a dialog template with invalid control class.
by Marvin 18 Aug '17

18 Aug '17

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=32738 Your paranoid android. === w7u (32 bit msg) === msg.c:5084: Test failed: ShowWindow(SW_RESTORE):overlapped: 18: the msg sequence is not complete: expected 0000 - actual 0088 msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 11: the msg 0x001c was expected, but got msg 0x0047 instead msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 12: the msg 0x0086 was expected, but got msg 0x001c instead msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 13: the msg 0x0006 was expected, but got msg 0x0086 instead msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 18: the msg 0x0009 was expected, but got msg 0x0006 instead msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 19: the msg 0x0007 was expected, but got msg 0x0009 instead msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 20: the msg 0x0047 was expected, but got msg 0x0007 instead msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 21: the msg 0x0003 was expected, but got msg 0x0047 instead msg.c:5207: Test failed: SetWindowPos:show_popup_first_show_window: 22: the msg sequence is not complete: expected 0000 - actual 0003 === wvistau64 (32 bit listbox) === listbox.c:706: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:941: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:706: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:941: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === w864 (32 bit broadcast) === The task timed out === w8 (32 bit sysparams) === sysparams.c:2519: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2530: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064 (32 bit sysparams) === sysparams.c:206: Test failed: Unexpected WM_DISPLAYCHANGE message === w864 (64 bit sysparams) === The task timed out

1 0

Re: [v5 PATCH 1/3] dwrite: Protect cached fontface list when accessed from multiple threads
by Anton Romanov 18 Aug '17

18 Aug '17

On Tue, Aug 15, 2017 at 4:40 AM, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/dwrite/dwrite_private.h | 15 ++++++++--- > dlls/dwrite/font.c | 30 +++++++++++++-------- > dlls/dwrite/main.c | 63 +++++++++++++++++++++++++++++++------------- > 3 files changed, 74 insertions(+), 34 deletions(-) > Since apps seem to freely use fontface interfaces from multiple threads - Isn't the following race possible? +----------------+------------------------+-------------------------+ | T1 | T2 | T3 | +----------------+------------------------+-------------------------+ | Release | | | | Decrement | | | | == 0 -> True | | | | | Query_Interface/AddRef | | | | Increment | | | | | Release | | | | Decrement | | free(cached) | | | | factory_unlock | | | | | | use after free (cached) | +----------------+------------------------+-------------------------+

3 7

Re: [PATCH] comctl32/listview: Keep the active item selected after hwndEdit is destroyed
by Nikolay Sivov 17 Aug '17

17 Aug '17

On 10.08.2017 7:54, Hugh McMaster wrote: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/comctl32/listview.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c > index 73eceff509..05bd375571 100644 > --- a/dlls/comctl32/listview.c > +++ b/dlls/comctl32/listview.c > @@ -10216,6 +10216,7 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN > static BOOL bGroupSelect = TRUE; > POINT pt = { x, y }; > INT nItem; > + BOOL editing = FALSE; > > TRACE("(key=%hu, X=%u, Y=%u)\n", wKey, x, y); > > @@ -10309,11 +10310,20 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN > else > { > if (!infoPtr->bFocus) > + { > + editing = IsWindow(infoPtr->hwndEdit); > SetFocus(infoPtr->hwndSelf); > + } > > - /* remove all selections */ > + /* keep the active item selected after hwndEdit is destroyed, or deselect all items */ > if (!(wKey & MK_CONTROL) && !(wKey & MK_SHIFT)) > - LISTVIEW_DeselectAll(infoPtr); > + { > + if (editing) > + LISTVIEW_DeselectAllSkipItem(infoPtr, infoPtr->nFocusedItem); > + else > + LISTVIEW_DeselectAll(infoPtr); > + } > + Maybe this could be reduced to a single unconditional call: LISTVIEW_DeselectAllSkipItem(infoPtr, infoPtr->nEditLabelItem); > ReleaseCapture(); > } > >

1 0

Re: [PATCH 1/2] user32/tests: Test DialogBoxParam using a dialog template with invalid control class.
by Marvin 17 Aug '17

17 Aug '17

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=32717 Your paranoid android. === wvistau64 (32 bit listbox) === listbox.c:706: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:941: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === wvistau64 (64 bit listbox) === listbox.c:706: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY, *) filled with 7 entries, expected > 7 listbox.c:941: Test failed: SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) failed err 18 === w864 (64 bit broadcast) === The task timed out === w8 (32 bit sysparams) === sysparams.c:2519: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2530: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w864 (32 bit sysparams) === sysparams.c:2519: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2530: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

2 1

Re: [PATCH 1/2] user32/tests: Test DialogBoxParam using a dialog template with invalid control class.
by Dmitry Timoshkov 17 Aug '17

17 Aug '17

Andrew Eikum <aeikum(a)codeweavers.com> wrote: > From: Dmitry Timoshkov <dmitry(a)baikal.ru> > > Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> > --- > dlls/user32/tests/dialog.c | 6 ++++++ > dlls/user32/tests/resource.rc | 6 ++++++ > 2 files changed, 12 insertions(+) I think that I've expressed my opinion clear enough in my response to your private e-mail that I don't allow you to send my patches included in the wine-staging tree to winehq, and explained well enough my reasoning. The only person who has my permission is Sebastian Lackner - wine-staging maintainer. I'm too sometimes sending the patches, but I have to admit that's pretty rare cases these days, and usually that's not my personal decision. Please try to find your own areas to work on, and stop stealing patches created by somebody else, especially when directly asked not to. -- Dmitry.

3 12

Re: [v5 PATCH 1/3] dwrite: Protect cached fontface list when accessed from multiple threads
by Sebastian Lackner 17 Aug '17

17 Aug '17

On 15.08.2017 13:40, Nikolay Sivov wrote: > if (cached_key_size == key_size && !memcmp(cached_key, key, key_size)) { > + if (FAILED(hr = IDWriteFontFace4_QueryInterface(cached->fontface, riid, obj))) > + WARN("Failed to get %s from fontface, hr %#x.\n", debugstr_guid(riid), hr); > + > TRACE("returning cached fontface %p\n", cached->fontface); > - *font_face = (IDWriteFontFace*)cached->fontface; > - return S_OK; > + break; > } > } There is still a minor problem (no race condition though). Lets assume a fontface is just about to be destroyed, then the code above will abort enumeration after reaching the fontface with refcount == 0. Lets assume the newly created fontface is added after the old one, then all following attempts to get the fontface from the cache will fail, until the old one has finally be removed. This issue can be avoided by doing "continue;" instead of "break;" for E_FAIL.

1 0

Re: [PATCH] kernel32/nls: Added LOCALE_SNAN entries
by Henri Verbeet 17 Aug '17

17 Aug '17

On 17 August 2017 at 00:28, Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls > index 0f5b17068b..2baf289223 100644 > --- a/dlls/kernel32/nls/far.nls > +++ b/dlls/kernel32/nls/far.nls > @@ -124,6 +124,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT > LOCALE_SMONTHNAME13 "" > LOCALE_SMONTHOUSANDSEP "٬" > LOCALE_SNAME "fa-IR" > + LOCALE_SNAN "ﻥﺎﻋﺩﺩ" That doesn't look right. According to http://www.unicode.org/cldr/charts/latest/by_type/numbers.symbols.html#2a6d… "ناعدد" is correct, but the above is using the Presentation Forms-B characters.

2 1

Re: [PATCH] msi: Print error number when GetProcAddress fails
by Hans Leidekker 17 Aug '17

17 Aug '17

On Wed, 2017-08-16 at 17:20 +0100, Carlos Palminha wrote: > diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c > index 922927e8903..cfdfe852efb 100644 > --- a/dlls/msi/custom.c > +++ b/dlls/msi/custom.c > @@ -608,7 +608,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) > ERR("failed to create handle for %p\n", remote_package ); > } > else > - ERR("GetProcAddress(%s) failed\n", debugstr_w( function ) ); > + ERR("GetProcAddress(%s) failed: %d\n", debugstr_w( function ), GetLastError() ); > > FreeLibrary(hModule); This doesn't appear to add any useful information. Our implementation of GetProcAddress sets either ERROR_PROC_NOT_FOUND or ERROR_MOD_NOT_FOUND and LoadLibrary must have succeeded before reaching this code.

3 2

Re: [PATCH v3] user32/combo: Set listview popup height correctly and add tests
by Nikolay Sivov 16 Aug '17

16 Aug '17

It's a listbox, not listview.

2 1

D3D8 Software Vertex Processing
by Jan Havran 16 Aug '17

16 Aug '17

Hello, i am trying to fix #9337 [1] for VietCong game (game is crashing during loading 3D objects) for which exists community util which fixes it. This util was made to fix issues for VC on newer Windows - fixing this bug in Wine was just side effect. Anyway, i have talked to creator of this util (Brchi from The Archi Family) about it. The game originally use software vertexes only, but he edited the game and switched to hardware vertexes (which increased FPS rapidly on Windows), but he was facing the same problem - the game was crashing. Fortunately, he found that the game uses different code branches when hardware vertex are used - developers probably never finished support for hardware vertexes and that is reason why it is crashing when HW vertexes are used. He fixed game code so it works with HW vertexes (even in Wine). The problem is that game uses only SW vertexes and these unfinished branches are called only when HW vertexes are used, which is not a problem for Windows (which support SW vertexes). But for some reason Wine uses HW vertexes even if game wants to use SW vertexes. Thats why the game works in Wine only with this util applied. I can see from report [2] that game tries to use SW vertexes, which are unsupported by Wine. Can I simply edit some code in Wine (some D3D flag) so the game will think that it use SW vertexes, so after checking some flags by game it will not jump into some unfinished branches for HW vertexes? I just want to test if it is really caused by this. From application view, what is difference between using SW and HW vertexes, do you think that using HW vertexes with code done for SW vertexes will work? [1] https://bugs.winehq.org/show_bug.cgi?id=9337 [2] https://bugs.winehq.org/show_bug.cgi?id=9337#c35 Thanks, Jan

2 6

Re: [PATCH] gdiplus: Implement transform matrix for line gradient brushes
by Vincent Povirk 16 Aug '17

16 Aug '17

I wrote a test program (attached), and it doesn't work when the start point isn't 0,0. > + if (line->startpoint.X == line->endpoint.X) > + t = line->startpoint.Y > line->endpoint.Y ? 3.f * M_PI / 2.f : M_PI / 2.f; > + else > + t = atanf((line->endpoint.Y - line->startpoint.Y) / (line->endpoint.X - line->startpoint.X)); > + > + t_cos = cosf(t); > + t_sin = sinf(t); This seems like an oddly complicated and fragile way to normalize a vector.

2 1

Re: [PATCH] avrt: Add AvQuerySystemResponsiveness stub.
by Huw Davies 16 Aug '17

16 Aug '17

On Wed, Aug 16, 2017 at 02:22:13PM +0300, Andrey Gusev wrote: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > dlls/avrt/avrt.spec | 2 +- > dlls/avrt/main.c | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/dlls/avrt/avrt.spec b/dlls/avrt/avrt.spec > index 640a12ac22..a7dfc42879 100644 > --- a/dlls/avrt/avrt.spec > +++ b/dlls/avrt/avrt.spec > @@ -1,4 +1,4 @@ > -@ stub AvQuerySystemResponsiveness > +@ stdcall AvQuerySystemResponsiveness(long ptr) > @ stdcall AvRevertMmThreadCharacteristics(long) > @ stub AvRtCreateThreadOrderingGroup > @ stub AvRtCreateThreadOrderingGroupExA > diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c > index 8a110250ae..68e44d6098 100644 > --- a/dlls/avrt/main.c > +++ b/dlls/avrt/main.c > @@ -83,6 +83,12 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsW(LPCWSTR TaskName, LPDWORD TaskIndex) > return (HANDLE)0x12345678; > } > > +BOOL WINAPI AvQuerySystemResponsiveness(HANDLE AvrtHandle, PULONG SystemResponsivenessValue) > +{ > + FIXME("(%p, %p): stub\n", AvrtHandle, SystemResponsivenessValue); > + return TRUE; > +} > + If you're going to return TRUE, you need to initialize *SystemResponsivenessValue to something meaningful. While you're at it, we generally prefer 'ULONG *' to 'PULONG', although I realise there are several of the latter form in this file. Huw.

2 3

Re: [PATCH v2] server: Use queue_irp() also for synchronous IRPs.
by Alexandre Julliard 16 Aug '17

16 Aug '17

Zebediah Figura <z.figura12(a)gmail.com> writes: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > server/device.c | 46 ++++++++++++++++++++-------------------------- > 1 file changed, 20 insertions(+), 26 deletions(-) It's probably a matter of taste, but this doesn't look to me like an improvement. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v4 5/5] kernel32/tests: Add tests for LoadLibrary with LIBRARY_SEARCH_* flags
by Marvin 16 Aug '17

16 Aug '17

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=32694 Your paranoid android. === wvistau64 (32 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === w2008s64 (32 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === wvistau64 (64 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === w2008s64 (64 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8

1 0

Re: [PATCH] usp10: fall back to 'dflt' language if shaping language tag not found
by Henri Verbeet 15 Aug '17

15 Aug '17

On 14 August 2017 at 20:04, Aric Stewart <aric(a)codeweavers.com> wrote: > + script = get_opentype_script(hdc,psa,psc,FALSE); Does that do anything? If I'm reading the code correctly that will set it to the same value it already was. (In which case most of this would simplify to "if (!script) script = MS_MAKE_TAG('l','a','t','n');")

2 2

Re: [PATCH v3 5/5] ieframe: Add stub implementation of IInternetExplorerManager.
by Jacek Caban 15 Aug '17

15 Aug '17

On 10.08.2017 20:52, Zebediah Figura wrote: > v2: register IE and IEM separately, and the latter with SINGLEUSE > (thanks Jacek) > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > dlls/ieframe/ieframe.h | 5 +- > dlls/ieframe/ieframe_main.c | 35 ++++--------- > dlls/ieframe/iexplore.c | 111 ++++++++++++++++++++++++++++++++++++++--- > dlls/ieframe/tests/ie.c | 21 ++++++++ > programs/iexplore/iexplore.inf | 3 ++ > 5 files changed, 142 insertions(+), 33 deletions(-) > > diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h > index d1f1c5daf24..c690d5c6878 100644 > --- a/dlls/ieframe/ieframe.h > +++ b/dlls/ieframe/ieframe.h > @@ -312,13 +312,16 @@ TID_LIST > } tid_t; > > HRESULT get_typeinfo(tid_t,ITypeInfo**) DECLSPEC_HIDDEN; > -HRESULT register_class_object(BOOL) DECLSPEC_HIDDEN; > > HRESULT WINAPI CUrlHistory_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI InternetExplorer_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > +HRESULT WINAPI InternetExplorerManager_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; > + > +extern IClassFactory InternetExplorerFactory; > +extern IClassFactory InternetExplorerManagerFactory; This is missing DECLSPEC_HIDDEN. > > +/****************************************************************** > + * IInternetExplorerManager implementation > + */ > +struct internet_explorer_manager { > + IInternetExplorerManager IInternetExplorerManager_iface; > + LONG ref; > +}; Please use the type from public declaration (coclass). See how InternetExplorer object is declared. > +HRESULT WINAPI InternetExplorerManager_Create(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) > +{ > + struct internet_explorer_manager *ret; > + > + TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); > + > + if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) > + return E_OUTOFMEMORY; > + > + ret->IInternetExplorerManager_iface.lpVtbl = &InternetExplorerManager_vtbl; > + return IInternetExplorerManager_QueryInterface(&ret->IInternetExplorerManager_iface, riid, ppv); > +} This leaks the object if QueryInterface fails. The usual way to handle is to set initial ref to 1 and release the object after QI() call. > +static void test_InternetExplorerManager(void) > +{ > + IUnknown *unk; > + ULONG ref; > + HRESULT hres; > + > + hres = CoCreateInstance(&CLSID_InternetExplorerManager, NULL, CLSCTX_LOCAL_SERVER, > + &IID_IInternetExplorerManager, (void**)&unk); > + ok(hres == S_OK || hres == REGDB_E_CLASSNOTREG, "Could not create InternetExplorerManager instance: %08x\n", hres); Use broken() for failure with older versions. > + > + if(hres != S_OK) > + return; This could use a win_skip(). Thanks, Jacek

1 0

Re: [PATCH v3 4/5] ieframe: Parse multiple command-line arguments.
by Jacek Caban 15 Aug '17

15 Aug '17

Hi Zebediah, On 10.08.2017 20:52, Zebediah Figura wrote: > + if (!strncmpiW(cmdline, embeddingW, length)) > + embedding = TRUE; > + else if (!strncmpiW(cmdline, nohomeW, length)) > + nohome = TRUE; > + else if (*cmdline == '-') > + FIXME("ignoring unknown option %s\n", debugstr_wn(cmdline, length)); It's probably not very important, but with native IE unknown options seem to be treated as URLs (iexplore.exe -test tries to open "-test" URL). Thanks, Jacek

1 0

Re: [PATCH 2/3] include: Add CryptProtectMemory and CryptUnprotectMemory.
by Michael Stefaniuc 15 Aug '17

15 Aug '17

On 08/15/2017 05:00 PM, Alex Henrie wrote: > Needed for PuTTY to compile with Winelib. > > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > include/wincrypt.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/wincrypt.h b/include/wincrypt.h > index abbe99f245..058798c4f4 100644 > --- a/include/wincrypt.h > +++ b/include/wincrypt.h > @@ -4428,6 +4428,9 @@ BOOL WINAPI CryptUnprotectData( DATA_BLOB* pDataIn, LPWSTR* ppszDataDescr, > DATA_BLOB* pOptionalEntropy, PVOID pvReserved, > CRYPTPROTECT_PROMPTSTRUCT* pPromptStruct, DWORD dwFlags, DATA_BLOB* pDataOut ); > > +BOOL WINAPI CryptProtectMemory(void *pData, DWORD cbData, DWORD dwFlags); > +BOOL WINAPI CryptUnrotectMemory(void *pData, DWORD cbData, DWORD dwFlags); Isn't that missing a p^ ? bye michael > + > DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, > DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString); > DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, >

2 1

Re: [3/8] bcrypt: Add a stub implementation of BCryptEncrypt.
by Jacek Caban 15 Aug '17

15 Aug '17

Hi Hans, On 15.08.2017 14:51, Hans Leidekker wrote: > diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c > index 3d70c15e7c..ccab676c1a 100644 > --- a/dlls/bcrypt/bcrypt_main.c > +++ b/dlls/bcrypt/bcrypt_main.c > @@ -515,7 +515,7 @@ NTSTATUS WINAPI BCryptGetProperty( BCRYPT_HANDLE handle, LPCWSTR prop, UCHAR *bu > NTSTATUS WINAPI BCryptSetProperty( BCRYPT_HANDLE handle, const WCHAR *prop, UCHAR *value, ULONG size, ULONG flags ) > { > FIXME( "%p, %s, %p, %u, %08x\n", handle, debugstr_w(prop), value, size, flags ); > - return STATUS_SUCCESS; > + return STATUS_NOT_IMPLEMENTED; I think this part was meant to be in patch 2/8. Thanks, Jacek

1 0

Re: [PATCH] user32/combo: Set listview popup height correctly and add tests
by Marvin 14 Aug '17

14 Aug '17

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=32672 Your paranoid android. === wxppro (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w2003std (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === wvistau64 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w2008s64 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w7u (32 bit combo) === combo.c:786: Test failed: Test 2, expected list height to be 16, got 0 combo.c:786: Test failed: Test 3, expected list height to be 16, got 18 combo.c:786: Test failed: Test 4, expected list height to be 32, got 18 combo.c:786: Test failed: Test 5, expected list height to be 32, got 36 combo.c:786: Test failed: Test 6, expected list height to be 32, got 36 combo.c:786: Test failed: Test 7, expected list height to be 32, got 36 combo.c:786: Test failed: Test 8, expected list height to be 32, got 36 combo.c:786: Test failed: Test 11, expected list height to be 16, got 0 combo.c:786: Test failed: Test 12, expected list height to be 16, got 18 combo.c:786: Test failed: Test 13, expected list height to be 32, got 18 combo.c:786: Test failed: Test 14, expected list height to be 48, got 36 combo.c:781: Test failed: Test 15, expected list height to be 48, got 54 combo.c:786: Test failed: Test 16, expected list height to be 64, got 54 combo.c:786: Test failed: Test 17, expected list height to be 64, got 72 combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w7pro64 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w8 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w864 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === w1064 (32 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 00000000 === wvistau64 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w2008s64 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w7pro64 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w864 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000 === w1064 (64 bit combo) === combo.c:315: Test failed: Focus not on Main Window, instead on 0000000000000000

2 1

Re: [1/3] shell32: Implement SHCreateItemFromRelativeName.
by Huw Davies 14 Aug '17

14 Aug '17

On Sat, Aug 12, 2017 at 11:42:40PM +0800, Jactry Zeng wrote: > +HRESULT WINAPI SHCreateItemFromRelativeName(IShellItem *parent, PCWSTR name, IBindCtx *pbc, > + REFIID riid, void **ppv) > +{ > + LPITEMIDLIST pidl_folder = NULL, pidl = NULL; > + IShellFolder *desktop = NULL, *folder = NULL; > + HRESULT hr; > + > + TRACE("(%p, %p, %p, %s, %p)\n", parent, name, pbc, debugstr_guid(riid), ppv); Use debugstr_w() to trace 'name'. > + > + if(!ppv) > + return E_INVALIDARG; > + *ppv = NULL; > + if(!name) > + return E_INVALIDARG; > + > + hr = SHGetIDListFromObject((IUnknown*)parent, &pidl_folder); > + if(hr != S_OK) > + return hr; > + > + hr = SHGetDesktopFolder(&desktop); > + if(hr != S_OK) > + goto cleanup; > + > + if(!_ILIsDesktop(pidl_folder)) > + { > + hr = IShellFolder_BindToObject(desktop, pidl_folder, pbc, &IID_IShellFolder, > + (void**)&folder); You should pass a NULL IBindCtx here. pbc is associated with binding the name. > + if(hr != S_OK) > + goto cleanup; > + } > + > + hr = IShellFolder_ParseDisplayName(folder ? folder : desktop, NULL, pbc, (LPWSTR)name, > + NULL, &pidl, NULL); > + if(hr != S_OK) > + goto cleanup; > + hr = SHCreateItemFromIDList(pidl, riid, ppv); > + > diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c > index 9e7127dfea..cbab88035a 100644 > --- a/dlls/shell32/tests/shlfolder.c > +++ b/dlls/shell32/tests/shlfolder.c > @@ -2519,6 +2523,86 @@ static void test_SHCreateShellItem(void) > else > win_skip("No SHCreateItemFromIDList\n"); > > + /* SHCreateItemFromRelativeName */ > + if(pSHCreateItemFromRelativeName && pSHGetKnownFolderPath) > + { > + IShellItem *shellitem_desktop = NULL; > + WCHAR *desktop_path, *displayname; > + WCHAR testfile_path[MAX_PATH] = {0}; > + HANDLE file; > + LPITEMIDLIST pidl_desktop_testfile = NULL; > + int order; > + > + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem_desktop); > + ok(ret == S_OK, "SHCreateShellItem failed: 0x%08x.\n", ret); > + > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, NULL, NULL, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == E_INVALIDARG, "Expected 0x%08x but SHCreateItemFromRelativeName return: 0x%08x.\n", > + E_INVALIDARG, ret); > + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); > + > + /* Test with a non-existent file */ > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), > + "Expected 0x%08x but SHCreateItemFromRelativeName return: 0x%08x.\n", > + HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), ret); > + ok(shellitem == NULL, "shellitem was %p.\n", shellitem); > + > + /* Create a file for testing in desktop folder */ > + pSHGetKnownFolderPath(&FOLDERID_Desktop, 0, NULL, &desktop_path); > + lstrcatW(testfile_path, desktop_path); > + myPathAddBackslashW(testfile_path); > + lstrcatW(testfile_path, testfileW); > + file = CreateFileW(testfile_path, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL); > + ok(file != INVALID_HANDLE_VALUE, "CreateFileW failed! Last error: 0x%08x.\n", GetLastError()); > + CloseHandle(file); > + > + shellitem = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, > + (void**)&shellitem); > + ok(ret == S_OK, "SHCreateItemFromRelativeName failed: 0x%08x.\n", ret); > + ok(shellitem != NULL, "shellitem was %p.\n", shellitem); > + if(SUCCEEDED(ret)) > + { > + ret = IShellItem_GetDisplayName(shellitem, 0, &displayname); > + ok(ret == S_OK, "IShellItem_GetDisplayName failed: 0x%08x.\n", ret); > + ok(!lstrcmpW(displayname, testfileW), "got wrong display name: %s.\n", wine_dbgstr_w(displayname)); > + > + shellitem2 = (void*)0xdeadbeef; > + ret = pSHCreateItemFromRelativeName(shellitem_desktop, testfileW, NULL, &IID_IShellItem, > + (void**)&shellitem2); > + ok(ret == S_OK, "SHCreateItemFromRelativeName failed: 0x%08x.\n", ret); > + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); > + ok(ret == S_OK, "IShellItem_Compare failed: 0x%08x.\n", ret); > + ok(!order, "order got wrong value: %d.\n", order); > + IShellItem_Release(shellitem2); > + > + shellitem2 = (void*)0xdeadbeef; > + ret = IShellFolder_ParseDisplayName(desktopfolder, NULL, NULL, testfileW, NULL, > + &pidl_desktop_testfile, NULL); > + ok(ret == S_OK, "ParseDisplayName failed 0x%08x.\n", ret); > + ret = pSHCreateItemFromIDList(pidl_desktop_testfile, &IID_IShellItem, (void**)&shellitem2); > + ret = IShellItem_Compare(shellitem, shellitem2, 0, &order); > + ok(ret == S_OK, "IShellItem_Compare fail: 0x%08x.\n", ret); > + ok(!order, "order got wrong value: %d.\n", order); > + pILFree(pidl_desktop_testfile); > + IShellItem_Release(shellitem2); > + > + IShellItem_Release(shellitem); > + } > + > + DeleteFileW(testfile_path); > + CoTaskMemFree(desktop_path); > + CoTaskMemFree(displayname); dipslayname is uninitialized if the 'if' block isn't executed. Either move this inside the 'if' block, or just get rid of the 'if' condition. We expect the condition to succeed in all cases anyway. Huw.

2 1

Re: [2/3 v4] shell32: Implement SHCreateItemInKnownFolder.
by Huw Davies 14 Aug '17

14 Aug '17

On Sat, Aug 12, 2017 at 11:42:43PM +0800, Jactry Zeng wrote: > Superseded patch 136380. > > ChangLog: > v4: > - Using SHCreateItemFromRelativeName() for implementing > SHCreateItemInKnownFolder(); > - Fix a logic error in tests. > v3: > - Load SHGetKnownFolderPath() dynamically. > v2: > - Using SHGetKnownFolderIDList() instead of SHGetKnownFolderPath() and > IShellFolder_ParseDisplayName(); > - Add more tests. > > Signed-off-by: Jactry Zeng <jzen g(a)codeweavers.com> > --- > dlls/shell32/shell32.spec | 1 + > dlls/shell32/shellitem.c | 35 +++++++++++++ > dlls/shell32/tests/shlfolder.c | 111 > +++++++++++++++++++++++++++++++++++++++++ > include/shobjidl.idl | 1 + > 4 files changed, 148 insertions(+) > This and patch 3/3 look good to me, so just fix up 1/3 and resend the series. Huw.

1 0

Re: [PATCH] mfplat: Add MFTEnumEx stub.
by Alistair Leslie-Hughes 14 Aug '17

14 Aug '17

Hi Andrey, On 14/08/17 19:59, Andrey Gusev wrote: > Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> > --- > + * MFTEnumEx (mfplat.@) > + */ > +HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, > + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, > + UINT32 *pcount) > +{ > + FIXME("(%s, %x, %p, %p, %p, %p): stub\n", debugstr_guid(&category), flags, input_type, > + output_type, activate, pcount); > + return S_OK; > +} If you must return S_OK, please set pcount to 0. (maybe rename pcount to count at the same time). Alistair.

1 0

Re: [PATCH] wined3d: Reduce timeout value to avoid GL_TIMEOUT_EXPIRED on macOS
by Henri Verbeet 12 Aug '17

12 Aug '17

On 12 August 2017 at 11:06, <nneonneo(a)gmail.com> wrote: > - /* Apple seems to be into arbitrary limits, and timeouts larger than > - * 0xfffffffffffffbff immediately return GL_TIMEOUT_EXPIRED. We don't > - * really care and can live with waiting a few μs less. (OS X 10.7.4). */ > + /* Timeouts near 0xffffffffffffffff may immediately return GL_TIMEOUT_EXPIRED, > + * possibly because macOS internally adds some slop to the timer. To avoid this, > + * we use a large number that isn't near the point of overflow (macOS 10.12.5). > + */ > GLenum gl_ret = GL_EXTCALL(glClientWaitSync(fence->object.sync, > - GL_SYNC_FLUSH_COMMANDS_BIT, ~(GLuint64)0xffff)); > + GL_SYNC_FLUSH_COMMANDS_BIT, (GLuint64)((1ULL << 62ULL) - 0xffff))); Adjusting the workaround is probably fine, but ULL literals are not portable. Does something along the lines of "~(GLuint64)0 >> 1" work as well? I don't think we care about the low bits, but note that the patch as it is doesn't actually preserve them.

2 2

Re: [PATCH resend 1/2] krnl386.exe16: Use toupper() instead of RtlUpperChar().
by Alexandre Julliard 12 Aug '17

12 Aug '17

Zebediah Figura <z.figura12(a)gmail.com> writes: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/krnl386.exe16/ne_module.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) I don't think that's a good idea. Why do you need that? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH v3 2/5] ieproxy: Add stub DLL.
by Jacek Caban 11 Aug '17

11 Aug '17

On 10.08.2017 20:52, Zebediah Figura wrote: > --- a/loader/wine.inf.in > +++ b/loader/wine.inf.in > @@ -2559,6 +2559,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" > 11,,msxml6.dll > 11,,shdocvw.dll > 16422,Internet Explorer,iexplore.exe > +16422,Internet Explorer,ieproxy.dll > 16422,Windows Media Player,wmplayer.exe > 16422,Windows NT\Accessories,wordpad.exe > 11,,* > @@ -2613,6 +2614,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" > 16410,Microsoft, > 16412,Microsoft, > 16422,Internet Explorer,iexplore.exe > +16422,Internet Explorer,ieproxy.dll Are you sure about it? It's in regular system32 (and syswow64) on my Win10. Jacek

2 2

Re: [PATCH v5 1/5] include: Add initial ieautomation.idl
by Jacek Caban 11 Aug '17

11 Aug '17

On 11.08.2017 16:10, Zebediah Figura wrote: > +cpp_quote("#define INTERNETEXPLORERCONFIGURATION_HOST 0x00000001") This should be a value of INTERNETEXPLORERCONFIGURATION enum. Jacek

1 0

Re: [PATCH v4 1/5] include: Add initial ieautomation.idl
by Jacek Caban 11 Aug '17

11 Aug '17

On 11.08.2017 15:54, Zebediah Figura wrote: > + */ > + > +import "unknwn.idl"; One more thing I didn't notice earlier: this should be ocidl.idl. Jacek

1 0

Re: [v3 5/5] kernel32/tests: Add tests for LoadLibrary with LIBRARY_SEARCH_* flags
by Carlos Palminha 11 Aug '17

11 Aug '17

Hi, My patch with test is producing a strange result in Test Bot. I'm getting a ERROR_NOT_ENOUGH_MEMORY when calling LoadLibraryExA only in Vista and Win2008 64bit. Any hint? Regards, C.Palminha On 11-08-2017 11:39, Carlos Palminha wrote: > Test LIBRARY_SEARCH_* flags when loading libraries. > Uses helper from path.c to create the test dll file. > > Signed-off-by: Carlos Palminha <palminha(a)synopsys.com> > --- > v3: > - Improved check for Win2003 cases > > v2: > - Split the tests affecting different files > - Tests checks for Win2003 cases > > dlls/kernel32/tests/module.c | 132 ++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 131 insertions(+), 1 deletion(-) > > diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c > index bb22c24316c..96dd3277c1b 100644 > --- a/dlls/kernel32/tests/module.c > +++ b/dlls/kernel32/tests/module.c > @@ -407,6 +407,136 @@ static void testLoadLibraryEx(void) > FreeLibrary(hmodule); > } > > +/* use some functions and strcutures from loader.c */ > +extern DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, > + const IMAGE_NT_HEADERS *nt_header, const char *dll_name ); > +extern const IMAGE_NT_HEADERS nt_header_template; > + > +static void testLoadLibraryExSearchFlags(void) > +{ > + HMODULE hmodule; > + char tmpPath[MAX_PATH]; > + char dllName[] = "testFlags.dll"; > + char tmpFullFile[MAX_PATH]; > + char sysFullFile[MAX_PATH]; > + IMAGE_DOS_HEADER dos_header; > + IMAGE_NT_HEADERS nt_header; > + ULONG file_size; > + char fullPath[MAX_PATH]; > + DWORD version; > + BOOL is_win2003 = FALSE; > + > + GetTempPathA(MAX_PATH, tmpPath); > + lstrcpyA(tmpFullFile, tmpPath); > + lstrcatA(tmpFullFile, dllName); > + > + /* check for required function */ > + if (!pSetDllDirectoryA) > + { > + win_skip("SetDllDirectoryA not available\n"); > + return; > + } > + > + /* check if we are in win2003... flags are not supported */ > + version = GetVersion(); > + if ((LOBYTE(LOWORD(version)) == 5) && (HIBYTE(LOWORD(version))==2)) > + is_win2003 = TRUE; > + > + /* try to load test dll from test path before creating it*/ > + SetLastError(0xdeadbeef); > + pSetDllDirectoryA(tmpPath); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS); > + ok (hmodule == NULL, "Test library %s should not be loaded from %s\n", dllName, tmpPath); > + ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + pSetDllDirectoryA(NULL); > + > + /* create test library */ > + lstrcpyA(fullPath, tmpPath); > + lstrcatA(fullPath, dllName); > + > + dos_header.e_magic = IMAGE_DOS_SIGNATURE; > + dos_header.e_lfanew = sizeof(dos_header); > + > + nt_header = nt_header_template; > + > + nt_header.FileHeader.NumberOfSections = 1; > + nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); > + nt_header.OptionalHeader.SectionAlignment = 0x1000; > + nt_header.OptionalHeader.FileAlignment = 0x1000; > + nt_header.OptionalHeader.SizeOfImage = sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER) + 0x1000; > + nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header_template) + sizeof(IMAGE_SECTION_HEADER); > + > + file_size = create_test_dll(&dos_header, sizeof(dos_header), &nt_header, fullPath); > + ok( file_size, "could not create '%s'\n",fullPath); > + > + /* try to load test dll without specifying the test path */ > + SetLastError(0xdeadbeef); > + pSetDllDirectoryA(NULL); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS); > + ok (hmodule == NULL, "Test library should not be loaded from 'NULL' path\n"); > + ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + > + /* try to load test dll from test path */ > + SetLastError(0xdeadbeef); > + pSetDllDirectoryA(tmpPath); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS); > + if(is_win2003) > + ok (hmodule == NULL, "Test library should not be loaded from %s in Win2003 (flag not supported)\n", tmpPath); > + else > + ok (hmodule != NULL, "Could not load test library %s from %s\n", dllName, tmpPath); > + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected 0xdeadbeef or ERROR_SUCCESS or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + pSetDllDirectoryA(NULL); > + > + /* load non-existing test dll from system32 */ > + SetLastError(0xdeadbeef); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); > + ok(hmodule == NULL, "%s should not be loaded\n", dllName); > + ok( GetLastError() == ERROR_MOD_NOT_FOUND || GetLastError() == ERROR_DLL_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + > + /* move library from temp path to system32 and delete from old path */ > + GetWindowsDirectoryA(sysFullFile,MAX_PATH); > + lstrcatA(sysFullFile,"\\system32\\"); > + lstrcatA(sysFullFile, dllName); > + MoveFileA(tmpFullFile,sysFullFile); > + DeleteFileA(tmpFullFile); > + > + /* try to load dll using more than one flag */ > + pSetDllDirectoryA(tmpPath); > + SetLastError(0xdeadbeef); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_USER_DIRS | LOAD_LIBRARY_SEARCH_SYSTEM32); > + if(is_win2003) > + ok (hmodule == NULL, "Test library should not be loaded from 'system32' in Win2003 (flag not supported)\n"); > + else > + ok (hmodule != NULL, "Library %s was expected to be loaded from 'system32'\n", dllName); > + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected 0xdeadbeef or ERROR_SUCCESS or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + pSetDllDirectoryA(NULL); > + > + /* try to load test dll from system32 */ > + SetLastError(0xdeadbeef); > + hmodule = LoadLibraryExA(dllName, NULL, LOAD_LIBRARY_SEARCH_SYSTEM32); > + if(is_win2003) > + ok (hmodule == NULL, "Test library should not be loaded from 'system32' in Win2003 (flag not supported)\n"); > + else > + ok (hmodule != NULL, "Library %s was expected to be loaded from 'system32'\n", dllName); > + ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_INVALID_PARAMETER, > + "Expected 0xdeadbeef or ERROR_SUCCESS or ERROR_INVALID_PARAMETER (win2003), got %d\n", GetLastError()); > + FreeLibrary(hmodule); > + > + /* delete test dll from system32 directory */ > + DeleteFileA(sysFullFile); > + > +} > + > static void testGetDllDirectory(void) > { > CHAR bufferA[MAX_PATH]; > @@ -744,7 +874,6 @@ START_TEST(module) > WCHAR filenameW[MAX_PATH]; > > /* Test if we can use GetModuleFileNameW */ > - > SetLastError(0xdeadbeef); > GetModuleFileNameW(NULL, filenameW, MAX_PATH); > if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) > @@ -766,6 +895,7 @@ START_TEST(module) > testLoadLibraryA_Wrong(); > testGetProcAddress_Wrong(); > testLoadLibraryEx(); > + testLoadLibraryExSearchFlags(); > testGetModuleHandleEx(); > testK32GetModuleInformation(); > } >

1 0

Re: [PATCH v3 1/5] include: Add initial ieautomation.idl
by Jacek Caban 11 Aug '17

11 Aug '17

On 10.08.2017 20:52, Zebediah Figura wrote: > + > +cpp_quote("DEFINE_GUID(CLSID_InternetExplorerManager, 0xdf4fcc34, 0x067a, 0x4e0a, 0x83,0x52, 0x4a,0x1a,0x50,0x95,0x34,0x6e);") Please use coclass, like in PSDK, instead. Jacek

1 0

Re: [v3 5/5] kernel32/tests: Add tests for LoadLibrary with LIBRARY_SEARCH_* flags
by Marvin 11 Aug '17

11 Aug '17

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=32633 Your paranoid android. === wvistau64 (32 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === w2008s64 (32 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === wvistau64 (64 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8 === w2008s64 (64 bit module) === module.c:479: Test failed: Expected ERROR_MOD_NOT_FOUND or ERROR_DLL_NOT_FOUND (win9x) or ERROR_INVALID_PARAMETER (win2003), got 8

1 0

Re: [PATCH] comctl32/listview: Keep the active item selected after hwndEdit is destroyed
by Nikolay Sivov 11 Aug '17

11 Aug '17

Could you describe how should I be testing this?

2 1

Re: [PATCH v2 3/5] ieframe: Add stub implementation of IInternetExplorerManager.
by Jacek Caban 10 Aug '17

10 Aug '17

Hi Zebediah, On 08.08.2017 20:04, Zebediah Figura wrote: > HRESULT register_class_object(BOOL do_reg) > { > HRESULT hres; > > - static DWORD cookie; > + static DWORD ie_cookie, iem_cookie; > > if(do_reg) { > hres = CoRegisterClassObject(&CLSID_InternetExplorer, > (IUnknown*)&InternetExplorerFactory, CLSCTX_SERVER, > - REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie); > - if (FAILED(hres)) { > + REGCLS_MULTIPLEUSE, &ie_cookie); > + if (FAILED(hres)) > + ERR("failed to register object %08x\n", hres); > + hres = CoRegisterClassObject(&CLSID_InternetExplorerManager, > + (IUnknown*)&InternetExplorerManagerFactory, CLSCTX_SERVER, > + REGCLS_MULTIPLEUSE, &iem_cookie); > + if (FAILED(hres)) > ERR("failed to register object %08x\n", hres); > - return hres; > - } > - > - hres = CoResumeClassObjects(); > - if(SUCCEEDED(hres)) > - return hres; > - > - ERR("failed to resume object %08x\n", hres); > } > - > - return CoRevokeClassObject(cookie); > + else > + { > + hres = CoRevokeClassObject(ie_cookie); > + if (FAILED(hres)) > + ERR("failed to register object %08x\n", hres); > + hres = CoRevokeClassObject(iem_cookie); > + if (FAILED(hres)) > + ERR("failed to register object %08x\n", hres); > + } > + return hres; > } Are you sure that's how it's supposed to work? I didn't test it myself, but given how it's registered and documented, I'd expect that CLSID_InternetExplorerManager should live in a different process from CLSID_InternetExplorer. It should be easy to distinguish those processes with -startmanager command line argument. > +static HRESULT WINAPI InternetExplorerManager_CreateObject(IInternetExplorerManager *iface, DWORD config, LPCWSTR url, REFIID riid, void **ppv) > +{ > + FIXME("(%p)->(0x%x, %s, %s, %p) semi-stub\n", iface, config, debugstr_w(url), debugstr_guid(riid), ppv); > + > + return CoCreateInstance(&CLSID_InternetExplorer, NULL, CLSCTX_LOCAL_SERVER, riid, ppv); > +} Using CoCreateInstance is very questionable here (eg. due to the comment above). Also, a patch adding a stub should just return E_NOTIMPL. Implementation deserves a separated patch. I'd expect that it should just use internal ieframe functions to create a new IE instance. Also, I'd suggest to reorder patches to something like: 2, 4, 5, 1 (likely replaced by support for -startmanager command line argument), 3 and then a new patch implementing CreateObject. Thanks, Jacek

2 6

Re: [v3 PATCH 1/2] dwrite: Protect cached fontface list when accessed from multiple threads
by Sebastian Lackner 10 Aug '17

10 Aug '17

On 10.08.2017 08:45, Nikolay Sivov wrote: > Based on patch by Anton Romanov <theli.ua(a)gmail.com> > > Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> > --- > dlls/dwrite/dwrite_private.h | 6 ++++-- > dlls/dwrite/font.c | 24 ++++++++++++--------- > dlls/dwrite/main.c | 50 +++++++++++++++++++++++++++++++++----------- > 3 files changed, 56 insertions(+), 24 deletions(-) > Isn't it also necessary to protect factory_cache_fontface()? By the way: An alternative method to implement proper synchronization (which does not require locking critical sections before InterlockedDecrement) would be to do something like: In the destructor: --- snip --- if (!ref) { EnterCriticalSection(...); list_remove(...); LeaveCriticalSection(...); ... } --- snip --- And when querying cached font faces: --- snip --- EnterCriticalSection(...); LIST_FOR_EACH_ENTRY(...) { ... /* the following code could also be hidden in QueryInterface */ if (InterlockedIncrement( &obj->refcount ) == 1) { InterlockedDecrement( &obj->refcount ); continue; } /* return it */ } LeaveCriticalSection(...); --- snip --- This is also what is done in Wines threadpool implementation [1], and has the advantage that the CS is not needed for every Release, only when the object is really destroyed. But in the end it is a matter of taste, for rpcrt4 Jacek also picked the "hold CS during InterlockedDecrement" method. [1] https://source.winehq.org/git/wine.git/blob/HEAD:/dlls/ntdll/threadpool.c#l… Best regards, Sebastian

3 2

Re: [PATCH] gdiplus: Support GdipSetClipRegion in metafiles
by Vincent Povirk 10 Aug '17

10 Aug '17

+ stat = GdipGetRegionData(region, (BYTE*)object_record + FIELD_OFFSET(EmfPlusObject, Header.Size), size, NULL); + object_record->Header.DataSize = object_record->Header.Size; + object_record->Header.Size = record_size; This is a little too clever. I'd rather have a solution similar to write_path_data.

1 0

Re: [v4 PATCH 1/2] dwrite: Protect cached fontface list when accessed from multiple threads
by Sebastian Lackner 10 Aug '17

10 Aug '17

On 10.08.2017 15:41, Nikolay Sivov wrote: > @@ -861,6 +877,10 @@ HRESULT factory_get_cached_fontface(IDWriteFactory5 *iface, IDWriteFontFile * co > const void *cached_key; > IDWriteFontFile *file; > > + if (IDWriteFontFace4_AddRef(cached->fontface) == 1) > + continue; > + IDWriteFontFace4_Release(cached->fontface); This will not work as expected. The refcount also matters when the object is about to be destroyed. There could be multiple threads running factory_get_cached_fontface() before _Release() can finally remove the fontface from the list. Please note that always calling _Release() also wouldn't be correct because it would run the destructor twice. It is not really necessary to access the private structs from other parts of dwrite, but you should either: * change AddRef to use something like interlocked_dec_if_nonzero (see ntdll/sync.c) * implement the check in QueryInterface (manually run InterlockedDecrement to decrement the refcount without going through the destructor) There are probably also other ways, for example using a flag to make sure the destructor is not called twice. Best regards, Sebastian

1 0

Re: [v2 PATCH 2/2] dwrite: Added a helper to check for supported characters
by Dmitry Timoshkov 10 Aug '17

10 Aug '17

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > - TRACE("(%p)->(0x%08x)\n", This, ch); > + TRACE("(%p)->(0x%#x)\n", This, ch); This will cause printing of the 0x prefix twice. Same applies to other places. -- Dmitry.

1 0

Re: wineandroid: Add suffix to lib directory and wine binary on 64-bit
by Alexandre Julliard 10 Aug '17

10 Aug '17

André Hentschel <nerv(a)dawncrow.de> writes: > This fixes at least arm64-v8a builds, where you have lib64/libwine.so and bin/wine64 > > Signed-off-by: André Hentschel <nerv(a)dawncrow.de> > --- > > This and "winebuild: Improved position independent code generation" enable Wine on ARM64 Android phones (e.g. most Android devices). > The check for 64 in the CPU_ABI can be discussed, but I think it's reliable and fast. > > dlls/wineandroid.drv/WineActivity.java | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) We already prefix with the ABI, so I think plain "lib" is better. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH v2 2/5] include: Add initial ieautomation.idl
by Nikolay Sivov 09 Aug '17

09 Aug '17

On 08.08.2017 21:04, Zebediah Figura wrote: > +[ > + object, > + uuid(acc84351-04ff-44f9-b23f-655ed168c6d5), > + oleautomation > +] > +interface IInternetExplorerManager : IUnknown > +{ > + HRESULT CreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); > +} This is not how it's defined in SDK - oleautomation is not used there and "url" argument has different attributes.

3 2

Re: [PATCH v2 5/5] ieproxy: Add proxy/stub for IInternetExplorerManager.
by Alistair Leslie-Hughes 09 Aug '17

09 Aug '17

Hi Zebediah, On 09/08/17 04:04, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > interface IInternetExplorerManager : IUnknown > { > - HRESULT CreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); > + [local] HRESULT CreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); > + [call_as(CreateObject)] HRESULT RemoteCreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); The public API doesn't have the RemoteCreateObject function. Best Regards Alistair.

2 1

Re: [PATCH 3/5] setupapi: Fix compiler warnings when converting between pointers and integers on 64-bit systems
by Alexandre Julliard 09 Aug '17

09 Aug '17

Hugh McMaster <hugh.mcmaster(a)outlook.com> writes: > Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> > --- > dlls/setupapi/devinst.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) That's only hiding the bug. -- Alexandre Julliard julliard(a)winehq.org

4 3

Re: [PATCH v2 5/5] ieproxy: Add proxy/stub for IInternetExplorerManager.
by Alistair Leslie-Hughes 09 Aug '17

09 Aug '17

Hi Zebediah, On 09/08/17 04:04, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > interface IInternetExplorerManager : IUnknown > { > - HRESULT CreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); > + [local] HRESULT CreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); > + [call_as(CreateObject)] HRESULT RemoteCreateObject([in] DWORD config, [in, unique] LPCWSTR url, [in] REFIID riid, [out, iid_is(riid)] void **ppv); The public API doesn't have the RemoteCreateObject function. Best Regards Alistair.

1 0

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