July 2016 - Wine-Commits - list.winehq.org

Alexandre Julliard : kernel32/tests: Fix loader test failures on some Windows versions.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 24b49c477587bf1b7621ed1550b9d49ba21a424f URL: http://source.winehq.org/git/wine.git/?a=commit;h=24b49c477587bf1b7621ed155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 27 16:09:40 2016 +0900 kernel32/tests: Fix loader test failures on some Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e845e0d..8ff511f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -230,15 +230,22 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE NTSTATUS status; HANDLE file, mapping; ULONG file_size; + /* truncated header is not handled correctly in windows <= w2k3 */ + BOOL truncated = nt_header->FileHeader.SizeOfOptionalHeader < sizeof(nt_header->OptionalHeader); - file = CreateFileA( dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + file = CreateFileA( dll_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, 0, 0 ); ok( file != INVALID_HANDLE_VALUE, "%u: CreateFile error %d\n", id, GetLastError() ); file_size = GetFileSize( file, NULL ); status = pNtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, NULL, PAGE_READONLY, SEC_IMAGE, file ); ok( !status, "%u: NtCreateSection failed err %x\n", id, status ); - if (status) return; + if (status) + { + CloseHandle( file ); + return; + } status = pNtQuerySection( mapping, SectionImageInformation, &image, sizeof(image), &info_size ); ok( !status, "%u: NtQuerySection failed err %x\n", id, status ); ok( info_size == sizeof(image), "%u: NtQuerySection wrong size %u\n", id, info_size ); @@ -247,13 +254,13 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE image.TransferAddress, (char *)nt_header->OptionalHeader.ImageBase, nt_header->OptionalHeader.AddressOfEntryPoint ); ok( image.ZeroBits == 0, "%u: ZeroBits wrong %08x\n", id, image.ZeroBits ); - ok( image.MaximumStackSize == nt_header->OptionalHeader.SizeOfStackReserve, + ok( image.MaximumStackSize == nt_header->OptionalHeader.SizeOfStackReserve || broken(truncated), "%u: MaximumStackSize wrong %lx / %lx\n", id, image.MaximumStackSize, (SIZE_T)nt_header->OptionalHeader.SizeOfStackReserve ); - ok( image.CommittedStackSize == nt_header->OptionalHeader.SizeOfStackCommit, + ok( image.CommittedStackSize == nt_header->OptionalHeader.SizeOfStackCommit || broken(truncated), "%u: CommittedStackSize wrong %lx / %lx\n", id, image.CommittedStackSize, (SIZE_T)nt_header->OptionalHeader.SizeOfStackCommit ); - ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem, + ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem || broken(truncated), "%u: SubSystemType wrong %08x / %08x\n", id, image.SubSystemType, nt_header->OptionalHeader.Subsystem ); ok( image.SubsystemVersionLow == nt_header->OptionalHeader.MinorSubsystemVersion, @@ -262,11 +269,10 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.SubsystemVersionHigh == nt_header->OptionalHeader.MajorSubsystemVersion, "%u: SubsystemVersionHigh wrong %04x / %04x\n", id, image.SubsystemVersionHigh, nt_header->OptionalHeader.MajorSubsystemVersion ); - ok( image.GpValue == 0, "%u: GpValue wrong %08x\n", id, image.GpValue ); ok( image.ImageCharacteristics == nt_header->FileHeader.Characteristics, "%u: ImageCharacteristics wrong %04x / %04x\n", id, image.ImageCharacteristics, nt_header->FileHeader.Characteristics ); - ok( image.DllCharacteristics == nt_header->OptionalHeader.DllCharacteristics, + ok( image.DllCharacteristics == nt_header->OptionalHeader.DllCharacteristics || broken(truncated), "%u: DllCharacteristics wrong %04x / %04x\n", id, image.DllCharacteristics, nt_header->OptionalHeader.DllCharacteristics ); ok( image.Machine == nt_header->FileHeader.Machine, "%u: Machine wrong %04x / %04x\n", id, @@ -274,11 +280,12 @@ static void query_image_section( int id, const char *dll_name, const IMAGE_NT_HE ok( image.LoaderFlags == nt_header->OptionalHeader.LoaderFlags, "%u: LoaderFlags wrong %08x / %08x\n", id, image.LoaderFlags, nt_header->OptionalHeader.LoaderFlags ); - ok( image.ImageFileSize == file_size, "%u: ImageFileSize wrong %08x / %08x\n", id, - image.ImageFileSize, file_size ); + ok( image.ImageFileSize == file_size || broken(!image.ImageFileSize), /* winxpsp1 */ + "%u: ImageFileSize wrong %08x / %08x\n", id, image.ImageFileSize, file_size ); ok( image.CheckSum == nt_header->OptionalHeader.CheckSum, "%u: CheckSum wrong %08x / %08x\n", id, image.CheckSum, nt_header->OptionalHeader.CheckSum ); /* FIXME: needs more work: */ + /* image.GpValue */ /* image.ImageFlags */ /* image.ImageContainsCode */ CloseHandle( mapping );

1 0

Nikolay Sivov : comctl32/treeview: Handle WM_SYSKEYDOWN.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 11beaf9978365ba58ac7c4d00680d95a5675ea39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11beaf9978365ba58ac7c4d00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 23:16:51 2016 +0300 comctl32/treeview: Handle WM_SYSKEYDOWN. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index a703ae7..6540fdb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5752,6 +5752,7 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return TREEVIEW_HScroll(infoPtr, wParam); case WM_KEYDOWN: + case WM_SYSKEYDOWN: return TREEVIEW_KeyDown(infoPtr, wParam); case WM_KILLFOCUS: @@ -5816,8 +5817,6 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) COMCTL32_RefreshSysColors(); return 0; - /* WM_SYSKEYDOWN */ - case WM_TIMER: return TREEVIEW_HandleTimer(infoPtr, wParam);

1 0

Andrew Eikum : winepulse.drv: Don' t hold PA-owned buffer between capture callbacks.
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: ee2310f7674c95b1ebc6229e3acd5b2bc408ba73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee2310f7674c95b1ebc6229e3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 26 12:51:16 2016 -0500 winepulse.drv: Don't hold PA-owned buffer between capture callbacks. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 55 +++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 32db0d1..bb533d9 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -173,8 +173,8 @@ struct ACImpl { INT32 locked; UINT32 bufsize_frames, bufsize_bytes, capture_period, pad, started, peek_ofs, wri_offs_bytes, lcl_offs_bytes; - UINT32 tmp_buffer_bytes, held_bytes; - BYTE *local_buffer, *tmp_buffer; + UINT32 tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len; + BYTE *local_buffer, *tmp_buffer, *peek_buffer; void *locked_ptr; pa_stream *stream; @@ -764,28 +764,42 @@ static void pulse_rd_loop(ACImpl *This, size_t bytes) dst = p->data; while (rem) { - pa_stream_peek(This->stream, (const void**)&src, &src_len); - assert(src_len); - assert(This->peek_ofs < src_len); - src += This->peek_ofs; - src_len -= This->peek_ofs; - assert(src_len <= bytes); + if (This->peek_len) { + copy = min(rem, This->peek_len - This->peek_ofs); - copy = rem; - if (copy > src_len) - copy = src_len; - memcpy(dst, src, rem); - src += copy; - src_len -= copy; - dst += copy; - rem -= copy; + memcpy(dst, This->peek_buffer + This->peek_ofs, copy); - if (!src_len) { - This->peek_ofs = 0; - pa_stream_drop(This->stream); - } else + rem -= copy; + dst += copy; This->peek_ofs += copy; + if(This->peek_len == This->peek_ofs) + This->peek_len = 0; + } else { + pa_stream_peek(This->stream, (const void**)&src, &src_len); + + copy = min(rem, src_len); + + memcpy(dst, src, rem); + + dst += copy; + rem -= copy; + + if (copy < src_len) { + if (src_len > This->peek_buffer_len) { + HeapFree(GetProcessHeap(), 0, This->peek_buffer); + This->peek_buffer = HeapAlloc(GetProcessHeap(), 0, src_len); + This->peek_buffer_len = src_len; + } + + memcpy(This->peek_buffer, src + copy, src_len - copy); + This->peek_len = src_len - copy; + This->peek_ofs = 0; + } + + pa_stream_drop(This->stream); + } } + bytes -= This->capture_period; } } @@ -1036,6 +1050,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) IUnknown_Release(This->marshal); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + HeapFree(GetProcessHeap(), 0, This->peek_buffer); HeapFree(GetProcessHeap(), 0, This->local_buffer); HeapFree(GetProcessHeap(), 0, This); }

1 0

Huw Davies : gdi32: Avoid unnecessary calls to get_dc_ptr().
by Alexandre Julliard July 27, 2016

July 27, 2016

Module: wine Branch: master Commit: 36a0bb0f5296fa5412e40fc3e1e4a854550e448b URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a0bb0f5296fa5412e40fc3e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jul 27 09:59:26 2016 +0100 gdi32: Avoid unnecessary calls to get_dc_ptr(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/bitblt.c | 19 ++++--------------- dlls/gdi32/gdi_private.h | 7 +++++++ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 71ef272..12e4cd8 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1390,18 +1390,12 @@ COLORREF get_pixel_bitmapinfo( const BITMAPINFO *info, void *bits, struct bitblt BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) { - BOOL ret; - DC *dc_dst = get_dc_ptr( dst_dev->hdc ); - - if (!dc_dst) return FALSE; + DC *dc_dst = get_physdev_dc( dst_dev ); if (dst->width == 1 && src->width > 1) src->width--; if (dst->height == 1 && src->height > 1) src->height--; - ret = dc_dst->nulldrv.funcs->pStretchBlt( &dc_dst->nulldrv, dst, - src_dev, src, rop ); - release_dc_ptr( dc_dst ); - return ret; + return dc_dst->nulldrv.funcs->pStretchBlt( &dc_dst->nulldrv, dst, src_dev, src, rop ); } /*********************************************************************** @@ -1410,14 +1404,9 @@ BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, BOOL dibdrv_AlphaBlend( PHYSDEV dst_dev, struct bitblt_coords *dst, PHYSDEV src_dev, struct bitblt_coords *src, BLENDFUNCTION blend ) { - BOOL ret; - DC *dc_dst = get_dc_ptr( dst_dev->hdc ); + DC *dc_dst = get_physdev_dc( dst_dev ); - if (!dc_dst) return FALSE; - - ret = dc_dst->nulldrv.funcs->pAlphaBlend( &dc_dst->nulldrv, dst, src_dev, src, blend ); - release_dc_ptr( dc_dst ); - return ret; + return dc_dst->nulldrv.funcs->pAlphaBlend( &dc_dst->nulldrv, dst, src_dev, src, blend ); } /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 47cdf66..a837215 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -469,6 +469,13 @@ static inline DC *get_nulldrv_dc( PHYSDEV dev ) return CONTAINING_RECORD( dev, DC, nulldrv ); } +static inline DC *get_physdev_dc( PHYSDEV dev ) +{ + while (dev->funcs != &null_driver) + dev = dev->next; + return get_nulldrv_dc( dev ); +} + /* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ #define DIB_PAL_MONO 2

1 0

Francois Gouget : kernel32/tests: Remove a trailing space from an ok() call message.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: b54a8dda844a1a43d1dff22eff0ea206be5c630c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54a8dda844a1a43d1dff22ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 26 16:52:13 2016 +0200 kernel32/tests: Remove a trailing space from an ok() call message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2a13857..40b1bc9 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -651,7 +651,7 @@ static void test_MapViewOfFile(void) ok( mapping != 0, "OpenFileMapping FILE_MAP_WRITE error %u\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, 0 ); - ok( !ptr, "MapViewOfFile succeeded\n " ); + ok( !ptr, "MapViewOfFile succeeded\n" ); ok( GetLastError() == ERROR_ACCESS_DENIED, "Wrong error %d\n", GetLastError() ); SetLastError(0xdeadbeef); ptr = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 );

1 0

Andrey Gusev : riched20: Use debugstr_guid() in TRACE() messages.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: c43aebd79b8f29c1f3e3fb11ffaa999952d4dc3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43aebd79b8f29c1f3e3fb11f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jul 22 13:03:31 2016 +0300 riched20: Use debugstr_guid() in TRACE() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index a2f23c9..77e7b57 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1603,7 +1603,7 @@ static HRESULT WINAPI ITextRange_fnGetIDsOfNames(ITextRange *me, REFIID riid, LP ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextRange_tid, &ti); @@ -1621,8 +1621,8 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextRange_tid, &ti); if (SUCCEEDED(hr)) @@ -2601,8 +2601,8 @@ static HRESULT WINAPI TextFont_GetIDsOfNames(ITextFont *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextFont_tid, &ti); if (SUCCEEDED(hr)) @@ -2625,8 +2625,8 @@ static HRESULT WINAPI TextFont_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextFont_tid, &ti); if (SUCCEEDED(hr)) @@ -3383,8 +3383,8 @@ static HRESULT WINAPI TextPara_GetIDsOfNames(ITextPara *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); hr = get_typeinfo(ITextPara_tid, &ti); if (SUCCEEDED(hr)) @@ -3407,8 +3407,9 @@ static HRESULT WINAPI TextPara_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(ITextPara_tid, &ti); if (SUCCEEDED(hr)) @@ -3884,8 +3885,8 @@ ITextDocument_fnGetIDsOfNames(ITextDocument* me, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextDocument_tid, &ti); if (SUCCEEDED(hr)) @@ -3902,8 +3903,9 @@ ITextDocument_fnInvoke(ITextDocument* me, DISPID dispIdMember, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, + pExcepInfo, puArgErr); hr = get_typeinfo(ITextDocument_tid, &ti); if (SUCCEEDED(hr)) @@ -4218,7 +4220,7 @@ static HRESULT WINAPI ITextSelection_fnGetIDsOfNames(ITextSelection *me, REFIID ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextSelection_tid, &ti); @@ -4242,7 +4244,7 @@ static HRESULT WINAPI ITextSelection_fnInvoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid, + TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextSelection_tid, &ti);

1 0

Michael Stefaniuc : dmusic: Use debugstr_guid to trace some GUIDs.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 253bffafba6ceea8b2da87875fdcbdc0c5a51108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253bffafba6ceea8b2da87875… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 26 10:42:02 2016 +0200 dmusic: Use debugstr_guid to trace some GUIDs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/clock.c | 2 +- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/port.c | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 46a035f..7fd1d8f 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -123,7 +123,7 @@ HRESULT DMUSIC_CreateReferenceClockImpl(LPCGUID riid, LPVOID* ret_iface, LPUNKNO IReferenceClockImpl* clock; HRESULT hr; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); clock = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IReferenceClockImpl)); if (!clock) { diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 09a7f53..67900b3 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -405,7 +405,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicImpl(LPCGUID riid, LPVOID* ret_iface, LPU IDirectMusic8Impl *dmusic; HRESULT ret; - TRACE("(%p,%p,%p)\n", riid, ret_iface, unkouter); + TRACE("(%s, %p, %p)\n", debugstr_guid(riid), ret_iface, unkouter); *ret_iface = NULL; if (unkouter) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index f886d52..d919c10 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -678,7 +678,8 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT hr = E_FAIL; int i; - TRACE("(%p,%p,%p,%p,%p,%d)\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d)\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); *object = NULL; @@ -762,14 +763,16 @@ HRESULT DMUSIC_CreateSynthPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkou HRESULT DMUSIC_CreateMidiOutPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; } HRESULT DMUSIC_CreateMidiInPortImpl(LPCGUID guid, LPVOID *object, LPUNKNOWN unkouter, LPDMUS_PORTPARAMS port_params, LPDMUS_PORTCAPS port_caps, DWORD device) { - TRACE("(%p,%p,%p,%p,%p,%d): stub\n", guid, object, unkouter, port_params, port_caps, device); + TRACE("(%s, %p, %p, %p, %p, %d): stub\n", debugstr_guid(guid), object, unkouter, port_params, + port_caps, device); return E_NOTIMPL; }

1 0

Alistair Leslie-Hughes : include/netfw.idl: Add INetFwRule, INetFwRules, INetFwServiceRestriction, INetFwPolicy2 interfaces.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 45c2911a260903860b83fdb4efcc745b6b44930b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c2911a260903860b83fdb4e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:46:58 2016 +0000 include/netfw.idl: Add INetFwRule, INetFwRules, INetFwServiceRestriction, INetFwPolicy2 interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/netfw.idl | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) diff --git a/include/netfw.idl b/include/netfw.idl index 9158f8d..cf03b82 100644 --- a/include/netfw.idl +++ b/include/netfw.idl @@ -333,6 +333,149 @@ interface INetFwAuthorizedApplications : IDispatch } [ + local, + object, + uuid(af230d27-baba-4e42-aced-f524f22cfce2), + dual +] +interface INetFwRule : IDispatch +{ + [id(1), propget] + HRESULT Name( [out, retval] BSTR *name ); + [id(1), propput] + HRESULT Name( [in] BSTR name ); + + [id(2), propget] + HRESULT Description( [out, retval] BSTR* desc ); + [id(2), propput] + HRESULT Description( [in] BSTR desc ); + + [id(3), propget] + HRESULT ApplicationName( [out, retval] BSTR *imagename ); + [id(3), propput] + HRESULT ApplicationName( [in] BSTR imagename ); + + [id(4), propget] + HRESULT ServiceName( [out, retval] BSTR *service ); + [id(4), propput] + HRESULT ServiceName( [in] BSTR service ); + + [id(5), propget] + HRESULT Protocol( [out, retval] long* protocol ); + [id(5), propput] + HRESULT Protocol( [in] long protocol ); + + [id(6), propget] + HRESULT LocalPorts( [out, retval] BSTR* ports ); + [id(6), propput] + HRESULT LocalPorts( [in] BSTR ports ); + + [id(7), propget] + HRESULT RemotePorts( [out, retval] BSTR *ports ); + [id(7), propput] + HRESULT RemotePorts( [in] BSTR ports ); + + [id(8), propget] + HRESULT LocalAddresses([out, retval] BSTR* address ); + [id(8), propput] + HRESULT LocalAddresses([in] BSTR address); + + [id(9), propget] + HRESULT RemoteAddresses( [out, retval] BSTR* address ); + [id(9), propput] + HRESULT RemoteAddresses( [in] BSTR address ); + + [id(10), propget] + HRESULT IcmpTypesAndCodes( [out, retval] BSTR *codes ); + [id(10), propput] + HRESULT IcmpTypesAndCodes( [in] BSTR codes ); + + [id(11), propget] + HRESULT Direction( [out, retval] NET_FW_RULE_DIRECTION* dir ); + [id(11), propput] + HRESULT Direction( [in] NET_FW_RULE_DIRECTION dir ); + + [id(12), propget] + HRESULT Interfaces( [out, retval] VARIANT* interfaces ); + [id(12), propput] + HRESULT Interfaces( [in] VARIANT interfaces ); + + [id(13), propget] + HRESULT InterfaceTypes( [out, retval] BSTR* types ); + [id(13), propput] + HRESULT InterfaceTypes( [in] BSTR types ); + + [id(14), propget] + HRESULT Enabled( [out, retval] VARIANT_BOOL* enabled ); + [id(14), propput] + HRESULT Enabled( [in] VARIANT_BOOL enabled ); + + [id(15), propget] + HRESULT Grouping( [out, retval] BSTR* context ); + [id(15), propput] + HRESULT Grouping( [in] BSTR context ); + + [id(16), propget] + HRESULT Profiles( [out, retval] long* profiles ); + [id(16), propput] + HRESULT Profiles( [in] long profiles ); + + [id(17), propget] + HRESULT EdgeTraversal( [out, retval] VARIANT_BOOL* enabled ); + [id(17), propput] + HRESULT EdgeTraversal( [in] VARIANT_BOOL enabled ); + + [id(18), propget] + HRESULT Action( [out, retval] NET_FW_ACTION* action ); + [id(18), propput] + HRESULT Action( [in] NET_FW_ACTION action ); +} + +[ + local, + object, + uuid(9c4c6277-5027-441e-afae-ca1f542da009), + dual +] +interface INetFwRules : IDispatch +{ + [id(1), propget] + HRESULT Count( [out, retval] long* count ); + + [id(2)] + HRESULT Add( [in] INetFwRule* rule ); + + [id(3)] + HRESULT Remove( [in] BSTR name ); + + [id(4)] + HRESULT Item( [in] BSTR name, [out, retval] INetFwRule** rule ); + + [id(DISPID_NEWENUM), propget, restricted] + HRESULT _NewEnum( [out, retval] IUnknown** newEnum ); +} + +[ + local, + object, + uuid(8267bbe3-f890-491c-b7b6-2db1ef0e5d2b), + dual +] +interface INetFwServiceRestriction : IDispatch +{ + [id(1)] + HRESULT RestrictService( [in] BSTR serviceName, [in] BSTR appName, + [in] VARIANT_BOOL restrictService, [in] VARIANT_BOOL serviceSidRestricted ); + + [id(2)] + HRESULT ServiceRestricted( [in] BSTR serviceName, [in] BSTR appName, + [out, retval] VARIANT_BOOL* serviceRestricted ); + + [id(3), propget] + HRESULT Rules( [out, retval] INetFwRules** rules ); +} + +[ object, uuid(174A0DDA-E9F9-449D-993B-21AB667CA456), dual @@ -398,6 +541,81 @@ interface INetFwPolicy : IDispatch } [ + local, + object, + uuid(98325047-c671-4174-8d81-defcd3f03186), + dual +] +interface INetFwPolicy2 : IDispatch +{ + [id(1), propget] + HRESULT CurrentProfileTypes( [out, retval] long *profile ); + + [id(2), propget] + HRESULT FirewallEnabled( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT_BOOL* enabled ); + + [id(2), propput] + HRESULT FirewallEnabled( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT_BOOL enabled ); + + [id(3), propget] + HRESULT ExcludedInterfaces( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT *interfaces ); + + [id(3), propput] + HRESULT ExcludedInterfaces( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT interfaces ); + + [id(4), propget] + HRESULT BlockAllInboundTraffic( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT_BOOL* block ); + + [id(4), propput] + HRESULT BlockAllInboundTraffic( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT_BOOL block ); + + [id(5), propget] + HRESULT NotificationsDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] VARIANT_BOOL* disabled ); + [id(5), propput] + HRESULT NotificationsDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, [in] VARIANT_BOOL disabled ); + + [id(6), propget] + HRESULT UnicastResponsesToMulticastBroadcastDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, + [out, retval] VARIANT_BOOL* disabled ); + [id(6), propput] + HRESULT UnicastResponsesToMulticastBroadcastDisabled( [in] NET_FW_PROFILE_TYPE2 profileType, + [in] VARIANT_BOOL disabled ); + + [id(7), propget] + HRESULT Rules( [out, retval] INetFwRules** rules ); + + [id(8), propget] + HRESULT ServiceRestriction( [out, retval] INetFwServiceRestriction **ServiceRestriction ); + + [id(9)] + HRESULT EnableRuleGroup( [in] long profileTypesBitmask, [in] BSTR group, [in] VARIANT_BOOL enable ); + + [id(10)] + HRESULT IsRuleGroupEnabled( [in] long profileTypesBitmask, [in] BSTR group, [out, retval] VARIANT_BOOL *enabled ); + + [id(11)] + HRESULT RestoreLocalFirewallDefaults(); + + [id(12), propget] + HRESULT DefaultInboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] NET_FW_ACTION* action ); + + [id(12), propput] + HRESULT DefaultInboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [in] NET_FW_ACTION action ); + + [id(13), propget] + HRESULT DefaultOutboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [out, retval] NET_FW_ACTION* action ); + + [id(13), propput] + HRESULT DefaultOutboundAction( [in] NET_FW_PROFILE_TYPE2 profileType, [in] NET_FW_ACTION action ); + + [id(14), propget] + HRESULT IsRuleGroupCurrentlyEnabled( [in] BSTR group, [out, retval] VARIANT_BOOL* enabled ); + + [id(15), propget] + HRESULT LocalPolicyModifyState( [out, retval] NET_FW_MODIFY_STATE* modifyState ); +} + +[ object, uuid(F7898AF5-CAC4-4632-A2EC-DA06E5111AF2), dual @@ -442,6 +660,7 @@ library NetFwPublicTypeLib interface INetFwAuthorizedApplications; interface INetFwProfile; interface INetFwPolicy; + interface INetFwPolicy2; interface INetFwMgr; [ @@ -467,4 +686,12 @@ library NetFwPublicTypeLib { [default] interface INetFwMgr; } + + [ + uuid(e2b3c97f-6ae1-41ac-817a-f6f92166d7dd) + ] + coclass NetFwPolicy2 + { + [default] interface INetFwPolicy2; + } }

1 0

Michael Stefaniuc : dmime: Use debugstr_guid() to trace a REFIID.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 07cee87e8f42b36d3494715fd75991cd83e32708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cee87e8f42b36d3494715fd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 26 10:43:03 2016 +0200 dmime: Use debugstr_guid() to trace a REFIID. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 8b5d3e2..d1befcf 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1198,7 +1198,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) { IDirectMusicPerformance8Impl *obj; - TRACE("(%p,%p)\n", lpcGUID, ppobj); + TRACE("(%s, %p)\n", debugstr_guid(lpcGUID), ppobj); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicPerformance8Impl)); if (NULL == obj) {

1 0

Alistair Leslie-Hughes : hnetcfg/tests: Add initial tests.
by Alexandre Julliard July 26, 2016

July 26, 2016

Module: wine Branch: master Commit: 7ffb4a912cd88ad848c716d1b1f5b51b8970071f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ffb4a912cd88ad848c716d1b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 22 07:47:27 2016 +0000 hnetcfg/tests: Add initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/hnetcfg/tests/Makefile.in | 5 +++ dlls/hnetcfg/tests/policy.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+) diff --git a/configure b/configure index a6442c7..928ff66 100755 --- a/configure +++ b/configure @@ -17734,6 +17734,7 @@ wine_fn_config_dll hidclass.sys enable_hidclass_sys implib hidclass wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test wine_fn_config_dll hnetcfg enable_hnetcfg clean +wine_fn_config_test dlls/hnetcfg/tests hnetcfg_test wine_fn_config_dll httpapi enable_httpapi wine_fn_config_dll iccvid enable_iccvid clean wine_fn_config_dll icmp enable_icmp diff --git a/configure.ac b/configure.ac index 0a42855..1cdba77 100644 --- a/configure.ac +++ b/configure.ac @@ -2968,6 +2968,7 @@ WINE_CONFIG_DLL(hidclass.sys,,[implib],[hidclass]) WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) WINE_CONFIG_DLL(hnetcfg,,[clean]) +WINE_CONFIG_TEST(dlls/hnetcfg/tests) WINE_CONFIG_DLL(httpapi) WINE_CONFIG_DLL(iccvid,,[clean]) WINE_CONFIG_DLL(icmp) diff --git a/dlls/hnetcfg/tests/Makefile.in b/dlls/hnetcfg/tests/Makefile.in new file mode 100644 index 0000000..aa4062a --- /dev/null +++ b/dlls/hnetcfg/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = hnetcfg.dll +IMPORTS = ole32 uuid + +C_SRCS = \ + policy.c diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c new file mode 100644 index 0000000..a3ed4b2 --- /dev/null +++ b/dlls/hnetcfg/tests/policy.c @@ -0,0 +1,90 @@ +/* + * Copyright 2016 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "oleauto.h" +#include "olectl.h" +#include "dispex.h" + +#include "wine/test.h" + +#include "netfw.h" + +static void test_interfaces(void) +{ + INetFwMgr *manager; + INetFwPolicy *policy; + INetFwPolicy2 *policy2; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwMgr, (void**)&manager); + ok(hr == S_OK, "NetFwMgr create failed: %08x\n", hr); + + hr = INetFwMgr_QueryInterface(manager, &IID_INetFwPolicy, (void**)&policy); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwMgr_QueryInterface(manager, &IID_INetFwPolicy2, (void**)&policy2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = INetFwMgr_get_LocalPolicy(manager, &policy); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = INetFwPolicy_QueryInterface(policy, &IID_INetFwPolicy2, (void**)&policy2); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + INetFwPolicy_Release(policy); + + hr = CoCreateInstance(&CLSID_NetFwPolicy2, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwPolicy2, (void**)&policy2); + if(hr == S_OK) + { + INetFwPolicy2_Release(policy2); + } + else + win_skip("NetFwPolicy2 object is not supported: %08x\n", hr); + + INetFwMgr_Release(manager); +} + +START_TEST(policy) +{ + INetFwMgr *manager; + HRESULT hr; + + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_INetFwMgr, (void**)&manager); + if(FAILED(hr)) + { + win_skip("NetFwMgr object is not supported: %08x\n", hr); + CoUninitialize(); + return; + } + + INetFwMgr_Release(manager); + + test_interfaces(); + + + CoUninitialize(); +}

1 0