February 2017 - Wine-devel - list.winehq.org

Re: [PATCH 2/2] mfreadwrite: Add MFCreateSourceReaderFromMediaSource stub
by Andrew Eikum 13 Feb '17

13 Feb '17

> +WINE_DEFAULT_DEBUG_CHANNEL(mfreadwrite); > There are a bunch of Media Foundation DLLs, I count roughly 12 on my Win7 VM. I think we should stick to just one debug channel in Wine. I suggest "mfplat" since we already have it. Andrew

1 0

Re: [v6 4/6] user32: Add WM_NCPAINT tests for windows crossing screen or maximized
by Alexandre Julliard 13 Feb '17

13 Feb '17

Fabian Maurer <dark.shadow4(a)web.de> writes: > @@ -4580,6 +4643,18 @@ static void test_showwindow(void) > DestroyWindow(hwnd); > flush_sequence(); > > + /* Test again, this time the NC_PAINT message */ > + hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE, > + 100, 100, 200, 200, 0, 0, 0, NULL); > + ok (hwnd != 0, "Failed to create popup window\n"); > + SetWindowPos(hwnd, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE); > + flush_sequence(); > + ShowWindow(hwnd, SW_SHOWMAXIMIZED); > + ok_sequence(WmShowMaxPopupResizedSeq_todo, > + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", TRUE); > + DestroyWindow(hwnd); > + flush_sequence(); This one is already succeeding here: ../../../tools/runtest -q -P wine -T ../../.. -M user32.dll -p user32_test.exe.so msg && touch msg.ok msg.c:4654: Test succeeded inside todo block: ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO: marked "todo_wine" but succeeds msg.c:13361: Tests skipped: Skipping DBCS WM_CHAR test in SBCS codepage 'ANSI Latin 1' msg.c:13677: Tests skipped: Unable to load Greek keyboard layout Makefile:482: recipe for target 'msg.ok' failed -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [v2 PATCH 2/3] d2d1: Added support for ID2D1GdiInteropRenderTarget interface
by Jacek Caban 13 Feb '17

13 Feb '17

Hi Nikolay, On 12.02.2017 20:14, Nikolay Sivov wrote: > diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c > index 67b0713376..3ac5c77d36 100644 > --- a/dlls/d2d1/bitmap_render_target.c > +++ b/dlls/d2d1/bitmap_render_target.c > @@ -32,6 +32,8 @@ static inline struct d2d_bitmap_render_target *impl_from_ID2D1BitmapRenderTarget > static HRESULT STDMETHODCALLTYPE d2d_bitmap_render_target_QueryInterface(ID2D1BitmapRenderTarget *iface, > REFIID iid, void **out) > { > + struct d2d_bitmap_render_target *render_target = impl_from_ID2D1BitmapRenderTarget(iface); > + > TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); > > if (IsEqualGUID(iid, &IID_ID2D1BitmapRenderTarget) > @@ -43,6 +45,8 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_render_target_QueryInterface(ID2D1Bi > *out = iface; > return S_OK; > } > + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) > + return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); AFAICS this won't work. If you call QueryInterface(IID_ID2D1BitmapRenderTarget) on returned ID2D1GdiInteropRenderTarget, it will fail. There are a few solutions for that. The most generic is COM aggregation with separated 'inner' IUnknown for dxgi_target. Thanks, Jacek

2 1

Re: [PATCH 2/3] wined3d: Marge common code between texture3d_load_location() and surface_load_location().
by Henri Verbeet 13 Feb '17

13 Feb '17

On 13 February 2017 at 13:13, Henri Verbeet <hverbeet(a)codeweavers.com> wrote: > Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> > --- > dlls/wined3d/surface.c | 60 ++------------------------------------ > dlls/wined3d/texture.c | 79 ++++++++++++++++++++++++++++++-------------------- > 2 files changed, 50 insertions(+), 89 deletions(-) > That should have read "Merge" instead of "Marge".

1 0

Re: [PATCH] include: Make break out of __TRY blocks work with compiler exceptions.
by Alexandre Julliard 13 Feb '17

13 Feb '17

Stefan Dösinger <stefandoesinger(a)gmx.at> writes: > ddraw.dll uses this. I am using compiler exceptions for my Visual Studio > build setup. A ddraw.dll compiled with this passes the test added by > commit d9f2b4627. I manually tested the functionality of __TRY-__FINALLY, > __EXCEPT_ALL and __EXCEPT(func). It would be better to avoid break, and ideally find a way to disallow it in the Wine macros. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH v4 1/3] storage.dll16: Fix negation in IStream::Seek.
by Huw Davies 13 Feb '17

13 Feb '17

On Sun, Feb 12, 2017 at 12:03:20PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/storage.dll16/storage.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c > index 74aa7f9..7a5b367 100644 > --- a/dlls/storage.dll16/storage.c > +++ b/dlls/storage.dll16/storage.c > @@ -1196,9 +1196,8 @@ HRESULT CDECL IStream16_fnSeek(IStream16 *iface, LARGE_INTEGER offset, DWORD whe > break; > case SEEK_CUR: > if (offset.u.HighPart < 0) { > - /* FIXME: is this negation correct ? */ > - offset.u.HighPart = -offset.u.HighPart; > - offset.u.LowPart = (0xffffffff ^ offset.u.LowPart)+1; > + offset.u.HighPart = ~offset.u.HighPart + (offset.u.LowPart ? 0 : 1); > + offset.u.LowPart = -offset.u.LowPart; > > assert(offset.u.HighPart==0); > assert(This->offset.u.LowPart >= offset.u.LowPart); > -- Couldn't you just replace the whole SEEK_CUR branch with: This->offset.QuadPart += offset.QuadPart; Huw.

1 0

Re: [PATCH v2 1/3] storage.dll16: Fix negation in IStream::Seek.
by Henri Verbeet 12 Feb '17

12 Feb '17

On 11 February 2017 at 23:54, Zebediah Figura <z.figura12(a)gmail.com> wrote: > @@ -1196,9 +1196,8 @@ HRESULT CDECL IStream16_fnSeek(IStream16 *iface, LARGE_INTEGER offset, DWORD whe > break; > case SEEK_CUR: > if (offset.u.HighPart < 0) { > - /* FIXME: is this negation correct ? */ > - offset.u.HighPart = -offset.u.HighPart; > - offset.u.LowPart = (0xffffffff ^ offset.u.LowPart)+1; > + offset.u.HighPart = ~offset.u.HighPart; > + offset.u.LowPart = -offset.u.LowPart; > I don't think that's quite correct either. Consider e.g. 0xffffffff00000000, the negation of which would be 0x0000000100000000.

2 1

Re: [PATCH] include: Make break out of __TRY blocks work with compiler exceptions.
by Dmitry Timoshkov 12 Feb '17

12 Feb '17

Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > +#define __TRY __try { do > +#define __EXCEPT(func) while(0); } __except((func)(GetExceptionInformation())) { do > +#define __FINALLY(func) while(0); } __finally { (func)(!AbnormalTermination()); } > +#define __ENDTRY while(0); } > +#define __EXCEPT_PAGE_FAULT while(0); } __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) { do > +#define __EXCEPT_ALL while(0); } __except(EXCEPTION_EXECUTE_HANDLER) { do Perhaps add another '{' after 'do' and and '}' before 'while(0)' ? -- Dmitry.

2 2

Re: kernel32: Avoid two potential buffer overflows of cStr in create_hardware_branch.
by Sebastian Lackner 12 Feb '17

12 Feb '17

On 08.10.2016 22:31, Gerald Pfeifer wrote: > + char cStr[sizeof(dent->d_name)+sizeof(procname_ide_media)], http://man7.org/linux/man-pages/man3/readdir.3.html says: """The standard also notes that the use of sizeof(d_name) is incorrect; use strlen(d_name) instead. (On some systems, this field is defined as char d_name[1]!)""" This means your solution will not work on all systems.

3 4

Re: [PATCH 1/2] RFC: Implement XInputEnable based on MSDN
by Bruno Jesus 11 Feb '17

11 Feb '17

On Sat, Feb 11, 2017 at 9:05 PM, Christoph Brill <egore911(a)gmail.com> wrote: > --- > dlls/xinput1_3/xinput1_3_main.c | 45 ++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 44 insertions(+), 1 deletion(-) Hi, thanks for the patch but currently Wine is aiming at a different direction of reimplementing the 3 joystick API's (winmm, dinput and xinput) using a single HID library so that the OS dependent parts stay in one place. I believe Wine is only months away of having all these working with current Aric Stewart work. Other people (including me) already have suggested at wine-devel/wine-patches more or less completed versions of xinput using SDL, dinput and event libraries before/during the HID model adoption. IMO the best thing that can be done for now is to ensure the winmm driver (in the progress of being commited [1]) works fine so help testing is very welcome. After that we will have a standard to implement the other 2 API's. [1] http://source.winehq.org/patches/data/129688 Best wishes, Bruno

1 0