February 2017 - Wine-Commits

Huw Davies : dsound: Correctly update buflen.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 3076192e7de3c988e140da7003bd60c937c6ac8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3076192e7de3c988e140da700… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Feb 26 17:42:21 2017 +0000 dsound: Correctly update buflen. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f5a1020..ed41a5c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -250,18 +250,18 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, } FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); } else if (!mixfloat) { - DWORD alloc_len = frames * sizeof(float); + new_buflen = frames * sizeof(float); if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, alloc_len); + newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen); else - newbuf = HeapAlloc(GetProcessHeap(), 0, alloc_len); + newbuf = HeapAlloc(GetProcessHeap(), 0, new_buflen); if (!newbuf) { ERR("failed to allocate primary buffer\n"); return DSERR_OUTOFMEMORY; } - FillMemory(newbuf, alloc_len, (wfx->wBitsPerSample == 8) ? 128 : 0); + FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); } else { HeapFree(GetProcessHeap(), 0, device->buffer); newbuf = NULL;

1 0

André Hentschel : iphlpapi/tests: Test ScopeID only for IPv6.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 38bf651bc4efdce9ef296326b7cf40d6ae117e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf651bc4efdce9ef296326b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 27 14:05:45 2017 +0100 iphlpapi/tests: Test ScopeID only for IPv6. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e0701a3..953bbc9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2067,8 +2067,6 @@ static void test_GetUnicastIpAddressEntry(void) if (row.Address.si_family == AF_INET6) ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); - else - ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); } ua = ua->Next;

1 0

Nikolay Sivov : shell32: Implement SHGetPropertyStoreFromParsingName() as a wrapper over IShellItem2.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: f2499d20d4eb6dcce8984d5ef887648112f4f1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2499d20d4eb6dcce8984d5ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 27 17:19:23 2017 +0300 shell32: Implement SHGetPropertyStoreFromParsingName() as a wrapper over IShellItem2. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 9 --------- dlls/shell32/shellitem.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 7e1c7d5..1a22150 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -964,15 +964,6 @@ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) return E_NOTIMPL; } -/************************************************************************* - * SHGetPropertyStoreFromParsingName [SHELL32.@] - */ -HRESULT WINAPI SHGetPropertyStoreFromParsingName(PCWSTR pszPath, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, REFIID riid, void **ppv) -{ - FIXME("(%s %p %u %p %p) stub!\n", debugstr_w(pszPath), pbc, flags, riid, ppv); - return E_NOTIMPL; -} - /*************************************************************************/ typedef struct diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 57f5fa6..1e19f7c 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -1331,6 +1331,24 @@ HRESULT WINAPI SHCreateShellItemArrayFromIDLists(UINT cidl, return ret; } +HRESULT WINAPI SHGetPropertyStoreFromParsingName(const WCHAR *path, IBindCtx *pbc, GETPROPERTYSTOREFLAGS flags, + REFIID riid, void **ppv) +{ + IShellItem2 *item; + HRESULT hr; + + TRACE("(%s %p %#x %p %p)\n", debugstr_w(path), pbc, flags, riid, ppv); + + hr = SHCreateItemFromParsingName(path, pbc, &IID_IShellItem2, (void **)&item); + if(SUCCEEDED(hr)) + { + hr = IShellItem2_GetPropertyStore(item, flags, riid, ppv); + IShellItem2_Release(item); + } + + return hr; +} + static HRESULT WINAPI CustomDestinationList_QueryInterface(ICustomDestinationList *iface, REFIID riid, void **obj) { CustomDestinationList *This = impl_from_ICustomDestinationList(iface);

1 0

Bruno Jesus : winegstreamer: Avoid a magic number for empty offset.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: a8fc94d526e716aa76fdbd75feef57a33bf821ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fc94d526e716aa76fdbd75f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 22 23:44:48 2017 -0300 winegstreamer: Avoid a magic number for empty offset. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 759a5db..3ef2324 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -700,7 +700,7 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 TRACE("%p %s %i %p\n", pad, wine_dbgstr_longlong(ofs), len, buf); *buf = NULL; - if (ofs == (guint64)-1) + if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; if (ofs >= This->filesize) { WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len);

1 0

André Hentschel : usp10: Fix ScriptGetProperties spec file entry.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: b32fb231e6e4821a585e6165b743c367afa35e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32fb231e6e4821a585e6165b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 22 21:28:15 2017 +0100 usp10: Fix ScriptGetProperties spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 3880895..3e97d91 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -13,7 +13,7 @@ @ stdcall ScriptGetFontScriptTags(long ptr ptr long ptr ptr) @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) @ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) -@ stdcall ScriptGetProperties(ptr long) +@ stdcall ScriptGetProperties(ptr ptr) @ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) @ stdcall ScriptItemizeOpenType(wstr long long ptr ptr ptr ptr ptr)

1 0

Bruno Jesus : include: Add missing GetIfTable2 to netioapi.h.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 08cae050154a3706df1e418f526d943ab77b9b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cae050154a3706df1e418f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 26 22:28:09 2017 -0300 include: Add missing GetIfTable2 to netioapi.h. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netioapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/netioapi.h b/include/netioapi.h index 0e777c7..2faa5d6 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -108,6 +108,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*); DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); +DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); #endif /* __WINE_NETIOAPI_H */

1 0

Piotr Caban : msvcr100: Add _ReentrantBlockingLock class implementation.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 2682f9e67c78172039de4abc690b33b3a20742f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2682f9e67c78172039de4abc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:15:56 2017 +0100 msvcr100: Add _ReentrantBlockingLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 +++++++------- dlls/msvcr100/msvcr100.spec | 20 +++++++------- dlls/msvcr110/msvcr110.spec | 30 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 ++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 30 ++++++++++----------- dlls/msvcrt/lock.c | 54 +++++++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2682f9e67c78172039de4…

1 0

Chris Morgan : winex11: Wrap XInput2 dependent functions with appropriate #ifdef.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 9c83e5ccf2f4c9d8662baa85c35f5147ccaae883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c83e5ccf2f4c9d8662baa85c… Author: Chris Morgan <chmorgan(a)gmail.com> Date: Fri Feb 24 08:06:52 2017 -0500 winex11: Wrap XInput2 dependent functions with appropriate #ifdef. Signed-off-by: Chris Morgan <chmorgan(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 6027a6e..259263d 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -246,6 +246,7 @@ void sync_window_cursor( Window window ) set_window_cursor( window, cursor ); } +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H /*********************************************************************** * update_relative_valuators */ @@ -281,6 +282,7 @@ static void update_relative_valuators(XIAnyClassInfo **valuators, int n_valuator } } } +#endif /***********************************************************************

1 0

Nikolay Sivov : usp10: Filter out DeltaFormat == 0 too, valid range is [1, 3].
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 892393bb76110ab936b98e79fef2299c13df5d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892393bb76110ab936b98e79f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 22 12:14:50 2017 +0300 usp10: Filter out DeltaFormat == 0 too, valid range is [1, 3]. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a1ad3dc..4f3b559 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1512,7 +1512,7 @@ static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD p TRACE("device table, format %#x, index %i\n", format, index); - if (format & ~0x3) + if (format < 1 || format > 3) { WARN("invalid delta format %#x\n", format); return 0;

1 0

Francois Gouget : usp10: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 1a42ee31982eaa665448bddbe62aaa7f34557779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a42ee31982eaa665448bddbe… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 22 11:25:37 2017 +0100 usp10: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. And standardize their type names. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index f8a6aa5..9a558b4 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -710,17 +710,17 @@ typedef struct { WORD target; } FindGlyph_struct; -static inline void *heap_alloc(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline BOOL heap_free(LPVOID mem) +static inline BOOL heap_free(void *mem) { return HeapFree(GetProcessHeap(), 0, mem); }

1 0