March 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : libport: Get rid of memcpy_unaligned().
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 25e4cfbdb37d58743ece53e120cf258f1cd0ae46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e4cfbdb37d58743ece53e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 19:30:33 2019 +0100 libport: Get rid of memcpy_unaligned(). The code that uses it is no longer built on non-i386. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/ne_module.c | 2 +- dlls/krnl386.exe16/resource.c | 7 +++---- include/wine/port.h | 10 ---------- libs/port/Makefile.in | 1 - libs/port/memcpy_unaligned.c | 29 ----------------------------- 5 files changed, 4 insertions(+), 45 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 14f8075..d494585 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -333,7 +333,7 @@ static void NE_InitResourceHandler( HMODULE16 hModule ) pTypeInfo = (NE_TYPEINFO *)((char *)pModule + pModule->ne_rsrctab + 2); while(pTypeInfo->type_id) { - memcpy_unaligned( &pTypeInfo->resloader, &proc, sizeof(FARPROC16) ); + pTypeInfo->resloader = proc; pTypeInfo = (NE_TYPEINFO *)((char*)(pTypeInfo + 1) + pTypeInfo->count * sizeof(NE_NAMEINFO)); } } diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c index da54f6d..2f606fa 100644 --- a/dlls/krnl386.exe16/resource.c +++ b/dlls/krnl386.exe16/resource.c @@ -380,8 +380,8 @@ FARPROC16 WINAPI SetResourceHandler16( HMODULE16 hModule, LPCSTR typeId, FARPROC { if (!(pTypeInfo = NE_FindTypeSection( pResTab, pTypeInfo, typeId ))) break; - memcpy_unaligned( &prevHandler, &pTypeInfo->resloader, sizeof(FARPROC16) ); - memcpy_unaligned( &pTypeInfo->resloader, &resourceHandler, sizeof(FARPROC16) ); + prevHandler = pTypeInfo->resloader; + pTypeInfo->resloader = resourceHandler; pTypeInfo = next_typeinfo(pTypeInfo); } if (!prevHandler) prevHandler = get_default_res_handler(); @@ -1031,8 +1031,7 @@ HGLOBAL16 WINAPI LoadResource16( HMODULE16 hModule, HRSRC16 hRsrc ) } else { - FARPROC16 resloader; - memcpy_unaligned( &resloader, &pTypeInfo->resloader, sizeof(FARPROC16) ); + FARPROC16 resloader = pTypeInfo->resloader; if (resloader && resloader != get_default_res_handler()) { WORD args[3]; diff --git a/include/wine/port.h b/include/wine/port.h index fb7251e..600d78d 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -368,15 +368,6 @@ int symlink(const char *from, const char *to); int usleep (unsigned int useconds); #endif /* !defined(HAVE_USLEEP) */ -#ifdef __i386__ -static inline void *memcpy_unaligned( void *dst, const void *src, size_t size ) -{ - return memcpy( dst, src, size ); -} -#else -extern void *memcpy_unaligned( void *dst, const void *src, size_t size ); -#endif /* __i386__ */ - extern int mkstemps(char *template, int suffix_len); /* Process creation flags */ @@ -532,7 +523,6 @@ extern __int64 interlocked_cmpxchg64( __int64 *dest, __int64 xchg, __int64 compa #define interlocked_xchg_ptr __WINE_NOT_PORTABLE(interlocked_xchg_ptr) #define interlocked_xchg_add __WINE_NOT_PORTABLE(interlocked_xchg_add) #define lstat __WINE_NOT_PORTABLE(lstat) -#define memcpy_unaligned __WINE_NOT_PORTABLE(memcpy_unaligned) #undef memmove #define memmove __WINE_NOT_PORTABLE(memmove) #define pread __WINE_NOT_PORTABLE(pread) diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 8d16741..239f20f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -90,7 +90,6 @@ C_SRCS = \ isnan.c \ lstat.c \ mbtowc.c \ - memcpy_unaligned.c \ memmove.c \ mkstemps.c \ normalize.c \ diff --git a/libs/port/memcpy_unaligned.c b/libs/port/memcpy_unaligned.c deleted file mode 100644 index 35fbacb..0000000 --- a/libs/port/memcpy_unaligned.c +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Unaligned memcpy wrapper to defeat gcc optimizations. - * - * Copyright 1996 Alexandre Julliard - * - * 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 - */ - -#include "config.h" -#include "wine/port.h" - -#ifndef __i386__ -void *memcpy_unaligned( void *dst, const void *src, size_t size ) -{ - return memcpy( dst, src, size ); -} -#endif

1 0

Józef Kucia : wined3d: Add driver and device UUIDs to adapter identifiers.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 1f0be7befedf80819a6888437f608b6f5f1edce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0be7befedf80819a688843… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 12 16:30:18 2019 +0100 wined3d: Add driver and device UUIDs to adapter identifiers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/directx.c | 7 ++++++- dlls/wined3d/wined3d_gl.h | 3 ++- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.h | 8 +++++--- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 492d7f9..5bcb39f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -179,6 +179,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT }, {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE }, {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT }, + {"GL_EXT_memory_object", EXT_MEMORY_OBJECT }, {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS }, {"GL_EXT_gpu_shader4", EXT_GPU_SHADER4 }, {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, @@ -2499,6 +2500,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttribI4uivEXT) USE_GL_FUNC(glVertexAttribI4usvEXT) USE_GL_FUNC(glVertexAttribIPointerEXT) + /* GL_EXT_memory_object */ + USE_GL_FUNC(glGetUnsignedBytei_vEXT) + USE_GL_FUNC(glGetUnsignedBytevEXT) /* GL_EXT_point_parameters */ USE_GL_FUNC(glPointParameterfEXT) USE_GL_FUNC(glPointParameterfvEXT) @@ -3871,6 +3875,28 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); + if (gl_info->supported[EXT_MEMORY_OBJECT]) + { + GLint device_count = 0; + + gl_info->gl_ops.gl.p_glGetIntegerv(GL_NUM_DEVICE_UUIDS_EXT, &device_count); + if (device_count > 0) + { + if (device_count > 1) + FIXME("A set of %d devices is not supported.\n", device_count); + + GL_EXTCALL(glGetUnsignedBytevEXT(GL_DRIVER_UUID_EXT, (GLubyte *)&adapter->driver_uuid)); + GL_EXTCALL(glGetUnsignedBytei_vEXT(GL_DEVICE_UUID_EXT, 0, (GLubyte *)&adapter->device_uuid)); + + TRACE("Driver UUID: %s, device UUID %s.\n", + debugstr_guid(&adapter->driver_uuid), debugstr_guid(&adapter->device_uuid)); + } + else + { + WARN("Unexpected device count %d.\n", device_count); + } + } + gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a05f6cc..d51e672 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1211,7 +1211,9 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->device_id = adapter->driver_info.device; identifier->subsystem_id = 0; identifier->revision = 0; - memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); + identifier->device_identifier = IID_D3DDEVICE_D3DUID; + identifier->driver_uuid = adapter->driver_uuid; + identifier->device_uuid = adapter->device_uuid; identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); @@ -2548,6 +2550,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); + memset(&adapter->driver_uuid, 0, sizeof(adapter->driver_uuid)); + memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); + adapter->formats = NULL; if (wined3d_creation_flags & WINED3D_NO3D) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a02073c..ae067e6 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -157,14 +157,15 @@ enum wined3d_gl_extension EXT_BLEND_FUNC_SEPARATE, EXT_BLEND_MINMAX, EXT_BLEND_SUBTRACT, - EXT_DRAW_BUFFERS2, EXT_DEPTH_BOUNDS_TEST, + EXT_DRAW_BUFFERS2, EXT_FOG_COORD, EXT_FRAMEBUFFER_BLIT, EXT_FRAMEBUFFER_MULTISAMPLE, EXT_FRAMEBUFFER_OBJECT, EXT_GPU_PROGRAM_PARAMETERS, EXT_GPU_SHADER4, + EXT_MEMORY_OBJECT, EXT_PACKED_DEPTH_STENCIL, EXT_PACKED_FLOAT, EXT_POINT_PARAMETERS, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6907c7b..d0edb8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2686,7 +2686,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, /* The adapter structure */ struct wined3d_adapter { - UINT ordinal; + unsigned int ordinal; POINT monitor_position; enum wined3d_format_id screen_format; @@ -2694,6 +2694,8 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; UINT64 vram_bytes_used; + GUID driver_uuid; + GUID device_uuid; LUID luid; WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0732902..2f8ed5e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1719,17 +1719,19 @@ struct wined3d_tri_patch_info struct wined3d_adapter_identifier { char *driver; - UINT driver_size; + unsigned int driver_size; char *description; - UINT description_size; + unsigned int description_size; char *device_name; - UINT device_name_size; + unsigned int device_name_size; LARGE_INTEGER driver_version; DWORD vendor_id; DWORD device_id; DWORD subsystem_id; DWORD revision; GUID device_identifier; + GUID driver_uuid; + GUID device_uuid; DWORD whql_level; LUID adapter_luid; SIZE_T video_memory;

1 0

Zebediah Figura : quartz/tests: Add some tests for IBaseFilter_FindPin() on the DirectSound renderer.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 18fe24ae08ae3786530ac4bc7a5058e4b63a1f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18fe24ae08ae3786530ac4bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:58 2019 -0500 quartz/tests: Add some tests for IBaseFilter_FindPin() on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index aa24d33..37b9dfa 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -26,6 +26,8 @@ #include "amaudio.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'A','u','d','i','o',' ','I','n','p','u','t',' ','p','i','n',' ','(','r','e','n','d','e','r','e','d',')',0}; + static IBaseFilter *create_dsound_render(void) { IBaseFilter *filter = NULL; @@ -243,6 +245,39 @@ todo_wine ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR inW[] = {'I','n',0}; + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + IBaseFilter *filter = create_dsound_render(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_FindPin(filter, inW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin == pin2, "Expected pin %p, got %p.\n", pin2, pin); + IPin_Release(pin); + IPin_Release(pin2); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -320,6 +355,7 @@ START_TEST(dsoundrender) test_property_bag(); test_interfaces(); test_enum_pins(); + test_find_pin(); test_basefilter(); CoUninitialize();

1 0

Alexandre Julliard : Avoid using Windows includes that are already handled in wine/port.h.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 2ae84d52408e06ef53816226a1eae7091a58dc00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae84d52408e06ef53816226… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 20:19:00 2019 +0100 Avoid using Windows includes that are already handled in wine/port.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 3 --- dlls/ntdll/cdrom.c | 3 --- dlls/ntdll/om.c | 3 --- dlls/ntdll/serial.c | 3 --- libs/port/pread.c | 4 ---- libs/port/pwrite.c | 3 --- libs/wpp/preproc.c | 3 --- programs/winecfg/theme.c | 3 --- 8 files changed, 25 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index 2e1ace8..3e49af2 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -31,9 +31,6 @@ #include <string.h> #include <ctype.h> #include <errno.h> -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_SYS_WAIT_H # include <sys/wait.h> #endif diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 066181b..4a3b84d 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -28,9 +28,6 @@ #include <string.h> #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 0b56251..0d66867 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -24,9 +24,6 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 830137c..66081d2 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -30,9 +30,6 @@ #ifdef HAVE_TERMIOS_H #include <termios.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/libs/port/pread.c b/libs/port/pread.c index 34b6304..cced416 100644 --- a/libs/port/pread.c +++ b/libs/port/pread.c @@ -26,10 +26,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif - /* FIXME: this is not thread-safe */ diff --git a/libs/port/pwrite.c b/libs/port/pwrite.c index 1829a22..37e5dab 100644 --- a/libs/port/pwrite.c +++ b/libs/port/pwrite.c @@ -26,9 +26,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif /* FIXME: this is not thread-safe */ diff --git a/libs/wpp/preproc.c b/libs/wpp/preproc.c index 21830d6..1bd10cd 100644 --- a/libs/wpp/preproc.c +++ b/libs/wpp/preproc.c @@ -29,9 +29,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_IO_H -# include <io.h> -#endif #include "wine/wpp.h" #include "wpp_private.h" diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 78d89a5..66d2344 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -34,9 +34,6 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef HAVE_DIRECT_H -#include <direct.h> -#endif #define COBJMACROS

1 0

Zebediah Figura : quartz/tests: Add some tests for DirectSound renderer pin interfaces.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 6f81d51e38b76cbb9455e90d038440316f54042e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f81d51e38b76cbb9455e90d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:33:00 2019 -0500 quartz/tests: Add some tests for DirectSound renderer pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 28166e5..0d48bec 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -129,6 +129,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO static void test_interfaces(void) { IBaseFilter *filter = create_dsound_render(); + IPin *pin; check_interface(filter, &IID_IAMDirectSound, TRUE); check_interface(filter, &IID_IBaseFilter, TRUE); @@ -150,6 +151,18 @@ static void test_interfaces(void) check_interface(filter, &IID_IQualProp, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IPin, TRUE); + check_interface(pin, &IID_IMemInputPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); IBaseFilter_Release(filter); }

1 0

Zebediah Figura : quartz/tests: Add some tests for querying DirectSound renderer pin information.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: e657ea662fb9371365b42b339799a9c6ff936aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e657ea662fb9371365b42b33… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:59 2019 -0500 quartz/tests: Add some tests for querying DirectSound renderer pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 37b9dfa..28166e5 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -278,6 +278,51 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_dsound_render(); + PIN_DIRECTION dir; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + todo_wine ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -356,6 +401,7 @@ START_TEST(dsoundrender) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_basefilter(); CoUninitialize();

1 0

Nikolay Sivov : mfreadwrite: Use source resolver when creating reader from bytestream.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 95ab51105b3eae4076ea304c33b87ce38566766e URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ab51105b3eae4076ea304c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 12 09:07:45 2019 +0300 mfreadwrite: Use source resolver when creating reader from bytestream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 2 +- dlls/mfreadwrite/main.c | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index afefdb5..edc7ebd 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite -IMPORTS = mfuuid uuid +IMPORTS = mfuuid uuid mfplat C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 098100df..bcf79a8 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -254,9 +254,23 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, REFIID riid, void **out) { - /* FIXME: resolve bytestream to media source */ + IMFSourceResolver *resolver; + MF_OBJECT_TYPE obj_type; + IMFMediaSource *source; + HRESULT hr; + + if (FAILED(hr = MFCreateSourceResolver(&resolver))) + return hr; - return create_source_reader_from_source(NULL, attributes, riid, out); + hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, + &obj_type, (IUnknown **)&source); + IMFSourceResolver_Release(resolver); + if (FAILED(hr)) + return hr; + + hr = create_source_reader_from_source(source, attributes, riid, out); + IMFMediaSource_Release(source); + return hr; } static HRESULT WINAPI sink_writer_QueryInterface(IMFSinkWriter *iface, REFIID riid, void **out)

1 0

Józef Kucia : dxgi: Introduce IWineDXGIAdapter:: get_adapter_info().
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 642ef33df02eb674f94f167a3a4fe32e809b636f URL: https://source.winehq.org/git/wine.git/?a=commit;h=642ef33df02eb674f94f167a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 12 16:30:19 2019 +0100 dxgi: Introduce IWineDXGIAdapter::get_adapter_info(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 24 ++++++++++++++++++++++++ include/wine/winedxgi.idl | 12 ++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 31baae6..d96cb1e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -364,6 +364,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, return dxgi_adapter_get_desc(adapter, desc); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_get_adapter_info(IWineDXGIAdapter *iface, + struct wine_dxgi_adapter_info *info) +{ + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr; + + TRACE("iface %p, info %p.\n", iface, info); + + memset(&adapter_id, 0, sizeof(adapter_id)); + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) + { + info->driver_uuid = adapter_id.driver_uuid; + info->device_uuid = adapter_id.device_uuid; + info->vendor_id = adapter_id.vendor_id; + info->device_id = adapter_id.device_id; + info->luid = adapter_id.adapter_luid; + } + + return hr; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -390,6 +412,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, /* IDXGIAdapter4 methods */ dxgi_adapter_GetDesc3, + /* IWineDXGIAdapter methods */ + dxgi_adapter_get_adapter_info, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index f300eb9..8444090 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -68,6 +68,17 @@ interface IWineDXGIDeviceParent : IUnknown struct wined3d_device_parent *get_wined3d_device_parent(); } +struct wine_dxgi_adapter_info +{ + GUID driver_uuid; + GUID device_uuid; + + DWORD vendor_id; + DWORD device_id; + + LUID luid; +}; + [ object, local, @@ -75,6 +86,7 @@ interface IWineDXGIDeviceParent : IUnknown ] interface IWineDXGIAdapter : IDXGIAdapter4 { + HRESULT get_adapter_info([out] struct wine_dxgi_adapter_info *info); } [

1 0

Alexandre Julliard : libport: Simplify configuration checks in getopt.c.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 96b815fcca044ffd30808d21890023f4bb0b92fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b815fcca044ffd30808d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 12 19:33:49 2019 +0100 libport: Simplify configuration checks in getopt.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 - libs/port/getopt.c | 148 ++++++-------------------------------- libs/port/getopt.h | 129 --------------------------------- libs/port/getopt1.c | 192 -------------------------------------------------- 4 files changed, 21 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96b815fcca044ffd3080…

1 0

Zebediah Figura : strmbase: Correct pin IDs for renderers.
by Alexandre Julliard March 12, 2019

March 12, 2019

Module: wine Branch: master Commit: 4f16a137dab794f1a51dde6c2460b78fda79cc55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f16a137dab794f1a51dde6c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 12 00:32:57 2019 -0500 strmbase: Correct pin IDs for renderers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 2 +- dlls/quartz/dsoundrender.c | 9 +++++++-- dlls/quartz/nullrenderer.c | 10 ++++++---- dlls/quartz/videorenderer.c | 9 +++++---- dlls/quartz/vmr9.c | 14 +++++++++----- dlls/strmbase/renderer.c | 29 ++++------------------------- include/wine/strmbase.h | 5 +++-- 7 files changed, 35 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f16a137dab794f1a51d…

1 0