March 2020 - Wine-devel - list.winehq.org

[PATCH 1/4] winegcc: Lookup PATH in find_binary and don't try to run binaries that can't be found.
by Jacek Caban 03 Mar '20

03 Mar '20

Based on winebuild. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I'm resending the series because patch 2 got lost by the mailing list yesterday. tools/winegcc/utils.c | 44 +++++++++++++++++++++++++++++++++++------ tools/winegcc/winegcc.c | 7 ++++++- 2 files changed, 44 insertions(+), 7 deletions(-)

1 0

[v2 PATCH 5/5] mfplat: Implement transform activation object.
by Nikolay Sivov 03 Mar '20

03 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: reset transform pointer on shutdown. Thanks, Alexandre. dlls/mfplat/main.c | 59 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index a1314f6eb3..09d6a63bba 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -109,6 +109,7 @@ struct transform_activate struct attributes attributes; IMFActivate IMFActivate_iface; IClassFactory *factory; + IMFTransform *transform; }; struct system_clock @@ -198,6 +199,8 @@ static ULONG WINAPI transform_activate_Release(IMFActivate *iface) clear_attributes_object(&activate->attributes); if (activate->factory) IClassFactory_Release(activate->factory); + if (activate->transform) + IMFTransform_Release(activate->transform); heap_free(activate); } @@ -482,21 +485,67 @@ static HRESULT WINAPI transform_activate_CopyAllItems(IMFActivate *iface, IMFAtt static HRESULT WINAPI transform_activate_ActivateObject(IMFActivate *iface, REFIID riid, void **obj) { - FIXME("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + struct transform_activate *activate = impl_from_IMFActivate(iface); + CLSID clsid; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + EnterCriticalSection(&activate->attributes.cs); + + if (!activate->transform) + { + if (activate->factory) + { + if (FAILED(hr = IClassFactory_CreateInstance(activate->factory, NULL, &IID_IMFTransform, + (void **)&activate->transform))) + { + hr = MF_E_INVALIDREQUEST; + } + } + else + { + if (SUCCEEDED(hr = attributes_GetGUID(&activate->attributes, &MFT_TRANSFORM_CLSID_Attribute, &clsid))) + { + if (FAILED(hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, + (void **)&activate->transform))) + { + hr = MF_E_INVALIDREQUEST; + } + } + } + } + + if (activate->transform) + hr = IMFTransform_QueryInterface(activate->transform, riid, obj); + + LeaveCriticalSection(&activate->attributes.cs); + + return hr; } static HRESULT WINAPI transform_activate_ShutdownObject(IMFActivate *iface) { - FIXME("%p.\n", iface); + struct transform_activate *activate = impl_from_IMFActivate(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&activate->attributes.cs); + + if (activate->transform) + { + IMFTransform_Release(activate->transform); + activate->transform = NULL; + } + + LeaveCriticalSection(&activate->attributes.cs); + + return S_OK; } static HRESULT WINAPI transform_activate_DetachObject(IMFActivate *iface) { - FIXME("%p.\n", iface); + TRACE("%p.\n", iface); return E_NOTIMPL; } -- 2.25.1

1 0

[PATCH] include: Make SHCNF_FLUSHNOWAIT value more explicit.
by Serge Gautherie 03 Mar '20

03 Mar '20

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- * Addendum to 5f884d19c69b8a857083c013e5aecf6031d7bf70. * S2003R2 P.SDK still had '2'. '3' came later (Win10?). --- include/shlobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/shlobj.h b/include/shlobj.h index d309446..e5f6692 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1362,7 +1362,7 @@ typedef struct _SHChangeNotifyEntry #define SHCNF_PRINTERW 0x0006 #define SHCNF_TYPE 0x00FF #define SHCNF_FLUSH 0x1000 -#define SHCNF_FLUSHNOWAIT 0x3000 +#define SHCNF_FLUSHNOWAIT (0x2000 | SHCNF_FLUSH) #define SHCNF_NOTIFYRECURSIVE 0x10000 #define SHCNF_PATH WINELIB_NAME_AW(SHCNF_PATH) -- 2.10.0.windows.1

1 0

[PATCH 1/5] mfplat: Implement MFTEnumEx().
by Nikolay Sivov 03 Mar '20

03 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 457 ++++++++++++++++++++++++++++++------- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/tests/mfplat.c | 17 +- include/mfapi.h | 2 + 4 files changed, 391 insertions(+), 86 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ef0db5a276..45cddd42cc 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -85,7 +85,7 @@ static CRITICAL_SECTION local_handlers_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_scheme_handlers = LIST_INIT(local_scheme_handlers); static struct list local_bytestream_handlers = LIST_INIT(local_bytestream_handlers); -struct local_mft +struct mft_registration { struct list entry; IClassFactory *factory; @@ -107,6 +107,7 @@ struct transform_activate { struct attributes attributes; IMFActivate IMFActivate_iface; + IClassFactory *factory; }; struct system_clock @@ -194,6 +195,8 @@ static ULONG WINAPI transform_activate_Release(IMFActivate *iface) if (!refcount) { clear_attributes_object(&activate->attributes); + if (activate->factory) + IClassFactory_Release(activate->factory); heap_free(activate); } @@ -537,13 +540,11 @@ static const IMFActivateVtbl transform_activate_vtbl = transform_activate_DetachObject, }; -HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) +static HRESULT create_transform_activate(IClassFactory *factory, IMFActivate **activate) { struct transform_activate *object; HRESULT hr; - TRACE("%p.\n", activate); - object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -555,12 +556,22 @@ HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) } object->IMFActivate_iface.lpVtbl = &transform_activate_vtbl; + object->factory = factory; + if (object->factory) + IClassFactory_AddRef(object->factory); *activate = &object->IMFActivate_iface; return S_OK; } +HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) +{ + TRACE("%p.\n", activate); + + return create_transform_activate(NULL, activate); +} + static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', 'T','r','a','n','s','f','o','r','m','s',0}; static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', @@ -648,7 +659,7 @@ static BOOL GUIDFromString(LPCWSTR s, GUID *id) id->Data4[(i-19)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; } - if (!s[37]) return TRUE; + if (!s[36]) return TRUE; return FALSE; } @@ -774,7 +785,7 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } -static void release_local_mft(struct local_mft *mft) +static void release_mft_registration(struct mft_registration *mft) { if (mft->factory) IClassFactory_Release(mft->factory); @@ -788,7 +799,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI UINT32 input_count, const MFT_REGISTER_TYPE_INFO *input_types, UINT32 output_count, const MFT_REGISTER_TYPE_INFO *output_types) { - struct local_mft *mft, *cur, *unreg_mft = NULL; + struct mft_registration *mft, *cur, *unreg_mft = NULL; HRESULT hr; if (!factory && !clsid) @@ -807,7 +818,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI if (clsid) mft->clsid = *clsid; mft->category = *category; - mft->flags = flags; + mft->flags = flags | MFT_ENUM_FLAG_LOCALMFT; if (FAILED(hr = heap_strdupW(name, &mft->name))) goto failed; @@ -835,7 +846,7 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI EnterCriticalSection(&local_mfts_section); - LIST_FOR_EACH_ENTRY(cur, &local_mfts, struct local_mft, entry) + LIST_FOR_EACH_ENTRY(cur, &local_mfts, struct mft_registration, entry) { if (cur->factory == factory) { @@ -849,11 +860,11 @@ static HRESULT mft_register_local(IClassFactory *factory, REFCLSID clsid, REFGUI LeaveCriticalSection(&local_mfts_section); if (unreg_mft) - release_local_mft(unreg_mft); + release_mft_registration(unreg_mft); failed: if (FAILED(hr)) - release_local_mft(mft); + release_mft_registration(mft); return hr; } @@ -880,7 +891,7 @@ HRESULT WINAPI MFTRegisterLocalByCLSID(REFCLSID clsid, REFGUID category, LPCWSTR static HRESULT mft_unregister_local(IClassFactory *factory, REFCLSID clsid) { - struct local_mft *cur, *cur2; + struct mft_registration *cur, *cur2; BOOL unregister_all = !factory && !clsid; struct list unreg; @@ -888,7 +899,7 @@ static HRESULT mft_unregister_local(IClassFactory *factory, REFCLSID clsid) EnterCriticalSection(&local_mfts_section); - LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &local_mfts, struct local_mft, entry) + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &local_mfts, struct mft_registration, entry) { if (!unregister_all) { @@ -911,10 +922,10 @@ static HRESULT mft_unregister_local(IClassFactory *factory, REFCLSID clsid) if (!unregister_all && list_empty(&unreg)) return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); - LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &unreg, struct local_mft, entry) + LIST_FOR_EACH_ENTRY_SAFE(cur, cur2, &unreg, struct mft_registration, entry) { list_remove(&cur->entry); - release_local_mft(cur); + release_mft_registration(cur); } return S_OK; @@ -945,135 +956,411 @@ MFTIME WINAPI MFGetSystemTime(void) return mf; } -static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) +static BOOL mft_is_type_info_match(struct mft_registration *mft, const GUID *category, UINT32 flags, + IMFPluginControl *plugin_control, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type) +{ + BOOL matching = TRUE; + DWORD model; + int i; + + if (!IsEqualGUID(category, &mft->category)) + return FALSE; + + /* Default model is synchronous. */ + model = mft->flags & (MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_ASYNCMFT | MFT_ENUM_FLAG_HARDWARE); + if (!model) + model = MFT_ENUM_FLAG_SYNCMFT; + if (!(model & flags & (MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_ASYNCMFT | MFT_ENUM_FLAG_HARDWARE))) + return FALSE; + + /* These flags should be explicitly enabled. */ + if (mft->flags & ~flags & (MFT_ENUM_FLAG_FIELDOFUSE | MFT_ENUM_FLAG_TRANSCODE_ONLY)) + return FALSE; + + if (flags & MFT_ENUM_FLAG_SORTANDFILTER && !mft->factory && plugin_control + && IMFPluginControl_IsDisabled(plugin_control, MF_Plugin_Type_MFT, &mft->clsid) == S_OK) + { + return FALSE; + } + + if (input_type) + { + for (i = 0, matching = FALSE; input_type && i < mft->input_types_count; ++i) + { + if (!memcmp(&mft->input_types[i], input_type, sizeof(*input_type))) + { + matching = TRUE; + break; + } + } + } + + if (output_type && matching) + { + for (i = 0, matching = FALSE; i < mft->output_types_count; ++i) + { + if (!memcmp(&mft->output_types[i], output_type, sizeof(*output_type))) + { + matching = TRUE; + break; + } + } + } + + return matching; +} + +static void mft_get_reg_type_info(const WCHAR *clsidW, const WCHAR *typeW, MFT_REGISTER_TYPE_INFO **type, + UINT32 *count) { HKEY htransform, hfilter; DWORD reg_type, size; - LONG ret = FALSE; - MFT_REGISTER_TYPE_INFO *info = NULL; - int i; + + *type = NULL; + *count = 0; if (RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &htransform)) - return FALSE; + return; - if (RegOpenKeyW(htransform, clsid_str, &hfilter)) + if (RegOpenKeyW(htransform, clsidW, &hfilter)) { RegCloseKey(htransform); - return FALSE; + return; } - if (RegQueryValueExW(hfilter, type_str, NULL, &reg_type, NULL, &size) != ERROR_SUCCESS) + if (RegQueryValueExW(hfilter, typeW, NULL, &reg_type, NULL, &size)) goto out; if (reg_type != REG_BINARY) goto out; - if (!size || size % (sizeof(MFT_REGISTER_TYPE_INFO)) != 0) + if (!size || size % sizeof(**type)) goto out; - info = HeapAlloc(GetProcessHeap(), 0, size); - if (!info) + if (!(*type = heap_alloc(size))) goto out; - if (RegQueryValueExW(hfilter, type_str, NULL, &reg_type, (LPBYTE)info, &size) != ERROR_SUCCESS) - goto out; + *count = size / sizeof(**type); - for (i = 0; i < size / sizeof(MFT_REGISTER_TYPE_INFO); i++) + if (RegQueryValueExW(hfilter, typeW, NULL, &reg_type, (BYTE *)*type, &size)) { - if (IsEqualGUID(&info[i].guidMajorType, &type->guidMajorType) && - IsEqualGUID(&info[i].guidSubtype, &type->guidSubtype)) - { - ret = TRUE; - break; - } + heap_free(*type); + *type = NULL; + *count = 0; } out: - HeapFree(GetProcessHeap(), 0, info); RegCloseKey(hfilter); RegCloseKey(htransform); - return ret; } -/*********************************************************************** - * MFTEnum (mfplat.@) - */ -HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, - MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, - CLSID **pclsids, UINT32 *pcount) +static void mft_get_reg_flags(const WCHAR *clsidW, const WCHAR *nameW, DWORD *flags) { - WCHAR buffer[64], clsid_str[MAX_PATH] = {0}; - HKEY hcategory, hlist; - DWORD index = 0; - DWORD size = MAX_PATH; - CLSID *clsids = NULL; - UINT32 count = 0; - LONG ret; + DWORD ret, reg_type, size; + HKEY hroot, hmft; - TRACE("(%s, %x, %p, %p, %p, %p, %p)\n", debugstr_guid(&category), flags, input_type, - output_type, attributes, pclsids, pcount); + *flags = 0; - if (!pclsids || !pcount) - return E_INVALIDARG; + if (RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &hroot)) + return; + + ret = RegOpenKeyW(hroot, clsidW, &hmft); + RegCloseKey(hroot); + if (ret) + return; + + reg_type = 0; + if (!RegQueryValueExW(hmft, nameW, NULL, &reg_type, NULL, &size) && reg_type == REG_DWORD) + RegQueryValueExW(hmft, nameW, NULL, &reg_type, (BYTE *)flags, &size); + + RegCloseKey(hmft); +} + +static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, UINT32 flags, + IMFPluginControl *plugin_control, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type) +{ + struct mft_registration mft, *cur; + HKEY hcategory, hlist; + WCHAR clsidW[64]; + DWORD ret, size; + int index = 0; if (RegOpenKeyW(HKEY_CLASSES_ROOT, categories_keyW, &hcategory)) return E_FAIL; - GUIDToString(buffer, &category); - - ret = RegOpenKeyW(hcategory, buffer, &hlist); + GUIDToString(clsidW, category); + ret = RegOpenKeyW(hcategory, clsidW, &hlist); RegCloseKey(hcategory); - if (ret) return E_FAIL; + if (ret) + return E_FAIL; - while (RegEnumKeyExW(hlist, index, clsid_str, &size, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = ARRAY_SIZE(clsidW); + while (!RegEnumKeyExW(hlist, index, clsidW, &size, NULL, NULL, NULL, NULL)) { - GUID clsid; - void *tmp; - - if (!GUIDFromString(clsid_str, &clsid)) + memset(&mft, 0, sizeof(mft)); + mft.category = *category; + if (!GUIDFromString(clsidW, &mft.clsid)) goto next; - if (output_type && !match_type(clsid_str, outputtypesW, output_type)) - goto next; + mft_get_reg_flags(clsidW, mftflagsW, &mft.flags); - if (input_type && !match_type(clsid_str, inputtypesW, input_type)) - goto next; + if (output_type) + mft_get_reg_type_info(clsidW, outputtypesW, &mft.output_types, &mft.output_types_count); + + if (input_type) + mft_get_reg_type_info(clsidW, inputtypesW, &mft.input_types, &mft.input_types_count); - tmp = CoTaskMemRealloc(clsids, (count + 1) * sizeof(GUID)); - if (!tmp) + if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { - CoTaskMemFree(clsids); - RegCloseKey(hlist); - return E_OUTOFMEMORY; + heap_free(mft.input_types); + heap_free(mft.output_types); + goto next; } - clsids = tmp; - clsids[count++] = clsid; + cur = heap_alloc(sizeof(*cur)); + /* Reuse allocated type arrays. */ + *cur = mft; + list_add_tail(mfts, &cur->entry); next: - size = MAX_PATH; + size = ARRAY_SIZE(clsidW); index++; } - *pclsids = clsids; - *pcount = count; - - RegCloseKey(hlist); return S_OK; } +static BOOL mft_is_preferred(IMFPluginControl *plugin_control, const CLSID *clsid) +{ + CLSID preferred; + WCHAR *selector; + int index = 0; + + while (SUCCEEDED(IMFPluginControl_GetPreferredClsidByIndex(plugin_control, MF_Plugin_Type_MFT, index++, &selector, + &preferred))) + { + CoTaskMemFree(selector); + + if (IsEqualGUID(&preferred, clsid)) + return TRUE; + } + + return FALSE; +} + +static HRESULT mft_enum(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count) +{ + IMFPluginControl *plugin_control = NULL; + struct list mfts, mfts_sorted, *result = &mfts; + struct mft_registration *mft, *mft2; + unsigned int obj_count; + HRESULT hr; + + *count = 0; + *activate = NULL; + + if (!flags) + flags = MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_LOCALMFT | MFT_ENUM_FLAG_SORTANDFILTER; + + /* Synchronous processing is default. */ + if (!(flags & (MFT_ENUM_FLAG_SYNCMFT | MFT_ENUM_FLAG_ASYNCMFT | MFT_ENUM_FLAG_HARDWARE))) + flags |= MFT_ENUM_FLAG_SYNCMFT; + + if (FAILED(hr = MFGetPluginControl(&plugin_control))) + { + WARN("Failed to get plugin control instance, hr %#x.\n", hr); + return hr; + } + + list_init(&mfts); + + /* Collect from registry */ + mft_collect_machine_reg(&mfts, &category, flags, plugin_control, input_type, output_type); + + /* Collect locally registered ones. */ + if (flags & MFT_ENUM_FLAG_LOCALMFT) + { + struct mft_registration *local; + + EnterCriticalSection(&local_mfts_section); + + LIST_FOR_EACH_ENTRY(local, &local_mfts, struct mft_registration, entry) + { + if (mft_is_type_info_match(local, &category, flags, plugin_control, input_type, output_type)) + { + mft = heap_alloc_zero(sizeof(*mft)); + + mft->clsid = local->clsid; + mft->factory = local->factory; + if (mft->factory) + IClassFactory_AddRef(mft->factory); + mft->flags = local->flags; + + list_add_tail(&mfts, &mft->entry); + } + } + + LeaveCriticalSection(&local_mfts_section); + } + + list_init(&mfts_sorted); + + if (flags & MFT_ENUM_FLAG_SORTANDFILTER) + { + /* Local registrations. */ + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + if (mft->flags & MFT_ENUM_FLAG_LOCALMFT) + { + list_remove(&mft->entry); + list_add_tail(&mfts_sorted, &mft->entry); + } + } + + /* FIXME: Sort by merit value, for the ones that got it. Currently not handled. */ + + /* Preferred transforms. */ + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + if (!mft->factory && mft_is_preferred(plugin_control, &mft->clsid)) + { + list_remove(&mft->entry); + list_add_tail(&mfts_sorted, &mft->entry); + } + } + + /* Append the rest. */ + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + list_remove(&mft->entry); + list_add_tail(&mfts_sorted, &mft->entry); + } + + result = &mfts; + } + + IMFPluginControl_Release(plugin_control); + + /* Create activation objects from CLSID/IClassFactory. */ + + obj_count = list_count(result); + + if (obj_count) + { + if (!(*activate = CoTaskMemAlloc(obj_count * sizeof(**activate)))) + hr = E_OUTOFMEMORY; + + obj_count = 0; + + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, result, struct mft_registration, entry) + { + IMFActivate *mft_activate; + + if (*activate) + { + if (SUCCEEDED(create_transform_activate(mft->factory, &mft_activate))) + { + (*activate)[obj_count] = mft_activate; + + /* FIXME: set some attributes */ + + obj_count++; + } + } + + list_remove(&mft->entry); + release_mft_registration(mft); + } + } + + if (!obj_count) + { + CoTaskMemFree(*activate); + *activate = NULL; + } + *count = obj_count; + + return hr; +} + +/*********************************************************************** + * MFTEnum (mfplat.@) + */ +HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, + MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, CLSID **clsids, UINT32 *count) +{ + struct mft_registration *mft, *mft2; + unsigned int mft_count; + struct list mfts; + HRESULT hr; + + TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, + clsids, count); + + if (!clsids || !count) + return E_INVALIDARG; + + *count = 0; + + list_init(&mfts); + + if (FAILED(hr = mft_collect_machine_reg(&mfts, &category, MFT_ENUM_FLAG_SYNCMFT, NULL, input_type, output_type))) + return hr; + + mft_count = list_count(&mfts); + + if (mft_count) + { + if (!(*clsids = CoTaskMemAlloc(mft_count * sizeof(**clsids)))) + hr = E_OUTOFMEMORY; + + mft_count = 0; + LIST_FOR_EACH_ENTRY_SAFE(mft, mft2, &mfts, struct mft_registration, entry) + { + if (*clsids) + (*clsids)[mft_count++] = mft->clsid; + list_remove(&mft->entry); + release_mft_registration(mft); + } + } + + if (!mft_count) + { + CoTaskMemFree(*clsids); + *clsids = NULL; + } + *count = mft_count; + + return hr; +} + /*********************************************************************** * MFTEnumEx (mfplat.@) */ HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, - const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, - UINT32 *pcount) + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count) { - FIXME("(%s, %x, %p, %p, %p, %p): stub\n", debugstr_guid(&category), flags, input_type, - output_type, activate, pcount); + TRACE("%s, %#x, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, activate, count); - *pcount = 0; - return S_OK; + return mft_enum(category, flags, input_type, output_type, NULL, activate, count); +} + +/*********************************************************************** + * MFTEnum2 (mfplat.@) + */ +HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count) +{ + TRACE("%s, %#x, %p, %p, %p, %p, %p.\n", debugstr_guid(&category), flags, input_type, output_type, attributes, + activate, count); + + if (attributes) + FIXME("Ignoring attributes.\n"); + + return mft_enum(category, flags, input_type, output_type, attributes, activate, count); } /*********************************************************************** diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 85e28792c6..7e3bd4571c 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -144,6 +144,7 @@ @ stdcall MFStartup(long long) @ stub MFStreamDescriptorProtectMediaType @ stdcall MFTEnum(int128 long ptr ptr ptr ptr ptr) +@ stdcall MFTEnum2(int128 long ptr ptr ptr ptr ptr) @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 896cd93a46..a93bbfe7f1 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -89,6 +89,8 @@ static HRESULT (WINAPI *pMFTRegisterLocalByCLSID)(REFCLSID clsid, REFGUID catego static HRESULT (WINAPI *pMFTUnregisterLocal)(IClassFactory *factory); static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); +static HRESULT (WINAPI *pMFTEnumEx)(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *count); static const WCHAR fileschemeW[] = L"file://"; @@ -659,13 +661,14 @@ static void init_functions(void) X(MFCreateDXGIDeviceManager); X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); + X(MFCreateTransformActivate); X(MFHeapAlloc); X(MFHeapFree); X(MFPutWaitingWorkItem); X(MFRegisterLocalByteStreamHandler); X(MFRegisterLocalSchemeHandler); X(MFRemovePeriodicCallback); - X(MFCreateTransformActivate); + X(MFTEnumEx); X(MFTRegisterLocal); X(MFTRegisterLocalByCLSID); X(MFTUnregisterLocal); @@ -4055,6 +4058,8 @@ static void test_MFTRegisterLocal(void) { IClassFactory test_factory = { &test_mft_factory_vtbl }; MFT_REGISTER_TYPE_INFO input_types[1]; + IMFActivate **activate; + UINT32 count, count2; HRESULT hr; if (!pMFTRegisterLocal) @@ -4071,9 +4076,19 @@ static void test_MFTRegisterLocal(void) hr = pMFTRegisterLocal(&test_factory, &MFT_CATEGORY_OTHER, L"Local MFT name", 0, 1, input_types, 0, NULL); ok(hr == S_OK, "Failed to register MFT, hr %#x.\n", hr); + hr = pMFTEnumEx(MFT_CATEGORY_OTHER, MFT_ENUM_FLAG_LOCALMFT, NULL, NULL, &activate, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count > 0, "Unexpected count %u.\n", count); + CoTaskMemFree(activate); + hr = pMFTUnregisterLocal(&test_factory); ok(hr == S_OK, "Failed to unregister MFT, hr %#x.\n", hr); + hr = pMFTEnumEx(MFT_CATEGORY_OTHER, MFT_ENUM_FLAG_LOCALMFT, NULL, NULL, &activate, &count2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count2 < count, "Unexpected count %u.\n", count2); + CoTaskMemFree(activate); + hr = pMFTUnregisterLocal(&test_factory); ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Unexpected hr %#x.\n", hr); diff --git a/include/mfapi.h b/include/mfapi.h index 910b45e68f..4d5ad5ad15 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -422,6 +422,8 @@ HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, CLSID **pclsids, UINT32 *pcount); +HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, + const MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, IMFActivate ***activate, UINT32 *count); HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); -- 2.25.1

2 5

[PATCH v2 2/2] kernelbase: Implement SetConsoleScreenBufferInfoEx().
by Aaro Altonen 03 Mar '20

03 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47288 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Removed an unnecessary check and added a print (thanks Gijs) --- dlls/kernel32/tests/console.c | 10 +++++----- dlls/kernelbase/console.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 9c05784a28..84406e8409 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3162,24 +3162,24 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(NULL, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); - todo_wine ok(ret, "got %d, expected one\n", ret); - todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(ret, "got %d, expected one\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_input, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, "got %u, expected 5 or 6\n", GetLastError()); info.cbSize = 0; SetLastError(0xdeadbeef); ret = pSetConsoleScreenBufferInfoEx(std_output, &info); ok(!ret, "got %d, expected zero\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); CloseHandle(std_input); } diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 91e8129fbe..8ce9252413 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1146,9 +1146,36 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleOutputCP( UINT cp ) BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleScreenBufferInfoEx( HANDLE handle, CONSOLE_SCREEN_BUFFER_INFOEX *info ) { - FIXME( "(%p %p): stub!\n", handle, info ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + BOOL ret; + + TRACE("(%p, %p)\n", handle, info); + + if (info->cbSize != sizeof(CONSOLE_SCREEN_BUFFER_INFOEX)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SERVER_START_REQ(set_console_output_info) + { + req->handle = console_handle_unmap(handle); + req->width = info->dwSize.X; + req->height = info->dwSize.Y; + req->cursor_x = info->dwCursorPosition.X; + req->cursor_y = info->dwCursorPosition.Y; + req->attr = info->wAttributes; + req->win_left = info->srWindow.Left; + req->win_top = info->srWindow.Top; + req->win_right = info->srWindow.Right; + req->win_bottom = info->srWindow.Bottom; + req->popup_attr = info->wPopupAttributes; + req->max_width = min(info->dwMaximumWindowSize.X, info->dwSize.X); + req->max_height = min(info->dwMaximumWindowSize.Y, info->dwSize.Y); + ret = !wine_server_call_err(req); + } + SERVER_END_REQ; + + return ret; } -- 2.25.1

2 1

[PATCH v2 1/2] kernel32/tests: Add tests for SetConsoleScreenBufferInfoEx().
by Aaro Altonen 03 Mar '20

03 Mar '20

Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> --- v2: - Fix code formatting and a typo --- dlls/kernel32/tests/console.c | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5f8003760d..9c05784a28 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3142,6 +3142,48 @@ static void test_GetConsoleScreenBufferInfoEx(HANDLE std_output) ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); } +static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) +{ + BOOL ret; + HANDLE hmod; + HANDLE std_input = CreateFileA("CONIN$", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + BOOL (WINAPI *pSetConsoleScreenBufferInfoEx)(HANDLE, CONSOLE_SCREEN_BUFFER_INFOEX *); + CONSOLE_SCREEN_BUFFER_INFOEX info; + info.cbSize = sizeof(CONSOLE_SCREEN_BUFFER_INFOEX); + + hmod = GetModuleHandleA("kernel32.dll"); + pSetConsoleScreenBufferInfoEx = (void *)GetProcAddress(hmod, "SetConsoleScreenBufferInfoEx"); + if (!pSetConsoleScreenBufferInfoEx) + { + win_skip("SetConsoleScreenBufferInfoEx is not available\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(NULL, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + todo_wine ok(ret, "got %d, expected one\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_input, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE || GetLastError() == ERROR_ACCESS_DENIED, + "got %u, expected 5 or 6\n", GetLastError()); + + info.cbSize = 0; + SetLastError(0xdeadbeef); + ret = pSetConsoleScreenBufferInfoEx(std_output, &info); + ok(!ret, "got %d, expected zero\n", ret); + todo_wine ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + + CloseHandle(std_input); +} + static void test_AttachConsole_child(DWORD console_pid) { HANDLE pipe_in, pipe_out; @@ -3398,5 +3440,6 @@ START_TEST(console) test_GetConsoleFontInfo(hConOut); test_SetConsoleFont(hConOut); test_GetConsoleScreenBufferInfoEx(hConOut); + test_SetConsoleScreenBufferInfoEx(hConOut); test_AttachConsole(hConOut); } -- 2.25.1

2 1

[PATCH 1/4] mf: Handle shutdown state in GetFullTopology().
by Nikolay Sivov 03 Mar '20

03 Mar '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/session.c | 33 ++++++++++++++++++--------------- dlls/mf/tests/mf.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 15 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index a2a2ba6fe5..c5235e42a8 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1401,8 +1401,8 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl { struct media_session *session = impl_from_IMFMediaSession(iface); struct queued_topology *queued; - HRESULT hr = S_OK; TOPOID topo_id; + HRESULT hr; TRACE("%p, %#x, %s, %p.\n", iface, flags, wine_dbgstr_longlong(id), topology); @@ -1410,27 +1410,30 @@ static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD fl EnterCriticalSection(&session->cs); - if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + if (SUCCEEDED(hr = session_is_shut_down(session))) { - if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) - *topology = session->presentation.current_topology; + if (flags & MFSESSION_GETFULLTOPOLOGY_CURRENT) + { + if (session->presentation.topo_status != MF_TOPOSTATUS_INVALID) + *topology = session->presentation.current_topology; + else + hr = MF_E_INVALIDREQUEST; + } else - hr = MF_E_INVALIDREQUEST; - } - else - { - LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) { - if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + LIST_FOR_EACH_ENTRY(queued, &session->topologies, struct queued_topology, entry) { - *topology = queued->topology; - break; + if (SUCCEEDED(IMFTopology_GetTopologyID(queued->topology, &topo_id)) && topo_id == id) + { + *topology = queued->topology; + break; + } } } - } - if (*topology) - IMFTopology_AddRef(*topology); + if (*topology) + IMFTopology_AddRef(*topology); + } LeaveCriticalSection(&session->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5f3114da32..5a690880d1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1027,11 +1027,14 @@ static void test_media_session(void) IMFRateSupport *rate_support; IMFAttributes *attributes; IMFMediaSession *session; + IMFTopology *topology; + PROPVARIANT propvar; IMFGetService *gs; IMFClock *clock; IUnknown *unk; HRESULT hr; float rate; + DWORD caps; BOOL thin; hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); @@ -1115,12 +1118,40 @@ todo_wine hr = IMFMediaSession_Shutdown(session); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaSession_ClearTopologies(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Start(session, &GUID_NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + propvar.vt = VT_EMPTY; + hr = IMFMediaSession_Start(session, &GUID_NULL, &propvar); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Pause(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Stop(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_Close(session); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFMediaSession_GetClock(session, &clock); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSession_GetSessionCapabilities(session, &caps); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetSessionCapabilities(session, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_GetFullTopology(session, MFSESSION_GETFULLTOPOLOGY_CURRENT, 0, &topology); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSession_Shutdown(session); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSession_Release(session); /* Custom topology loader, GUID is not registered. */ -- 2.25.1

1 3

[PATCH v2] msi: Add support for ListView dialog control.
by Dmitry Timoshkov 03 Mar '20

03 Mar '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/dialog.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8a28e4d4af..67a0633991 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -66,6 +66,7 @@ struct msi_control_tag LPWSTR value; HBITMAP hBitmap; HICON hIcon; + HIMAGELIST hImageList; LPWSTR tabnext; LPWSTR type; HMODULE hDll; @@ -159,6 +160,7 @@ static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l' static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; +static const WCHAR szListView[] = {'L','i','s','t','V','i','e','w',0}; /* dialog sequencing */ @@ -401,6 +403,8 @@ static void msi_destroy_control( msi_control *t ) DeleteObject( t->hBitmap ); if( t->hIcon ) DestroyIcon( t->hIcon ); + if ( t->hImageList ) + ImageList_Destroy( t->hImageList ); msi_free( t->tabnext ); msi_free( t->type ); if (t->hDll) @@ -431,6 +435,7 @@ static msi_control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DW control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; + control->hImageList = NULL; control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); @@ -3522,6 +3527,107 @@ static UINT msi_dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** ListView *****************************************/ + +struct listview_param +{ + msi_dialog *dialog; + msi_control *control; +}; + +static UINT msi_dialog_listview_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +{ + NMHDR *nmhdr = (NMHDR *)param; + + FIXME("code %#x (%d)\n", nmhdr->code, nmhdr->code); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct listview_param *lv_param = (struct listview_param *)param; + LPCWSTR text, binary; + LVITEMW item; + HICON hIcon; + + text = MSI_RecordGetString( rec, 4 ); + binary = MSI_RecordGetString( rec, 5 ); + hIcon = msi_load_icon( lv_param->dialog->package->db, binary, 0 ); + + TRACE("Adding: text %s, binary %s, icon %p\n", debugstr_w(text), debugstr_w(binary), hIcon); + + memset( &item, 0, sizeof(item) ); + item.mask = LVIF_TEXT | LVIF_IMAGE; + deformat_string( lv_param->dialog->package, text, &item.pszText ); + item.iImage = ImageList_AddIcon( lv_param->control->hImageList, hIcon ); + item.iItem = item.iImage; + SendMessageW( lv_param->control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&item ); + + DestroyIcon( hIcon ); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_items( msi_dialog *dialog, msi_control *control ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','L','i','s','t','V','i','e','w','`',' ','W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ', + 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0}; + MSIQUERY *view; + struct listview_param lv_param = { dialog, control }; + + if (MSI_OpenQuery( dialog->package->db, &view, query, control->property ) == ERROR_SUCCESS) + { + MSI_IterateRecords( view, NULL, msi_listview_add_item, &lv_param ); + msiobj_release( &view->hdr ); + } + + return ERROR_SUCCESS; +} + +static UINT msi_dialog_listview( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + LPCWSTR prop; + DWORD style, attributes; + LVCOLUMNW col; + RECT rc; + + style = LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | WS_VSCROLL | WS_HSCROLL | WS_BORDER | WS_TABSTOP | WS_CHILD; + attributes = MSI_RecordGetInteger( rec, 8 ); + if ( ~attributes & msidbControlAttributesSorted ) + style |= LVS_SORTASCENDING; + control = msi_dialog_add_control( dialog, rec, WC_LISTVIEWW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + control->hImageList = ImageList_Create( 16, 16, ILC_COLOR32, 0, 1); + SendMessageW( control->hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)control->hImageList ); + + col.mask = LVCF_FMT | LVCF_WIDTH; + col.fmt = LVCFMT_LEFT; + col.cx = 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + GetClientRect( control->hwnd, &rc ); + col.cx = rc.right - 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + if (control->property) + msi_listview_add_items( dialog, control ); + + control->handler = msi_dialog_listview_handler; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -3544,7 +3650,8 @@ static const struct control_handler msi_dialog_handler[] = { szDirectoryList, msi_dialog_directory_list }, { szVolumeCostList, msi_dialog_volumecost_list }, { szVolumeSelectCombo, msi_dialog_volumeselect_combo }, - { szHyperLink, msi_dialog_hyperlink } + { szHyperLink, msi_dialog_hyperlink }, + { szListView, msi_dialog_listview } }; static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param ) -- 2.20.1

2 1

[PATCH 1/4] http.sys: Support cancelling IRPs.
by Zebediah Figura 03 Mar '20

03 Mar '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 28 ++++++++++++++++++++++++++-- dlls/httpapi/tests/httpapi.c | 12 ++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 4259ca618f..9587eaa9a8 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1178,6 +1178,20 @@ static struct connection *get_connection(HTTP_REQUEST_ID req_id) return NULL; } +static void WINAPI http_receive_request_cancel(DEVICE_OBJECT *device, IRP *irp) +{ + TRACE("device %p, irp %p.\n", device, irp); + + IoReleaseCancelSpinLock(irp->CancelIrql); + + EnterCriticalSection(&http_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&http_cs); + + irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) { const struct http_receive_request_params *params = irp->AssociatedIrp.SystemBuffer; @@ -1199,8 +1213,18 @@ static NTSTATUS http_receive_request(struct request_queue *queue, IRP *irp) if (params->id == HTTP_NULL_ID) { TRACE("Queuing IRP %p.\n", irp); - InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); - ret = STATUS_PENDING; + + IoSetCancelRoutine(irp, http_receive_request_cancel); + if (irp->Cancel && !IoSetCancelRoutine(irp, NULL)) + { + /* The IRP was canceled before we set the cancel routine. */ + ret = STATUS_CANCELLED; + } + else + { + InsertTailList(&queue->irp_queue, &irp->Tail.Overlay.ListEntry); + ret = STATUS_PENDING; + } } else ret = STATUS_CONNECTION_INVALID; diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index fced1b5e2f..5a9f3c3178 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -348,6 +348,18 @@ static void test_v1_server(void) ret = remove_url_v1(queue, port); ok(ret == ERROR_FILE_NOT_FOUND, "Got error %u.\n", ret); + ret = HttpReceiveHttpRequest(queue, HTTP_NULL_ID, 0, (HTTP_REQUEST *)req, sizeof(req_buffer), NULL, &ovl); + ok(ret == ERROR_IO_PENDING, "Got error %u.\n", ret); + + ret = CancelIo(queue); + ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + + ret_size = 0xdeadbeef; + ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_OPERATION_ABORTED, "Got error %u.\n", GetLastError()); + ok(!ret_size, "Got size %u.\n", ret_size); + closesocket(s); CloseHandle(ovl.hEvent); ret = CloseHandle(queue); -- 2.25.1

1 3

Re: [PATCH] kernel32/tests: Fix test_Toolhelp()'s nested process lookup.
by Francois Gouget 03 Mar '20

03 Mar '20

On Mon, 2 Mar 2020, Marvin wrote: [...] > === w1064v1507 (32 bit report) === > > Report validation errors: > kernel32:process is missing some failure messages That's one of the occasional timeouts that was identified before, only in this case it raced with the child process so that the test failure message was garbled and unrecognizable. At some point I'll patch this test with timing information and longer timeouts to see just how long some of these waits are (all I know for now is that raising them to 2s is not enough). -- Francois Gouget <fgouget(a)codeweavers.com>

1 0