April 2020 - Wine-commits - list.winehq.org

Zebediah Figura : devenum: Don't bother creating the category key for codecs if there are no codecs to register.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: cbfd33300a075f91bb75b958914150ed234fe48e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbfd33300a075f91bb75b958… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:39 2020 -0500 devenum: Don't bother creating the category key for codecs if there are no codecs to register. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 56 -------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8e82fcdeac..eba93f0fa0 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -52,7 +52,6 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszFilterData[] = {'F','i','l','t','e','r','D','a','t','a',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) @@ -429,9 +428,6 @@ static void register_legacy_filters(void) hr = HRESULT_FROM_WIN32(lRet); } - if (SUCCEEDED(hr)) - hr = DEVENUM_CreateAMCategoryKey(&CLSID_LegacyAmFilterCategory); - if (SUCCEEDED(hr)) { for (i = 0; i < dwFilterSubkeys; i++) @@ -517,10 +513,6 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) - return FALSE; - if (guid) { WCHAR *name = heap_alloc(sizeof(defaultW) + lstrlenW(desc) * sizeof(WCHAR)); @@ -578,9 +570,6 @@ static void register_waveout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveOutGetNumDevs(); for (i = -1; i < count; i++) @@ -627,9 +616,6 @@ static void register_wavein_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveInGetNumDevs(); for (i = 0; i < count; i++) @@ -671,9 +657,6 @@ static void register_midiout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = midiOutGetNumDevs(); for (i = -1; i < count; i++) @@ -724,9 +707,6 @@ static void register_vfw_codecs(void) int i = 0; HIC hic; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - while (ICInfo(ICTYPE_VIDEO, i++, &info)) { WCHAR name[5] = {LOBYTE(LOWORD(info.fccHandler)), HIBYTE(LOWORD(info.fccHandler)), @@ -784,10 +764,6 @@ static void register_avicap_devices(void) HRESULT hr; int i = 0; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); - if (FAILED(hr)) - return; - for (i = 0; i < 10; ++i) { if (!capGetDriverDescriptionW(i, friendlyname, ARRAY_SIZE(friendlyname), @@ -896,35 +872,3 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = * static CreateDevEnum instance */ ICreateDevEnum DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; - -/********************************************************************** - * DEVENUM_CreateAMCategoryKey (INTERNAL) - * - * Creates a registry key for a category at HKEY_CURRENT_USER\Software\ - * Microsoft\ActiveMovie\devenum\{clsid} - */ -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) -{ - WCHAR wszRegKey[MAX_PATH]; - HRESULT res = S_OK; - HKEY hkeyDummy = NULL; - - lstrcpyW(wszRegKey, wszActiveMovieKey); - - if (!StringFromGUID2(clsidCategory, wszRegKey + lstrlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - lstrlenW(wszRegKey))) - res = E_INVALIDARG; - - if (SUCCEEDED(res)) - { - LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); - res = HRESULT_FROM_WIN32(lRes); - } - - if (hkeyDummy) - RegCloseKey(hkeyDummy); - - if (FAILED(res)) - ERR("Failed to create key HKEY_CURRENT_USER\\%s\n", debugstr_w(wszRegKey)); - - return res; -}

1 0

Zebediah Figura : devenum: Get rid of the DEVENUM_ prefix on all method names.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 6a95f68396dad8a4c7680653b8e86d3e642b607f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a95f68396dad8a4c7680653… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:40 2020 -0500 devenum: Get rid of the DEVENUM_ prefix on all method names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 39 +++------ dlls/devenum/devenum_main.c | 4 +- dlls/devenum/devenum_private.h | 8 +- dlls/devenum/mediacatenum.c | 178 ++++++++++++++++++---------------------- dlls/devenum/parsedisplayname.c | 30 +++---- 5 files changed, 108 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a95f68396dad8a4c768…

1 0

Zebediah Figura : devenum: Get rid of the MediaCatMoniker typedef.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 0fc7e99a1510277180a33cc12e67e1e5b1981c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc7e99a1510277180a33cc1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:41 2020 -0500 devenum: Get rid of the MediaCatMoniker typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 6 +++--- dlls/devenum/mediacatenum.c | 27 ++++++++++++++------------- dlls/devenum/parsedisplayname.c | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 0df964b72d..bdb5fb7b01 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -54,7 +54,7 @@ enum device_type DEVICE_DMO, }; -typedef struct +struct moniker { IMoniker IMoniker_iface; LONG ref; @@ -66,9 +66,9 @@ typedef struct WCHAR *name; /* for filters and codecs */ CLSID clsid; /* for DMOs */ }; -} MediaCatMoniker; +}; -MediaCatMoniker *moniker_create(void) DECLSPEC_HIDDEN; +struct moniker *moniker_create(void) DECLSPEC_HIDDEN; HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; extern ICreateDevEnum devenum_factory DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 085bdaea69..fff40e4af3 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -319,7 +319,7 @@ static const IPropertyBagVtbl IPropertyBag_Vtbl = property_bag_Write, }; -static HRESULT property_bag_create(MediaCatMoniker *mon, IPropertyBag **ppBag) +static HRESULT property_bag_create(struct moniker *mon, IPropertyBag **ppBag) { RegPropBagImpl * rpb = CoTaskMemAlloc(sizeof(RegPropBagImpl)); if (!rpb) @@ -359,9 +359,9 @@ static HRESULT property_bag_create(MediaCatMoniker *mon, IPropertyBag **ppBag) } -static inline MediaCatMoniker *impl_from_IMoniker(IMoniker *iface) +static inline struct moniker *impl_from_IMoniker(IMoniker *iface) { - return CONTAINING_RECORD(iface, MediaCatMoniker, IMoniker_iface); + return CONTAINING_RECORD(iface, struct moniker, IMoniker_iface); } static HRESULT WINAPI moniker_QueryInterface(IMoniker *iface, REFIID riid, void **ppv) @@ -388,7 +388,7 @@ static HRESULT WINAPI moniker_QueryInterface(IMoniker *iface, REFIID riid, void static ULONG WINAPI moniker_AddRef(IMoniker *iface) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -398,7 +398,7 @@ static ULONG WINAPI moniker_AddRef(IMoniker *iface) static ULONG WINAPI moniker_Release(IMoniker *iface) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -413,7 +413,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) static HRESULT WINAPI moniker_GetClassID(IMoniker *iface, CLSID *pClassID) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); TRACE("(%p)->(%p)\n", This, pClassID); @@ -458,7 +458,7 @@ static HRESULT WINAPI moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSiz static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); IUnknown * pObj = NULL; IPropertyBag * pProp = NULL; CLSID clsID; @@ -527,7 +527,7 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppvObj) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj); @@ -681,7 +681,7 @@ static HRESULT WINAPI moniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther static HRESULT WINAPI moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); WCHAR *buffer; TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName); @@ -768,10 +768,11 @@ static const IMonikerVtbl IMoniker_Vtbl = moniker_IsSystemMoniker, }; -MediaCatMoniker *moniker_create(void) +struct moniker *moniker_create(void) { - MediaCatMoniker * pMoniker = NULL; - pMoniker = CoTaskMemAlloc(sizeof(MediaCatMoniker)); + struct moniker *pMoniker; + + pMoniker = CoTaskMemAlloc(sizeof(*pMoniker)); if (!pMoniker) return NULL; @@ -844,9 +845,9 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; + struct moniker *pMoniker; LONG res; ULONG fetched = 0; - MediaCatMoniker * pMoniker; CLSID clsid; HRESULT hr; HKEY hkey; diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index f472e4c1be..ab0f7bf870 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -70,7 +70,7 @@ static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, { WCHAR buffer[MAX_PATH]; enum device_type type; - MediaCatMoniker *mon; + struct moniker *mon; CLSID class; TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret);

1 0

Zebediah Figura : devenum: Use calloc() in moniker_create().
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 4994ba2123d9a829ef2708d4647800da7cbac4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=4994ba2123d9a829ef2708d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:42 2020 -0500 devenum: Use calloc() in moniker_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index fff40e4af3..860eef7603 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -405,7 +405,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) if (ref == 0) { CoTaskMemFree(This->name); - CoTaskMemFree(This); + free(This); DEVENUM_UnlockModule(); } return ref; @@ -770,20 +770,17 @@ static const IMonikerVtbl IMoniker_Vtbl = struct moniker *moniker_create(void) { - struct moniker *pMoniker; + struct moniker *object; - pMoniker = CoTaskMemAlloc(sizeof(*pMoniker)); - if (!pMoniker) + if (!(object = calloc(1, sizeof(*object)))) return NULL; - pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; - pMoniker->ref = 1; - pMoniker->has_class = FALSE; - pMoniker->name = NULL; + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; DEVENUM_LockModule(); - return pMoniker; + return object; } static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface)

1 0

Zebediah Figura : devenum: Pass moniker fields to moniker_create().
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 8cabd4785fe18c45421fd48063a5dd985da32716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cabd4785fe18c45421fd480… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:43 2020 -0500 devenum: Pass moniker fields to moniker_create(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 4 +- dlls/devenum/mediacatenum.c | 89 ++++++++++++++++++++++++----------------- dlls/devenum/parsedisplayname.c | 41 +++++++++---------- 3 files changed, 73 insertions(+), 61 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index bdb5fb7b01..cb274d6c11 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -68,7 +68,9 @@ struct moniker }; }; -struct moniker *moniker_create(void) DECLSPEC_HIDDEN; +struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) DECLSPEC_HIDDEN; +struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; +struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) DECLSPEC_HIDDEN; HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; extern ICreateDevEnum devenum_factory DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 860eef7603..4a5ae45e8b 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -768,7 +768,7 @@ static const IMonikerVtbl IMoniker_Vtbl = moniker_IsSystemMoniker, }; -struct moniker *moniker_create(void) +struct moniker *filter_moniker_create(const GUID *class, const WCHAR *name) { struct moniker *object; @@ -777,6 +777,49 @@ struct moniker *moniker_create(void) object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; object->ref = 1; + object->type = DEVICE_FILTER; + if (class) + object->class = *class; + object->has_class = !!class; + object->name = wcsdup(name); + + DEVENUM_LockModule(); + + return object; +} + +struct moniker *codec_moniker_create(const GUID *class, const WCHAR *name) +{ + struct moniker *object; + + if (!(object = calloc(1, sizeof(*object)))) + return NULL; + + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; + object->type = DEVICE_CODEC; + if (class) + object->class = *class; + object->has_class = !!class; + object->name = wcsdup(name); + + DEVENUM_LockModule(); + + return object; +} + +struct moniker *dmo_moniker_create(const GUID class, const GUID clsid) +{ + struct moniker *object; + + if (!(object = calloc(1, sizeof(*object)))) + return NULL; + + object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl; + object->ref = 1; + object->type = DEVICE_DMO; + object->class = class; + object->clsid = clsid; DEVENUM_LockModule(); @@ -842,11 +885,11 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; - struct moniker *pMoniker; + struct moniker *moniker; LONG res; ULONG fetched = 0; - CLSID clsid; HRESULT hr; + GUID clsid; HKEY hkey; TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); @@ -858,14 +901,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike /* try DMOs */ if ((hr = IEnumDMO_Next(This->dmo_enum, 1, &clsid, NULL, NULL)) == S_OK) { - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_DMO; - pMoniker->clsid = clsid; - - StringFromGUID2(&clsid, buffer, CHARS_IN_GUID); - StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); + moniker = dmo_moniker_create(This->class, clsid); } /* try DirectShow filters */ else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, ARRAY_SIZE(buffer)))) @@ -874,17 +910,7 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_FILTER; - - if (!(pMoniker->name = CoTaskMemAlloc((lstrlenW(buffer) + 1) * sizeof(WCHAR)))) - { - IMoniker_Release(&pMoniker->IMoniker_iface); - return E_OUTOFMEMORY; - } - lstrcpyW(pMoniker->name, buffer); + moniker = filter_moniker_create(&This->class, buffer); } /* then try codecs */ else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, ARRAY_SIZE(buffer)))) @@ -894,26 +920,15 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike if ((res = RegOpenKeyExW(This->cm_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) break; - if (!(pMoniker = moniker_create())) - return E_OUTOFMEMORY; - - pMoniker->type = DEVICE_CODEC; - - if (!(pMoniker->name = CoTaskMemAlloc((lstrlenW(buffer) + 1) * sizeof(WCHAR)))) - { - IMoniker_Release(&pMoniker->IMoniker_iface); - return E_OUTOFMEMORY; - } - lstrcpyW(pMoniker->name, buffer); + moniker = codec_moniker_create(&This->class, buffer); } else break; - pMoniker->has_class = TRUE; - pMoniker->class = This->class; + if (!moniker) + return E_OUTOFMEMORY; - rgelt[fetched] = &pMoniker->IMoniker_iface; - fetched++; + rgelt[fetched++] = &moniker->IMoniker_iface; } TRACE("-- fetched %d\n", fetched); diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index ab0f7bf870..45a89f6993 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -68,10 +68,10 @@ static ULONG WINAPI devenum_parser_Release(IParseDisplayName *iface) static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR name, ULONG *eaten, IMoniker **ret) { + struct moniker *moniker; WCHAR buffer[MAX_PATH]; enum device_type type; - struct moniker *mon; - CLSID class; + GUID class, clsid; TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret); @@ -102,47 +102,42 @@ static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, return MK_E_SYNTAX; } - if (!(mon = moniker_create())) - return E_OUTOFMEMORY; - if (type == DEVICE_DMO) { lstrcpynW(buffer, name, CHARS_IN_GUID); - if (FAILED(CLSIDFromString(buffer, &mon->clsid))) - { - IMoniker_Release(&mon->IMoniker_iface); + if (FAILED(CLSIDFromString(buffer, &clsid))) return MK_E_SYNTAX; - } lstrcpynW(buffer, name + CHARS_IN_GUID - 1, CHARS_IN_GUID); - if (FAILED(CLSIDFromString(buffer, &mon->class))) - { - IMoniker_Release(&mon->IMoniker_iface); + if (FAILED(CLSIDFromString(buffer, &class))) return MK_E_SYNTAX; - } + + moniker = dmo_moniker_create(class, clsid); } else { lstrcpynW(buffer, name, CHARS_IN_GUID); if (CLSIDFromString(buffer, &class) == S_OK) { - mon->has_class = TRUE; - mon->class = class; name += CHARS_IN_GUID; + if (type == DEVICE_FILTER) + moniker = filter_moniker_create(&class, name); + else + moniker = codec_moniker_create(&class, name); } - - if (!(mon->name = CoTaskMemAlloc((lstrlenW(name) + 1) * sizeof(WCHAR)))) + else { - IMoniker_Release(&mon->IMoniker_iface); - return E_OUTOFMEMORY; + if (type == DEVICE_FILTER) + moniker = filter_moniker_create(NULL, name); + else + moniker = codec_moniker_create(NULL, name); } - lstrcpyW(mon->name, name); } - mon->type = type; - - *ret = &mon->IMoniker_iface; + if (!moniker) + return E_OUTOFMEMORY; + *ret = &moniker->IMoniker_iface; return S_OK; }

1 0

Alexandre Julliard : Wine release 5.6
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: website Branch: master Commit: 9e12d35d78d24461ed3f0f41cbce08609d8589e7 URL: https://source.winehq.org/git/website.git/?a=commit;h=9e12d35d78d24461ed3f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 20:57:22 2020 +0200 Wine release 5.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020041001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020041001.xml b/news/en/2020041001.xml new file mode 100644 index 00000000..86a5be02 --- /dev/null +++ b/news/en/2020041001.xml @@ -0,0 +1,16 @@ +<news> +<date>April 10, 2020</date> +<title>Wine 5.6 Released</title> +<body> + The Wine development release 5.6 is now available. + <a href="{$root}/announce/5.6">What's new</a> in this release: +<ul> + <li>Still more Media Foundation work.</li> + <li>Improvements to Active Directory LDAP support.</li> + <li>A few more modules converted to PE.</li> + <li>Improvements to gdb proxy mode.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Hans-Kristian Arntzen : dxgi: Implement dxgi_factory_CheckFeatureSupport().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: bbf2836a85046bf9af2dca3b3158250d79302324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf2836a85046bf9af2dca3b… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Fri Apr 10 21:51:52 2020 +0430 dxgi: Implement dxgi_factory_CheckFeatureSupport(). Some d3d12 games gate their use of sync interval 0 on support for DXGI_FEATURE_PRESENT_ALLOW_TEARING. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 15 +++++++++++++-- dlls/dxgi/tests/dxgi.c | 10 +++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3f41df9e36..39c9e10f7a 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -445,10 +445,21 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumWarpAdapter(IWineDXGIFactory * static HRESULT STDMETHODCALLTYPE dxgi_factory_CheckFeatureSupport(IWineDXGIFactory *iface, DXGI_FEATURE feature, void *feature_data, UINT data_size) { - FIXME("iface %p, feature %#x, feature_data %p, data_size %u stub!\n", + TRACE("iface %p, feature %#x, feature_data %p, data_size %u.\n", iface, feature, feature_data, data_size); - return E_NOTIMPL; + switch (feature) + { + case DXGI_FEATURE_PRESENT_ALLOW_TEARING: + if (data_size != sizeof(BOOL)) + return DXGI_ERROR_INVALID_CALL; + *(BOOL *)feature_data = TRUE; + return S_OK; + + default: + WARN("Unsupported feature %#x.\n", feature); + return DXGI_ERROR_INVALID_CALL; + } } static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index cb6ef6c0ec..3887982634 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6164,7 +6164,7 @@ static void test_factory_check_feature_support(void) } hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data)); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Crashes on Windows. */ if (0) @@ -6174,15 +6174,15 @@ static void test_factory_check_feature_support(void) } hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); data = (BOOL)0xdeadbeef; hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); ref_count = IDXGIFactory5_Release(factory); ok(!ref_count, "Factory has %u references left.\n", ref_count);

1 0

Alexandre Julliard : Release 5.6.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 4cdb7ec8291c171176fb390f4cef1f88409a982f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cdb7ec8291c171176fb390f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 20:54:32 2020 +0200 Release 5.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1148 +++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 591 insertions(+), 580 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4cdb7ec8291c171176fb…

1 0

Tag wine-5.6 : Alexandre Julliard : Release 5.6
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: refs/tags/wine-5.6 Tag: 1f6492dbfe010176af0fb7153e2b2d78c8667cb9 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1f6492dbfe010176af0fb7153e2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 20:54:32 2020 +0200 Release 5.6

1 0

Dmitry Timoshkov : activeds: Implement remaining cases for IADsPathname::Set().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 606ececd8e2ed52c1fe418363f2482c4a32f62fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=606ececd8e2ed52c1fe41836… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 10 15:34:20 2020 +0800 activeds: Implement remaining cases for IADsPathname::Set(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/pathname.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/activeds/pathname.c b/dlls/activeds/pathname.c index 4733c5315f..cffaf3d8e6 100644 --- a/dlls/activeds/pathname.c +++ b/dlls/activeds/pathname.c @@ -184,8 +184,32 @@ static HRESULT WINAPI path_Set(IADsPathname *iface, BSTR adspath, LONG type) if (!adspath) return E_INVALIDARG; + if (type == ADS_SETTYPE_PROVIDER) + { + SysFreeString(path->provider); + path->provider = SysAllocString(adspath); + return path->provider ? S_OK : E_OUTOFMEMORY; + } + + if (type == ADS_SETTYPE_SERVER) + { + SysFreeString(path->server); + path->server = SysAllocString(adspath); + return path->server ? S_OK : E_OUTOFMEMORY; + } + + if (type == ADS_SETTYPE_DN) + { + SysFreeString(path->dn); + path->dn = SysAllocString(adspath); + return path->dn ? S_OK : E_OUTOFMEMORY; + } + if (type != ADS_SETTYPE_FULL) + { FIXME("type %d not implemented\n", type); + return E_INVALIDARG; + } hr = parse_path(adspath, &provider, &server, &dn); if (hr == S_OK)

1 0