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

[PATCH v2 2/2] ddraw: Allow to create managed textures with DDSCAPS_TEXTURE|DDSCAPS_3DDEVICE caps.
by Akihiro Sagawa March 30, 2020

March 30, 2020

In v2, revise commit message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48844 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ddraw/surface.c | 1 + dlls/ddraw/tests/ddraw7.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH v2 2/2] shell32: Implement IFileOperation stub.
by Jactry Zeng March 30, 2020

March 30, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48848 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/shell32/shell32_classes.idl | 6 + dlls/shell32/shell32_main.h | 1 + dlls/shell32/shellole.c | 1 + dlls/shell32/shlfileop.c | 249 +++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfileop.c | 29 ++++ 5 files changed, 286 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index 6ed497fea5..f2c5ed4a76 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -166,3 +166,9 @@ coclass KnownFolderManager { interface IKnownFolderManager; } threading(apartment), uuid(66e4e4fb-f385-4dd0-8d74-a2efd1bc6178) ] coclass ShellImageDataFactory { interface IShellImageDataFactory; } + +[ + helpstring("Copy/Move/Rename/Delete/Link Object"), + threading(apartment), + uuid(3ad05575-8857-4850-9277-11b85bdb8e09) +] coclass FileOperation { interface IFileOperation; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 11a96309e8..37c74612c0 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -103,6 +103,7 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput) DECLSPEC_HIDDEN; HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT WINAPI KnownFolderManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **out) DECLSPEC_HIDDEN; extern HRESULT CPanel_GetIconLocationW(LPCITEMIDLIST, LPWSTR, UINT, int*) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconA(LPITEMIDLIST pidl, LPCSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIconIndex, HICON *phiconLarge, HICON *phiconSmall, UINT nIconSize) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index e84402d7bc..3c88642512 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -89,6 +89,7 @@ static const struct { {&CLSID_Shell, IShellDispatch_Constructor}, {&CLSID_DestinationList, CustomDestinationList_Constructor}, {&CLSID_ShellImageDataFactory, ShellImageDataFactory_Constructor}, + {&CLSID_FileOperation, IFileOperation_Constructor}, {NULL, NULL} }; diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index b941db3914..5a507c3c11 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -24,6 +24,8 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS + #include <stdarg.h> #include <string.h> #include <ctype.h> @@ -1809,3 +1811,250 @@ HRESULT WINAPI SHMultiFileProperties(IDataObject *pdtobj, DWORD flags) FIXME("stub: %p %u\n", pdtobj, flags); return E_NOTIMPL; } + +struct file_operation +{ + IFileOperation IFileOperation_iface; + LONG ref; +}; + +static inline struct file_operation *impl_from_IFileOperation(IFileOperation *iface) +{ + return CONTAINING_RECORD(iface, struct file_operation, IFileOperation_iface); +} + +static HRESULT WINAPI file_operation_QueryInterface(IFileOperation *iface, REFIID riid, void **out) +{ + struct file_operation *This = impl_from_IFileOperation(iface); + + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(&IID_IFileOperation, riid) || + IsEqualIID(&IID_IUnknown, riid)) + *out = &This->IFileOperation_iface; + else + { + FIXME("not implemented for %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI file_operation_AddRef(IFileOperation *iface) +{ + struct file_operation *This = impl_from_IFileOperation(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + return ref; +} + +static ULONG WINAPI file_operation_Release(IFileOperation *iface) +{ + struct file_operation *This = impl_from_IFileOperation(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p): ref=%u.\n", iface, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI file_operation_Advise(IFileOperation *iface, IFileOperationProgressSink *sink, DWORD *cookie) +{ + FIXME("(%p, %p, %p): stub.\n", iface, sink, cookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_Unadvise(IFileOperation *iface, DWORD cookie) +{ + FIXME("(%p, %x): stub.\n", iface, cookie); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_SetOperationFlags(IFileOperation *iface, DWORD flags) +{ + FIXME("(%p, %x): stub.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_SetProgressMessage(IFileOperation *iface, LPCWSTR message) +{ + FIXME("(%p, %s): stub.\n", iface, debugstr_w(message)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_SetProgressDialog(IFileOperation *iface, IOperationsProgressDialog *dialog) +{ + FIXME("(%p, %p): stub.\n", iface, dialog); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_SetProperties(IFileOperation *iface, IPropertyChangeArray *array) +{ + FIXME("(%p, %p): stub.\n", iface, array); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_SetOwnerWindow(IFileOperation *iface, HWND owner) +{ + FIXME("(%p, %p): stub.\n", iface, owner); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_ApplyPropertiesToItem(IFileOperation *iface, IShellItem *item) +{ + FIXME("(%p, %p): stub.\n", iface, item); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_ApplyPropertiesToItems(IFileOperation *iface, IUnknown *items) +{ + FIXME("(%p, %p): stub.\n", iface, items); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_RenameItem(IFileOperation *iface, IShellItem *item, LPCWSTR name, + IFileOperationProgressSink *sink) +{ + FIXME("(%p, %p, %s, %p): stub.\n", iface, item, debugstr_w(name), sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_RenameItems(IFileOperation *iface, IUnknown *items, LPCWSTR name) +{ + FIXME("(%p, %p, %s): stub.\n", iface, items, debugstr_w(name)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_MoveItem(IFileOperation *iface, IShellItem *item, IShellItem *folder, + LPCWSTR name, IFileOperationProgressSink *sink) +{ + FIXME("(%p, %p, %p, %s, %p): stub.\n", iface, item, folder, debugstr_w(name), sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_MoveItems(IFileOperation *iface, IUnknown *items, IShellItem *folder) +{ + FIXME("(%p, %p, %p): stub.\n", iface, items, folder); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_CopyItem(IFileOperation *iface, IShellItem *item, IShellItem *folder, + LPCWSTR name, IFileOperationProgressSink *sink) +{ + FIXME("(%p, %p, %p, %s, %p): stub.\n", iface, item, folder, debugstr_w(name), sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_CopyItems(IFileOperation *iface, IUnknown *items, IShellItem *folder) +{ + FIXME("(%p, %p, %p): stub.\n", iface, items, folder); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_DeleteItem(IFileOperation *iface, IShellItem *item, + IFileOperationProgressSink *sink) +{ + FIXME("(%p, %p, %p): stub.\n", iface, item, sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_DeleteItems(IFileOperation *iface, IUnknown *items) +{ + FIXME("(%p, %p): stub.\n", iface, items); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_NewItem(IFileOperation *iface, IShellItem *folder, DWORD attributes, + LPCWSTR name, LPCWSTR template, IFileOperationProgressSink *sink) +{ + FIXME("(%p, %p, %x, %s, %s, %p): stub.\n", iface, folder, attributes, + debugstr_w(name), debugstr_w(template), sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_PerformOperations(IFileOperation *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI file_operation_GetAnyOperationsAborted(IFileOperation *iface, BOOL *aborted) +{ + FIXME("(%p, %p): stub.\n", iface, aborted); + + return E_NOTIMPL; +} + +static const IFileOperationVtbl file_operation_vtbl = +{ + file_operation_QueryInterface, + file_operation_AddRef, + file_operation_Release, + file_operation_Advise, + file_operation_Unadvise, + file_operation_SetOperationFlags, + file_operation_SetProgressMessage, + file_operation_SetProgressDialog, + file_operation_SetProperties, + file_operation_SetOwnerWindow, + file_operation_ApplyPropertiesToItem, + file_operation_ApplyPropertiesToItems, + file_operation_RenameItem, + file_operation_RenameItems, + file_operation_MoveItem, + file_operation_MoveItems, + file_operation_CopyItem, + file_operation_CopyItems, + file_operation_DeleteItem, + file_operation_DeleteItems, + file_operation_NewItem, + file_operation_PerformOperations, + file_operation_GetAnyOperationsAborted +}; + +HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **out) +{ + struct file_operation *object; + HRESULT hr; + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IFileOperation_iface.lpVtbl = &file_operation_vtbl; + object->ref = 1; + + hr = IFileOperation_QueryInterface(&object->IFileOperation_iface, riid, out); + IFileOperation_Release(&object->IFileOperation_iface); + + return hr; +} diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 27c7244042..ed98d24b41 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -2697,6 +2697,29 @@ static BOOL is_old_shell32(void) return FALSE; } +static void test_file_operation(void) +{ + IFileOperation *operation; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FileOperation, NULL, CLSCTX_INPROC_SERVER, + &IID_IFileOperation, (void **)&operation); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /* before vista */, + "Got hr %#x.\n", hr); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("IFileOperation isn't supported.\n"); + return; + } + + hr = IFileOperation_QueryInterface(operation, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + + IFileOperation_Release(operation); +} + START_TEST(shlfileop) { clean_after_shfo_tests(); @@ -2742,4 +2765,10 @@ START_TEST(shlfileop) test_unicode(); test_shlmenu(); + + CoInitialize(NULL); + + test_file_operation(); + + CoUninitialize(); } -- 2.26.0

2 1

[PATCH 1/2] ddraw/tests: Add more managed texture tests.
by Akihiro Sagawa March 30, 2020

March 30, 2020

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ddraw/tests/ddraw4.c | 13 ++++++++++++- dlls/ddraw/tests/ddraw7.c | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-)

2 2

[PATCH v2 1/2] include: Add IFileOperation interface.
by Jactry Zeng March 30, 2020

March 30, 2020

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- include/shobjidl.idl | 117 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 42ef264ed8..ab9b64430a 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3871,4 +3871,121 @@ library ShellObjects { interface IApplicationActivationManager; } + + [ + uuid(3ad05575-8857-4850-9277-11b85bdb8e09) + ] + coclass FileOperation + { + interface IFileOperation; + } +} + +[v1_enum] enum _OPPROGDLGF +{ + OPPROGDLG_DEFAULT = 0x00000000, + OPPROGDLG_ENABLEPAUSE = 0x00000080, + OPPROGDLG_ALLOWUNDO = 0x00000100, + OPPROGDLG_DONTDISPLAYSOURCEPATH = 0x00000200, + OPPROGDLG_DONTDISPLAYDESTPATH = 0x00000400, + OPPROGDLG_NOMULTIDAYESTIMATES = 0x00000800, + OPPROGDLG_DONTDISPLAYLOCATIONS = 0x00001000, +}; +typedef DWORD OPPROGDLGF; + +typedef [v1_enum] enum _SPACTION { + SPACTION_NONE = 0, + SPACTION_MOVING, + SPACTION_COPYING, + SPACTION_RECYCLING, + SPACTION_APPLYINGATTRIBS, + SPACTION_DOWNLOADING, + SPACTION_SEARCHING_INTERNET, + SPACTION_CALCULATING, + SPACTION_UPLOADING, + SPACTION_SEARCHING_FILES, + SPACTION_DELETING, + SPACTION_RENAMING, + SPACTION_FORMATTING, + SPACTION_COPY_MOVING, +} SPACTION; + +[ + object, + uuid(0c9fb851-e5c9-43eb-a370-f0677b13874c), + pointer_default(unique) +] +interface IOperationsProgressDialog : IUnknown +{ + [v1_enum] enum _PDMODE + { + PDM_DEFAULT = 0x00000000, + PDM_RUN = 0x00000001, + PDM_PREFLIGHT = 0x00000002, + PDM_UNDOING = 0x00000004, + PDM_ERRORSBLOCKING = 0x00000008, + PDM_INDETERMINATE = 0x00000010, + }; + typedef DWORD PDMODE; + + typedef [v1_enum] enum PDOPSTATUS + { + PDOPS_RUNNING = 1, + PDOPS_PAUSED = 2, + PDOPS_CANCELLED = 3, + PDOPS_STOPPED = 4, + PDOPS_ERRORS = 5, + } PDOPSTATUS; + + HRESULT StartProgressDialog([in, unique] HWND owner, [in] OPPROGDLGF flags); + HRESULT StopProgressDialog(); + HRESULT SetOperation([in] SPACTION action); + HRESULT SetMode([in] PDMODE mode); + HRESULT UpdateProgress([in] ULONGLONG current_points, [in] ULONGLONG total_points, + [in] ULONGLONG current_size, [in] ULONGLONG total_size, + [in] ULONGLONG current_item, [in] ULONGLONG total_item); + HRESULT UpdateLocations([in, unique] IShellItem *source, [in, unique] IShellItem *target, + [in, unique] IShellItem *item); + HRESULT ResetTimer(); + HRESULT PauseTimer(); + HRESULT ResumeTimer(); + HRESULT GetMilliseconds([out] ULONGLONG *elapsed, [out] ULONGLONG *remaining); + HRESULT GetOperationStatus([out] PDOPSTATUS *status); +} + +[ + object, + uuid(947aab5f-0a5c-4c13-b4d6-4bf7836fc9f8), + pointer_default(unique) +] +interface IFileOperation : IUnknown +{ + HRESULT Advise([in] IFileOperationProgressSink *sink, [out] DWORD *cookie); + HRESULT Unadvise([in] DWORD cookie); + HRESULT SetOperationFlags([in] DWORD flags); + HRESULT SetProgressMessage([in, string] LPCWSTR message); + HRESULT SetProgressDialog([in] IOperationsProgressDialog *dialog); + HRESULT SetProperties([in] IPropertyChangeArray *array); + HRESULT SetOwnerWindow([in] HWND owner); + HRESULT ApplyPropertiesToItem([in] IShellItem *item); + HRESULT ApplyPropertiesToItems([in] IUnknown *items); + HRESULT RenameItem([in] IShellItem *item, [in, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT RenameItems([in] IUnknown *items, [in, string] LPCWSTR name); + HRESULT MoveItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT MoveItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT CopyItem([in] IShellItem *item, [in] IShellItem *folder, + [in, unique, string] LPCWSTR name, + [in, unique] IFileOperationProgressSink *sink); + HRESULT CopyItems([in] IUnknown *items, [in] IShellItem *folder); + HRESULT DeleteItem([in] IShellItem *item, + [in, unique] IFileOperationProgressSink *sink); + HRESULT DeleteItems([in] IUnknown *items); + HRESULT NewItem([in] IShellItem *folder, [in] DWORD attributes, + [in, unique, string] LPCWSTR name, [in, unique, string] LPCWSTR template, + [in, unique] IFileOperationProgressSink *sink); + HRESULT PerformOperations(); + HRESULT GetAnyOperationsAborted([out] BOOL *aborted); } -- 2.26.0

1 0

[PATCH] winex11.drv: Get the minimum screen size from XRRGetScreenSizeRange().
by Zhiyi Zhang March 30, 2020

March 30, 2020

RandR minimum screen size is not necessarily 0x0. Some drivers report resolutions smaller than the minimum screen size. When Wine tries to switch to these resolutions, a X error is generated and causes process exit. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 930e0282be..bdfe3d42d9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -60,6 +60,7 @@ MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) MAKE_FUNCPTR(XRRGetScreenResources) +MAKE_FUNCPTR(XRRGetScreenSizeRange) MAKE_FUNCPTR(XRRSetCrtcConfig) MAKE_FUNCPTR(XRRSetScreenSize) static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; @@ -114,6 +115,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRGetCrtcInfo) LOAD_FUNCPTR(XRRGetOutputInfo) LOAD_FUNCPTR(XRRGetScreenResources) + LOAD_FUNCPTR(XRRGetScreenSizeRange) LOAD_FUNCPTR(XRRSetCrtcConfig) LOAD_FUNCPTR(XRRSetScreenSize) r = 2; @@ -361,9 +363,13 @@ static int xrandr12_get_current_mode(void) static void get_screen_size( XRRScreenResources *resources, unsigned int *width, unsigned int *height ) { + int min_width = 0, min_height = 0, max_width, max_height; XRRCrtcInfo *crtc_info; int i; - *width = *height = 0; + + pXRRGetScreenSizeRange( gdi_display, root_window, &min_width, &min_height, &max_width, &max_height ); + *width = min_width; + *height = min_height; for (i = 0; i < resources->ncrtc; ++i) { -- 2.20.1

1 0

[PATCH] msvcr90/tests: Fix swscanf tests compilation on arm.
by Piotr Caban March 30, 2020

March 30, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48846 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/6] mfplat: Forward MFScheduleWorkItemEx() to rtworkq.dll.
by Nikolay Sivov March 30, 2020

March 30, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/queue.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 5af717419b..31d3777e87 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -136,7 +136,7 @@ @ stdcall MFRegisterLocalSchemeHandler(wstr ptr) @ stdcall MFRemovePeriodicCallback(long) rtworkq.RtwqRemovePeriodicCallback @ stdcall MFScheduleWorkItem(ptr ptr int64 ptr) -@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) +@ stdcall MFScheduleWorkItemEx(ptr int64 ptr) rtworkq.RtwqScheduleWorkItem @ stub MFSerializeAttributesToStream @ stub MFSerializeEvent @ stub MFSerializeMediaTypeToStream diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 6ad3977e59..2080a79f84 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -119,16 +119,6 @@ HRESULT WINAPI MFScheduleWorkItem(IMFAsyncCallback *callback, IUnknown *state, I return hr; } -/*********************************************************************** - * MFScheduleWorkItemEx (mfplat.@) - */ -HRESULT WINAPI MFScheduleWorkItemEx(IMFAsyncResult *result, INT64 timeout, MFWORKITEM_KEY *key) -{ - TRACE("%p, %s, %p.\n", result, wine_dbgstr_longlong(timeout), key); - - return RtwqScheduleWorkItem((IRtwqAsyncResult *)result, timeout, key); -} - /*********************************************************************** * MFInvokeCallback (mfplat.@) */ -- 2.25.1

1 5

[PATCH v2 9/9] adsldp/tests: Handle more cases of ERROR_DS_SERVER_DOWN.
by Dmitry Timoshkov March 30, 2020

March 30, 2020

Probably server protects itself from quick successive connections from the same client and returns LDAP_SERVER_DOWN. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/ldap.c | 2 +- dlls/adsldp/tests/ldap.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/ldap.c b/dlls/adsldp/ldap.c index c23f46267e..37a990ad81 100644 --- a/dlls/adsldp/ldap.c +++ b/dlls/adsldp/ldap.c @@ -69,7 +69,7 @@ DWORD map_ldap_error(DWORD err) case LDAP_NO_OBJECT_CLASS_MODS: return ERROR_DS_CANT_MOD_OBJ_CLASS; case LDAP_RESULTS_TOO_LARGE: return ERROR_DS_OBJECT_RESULTS_TOO_LARGE; case LDAP_AFFECTS_MULTIPLE_DSAS: return ERROR_DS_AFFECTS_MULTIPLE_DSAS; - case LDAP_SERVER_DOWN: return ERROR_DS_SERVER_DOWN; + case LDAP_SERVER_DOWN: return ERROR_DS_SERVER_DOWN; case LDAP_LOCAL_ERROR: return ERROR_DS_LOCAL_ERROR; case LDAP_ENCODING_ERROR: return ERROR_DS_ENCODING_ERROR; case LDAP_DECODING_ERROR: return ERROR_DS_DECODING_ERROR; diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index aec5bf89ee..b3cb489d58 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -106,11 +106,23 @@ static void test_LDAP(void) IDispatch_Release(disp); hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) IADs_Release(ads); hr = ADsGetObject(path, &IID_IDispatch, (void **)&disp); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + SysFreeString(path); + skip("server is down\n"); + break; + } ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) IDispatch_Release(disp); @@ -337,8 +349,12 @@ todo_wine ok(hr == E_NOINTERFACE, "got %#x\n", hr); hr = ADsGetObject(L"LDAP://ldap.forumsys.com", &IID_IDirectorySearch, (void **)&ds); + if (hr == HRESULT_FROM_WIN32(ERROR_DS_SERVER_DOWN)) + { + skip("server is down\n"); + return; + } ok(hr == S_OK, "got %#x\n", hr); - if (hr != S_OK) return; pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; pref.vValue.dwType = ADSTYPE_INTEGER; -- 2.25.1

2 1

[PATCH v2 8/9] adsldp: Fix IDirectorySearch::GetColumn() behaviour for not found case.
by Dmitry Timoshkov March 30, 2020

March 30, 2020

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/adsldp.c | 6 +++++- dlls/adsldp/tests/ldap.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 61162f08a3..5ab7948b1f 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1434,7 +1434,11 @@ exit: } values = ldap_get_values_lenW(ldap->ld, ldap_ctx->entry, name); - if (!values) return ERROR_DS_NO_ATTRIBUTE_OR_VALUE; + if (!values) + { + memset(col, 0, sizeof(*col)); + return E_ADS_COLUMN_NOT_SET; + } count = ldap_count_values_len(values); diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 3abbbdadb0..aec5bf89ee 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -417,6 +417,18 @@ todo_wine ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); } + hr = IDirectorySearch_GetFirstRow(ds, sh); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&col, 0x55, sizeof(col)); + hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"deadbeef", &col); + ok(hr == E_ADS_COLUMN_NOT_SET, "got %#x\n", hr); + ok(!col.pszAttrName, "got %p\n", col.pszAttrName); + ok(col.dwADsType == ADSTYPE_INVALID || broken(col.dwADsType != ADSTYPE_INVALID) /* XP */, "got %d\n", col.dwADsType); + ok(!col.pADsValues, "got %p\n", col.pADsValues); + ok(!col.dwNumValues, "got %u\n", col.dwNumValues); + ok(!col.hReserved, "got %p\n", col.hReserved); + hr = IDirectorySearch_CloseSearchHandle(ds, sh); ok(hr == S_OK, "got %#x\n", hr); -- 2.25.1

2 1

[PATCH 5/7] wined3d: Check cursor sizes are powers of two.
by Zhiyi Zhang March 30, 2020

March 30, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 1 - dlls/d3d9/tests/device.c | 1 - dlls/wined3d/device.c | 15 +++++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f63004054a..f9e34ad525 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1028,7 +1028,6 @@ static void test_cursor(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr == D3DERR_INVALIDCALL) ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", test_idx, expected_hr, hr); IDirect3DSurface8_Release(cursor); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5a5183c12f..5f4e7dc7df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1840,7 +1840,6 @@ static void test_cursor(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr == D3DERR_INVALIDCALL) ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", test_idx, expected_hr, hr); IDirect3DSurface9_Release(cursor); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f8caa0c23c..9d5025518d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4934,14 +4934,23 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } + /* Cursor width and height must all be powers of two */ + cursor_width = wined3d_texture_get_level_width(texture, texture_level); + cursor_height = wined3d_texture_get_level_height(texture, texture_level); + /* http://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2 */ + if ((cursor_width & (cursor_width - 1)) || (cursor_height & (cursor_height - 1))) + { + WARN("Cursor size %ux%u are not all powers of two.\n", cursor_width, cursor_height); + return WINED3DERR_INVALIDCALL; + } + + /* Cursor size must not exceed display mode */ if (FAILED(hr = wined3d_output_get_display_mode(&device->adapter->outputs[0], &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; } - cursor_width = wined3d_texture_get_level_width(texture, texture_level); - cursor_height = wined3d_texture_get_level_height(texture, texture_level); if (cursor_width > mode.width || cursor_height > mode.height) { WARN("Texture %p, sub-resource %u dimensions are %ux%u, but screen dimensions are %ux%u.\n", @@ -4949,8 +4958,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - /* TODO: MSDN: Cursor sizes must be a power of 2 */ - /* Do not store the surface's pointer because the application may * release it after setting the cursor image. Windows doesn't * addref the set surface, so we can't do this either without -- 2.20.1

2 1