wine-commits October 2022

wine-commits@winehq.org

1 participants
537 discussions

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

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 : 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

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

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.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;

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 index a3b9dab0fbb..b39cd86248a 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -983,6 +983,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagLabel: case SymTagInlineSite: case SymTagCustom: + case SymTagPublicSymbol: + case SymTagThunk: return FALSE; } break;

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 ++++---- dlls/dbghelp/cpu_i386.c | 12 ++++++------ dlls/dbghelp/cpu_x86_64.c | 10 +++++----- dlls/dbghelp/dbghelp.c | 14 ++++++-------- dlls/dbghelp/dwarf.c | 10 +++++----- dlls/dbghelp/elf_module.c | 8 ++++---- dlls/dbghelp/macho_module.c | 6 +++--- dlls/dbghelp/module.c | 16 +++++++--------- dlls/dbghelp/pe_module.c | 8 ++++---- dlls/dbghelp/source.c | 16 ++++++++-------- dlls/dbghelp/stack.c | 6 +++--- dlls/dbghelp/symbol.c | 41 ++++++++++++++++++----------------------- dlls/dbghelp/type.c | 4 +--- 15 files changed, 82 insertions(+), 95 deletions(-)

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/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,

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/token.c +++ b/dlls/sapi/token.c @@ -784,6 +784,7 @@ struct object_token LONG ref; HKEY token_key; + WCHAR *token_id; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -831,6 +832,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { if (This->token_key) RegCloseKey( This->token_key ); + free(This->token_id); heap_free( This ); } @@ -950,6 +952,7 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, if (res) return SPERR_NOT_FOUND; This->token_key = key; + This->token_id = wcsdup(token_id); return S_OK; } @@ -1075,6 +1078,7 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) This->ref = 1; This->token_key = NULL; + This->token_id = NULL; hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj );

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 error on multi-character strings Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/xmllite/tests/writer.c | 8 ++++++++ dlls/xmllite/writer.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7b98f61a207..c4ab079373c 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -2145,6 +2145,14 @@ static void test_WriteDocType(void) hr = IXmlWriter_WriteDocType(writer, L"a", pubidW, NULL, NULL); ok(hr == WC_E_PUBLICID, "Unexpected hr %#lx.\n", hr); + /* Invalid multi-character string */ + hr = IXmlWriter_WriteDocType(writer, L":ax>m", NULL, NULL, NULL); + ok(hr == WC_E_NAMECHARACTER, "Unexpected hr %#lx.\n", hr); + + /* Valid multi-character string */ + hr = IXmlWriter_WriteDocType(writer, L"root", NULL, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IStream_Release(stream); for (i = 0; i < ARRAY_SIZE(doctype_tests); i++) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 1e1a8e8ddb8..c4f9ed2f440 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -376,11 +376,12 @@ static HRESULT is_valid_name(const WCHAR *str, unsigned int *out) if (!is_namestartchar(*str++)) return WC_E_NAMECHARACTER; - while (*str++) + while (*str) { if (!is_namechar(*str)) return WC_E_NAMECHARACTER; len++; + str++; } *out = len;

1 0

Jump to page:

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