February 2022 - Wine-commits

Esme Povirk : diasymreader: Return success from SymWriter_Initialize.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 0672c5a4e892beefaae4362a4429be1a8918a1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0672c5a4e892beefaae4362a… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Feb 1 15:56:25 2022 -0600 diasymreader: Return success from SymWriter_Initialize. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/diasymreader/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/diasymreader/writer.c b/dlls/diasymreader/writer.c index 4a1d736770b..7970fbaca9a 100644 --- a/dlls/diasymreader/writer.c +++ b/dlls/diasymreader/writer.c @@ -214,7 +214,7 @@ static HRESULT WINAPI SymWriter_Initialize(ISymUnmanagedWriter5 *iface, IUnknown IStream *pIStream, BOOL fFullBuild) { FIXME("(%p,%p,%s,%p,%u)\n", iface, emitter, debugstr_w(filename), pIStream, fFullBuild); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI SymWriter_GetDebugInfo(ISymUnmanagedWriter5 *iface, IMAGE_DEBUG_DIRECTORY *pIDD, DWORD cData,

1 0

Zebediah Figura : shell32: Move file menu definitions to shlmenu.c.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: ac987baee723ff3f47c9b2cfbcc87fd8d2c38ae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac987baee723ff3f47c9b2cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 19:32:49 2022 -0600 shell32: Move file menu definitions to shlmenu.c. There's no need to document anything in a common header. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 26 ++++++++-- dlls/shell32/undocshell.h | 130 ---------------------------------------------- 2 files changed, 21 insertions(+), 135 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index e4afe3dcfdc..60bb2a058c4 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -30,7 +30,6 @@ #include "wingdi.h" #include "winuser.h" #include "shlobj.h" -#include "undocshell.h" #include "shlwapi.h" #include "shell32_main.h" @@ -38,13 +37,30 @@ #include "wine/debug.h" #include "debughlp.h" -#ifdef FM_SEPARATOR -#undef FM_SEPARATOR -#endif -#define FM_SEPARATOR (LPCWSTR)1 +/* FileMenu_Create nSelHeight constants */ +#define FM_DEFAULT_SELHEIGHT -1 +#define FM_FULL_SELHEIGHT 0 + +/* FileMenu_Create flags */ +#define FMF_SMALL_ICONS 0x00 +#define FMF_LARGE_ICONS 0x08 +#define FMF_NO_COLUMN_BREAK 0x10 + +/* FileMenu_AppendItem constants */ +#define FM_SEPARATOR ((const WCHAR *)1) +#define FM_BLANK_ICON -1 +#define FM_DEFAULT_HEIGHT 0 + +/* FileMenu_InsertUsingPidl flags */ +#define FMF_NO_EMPTY_ITEM 0x01 +#define FMF_NO_PROGRAM_GROUPS 0x04 + +/* FileMenu_InsertUsingPidl callback function */ +typedef void (CALLBACK *LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile); static BOOL FileMenu_AppendItemW(HMENU hMenu, LPCWSTR lpText, UINT uID, int icon, HMENU hMenuPopup, int nItemHeight); +BOOL WINAPI FileMenu_DeleteAllItems(HMENU hMenu); typedef struct { diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 9b3d844b876..9af57b4fe7f 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -193,136 +193,6 @@ HICON WINAPI SHGetFileIcon( BOOL WINAPI FileIconInit(BOOL bFullInit); -/**************************************************************************** - * File Menu Routines - */ -/* FileMenu_Create nSelHeight constants */ -#define FM_DEFAULT_SELHEIGHT -1 -#define FM_FULL_SELHEIGHT 0 - -/* FileMenu_Create flags */ -#define FMF_SMALL_ICONS 0x00 -#define FMF_LARGE_ICONS 0x08 -#define FMF_NO_COLUMN_BREAK 0x10 - -HMENU WINAPI FileMenu_Create( - COLORREF crBorderColor, - int nBorderWidth, - HBITMAP hBorderBmp, - int nSelHeight, - UINT uFlags); - -void WINAPI FileMenu_Destroy(HMENU hMenu); - -/* FileMenu_AppendItem constants */ -#define FM_SEPARATOR (LPCSTR)1 -#define FM_BLANK_ICON -1 -#define FM_DEFAULT_HEIGHT 0 - -BOOL WINAPI FileMenu_AppendItem( - HMENU hMenu, - LPCSTR lpszText, - UINT uID, - int iIcon, - HMENU hMenuPopup, - int nItemHeight); - -/* FileMenu_InsertUsingPidl flags */ -#define FMF_NO_EMPTY_ITEM 0x01 -#define FMF_NO_PROGRAM_GROUPS 0x04 - -/* FileMenu_InsertUsingPidl callback function */ -typedef void (CALLBACK *LPFNFMCALLBACK)(LPCITEMIDLIST pidlFolder, LPCITEMIDLIST pidlFile); - -int WINAPI FileMenu_InsertUsingPidl( - HMENU hMenu, - UINT uID, - LPCITEMIDLIST pidl, - UINT uFlags, - UINT uEnumFlags, - LPFNFMCALLBACK lpfnCallback); - -int WINAPI FileMenu_ReplaceUsingPidl( - HMENU hMenu, - UINT uID, - LPCITEMIDLIST pidl, - UINT uEnumFlags, - LPFNFMCALLBACK lpfnCallback); - -void WINAPI FileMenu_Invalidate(HMENU hMenu); - -HMENU WINAPI FileMenu_FindSubMenuByPidl( - HMENU hMenu, - LPCITEMIDLIST pidl); - -BOOL WINAPI FileMenu_TrackPopupMenuEx( - HMENU hMenu, - UINT uFlags, - int x, - int y, - HWND hWnd, - LPTPMPARAMS lptpm); - -BOOL WINAPI FileMenu_GetLastSelectedItemPidls( - UINT uReserved, - LPCITEMIDLIST *ppidlFolder, - LPCITEMIDLIST *ppidlItem); - -LRESULT WINAPI FileMenu_MeasureItem( - HWND hWnd, - LPMEASUREITEMSTRUCT lpmis); - -LRESULT WINAPI FileMenu_DrawItem( - HWND hWnd, - LPDRAWITEMSTRUCT lpdis); - -BOOL WINAPI FileMenu_InitMenuPopup(HMENU hMenu); - -void WINAPI FileMenu_AbortInitMenu(void); - -LRESULT WINAPI FileMenu_HandleMenuChar( - HMENU hMenu, - WPARAM wParam); - -BOOL WINAPI FileMenu_DeleteAllItems(HMENU hMenu); - -BOOL WINAPI FileMenu_DeleteItemByCmd( - HMENU hMenu, - UINT uID); - -BOOL WINAPI FileMenu_DeleteItemByIndex( - HMENU hMenu, - UINT uPos); - -BOOL WINAPI FileMenu_DeleteMenuItemByFirstID( - HMENU hMenu, - UINT uID); - -BOOL WINAPI FileMenu_DeleteSeparator(HMENU hMenu); - -BOOL WINAPI FileMenu_EnableItemByCmd( - HMENU hMenu, - UINT uID, - BOOL bEnable); - -DWORD WINAPI FileMenu_GetItemExtent( - HMENU hMenu, - UINT uPos); - -int WINAPI FileMenu_AppendFilesForPidl( - HMENU hMenu, - LPCITEMIDLIST pidl, - BOOL bAddSeparator); - -int WINAPI FileMenu_AddFilesForPidl( - HMENU hMenu, - UINT uReserved, - UINT uID, - LPCITEMIDLIST pidl, - UINT uFlags, - UINT uEnumFlags, - LPFNFMCALLBACK lpfnCallback); - /**************************************************************************** * Drag And Drop Routines */

1 0

Zebediah Figura : shell32: Move PIDL definitions from undocshell.h to pidl.h.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: c7f58d2be35bffdf747b28c1b49fdb121b712a50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7f58d2be35bffdf747b28c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 19:32:50 2022 -0600 shell32: Move PIDL definitions from undocshell.h to pidl.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/changenotify.c | 1 + dlls/shell32/pidl.h | 8 ++++++++ dlls/shell32/undocshell.h | 29 ----------------------------- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index f8714627eb6..40ccb891589 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -26,6 +26,7 @@ #include "wine/list.h" #include "wine/debug.h" #include "shell32_main.h" +#include "pidl.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); diff --git a/dlls/shell32/pidl.h b/dlls/shell32/pidl.h index fc14ab3c1c8..7aaea904a68 100644 --- a/dlls/shell32/pidl.h +++ b/dlls/shell32/pidl.h @@ -270,6 +270,14 @@ void _ILFreeaPidl(LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; LPITEMIDLIST * _ILCopyaPidl(const LPCITEMIDLIST * apidlsrc, UINT cidl) DECLSPEC_HIDDEN; LPITEMIDLIST * _ILCopyCidaToaPidl(LPITEMIDLIST* pidl, const CIDA * cida) DECLSPEC_HIDDEN; +/* type parameter for ILGetDisplayNameEx() */ +#define ILGDN_FORPARSING 0 +#define ILGDN_NORMAL 1 +#define ILGDN_INFOLDER 2 + BOOL ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR path, DWORD type) DECLSPEC_HIDDEN; +HRESULT SHILCreateFromPathW(const WCHAR *path, LPITEMIDLIST *pidl, DWORD *attributes); +LPITEMIDLIST SHSimpleIDListFromPathA(const char *path); +LPITEMIDLIST SHSimpleIDListFromPathW(const WCHAR *path); #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 9af57b4fe7f..b606f1789d6 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -31,35 +31,6 @@ extern "C" { #endif /* defined(__cplusplus) */ -/**************************************************************************** - * IDList Functions - */ -BOOL WINAPI ILGetDisplayName( - LPCITEMIDLIST pidl, - LPVOID path); - -/* type parameter for ILGetDisplayNameEx() */ -#define ILGDN_FORPARSING 0 -#define ILGDN_NORMAL 1 -#define ILGDN_INFOLDER 2 - -BOOL WINAPI ILGetDisplayNameEx( - LPSHELLFOLDER psf, - LPCITEMIDLIST pidl, - LPVOID path, - DWORD type); - -LPITEMIDLIST WINAPI ILGlobalClone(LPCITEMIDLIST pidl); -void WINAPI ILGlobalFree(LPITEMIDLIST pidl); - -LPITEMIDLIST SHSimpleIDListFromPathA (LPCSTR lpszPath); -LPITEMIDLIST SHSimpleIDListFromPathW (LPCWSTR lpszPath); - -HRESULT SHILCreateFromPathW ( - LPCWSTR path, - LPITEMIDLIST * ppidl, - DWORD *attributes); - /* string functions */

1 0

Zebediah Figura : shell32: Do not redefine SHCNRF_* flags.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 6d7f9a9bee4ff1c8fe3e9f23df8fe6fb600d8736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d7f9a9bee4ff1c8fe3e9f23… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 19:32:51 2022 -0600 shell32: Do not redefine SHCNRF_* flags. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/undocshell.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index b606f1789d6..afa87f40f5b 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -37,15 +37,6 @@ extern "C" { BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); - -/**************************************************************************** -* SHChangeNotifyRegister API -*/ -#define SHCNRF_InterruptLevel 0x0001 -#define SHCNRF_ShellLevel 0x0002 -#define SHCNRF_RecursiveInterrupt 0x1000 /* Must be combined with SHCNRF_InterruptLevel */ -#define SHCNRF_NewDelivery 0x8000 /* Messages use shared memory */ - /**************************************************************************** * Shell Common Dialogs */

1 0

Zebediah Figura : shell32: Move dialog definitions to dialog.c.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 086ba9ea12f2adde009274c603283ff1a0b3a2f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086ba9ea12f2adde009274c6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 19:32:52 2022 -0600 shell32: Move dialog definitions to dialog.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dialogs.c | 21 +++++++++++++++++++ dlls/shell32/undocshell.h | 52 ----------------------------------------------- 2 files changed, 21 insertions(+), 52 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index aa6ef7fe6a9..70548389e15 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -36,6 +36,27 @@ #include "shresdef.h" #include "undocshell.h" +/* RunFileDlg flags */ +#define RFF_NOBROWSE 0x01 +#define RFF_NODEFAULT 0x02 +#define RFF_CALCDIRECTORY 0x04 +#define RFF_NOLABEL 0x08 +#define RFF_NOSEPARATEMEM 0x20 /* NT only */ + +/* RunFileFlg notification structure */ +typedef struct +{ + NMHDR hdr; + const char *lpFile; + const char *lpDirectory; + int nShow; +} NM_RUNFILEDLG; + +/* RunFileDlg notification return values */ +#define RF_OK 0x00 +#define RF_CANCEL 0x01 +#define RF_RETRY 0x02 + typedef struct { HWND hwndOwner ; diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index afa87f40f5b..b0975559c6f 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -37,58 +37,6 @@ extern "C" { BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); -/**************************************************************************** - * Shell Common Dialogs - */ - -/* RunFileDlg flags */ -#define RFF_NOBROWSE 0x01 -#define RFF_NODEFAULT 0x02 -#define RFF_CALCDIRECTORY 0x04 -#define RFF_NOLABEL 0x08 -#define RFF_NOSEPARATEMEM 0x20 /* NT only */ - -/* RunFileFlg notification structure */ -typedef struct -{ - NMHDR hdr; - LPCSTR lpFile; - LPCSTR lpDirectory; - int nShow; -} NM_RUNFILEDLG, * LPNM_RUNFILEDLG; - -/* RunFileDlg notification return values */ -#define RF_OK 0x00 -#define RF_CANCEL 0x01 -#define RF_RETRY 0x02 - -void WINAPI RunFileDlg( - HWND hwndOwner, - HICON hIcon, - LPCSTR lpstrDirectory, - LPCSTR lpstrTitle, - LPCSTR lpstrDescription, - UINT uFlags); - -void WINAPI ExitWindowsDialog(HWND hwndOwner); - -BOOL WINAPI SHFindComputer( - LPCITEMIDLIST pidlRoot, - LPCITEMIDLIST pidlSavedSearch); - -void WINAPI SHHandleDiskFull(HWND hwndOwner, - UINT uDrive); - -int WINAPI SHOutOfMemoryMessageBox( - HWND hwndOwner, - LPCSTR lpCaption, - UINT uType); - -DWORD WINAPI SHNetConnectionDialog( - HWND hwndOwner, - LPCSTR lpstrRemoteName, - DWORD dwType); - /**************************************************************************** * Memory Routines */

1 0

Zebediah Figura : shell32: Move IShellFolderViewCB definitions to shlview.c.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: ebdd0c1c70801fc0ce0f15bf1dcf6bcc14439afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebdd0c1c70801fc0ce0f15bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 19:32:53 2022 -0600 shell32: Move IShellFolderViewCB definitions to shlview.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/shell32/undocshell.h | 42 ------------------------------------------ 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index a2afc72b7a9..0ffe2e4e9cf 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -66,6 +66,45 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); +/* Generic structure used by several messages */ +typedef struct +{ + DWORD dwReserved; + DWORD dwReserved2; + LPCITEMIDLIST pidl; + DWORD *lpdwUser; +} SFVCBINFO; + +/* SFVCB_SELECTIONCHANGED structure */ +typedef struct +{ + UINT uOldState; + UINT uNewState; + LPCITEMIDLIST pidl; + DWORD *lpdwUser; +} SFVSELECTSTATE; + +/* SFVCB_COPYHOOKCALLBACK structure */ +typedef struct +{ + HWND hwnd; + UINT wFunc; + UINT wFlags; + const char *pszSrcFile; + DWORD dwSrcAttribs; + const char *pszDestFile; + DWORD dwDestAttribs; +} SFVCOPYHOOKINFO; + +/* SFVCB_GETDETAILSOF structure */ +typedef struct +{ + LPCITEMIDLIST pidl; + int fmt; + int cx; + STRRET lpText; +} SFVCOLUMNINFO; + typedef struct { BOOL bIsAscending; INT nHeaderID; diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index b0975559c6f..5ed8d25f234 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -204,48 +204,6 @@ BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID *sOtherDirs); * Shell Namespace Routines */ -/* Generic structure used by several messages */ -typedef struct -{ - DWORD dwReserved; - DWORD dwReserved2; - LPCITEMIDLIST pidl; - LPDWORD lpdwUser; -} SFVCBINFO, * LPSFVCBINFO; -typedef const SFVCBINFO * LPCSFVCBINFO; - -/* SFVCB_SELECTIONCHANGED structure */ -typedef struct -{ - UINT uOldState; - UINT uNewState; - LPCITEMIDLIST pidl; - LPDWORD lpdwUser; -} SFVSELECTSTATE, * LPSFVSELECTSTATE; -typedef const SFVSELECTSTATE * LPCSFVSELECTSTATE; - -/* SFVCB_COPYHOOKCALLBACK structure */ -typedef struct -{ - HWND hwnd; - UINT wFunc; - UINT wFlags; - LPCSTR pszSrcFile; - DWORD dwSrcAttribs; - LPCSTR pszDestFile; - DWORD dwDestAttribs; -} SFVCOPYHOOKINFO, * LPSFVCOPYHOOKINFO; -typedef const SFVCOPYHOOKINFO * LPCSFVCOPYHOOKINFO; - -/* SFVCB_GETDETAILSOF structure */ -typedef struct -{ - LPCITEMIDLIST pidl; - int fmt; - int cx; - STRRET lpText; -} SFVCOLUMNINFO, * LPSFVCOLUMNINFO; - /**************************************************************************** * Misc Stuff */

1 0

Zebediah Figura : quartz/vmr9: Get rid of a broken check for hardware acceleration support in VMR9DefaultAllocatorPresenterImpl_create().
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 0e4620dcd4339aa0fd2fb44871e10eb75d485d06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4620dcd4339aa0fd2fb448… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 22:37:40 2022 -0600 quartz/vmr9: Get rid of a broken check for hardware acceleration support in VMR9DefaultAllocatorPresenterImpl_create(). It doesn't check for hardware acceleration for the adapter that we're actually going to use, and we don't actually care what the swapchain format is anyway. If the device doesn't support hardware acceleration we'll fail later when trying to actually create it. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4bde811c6d7..f992f1136c7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2987,8 +2987,6 @@ static IDirect3D9 *init_d3d9(HMODULE d3d9_handle) static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *parent, LPVOID * ppv) { struct default_presenter *object; - HRESULT hr = S_OK; - int i; if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; @@ -3001,24 +2999,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren return VFW_E_DDRAW_CAPS_NOT_SUITABLE; } - i = 0; - do - { - D3DDISPLAYMODE mode; - - hr = IDirect3D9_EnumAdapterModes(object->d3d9_ptr, i++, D3DFMT_X8R8G8B8, 0, &mode); - if (hr == D3DERR_INVALIDCALL) break; /* out of adapters */ - } while (FAILED(hr)); - if (FAILED(hr)) - ERR("HR: %08x\n", hr); - if (hr == D3DERR_NOTAVAILABLE) - { - ERR("Format not supported\n"); - IDirect3D9_Release(object->d3d9_ptr); - free(object); - return VFW_E_DDRAW_CAPS_NOT_SUITABLE; - } - object->IVMRImagePresenter9_iface.lpVtbl = &VMR9_ImagePresenter; object->IVMRSurfaceAllocator9_iface.lpVtbl = &VMR9_SurfaceAllocator;

1 0

Zebediah Figura : quartz/vmr9: Pass the already retrieved caps pointer to VMR9_SurfaceAllocator_SetAllocationSettings().
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 3105c22d0ddf396f619443798fb01ae76d9c3bab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3105c22d0ddf396f61944379… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 22:37:41 2022 -0600 quartz/vmr9: Pass the already retrieved caps pointer to VMR9_SurfaceAllocator_SetAllocationSettings(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f992f1136c7..78e47bbb908 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2778,21 +2778,15 @@ static ULONG WINAPI VMR9_SurfaceAllocator_Release(IVMRSurfaceAllocator9 *iface) return IVMRImagePresenter9_Release(&presenter->IVMRImagePresenter9_iface); } -static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presenter *This, VMR9AllocationInfo *allocinfo) +static void adjust_surface_size(const D3DCAPS9 *caps, VMR9AllocationInfo *allocinfo) { - D3DCAPS9 caps; UINT width, height; - HRESULT hr; + /* There are no restrictions on the size of offscreen surfaces. */ if (!(allocinfo->dwFlags & VMR9AllocFlag_TextureSurface)) - /* Only needed for texture surfaces */ - return S_OK; - - hr = IDirect3DDevice9_GetDeviceCaps(This->d3d9_dev, &caps); - if (FAILED(hr)) - return hr; + return; - if (!(caps.TextureCaps & D3DPTEXTURECAPS_POW2) || (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY)) + if (!(caps->TextureCaps & D3DPTEXTURECAPS_POW2) || (caps->TextureCaps & D3DPTEXTURECAPS_SQUAREONLY)) { width = allocinfo->dwWidth; height = allocinfo->dwHeight; @@ -2808,7 +2802,7 @@ static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presen FIXME("NPOW2 support missing, not using proper surfaces!\n"); } - if (caps.TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) + if (caps->TextureCaps & D3DPTEXTURECAPS_SQUAREONLY) { if (height > width) width = height; @@ -2819,8 +2813,6 @@ static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(struct default_presen allocinfo->dwHeight = height; allocinfo->dwWidth = width; - - return hr; } static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_out) @@ -2899,19 +2891,13 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato if (!(This->d3d9_surfaces = calloc(*numbuffers, sizeof(IDirect3DSurface9 *)))) return E_OUTOFMEMORY; - hr = VMR9_SurfaceAllocator_SetAllocationSettings(This, info); - if (FAILED(hr)) - ERR("Setting allocation settings failed: %08x\n", hr); - - if (SUCCEEDED(hr)) - { - hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(This->SurfaceAllocatorNotify, info, numbuffers, This->d3d9_surfaces); - if (FAILED(hr)) - ERR("Allocating surfaces failed: %08x\n", hr); - } + adjust_surface_size(&caps, info); + hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(This->SurfaceAllocatorNotify, + info, numbuffers, This->d3d9_surfaces); if (FAILED(hr)) { + ERR("Failed to allocate surfaces, hr %#x.\n", hr); IVMRSurfaceAllocator9_TerminateDevice(This->pVMR9->allocator, This->pVMR9->cookie); return hr; }

1 0

Zebediah Figura : quartz/filtergraph: Implement the IDispatch methods for IMediaControl.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: e68a1009ad0f2f07b56113bb285695d50c912c86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e68a1009ad0f2f07b56113bb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 1 22:37:42 2022 -0600 quartz/filtergraph: Implement the IDispatch methods for IMediaControl. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 57 ++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d20687c1b38..a98b0360e20 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1650,47 +1650,52 @@ static ULONG WINAPI MediaControl_Release(IMediaControl *iface) } -/*** IDispatch methods ***/ -static HRESULT WINAPI MediaControl_GetTypeInfoCount(IMediaControl *iface, UINT *pctinfo) +static HRESULT WINAPI MediaControl_GetTypeInfoCount(IMediaControl *iface, UINT *count) { - struct filter_graph *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, pctinfo); - + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; return S_OK; } -static HRESULT WINAPI MediaControl_GetTypeInfo(IMediaControl *iface, UINT iTInfo, LCID lcid, - ITypeInfo **ppTInfo) +static HRESULT WINAPI MediaControl_GetTypeInfo(IMediaControl *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - struct filter_graph *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->(%d, %d, %p): stub !!!\n", This, iface, iTInfo, lcid, ppTInfo); - - return S_OK; + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IMediaControl_tid, typeinfo); } -static HRESULT WINAPI MediaControl_GetIDsOfNames(IMediaControl *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +static HRESULT WINAPI MediaControl_GetIDsOfNames(IMediaControl *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - struct filter_graph *This = impl_from_IMediaControl(iface); + ITypeInfo *typeinfo; + HRESULT hr; - TRACE("(%p/%p)->(%s, %p, %d, %d, %p): stub !!!\n", This, iface, debugstr_guid(riid), rgszNames, - cNames, lcid, rgDispId); + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); - return S_OK; + if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaControl_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } + return hr; } -static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExepInfo, - UINT *puArgErr) +static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - struct filter_graph *This = impl_from_IMediaControl(iface); + ITypeInfo *typeinfo; + HRESULT hr; - TRACE("(%p/%p)->(%d, %s, %d, %04x, %p, %p, %p, %p): stub !!!\n", This, iface, dispIdMember, - debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); - return S_OK; + if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaControl_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } + return hr; } static void update_render_count(struct filter_graph *graph)

1 0

Zebediah Figura : quartz/filtergraph: Implement the IDispatch methods for IMediaPosition.
by Alexandre Julliard 02 Feb '22

02 Feb '22

Module: wine Branch: master Commit: 8a2cdd7aa655d2cc213a4bc76187d9d9b5bfb3dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2cdd7aa655d2cc213a4bc7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 1 22:37:43 2022 -0600 quartz/filtergraph: Implement the IDispatch methods for IMediaPosition. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 49 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a98b0360e20..7e3d9fac16a 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2543,29 +2543,52 @@ static ULONG WINAPI MediaPosition_Release(IMediaPosition *iface) return IUnknown_Release(graph->outer_unk); } -/*** IDispatch methods ***/ -static HRESULT WINAPI MediaPosition_GetTypeInfoCount(IMediaPosition *iface, UINT* pctinfo) +static HRESULT WINAPI MediaPosition_GetTypeInfoCount(IMediaPosition *iface, UINT *count) { - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; + TRACE("iface %p, count %p.\n", iface, count); + *count = 1; + return S_OK; } -static HRESULT WINAPI MediaPosition_GetTypeInfo(IMediaPosition *iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) +static HRESULT WINAPI MediaPosition_GetTypeInfo(IMediaPosition *iface, UINT index, + LCID lcid, ITypeInfo **typeinfo) { - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, lcid %#x, typeinfo %p.\n", iface, index, lcid, typeinfo); + return strmbase_get_typeinfo(IMediaPosition_tid, typeinfo); } -static HRESULT WINAPI MediaPosition_GetIDsOfNames(IMediaPosition* iface, REFIID riid, LPOLESTR* rgszNames, UINT cNames, LCID lcid, DISPID* rgDispId) +static HRESULT WINAPI MediaPosition_GetIDsOfNames(IMediaPosition *iface, REFIID iid, + LPOLESTR *names, UINT count, LCID lcid, DISPID *ids) { - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, iid %s, names %p, count %u, lcid %#x, ids %p.\n", + iface, debugstr_guid(iid), names, count, lcid, ids); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo))) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, ids); + ITypeInfo_Release(typeinfo); + } + return hr; } -static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) +static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition *iface, DISPID id, REFIID iid, LCID lcid, + WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *error_arg) { - FIXME("(%p) stub!\n", iface); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("iface %p, id %d, iid %s, lcid %#x, flags %#x, params %p, result %p, excepinfo %p, error_arg %p.\n", + iface, id, debugstr_guid(iid), lcid, flags, params, result, excepinfo, error_arg); + + if (SUCCEEDED(hr = strmbase_get_typeinfo(IMediaPosition_tid, &typeinfo))) + { + hr = ITypeInfo_Invoke(typeinfo, iface, id, flags, params, result, excepinfo, error_arg); + ITypeInfo_Release(typeinfo); + } + return hr; } static HRESULT ConvertFromREFTIME(IMediaSeeking *seek, REFTIME time_in, LONGLONG *time_out)

1 0