- Wine-Devel - list.winehq.org

[PATCH] mscoree: Add an option to enable the interpreter.
by Esme Povirk Feb. 28, 2021

Feb. 28, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/mscoree/metahost.c | 28 ++++++++++++++++++++++++++++ dlls/mscoree/mscoree_private.h | 12 ++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d9b599fadc7..907d8af9791 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -106,6 +106,7 @@ MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, ch static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init_version)(const char *domain_name, const char *runtime_version); +static void (CDECL *mono_jit_set_aot_mode)(MonoAotMode mode); static int (CDECL *mono_jit_set_trace_options)(const char* options); void* (CDECL *mono_marshal_get_vtfixup_ftnptr)(MonoImage *image, DWORD token, WORD type); MonoDomain* (CDECL *mono_object_get_domain)(MonoObject *obj); @@ -158,6 +159,8 @@ static HRESULT load_mono(LPCWSTR mono_path) WCHAR mono_dll_path[MAX_PATH+16]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int aot_size; + char aot_setting[256]; int trace_size; char trace_setting[256]; int verbose_size; @@ -239,6 +242,7 @@ static HRESULT load_mono(LPCWSTR mono_path) LOAD_OPT_MONO_FUNCTION(mono_callspec_set_assembly, NULL); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_jit_set_aot_mode, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL); LOAD_OPT_MONO_FUNCTION(mono_profiler_set_runtime_shutdown_begin_callback, NULL); @@ -277,6 +281,30 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_install_assembly_preload_hook(mono_assembly_preload_hook_fn, NULL); + aot_size = GetEnvironmentVariableA("WINE_MONO_AOT", aot_setting, sizeof(aot_setting)); + + if (aot_size) + { + MonoAotMode mode; + if (strcmp(aot_setting, "interp") == 0) + mode = MONO_AOT_MODE_INTERP_ONLY; + else if (strcmp(aot_setting, "none") == 0) + mode = MONO_AOT_MODE_NONE; + else + { + ERR("unknown WINE_MONO_AOT setting, valid settings are interp and none\n"); + mode = MONO_AOT_MODE_NONE; + } + if (mono_jit_set_aot_mode != NULL) + { + mono_jit_set_aot_mode(mode); + } + else + { + ERR("mono_jit_set_aot_mode export not found\n"); + } + } + trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); if (trace_size) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index da587285cfe..69c30e5e3e0 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -147,6 +147,18 @@ typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof); typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout); +typedef enum { + MONO_AOT_MODE_NONE, + MONO_AOT_MODE_NORMAL, + MONO_AOT_MODE_HYBRID, + MONO_AOT_MODE_FULL, + MONO_AOT_MODE_LLVMONLY, + MONO_AOT_MODE_INTERP, + MONO_AOT_MODE_INTERP_LLVMONLY, + MONO_AOT_MODE_LLVMONLY_INTERP, + MONO_AOT_MODE_INTERP_ONLY +} MonoAotMode; + extern BOOL is_mono_started DECLSPEC_HIDDEN; extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH v2 1/5] aclui: Add an empty ACE editor dialog.
by Zebediah Figura Feb. 28, 2021

Feb. 28, 2021

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/aclui/Makefile.in | 3 ++ dlls/aclui/aclui.rc | 38 ++++++++++++++ dlls/aclui/aclui_main.c | 106 ++++++++++++++++++++++++++++++++++++++-- dlls/aclui/resource.h | 36 ++++++++++++++ 4 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 dlls/aclui/aclui.rc create mode 100644 dlls/aclui/resource.h diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index e79b3fe9e33..da3aa00084e 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,9 @@ MODULE = aclui.dll IMPORTLIB = aclui +IMPORTS = comctl32 user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = aclui_main.c + +RC_SRCS = aclui.rc diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc new file mode 100644 index 00000000000..3a03b0550e9 --- /dev/null +++ b/dlls/aclui/aclui.rc @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" +#include "winresrc.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_SECURITY_PROPERTIES DIALOGEX 0, 0, 240, 215 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Security" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Group or user names:", -1, 5, 5, 230, 10 + CONTROL "", IDC_USERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SORTASCENDING | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 17, 230, 63, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + + LTEXT "", IDC_ACE_USER, 5, 105, 110, 10 + LTEXT "Allow", -1, 120, 105, 55, 10, SS_CENTER + LTEXT "Deny", -1, 180, 105, 55, 10, SS_CENTER + CONTROL "", IDC_ACE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 115, 230, 95, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE +END diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 1a03f30df24..3989c3017aa 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -19,22 +19,110 @@ */ #include <stdarg.h> - +#define COBJMACROS #include "initguid.h" #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winnt.h" #include "aclui.h" +#include "resource.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(aclui); -HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi) +/* the aclui.h files does not contain the necessary COBJMACROS */ +#define ISecurityInformation_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISecurityInformation_Release(This) (This)->lpVtbl->Release(This) +#define ISecurityInformation_GetObjectInformation(This, obj) (This)->lpVtbl->GetObjectInformation(This, obj) +#define ISecurityInformation_GetSecurity(This, info, sd, def) (This)->lpVtbl->GetSecurity(This, info, sd, def) +#define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def) + +struct security_page +{ + SI_OBJECT_INFO info; + + HWND dialog; +}; + +static HINSTANCE aclui_instance; + +static void security_page_free(struct security_page *page) +{ + free(page); +} + +static void security_page_init_dlg(HWND hwnd, struct security_page *page) +{ + page->dialog = hwnd; +} + +static INT_PTR CALLBACK security_page_proc(HWND dialog, UINT msg, WPARAM wparam, LPARAM lparam) { - FIXME("(%p): stub\n", psi); - return NULL; + switch (msg) + { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *propsheet = (PROPSHEETPAGEW *)lparam; + security_page_init_dlg(dialog, (struct security_page *)propsheet->lParam); + break; + } + } + return FALSE; +} + +static UINT CALLBACK security_page_callback(HWND hwnd, UINT msg, PROPSHEETPAGEW *ppsp) +{ + struct security_page *page = (struct security_page *)ppsp->lParam; + + if (msg == PSPCB_RELEASE) + security_page_free(page); + + return 1; +} + +HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) +{ + struct security_page *page; + PROPSHEETPAGEW propsheet; + HPROPSHEETPAGE ret; + + TRACE("%p\n", security); + + InitCommonControls(); + + if (!(page = calloc(1, sizeof(*page)))) + return NULL; + + if (FAILED(ISecurityInformation_GetObjectInformation(security, &page->info))) + { + free(page); + return NULL; + } + + memset(&propsheet, 0, sizeof(propsheet)); + propsheet.dwSize = sizeof(propsheet); + propsheet.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; + propsheet.hInstance = aclui_instance; + propsheet.pszTemplate = (WCHAR *)MAKEINTRESOURCE(IDD_SECURITY_PROPERTIES); + propsheet.pfnDlgProc = security_page_proc; + propsheet.pfnCallback = security_page_callback; + propsheet.lParam = (LPARAM)page; + + if (page->info.dwFlags & SI_PAGE_TITLE) + { + propsheet.pszTitle = page->info.pszPageTitle; + propsheet.dwFlags |= PSP_USETITLE; + } + + if (!(ret = CreatePropertySheetPageW(&propsheet))) + { + ERR("Failed to create property sheet page.\n"); + free(page); + return NULL; + } + return ret; } BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) @@ -42,3 +130,13 @@ BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) FIXME("(%p, %p): stub\n", owner, psi); return FALSE; } + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + { + aclui_instance = instance; + DisableThreadLibraryCalls(instance); + } + return TRUE; +} diff --git a/dlls/aclui/resource.h b/dlls/aclui/resource.h new file mode 100644 index 00000000000..f92d99692c7 --- /dev/null +++ b/dlls/aclui/resource.h @@ -0,0 +1,36 @@ +/* + * Definitions for aclui dialog controls + * + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ACLUI__ +#define __WINE_ACLUI__ + +#define IDD_SECURITY_PROPERTIES 100 + +#define IDC_USERS 101 + +#define IDC_ACE_USER 110 +#define IDC_ACE 111 + +#define IDS_PERMISSION_FOR 1000 + +#define IDB_USER_ICONS 2000 +#define IDB_CHECKBOX 2001 + +#endif /* __WINE_ACLUI__ */ -- 2.30.1

1 4

[PATCH 1/5] aclui: Add an empty ACE editor dialog.
by Zebediah Figura Feb. 28, 2021

Feb. 28, 2021

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/aclui/Makefile.in | 3 ++ dlls/aclui/aclui.rc | 38 ++++++++++++++ dlls/aclui/aclui_main.c | 106 ++++++++++++++++++++++++++++++++++++++-- dlls/aclui/resource.h | 36 ++++++++++++++ 4 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 dlls/aclui/aclui.rc create mode 100644 dlls/aclui/resource.h diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index e79b3fe9e33..da3aa00084e 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,9 @@ MODULE = aclui.dll IMPORTLIB = aclui +IMPORTS = comctl32 user32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = aclui_main.c + +RC_SRCS = aclui.rc diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc new file mode 100644 index 00000000000..3a03b0550e9 --- /dev/null +++ b/dlls/aclui/aclui.rc @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" +#include "winresrc.h" + +#pragma makedep po + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +IDD_SECURITY_PROPERTIES DIALOGEX 0, 0, 240, 215 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Security" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Group or user names:", -1, 5, 5, 230, 10 + CONTROL "", IDC_USERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SORTASCENDING | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 17, 230, 63, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + + LTEXT "", IDC_ACE_USER, 5, 105, 110, 10 + LTEXT "Allow", -1, 120, 105, 55, 10, SS_CENTER + LTEXT "Deny", -1, 180, 105, 55, 10, SS_CENTER + CONTROL "", IDC_ACE, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | LVS_SINGLESEL | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 115, 230, 95, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE +END diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 1a03f30df24..3989c3017aa 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -19,22 +19,110 @@ */ #include <stdarg.h> - +#define COBJMACROS #include "initguid.h" #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winnt.h" #include "aclui.h" +#include "resource.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(aclui); -HPROPSHEETPAGE WINAPI CreateSecurityPage(LPSECURITYINFO psi) +/* the aclui.h files does not contain the necessary COBJMACROS */ +#define ISecurityInformation_AddRef(This) (This)->lpVtbl->AddRef(This) +#define ISecurityInformation_Release(This) (This)->lpVtbl->Release(This) +#define ISecurityInformation_GetObjectInformation(This, obj) (This)->lpVtbl->GetObjectInformation(This, obj) +#define ISecurityInformation_GetSecurity(This, info, sd, def) (This)->lpVtbl->GetSecurity(This, info, sd, def) +#define ISecurityInformation_GetAccessRights(This, type, flags, access, count, def) (This)->lpVtbl->GetAccessRights(This, type, flags, access, count, def) + +struct security_page +{ + SI_OBJECT_INFO info; + + HWND dialog; +}; + +static HINSTANCE aclui_instance; + +static void security_page_free(struct security_page *page) +{ + free(page); +} + +static void security_page_init_dlg(HWND hwnd, struct security_page *page) +{ + page->dialog = hwnd; +} + +static INT_PTR CALLBACK security_page_proc(HWND dialog, UINT msg, WPARAM wparam, LPARAM lparam) { - FIXME("(%p): stub\n", psi); - return NULL; + switch (msg) + { + case WM_INITDIALOG: + { + PROPSHEETPAGEW *propsheet = (PROPSHEETPAGEW *)lparam; + security_page_init_dlg(dialog, (struct security_page *)propsheet->lParam); + break; + } + } + return FALSE; +} + +static UINT CALLBACK security_page_callback(HWND hwnd, UINT msg, PROPSHEETPAGEW *ppsp) +{ + struct security_page *page = (struct security_page *)ppsp->lParam; + + if (msg == PSPCB_RELEASE) + security_page_free(page); + + return 1; +} + +HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) +{ + struct security_page *page; + PROPSHEETPAGEW propsheet; + HPROPSHEETPAGE ret; + + TRACE("%p\n", security); + + InitCommonControls(); + + if (!(page = calloc(1, sizeof(*page)))) + return NULL; + + if (FAILED(ISecurityInformation_GetObjectInformation(security, &page->info))) + { + free(page); + return NULL; + } + + memset(&propsheet, 0, sizeof(propsheet)); + propsheet.dwSize = sizeof(propsheet); + propsheet.dwFlags = PSP_DEFAULT | PSP_USECALLBACK; + propsheet.hInstance = aclui_instance; + propsheet.pszTemplate = (WCHAR *)MAKEINTRESOURCE(IDD_SECURITY_PROPERTIES); + propsheet.pfnDlgProc = security_page_proc; + propsheet.pfnCallback = security_page_callback; + propsheet.lParam = (LPARAM)page; + + if (page->info.dwFlags & SI_PAGE_TITLE) + { + propsheet.pszTitle = page->info.pszPageTitle; + propsheet.dwFlags |= PSP_USETITLE; + } + + if (!(ret = CreatePropertySheetPageW(&propsheet))) + { + ERR("Failed to create property sheet page.\n"); + free(page); + return NULL; + } + return ret; } BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) @@ -42,3 +130,13 @@ BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) FIXME("(%p, %p): stub\n", owner, psi); return FALSE; } + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + { + aclui_instance = instance; + DisableThreadLibraryCalls(instance); + } + return TRUE; +} diff --git a/dlls/aclui/resource.h b/dlls/aclui/resource.h new file mode 100644 index 00000000000..f92d99692c7 --- /dev/null +++ b/dlls/aclui/resource.h @@ -0,0 +1,36 @@ +/* + * Definitions for aclui dialog controls + * + * Copyright (c) 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_ACLUI__ +#define __WINE_ACLUI__ + +#define IDD_SECURITY_PROPERTIES 100 + +#define IDC_USERS 101 + +#define IDC_ACE_USER 110 +#define IDC_ACE 111 + +#define IDS_PERMISSION_FOR 1000 + +#define IDB_USER_ICONS 2000 +#define IDB_CHECKBOX 2001 + +#endif /* __WINE_ACLUI__ */ -- 2.30.1

3 6

[PATCH] po: Update Dutch translation
by Floris Renaud Feb. 28, 2021

Feb. 28, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/po/nl.po b/po/nl.po index d727b541ffa..1c0f94c1515 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13112,7 +13112,7 @@ msgstr "Wine Verkenner" #: programs/explorer/explorer.rc:33 msgid "Start" -msgstr "Opstarten" +msgstr "Wine" #: programs/explorer/explorer.rc:34 programs/winefile/winefile.rc:36 msgid "&Run..." @@ -16145,10 +16145,10 @@ msgid "" "linked to the Libraries and Graphics tabs to allow you to change system-wide " "or per-application settings in those tabs as well." msgstr "" -"Wine geeft de mogelijkheid om per toepassing de Windows versie in te " -"stellen. Dit tabblad is gekoppeld aan de tabbladen 'Bibliotheken' en " -"'Grafisch' om zowel systeembreed als programmaspecifiek instellingen in deze " -"tabbladen mogelijk te maken." +"Voor elk programma kan Wine apart de Windows versie instellen. Dit tabblad is" +"gekoppeld aan de tabbladen 'Bibliotheken' en 'Grafisch'. Hierdoor kan per " +"programma de standaardinstellingen of programmaspecifieke instellingen " +"gebruikt worden." #: programs/winecfg/winecfg.rc:158 msgid "Add appli&cation..." @@ -16180,7 +16180,7 @@ msgstr "Laat de vensterbeheerder de vensters &beheren" #: programs/winecfg/winecfg.rc:172 msgid "&Emulate a virtual desktop" -msgstr "&Emuleer een virtueel bureaublad" +msgstr "Maak een &virtueel bureaublad" #: programs/winecfg/winecfg.rc:174 msgid "Desktop &size:" @@ -16514,7 +16514,7 @@ msgstr "Automatisch" #: programs/winecfg/winecfg.rc:69 msgid "Local hard disk" -msgstr "Hardeschijf" +msgstr "Harde schijf" #: programs/winecfg/winecfg.rc:70 msgid "Network share" @@ -16526,7 +16526,7 @@ msgstr "Diskettestation" #: programs/winecfg/winecfg.rc:72 msgid "CD-ROM" -msgstr "Cd-rom" +msgstr "CD-ROM" #: programs/winecfg/winecfg.rc:73 msgid "" @@ -16536,7 +16536,7 @@ msgid "" msgstr "" "U kunt geen schijven meer toevoegen.\n" "\n" -"Elke schijf moet een letter van A tot Z hebben dus het kunnen er niet meer " +"Elke schijf moet een letter van A tot Z hebben. Het kunnen er dus niet meer " "dan 26 zijn." #: programs/winecfg/winecfg.rc:74 @@ -16727,8 +16727,8 @@ msgid "" "Database</a> for tips about running this application." msgstr "" "Dit kan veroorzaakt worden door een probleem in het programma of een fout in " -"Wine. U kunt zoeken op <a href=\"https://appdb.winehq.org\">Application " -"Database</a> naar tips voor dit programma." +"Wine. Zoek in de <a href=\"https://appdb.winehq.org\">Programma Database</a> " +"naar tips voor dit programma." #: programs/winedbg/winedbg.rc:62 msgid "Show &Details" @@ -16745,9 +16745,9 @@ msgid "" "button, then <a href=\"https://wiki.winehq.org/Bugs\">file a bug report</a> " "and attach that file to the report." msgstr "" -"Indien dit probleem zich niet voordoet onder Windows en het probleem is nog " -"niet gerapporteerd, dan kunt U gedetailleerde informatie in een bestand " -"opslaan met de \"Opslaan als\" knop. Dit bestand kunt U via <a href=" +"Indien dit probleem zich niet voordoet onder Windows en het probleem nog " +"niet is gerapporteerd, dan kunt u gedetailleerde informatie in een bestand " +"opslaan met de \"Opslaan als\" knop. Dit bestand kunt u via <a href=" "\"https://wiki.winehq.org/Bugs\">file a bug report</a> versturen." #: programs/winedbg/winedbg.rc:40 -- 2.30.1

2 2

[PATCH vkd3d v2 1/6] vkd3d-shader: Return a vkd3d_string_buffer from hlsl_type_to_string().
by Zebediah Figura Feb. 28, 2021

Feb. 28, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 62 +++++++++++++----------- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl.y | 20 +++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 60 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 11 +++++ 5 files changed, 120 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 52b3dd10..e2a77707 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -648,10 +648,10 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr return 0; } -char *hlsl_type_to_string(const struct hlsl_type *type) +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) { - const char *name; - char *string; + struct vkd3d_string_buffer *string; static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = { @@ -663,66 +663,70 @@ char *hlsl_type_to_string(const struct hlsl_type *type) "bool", }; + if (!(string = vkd3d_string_buffer_get(string_buffers))) + return NULL; + if (type->name) - return vkd3d_strdup(type->name); + { + vkd3d_string_buffer_printf(string, "%s", type->name); + return string; + } switch (type->type) { case HLSL_CLASS_SCALAR: - return vkd3d_strdup(base_types[type->base_type]); + vkd3d_string_buffer_printf(string, "%s", base_types[type->base_type]); + return string; case HLSL_CLASS_VECTOR: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 2))) - sprintf(string, "%s%u", name, type->dimx); + vkd3d_string_buffer_printf(string, "%s%u", base_types[type->base_type], type->dimx); return string; case HLSL_CLASS_MATRIX: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 4))) - sprintf(string, "%s%ux%u", name, type->dimx, type->dimy); + vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); return string; case HLSL_CLASS_ARRAY: { + struct vkd3d_string_buffer *inner_string; const struct hlsl_type *t; - char *inner_string; - size_t len = 1; for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - len += 14; - if (!(inner_string = hlsl_type_to_string(t))) - return NULL; - len += strlen(inner_string); + ; - if ((string = malloc(len))) + if ((inner_string = hlsl_type_to_string(string_buffers, t))) { - strcpy(string, inner_string); - for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - sprintf(string + strlen(string), "[%u]", t->e.array.elements_count); + vkd3d_string_buffer_printf(string, "%s", inner_string->buffer); + vkd3d_string_buffer_release(string_buffers, inner_string); } - vkd3d_free(inner_string); + for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) + vkd3d_string_buffer_printf(string, "[%u]", t->e.array.elements_count); return string; } case HLSL_CLASS_STRUCT: - return vkd3d_strdup("<anonymous struct>"); + vkd3d_string_buffer_printf(string, "<anonymous struct>"); + return string; default: - return vkd3d_strdup("<unexpected type>"); + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; } } const char *debug_hlsl_type(const struct hlsl_type *type) { + struct vkd3d_string_buffer_cache string_buffers; + struct vkd3d_string_buffer *string; const char *ret; - char *string; - if (!(string = hlsl_type_to_string(type))) + vkd3d_string_buffer_cache_init(&string_buffers); + if (!(string = hlsl_type_to_string(&string_buffers, type))) return NULL; - ret = vkd3d_dbg_sprintf("%s", string); - vkd3d_free(string); + ret = vkd3d_dbg_sprintf("%s", string->buffer); + vkd3d_string_buffer_release(&string_buffers, string); + vkd3d_string_buffer_cache_cleanup(&string_buffers); return ret; } @@ -1526,6 +1530,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_cont ctx->source_files_count = 1; ctx->location.source_name = ctx->source_files[0]; ctx->location.line = ctx->location.column = 1; + vkd3d_string_buffer_cache_init(&ctx->string_buffers); ctx->matrix_majority = HLSL_COLUMN_MAJOR; @@ -1553,6 +1558,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) for (i = 0; i < ctx->source_files_count; ++i) vkd3d_free((void *)ctx->source_files[i]); vkd3d_free(ctx->source_files); + vkd3d_string_buffer_cache_cleanup(&ctx->string_buffers); rb_destroy(&ctx->functions, free_function_rb, NULL); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a374f54a..5a0470b9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -390,6 +390,7 @@ struct hlsl_ctx unsigned int source_files_count; struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; + struct vkd3d_string_buffer_cache string_buffers; bool failed; void *scanner; @@ -496,7 +497,8 @@ static inline void hlsl_src_remove(struct hlsl_src *src) const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; -char *hlsl_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) DECLSPEC_HIDDEN; char *hlsl_modifiers_to_string(unsigned int modifiers) DECLSPEC_HIDDEN; const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ea640b94..1fb1b7f3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -255,13 +255,15 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct if (!implicit_compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Can't implicitly convert from %s to %s.", src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + "Can't implicitly convert from %s to %s.", src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); return NULL; } @@ -2744,13 +2746,15 @@ unary_expr: if (!compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", - src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); YYABORT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bae2852a..51136243 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -33,6 +33,12 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } +static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +{ + buffer->buffer[0] = '\0'; + buffer->content_size = 0; +} + static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { unsigned int new_buffer_size = buffer->buffer_size * 2; @@ -107,6 +113,60 @@ void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const } } +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *cache) +{ + memset(cache, 0, sizeof(*cache)); +} + +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *cache) +{ + unsigned int i; + + for (i = 0; i < cache->count; ++i) + { + vkd3d_string_buffer_cleanup(cache->buffers[i]); + vkd3d_free(cache->buffers[i]); + } + vkd3d_free(cache->buffers); + vkd3d_string_buffer_cache_init(cache); +} + +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *cache) +{ + struct vkd3d_string_buffer *buffer; + + if (!cache->count) + { + if (!vkd3d_array_reserve((void **)&cache->buffers, &cache->capacity, + cache->max_count + 1, sizeof(*cache->buffers))) + return NULL; + ++cache->max_count; + + if (!(buffer = vkd3d_malloc(sizeof(*buffer)))) + return NULL; + vkd3d_string_buffer_init(buffer); + if (!vkd3d_string_buffer_resize(buffer, 1)) + { + vkd3d_free(buffer); + return NULL; + } + } + else + { + buffer = cache->buffers[--cache->count]; + } + vkd3d_string_buffer_clear(buffer); + return buffer; +} + +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *cache, struct vkd3d_string_buffer *buffer) +{ + if (!buffer) + return; + assert(cache->count + 1 <= cache->max_count); + cache->buffers[cache->count++] = buffer; +} + void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e837dbcd..cf66c67a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -870,12 +870,23 @@ struct vkd3d_string_buffer unsigned int content_size; }; +struct vkd3d_string_buffer_cache +{ + struct vkd3d_string_buffer **buffers; + size_t count, max_count, capacity; +}; + enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, + struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; #define vkd3d_string_buffer_trace(buffer) \ vkd3d_string_buffer_trace_(buffer, __FUNCTION__) void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; -- 2.30.1

3 7

[PATCH] widl: Remove unnecessary assignment (Coverity).
by Nikolay Sivov Feb. 27, 2021

Feb. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 16c8b57fd6e..40c1f9d008e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1534,7 +1534,7 @@ static void write_parameterized_type_forward(FILE *header, type_t *type) static void write_parameterized_implementation(FILE *header, type_t *type, int declonly) { const statement_t *stmt; - typeref_list_t *params = params = type->details.parameterized.params; + typeref_list_t *params = type->details.parameterized.params; typeref_t *ref; type_t *iface = type->details.parameterized.type, *base; char *args = NULL; -- 2.30.1

1 0

[PATCH] msado15: Fix copy-paste typos in IDispatch methods.
by Nikolay Sivov Feb. 27, 2021

Feb. 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msado15/command.c | 2 +- dlls/msado15/stream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index aff12f6a108..8c8ec79a58e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -133,7 +133,7 @@ static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID rii TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Command_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &command->Command_iface, member, flags, params, diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 961aed6a739..424ba722a26 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -113,7 +113,7 @@ static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLEST TRACE( "%p, %s, %p, %u, %u, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); @@ -133,7 +133,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &stream->Stream_iface, member, flags, params, -- 2.30.1

1 0

[PATCH V3 2/2] msxml3: Implement SAXContentHandler methods for DOMDocument mxwriter output.
by Jefferson Carpenter Feb. 27, 2021

Feb. 27, 2021

2 3

Wine staging 6.3 release
by Alistair Leslie-Hughes Feb. 27, 2021

Feb. 27, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.3 (694 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * imagehlp: Implement parts of BindImageEx to make freezing Python scripts work. * widl: Support WinRT parameterized interface type. * ntdll: Implement SystemExtendedHandleInformation in NtQuerySystemInformation. * ntdll: Set object type for System(Extended)HandleInformation in NtQuerySystemInformation. * user32: Send a WM_ACTIVATE message after restoring a minimized window. * widl: Support WinRT delegate type. * widl: Support WinRT parameterized delegate type. * widl: Compute signatures for parameterized types. * widl: Compute uuids for parameterized types. * xactengine3_7: Implement IXACT3Engine PrepareWave * widl: Never use the namespace ABI prefix for global types. * widl: Precompute qualified type names, and use them for C++ interfaces. * widl: Define the C type name as an alias for the C++ qualified name. * shell32: Implement process elevation using runas verb. Added: * [40613] Multiple applications require UAC implementation to run installer/app as a normal user instead of administrator (WhatsApp Desktop, Smartflix, Squirrel Installers, OneDrive) * [39262] DiscordSetup.exe (.NET 4.5.2 app): Squirrell installer requires being run as unelevated process ('explorer.exe' should run unelevated by default with Vista+ setting) Updated: * packager-DllMain * nvcuda-CUDA_Support * api-ms-win-Stub_DLLs * nvapi-Stub_DLL * ntdll-Junction_Points Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 1/2] oleaut32: Fix VariantCopy()/VariantCopyInd() prototypes.
by Nikolay Sivov Feb. 26, 2021

Feb. 26, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/variant.c | 13 +++++++------ include/oleauto.h | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 36191b6b424..b20ddffab5f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -689,10 +689,10 @@ HRESULT WINAPI DECLSPEC_HOTPATCH VariantClear(VARIANTARG* pVarg) /****************************************************************************** * Copy an IRecordInfo object contained in a variant. */ -static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) +static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, const VARIANT *src) { struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); - struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + const struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); HRESULT hr = S_OK; ULONG size; @@ -745,7 +745,7 @@ static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) * reference count increased using IUnknown_AddRef(). * - For all by-reference types, only the referencing pointer is copied. */ -HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc) +HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, const VARIANTARG* pvargSrc) { HRESULT hres = S_OK; @@ -844,9 +844,10 @@ static inline size_t VARIANT_DataSize(const VARIANT* pv) * pvargDest is always cleared using VariantClear() before pvargSrc is copied * to it. If clearing pvargDest fails, so does this function. */ -HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) +HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc) { - VARIANTARG vTmp, *pSrc = pvargSrc; + const VARIANTARG *pSrc = pvargSrc; + VARIANTARG vTmp; VARTYPE vt; HRESULT hres = S_OK; @@ -934,7 +935,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) VariantCopyInd_Return: if (pSrc != pvargSrc) - VariantClear(pSrc); + VariantClear(&vTmp); TRACE("returning 0x%08x, %s\n", hres, debugstr_variant(pvargDest)); return hres; diff --git a/include/oleauto.h b/include/oleauto.h index cc50f189475..8528b74c02f 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -186,8 +186,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFGUID,IRecordIn void WINAPI VariantInit(VARIANT*); HRESULT WINAPI VariantClear(VARIANT*); -HRESULT WINAPI VariantCopy(VARIANT*,VARIANT*); -HRESULT WINAPI VariantCopyInd(VARIANT*,VARIANT*); +HRESULT WINAPI VariantCopy(VARIANTARG *dst, const VARIANTARG *src); +HRESULT WINAPI VariantCopyInd(VARIANT *dst, const VARIANTARG *src); HRESULT WINAPI VariantChangeType(VARIANT*,VARIANT*,USHORT,VARTYPE); HRESULT WINAPI VariantChangeTypeEx(VARIANT*,VARIANT*,LCID,USHORT,VARTYPE); -- 2.30.0

1 1