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

[PATCH 1/2] hid/tests: Do not access uninitialized memory
by Detlef Riekenberg March 25, 2019

March 25, 2019

Most api-calls in test_device_info access uninitialized memory, when called with INVALID_HANDLE_VALUE this results in broken device names and crashes Example failures: http://test.winehq.org/data/6325d85406fbf7f46770bc739da4b7e2c9b199d7/win8_d… Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=49763 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/hid/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index f20677fb1b..ff17229785 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -82,7 +82,8 @@ static void run_for_each_device(device_test *test) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u.\n", wine_dbgstr_w(data->DevicePath), GetLastError()); - test(file); + if (file != INVALID_HANDLE_VALUE) + test(file); CloseHandle(file); } -- 2.21.0.windows.1

2 3

[PATCH] include/commctrl: Add style definitions for split buttons
by Gabriel Ivăncescu March 25, 2019

March 25, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Wanted to get this out of the way before the split button implementation. I still have a few corner cases left to do and proper wine tests. include/commctrl.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 9b86bdb..f1af7de 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1096,6 +1096,15 @@ typedef struct tagNMBCHOTITEM #define BS_COMMANDLINK 0x0000000E #define BS_DEFCOMMANDLINK 0x0000000F +#define BCSIF_GLYPH 0x00000001 +#define BCSIF_IMAGE 0x00000002 +#define BCSIF_STYLE 0x00000004 +#define BCSIF_SIZE 0x00000008 +#define BCSS_NOSPLIT 0x00000001 +#define BCSS_STRETCH 0x00000002 +#define BCSS_ALIGNLEFT 0x00000004 +#define BCSS_IMAGE 0x00000008 + /* Button macros */ #define Button_SetNote(button, note) \ (BOOL)SNDMSG(button, BCM_SETNOTE, 0, (LPARAM)(note)) -- 2.20.1

1 0

[PATCH 7/8] ntoskrnl.exe: Support waiting on kernel objects.
by Jacek Caban March 25, 2019

March 25, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl_private.h | 3 ++- dlls/ntoskrnl.exe/sync.c | 11 ++++++----- dlls/ntoskrnl.exe/tests/driver.c | 3 +-- server/device.c | 19 +++++++++++++++++++ server/protocol.def | 10 ++++++++++ 6 files changed, 52 insertions(+), 8 deletions(-)

3 2

[PATCH 1/2] wbemprox: Implement Win32_PhysicalMemory.DeviceLocator.
by Hans Leidekker March 25, 2019

March 25, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46894 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 18 ++++++++++++------ dlls/wbemprox/tests/query.c | 10 ++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index b206a2a658..fc04f3f85f 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -204,6 +204,8 @@ static const WCHAR prop_destinationW[] = {'D','e','s','t','i','n','a','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = {'D','e','v','i','c','e','I','d',0}; +static const WCHAR prop_devicelocatorW[] = + {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; static const WCHAR prop_dhcpenabledW[] = {'D','H','C','P','E','n','a','b','l','e','d',0}; static const WCHAR prop_directionW[] = @@ -617,8 +619,9 @@ static const struct column col_physicalmedia[] = }; static const struct column col_physicalmemory[] = { - { prop_capacityW, CIM_UINT64 }, - { prop_memorytypeW, CIM_UINT16, VT_I4 } + { prop_capacityW, CIM_UINT64 }, + { prop_devicelocatorW, CIM_STRING }, + { prop_memorytypeW, CIM_UINT16, VT_I4 } }; static const struct column col_pnpentity[] = { @@ -1043,8 +1046,9 @@ struct record_physicalmedia }; struct record_physicalmemory { - UINT64 capacity; - UINT16 memorytype; + UINT64 capacity; + const WCHAR *devicelocator; + UINT16 memorytype; }; struct record_pnpentity { @@ -2639,6 +2643,7 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st static enum fill_status fill_physicalmemory( struct table *table, const struct expr *cond ) { + static const WCHAR dimm0W[] = {'D','I','M','M',' ','0',0}; struct record_physicalmemory *rec; enum fill_status status = FILL_STATUS_UNFILTERED; UINT row = 0; @@ -2646,8 +2651,9 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_physicalmemory *)table->data; - rec->capacity = get_total_physical_memory(); - rec->memorytype = 9; /* RAM */ + rec->capacity = get_total_physical_memory(); + rec->devicelocator = heap_strdupW( dimm0W ); + rec->memorytype = 9; /* RAM */ if (!match_row( table, row, cond, &status )) free_row_values( table, row ); else row++; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e8ddbccbe6..b622ac278c 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1489,6 +1489,7 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) { static const WCHAR capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR memorytypeW[] = {'M','e','m','o','r','y','T','y','p','e',0}; + static const WCHAR devicelocatorW[] = {'D','e','v','i','c','e','L','o','c','a','t','o','r',0}; static const WCHAR queryW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; @@ -1523,6 +1524,15 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, devicelocatorW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get devicelocator %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "devicelocator %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get memory type %08x\n", hr ); ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); -- 2.11.0

2 1

[PATCH 2/2] wbemprox: Implement Win32_OperatingSystem.OperatingSystemSKU.
by Hans Leidekker March 25, 2019

March 25, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46895 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 11 +++++++++++ dlls/wbemprox/tests/query.c | 13 +++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fc04f3f85f..d4c263078e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -314,6 +314,8 @@ static const WCHAR prop_numlogicalprocessorsW[] = {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR prop_numprocessorsW[] = {'N','u','m','b','e','r','O','f','P','r','o','c','e','s','s','o','r','s',0}; +static const WCHAR prop_operatingsystemskuW[] = + {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = @@ -588,6 +590,7 @@ static const struct column col_os[] = { prop_localdatetimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, { prop_localeW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_operatingsystemskuW, CIM_UINT32, VT_I4 }, { prop_osarchitectureW, CIM_STRING }, { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, @@ -1015,6 +1018,7 @@ struct record_operatingsystem const WCHAR *localdatetime; const WCHAR *locale; const WCHAR *name; + UINT32 operatingsystemsku; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -3197,6 +3201,12 @@ static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) if (ret) sprintfW( ret, fmtW, ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); return ret; } +static DWORD get_operatingsystemsku(void) +{ + DWORD ret = PRODUCT_UNDEFINED; + GetProductInfo( 6, 0, 0, 0, &ret ); + return ret; +} static enum fill_status fill_os( struct table *table, const struct expr *cond ) { @@ -3222,6 +3232,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->localdatetime = get_localdatetime(); rec->locale = get_locale(); rec->name = get_osname( rec->caption ); + rec->operatingsystemsku = get_operatingsystemsku(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index b622ac278c..510e7aad70 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1234,6 +1234,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) static const WCHAR csdversionW[] = {'C','S','D','V','e','r','s','i','o','n',0}; static const WCHAR freephysicalmemoryW[] = {'F','r','e','e','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR operatingsystemskuW[] = {'O','p','e','r','a','t','i','n','g','S','y','s','t','e','m','S','K','U',0}; static const WCHAR osproductsuiteW[] = {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; static const WCHAR ostypeW[] = {'O','S','T','y','p','e',0}; static const WCHAR suitemaskW[] = {'S','u','i','t','e','M','a','s','k',0}; @@ -1315,6 +1316,18 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) type = 0xdeadbeef; VariantInit( &val ); + hr = IWbemClassObject_Get( obj, operatingsystemskuW, 0, &val, &type, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND) /* winxp */, "failed to get operatingsystemsku %08x\n", hr ); + if (hr == S_OK) + { + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT32, "unexpected type 0x%x\n", type ); + trace( "operatingsystemsku: %08x\n", V_I4( &val ) ); + VariantClear( &val ); + } + + type = 0xdeadbeef; + VariantInit( &val ); hr = IWbemClassObject_Get( obj, osproductsuiteW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get osproductsuite %08x\n", hr ); ok( V_VT( &val ) == VT_I4 || broken(V_VT( &val ) == VT_NULL) /* winxp */, "unexpected variant type 0x%x\n", V_VT( &val ) ); -- 2.11.0

1 0

[PATCH] msi: Don't fail the BindImage action if the BindImage table is absent.
by Zebediah Figura March 25, 2019

March 25, 2019

This fixes a regression introduced with 15f852015a0332313821804cc1fbad79216408c6 and observable with several installers, including dotnet472. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/action.c | 4 ++-- dlls/msi/tests/install.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b51a21d457..e2f91c3774 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7809,10 +7809,10 @@ static UINT ACTION_BindImage( MSIPACKAGE *package ) r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r == ERROR_SUCCESS) { - r = MSI_IterateRecords( view, NULL, ITERATE_BindImage, package ); + MSI_IterateRecords( view, NULL, ITERATE_BindImage, package ); msiobj_release( &view->hdr ); } - return r; + return ERROR_SUCCESS; } static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3c040e350c..e348f32701 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -135,6 +135,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "ResolveSource\t\t950\n" "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" + "BindImage\t\t4100\n" "DuplicateFiles\t\t4500\n" "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n" -- 2.17.1

3 2

[PATCH] msi: Append the custom action client PID to the endpoint name.
by Zebediah Figura March 25, 2019

March 25, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46833 --- dlls/msi/custom.c | 14 ++++++++++---- dlls/msi/msi.spec | 2 +- programs/msiexec/msiexec.c | 9 +++++---- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8bf0902914..facb1d81e1 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -477,7 +477,7 @@ static void handle_msi_break(LPCSTR target) } static WCHAR ncalrpcW[] = {'n','c','a','l','r','p','c',0}; -static WCHAR endpoint_lrpcW[] = {'m','s','i',0}; +static WCHAR endpoint_fmtW[] = {'m','s','i','%','x',0}; #ifdef __i386__ /* wrapper for apps that don't declare the thread function correctly */ @@ -502,7 +502,7 @@ static UINT custom_proc_wrapper( MsiCustomActionEntryPoint entry, MSIHANDLE hins } #endif -UINT CDECL __wine_msi_call_dll_function(const GUID *guid) +UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) { MsiCustomActionEntryPoint fn; MSIHANDLE remote_package = 0; @@ -519,7 +519,10 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) if (!rpc_handle) { - status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); + WCHAR endpoint[12]; + + sprintfW(endpoint, endpoint_fmtW, client_pid); + status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint, NULL, &binding_str); if (status != RPC_S_OK) { ERR("RpcStringBindingCompose failed: %#x\n", status); @@ -740,8 +743,11 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( if (!package->rpc_server_started) { + WCHAR endpoint[12]; + + sprintfW(endpoint, endpoint_fmtW, GetCurrentProcessId()); status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - endpoint_lrpcW, NULL); + endpoint, NULL); if (status != RPC_S_OK) { ERR("RpcServerUseProtseqEp failed: %#x\n", status); diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index aecba1b1b3..eeb9ea757c 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -295,4 +295,4 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ cdecl __wine_msi_call_dll_function(ptr) +@ cdecl __wine_msi_call_dll_function(long ptr) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index efbcb5c7f4..3340ade776 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -397,19 +397,20 @@ static DWORD DoUnregServer(void) return ret; } -extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); +extern UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid); + +static DWORD client_pid; static DWORD CALLBACK custom_action_thread(void *arg) { GUID guid = *(GUID *)arg; heap_free(arg); - return __wine_msi_call_dll_function(&guid); + return __wine_msi_call_dll_function(client_pid, &guid); } static int custom_action_server(const WCHAR *arg) { static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; - DWORD client_pid = atoiW(arg); GUID guid, *thread_guid; DWORD64 thread64; WCHAR buffer[24]; @@ -419,7 +420,7 @@ static int custom_action_server(const WCHAR *arg) TRACE("%s\n", debugstr_w(arg)); - if (!client_pid) + if (!(client_pid = atoiW(arg))) { ERR("Invalid parameter %s\n", debugstr_w(arg)); return 1; -- 2.17.1

3 2

Winedevice address space discussion / request for feedback
by Derek Lesho March 25, 2019

March 25, 2019

Hello, I have been doing some work with anti-cheat drivers recently, and I've run into a problem with winedevice's design. Right now, since winedevice is just a normal user-space process, drivers can only access the address space of this process, and not that of the client process. This also means that drivers which rely on certain addresses being above the system address space start or below the user address space end, such as EasyAntiCheat.sys, may not work as intended. I have a few ideas on how to solve this issue, and I'm curious whether you guys have any opinions on them or other solutions I haven't thought of. 1) Set the highest bit in certain pointers to satisfy the driver at hand, this may help EAC get farther, but it's hard to tell since a lot of the code is obfuscated well with virtualization. 2) Capitalize on the fact that on windows 7, the user-space addresses only go up to 2^43, not 2^48 like on Linux. We could reserve the top 5 bits for winedevice processes, and set up a vectored exception in instr.c to handle reads/writes to the client process's address space by a driver. 3) Run winedevice.exe in a VM environment to allow usage of the higher bits. This is the solution I've thought about the least, but I just wanted to mention it.

2 1

[PATCH 1/5] mfplat: Create dummy descriptor using public API.
by Nikolay Sivov March 25, 2019

March 25, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 357 ++------------------------------------------- 1 file changed, 13 insertions(+), 344 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index bac5905cff..d5a408b5b8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2855,341 +2855,6 @@ HRESULT WINAPI MFGetPluginControl(IMFPluginControl **ret) return S_OK; } -typedef struct _mfpresentationdescriptor -{ - struct attributes attributes; - IMFPresentationDescriptor IMFPresentationDescriptor_iface; -} mfpresentationdescriptor; - -static inline mfpresentationdescriptor *impl_from_IMFPresentationDescriptor(IMFPresentationDescriptor *iface) -{ - return CONTAINING_RECORD(iface, mfpresentationdescriptor, IMFPresentationDescriptor_iface); -} - -static HRESULT WINAPI mfpresentationdescriptor_QueryInterface(IMFPresentationDescriptor *iface, REFIID riid, void **out) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); - - if(IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IMFAttributes) || - IsEqualGUID(riid, &IID_IMFPresentationDescriptor)) - { - *out = &This->IMFPresentationDescriptor_iface; - } - else - { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); - *out = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*out); - return S_OK; -} - -static ULONG WINAPI mfpresentationdescriptor_AddRef(IMFPresentationDescriptor *iface) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - ULONG ref = InterlockedIncrement(&This->attributes.ref); - - TRACE("(%p) ref=%u\n", This, ref); - - return ref; -} - -static ULONG WINAPI mfpresentationdescriptor_Release(IMFPresentationDescriptor *iface) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - ULONG ref = InterlockedDecrement(&This->attributes.ref); - - TRACE("(%p) ref=%u\n", This, ref); - - if (!ref) - { - clear_attributes_object(&This->attributes); - HeapFree(GetProcessHeap(), 0, This); - } - - return ref; -} - -static HRESULT WINAPI mfpresentationdescriptor_GetItem(IMFPresentationDescriptor *iface, REFGUID key, PROPVARIANT *value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetItemType(IMFPresentationDescriptor *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); -} - -static HRESULT WINAPI mfpresentationdescriptor_CompareItem(IMFPresentationDescriptor *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); -} - -static HRESULT WINAPI mfpresentationdescriptor_Compare(IMFPresentationDescriptor *iface, IMFAttributes *attrs, MF_ATTRIBUTES_MATCH_TYPE type, - BOOL *result) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, attrs, type, result); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetUINT32(IMFPresentationDescriptor *iface, REFGUID key, UINT32 *value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetUINT64(IMFPresentationDescriptor *iface, REFGUID key, UINT64 *value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetDouble(IMFPresentationDescriptor *iface, REFGUID key, double *value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetGUID(IMFPresentationDescriptor *iface, REFGUID key, GUID *value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetStringLength(IMFPresentationDescriptor *iface, REFGUID key, UINT32 *length) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetString(IMFPresentationDescriptor *iface, REFGUID key, WCHAR *value, - UINT32 size, UINT32 *length) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetAllocatedString(IMFPresentationDescriptor *iface, REFGUID key, - WCHAR **value, UINT32 *length) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetBlobSize(IMFPresentationDescriptor *iface, REFGUID key, UINT32 *size) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetBlob(IMFPresentationDescriptor *iface, REFGUID key, UINT8 *buf, - UINT32 bufsize, UINT32 *blobsize) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetAllocatedBlob(IMFPresentationDescriptor *iface, REFGUID key, UINT8 **buf, UINT32 *size) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetUnknown(IMFPresentationDescriptor *iface, REFGUID key, REFIID riid, void **ppv) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetItem(IMFPresentationDescriptor *iface, REFGUID key, REFPROPVARIANT value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_DeleteItem(IMFPresentationDescriptor *iface, REFGUID key) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); -} - -static HRESULT WINAPI mfpresentationdescriptor_DeleteAllItems(IMFPresentationDescriptor *iface) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetUINT32(IMFPresentationDescriptor *iface, REFGUID key, UINT32 value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetUINT64(IMFPresentationDescriptor *iface, REFGUID key, UINT64 value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetDouble(IMFPresentationDescriptor *iface, REFGUID key, double value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetGUID(IMFPresentationDescriptor *iface, REFGUID key, REFGUID value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetString(IMFPresentationDescriptor *iface, REFGUID key, const WCHAR *value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetBlob(IMFPresentationDescriptor *iface, REFGUID key, const UINT8 *buf, UINT32 size) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); -} - -static HRESULT WINAPI mfpresentationdescriptor_SetUnknown(IMFPresentationDescriptor *iface, REFGUID key, IUnknown *unknown) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); -} - -static HRESULT WINAPI mfpresentationdescriptor_LockStore(IMFPresentationDescriptor *iface) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); -} - -static HRESULT WINAPI mfpresentationdescriptor_UnlockStore(IMFPresentationDescriptor *iface) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetCount(IMFPresentationDescriptor *iface, UINT32 *items) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); -} - -static HRESULT WINAPI mfpresentationdescriptor_GetItemByIndex(IMFPresentationDescriptor *iface, UINT32 index, GUID *key, PROPVARIANT *value) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); -} - -static HRESULT WINAPI mfpresentationdescriptor_CopyAllItems(IMFPresentationDescriptor *iface, IMFAttributes *dest) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - - FIXME("%p, %p\n", This, dest); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfpresentationdescriptor_GetStreamDescriptorCount(IMFPresentationDescriptor *iface, DWORD *descriptor_count) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - - FIXME("%p, %p\n", This, descriptor_count); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfpresentationdescriptor_GetStreamDescriptorByIndex(IMFPresentationDescriptor *iface, DWORD index, - BOOL *selected, IMFStreamDescriptor **descriptor) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - - FIXME("%p, %#x, %p, %p\n", This, index, selected, descriptor); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfpresentationdescriptor_SelectStream(IMFPresentationDescriptor *iface, DWORD index) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - - FIXME("%p, %#x\n", This, index); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfpresentationdescriptor_DeselectStream(IMFPresentationDescriptor *iface, DWORD index) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - - FIXME("%p, %#x\n", This, index); - - return E_NOTIMPL; -} - -static HRESULT WINAPI mfpresentationdescriptor_Clone(IMFPresentationDescriptor *iface, IMFPresentationDescriptor **descriptor) -{ - mfpresentationdescriptor *This = impl_from_IMFPresentationDescriptor(iface); - - FIXME("%p, %p\n", This, descriptor); - - return E_NOTIMPL; -} - -static const IMFPresentationDescriptorVtbl mfpresentationdescriptor_vtbl = -{ - mfpresentationdescriptor_QueryInterface, - mfpresentationdescriptor_AddRef, - mfpresentationdescriptor_Release, - mfpresentationdescriptor_GetItem, - mfpresentationdescriptor_GetItemType, - mfpresentationdescriptor_CompareItem, - mfpresentationdescriptor_Compare, - mfpresentationdescriptor_GetUINT32, - mfpresentationdescriptor_GetUINT64, - mfpresentationdescriptor_GetDouble, - mfpresentationdescriptor_GetGUID, - mfpresentationdescriptor_GetStringLength, - mfpresentationdescriptor_GetString, - mfpresentationdescriptor_GetAllocatedString, - mfpresentationdescriptor_GetBlobSize, - mfpresentationdescriptor_GetBlob, - mfpresentationdescriptor_GetAllocatedBlob, - mfpresentationdescriptor_GetUnknown, - mfpresentationdescriptor_SetItem, - mfpresentationdescriptor_DeleteItem, - mfpresentationdescriptor_DeleteAllItems, - mfpresentationdescriptor_SetUINT32, - mfpresentationdescriptor_SetUINT64, - mfpresentationdescriptor_SetDouble, - mfpresentationdescriptor_SetGUID, - mfpresentationdescriptor_SetString, - mfpresentationdescriptor_SetBlob, - mfpresentationdescriptor_SetUnknown, - mfpresentationdescriptor_LockStore, - mfpresentationdescriptor_UnlockStore, - mfpresentationdescriptor_GetCount, - mfpresentationdescriptor_GetItemByIndex, - mfpresentationdescriptor_CopyAllItems, - mfpresentationdescriptor_GetStreamDescriptorCount, - mfpresentationdescriptor_GetStreamDescriptorByIndex, - mfpresentationdescriptor_SelectStream, - mfpresentationdescriptor_DeselectStream, - mfpresentationdescriptor_Clone, -}; - typedef struct _mfsource { IMFMediaSource IMFMediaSource_iface; @@ -3298,20 +2963,24 @@ static HRESULT WINAPI mfsource_GetCharacteristics(IMFMediaSource *iface, DWORD * static HRESULT WINAPI mfsource_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) { mfsource *This = impl_from_IMFMediaSource(iface); - - mfpresentationdescriptor *object; + IMFStreamDescriptor *sd; + IMFMediaType *mediatype; + HRESULT hr; FIXME("(%p)->(%p): stub\n", This, descriptor); - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); - if (!object) - return E_OUTOFMEMORY; + if (FAILED(hr = MFCreateMediaType(&mediatype))) + return hr; + + hr = MFCreateStreamDescriptor(0, 1, &mediatype, &sd); + IMFMediaType_Release(mediatype); + if (FAILED(hr)) + return hr; - init_attributes_object(&object->attributes, 0); - object->IMFPresentationDescriptor_iface.lpVtbl = &mfpresentationdescriptor_vtbl; + hr = MFCreatePresentationDescriptor(1, &sd, descriptor); + IMFStreamDescriptor_Release(sd); - *descriptor = &object->IMFPresentationDescriptor_iface; - return S_OK; + return hr; } static HRESULT WINAPI mfsource_Start(IMFMediaSource *iface, IMFPresentationDescriptor *descriptor, -- 2.20.1

2 5

[PATCH 1/2] mfreadwrite: Use single helper for source reader creation functions.
by Nikolay Sivov March 25, 2019

March 25, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 65 +++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 516b5928b1..3936b5b598 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -838,6 +838,35 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes return create_sink_writer_from_sink(sink, attributes, &IID_IMFSinkWriter, (void **)writer); } +static HRESULT create_source_reader_from_object(IUnknown *unk, IMFAttributes *attributes, REFIID riid, void **out) +{ + IMFMediaSource *source = NULL; + IMFByteStream *stream = NULL; + HRESULT hr; + + hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); + if (FAILED(hr)) + hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); + + if (source) + { + UINT32 disconnect = 0; + + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); + hr = create_source_reader_from_source(source, attributes, !disconnect, riid, out); + } + else if (stream) + hr = create_source_reader_from_stream(stream, attributes, riid, out); + + if (source) + IMFMediaSource_Release(source); + if (stream) + IMFByteStream_Release(stream); + + return hr; +} + /*********************************************************************** * MFCreateSourceReaderFromByteStream (mfreadwrite.@) */ @@ -846,23 +875,18 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr { TRACE("%p, %p, %p.\n", stream, attributes, reader); - return create_source_reader_from_stream(stream, attributes, &IID_IMFSourceReader, (void **)reader); + return create_source_reader_from_object((IUnknown *)stream, attributes, &IID_IMFSourceReader, (void **)reader); } /*********************************************************************** * MFCreateSourceReaderFromMediaSource (mfreadwrite.@) */ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAttributes *attributes, - IMFSourceReader **reader) + IMFSourceReader **reader) { - UINT32 disconnect = 0; - TRACE("%p, %p, %p.\n", source, attributes, reader); - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); - - return create_source_reader_from_source(source, attributes, !disconnect, &IID_IMFSourceReader, (void **)reader); + return create_source_reader_from_object((IUnknown *)source, attributes, &IID_IMFSourceReader, (void **)reader); } /*********************************************************************** @@ -924,30 +948,7 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteCla if (IsEqualGUID(clsid, &CLSID_MFSourceReader)) { - IMFMediaSource *source = NULL; - IMFByteStream *stream = NULL; - - hr = IUnknown_QueryInterface(unk, &IID_IMFByteStream, (void **)&stream); - if (FAILED(hr)) - hr = IUnknown_QueryInterface(unk, &IID_IMFMediaSource, (void **)&source); - - if (stream) - hr = create_source_reader_from_stream(stream, attributes, riid, out); - else if (source) - { - UINT32 disconnect = 0; - - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN, &disconnect); - hr = create_source_reader_from_source(source, attributes, !disconnect, riid, out); - } - - if (source) - IMFMediaSource_Release(source); - if (stream) - IMFByteStream_Release(stream); - - return hr; + return create_source_reader_from_object(unk, attributes, riid, out); } else if (IsEqualGUID(clsid, &CLSID_MFSinkWriter)) { -- 2.20.1

1 1