- Wine-Devel - list.winehq.org

[PATCH] winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5.
by Brendan Shanks June 18, 2021

June 18, 2021

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Also remove the check for AudioToolbox/AudioConverter.h, the only user of that macro was removed in d9ed4ee992b0b277dacf87d05cc0b69bcd06b90c ("l3codeca.acm: Remove the Mac OS AudioToolbox backend.") configure.ac | 18 ++---------------- dlls/winecoreaudio.drv/audiounit.c | 20 -------------------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ---------------------- 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/configure.ac b/configure.ac index ade04399af0..f76dd047825 100644 --- a/configure.ac +++ b/configure.ac @@ -431,9 +431,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ ApplicationServices/ApplicationServices.h \ - AudioToolbox/AudioConverter.h \ - AudioUnit/AudioUnit.h \ - AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ @@ -800,21 +797,10 @@ case $host_os in AC_CHECK_FUNCS(SSLCopyPeerCertificates) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" + if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" then - if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" - then - AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") - else - dnl CoreServices needed by AudioUnit - AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") - fi + AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} - dnl Check for the AUGraphAddNode function - ac_save_LIBS="$LIBS" - LIBS="$LIBS $COREAUDIO_LIBS" - AC_CHECK_FUNCS(AUGraphAddNode) - LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index a3c190870ad..030ff4d090a 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,9 +22,6 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -#include <CoreServices/CoreServices.h> -#endif #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -50,23 +47,6 @@ #include "coreaudio.h" #include "wine/debug.h" -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager types for compatibility's sake */ -typedef ComponentDescription AudioComponentDescription; -#endif - -#ifndef HAVE_AUGRAPHADDNODE -static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) -{ - return AUGraphNewNode(graph, desc, 0, NULL, node); -} - -static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) -{ - return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); -} -#endif - WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index bc153d92511..f07f4bae5fb 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -72,28 +72,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for OSX 10.5 */ -typedef Component AudioComponent; -typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} -#endif - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; -- 2.31.1

2 1

[PATCH 1/2] reg: Support the use of registry views during the 'add' operation
by Hugh McMaster June 18, 2021

June 18, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 22 ++++++++++++++++++---- programs/reg/tests/add.c | 32 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index fb0ee2a03fd..269fa30e5e1 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -158,7 +158,7 @@ static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, return TRUE; } -static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, +static int run_add(HKEY root, WCHAR *path, REGSAM sam, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY hkey; @@ -167,7 +167,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, LONG rc; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, &hkey, &dispos)) + KEY_READ|KEY_WRITE|sam, NULL, &hkey, &dispos)) { output_message(STRING_ACCESS_DENIED); return 1; @@ -229,6 +229,7 @@ int reg_add(int argc, WCHAR *argvW[]) HKEY root; WCHAR *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (!parse_registry_key(argvW[2], &root, &path)) @@ -249,8 +250,18 @@ int reg_add(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -286,7 +297,10 @@ int reg_add(int argc, WCHAR *argvW[]) if (value_name && value_empty) goto invalid; - return run_add(root, path, value_name, value_empty, type, separator, data, force); + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + + return run_add(root, path, sam, value_name, value_empty, type, separator, data, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 264693ab349..3b4a895d0c5 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -277,13 +277,13 @@ static void test_command_syntax(void) /* Test registry view */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:32", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:64 /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_key_formats(void) @@ -914,12 +914,12 @@ static void test_registry_view_win64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine32 /d Test /f /reg:32", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); - todo_wine verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); - todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); /* Try adding to the 64-bit registry view (64-bit Windows) */ run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); @@ -958,16 +958,16 @@ static void test_registry_view_wow64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); - todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); } START_TEST(add) -- 2.32.0

1 1

[PATCH v4 1/6] jscript: Factor local_ref_scopes_t structure out of function_code_t.
by Paul Gofman June 18, 2021

June 18, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/jscript/compile.c | 14 +++++++++----- dlls/jscript/engine.c | 10 +++++----- dlls/jscript/engine.h | 9 +++++++-- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 2a17639641f..46efd53cdb5 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2379,10 +2379,14 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, if(FAILED(hres)) return hres; - func->locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->locals)); - if(!func->locals) + func->local_scope_count = 1; + func->local_scopes = compiler_alloc(ctx->code, func->local_scope_count * sizeof(*func->local_scopes)); + if(!func->local_scopes) return E_OUTOFMEMORY; - func->locals_cnt = ctx->locals_cnt; + func->local_scopes[0].locals = compiler_alloc(ctx->code, ctx->locals_cnt * sizeof(*func->local_scopes[0].locals)); + if(!func->local_scopes[0].locals) + return E_OUTOFMEMORY; + func->local_scopes[0].locals_cnt = ctx->locals_cnt; func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); if(!func->variables) @@ -2390,8 +2394,8 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, i = 0; WINE_RB_FOR_EACH_ENTRY(local, &ctx->locals, function_local_t, entry) { - func->locals[i].name = local->name; - func->locals[i].ref = local->ref; + func->local_scopes[0].locals[i].name = local->name; + func->local_scopes[0].locals[i].ref = local->ref; if(local->ref >= 0) { func->variables[local->ref].name = local->name; func->variables[local->ref].func_id = -1; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e0a6e10e98b..c6ca3a9c10d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -578,13 +578,12 @@ static HRESULT detach_variable_object(script_ctx_t *ctx, call_frame_t *frame, BO frame->base_scope->frame = NULL; - for(i = 0; i < frame->function->locals_cnt; i++) { - hres = jsdisp_propput_name(frame->variable_obj, frame->function->locals[i].name, - ctx->stack[local_off(frame, frame->function->locals[i].ref)]); + for(i = 0; i < frame->function->local_scopes[0].locals_cnt; i++) { + hres = jsdisp_propput_name(frame->variable_obj, frame->function->local_scopes[0].locals[i].name, + ctx->stack[local_off(frame, frame->function->local_scopes[0].locals[i].ref)]); if(FAILED(hres)) return hres; } - return S_OK; } @@ -630,7 +629,8 @@ static int __cdecl local_ref_cmp(const void *key, const void *ref) local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) { - return bsearch(identifier, function->locals, function->locals_cnt, sizeof(*function->locals), local_ref_cmp); + return bsearch(identifier, function->local_scopes[0].locals, function->local_scopes[0].locals_cnt, + sizeof(*function->local_scopes[0].locals), local_ref_cmp); } /* ECMA-262 3rd Edition 10.1.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 442e7334c41..a94f1f211e4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -147,6 +147,11 @@ typedef struct { #define INVALID_LOCAL_REF 0x7fffffff +typedef struct { + unsigned locals_cnt; + local_ref_t *locals; +} local_ref_scopes_t; + typedef struct _function_code_t { BSTR name; int local_ref; @@ -168,8 +173,8 @@ typedef struct _function_code_t { unsigned param_cnt; BSTR *params; - unsigned locals_cnt; - local_ref_t *locals; + local_ref_scopes_t *local_scopes; + unsigned local_scope_count; bytecode_t *bytecode; } function_code_t; -- 2.31.1

3 11

[PATCH] uiribbon: Add stubs for IUIImageFromBitmap.
by Vijay Kiran Kamuju June 18, 2021

June 18, 2021

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/uiribbon/Makefile.in | 1 + dlls/uiribbon/main.c | 1 + dlls/uiribbon/uiimage.c | 110 +++++++++++++++++++++++++++++++ dlls/uiribbon/uiribbon_private.h | 6 ++ 4 files changed, 118 insertions(+) create mode 100644 dlls/uiribbon/uiimage.c diff --git a/dlls/uiribbon/Makefile.in b/dlls/uiribbon/Makefile.in index f41b4d4a55a..56d9c3ec93c 100644 --- a/dlls/uiribbon/Makefile.in +++ b/dlls/uiribbon/Makefile.in @@ -5,6 +5,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ main.c \ + uiimage.c \ uiribbon.c IDL_SRCS = uiribbon_classes.idl diff --git a/dlls/uiribbon/main.c b/dlls/uiribbon/main.c index a76c349ad96..7f86d48f9b7 100644 --- a/dlls/uiribbon/main.c +++ b/dlls/uiribbon/main.c @@ -77,6 +77,7 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_UIRibbonFramework, UIRibbonFrameworkImpl_Create }, + { &CLSID_UIRibbonImageFromBitmapFactory, UIRibbonImageFromBitmapFactoryImpl_Create }, }; static HRESULT WINAPI XFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid, void **ppobj) diff --git a/dlls/uiribbon/uiimage.c b/dlls/uiribbon/uiimage.c new file mode 100644 index 00000000000..6f10159cbaa --- /dev/null +++ b/dlls/uiribbon/uiimage.c @@ -0,0 +1,110 @@ +/* + * Copyright 2021 Vijay Kiran Kamuju + * + * 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 "wine/debug.h" + +#define COBJMACROS + +#include "uiribbon_private.h" + +#include <stdio.h> + +WINE_DEFAULT_DEBUG_CHANNEL(uiribbon); + +static inline UIRibbonImageFromBitmapFactoryImpl *impl_from_IUIImageFromBitmap(IUIImageFromBitmap *iface) +{ + return CONTAINING_RECORD(iface, UIRibbonImageFromBitmapFactoryImpl, IUIImageFromBitmap_iface); +} + +/*** IUnknown methods ***/ + +static HRESULT WINAPI UIRibbonImageFromBitmapFactoryImpl_QueryInterface(IUIImageFromBitmap *iface, REFIID riid, void **ppvObject) +{ + UIRibbonImageFromBitmapFactoryImpl *This = impl_from_IUIImageFromBitmap(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + + if (IsEqualGUID(riid, &IID_IUnknown) + || IsEqualGUID(riid, &IID_IUIImageFromBitmap)) + { + IUnknown_AddRef(iface); + *ppvObject = &This->IUIImageFromBitmap_iface; + return S_OK; + } + + ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + return E_NOINTERFACE; +} + +static ULONG WINAPI UIRibbonImageFromBitmapFactoryImpl_AddRef(IUIImageFromBitmap *iface) +{ + UIRibbonImageFromBitmapFactoryImpl *This = impl_from_IUIImageFromBitmap(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + + return ref; +} + +static ULONG WINAPI UIRibbonImageFromBitmapFactoryImpl_Release(IUIImageFromBitmap *iface) +{ + UIRibbonImageFromBitmapFactoryImpl *This = impl_from_IUIImageFromBitmap(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IUIImageFromBitmap methods ***/ + +static HRESULT WINAPI UIRibbonImageFromBitmapFactoryImpl_CreateImage(IUIImageFromBitmap *iface, HBITMAP bitmap, UI_OWNERSHIP options, IUIImage **image) +{ + FIXME("(%p %d %p): stub!\n", bitmap, options, image); + + return E_NOTIMPL; +} + +static const IUIImageFromBitmapVtbl IUIImageFromBitmap_Vtbl = +{ + UIRibbonImageFromBitmapFactoryImpl_QueryInterface, + UIRibbonImageFromBitmapFactoryImpl_AddRef, + UIRibbonImageFromBitmapFactoryImpl_Release, + UIRibbonImageFromBitmapFactoryImpl_CreateImage +}; + +HRESULT UIRibbonImageFromBitmapFactoryImpl_Create(IUnknown *pUnkOuter, void **ppObj) +{ + UIRibbonImageFromBitmapFactoryImpl *object; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(UIRibbonImageFromBitmapFactoryImpl)); + if (!object) + return E_OUTOFMEMORY; + + object->IUIImageFromBitmap_iface.lpVtbl = &IUIImageFromBitmap_Vtbl; + object->ref = 1; + + *ppObj = &object->IUIImageFromBitmap_iface; + + return S_OK; +} diff --git a/dlls/uiribbon/uiribbon_private.h b/dlls/uiribbon/uiribbon_private.h index 9d7481533d0..b9334e43bbd 100644 --- a/dlls/uiribbon/uiribbon_private.h +++ b/dlls/uiribbon/uiribbon_private.h @@ -26,7 +26,13 @@ typedef struct { LONG ref; } UIRibbonFrameworkImpl; +typedef struct { + IUIImageFromBitmap IUIImageFromBitmap_iface; + LONG ref; +} UIRibbonImageFromBitmapFactoryImpl; + HRESULT UIRibbonFrameworkImpl_Create(IUnknown *pUnkOuter, void **ppObj) DECLSPEC_HIDDEN; +HRESULT UIRibbonImageFromBitmapFactoryImpl_Create(IUnknown *pUnkOuter, void **ppObj) DECLSPEC_HIDDEN; #endif /* __UIRIBBON_PRIVATE_INCLUDED__ */ -- 2.31.0

1 0

[PATCH] secur32: Default to building with GnuTLS support on macOS, if present.
by Gijs Vermeulen June 18, 2021

June 18, 2021

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/secur32/schannel_gnutls.c | 4 ++-- dlls/secur32/schannel_macosx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 93868d10b3b..03124924644 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -47,7 +47,7 @@ #include "wine/debug.h" #include "wine/unicode.h" -#if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) +#if defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -1122,4 +1122,4 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p return STATUS_SUCCESS; } -#endif /* SONAME_LIBGNUTLS && !HAVE_SECURITY_SECURITY_H */ +#endif /* SONAME_LIBGNUTLS */ diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index f4f84557dfe..d7453a44816 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -47,7 +47,7 @@ #include "secur32_priv.h" #include "wine/debug.h" -#ifdef HAVE_SECURITY_SECURITY_H +#if defined(HAVE_SECURITY_SECURITY_H) && !defined(SONAME_LIBGNUTLS) WINE_DEFAULT_DEBUG_CHANNEL(secur32); @@ -1290,4 +1290,4 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p return STATUS_SUCCESS; } -#endif /* HAVE_SECURITY_SECURITY_H */ +#endif /* HAVE_SECURITY_SECURITY_H && !SONAME_LIBGNUTLS */ -- 2.32.0

2 1

[PATCH 1/6] hidclass.sys: Create link collection caps during parsing.
by Rémi Bernon June 18, 2021

June 18, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 67 ++++++++++++++++++------------ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 25 ++++++----- 2 files changed, 56 insertions(+), 36 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 86b68863308..f7fcccf55d4 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -306,6 +306,9 @@ struct hid_parser_state DWORD stack_size; DWORD global_idx; DWORD collection_idx; + + struct hid_value_caps *collections; + DWORD collections_size; }; static BOOL array_reserve( struct hid_value_caps **array, DWORD *array_size, DWORD index ) @@ -390,12 +393,24 @@ static BOOL parse_new_collection( struct hid_parser_state *state ) return FALSE; } + if (!array_reserve( &state->collections, &state->collections_size, state->caps.NumberLinkCollectionNodes )) + { + ERR( "HID parser collections overflow!\n" ); + return FALSE; + } + copy_collection_items( state->stack + state->collection_idx, &state->items ); state->collection_idx++; + state->collections[state->caps.NumberLinkCollectionNodes] = state->items; state->items.link_collection = state->caps.NumberLinkCollectionNodes; state->items.link_usage_page = state->items.usage_page; state->items.link_usage = state->items.usage_min; + if (!state->caps.NumberLinkCollectionNodes) + { + state->caps.UsagePage = state->items.usage_page; + state->caps.Usage = state->items.usage_min; + } state->caps.NumberLinkCollectionNodes++; reset_local_items( state ); @@ -421,6 +436,7 @@ static void free_parser_state( struct hid_parser_state *state ) if (state->global_idx) ERR( "%u unpopped device caps on the stack\n", state->global_idx ); if (state->collection_idx) ERR( "%u unpopped device collection on the stack\n", state->collection_idx ); free( state->stack ); + free( state->collections ); free( state ); } @@ -727,10 +743,8 @@ static void preparse_collection(const struct collection *root, const struct coll WINE_HIDP_PREPARSED_DATA *data, struct preparse_ctx *ctx) { WINE_HID_ELEMENT *elem = HID_ELEMS(data); - WINE_HID_LINK_COLLECTION_NODE *nodes = HID_NODES(data); struct feature *f; struct collection *c; - struct list *entry; LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, entry) { @@ -775,33 +789,18 @@ static void preparse_collection(const struct collection *root, const struct coll } } - if (root != base) - { - nodes[base->index].LinkUsagePage = base->caps.UsagePage; - nodes[base->index].LinkUsage = base->caps.NotRange.Usage; - nodes[base->index].Parent = base->parent == root ? 0 : base->parent->index; - nodes[base->index].CollectionType = base->type; - nodes[base->index].IsAlias = 0; - - if ((entry = list_head(&base->collections))) - nodes[base->index].FirstChild = LIST_ENTRY(entry, struct collection, entry)->index; - } - LIST_FOR_EACH_ENTRY(c, &base->collections, struct collection, entry) - { preparse_collection(root, c, data, ctx); - - if ((entry = list_next(&base->collections, &c->entry))) - nodes[c->index].NextSibling = LIST_ENTRY(entry, struct collection, entry)->index; - if (root != base) nodes[base->index].NumberOfChildren++; - } } -static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_collection, unsigned int node_count) +static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_collection, + struct hid_parser_state *state ) { + WINE_HID_LINK_COLLECTION_NODE *nodes; WINE_HIDP_PREPARSED_DATA *data; unsigned int report_count; unsigned int size; + DWORD i; struct preparse_ctx ctx; unsigned int element_off; @@ -816,18 +815,34 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_coll size = element_off + (ctx.elem_count * sizeof(WINE_HID_ELEMENT)); nodes_offset = size; - size += node_count * sizeof(WINE_HID_LINK_COLLECTION_NODE); + size += state->caps.NumberLinkCollectionNodes * sizeof(WINE_HID_LINK_COLLECTION_NODE); if (!(data = calloc(1, size))) return NULL; data->magic = HID_MAGIC; data->dwSize = size; - data->caps.Usage = base_collection->caps.NotRange.Usage; - data->caps.UsagePage = base_collection->caps.UsagePage; - data->caps.NumberLinkCollectionNodes = node_count; + data->caps = state->caps; data->elementOffset = element_off; data->nodesOffset = nodes_offset; preparse_collection(base_collection, base_collection, data, &ctx); + + nodes = HID_NODES( data ); + for (i = 0; i < data->caps.NumberLinkCollectionNodes; ++i) + { + nodes[i].LinkUsagePage = state->collections[i].usage_page; + nodes[i].LinkUsage = state->collections[i].usage_min; + nodes[i].Parent = state->collections[i].link_collection; + nodes[i].CollectionType = state->collections[i].bit_field; + nodes[i].IsAlias = 0; + + if (i > 0) + { + nodes[i].NextSibling = nodes[nodes[i].Parent].FirstChild; + nodes[nodes[i].Parent].FirstChild = i; + nodes[nodes[i].Parent].NumberOfChildren++; + } + } + return data; } @@ -889,7 +904,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) debug_collection(base); - if ((data = build_PreparseData(base, cidx))) + if ((data = build_preparsed_data( base, state ))) debug_print_preparsed(data); free_collection(base); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5453af8ff1c..19099a5a19c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1500,6 +1500,20 @@ static void test_pnp_driver(struct testsign_context *ctx) (val).member, (exp).member) #define check_member(val, exp, fmt, member) check_member_(__FILE__, __LINE__, val, exp, fmt, member) +#define check_hidp_link_collection_node(a, b) check_hidp_link_collection_node_(__LINE__, a, b) +static inline void check_hidp_link_collection_node_(int line, HIDP_LINK_COLLECTION_NODE *node, + const HIDP_LINK_COLLECTION_NODE *exp) +{ + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsage); + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsagePage); + check_member_(__FILE__, line, *node, *exp, "%d", Parent); + check_member_(__FILE__, line, *node, *exp, "%d", NumberOfChildren); + check_member_(__FILE__, line, *node, *exp, "%d", NextSibling); + check_member_(__FILE__, line, *node, *exp, "%d", FirstChild); + check_member_(__FILE__, line, *node, *exp, "%d", CollectionType); + check_member_(__FILE__, line, *node, *exp, "%d", IsAlias); +} + #define check_hidp_button_caps(a, b) check_hidp_button_caps_(__LINE__, a, b) static inline void check_hidp_button_caps_(int line, HIDP_BUTTON_CAPS *caps, const HIDP_BUTTON_CAPS *exp) { @@ -1850,16 +1864,7 @@ static void test_hidp(HANDLE file, int report_id) for (i = 0; i < ARRAY_SIZE(expect_collections); ++i) { winetest_push_context("collections[%d]", i); - check_member(collections[i], expect_collections[i], "%04x", LinkUsage); - check_member(collections[i], expect_collections[i], "%04x", LinkUsagePage); - check_member(collections[i], expect_collections[i], "%d", Parent); - check_member(collections[i], expect_collections[i], "%d", NumberOfChildren); - todo_wine_if(i == 1) - check_member(collections[i], expect_collections[i], "%d", NextSibling); - todo_wine_if(i == 0) - check_member(collections[i], expect_collections[i], "%d", FirstChild); - check_member(collections[i], expect_collections[i], "%d", CollectionType); - check_member(collections[i], expect_collections[i], "%d", IsAlias); + check_hidp_link_collection_node(&collections[i], &expect_collections[i]); winetest_pop_context(); } -- 2.31.0

2 8

[PATCH 3/3] d3dx10: Support block compressed format for D3DX10CreateTextureFromMemory.
by Ziqing Hui June 18, 2021

June 18, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +- dlls/d3dx10_43/texture.c | 92 +++++++++++++++++++++++++---------- 2 files changed, 69 insertions(+), 26 deletions(-)

1 0

[PATCH v3] cmd: Do not change errorlevel when setting environment variables
by Florian Eder June 18, 2021

June 18, 2021

Changes CMD to set its errorlevel to 0 only when the value of an environment variable is set in in non-interactive / batch mode, retains the previous value otherwise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47791 Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v3: Conditional setting of errorlevel instead of a premature return statement, explanatory paragraphs reformated to conform with the style described in the Wiki --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 502694ffc46..c7df724ae00 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4218,7 +4218,7 @@ void WCMD_setshow_env (WCHAR *s) { if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { errorlevel = 1; } else if (!status) WCMD_print_error(); - else errorlevel = 0; + else if (!interactive) errorlevel = 0; } } -- 2.31.1

2 1

[PATCH 1/5] ws2_32: Remove some unused declarations.
by Zebediah Figura June 18, 2021

June 18, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a4d89e728b8..25e5294cbf1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -416,14 +416,6 @@ static void socket_list_remove(SOCKET socket) LeaveCriticalSection(&cs_socket_list); } -typedef struct /* WSAAsyncSelect() control struct */ -{ - HANDLE service, event, sock; - HWND hWnd; - UINT uMsg; - LONG lEvent; -} ws_select_info; - #define WS_MAX_SOCKETS_PER_PROCESS 128 /* reasonable guess */ #define WS_MAX_UDP_DATAGRAM 1024 static INT WINAPI WSA_DefaultBlockingHook( FARPROC x ); @@ -434,9 +426,6 @@ static FARPROC blocking_hook = (FARPROC)WSA_DefaultBlockingHook; /* function prototypes */ static int ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size); -int WSAIOCTL_GetInterfaceCount(void); -int WSAIOCTL_GetInterfaceName(int intNumber, char *intName); - #define MAP_OPTION(opt) { WS_##opt, opt } static const int ws_sock_map[][2] = -- 2.30.2

2 6

[PATCH] sechost: Implement hexadecimal SID parsing.
by Esme Povirk June 17, 2021

June 17, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/advapi32/tests/security.c | 1 + dlls/sechost/security.c | 59 +++++++++++++++++++++------------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6037ddb2165..77748abe9ec 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -306,6 +306,7 @@ static void test_ConvertStringSidToSid(void) { "RS", "", 1 }, { "SA", "", 1 }, { "s-1-12-1", "S-1-12-1" }, + { "S-0x1-0XC-0x1a", "S-1-12-26" }, }; const char noSubAuthStr[] = "S-1-5"; diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index b4f00f5bdf5..4aee8c723d2 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -594,18 +594,42 @@ static BOOL get_computer_sid( PSID sid ) return TRUE; } +static BOOL parse_token( const WCHAR *string, const WCHAR **end, DWORD *result ) +{ + if (string[0] == '0' && (string[1] == 'X' || string[1] == 'x')) + { + /* hexadecimal */ + *result = wcstoul( string + 2, (WCHAR**)&string, 16 ); + if (*string == '-') + string++; + *end = string; + return TRUE; + } + else if (iswdigit(string[0]) || string[0] == '-') + { + *result = wcstoul( string, (WCHAR**)&string, 10 ); + if (*string == '-') + string++; + *end = string; + return TRUE; + } + + *result = 0; + *end = string; + return FALSE; +} + static DWORD get_sid_size( const WCHAR *string, const WCHAR **end ) { if ((string[0] == 'S' || string[0] == 's') && string[1] == '-') /* S-R-I(-S)+ */ { int token_count = 0; - string++; - while (*string == '-' || iswdigit(*string)) - { - if (*string == '-') - token_count++; - string++; - } + DWORD value; + + string += 2; + + while (parse_token( string, &string, &value )) + token_count++; if (end) *end = string; @@ -653,9 +677,11 @@ static BOOL parse_sid( const WCHAR *string, const WCHAR **end, SID *pisid, DWORD { DWORD i = 0, identAuth; DWORD csubauth = ((*size - GetSidLengthRequired(0)) / sizeof(DWORD)); + DWORD token; string += 2; /* Advance to Revision */ - pisid->Revision = wcstoul( string, (WCHAR**)&string, 10 ); + parse_token( string, &string, &token ); + pisid->Revision = token; if (pisid->Revision != SDDL_REVISION) { @@ -672,31 +698,20 @@ static BOOL parse_sid( const WCHAR *string, const WCHAR **end, SID *pisid, DWORD pisid->SubAuthorityCount = csubauth; - /* Advance to identifier authority */ - if (*string == '-') - string++; - /* MS' implementation can't handle values greater than 2^32 - 1, so * we don't either; assume most significant bytes are always 0 */ pisid->IdentifierAuthority.Value[0] = 0; pisid->IdentifierAuthority.Value[1] = 0; - identAuth = wcstoul( string, (WCHAR**)&string, 10 ); + parse_token( string, &string, &identAuth ); pisid->IdentifierAuthority.Value[5] = identAuth & 0xff; pisid->IdentifierAuthority.Value[4] = (identAuth & 0xff00) >> 8; pisid->IdentifierAuthority.Value[3] = (identAuth & 0xff0000) >> 16; pisid->IdentifierAuthority.Value[2] = (identAuth & 0xff000000) >> 24; - /* Advance to first sub authority */ - if (*string == '-') - string++; - - while (iswdigit(*string) || *string == '-') + while (parse_token( string, &string, &token )) { - pisid->SubAuthority[i++] = wcstoul( string, (WCHAR**)&string, 10 ); - - if (*string == '-') - string++; + pisid->SubAuthority[i++] = token; } if (i != pisid->SubAuthorityCount) -- 2.30.2

1 0