October 2022 - Wine-commits

Eric Pouech : dbghelp: Remove symt_close_func_block() stabs's only parameter.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 1bcdb17455d022a87e672e3b817cca656365d69d URL: https://gitlab.winehq.org/wine/wine/-/commit/1bcdb17455d022a87e672e3b817cca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:40:00 2022 +0200 dbghelp: Remove symt_close_func_block() stabs's only parameter. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/dwarf.c | 4 +--- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/stabs.c | 6 ++++-- dlls/dbghelp/symbol.c | 7 +++---- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index fd887718d8c..b6a7df10061 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -862,9 +862,9 @@ extern struct symt_block* struct symt_block* block, unsigned pc, unsigned len) DECLSPEC_HIDDEN; extern struct symt_block* - symt_close_func_block(struct module* module, + symt_close_func_block(struct module* module, const struct symt_function* func, - struct symt_block* block, unsigned pc) DECLSPEC_HIDDEN; + struct symt_block* block) DECLSPEC_HIDDEN; extern struct symt_hierarchy_point* symt_add_function_point(struct module* module, struct symt_function* func, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 92229552929..8c57c211db4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2312,9 +2312,7 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, } } - symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->current_func, subpgm->current_block, 0); - subpgm->current_block = symt_check_tag(subpgm->current_block->container, SymTagBlock) ? - (struct symt_block*)subpgm->current_block->container : NULL; + subpgm->current_block = symt_close_func_block(subpgm->ctx->module_ctx->module, subpgm->current_func, subpgm->current_block); } static struct symt* dwarf2_parse_subprogram(dwarf2_debug_info_t* di) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 0109e4dd255..94f0c6af9ee 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2472,7 +2472,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_END: if (block) { - block = symt_close_func_block(msc_dbg->module, curr_func, block, 0); + block = symt_close_func_block(msc_dbg->module, curr_func, block); } else if (top_func) { diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index badb07e3b5c..e1945b41d66 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1381,8 +1381,10 @@ BOOL stabs_parse(struct module* module, ULONG_PTR load_offset, break; case N_RBRAC: if (curr_func) - block = symt_close_func_block(module, curr_func, block, - n_value); + { + block->size = curr_func->address + n_value - block->address; + block = symt_close_func_block(module, curr_func, block); + } break; case N_PSYM: /* These are function parameters. */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 98e25a32b30..9d248630393 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -549,14 +549,13 @@ struct symt_block* symt_open_func_block(struct module* module, return block; } -struct symt_block* symt_close_func_block(struct module* module, +struct symt_block* symt_close_func_block(struct module* module, const struct symt_function* func, - struct symt_block* block, unsigned pc) + struct symt_block* block) { assert(symt_check_tag(&func->symt, SymTagFunction) || symt_check_tag(&func->symt, SymTagInlineSite)); - if (pc) block->size = func->address + pc - block->address; - return (block->container->tag == SymTagBlock) ? + return (block->container->tag == SymTagBlock) ? CONTAINING_RECORD(block->container, struct symt_block, symt) : NULL; }

1 0

Nikolay Sivov : include: Change include guard for wininet.h.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 8957d74b991c394382da1f5bd995f77e6ef16a48 URL: https://gitlab.winehq.org/wine/wine/-/commit/8957d74b991c394382da1f5bd995f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 9 20:14:32 2022 +0300 include: Change include guard for wininet.h. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/wininet.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index ce5aebdca8c..cef5da15de2 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WINE_WININET_H_ -#define _WINE_WININET_H_ +#ifndef _WININET_ +#define _WININET_ #ifdef __cplusplus extern "C" {

1 0

Nikolay Sivov : include: Add IActiveDesktop definition.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: c083b2edcf6998dfc98dc04b6171b7811ad4cc9c URL: https://gitlab.winehq.org/wine/wine/-/commit/c083b2edcf6998dfc98dc04b6171b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 9 20:15:24 2022 +0300 include: Add IActiveDesktop definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/shlguid.h | 3 ++ include/shlobj.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/include/shlguid.h b/include/shlguid.h index 687bbec79e9..c6878c36864 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -238,4 +238,7 @@ DEFINE_GUID(BHID_ThumbnailHandler, 0x7B2E650A, 0x8E20, 0x4F4A, 0xB0,0x9E, 0x65,0 DEFINE_GUID(BHID_AssociationArray, 0xBEA9EF17, 0x82F1, 0x4F60, 0x92,0x84, 0x4F,0x8D,0xB7,0x5C,0x3B,0xE9); DEFINE_GUID(BHID_EnumAssocHandlers,0xB8AB0B9C, 0xC2EC, 0x4F7A, 0x91,0x8D, 0x31,0x49,0x00,0xE6,0x28,0x0A); +DEFINE_GUID(CLSID_ActiveDesktop, 0x75048700, 0xef1f, 0x11d0, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); +DEFINE_GUID(IID_IActiveDesktop, 0xf490eb00, 0x1240, 0x11d1, 0x98, 0x88, 0x00, 0x60, 0x97, 0xde, 0xac, 0xf9); + #endif /* __WINE_SHLGUID_H */ diff --git a/include/shlobj.h b/include/shlobj.h index 8d6eab85eb6..feee6cd9b98 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -754,6 +754,104 @@ DECLARE_INTERFACE_(IProgressDialog,IUnknown) #define IProgressDialog_Timer(p,a,b) (p)->lpVtbl->Timer(p,a,b) #endif +#ifdef _WININET_ + +typedef struct _tagWALLPAPEROPT +{ + DWORD dwSize; + DWORD dwStyle; +} WALLPAPEROPT, *LPWALLPAPEROPT; + +typedef const WALLPAPEROPT *LPCWALLPAPEROPT; + +typedef struct _tagCOMPPOS +{ + DWORD dwSize; + int iLeft; + int iTop; + DWORD dwWidth; + DWORD dwHeight; + int izIndex; + BOOL fCanResize; + BOOL fCanResizeX; + BOOL fCanResizeY; + int iPreferredLeftPercent; + int iPreferredTopPercent; +} COMPPOS, *LPCOMPPOS; + +typedef const COMPPOS *LPCCOMPPOS; + +typedef struct _tagCOMPSTATEINFO +{ + DWORD dwSize; + int iLeft; + int iTop; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwItemState; +} COMPSTATEINFO, *LPCOMPSTATEINFO; + +typedef const COMPSTATEINFO *LPCCOMPSTATEINFO; + +typedef struct _tagCOMPONENT +{ + DWORD dwSize; + DWORD dwID; + int iComponentType; + BOOL fChecked; + BOOL fDirty; + BOOL fNoScroll; + COMPPOS cpPos; + WCHAR wszFriendlyName[MAX_PATH]; + WCHAR wszSource[INTERNET_MAX_URL_LENGTH]; + WCHAR wszSubscribedURL[INTERNET_MAX_URL_LENGTH]; + DWORD dwCurItemState; + COMPSTATEINFO csiOriginal; + COMPSTATEINFO csiRestored; +} COMPONENT, *LPCOMPONENT; + +typedef const COMPONENT *LPCCOMPONENT; + +typedef struct _tagCOMPONENTSOPT +{ + DWORD dwSize; + BOOL fEnableComponents; + BOOL fActiveDesktop; +} COMPONENTSOPT, *LPCOMPONENTSOPT; + +typedef const COMPONENTSOPT *LPCCOMPONENTSOPT; + +#define INTERFACE IActiveDesktop +DECLARE_INTERFACE_(IActiveDesktop, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **obj) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** IActiveDesktop ***/ + STDMETHOD(ApplyChanges)(THIS_ DWORD flags) PURE; + STDMETHOD(GetWallpaper)(THIS_ PWSTR wallpaper, UINT length, DWORD flags) PURE; + STDMETHOD(SetWallpaper)(THIS_ PCWSTR wallpaper, DWORD reserved) PURE; + STDMETHOD(GetWallpaperOptions)(THIS_ LPWALLPAPEROPT options, DWORD reserved) PURE; + STDMETHOD(SetWallpaperOptions)(THIS_ LPCWALLPAPEROPT options, DWORD reserved) PURE; + STDMETHOD(GetPattern)(THIS_ PWSTR pattern, UINT length, DWORD reserved) PURE; + STDMETHOD(SetPattern)(THIS_ PCWSTR pattern, DWORD reserved) PURE; + STDMETHOD(GetDesktopItemOptions)(THIS_ LPCOMPONENTSOPT options, DWORD reserved) PURE; + STDMETHOD(SetDesktopItemOptions)(THIS_ LPCCOMPONENTSOPT options, DWORD reserved) PURE; + STDMETHOD(AddDesktopItem)(THIS_ LPCCOMPONENT component, DWORD reserved) PURE; + STDMETHOD(AddDesktopItemWithUI)(THIS_ HWND hwnd, LPCOMPONENT component, DWORD reserved) PURE; + STDMETHOD(ModifyDesktopItem)(THIS_ LPCCOMPONENT component, DWORD flags) PURE; + STDMETHOD(RemoveDesktopItem)(THIS_ LPCCOMPONENT component, DWORD reserved) PURE; + STDMETHOD(GetDesktopItemCount)(THIS_ int *count, DWORD reserved) PURE; + STDMETHOD(GetDesktopItem)(THIS_ int index, LPCOMPONENT component, DWORD reserved) PURE; + STDMETHOD(GetDesktopItemByID)(THIS_ ULONG_PTR id, LPCOMPONENT component, DWORD reserved) PURE; + STDMETHOD(GenerateDesktopItemHtml)(THIS_ PCWSTR filename, LPCOMPONENT component, DWORD reserved) PURE; + STDMETHOD(AddUrl)(THIS_ HWND hwnd, PCWSTR source, LPCOMPONENT component, DWORD flags) PURE; + STDMETHOD(GetDesktopItemBySource)(THIS_ PCWSTR source, LPCOMPONENT component, DWORD reserved) PURE; +}; +#undef INTERFACE + +#endif /* _WININET_ */ /**************************************************************************** * SHAddToRecentDocs API

1 0

Nikolay Sivov : shell32: Add Active Desktop stub.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: b3553705fde9ffdc21769cf3ed2852a051a1af40 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3553705fde9ffdc21769cf3ed2852… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 9 21:24:02 2022 +0300 shell32: Add Active Desktop stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shell32_classes.idl | 5 + dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + dlls/shell32/shfldr_desktop.c | 209 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 217 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index 22ef49ae5c7..dc65ed3728d 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -178,3 +178,8 @@ coclass KnownFolderManager { interface IKnownFolderManager; } threading(apartment), uuid(3ad05575-8857-4850-9277-11b85bdb8e09) ] coclass FileOperation { interface IFileOperation; } + +[ + threading(apartment), + uuid(75048700-ef1f-11d0-9888-006097deacf9) +] coclass ActiveDesktop { interface IActiveDesktop; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index ca93293e50b..7bb26e46a6e 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -102,6 +102,8 @@ HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, L 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; +HRESULT WINAPI ActiveDesktop_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 7cd46ba2d98..589e5c5170a 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -87,6 +87,7 @@ static const struct { {&CLSID_DestinationList, CustomDestinationList_Constructor}, {&CLSID_ShellImageDataFactory, ShellImageDataFactory_Constructor}, {&CLSID_FileOperation, IFileOperation_Constructor}, + {&CLSID_ActiveDesktop, ActiveDesktop_Constructor}, {NULL, NULL} }; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index f8672836da9..7bf54c4e7d0 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -38,6 +38,7 @@ #include "ole2.h" #include "shlguid.h" +#include "wininet.h" #include "pidl.h" #include "shell32_main.h" #include "shresdef.h" @@ -939,3 +940,211 @@ HRESULT WINAPI ISF_Desktop_Constructor ( return IShellFolder2_QueryInterface( &cached_sf->IShellFolder2_iface, riid, ppv ); } + +static HRESULT WINAPI active_desktop_QueryInterface(IActiveDesktop *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IActiveDesktop) + || IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + } + + if (*obj) + { + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI active_desktop_AddRef(IActiveDesktop *iface) +{ + return 2; +} + +static ULONG WINAPI active_desktop_Release(IActiveDesktop *iface) +{ + return 1; +} + +static HRESULT WINAPI active_desktop_ApplyChanges(IActiveDesktop *iface, DWORD flags) +{ + FIXME("%p, %#lx.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetWallpaper(IActiveDesktop *iface, PWSTR wallpaper, UINT length, DWORD flags) +{ + FIXME("%p, %p, %u, %#lx.\n", iface, wallpaper, length, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_SetWallpaper(IActiveDesktop *iface, PCWSTR wallpaper, DWORD reserved) +{ + FIXME("%p, %s, %#lx.\n", iface, debugstr_w(wallpaper), reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetWallpaperOptions(IActiveDesktop *iface, LPWALLPAPEROPT options, DWORD reserved) +{ + FIXME("%p, %p, %#lx.\n", iface, options, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_SetWallpaperOptions(IActiveDesktop *iface, LPCWALLPAPEROPT options, DWORD reserved) +{ + FIXME("%p, %p, %#lx.\n", iface, options, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetPattern(IActiveDesktop *iface, PWSTR pattern, UINT length, DWORD reserved) +{ + FIXME("%p, %p, %u, %#lx.\n", iface, pattern, length, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_SetPattern(IActiveDesktop *iface, PCWSTR pattern, DWORD reserved) +{ + FIXME("%p, %s, %#lx.\n", iface, debugstr_w(pattern), reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetDesktopItemOptions(IActiveDesktop *iface, LPCOMPONENTSOPT options, DWORD reserved) +{ + FIXME("%p, %p, %#lx.\n", iface, options, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_SetDesktopItemOptions(IActiveDesktop *iface, LPCCOMPONENTSOPT options, DWORD reserved) +{ + FIXME("%p, %p, %#lx.\n", iface, options, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_AddDesktopItem(IActiveDesktop *iface, LPCCOMPONENT component, DWORD reserved) +{ + FIXME("%p, %p, %#lx.\n", iface, component, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_AddDesktopItemWithUI(IActiveDesktop *iface, HWND hwnd, LPCOMPONENT component, DWORD reserved) +{ + FIXME("%p, %p, %p, %#lx.\n", iface, hwnd, component, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_ModifyDesktopItem(IActiveDesktop *iface, LPCCOMPONENT component, DWORD flags) +{ + FIXME("%p, %p, %#lx.\n", iface, component, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_RemoveDesktopItem(IActiveDesktop *iface, LPCCOMPONENT component, DWORD reserved) +{ + FIXME("%p, %p, %#lx.\n", iface, component, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetDesktopItemCount(IActiveDesktop *iface, int *count, DWORD reserved) +{ + FIXME("%p, %p, %#lx.\n", iface, count, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetDesktopItem(IActiveDesktop *iface, int index, LPCOMPONENT component, DWORD reserved) +{ + FIXME("%p, %d, %p, %#lx.\n", iface, index, component, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetDesktopItemByID(IActiveDesktop *iface, ULONG_PTR id, LPCOMPONENT component, DWORD reserved) +{ + FIXME("%p, %Ix, %p, %#lx.\n", iface, id, component, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GenerateDesktopItemHtml(IActiveDesktop *iface, PCWSTR filename, LPCOMPONENT component, DWORD reserved) +{ + FIXME("%p, %s, %p, %#lx.\n", iface, debugstr_w(filename), component, reserved); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_AddUrl(IActiveDesktop *iface, HWND hwnd, PCWSTR source, LPCOMPONENT component, DWORD flags) +{ + FIXME("%p, %p, %s, %p, %#lx.\n", iface, hwnd, debugstr_w(source), component, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI active_desktop_GetDesktopItemBySource(IActiveDesktop *iface, PCWSTR source, LPCOMPONENT component, DWORD reserved) +{ + FIXME("%p, %s, %p, %#lx.\n", iface, debugstr_w(source), component, reserved); + + return E_NOTIMPL; +} + +static const IActiveDesktopVtbl active_desktop_vtbl = +{ + active_desktop_QueryInterface, + active_desktop_AddRef, + active_desktop_Release, + active_desktop_ApplyChanges, + active_desktop_GetWallpaper, + active_desktop_SetWallpaper, + active_desktop_GetWallpaperOptions, + active_desktop_SetWallpaperOptions, + active_desktop_GetPattern, + active_desktop_SetPattern, + active_desktop_GetDesktopItemOptions, + active_desktop_SetDesktopItemOptions, + active_desktop_AddDesktopItem, + active_desktop_AddDesktopItemWithUI, + active_desktop_ModifyDesktopItem, + active_desktop_RemoveDesktopItem, + active_desktop_GetDesktopItemCount, + active_desktop_GetDesktopItem, + active_desktop_GetDesktopItemByID, + active_desktop_GenerateDesktopItemHtml, + active_desktop_AddUrl, + active_desktop_GetDesktopItemBySource, +}; + +HRESULT WINAPI ActiveDesktop_Constructor(IUnknown *outer, REFIID riid, void **obj) +{ + static IActiveDesktop object = { &active_desktop_vtbl }; + HRESULT hr; + + TRACE("%p, %s, %p.\n", outer, debugstr_guid(riid), obj); + + if (outer) + return CLASS_E_NOAGGREGATION; + + hr = IUnknown_QueryInterface(&object, riid, obj); + IUnknown_Release(&object); + + return hr; +}

1 0

Francois Gouget : d3d9/tests: Mark the test_cursor_pos() tests failing randomly on Windows as flaky.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: fc5bb4deef2127b0ecd57078c45bbfe82db9d6f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc5bb4deef2127b0ecd57078c45bbf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 10:39:11 2022 +0200 d3d9/tests: Mark the test_cursor_pos() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53194 --- dlls/d3d9/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index dbdce1e5871..9fe05625190 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5287,6 +5287,7 @@ static void test_cursor_pos(void) ok(ret, "Failed to set cursor position.\n"); flush_events(); + flaky ok((!expect_pos->x && !expect_pos->y) || broken(expect_pos - points == 7), "Didn't receive MOUSEMOVE %u (%ld, %ld).\n", (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y);

1 0

Francois Gouget : d3d9/tests: Mark the test_wndproc_windowed() tests failing randomly on Windows as flaky.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 42290cddc53ea1e5b30d2e19e22297a121878f00 URL: https://gitlab.winehq.org/wine/wine/-/commit/42290cddc53ea1e5b30d2e19e22297… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 10:33:34 2022 +0200 d3d9/tests: Mark the test_wndproc_windowed() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53283 --- dlls/d3d9/tests/d3d9ex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 19c4eec7921..b9c5ecd2e05 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3297,6 +3297,7 @@ static void test_wndproc_windowed(void) if (thread_params.running_in_foreground) { tmp = GetForegroundWindow(); + flaky ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", thread_params.dummy_window, tmp); }

1 0

Alistair Leslie-Hughes : msdasql: Implement IRowsetInfo GetProperties.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 475824e7097479127067fd83a4ffbbca502e398e URL: https://gitlab.winehq.org/wine/wine/-/commit/475824e7097479127067fd83a4ffbb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Nov 11 14:52:24 2021 +1100 msdasql: Implement IRowsetInfo GetProperties. The only way to actually set these properties is via the ICommandProperties interface found on ICommandText(eg rowset->caller). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 15 +++++++++++++-- dlls/msdasql/tests/provider.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 2c1f193107b..27d952276e5 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -905,8 +905,19 @@ static HRESULT WINAPI rowset_info_GetProperties(IRowsetInfo *iface, const ULONG const DBPROPIDSET propertyidsets[], ULONG *out_count, DBPROPSET **propertysets) { struct msdasql_rowset *rowset = impl_from_IRowsetInfo( iface ); - FIXME("%p, %lu, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); - return E_NOTIMPL; + HRESULT hr; + ICommandProperties *props; + + TRACE("%p, %lu, %p, %p, %p\n", rowset, count, propertyidsets, out_count, propertysets); + + hr = IUnknown_QueryInterface(rowset->caller, &IID_ICommandProperties, (void**)&props); + if (FAILED(hr)) + return hr; + + hr = ICommandProperties_GetProperties(props, count, propertyidsets, out_count, propertysets); + ICommandProperties_Release(props); + + return hr; } static HRESULT WINAPI rowset_info_GetReferencedRowset(IRowsetInfo *iface, DBORDINAL ordinal, diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ec883a80943..72e13154846 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -496,6 +496,43 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) ok(hr == E_NOINTERFACE, "got 0x%08lx\n", hr); } +static void test_rowset_info(IRowset *rowset) +{ + IRowsetInfo *info; + HRESULT hr; + ULONG propcnt; + DBPROPIDSET propidset; + DBPROPSET *propset; + int i; + DWORD row_props[] = { + DBPROP_CANSCROLLBACKWARDS, DBPROP_IRowsetUpdate, DBPROP_IRowsetResynch, + DBPROP_IConnectionPointContainer, DBPROP_BOOKMARKSKIPPED, DBPROP_REMOVEDELETED, + DBPROP_IConvertType, DBPROP_NOTIFICATIONGRANULARITY, DBPROP_IMultipleResults, DBPROP_ACCESSORDER, + DBPROP_BOOKMARKINFO, DBPROP_UNIQUEROWS + }; + + hr = IRowset_QueryInterface(rowset, &IID_IRowsetInfo, (void**)&info); + ok(hr == S_OK, "got 0x%08lx\n", hr); + + propidset.rgPropertyIDs = row_props; + propidset.cPropertyIDs = ARRAY_SIZE(row_props); + propidset.guidPropertySet = DBPROPSET_ROWSET; + + hr = IRowsetInfo_GetProperties(info, 1, &propidset, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08lx\n", hr); + ok(propset->cProperties == ARRAY_SIZE(row_props), "got %lu\n", propset->cProperties); + + for(i=0; i < ARRAY_SIZE(row_props); i++) + { + ok(propset->rgProperties[i].dwPropertyID == row_props[i], "expected 0x%08lx got 0x%08lx\n", + propset->rgProperties[i].dwPropertyID, row_props[i]); + } + + CoTaskMemFree(propset); + + IRowsetInfo_Release(info); +} + static void test_command_rowset(IUnknown *cmd) { ICommandText *command_text; @@ -587,6 +624,8 @@ static void test_command_rowset(IUnknown *cmd) CoTaskMemFree(stringsbuffer); IColumnsInfo_Release(colinfo); + test_rowset_info(rowset); + IRowset_Release(rowset); IUnknown_Release(unk); }

1 0

John Chadwick : wintab32: Fix match_token to match XWayland devices.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 953b93737a6cf2c2c45b01a982961b21ea4cd1ef URL: https://gitlab.winehq.org/wine/wine/-/commit/953b93737a6cf2c2c45b01a982961b… Author: John Chadwick <john(a)jchw.io> Date: Mon Oct 3 02:21:34 2022 -0400 wintab32: Fix match_token to match XWayland devices. XWayland tablet devices have the Wayland seat ID appended to the end of them, preceded by a colon. This prevents match_token from properly detecting XWayland devices and causes Wintab32 to fail to initialize. This change allows a matched token to end in a colon, and thus allows XWayland tablet devices to be detected correctly. Signed-off-by: John Chadwick <john(a)jchw.io> --- dlls/winex11.drv/wintab.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index b906a589e08..6f1437f14c6 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -374,7 +374,7 @@ static BOOL match_token(const char *haystack, const char *needle) for (q = needle; *q && *p && tolower(*p) == tolower(*q); q++) p++; - if (! *q && (isspace(*p) || !*p)) + if (! *q && (isspace(*p) || *p == ':' || !*p)) return TRUE; while (*p && ! isspace(*p))

1 0

Francois Gouget : dpnet/tests: Mark the test_enum_hosts*() tests failing randomly on Windows as flaky.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: fd64cbc02e20d104847b384c5bad55e38659f31a URL: https://gitlab.winehq.org/wine/wine/-/commit/fd64cbc02e20d104847b384c5bad55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 11:04:23 2022 +0200 dpnet/tests: Mark the test_enum_hosts*() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53239 --- dlls/dpnet/tests/client.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 04d7b18581c..2f7d6335a97 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -320,6 +320,7 @@ static void test_enum_hosts(void) lastAsyncHandle = 0xdeadbeef; hr = IDirectPlay8Client_CancelAsyncOperation(client, async2, 0); ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08lx\n", hr); + flaky todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", async2); @@ -750,7 +751,9 @@ static void test_enum_hosts_peer(void) lastAsyncHandle = 0xdeadbeef; hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async2, 0); todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08lx\n", hr); + flaky todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); + flaky todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", async2); IDirectPlay8Peer_Release(peer2);

1 0

Martin Storsjö : wow64: Use the right SEH opcode in raise_exception on arm64.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 4934c1276232a9ac9cad1bdf750c5ac099944180 URL: https://gitlab.winehq.org/wine/wine/-/commit/4934c1276232a9ac9cad1bdf750c5a… Author: Martin Storsjö <martin(a)martin.st> Date: Sat Oct 1 23:49:29 2022 +0300 wow64: Use the right SEH opcode in raise_exception on arm64. On ARM and ARM64, each SEH opcode is supposed to map to exactly one instruction; the operation of writing x29+x30 with a stack offset with writeback is called ".seh_save_fplr_x". Using the right opcode would fix inconsistent unwinding if we would unwind from near the end of the prologue (which is implausible here). However, clang/LLVM might also get checking for mismatches between SEH opcodes and the prolog/epilog ranges (https://reviews.llvm.org/D131394) mainly to guard against inconsistencies in the unwind info generated by the compiler, but that would trigger on this handwritten function too. --- dlls/wow64/process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 1d35702bf01..a810d5e5543 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -421,8 +421,7 @@ __ASM_GLOBAL_FUNC( raise_exception, #elif defined(__aarch64__) __ASM_GLOBAL_FUNC( raise_exception, "stp x29, x30, [sp, #-32]!\n\t" - __ASM_SEH(".seh_stackalloc 32\n\t") - __ASM_SEH(".seh_save_fplr 0\n\t") + __ASM_SEH(".seh_save_fplr_x 32\n\t") __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa x29, 32\n\t") __ASM_CFI(".cfi_offset x30, -24\n\t")

1 0