October 2022 - wine-commits

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/… [View More]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; +} [View Less]

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 … [View More]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 [View Less]

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.… [View More]

1 0

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 |… [View More] 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; } [View Less]

1 0

Eric Pouech : dbghelp: Keep compiland's address for Dwarf debug format.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 6f8ba8119ae6d40621e499d8d34d5379eccad084 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f8ba8119ae6d40621e499d8d34d53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:39:59 2022 +0200 dbghelp: Keep compiland's address for Dwarf debug format. Partly reverting 99eb63bd7a41b87d472bb622a5faf24d1fcd91c5 (it's still needed on Dwarf for blocks with multiple non-contiguous address ranges). Signed-off-by: Eric Pouech <eric.… [View More]pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 6 +++++- dlls/dbghelp/symbol.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af703c90f9e..92229552929 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2970,7 +2970,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) struct vector* children; dwarf2_debug_info_t* child = NULL; unsigned int i; - struct attribute stmt_list; + struct attribute stmt_list, low_pc; struct attribute comp_dir; struct attribute language; @@ -2981,6 +2981,9 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) if (!dwarf2_find_attribute(di, DW_AT_comp_dir, &comp_dir)) comp_dir.u.string = NULL; + if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc)) + low_pc.u.uvalue = 0; + if (!dwarf2_find_attribute(di, DW_AT_language, &language)) language.u.uvalue = DW_LANG_C; @@ -2988,6 +2991,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) ctx->compiland = symt_new_compiland(ctx->module_ctx->module, source_new(ctx->module_ctx->module, comp_dir.u.string, name.u.string)); + ctx->compiland->address = ctx->module_ctx->load_offset + low_pc.u.uvalue; dwarf2_cache_cuhead(ctx->module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx->compiland, &ctx->head); di->symt = &ctx->compiland->symt; children = dwarf2_get_di_children(di); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index a020c0b2a57..98e25a32b30 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -239,6 +239,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, unsigned src_id { sym->symt.tag = SymTagCompiland; sym->container = module->top; + sym->address = 0; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL; [View Less]

1 0

Eric Pouech : dbghelp: Silence some FIXME for SymGetTypeInfo/TI_GET_OFFSET.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 96c3f58783a7dcc5fcf386efcaed98f638f48864 URL: https://gitlab.winehq.org/wine/wine/-/commit/96c3f58783a7dcc5fcf386efcaed98… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:39:57 2022 +0200 dbghelp: Silence some FIXME for SymGetTypeInfo/TI_GET_OFFSET. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c … [View More]

1 0

Eric Pouech : dbghelp: No longer use wine_dbgstr_longlong.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 106a056c992da7806d69578dd68bd4068c0d67af URL: https://gitlab.winehq.org/wine/wine/-/commit/106a056c992da7806d69578dd68bd4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:39:56 2022 +0200 dbghelp: No longer use wine_dbgstr_longlong. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/coff.c | 10 ++++------ dlls/dbghelp/cpu_arm.c | 8 ++++---- dlls/dbghelp/cpu_arm64.c | 8 ++++---- … [View More]

1 0

Alistair Leslie-Hughes : sapi: Implement ISpObjectToken GetId.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 688ba6ae314baaec1a7b6a181583cffab36e957e URL: https://gitlab.winehq.org/wine/wine/-/commit/688ba6ae314baaec1a7b6a181583cf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 8 20:07:55 2022 +1100 sapi: Implement ISpObjectToken GetId. --- dlls/sapi/tests/token.c | 14 +++++++------- dlls/sapi/token.c | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/sapi/tests/… [View More]token.c b/dlls/sapi/tests/token.c index 9473d56b4d1..a65669b585a 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -185,11 +185,11 @@ static void test_object_token(void) ok( hr == S_OK, "got %08lx\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); - todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); + ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); tempW = (LPWSTR)0xdeadbeef; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); + ok( hr == SPERR_UNINITIALIZED, "got %08lx\n", hr ); ok( tempW == (LPWSTR)0xdeadbeef, "got %s\n", wine_dbgstr_w(tempW) ); hr = ISpObjectToken_GetCategory( token, NULL ); @@ -220,15 +220,15 @@ static void test_object_token(void) ok( hr == SPERR_ALREADY_INITIALIZED, "got %08lx\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); - todo_wine ok( hr == E_POINTER, "got %08lx\n", hr ); + ok( hr == E_POINTER, "got %08lx\n", hr ); hr = ISpObjectToken_GetCategory( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08lx\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == S_OK, "got %08lx\n", hr ); - todo_wine ok( tempW != NULL, "got %p\n", tempW ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( tempW != NULL, "got %p\n", tempW ); if (tempW) { ok( !wcscmp(tempW, L"HKEY_LOCAL_MACHINE\\SOFTWARE"), "got %s\n", wine_dbgstr_w(tempW) ); @@ -268,8 +268,8 @@ static void test_object_token(void) tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); - todo_wine ok( hr == S_OK, "got %08lx\n", hr ); - todo_wine ok( tempW != NULL, "got %p\n", tempW ); + ok( hr == S_OK, "got %08lx\n", hr ); + ok( tempW != NULL, "got %p\n", tempW ); if (tempW) { ok( !wcsncmp(tempW, token_id, wcslen(token_id)), "got %s (expected %s)\n", wine_dbgstr_w(tempW), wine_dbgstr_w(token_id) ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index fe84a07d3c6..6993ffdbac1 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -960,8 +960,28 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, static HRESULT WINAPI token_GetId( ISpObjectToken *iface, LPWSTR *token_id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + + TRACE( "%p, %p\n", This, token_id); + + if (!This->token_key) + return SPERR_UNINITIALIZED; + + if (!token_id) + return E_POINTER; + + if (!This->token_id) + { + FIXME("Loading default category not supported.\n"); + return E_POINTER; + } + + *token_id = CoTaskMemAlloc( (wcslen(This->token_id) + 1) * sizeof(WCHAR)); + if (!*token_id) + return E_OUTOFMEMORY; + + wcscpy(*token_id, This->token_id); + return S_OK; } static HRESULT WINAPI token_GetCategory( ISpObjectToken *iface, [View Less]

1 0

Alistair Leslie-Hughes : sapi: Store the token id in ISpObjectToken SetId.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 01b4286f8282518164ced9284800464f64dca89c URL: https://gitlab.winehq.org/wine/wine/-/commit/01b4286f8282518164ced928480046… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Oct 8 20:04:00 2022 +1100 sapi: Store the token id in ISpObjectToken SetId. --- dlls/sapi/token.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index 2de3553b3ab..fe84a07d3c6 100644 --- a/dlls/sapi/… [View More]

1 0

David Kahurani : xmllite/writer: Properly validate DocType name.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: fa591d3c5603f15328b7321f79dfaf86eb9b4033 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa591d3c5603f15328b7321f79dfaf… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Fri Oct 7 10:57:06 2022 +0300 xmllite/writer: Properly validate DocType name. Current code skips a character and goes on to run is_namechar the next instead of the current character ultimately always running a null string on is_namechar and therefore always returning … [View More]

1 0

Marcus Meissner : ntdll: Fix GetTempPathW() call passing wrong unit for the buffer size.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: b402ce89447cbce370e375079b41943ee5b0bd80 URL: https://gitlab.winehq.org/wine/wine/-/commit/b402ce89447cbce370e375079b4194… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Sep 23 13:51:18 2022 +0200 ntdll: Fix GetTempPathW() call passing wrong unit for the buffer size. Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/ntdll/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/… [View More]

1 0

Zebediah Figura : d3d8: Use a separate draw texture for managed resources.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: ec6b6f38be970fc6af67f4f0710fc74e1ce0964b URL: https://gitlab.winehq.org/wine/wine/-/commit/ec6b6f38be970fc6af67f4f0710fc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 17:36:17 2022 -0500 d3d8: Use a separate draw texture for managed resources. --- dlls/d3d8/d3d8_private.h | 7 ++++- dlls/d3d8/device.c | 33 +++++++++++++++++-- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d8/texture.c | 82 +++++++++++++++++++++++… [View More]

1 0

Zebediah Figura : d3d8: Add reference counting helpers for textures.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 520daf86302fef35fed1c6336c58a819984f422b URL: https://gitlab.winehq.org/wine/wine/-/commit/520daf86302fef35fed1c6336c58a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 16:06:55 2022 -0500 d3d8: Add reference counting helpers for textures. --- dlls/d3d8/texture.c | 159 ++++++++++++++++++---------------------------------- 1 file changed, 54 insertions(+), 105 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/… [View More]texture.c index bb0c4e5bd24..fea5d9a4ce1 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -20,6 +20,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); +static ULONG d3d8_texture_incref(struct d3d8_texture *texture) +{ + ULONG ref = InterlockedIncrement(&texture->resource.refcount); + + TRACE("%p increasing refcount to %u.\n", texture, ref); + + if (ref == 1) + { + struct d3d8_surface *surface; + + IDirect3DDevice8_AddRef(texture->parent_device); + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) + { + wined3d_rendertarget_view_incref(surface->wined3d_rtv); + } + wined3d_texture_incref(texture->wined3d_texture); + wined3d_mutex_unlock(); + } + + return ref; +} + +static ULONG d3d8_texture_decref(struct d3d8_texture *texture) +{ + ULONG ref = InterlockedDecrement(&texture->resource.refcount); + + TRACE("%p decreasing refcount to %u.\n", texture, ref); + + if (!ref) + { + IDirect3DDevice8 *parent_device = texture->parent_device; + struct d3d8_surface *surface; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) + { + wined3d_rendertarget_view_decref(surface->wined3d_rtv); + } + wined3d_texture_decref(texture->wined3d_texture); + wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice8_Release(parent_device); + } + return ref; +} + static void d3d8_texture_preload(struct d3d8_texture *texture) { wined3d_mutex_lock(); @@ -65,51 +113,15 @@ static HRESULT WINAPI d3d8_texture_2d_QueryInterface(IDirect3DTexture8 *iface, R static ULONG WINAPI d3d8_texture_2d_AddRef(IDirect3DTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - TRACE("%p increasing refcount to %u.\n", iface, ref); - - if (ref == 1) - { - struct d3d8_surface *surface; - - IDirect3DDevice8_AddRef(texture->parent_device); - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_incref(surface->wined3d_rtv); - } - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - - return ref; + return d3d8_texture_incref(texture); } static ULONG WINAPI d3d8_texture_2d_Release(IDirect3DTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - { - IDirect3DDevice8 *parent_device = texture->parent_device; - struct d3d8_surface *surface; - - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice8_Release(parent_device); - } - return ref; + return d3d8_texture_decref(texture); } static HRESULT WINAPI d3d8_texture_2d_GetDevice(IDirect3DTexture8 *iface, IDirect3DDevice8 **device) @@ -402,53 +414,15 @@ static HRESULT WINAPI d3d8_texture_cube_QueryInterface(IDirect3DCubeTexture8 *if static ULONG WINAPI d3d8_texture_cube_AddRef(IDirect3DCubeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - - if (ref == 1) - { - struct d3d8_surface *surface; - - IDirect3DDevice8_AddRef(texture->parent_device); - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_incref(surface->wined3d_rtv); - } - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - return ref; + return d3d8_texture_incref(texture); } static ULONG WINAPI d3d8_texture_cube_Release(IDirect3DCubeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DCubeTexture8(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - { - IDirect3DDevice8 *parent_device = texture->parent_device; - struct d3d8_surface *surface; - - TRACE("Releasing child %p.\n", texture->wined3d_texture); - - wined3d_mutex_lock(); - LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d8_surface, rtv_entry) - { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); - } - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice8_Release(parent_device); - } - return ref; + return d3d8_texture_decref(texture); } static HRESULT WINAPI d3d8_texture_cube_GetDevice(IDirect3DCubeTexture8 *iface, IDirect3DDevice8 **device) @@ -764,40 +738,15 @@ static HRESULT WINAPI d3d8_texture_3d_QueryInterface(IDirect3DVolumeTexture8 *if static ULONG WINAPI d3d8_texture_3d_AddRef(IDirect3DVolumeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - ULONG ref = InterlockedIncrement(&texture->resource.refcount); - - TRACE("%p increasing refcount to %u.\n", iface, ref); - if (ref == 1) - { - IDirect3DDevice8_AddRef(texture->parent_device); - wined3d_mutex_lock(); - wined3d_texture_incref(texture->wined3d_texture); - wined3d_mutex_unlock(); - } - - return ref; + return d3d8_texture_incref(texture); } static ULONG WINAPI d3d8_texture_3d_Release(IDirect3DVolumeTexture8 *iface) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - ULONG ref = InterlockedDecrement(&texture->resource.refcount); - - TRACE("%p decreasing refcount to %u.\n", iface, ref); - - if (!ref) - { - IDirect3DDevice8 *parent_device = texture->parent_device; - wined3d_mutex_lock(); - wined3d_texture_decref(texture->wined3d_texture); - wined3d_mutex_unlock(); - - /* Release the device last, as it may cause the device to be destroyed. */ - IDirect3DDevice8_Release(parent_device); - } - return ref; + return d3d8_texture_decref(texture); } static HRESULT WINAPI d3d8_texture_3d_GetDevice(IDirect3DVolumeTexture8 *iface, IDirect3DDevice8 **device) [View Less]

1 0

Zebediah Figura : d3d8: Introduce a d3d8_texture_preload() helper.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 99cee90c19951bf4fb00d41146ebfa86bafad895 URL: https://gitlab.winehq.org/wine/wine/-/commit/99cee90c19951bf4fb00d41146ebfa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 30 15:13:16 2022 -0500 d3d8: Introduce a d3d8_texture_preload() helper. --- dlls/d3d8/texture.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 5946f6aa2fd..bb0c4e5bd24 … [View More]

1 0

Zebediah Figura : d3d8: Factor out d3d8_texture_init().
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: a72e2613aeea4c24fbb21feedd3fdc00fe6ba7e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72e2613aeea4c24fbb21feedd3fdc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 18:06:00 2022 -0500 d3d8: Factor out d3d8_texture_init(). --- dlls/d3d8/d3d8_private.h | 13 +++--- dlls/d3d8/device.c | 6 +-- dlls/d3d8/texture.c | 119 ++++++++++++++++------------------------------- 3 files changed, 49 insertions(+), 89 deletions(-)

1 0

Rémi Bernon : mf: Avoid clearing media session command list while it is running.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 16d975fc128bdd754b6ce912a45927cf113efd28 URL: https://gitlab.winehq.org/wine/wine/-/commit/16d975fc128bdd754b6ce912a45927… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 13:30:31 2022 +0200 mf: Avoid clearing media session command list while it is running. This fixes a random crash with mfmediaengine tests, which quickly starts then shuts down a media session. --- dlls/mf/session.c | 12 ++++++++++-- 1 file changed, 10 … [View More]

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 … [View More]

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 <… [View More]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); } [View Less]

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". … [View More]

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/… [View More]

1 0

Piotr Caban : comctl32: Don't pass PROPSHEETPAGE to SetWindowSubclass in PROPSHEET_CreatePage.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: b536d57825e2e2b55fce58753989da3ec5638b13 URL: https://gitlab.winehq.org/wine/wine/-/commit/b536d57825e2e2b55fce58753989da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 17:30:40 2022 +0200 comctl32: Don't pass PROPSHEETPAGE to SetWindowSubclass in PROPSHEET_CreatePage. --- dlls/comctl32/propsheet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index … [View More]

1 0

Piotr Caban : comctl32/tests: Test passing PropertySheetPage as HPROPSHEETPAGE.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 89729df986b7142245b34c94b509dd40d35154f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/89729df986b7142245b34c94b509dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 23 12:07:14 2022 +0200 comctl32/tests: Test passing PropertySheetPage as HPROPSHEETPAGE. --- dlls/comctl32/tests/propsheet.c | 89 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/… [View More]comctl32/tests/propsheet.c index ca99e11df36..7e0e7087f67 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -42,6 +42,7 @@ static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageA)(const PROPSHEETPAGEA * static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW *desc); static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); +static INT_PTR (WINAPI *pPropertySheetW)(const PROPSHEETHEADERW *header); static BOOL (WINAPI *pIsThemeActive)(void); static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); @@ -1301,6 +1302,92 @@ static void test_page_dialog_texture(void) DestroyWindow(hdlg); } +static void test_invalid_hpropsheetpage(void) +{ + BYTE buf_pspW[sizeof(ULONG_PTR) + sizeof(PROPSHEETPAGEW)]; + BYTE buf_psp[sizeof(ULONG_PTR) + sizeof(PROPSHEETPAGEA)]; + HPROPSHEETPAGE hpsp[1]; + PROPSHEETHEADERW pshW; + PROPSHEETHEADERA psh; + PROPSHEETPAGEW *pspW; + PROPSHEETPAGEA *psp; + LRESULT ret; + HWND hdlg; + + /* LocalSize throws exception on misaligned pointers (x86_64). */ + psp = (PROPSHEETPAGEA *)((ULONG_PTR)buf_psp & 0xf ? buf_psp : buf_psp + sizeof(ULONG_PTR)); + pspW = (PROPSHEETPAGEW *)((ULONG_PTR)buf_pspW & 0xf ? buf_pspW : buf_pspW + sizeof(ULONG_PTR)); + + memset(psp, 0, sizeof(*psp)); + psp->dwSize = sizeof(*psp); + psp->hInstance = GetModuleHandleA(NULL); + U(psp)->pszTemplate = "prop_page1"; + U2(psp)->pszIcon = NULL; + psp->pfnDlgProc = page_dlg_proc; + psp->lParam = 0; + + /* Pass PROPSHEETPAGEA* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)psp; + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = sizeof(psh); + psh.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + psh.pszCaption = "test caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + psh.pfnCallback = sheet_callback; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); + ok(ret, "page was not created\n"); + todo_wine ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); + DestroyWindow(hdlg); + + memset(pspW, 0, sizeof(*pspW)); + pspW->dwSize = sizeof(*pspW); + pspW->hInstance = GetModuleHandleA(NULL); + U(pspW)->pszTemplate = L"prop_page1"; + U2(pspW)->pszIcon = NULL; + pspW->pfnDlgProc = page_dlg_proc; + pspW->lParam = 0; + + /* Pass PROPSHEETPAGEW* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)pspW; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ok(!SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0), "there should be no pages\n"); + /* Pass PROPSHEETPAGE[AW]* instead of HPROPSHEETPAGE */ + ok(!SendMessageW(hdlg, PSM_ADDPAGE, 0, (LPARAM)pspW), "PSM_ADDPAGE succeeded\n"); + ok(SendMessageW(hdlg, PSM_ADDPAGE, 0, (LPARAM)psp), "PSM_ADDPAGE failed\n"); + ok(SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0), "no pages after PSM_ADDPAGE\n"); + DestroyWindow(hdlg); + + /* Pass PROPSHEETPAGEW* instead of HPROPSHEETPAGE */ + hpsp[0] = (HPROPSHEETPAGE)pspW; + + memset(&pshW, 0, sizeof(pshW)); + pshW.dwSize = sizeof(pshW); + pshW.dwFlags = PSH_MODELESS | PSH_USECALLBACK; + pshW.pszCaption = L"test caption"; + pshW.nPages = 1; + pshW.hwndParent = GetDesktopWindow(); + U3(pshW).phpage = hpsp; + pshW.pfnCallback = sheet_callback; + + hdlg = (HWND)pPropertySheetW(&pshW); + ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); + + ret = SendMessageA(hdlg, PSM_INDEXTOPAGE, 0, 0); + todo_wine ok(ret, "page was not created\n"); + ok((HPROPSHEETPAGE)ret != hpsp[0], "invalid HPROPSHEETPAGE was preserved\n"); + DestroyWindow(hdlg); +} + static void init_comctl32_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1310,6 +1397,7 @@ static void init_comctl32_functions(void) X(CreatePropertySheetPageW); X(DestroyPropertySheetPage); X(PropertySheetA); + X(PropertySheetW); #undef X } @@ -1353,6 +1441,7 @@ START_TEST(propsheet) test_PSM_INSERTPAGE(); test_CreatePropertySheetPage(); test_page_dialog_texture(); + test_invalid_hpropsheetpage(); if (!load_v6_module(&ctx_cookie, &ctx)) return; [View Less]

1 0

Piotr Caban : comctl32/tests: Add more PROPSHEETPAGE tests inside callback.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 2a2878551500079a0664977066e036156fedf5f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a2878551500079a0664977066e036… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 16:05:04 2022 +0200 comctl32/tests: Add more PROPSHEETPAGE tests inside callback. --- dlls/comctl32/tests/propsheet.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/… [View More]

1 0

Piotr Caban : comctl32/tests: Test passing extra data in PROPSHEETPAGE structure.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 16ac644b114ad38770fd912c8bd6513336fed2cf URL: https://gitlab.winehq.org/wine/wine/-/commit/16ac644b114ad38770fd912c8bd651… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 14:06:55 2022 +0200 comctl32/tests: Test passing extra data in PROPSHEETPAGE structure. --- dlls/comctl32/tests/propsheet.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/… [View More]comctl32/tests/propsheet.c index 2132158bd93..eee525a19d3 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1035,6 +1035,7 @@ struct custom_proppage PROPSHEETPAGEA pageA; PROPSHEETPAGEW pageW; } u; + DWORD extra_data; unsigned int addref_called; unsigned int release_called; }; @@ -1050,6 +1051,12 @@ static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *ps psp->lParam, psp); ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); ok(!lstrcmpA(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) + { + struct custom_proppage *extra_data = (struct custom_proppage *)psp; + todo_wine ok(extra_data->extra_data == 0x1234, "Expected extra_data to be preserved, got %lx\n", + extra_data->extra_data); + } switch (msg) { @@ -1078,6 +1085,12 @@ static UINT CALLBACK proppage_callback_w(HWND hwnd, UINT msg, PROPSHEETPAGEW *ps psp->lParam, psp); ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); ok(!lstrcmpW(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + if (psp->dwSize >= FIELD_OFFSET(struct custom_proppage, addref_called)) + { + struct custom_proppage *extra_data = (struct custom_proppage *)psp; + todo_wine ok(extra_data->extra_data == 0x4321, "Expected extra_data to be preserved, got %lx\n", + extra_data->extra_data); + } switch (msg) { @@ -1110,8 +1123,11 @@ static void test_CreatePropertySheetPage(void) page.u.pageA.pszTitle = "Title"; /* Only minimal size validation is performed */ - for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; page.u.pageA.dwSize <= PROPSHEETPAGEA_V4_SIZE + 1; page.u.pageA.dwSize++) + for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; + page.u.pageA.dwSize <= FIELD_OFFSET(struct custom_proppage, addref_called); + page.u.pageA.dwSize++) { + page.extra_data = 0x1234; page.addref_called = 0; hpsp = pCreatePropertySheetPageA(&page.u.pageA); @@ -1139,8 +1155,11 @@ static void test_CreatePropertySheetPage(void) page.u.pageW.lParam = (LPARAM)&page; page.u.pageW.pszTitle = L"Title"; - for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; page.u.pageW.dwSize <= PROPSHEETPAGEW_V4_SIZE + 1; page.u.pageW.dwSize++) + for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; + page.u.pageW.dwSize <= FIELD_OFFSET(struct custom_proppage, addref_called); + page.u.pageW.dwSize++) { + page.extra_data = 0x4321; page.addref_called = 0; hpsp = pCreatePropertySheetPageW(&page.u.pageW); [View Less]

1 0

Piotr Caban : comctl32/tests: Test PROPERTYSHEETPAGE passed in WM_INITDIALOG.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 88bc45a7ec3eb4da1d5ace213003cbaca2393449 URL: https://gitlab.winehq.org/wine/wine/-/commit/88bc45a7ec3eb4da1d5ace213003cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 26 14:13:12 2022 +0200 comctl32/tests: Test PROPERTYSHEETPAGE passed in WM_INITDIALOG. --- dlls/comctl32/tests/propsheet.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/… [View More]

1 0

Francois Gouget : testbot/LogUtils: Fix a Perldoc entry.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: 7b86cb5a3be0af4c00eb200b8f7eb9e43ee45413 URL: https://gitlab.winehq.org/winehq/tools/-/commit/7b86cb5a3be0af4c00eb200b8f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 23 19:01:55 2022 +0200 testbot/LogUtils: Fix a Perldoc entry. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index … [View More]

1 0

Francois Gouget : testbot/LogUtils: Add support for flaky lines in report comparisons.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: 89b823e57ff23eaedc67a969addd560f617176ef URL: https://gitlab.winehq.org/winehq/tools/-/commit/89b823e57ff23eaedc67a969add… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 15 17:37:28 2022 +0200 testbot/LogUtils: Add support for flaky lines in report comparisons. Otherwise a simple line number change will prevent a flaky error from matching a previous instance. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, … [View More]

1 0

Francois Gouget : testbot: Only test complete patchsets.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: ca13ddef375ff236d3914770311df1698eeb51df URL: https://gitlab.winehq.org/winehq/tools/-/commit/ca13ddef375ff236d3914770311… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 18:02:53 2022 +0200 testbot: Only test complete patchsets. This avoids having multiple comments in case an early GitLab merge request commit introduces new failures. --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 … [View More]

1 0

Francois Gouget : testbot: Add an option to test patchsets in one go.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: 05f25bd2342c0811927720f1e5d14e034dae525c URL: https://gitlab.winehq.org/winehq/tools/-/commit/05f25bd2342c0811927720f1e5d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 17:54:48 2022 +0200 testbot: Add an option to test patchsets in one go. With this option a single result message is sent for the full patchset. This may mean missing issues fixed in later parts but avoids multiple reports in case an early part introduces … [View More]new failures. --- testbot/lib/WineTestBot/Config.pm | 8 ++++++-- testbot/lib/WineTestBot/PendingPatchSets.pm | 14 +++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index e0947b65..d1a24288 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -30,7 +30,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $WaitForShutdown $MaxVMErrors $MaxTaskTries - $AdminEMail $RobotEMail + $OnlyCompletePatchSets $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $WineBugUrl $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -47,7 +47,7 @@ require Exporter; $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxRunningVMs $MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert $VMToolTimeout $WaitForShutdown - $MaxVMErrors $MaxTaskTries $AdminEMail + $MaxVMErrors $MaxTaskTries $OnlyCompletePatchSets $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $WineBugUrl $ReconfigBuildTimeout $ExeBuildTimeout $ExeModuleTimeout $WineBuildTimeout $WineModuleTimeout $TimeoutMargin @@ -114,6 +114,10 @@ $MaxVMErrors = 3; # How many times to run a test that fails before giving up. $MaxTaskTries = 3; +# Set to true if the combined patchset should be tested all at once +# instead of testing the individual parts one by one. +$OnlyCompletePatchSets = undef; + # Build configure timeout (in seconds) $ReconfigBuildTimeout = 60; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 51a1d134..070a71df 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -104,6 +104,13 @@ sub SubmitSubset($$$) { my ($self, $MaxPart, $FinalPatch) = @_; + if ($OnlyCompletePatchSets and $MaxPart < $self->TotalParts) + { + # Skip over the intermediate patches to instead + # test the full patchset at once it is complete. + return undef; + } + my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patchset.diff"); return "Could not create a combined patch file: $!" if (!$CombinedFile); @@ -117,8 +124,13 @@ sub SubmitSubset($$$) last; } - if ($PartNo == $MaxPart and $PartNo > 1) + if ($OnlyCompletePatchSets) + { + ; # Intermediate parts were not tested so everything must be tested now + } + elsif ($PartNo == $MaxPart and $PartNo > 1) { + # Everything up to the last part separator has already been tested print $CombinedFile LastPartSeparator(); } if (open(my $PartFile, "<" , "$DataDir/patches/" . $Part->Patch->Id)) [View Less]

1 0

Francois Gouget : testbot: Allow two VMs to be active at the same time.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: 562784083371bb2ef3e59ccfb98aba43c8afbd35 URL: https://gitlab.winehq.org/winehq/tools/-/commit/562784083371bb2ef3e59ccfb98… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 17:15:27 2022 +0200 testbot: Allow two VMs to be active at the same time. An active VM is one that is either idle, running tests or reverting. --- testbot/lib/WineTestBot/Config.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git … [View More]

1 0

Francois Gouget : testbot/LogUtils: Fix the summary flaky count check.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: cd760081220709d18cfe5924a596c38987d52da6 URL: https://gitlab.winehq.org/winehq/tools/-/commit/cd760081220709d18cfe5924a59… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Oct 2 18:15:39 2022 +0200 testbot/LogUtils: Fix the summary flaky count check. --- testbot/lib/WineTestBot/LogUtils.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/… [View More]

1 0

Giovanni Mascellani : demos/gears: Recompile shaders with our compiler.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: vkd3d Branch: master Commit: 3d85d77cedfd9e8aece1c1feb622d82425f7e9ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3d85d77cedfd9e8aece1c1feb622d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 28 13:29:19 2022 +0200 demos/gears: Recompile shaders with our compiler. --- demos/gears.c | 28 +++-- demos/gears.hlsl | 55 ---------- demos/gears_hlsl.h | 56 ++++++++++ demos/gears_ps_flat.h | 73 ------------- demos/… [View More]

1 0

Giovanni Mascellani : demos/triangle: Recompile shaders with our compiler.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: vkd3d Branch: master Commit: 763f7dfa6196344da7c4fbb94dad9af42c26ac5b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/763f7dfa6196344da7c4fbb94dad9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 28 13:16:32 2022 +0200 demos/triangle: Recompile shaders with our compiler. --- demos/demo_win32.h | 1 + demos/triangle.c | 20 ++++++++---- demos/triangle.hlsl | 20 ------------ demos/triangle_hlsl.h | 21 ++++++++++++ demos/… [View More]triangle_ps.h | 73 ------------------------------------------ demos/triangle_vs.h | 89 --------------------------------------------------- 6 files changed, 36 insertions(+), 188 deletions(-) diff --git a/demos/demo_win32.h b/demos/demo_win32.h index d2a54989..382e6030 100644 --- a/demos/demo_win32.h +++ b/demos/demo_win32.h @@ -18,6 +18,7 @@ */ #include <vkd3d_dxgi1_4.h> +#include <vkd3d_d3dcompiler.h> #include <stdbool.h> #include <stdio.h> diff --git a/demos/triangle.c b/demos/triangle.c index bac1cdc5..b331da0c 100644 --- a/demos/triangle.c +++ b/demos/triangle.c @@ -45,8 +45,7 @@ #include <assert.h> #include "demo.h" -#include "triangle_vs.h" -#include "triangle_ps.h" +#include "triangle_hlsl.h" struct cxt_fence { @@ -277,6 +276,7 @@ static void cxt_load_assets(struct cx_triangle *cxt) D3D12_RESOURCE_DESC resource_desc; D3D12_HEAP_PROPERTIES heap_desc; D3D12_RANGE read_range = {0, 0}; + ID3DBlob *vs, *ps; HRESULT hr; void *data; @@ -285,14 +285,19 @@ static void cxt_load_assets(struct cx_triangle *cxt) hr = demo_create_root_signature(cxt->device, &root_signature_desc, &cxt->root_signature); assert(SUCCEEDED(hr)); + hr = D3DCompile(triangle_hlsl, strlen(triangle_hlsl), NULL, NULL, NULL, "vs_main", "vs_5_0", 0, 0, &vs, NULL); + assert(SUCCEEDED(hr)); + hr = D3DCompile(triangle_hlsl, strlen(triangle_hlsl), NULL, NULL, NULL, "ps_main", "ps_5_0", 0, 0, &ps, NULL); + assert(SUCCEEDED(hr)); + memset(&pso_desc, 0, sizeof(pso_desc)); pso_desc.InputLayout.pInputElementDescs = il_desc; pso_desc.InputLayout.NumElements = ARRAY_SIZE(il_desc); pso_desc.pRootSignature = cxt->root_signature; - pso_desc.VS.pShaderBytecode = g_vs_main; - pso_desc.VS.BytecodeLength = sizeof(g_vs_main); - pso_desc.PS.pShaderBytecode = g_ps_main; - pso_desc.PS.BytecodeLength = sizeof(g_ps_main); + pso_desc.VS.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs); + pso_desc.VS.BytecodeLength = ID3D10Blob_GetBufferSize(vs); + pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps); + pso_desc.PS.BytecodeLength = ID3D10Blob_GetBufferSize(ps); demo_rasterizer_desc_init_default(&pso_desc.RasterizerState); demo_blend_desc_init_default(&pso_desc.BlendState); pso_desc.DepthStencilState.DepthEnable = FALSE; @@ -306,6 +311,9 @@ static void cxt_load_assets(struct cx_triangle *cxt) &IID_ID3D12PipelineState, (void **)&cxt->pipeline_state); assert(SUCCEEDED(hr)); + ID3D10Blob_Release(vs); + ID3D10Blob_Release(ps); + hr = ID3D12Device_CreateCommandList(cxt->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxt->command_allocator, cxt->pipeline_state, &IID_ID3D12GraphicsCommandList, (void **)&cxt->command_list); assert(SUCCEEDED(hr)); diff --git a/demos/triangle.hlsl b/demos/triangle.hlsl deleted file mode 100644 index 90dd5ffe..00000000 --- a/demos/triangle.hlsl +++ /dev/null @@ -1,20 +0,0 @@ -struct ps_in -{ - float4 position : SV_POSITION; - float4 colour : COLOR; -}; - -struct ps_in vs_main(float4 position : POSITION, float4 colour : COLOR) -{ - struct ps_in o; - - o.position = position; - o.colour = colour; - - return o; -} - -float4 ps_main(struct ps_in i) : SV_TARGET -{ - return i.colour; -} diff --git a/demos/triangle_hlsl.h b/demos/triangle_hlsl.h new file mode 100644 index 00000000..de41bd5a --- /dev/null +++ b/demos/triangle_hlsl.h @@ -0,0 +1,21 @@ +static const char triangle_hlsl[] = +"struct ps_in\n" +"{\n" +" float4 position : SV_POSITION;\n" +" float4 colour : COLOR;\n" +"};\n" +"\n" +"struct ps_in vs_main(float4 position : POSITION, float4 colour : COLOR)\n" +"{\n" +" struct ps_in o;\n" +"\n" +" o.position = position;\n" +" o.colour = colour;\n" +"\n" +" return o;\n" +"}\n" +"\n" +"float4 ps_main(struct ps_in i) : SV_TARGET\n" +"{\n" +" return i.colour;\n" +"}\n"; diff --git a/demos/triangle_ps.h b/demos/triangle_ps.h deleted file mode 100644 index 82bcd3cb..00000000 --- a/demos/triangle_ps.h +++ /dev/null @@ -1,73 +0,0 @@ -#if 0 -// -// Generated by Microsoft (R) D3D Shader Disassembler -// -// -// Input signature: -// -// Name Index Mask Register SysValue Format Used -// -------------------- ----- ------ -------- -------- ------- ------ -// SV_POSITION 0 xyzw 0 POS float -// COLOR 0 xyzw 1 NONE float xyzw -// -// -// Output signature: -// -// Name Index Mask Register SysValue Format Used -// -------------------- ----- ------ -------- -------- ------- ------ -// SV_TARGET 0 xyzw 0 TARGET float xyzw -// -ps_5_0 -dcl_globalFlags refactoringAllowed -dcl_input_ps linear v1.xyzw -dcl_output o0.xyzw -mov o0.xyzw, v1.xyzw -ret -// Approximately 0 instruction slots used -#endif - -const BYTE g_ps_main[] = -{ - 68, 88, 66, 67, 80, 239, - 109, 26, 0, 147, 6, 156, - 240, 104, 206, 124, 185, 57, - 18, 98, 1, 0, 0, 0, - 248, 0, 0, 0, 3, 0, - 0, 0, 44, 0, 0, 0, - 128, 0, 0, 0, 180, 0, - 0, 0, 73, 83, 71, 78, - 76, 0, 0, 0, 2, 0, - 0, 0, 8, 0, 0, 0, - 56, 0, 0, 0, 0, 0, - 0, 0, 1, 0, 0, 0, - 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, - 68, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, - 0, 0, 15, 15, 0, 0, - 83, 86, 95, 80, 79, 83, - 73, 84, 73, 79, 78, 0, - 67, 79, 76, 79, 82, 0, - 171, 171, 79, 83, 71, 78, - 44, 0, 0, 0, 1, 0, - 0, 0, 8, 0, 0, 0, - 32, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, - 0, 0, 15, 0, 0, 0, - 83, 86, 95, 84, 65, 82, - 71, 69, 84, 0, 171, 171, - 83, 72, 69, 88, 60, 0, - 0, 0, 80, 0, 0, 0, - 15, 0, 0, 0, 106, 8, - 0, 1, 98, 16, 0, 3, - 242, 16, 16, 0, 1, 0, - 0, 0, 101, 0, 0, 3, - 242, 32, 16, 0, 0, 0, - 0, 0, 54, 0, 0, 5, - 242, 32, 16, 0, 0, 0, - 0, 0, 70, 30, 16, 0, - 1, 0, 0, 0, 62, 0, - 0, 1 -}; diff --git a/demos/triangle_vs.h b/demos/triangle_vs.h deleted file mode 100644 index 655b72bf..00000000 --- a/demos/triangle_vs.h +++ /dev/null @@ -1,89 +0,0 @@ -#if 0 -// -// Generated by Microsoft (R) D3D Shader Disassembler -// -// -// Input signature: -// -// Name Index Mask Register SysValue Format Used -// -------------------- ----- ------ -------- -------- ------- ------ -// POSITION 0 xyzw 0 NONE float xyzw -// COLOR 0 xyzw 1 NONE float xyzw -// -// -// Output signature: -// -// Name Index Mask Register SysValue Format Used -// -------------------- ----- ------ -------- -------- ------- ------ -// SV_POSITION 0 xyzw 0 POS float xyzw -// COLOR 0 xyzw 1 NONE float xyzw -// -vs_5_0 -dcl_globalFlags refactoringAllowed -dcl_input v0.xyzw -dcl_input v1.xyzw -dcl_output_siv o0.xyzw, position -dcl_output o1.xyzw -mov o0.xyzw, v0.xyzw -mov o1.xyzw, v1.xyzw -ret -// Approximately 0 instruction slots used -#endif - -const BYTE g_vs_main[] = -{ - 68, 88, 66, 67, 17, 201, - 143, 165, 233, 56, 0, 40, - 84, 255, 207, 20, 40, 195, - 63, 228, 1, 0, 0, 0, - 68, 1, 0, 0, 3, 0, - 0, 0, 44, 0, 0, 0, - 124, 0, 0, 0, 208, 0, - 0, 0, 73, 83, 71, 78, - 72, 0, 0, 0, 2, 0, - 0, 0, 8, 0, 0, 0, - 56, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 0, 0, - 0, 0, 15, 15, 0, 0, - 65, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 3, 0, 0, 0, 1, 0, - 0, 0, 15, 15, 0, 0, - 80, 79, 83, 73, 84, 73, - 79, 78, 0, 67, 79, 76, - 79, 82, 0, 171, 79, 83, - 71, 78, 76, 0, 0, 0, - 2, 0, 0, 0, 8, 0, - 0, 0, 56, 0, 0, 0, - 0, 0, 0, 0, 1, 0, - 0, 0, 3, 0, 0, 0, - 0, 0, 0, 0, 15, 0, - 0, 0, 68, 0, 0, 0, - 0, 0, 0, 0, 0, 0, - 0, 0, 3, 0, 0, 0, - 1, 0, 0, 0, 15, 0, - 0, 0, 83, 86, 95, 80, - 79, 83, 73, 84, 73, 79, - 78, 0, 67, 79, 76, 79, - 82, 0, 171, 171, 83, 72, - 69, 88, 108, 0, 0, 0, - 80, 0, 1, 0, 27, 0, - 0, 0, 106, 8, 0, 1, - 95, 0, 0, 3, 242, 16, - 16, 0, 0, 0, 0, 0, - 95, 0, 0, 3, 242, 16, - 16, 0, 1, 0, 0, 0, - 103, 0, 0, 4, 242, 32, - 16, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 101, 0, - 0, 3, 242, 32, 16, 0, - 1, 0, 0, 0, 54, 0, - 0, 5, 242, 32, 16, 0, - 0, 0, 0, 0, 70, 30, - 16, 0, 0, 0, 0, 0, - 54, 0, 0, 5, 242, 32, - 16, 0, 1, 0, 0, 0, - 70, 30, 16, 0, 1, 0, - 0, 0, 62, 0, 0, 1 -}; [View Less]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write SM4 rsq instructions.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: vkd3d Branch: master Commit: 1655d309bd4be05f10dac6da66c64e9c3078e86b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1655d309bd4be05f10dac6da66c64… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 28 13:49:03 2022 +0200 vkd3d-shader/hlsl: Write SM4 rsq instructions. --- libs/vkd3d-shader/hlsl_sm4.c | 5 +++++ tests/hlsl-normalize.shader_test | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-… [View More]

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Parse normalize intrinsic.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: vkd3d Branch: master Commit: d600f0488e07ff28d9eb85cb037220828ae0851b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d600f0488e07ff28d9eb85cb03722… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 1 11:06:03 2021 +0200 vkd3d-shader/hlsl: Parse normalize intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --… [View More]git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fc3b31a4..1bdc1433 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2278,6 +2278,34 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx, return !!add_implicit_conversion(ctx, params->instrs, &load->node, ret_type, loc); } +static bool intrinsic_normalize(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_type *type = params->args[0]->data_type; + struct hlsl_ir_node *dot, *rsq, *arg; + + if (type->type == HLSL_CLASS_MATRIX) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Invalid type %s.", string->buffer); + hlsl_release_string_buffer(ctx, string); + } + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(dot = add_binary_dot_expr(ctx, params->instrs, arg, arg, loc))) + return false; + + if (!(rsq = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_RSQ, dot, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, rsq, arg, loc); +} + static bool intrinsic_pow(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2342,6 +2370,7 @@ intrinsic_functions[] = {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, {"mul", 2, true, intrinsic_mul}, + {"normalize", 1, true, intrinsic_normalize}, {"pow", 2, true, intrinsic_pow}, {"round", 1, true, intrinsic_round}, {"saturate", 1, true, intrinsic_saturate}, [View Less]

1 0

Giovanni Mascellani : tests: Test normalize() intrinsic.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: vkd3d Branch: master Commit: 4ab1a4cef56137cb410f34d0415503b248de2abb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4ab1a4cef56137cb410f34d041550… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 28 13:59:49 2022 +0200 tests: Test normalize() intrinsic. --- Makefile.am | 1 + tests/hlsl-normalize.shader_test | 80 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/Makefile.am b/… [View More]

1 0

Francois Gouget : winetest: Recognize Windows NT4 reports.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: tools Branch: master Commit: d93b6a47b8cd73b21e4ed93f8f33e0afbcd71826 URL: https://gitlab.winehq.org/winehq/tools/-/commit/d93b6a47b8cd73b21e4ed93f8f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 27 17:28:03 2022 +0200 winetest: Recognize Windows NT4 reports. --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index 5a1ada8b..728b749d 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2022