April 2021 - Wine-Devel - list.winehq.org

Re: [PATCH] taskmgr: Implement process page sorting.
by Haoyang Chen April 6, 2021

April 6, 2021

在 2021/4/6 下午4:01, Haoyang Chen 写道: > From: Nikolay Sivov <nsivov(a)codeweavers.com> > Subject: Re: [PATCH] taskmgr: Implement process page sorting. > Message-Id: <7dd964b5-ed70-f504-ebc6-53739780a8be(a)codeweavers.com> > Date: Tue, 6 Apr 2021 08:42:36 +0300 > In-Reply-To: <20210406014834.20910-1-chenhaoyang(a)uniontech.com> > References: <20210406014834.20910-1-chenhaoyang(a)uniontech.com> > > On 4/6/21 4:48 AM, Haoyang Chen wrote: >> Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> >> --- >> programs/taskmgr/perfdata.c | 76 +++++++++++++++++++++++++++++++++++++ >> programs/taskmgr/perfdata.h | 1 + >> programs/taskmgr/procpage.c | 10 ++--- >> 3 files changed, 81 insertions(+), 6 deletions(-) >> >> diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c >> index 2cbd6b01669..52a08da4d88 100644 >> --- a/programs/taskmgr/perfdata.c >> +++ b/programs/taskmgr/perfdata.c >> @@ -833,3 +833,79 @@ ULONG PerfDataGetTotalThreadCount(void) >> >> return ThreadCount; >> } >> +/* sort code copied from DPA */ > > Why do you need to copy it? > The original DPA_QuickSort sort is for LPVOID, now it is used for PPERFDATA. >> +static BOOL bSortAscending = TRUE; > > This does not have to be global. > Because both processpagecomparefunction and perdatasort use it. >> +static INT CALLBACK ProcessPageCompareFunc(LPVOID first, LPVOID >> second, LPARAM lParam) >> +{ >> + PPERFDATA pPerfData1 = NULL; >> + PPERFDATA pPerfData2 = NULL; >> + INT iSubItem = lParam; >> + >> + if (bSortAscending) >> + { >> + pPerfData1 = (PPERFDATA) first; >> + pPerfData2 = (PPERFDATA) second; >> + } >> + else >> + { >> + pPerfData2 = (PPERFDATA) first; >> + pPerfData1 = (PPERFDATA) second; >> + } >> + >> + switch (iSubItem) >> + { >> + case 0: >> + return lstrcmpW(pPerfData1->ImageName, >> pPerfData2->ImageName); >> + case 1: >> + return pPerfData1->ProcessId > pPerfData2->ProcessId; >> + case 2: >> + return pPerfData1->CPUUsage > pPerfData2->CPUUsage; >> + case 3: >> + return pPerfData1->CPUTime.QuadPart > >> pPerfData2->CPUTime.QuadPart; >> + case 4: >> + return pPerfData1->vmCounters.VirtualSize > >> pPerfData2->vmCounters.VirtualSize; >> + } >> + return 0; >> +} > > We have 25 columns in total, with symbolic names defined for them. ok, I will send v2, thanks. >> + >> +static VOID DPA_QuickSort (PPERFDATA lpPtrs, INT l, INT r, >> + PFNDPACOMPARE pfnCompare, LPARAM lParam) >> +{ >> + INT m; >> + PERFDATA t; >> + >> + if (l==r) /* one element is always sorted */ >> + return; >> + if (r<l) /* oops, got it in the wrong order */ >> + { >> + DPA_QuickSort(lpPtrs, r, l, pfnCompare, lParam); >> + return; >> + } >> + m = (l+r)/2; /* divide by two */ >> + DPA_QuickSort(lpPtrs, l, m, pfnCompare, lParam); >> + DPA_QuickSort(lpPtrs, m+1, r, pfnCompare, lParam); >> + >> + /* join the two sides */ >> + while( (l<=m) && (m<r) ) >> + { >> + if(pfnCompare(&lpPtrs[l],&lpPtrs[m+1],lParam)>0) >> + { >> + t = lpPtrs[m+1]; >> + memmove(&lpPtrs[l+1],&lpPtrs[l],(m-l+1)*sizeof(lpPtrs[l])); >> + lpPtrs[l] = t; >> + >> + m++; >> + } >> + l++; >> + } >> +} >> + >> +VOID PerDataSort(UINT iSubItem) >> +{ >> + EnterCriticalSection(&PerfDataCriticalSection); >> + >> + bSortAscending = !bSortAscending; >> + DPA_QuickSort(pPerfData, 0, ProcessCount - 1, >> ProcessPageCompareFunc, iSubItem); >> + >> + LeaveCriticalSection(&PerfDataCriticalSection); >> +} >> \ No newline at end of file >> diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h >> index 615e7db2a64..f39b03c503d 100644 >> --- a/programs/taskmgr/perfdata.h >> +++ b/programs/taskmgr/perfdata.h >> @@ -110,4 +110,5 @@ ULONG PerfDataGetSystemHandleCount(void); >> >> ULONG PerfDataGetTotalThreadCount(void); >> >> +VOID PerDataSort(UINT iSubItem); >> #endif /* __PERFDATA_H */ >> diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c >> index 5ea2e6b044f..f8dc0a0e89d 100644 >> --- a/programs/taskmgr/procpage.c >> +++ b/programs/taskmgr/procpage.c >> @@ -155,12 +155,14 @@ static void ProcessPageOnNotify(LPARAM lParam) >> ULONG ColumnIndex; >> IO_COUNTERS iocounters; >> TIME time; >> + NMLISTVIEW* pnmListView; >> static const WCHAR wszFmtD[] = {'%','d',0}; >> static const WCHAR wszFmt02D[] = {'%','0','2','d',0}; >> static const WCHAR wszUnitK[] = {' ','K',0}; >> >> pnmh = (LPNMHDR) lParam; >> pnmdi = (NMLVDISPINFOW*) lParam; >> + pnmListView = (NM_LISTVIEW*)lParam; >> >> if (pnmh->hwndFrom == hProcessPageListCtrl) >> { >> @@ -343,12 +345,8 @@ static void ProcessPageOnNotify(LPARAM lParam) >> { >> case HDN_ITEMCLICKW: >> >> - /* >> - * FIXME: Fix the column sorting >> - * >> - *ListView_SortItems(hApplicationPageListCtrl, >> ApplicationPageCompareFunc, NULL); >> - *bSortAscending = !bSortAscending; >> - */ >> + PerDataSort(pnmListView->iItem); >> + InvalidateRect(hProcessPageListCtrl, NULL, TRUE); >> >> break; >> > HDN_ITEMCLICK does not use NMLISTVIEW structure. ok, I will send v2, thanks. > > > > >

2 2

[PATCH 1/7] mfplay: Create presentation descriptor for the item.
by Nikolay Sivov April 6, 2021

April 6, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 0a953dde10f..cef44c8b7ce 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -50,6 +50,7 @@ struct media_item LONG refcount; IMFPMediaPlayer *player; IMFMediaSource *source; + IMFPresentationDescriptor *pd; DWORD_PTR user_data; }; @@ -124,6 +125,8 @@ static ULONG WINAPI media_item_Release(IMFPMediaItem *iface) IMFPMediaPlayer_Release(item->player); if (item->source) IMFMediaSource_Release(item->source); + if (item->pd) + IMFPresentationDescriptor_Release(item->pd); heap_free(item); } @@ -328,7 +331,24 @@ static HRESULT create_media_item(IMFPMediaPlayer *player, DWORD_PTR user_data, s static HRESULT media_item_set_source(struct media_item *item, IUnknown *object) { - return IUnknown_QueryInterface(object, &IID_IMFMediaSource, (void **)&item->source); + IMFPresentationDescriptor *pd; + IMFMediaSource *source; + HRESULT hr; + + if (FAILED(hr = IUnknown_QueryInterface(object, &IID_IMFMediaSource, (void **)&source))) + return hr; + + if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) + { + WARN("Failed to get presentation descriptor, hr %#x.\n", hr); + IMFMediaSource_Release(source); + return hr; + } + + item->source = source; + item->pd = pd; + + return hr; } static HRESULT WINAPI media_player_QueryInterface(IMFPMediaPlayer *iface, REFIID riid, void **obj) -- 2.30.2

1 6

[PATCH] comctl32/tests: Test LVM_SORTITEMS sorting.
by Haoyang Chen April 6, 2021

April 6, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- dlls/comctl32/tests/listview.c | 67 ++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..88a9d518406 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2921,6 +2921,28 @@ static INT WINAPI test_CallBackCompare(LPARAM first, LPARAM second, LPARAM lPara return (first > second ? 1 : -1); } +static INT WINAPI test_CallBackCompare1(LPARAM first, LPARAM second, LPARAM lParam) +{ + CHAR str1[5]; + CHAR str2[5]; + INT r; + HWND hwnd = (HWND)lParam; + LV_ITEMA item = {0}; + + if (first == second) return 0; + item.cchTextMax = 5; + item.iSubItem = 0; + item.pszText = str1; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, first, (LPARAM)&item); + expect(TRUE, r); + + item.pszText = str2; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, second, (LPARAM)&item); + expect(TRUE, r); + + return atoi(str1) > atoi(str2) ? 1 : -1; +} + static void test_sorting(void) { HWND hwnd; @@ -2929,6 +2951,10 @@ static void test_sorting(void) LONG_PTR style; static CHAR names[][5] = {"A", "B", "C", "D", "0"}; CHAR buff[10]; + static CHAR before_sort_array[][5] = {"6","3","1","4","2"}; + static CHAR after_sort_arary[][5] = {"1","2","3","4","6"}; + INT i; + LVCOLUMNA lvc; hwnd = create_listview_control(LVS_REPORT); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -3096,6 +3122,47 @@ static void test_sorting(void) expect(TRUE, r); ok(lstrcmpA(buff, names[3]) == 0, "Expected '%s', got '%s'\n", names[3], buff); + DestroyWindow(hwnd); + + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + + lvc.mask = LVCF_TEXT | LVCF_WIDTH; + lvc.pszText = names[0]; + lvc.cx = 50; + + SendMessageA(hwnd, LVM_INSERTCOLUMNA, 0, (LPARAM)&lvc); + SendMessageA(hwnd, LVM_INSERTCOLUMNA, 1, (LPARAM)&lvc); + + item.mask = LVIF_PARAM | LVIF_TEXT; + item.iSubItem = 0; + item.cchTextMax = 5; + + for (i = 0; i < sizeof(before_sort_array)/5; i++) + { + item.iItem = i; + item.lParam = i; + item.pszText = &before_sort_array[i][0]; + r = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(i, r); + } + + r = SendMessageA(hwnd, LVM_SORTITEMS, (WPARAM)(LPARAM)hwnd, (LPARAM)test_CallBackCompare1); + expect(TRUE, r); + + for (i = 0; i < sizeof(after_sort_arary)/5; i++) + { + CHAR str[5]; + item.iItem = i; + item.cchTextMax = 5; + item.iSubItem = 0; + item.pszText = str; + r = SendMessageA(hwnd, LVM_GETITEMTEXTA, i, (LPARAM)&item); + expect(TRUE, r); + + expect(atoi(after_sort_arary[i]), atoi(str)); + } + DestroyWindow(hwnd); } -- 2.20.1

2 1

[PATCH] taskmgr: Implement process page sorting.
by Haoyang Chen April 6, 2021

April 6, 2021

Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> --- programs/taskmgr/perfdata.c | 76 +++++++++++++++++++++++++++++++++++++ programs/taskmgr/perfdata.h | 1 + programs/taskmgr/procpage.c | 10 ++--- 3 files changed, 81 insertions(+), 6 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index 2cbd6b01669..52a08da4d88 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -833,3 +833,79 @@ ULONG PerfDataGetTotalThreadCount(void) return ThreadCount; } +/* sort code copied from DPA */ +static BOOL bSortAscending = TRUE; +static INT CALLBACK ProcessPageCompareFunc(LPVOID first, LPVOID second, LPARAM lParam) +{ + PPERFDATA pPerfData1 = NULL; + PPERFDATA pPerfData2 = NULL; + INT iSubItem = lParam; + + if (bSortAscending) + { + pPerfData1 = (PPERFDATA) first; + pPerfData2 = (PPERFDATA) second; + } + else + { + pPerfData2 = (PPERFDATA) first; + pPerfData1 = (PPERFDATA) second; + } + + switch (iSubItem) + { + case 0: + return lstrcmpW(pPerfData1->ImageName, pPerfData2->ImageName); + case 1: + return pPerfData1->ProcessId > pPerfData2->ProcessId; + case 2: + return pPerfData1->CPUUsage > pPerfData2->CPUUsage; + case 3: + return pPerfData1->CPUTime.QuadPart > pPerfData2->CPUTime.QuadPart; + case 4: + return pPerfData1->vmCounters.VirtualSize > pPerfData2->vmCounters.VirtualSize; + } + return 0; +} + +static VOID DPA_QuickSort (PPERFDATA lpPtrs, INT l, INT r, + PFNDPACOMPARE pfnCompare, LPARAM lParam) +{ + INT m; + PERFDATA t; + + if (l==r) /* one element is always sorted */ + return; + if (r<l) /* oops, got it in the wrong order */ + { + DPA_QuickSort(lpPtrs, r, l, pfnCompare, lParam); + return; + } + m = (l+r)/2; /* divide by two */ + DPA_QuickSort(lpPtrs, l, m, pfnCompare, lParam); + DPA_QuickSort(lpPtrs, m+1, r, pfnCompare, lParam); + + /* join the two sides */ + while( (l<=m) && (m<r) ) + { + if(pfnCompare(&lpPtrs[l],&lpPtrs[m+1],lParam)>0) + { + t = lpPtrs[m+1]; + memmove(&lpPtrs[l+1],&lpPtrs[l],(m-l+1)*sizeof(lpPtrs[l])); + lpPtrs[l] = t; + + m++; + } + l++; + } +} + +VOID PerDataSort(UINT iSubItem) +{ + EnterCriticalSection(&PerfDataCriticalSection); + + bSortAscending = !bSortAscending; + DPA_QuickSort(pPerfData, 0, ProcessCount - 1, ProcessPageCompareFunc, iSubItem); + + LeaveCriticalSection(&PerfDataCriticalSection); +} \ No newline at end of file diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index 615e7db2a64..f39b03c503d 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -110,4 +110,5 @@ ULONG PerfDataGetSystemHandleCount(void); ULONG PerfDataGetTotalThreadCount(void); +VOID PerDataSort(UINT iSubItem); #endif /* __PERFDATA_H */ diff --git a/programs/taskmgr/procpage.c b/programs/taskmgr/procpage.c index 5ea2e6b044f..f8dc0a0e89d 100644 --- a/programs/taskmgr/procpage.c +++ b/programs/taskmgr/procpage.c @@ -155,12 +155,14 @@ static void ProcessPageOnNotify(LPARAM lParam) ULONG ColumnIndex; IO_COUNTERS iocounters; TIME time; + NMLISTVIEW* pnmListView; static const WCHAR wszFmtD[] = {'%','d',0}; static const WCHAR wszFmt02D[] = {'%','0','2','d',0}; static const WCHAR wszUnitK[] = {' ','K',0}; pnmh = (LPNMHDR) lParam; pnmdi = (NMLVDISPINFOW*) lParam; + pnmListView = (NM_LISTVIEW*)lParam; if (pnmh->hwndFrom == hProcessPageListCtrl) { @@ -343,12 +345,8 @@ static void ProcessPageOnNotify(LPARAM lParam) { case HDN_ITEMCLICKW: - /* - * FIXME: Fix the column sorting - * - *ListView_SortItems(hApplicationPageListCtrl, ApplicationPageCompareFunc, NULL); - *bSortAscending = !bSortAscending; - */ + PerDataSort(pnmListView->iItem); + InvalidateRect(hProcessPageListCtrl, NULL, TRUE); break; -- 2.20.1

2 1

[v3 PATCH 1/2] dhtmled.ocx: Add stub IOleControl interface.
by Vijay Kiran Kamuju April 5, 2021

April 5, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50916 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/dhtmled.ocx/edit.c | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c index 53dcdfc9ac6..e111f0b7979 100644 --- a/dlls/dhtmled.ocx/edit.c +++ b/dlls/dhtmled.ocx/edit.c @@ -30,6 +30,7 @@ typedef struct IDHTMLEdit IDHTMLEdit_iface; IOleObject IOleObject_iface; IPersistStreamInit IPersistStreamInit_iface; + IOleControl IOleControl_iface; IOleClientSite *client_site; SIZEL extent; LONG ref; @@ -50,6 +51,11 @@ static inline DHTMLEditImpl *impl_from_IPersistStreamInit(IPersistStreamInit *if return CONTAINING_RECORD(iface, DHTMLEditImpl, IPersistStreamInit_iface); } +static inline DHTMLEditImpl *impl_from_IOleControl(IOleControl *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IOleControl_iface); +} + static ULONG dhtml_edit_addref(DHTMLEditImpl *This) { LONG ref = InterlockedIncrement(&This->ref); @@ -83,6 +89,12 @@ static HRESULT dhtml_edit_qi(DHTMLEditImpl *This, REFIID iid, void **out) *out = &This->IPersistStreamInit_iface; return S_OK; } + else if(IsEqualGUID(iid, &IID_IOleControl)) + { + dhtml_edit_addref(This); + *out = &This->IOleControl_iface; + return S_OK; + } *out = NULL; ERR("no interface for %s\n", debugstr_guid(iid)); @@ -858,6 +870,59 @@ static const IPersistStreamInitVtbl PersistStreamInitVtbl = { PersistStreamInit_InitNew }; +static HRESULT WINAPI OleControl_QueryInterface(IOleControl *iface, REFIID iid, void **out) +{ + return dhtml_edit_qi(impl_from_IOleControl(iface), iid, out); +} + +static ULONG WINAPI OleControl_AddRef(IOleControl *iface) +{ + return dhtml_edit_addref(impl_from_IOleControl(iface)); +} + +static ULONG WINAPI OleControl_Release(IOleControl *iface) +{ + return dhtml_edit_release(impl_from_IOleControl(iface)); +} + +static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, pCI); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%p)\n", This, msg); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%d)\n", This, dispID); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleControl_FreezeEvents(IOleControl *iface, BOOL freeze) +{ + DHTMLEditImpl *This = impl_from_IOleControl(iface); + FIXME("(%p)->(%x)\n", This, freeze); + return E_NOTIMPL; +} + +static const IOleControlVtbl OleControlVtbl = { + OleControl_QueryInterface, + OleControl_AddRef, + OleControl_Release, + OleControl_GetControlInfo, + OleControl_OnMnemonic, + OleControl_OnAmbientPropertyChange, + OleControl_FreezeEvents +}; + HRESULT dhtml_edit_create(REFIID iid, void **out) { DHTMLEditImpl *This; @@ -874,6 +939,7 @@ HRESULT dhtml_edit_create(REFIID iid, void **out) This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; This->IOleObject_iface.lpVtbl = &OleObjectVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; + This->IOleControl_iface.lpVtbl = &OleControlVtbl; This->client_site = NULL; This->ref = 1; -- 2.31.1

2 3

[PATCH 4/4] makefiles: Install cross importlibs.
by Jacek Caban April 5, 2021

April 5, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Makefile.in | 1 + configure.ac | 7 +++++++ tools/makedep.c | 3 +++ 3 files changed, 11 insertions(+)

1 0

[PATCH 2/4] winegcc: Add Wine include directories before standard directories on search list.
by Jacek Caban April 5, 2021

April 5, 2021

This is especially important for msvcrt headers, which need to be used instead of system ones. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4] winegcc: Use paths for found libraries on PE targets when using msvcrt.
by Jacek Caban April 5, 2021

April 5, 2021

We use -nodefaultlibs now, so we don't need to worry about GCC additions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This series adds minimal support for cross compiling to PE targets with installed winegcc. tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] wined3d: Use VK_EXT_debug_report if available.
by Zebediah Figura April 5, 2021

April 5, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/adapter_vk.c | 60 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_vk.h | 6 ++++ 2 files changed, 66 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 7303c994eb4..e7ef721703c 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -271,6 +271,9 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(adapter); struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + if (vk_info->debug_callback) + VK_CALL(vkDestroyDebugReportCallbackEXT(vk_info->instance, vk_info->debug_callback, NULL)); + VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); wined3d_adapter_cleanup(&adapter_vk->a); @@ -1827,6 +1830,7 @@ static const struct } vulkan_instance_extensions[] = { + {VK_EXT_DEBUG_REPORT_EXTENSION_NAME, ~0u, FALSE}, {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_API_VERSION_1_1, FALSE}, {VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME, VK_API_VERSION_1_1, FALSE}, {VK_KHR_SURFACE_EXTENSION_NAME, ~0u, TRUE}, @@ -1904,6 +1908,34 @@ done: return success; } +static VkBool32 VKAPI_PTR debug_report_callback(VkDebugReportFlagsEXT flags, + VkDebugReportObjectTypeEXT object_type, uint64_t object, size_t location, + int32_t message_code, const char *layer_prefix, const char *message, void *user_data) +{ + FIXME("%s\n", debugstr_a(message)); + return VK_FALSE; +} + +static void init_debug_report(struct wined3d_vk_info *vk_info) +{ + VkDebugReportCallbackCreateInfoEXT callback_info; + VkDebugReportCallbackEXT callback; + VkResult vr; + + callback_info.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT; + callback_info.pNext = NULL; + callback_info.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; + callback_info.pfnCallback = debug_report_callback; + callback_info.pUserData = NULL; + if ((vr = VK_CALL(vkCreateDebugReportCallbackEXT(vk_info->instance, &callback_info, NULL, &callback))) < 0) + { + WARN("Failed to create debug report callback, vr %d.\n", vr); + return; + } + + vk_info->debug_callback = callback; +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { const char *enabled_instance_extensions[ARRAY_SIZE(vulkan_instance_extensions)]; @@ -1914,8 +1946,19 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) VkApplicationInfo app_info; uint32_t api_version = 0; char app_name[MAX_PATH]; + unsigned int i, j; VkResult vr; + static const struct + { + const char *name; + enum wined3d_vk_extension extension; + } + map[] = + { + {VK_EXT_DEBUG_REPORT_EXTENSION_NAME, WINED3D_VK_EXT_DEBUG_REPORT}, + }; + if (!wined3d_load_vulkan(vk_info)) return FALSE; @@ -1953,6 +1996,18 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) memset(vk_info->supported, 0, sizeof(vk_info->supported)); vk_info->supported[WINED3D_VK_EXT_NONE] = TRUE; + for (i = 0; i < ARRAY_SIZE(map); ++i) + { + for (j = 0; j < instance_info.enabledExtensionCount; ++j) + { + if (!strcmp(enabled_instance_extensions[j], map[i].name)) + { + vk_info->supported[map[i].extension] = TRUE; + break; + } + } + } + if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -1989,6 +2044,9 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) vk_info->instance = instance; + if (vk_info->supported[WINED3D_VK_EXT_DEBUG_REPORT]) + init_debug_report(vk_info); + return TRUE; fail: @@ -2366,6 +2424,8 @@ fail: wined3d_adapter_cleanup(adapter); heap_free(adapter_vk->device_extensions); fail_vulkan: + if (vk_info->debug_callback) + VK_CALL(vkDestroyDebugReportCallbackEXT(vk_info->instance, vk_info->debug_callback, NULL)); VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); return FALSE; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index a417a795901..d9d7faa55f6 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -42,6 +42,9 @@ /* Vulkan 1.1 */ \ VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceFeatures2) \ VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2) \ + /* VK_EXT_debug_report */ \ + VK_INSTANCE_EXT_PFN(vkCreateDebugReportCallbackEXT) \ + VK_INSTANCE_EXT_PFN(vkDestroyDebugReportCallbackEXT) \ /* VK_KHR_surface */ \ VK_INSTANCE_PFN(vkDestroySurfaceKHR) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) \ @@ -208,6 +211,7 @@ enum wined3d_vk_extension { WINED3D_VK_EXT_NONE, + WINED3D_VK_EXT_DEBUG_REPORT, WINED3D_VK_EXT_TRANSFORM_FEEDBACK, WINED3D_VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, @@ -225,6 +229,8 @@ struct wined3d_vk_info #ifdef USE_WIN32_VULKAN HMODULE vulkan_lib; #endif + + VkDebugReportCallbackEXT debug_callback; }; #define VK_CALL(f) (vk_info->vk_ops.f) -- 2.30.2

2 1

[PATCH 1/2] mfplat: Add corresponding 'IYUV' type alongside 'I420'.
by Connor McAdams April 5, 2021

April 5, 2021

Add references the 'IYUV' mediatype wherever 'I420' is referenced, as they are identical. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 3 +++ dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 85219c74dd5..c8028b2a46f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2634,6 +2634,7 @@ static const struct uncompressed_video_format video_formats[] = { &MFVideoFormat_IMC2, 1, 0, 0, 1 }, { &MFVideoFormat_IMC3, 2, 3, 0, 1 }, { &MFVideoFormat_IMC4, 1, 0, 0, 1 }, + { &MFVideoFormat_IYUV, 1, 0, 0, 1 }, { &MFVideoFormat_NV12, 1, 0, 0, 1 }, { &MFVideoFormat_D16, 2, 3, 0, 0 }, { &MFVideoFormat_L16, 2, 3, 0, 0 }, @@ -2716,6 +2717,7 @@ HRESULT WINAPI MFCalculateImageSize(REFGUID subtype, UINT32 width, UINT32 height case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): /* 2 x 2 block, interleaving UV for half the height */ *size = ((width + 1) & ~1) * height * 3 / 2; break; @@ -2758,6 +2760,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si case MAKEFOURCC('N','V','1','2'): case MAKEFOURCC('Y','V','1','2'): case MAKEFOURCC('I','4','2','0'): + case MAKEFOURCC('I','Y','U','V'): *size = stride * height * 3 / 2; break; default: diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..45781d3725a 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3965,6 +3965,12 @@ static void test_MFCalculateImageSize(void) { &MFVideoFormat_I420, 4, 3, 18 }, { &MFVideoFormat_I420, 320, 240, 115200 }, + { &MFVideoFormat_IYUV, 1, 1, 3, 1 }, + { &MFVideoFormat_IYUV, 2, 1, 3 }, + { &MFVideoFormat_IYUV, 1, 2, 6, 3 }, + { &MFVideoFormat_IYUV, 4, 3, 18 }, + { &MFVideoFormat_IYUV, 320, 240, 115200 }, + { &MFVideoFormat_YUY2, 2, 1, 4 }, { &MFVideoFormat_YUY2, 4, 3, 24 }, { &MFVideoFormat_YUY2, 128, 128, 32768 }, @@ -5293,6 +5299,10 @@ static void test_MFGetStrideForBitmapInfoHeader(void) { &MFVideoFormat_I420, 2, 2 }, { &MFVideoFormat_I420, 3, 3 }, { &MFVideoFormat_I420, 320, 320 }, + { &MFVideoFormat_IYUV, 1, 1 }, + { &MFVideoFormat_IYUV, 2, 2 }, + { &MFVideoFormat_IYUV, 3, 3 }, + { &MFVideoFormat_IYUV, 320, 320 }, }; unsigned int i; LONG stride; -- 2.25.1

3 3