August 2020 - Wine-Devel - list.winehq.org

[v2 PATCH 1/5] combase: Move HGLOBAL marshalling functions.
by Nikolay Sivov Aug. 4, 2020

Aug. 4, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.spec | 4 + dlls/combase/usrmarshal.c | 219 ++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 +- dlls/ole32/usrmarshal.c | 219 -------------------------------------- 4 files changed, 227 insertions(+), 223 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 9d0bad29f0d..3c0955f705d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -197,6 +197,10 @@ @ stdcall HDC_UserMarshal(ptr ptr ptr) @ stdcall HDC_UserSize(ptr long ptr) @ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserFree(ptr ptr) +@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserSize(ptr long ptr) +@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) @ stdcall HICON_UserFree(ptr ptr) @ stdcall HICON_UserMarshal(ptr ptr ptr) @ stdcall HICON_UserSize(ptr long ptr) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index c88e8c57cd0..7c77cc1a80e 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -617,6 +617,225 @@ unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char * return pBuffer; } +/****************************************************************************** + * HGLOBAL_UserSize (combase.@) + * + * Calculates the buffer size required to marshal an HGLOBAL. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * phGlobal [I] HGLOBAL to size. + * + * RETURNS + * The buffer size required to marshal an HGLOBAL plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *phGlobal) +{ + ULONG size = StartingSize; + + TRACE("%s, %u, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); + + ALIGN_LENGTH(size, 3); + + size += sizeof(ULONG); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + size += sizeof(HGLOBAL); + else + { + size += sizeof(ULONG); + if (*phGlobal) + { + SIZE_T ret; + size += 3 * sizeof(ULONG); + ret = GlobalSize(*phGlobal); + size += (ULONG)ret; + } + } + + return size; +} + +/****************************************************************************** + * HGLOBAL_UserMarshal (combase.@) + * + * Marshals an HGLOBAL into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format into. + * phGlobal [I] HGLOBAL to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) +{ + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); + + ALIGN_POINTER(pBuffer, 3); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + { + if (sizeof(*phGlobal) == 8) + *(ULONG *)pBuffer = WDT_INPROC64_CALL; + else + *(ULONG *)pBuffer = WDT_INPROC_CALL; + pBuffer += sizeof(ULONG); + *(HGLOBAL *)pBuffer = *phGlobal; + pBuffer += sizeof(HGLOBAL); + } + else + { + *(ULONG *)pBuffer = WDT_REMOTE_CALL; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = HandleToULong(*phGlobal); + pBuffer += sizeof(ULONG); + if (*phGlobal) + { + const unsigned char *memory; + SIZE_T size = GlobalSize(*phGlobal); + *(ULONG *)pBuffer = (ULONG)size; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = HandleToULong(*phGlobal); + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = (ULONG)size; + pBuffer += sizeof(ULONG); + + memory = GlobalLock(*phGlobal); + memcpy(pBuffer, memory, size); + pBuffer += size; + GlobalUnlock(*phGlobal); + } + } + + return pBuffer; +} + +/****************************************************************************** + * HGLOBAL_UserUnmarshal (combase.@) + * + * Unmarshals an HGLOBAL from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * phGlobal [O] Address that receive the unmarshaled HGLOBAL. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) +{ + ULONG fContext; + + TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); + + ALIGN_POINTER(pBuffer, 3); + + fContext = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (((fContext == WDT_INPROC_CALL) && (sizeof(*phGlobal) < 8)) || + ((fContext == WDT_INPROC64_CALL) && (sizeof(*phGlobal) == 8))) + { + *phGlobal = *(HGLOBAL *)pBuffer; + pBuffer += sizeof(*phGlobal); + } + else if (fContext == WDT_REMOTE_CALL) + { + ULONG handle; + + handle = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (handle) + { + ULONG size; + void *memory; + + size = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + /* redundancy is bad - it means you have to check consistency like + * this: */ + if (*(ULONG *)pBuffer != handle) + { + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + return pBuffer; + } + pBuffer += sizeof(ULONG); + /* redundancy is bad - it means you have to check consistency like + * this: */ + if (*(ULONG *)pBuffer != size) + { + RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); + return pBuffer; + } + pBuffer += sizeof(ULONG); + + /* FIXME: check size is not too big */ + + *phGlobal = GlobalAlloc(GMEM_MOVEABLE, size); + memory = GlobalLock(*phGlobal); + memcpy(memory, pBuffer, size); + pBuffer += size; + GlobalUnlock(*phGlobal); + } + else + *phGlobal = NULL; + } + else + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + + return pBuffer; +} + +/****************************************************************************** + * HGLOBAL_UserFree (combase.@) + * + * Frees an unmarshaled HGLOBAL. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phGlobal [I] HGLOBAL to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of + * which the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) +{ + TRACE("%s, &%p.\n", debugstr_user_flags(pFlags), *phGlobal); + + if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) + GlobalFree(*phGlobal); +} + /****************************************************************************** * HPALETTE_UserFree (combase.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 97618e08935..c3ee8f27f23 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -143,10 +143,10 @@ @ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HENHMETAFILE_UserSize(ptr long ptr) @ stdcall HENHMETAFILE_UserUnmarshal(ptr ptr ptr) -@ stdcall HGLOBAL_UserFree(ptr ptr) -@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) -@ stdcall HGLOBAL_UserSize(ptr long ptr) -@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) +@ stdcall HGLOBAL_UserFree(ptr ptr) combase.HGLOBAL_UserFree +@ stdcall HGLOBAL_UserMarshal(ptr ptr ptr) combase.HGLOBAL_UserMarshal +@ stdcall HGLOBAL_UserSize(ptr long ptr) combase.HGLOBAL_UserSize +@ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr) combase.HGLOBAL_UserUnmarshal @ stdcall HICON_UserFree(ptr ptr) combase.HICON_UserFree @ stdcall HICON_UserMarshal(ptr ptr ptr) combase.HICON_UserMarshal @ stdcall HICON_UserSize(ptr long ptr) combase.HICON_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 694ef60764f..a5daa949830 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -156,225 +156,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) IMPL_WIREM_HANDLE(HACCEL) -/****************************************************************************** - * HGLOBAL_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal an HGLOBAL. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * phGlobal [I] HGLOBAL to size. - * - * RETURNS - * The buffer size required to marshal an HGLOBAL plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *phGlobal) -{ - ULONG size = StartingSize; - - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, phGlobal); - - ALIGN_LENGTH(size, 3); - - size += sizeof(ULONG); - - if (LOWORD(*pFlags) == MSHCTX_INPROC) - size += sizeof(HGLOBAL); - else - { - size += sizeof(ULONG); - if (*phGlobal) - { - SIZE_T ret; - size += 3 * sizeof(ULONG); - ret = GlobalSize(*phGlobal); - size += (ULONG)ret; - } - } - - return size; -} - -/****************************************************************************** - * HGLOBAL_UserMarshal [OLE32.@] - * - * Marshals an HGLOBAL into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format into. - * phGlobal [I] HGLOBAL to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) -{ - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); - - ALIGN_POINTER(pBuffer, 3); - - if (LOWORD(*pFlags) == MSHCTX_INPROC) - { - if (sizeof(*phGlobal) == 8) - *(ULONG *)pBuffer = WDT_INPROC64_CALL; - else - *(ULONG *)pBuffer = WDT_INPROC_CALL; - pBuffer += sizeof(ULONG); - *(HGLOBAL *)pBuffer = *phGlobal; - pBuffer += sizeof(HGLOBAL); - } - else - { - *(ULONG *)pBuffer = WDT_REMOTE_CALL; - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = HandleToULong(*phGlobal); - pBuffer += sizeof(ULONG); - if (*phGlobal) - { - const unsigned char *memory; - SIZE_T size = GlobalSize(*phGlobal); - *(ULONG *)pBuffer = (ULONG)size; - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = HandleToULong(*phGlobal); - pBuffer += sizeof(ULONG); - *(ULONG *)pBuffer = (ULONG)size; - pBuffer += sizeof(ULONG); - - memory = GlobalLock(*phGlobal); - memcpy(pBuffer, memory, size); - pBuffer += size; - GlobalUnlock(*phGlobal); - } - } - - return pBuffer; -} - -/****************************************************************************** - * HGLOBAL_UserUnmarshal [OLE32.@] - * - * Unmarshals an HGLOBAL from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * phGlobal [O] Address that receive the unmarshaled HGLOBAL. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal) -{ - ULONG fContext; - - TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *phGlobal); - - ALIGN_POINTER(pBuffer, 3); - - fContext = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if (((fContext == WDT_INPROC_CALL) && (sizeof(*phGlobal) < 8)) || - ((fContext == WDT_INPROC64_CALL) && (sizeof(*phGlobal) == 8))) - { - *phGlobal = *(HGLOBAL *)pBuffer; - pBuffer += sizeof(*phGlobal); - } - else if (fContext == WDT_REMOTE_CALL) - { - ULONG handle; - - handle = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - - if (handle) - { - ULONG size; - void *memory; - - size = *(ULONG *)pBuffer; - pBuffer += sizeof(ULONG); - /* redundancy is bad - it means you have to check consistency like - * this: */ - if (*(ULONG *)pBuffer != handle) - { - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - return pBuffer; - } - pBuffer += sizeof(ULONG); - /* redundancy is bad - it means you have to check consistency like - * this: */ - if (*(ULONG *)pBuffer != size) - { - RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); - return pBuffer; - } - pBuffer += sizeof(ULONG); - - /* FIXME: check size is not too big */ - - *phGlobal = GlobalAlloc(GMEM_MOVEABLE, size); - memory = GlobalLock(*phGlobal); - memcpy(memory, pBuffer, size); - pBuffer += size; - GlobalUnlock(*phGlobal); - } - else - *phGlobal = NULL; - } - else - RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); - - return pBuffer; -} - -/****************************************************************************** - * HGLOBAL_UserFree [OLE32.@] - * - * Frees an unmarshaled HGLOBAL. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phGlobal [I] HGLOBAL to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) -{ - TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *phGlobal); - - if (LOWORD(*pFlags) != MSHCTX_INPROC && *phGlobal) - GlobalFree(*phGlobal); -} - /****************************************************************************** * HMETAFILE_UserSize [OLE32.@] * -- 2.27.0

1 4

[PATCH 1/2] xactengine3_7: Move DllGetClassObject to it's own file
by Alistair Leslie-Hughes Aug. 3, 2020

Aug. 3, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/Makefile.in | 1 + dlls/xactengine3_7/main.c | 42 ++++++++++++++++++++++++++++++++++ dlls/xactengine3_7/xact_dll.c | 14 +----------- 3 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 dlls/xactengine3_7/main.c diff --git a/dlls/xactengine3_7/Makefile.in b/dlls/xactengine3_7/Makefile.in index 6fce27d1628..bbbf239daf5 100644 --- a/dlls/xactengine3_7/Makefile.in +++ b/dlls/xactengine3_7/Makefile.in @@ -4,6 +4,7 @@ EXTRALIBS = $(FAUDIO_LIBS) EXTRAINCL = $(FAUDIO_CFLAGS) C_SRCS = \ + main.c \ xact_dll.c IDL_SRCS = xact_classes.idl diff --git a/dlls/xactengine3_7/main.c b/dlls/xactengine3_7/main.c new file mode 100644 index 00000000000..659cbeeca9e --- /dev/null +++ b/dlls/xactengine3_7/main.c @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018 Ethan Lee for CodeWeavers + * + * 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "xact_classes.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xact3); + +extern IClassFactory XACTFactory; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + if (IsEqualGUID(rclsid, &CLSID_XACTEngine37)) + { + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&XACTFactory, riid, ppv); + } + + FIXME("Unknown class %s\n", debugstr_guid(rclsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 69570e8ceff..d35bece8de9 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -488,7 +488,7 @@ static const IClassFactoryVtbl XACT3CF_Vtbl = XACT3CF_LockServer }; -static IClassFactory XACTFactory = { &XACT3CF_Vtbl }; +IClassFactory XACTFactory = { &XACT3CF_Vtbl }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, void *pReserved) { @@ -509,18 +509,6 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) -{ - if (IsEqualGUID(rclsid, &CLSID_XACTEngine37)) - { - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); - return IClassFactory_QueryInterface(&XACTFactory, riid, ppv); - } - - FIXME("Unknown class %s\n", debugstr_guid(rclsid)); - return CLASS_E_CLASSNOTAVAILABLE; -} - HRESULT WINAPI DllRegisterServer(void) { return __wine_register_resources(instance); -- 2.27.0

1 0

[PATCH] xactengine3_7: Return valid HRESULT from IXACT3Engine Initialize
by Alistair Leslie-Hughes Aug. 3, 2020

Aug. 3, 2020

FAudio doesn't always return a valid HRESULT, ensure a valid code is passed back to the application. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 3a14db7460..69570e8cef 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -157,6 +157,7 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); FACTRuntimeParameters params; + UINT ret; TRACE("(%p)->(%p)\n", This, pParams); @@ -195,7 +196,11 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, params.fileIOCallbacks.readFileCallback = wrap_readfile; params.fileIOCallbacks.getOverlappedResultCallback = wrap_getoverlappedresult; - return FACTAudioEngine_Initialize(This->fact_engine, &params); + ret = FACTAudioEngine_Initialize(This->fact_engine, &params); + if (ret != 0) + WARN("FACTAudioEngine_Initialize returned %d\n", ret); + + return !ret ? S_OK : E_FAIL; } static HRESULT WINAPI IXACT3EngineImpl_ShutDown(IXACT3Engine *iface) -- 2.27.0

1 0

[PATCH 1/3] server: Introduce a callback to retrieve the parent device from a file descriptor.
by Zebediah Figura Aug. 3, 2020

Aug. 3, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This patch series doesn't handle ntoskrnl device files. It is written with the ntoskrnl tests previously written in mind, and therefore is structured to make implementation somewhat easier, but the implementation is rather nontrivial and so far not known to be necessary. The equivalent Staging patch uses the object tree for device files. At least two problems immediately arise from this: firstly, there is no clean way to distinguish the root file name '\\' from the directly opened device (a distinction particularly important for file systems, but in fact even visible with named pipes); secondly, this cannot accomodate an implementation that must plumb requests through ntoskrnl, since object names are set at creation time. In general it also smacks of hacking a name into the object tree, since that name is not actually looked up directly as other names are. Another possible design would be to handle it all on the server side. This would mean changing the parameters of get_file_info to handle arbitrary buffers (or else adding a new callback specifically for ObjectNameInformation). It would also mean making get_object_info eventually asynchronous. After trying out that approach, this one seemed architecturally simpler. The equivalent Staging patch was originally written for msys2's strace.exe. msys2 and cygwin have been broken in Wine for a long time, perhaps unfixably. I'm not aware of other applications that need pipes, or similar objects, to return accurate names from ObjectNameInformation. I'm submitting this patch partly to upstream a long-standing Staging patch and fix tests, and partly because I believe it will help implementation of object/file name information for regular files with some of my local/planned changes to volume infrastructure. server/change.c | 1 + server/console.c | 3 +++ server/device.c | 1 + server/fd.c | 5 +++++ server/file.c | 1 + server/file.h | 3 +++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/serial.c | 1 + server/sock.c | 2 ++ 11 files changed, 24 insertions(+) diff --git a/server/change.c b/server/change.c index a8f3329c722..1eba2e4dd88 100644 --- a/server/change.c +++ b/server/change.c @@ -138,6 +138,7 @@ static const struct fd_ops dir_fd_ops = dir_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ dir_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/console.c b/server/console.c index 53910b3f46e..bd8cb1995e7 100644 --- a/server/console.c +++ b/server/console.c @@ -111,6 +111,7 @@ static const struct fd_ops console_input_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -168,6 +169,7 @@ static const struct fd_ops console_input_events_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -248,6 +250,7 @@ static const struct fd_ops screen_buffer_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ console_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/device.c b/server/device.c index 01e08f295f7..73c6edcb078 100644 --- a/server/device.c +++ b/server/device.c @@ -219,6 +219,7 @@ static const struct fd_ops device_file_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ device_file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ device_file_read, /* read */ device_file_write, /* write */ device_file_flush, /* flush */ diff --git a/server/fd.c b/server/fd.c index 7ea8ac273e5..064defc34e8 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2246,6 +2246,11 @@ static void unmount_device( struct fd *device_fd ) release_object( device ); } +struct object *no_fd_get_parent( struct fd *fd ) +{ + return NULL; +} + /* default read() routine */ int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ) { diff --git a/server/file.c b/server/file.c index 38260cfd2b3..0b92d6aae46 100644 --- a/server/file.c +++ b/server/file.c @@ -105,6 +105,7 @@ static const struct fd_ops file_fd_ops = file_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/file.h b/server/file.h index e8ace7f49e4..b407c725db2 100644 --- a/server/file.h +++ b/server/file.h @@ -56,6 +56,8 @@ struct fd_ops void (*poll_event)(struct fd *,int event); /* get file information */ enum server_fd_type (*get_fd_type)(struct fd *fd); + /* get the parent (device) object */ + struct object *(*get_parent)(struct fd *fd); /* perform a read on the file */ int (*read)(struct fd *, struct async *, file_pos_t ); /* perform a write on the file */ @@ -109,6 +111,7 @@ extern void default_poll_event( struct fd *fd, int event ); extern void fd_queue_async( struct fd *fd, struct async *async, int type ); extern void fd_async_wake_up( struct fd *fd, int type, unsigned int status ); extern void fd_reselect_async( struct fd *fd, struct async_queue *queue ); +extern struct object *no_fd_get_parent( struct fd *fd ); extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); diff --git a/server/mailslot.c b/server/mailslot.c index 58d650cbb25..03f5308fcbf 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -101,6 +101,7 @@ static const struct fd_ops mailslot_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mailslot_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -157,6 +158,7 @@ static const struct fd_ops mail_writer_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mail_writer_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -245,6 +247,7 @@ static const struct fd_ops mailslot_device_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mailslot_device_file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/mapping.c b/server/mapping.c index db0debe0af5..5d0a1c402b5 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -180,6 +180,7 @@ static const struct fd_ops mapping_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ mapping_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/named_pipe.c b/server/named_pipe.c index b259abb8de4..7eb0905293e 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -180,6 +180,7 @@ static const struct fd_ops pipe_server_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ pipe_end_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ @@ -222,6 +223,7 @@ static const struct fd_ops pipe_client_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ pipe_end_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ pipe_end_read, /* read */ pipe_end_write, /* write */ pipe_end_flush, /* flush */ @@ -297,6 +299,7 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ named_pipe_device_file_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/serial.c b/server/serial.c index 4292472613a..4d112b8c6ff 100644 --- a/server/serial.c +++ b/server/serial.c @@ -112,6 +112,7 @@ static const struct fd_ops serial_fd_ops = default_fd_get_poll_events, /* get_poll_events */ default_poll_event, /* poll_event */ serial_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ diff --git a/server/sock.c b/server/sock.c index 1a53ce4b091..9f33bc0b95c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -164,6 +164,7 @@ static const struct fd_ops sock_fd_ops = sock_get_poll_events, /* get_poll_events */ sock_poll_event, /* poll_event */ sock_get_fd_type, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ @@ -979,6 +980,7 @@ static const struct fd_ops ifchange_fd_ops = ifchange_get_poll_events, /* get_poll_events */ ifchange_poll_event, /* poll_event */ NULL, /* get_fd_type */ + no_fd_get_parent, /* get_parent */ no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ -- 2.27.0

1 2

[PATCH v2] sapi: Improve Get/SetDefaultTokenId stubs.
by Myah Caron Aug. 3, 2020

Aug. 3, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- Currently the new tests are skipped under wine due to missing registry keys. They can be added by running winetricks speechsdk. dlls/sapi/tests/token.c | 313 ++++++++++++++++++++++++++++++++++++++++ dlls/sapi/token.c | 140 +++++++++++++++++- 2 files changed, 449 insertions(+), 4 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 9f6689b83f..35e030cc87 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -83,6 +83,309 @@ static void test_token_category(void) ISpObjectTokenCategory_Release( cat ); } +static void backup_speech(HKEY root) +{ + LONG res; + HKEY key; + + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND || res == ERROR_ACCESS_DENIED, "got %08x\n", res ); + + res = RegCreateKeyW( root, L"SOFTWARE\\Microsoft\\Speech_winetest", &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + RegCopyTreeW( root, L"SOFTWARE\\Microsoft\\Speech", key ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + res = RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); +} + +static BOOL restore_speech(HKEY root, BOOL delete_backup) +{ + LONG res; + HKEY key; + BOOL returnvalue = FALSE; + + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech" ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND || res == ERROR_ACCESS_DENIED, "got %08x\n", res ); + if (res == ERROR_ACCESS_DENIED) + returnvalue = TRUE; + + res = RegCreateKeyW( root, L"SOFTWARE\\Microsoft\\Speech", &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + RegCopyTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest", key ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + if (delete_backup) { + res = RegDeleteTreeW( root, L"SOFTWARE\\Microsoft\\Speech_winetest" ); + ok( res == ERROR_SUCCESS || res == ERROR_ACCESS_DENIED, "got %08x\n", res ); + } + + return returnvalue; +} + +static void test_token_default_id(LPCWSTR cat_name) +{ + ISpObjectTokenCategory *cat; + HRESULT hr; + LONG res; + HKEY key; + LPWSTR token_id = NULL; + WCHAR regvalue[512]; + WCHAR regvalue2[512]; + DWORD regvalue_size = sizeof( regvalue ); + WCHAR regcat[256]; + WCHAR cat_id[256]; + + wcscpy(regcat, L"SOFTWARE\\Microsoft\\Speech\\"); + wcscat(regcat, cat_name); + + wcscpy(cat_id, L"HKEY_LOCAL_MACHINE\\"); + wcscat(cat_id, regcat); + + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, regcat, 0, KEY_READ, &key ); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "category %s not found in registry\n", wine_dbgstr_w(cat_name) ); + return; + } + RegCloseKey(key); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + /* if missing, Get/SetDefaultTokenId should initialize HKEY_LOCAL_USER's + SOFTWARE\Microsoft\Speech\[cat_name] */ + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + + /* AudioOutput under windows server returns this error */ + if (hr == SPERR_NOT_FOUND) { + /* also happens if TokenEnums/Tokens is empty or doesn't exist */ + skip( "category %s not found\n", wine_dbgstr_w(cat_name) ); + return; + } + + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + + regvalue_size = sizeof( regvalue ); + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "DefaultTokenId not found for category %s (%s)\n", wine_dbgstr_w(cat_name), wine_dbgstr_w(token_id)); + } else { + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should be equal to the DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + } + + CoTaskMemFree(token_id); + + regvalue_size = sizeof( regvalue2 ); + regvalue2[0] = 0; + res = RegGetValueW( HKEY_LOCAL_MACHINE, regcat, L"DefaultdefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue2, &regvalue_size); + if (res == ERROR_FILE_NOT_FOUND) { + skip( "DefaultdefaultTokenId not found for category %s (%s)\n", wine_dbgstr_w(cat_name), wine_dbgstr_w(regvalue) ); + } else { + regvalue_size = sizeof( regvalue ); + regvalue[0] = 0; + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, regvalue2), + "DefaultTokenId (%s) should be equal to the DefaultdefaultTokenId key (%s)\n", + wine_dbgstr_w(regvalue), wine_dbgstr_w(regvalue2) ); + } + + /* todo: test subkeys */ + + res = RegOpenKeyExW( HKEY_CURRENT_USER, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"bogus"); + regvalue_size = (wcslen(regvalue) + 1) * sizeof( WCHAR ); + res = RegSetValueExW( key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + todo_wine ok( wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should not be equal to the bogus DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + CoTaskMemFree(token_id); + + /* todo: add more tests for the resulting token_id */ + + res = restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + if (res == TRUE) { + skip( "Unable to delete HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\n" ); + } else { + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + todo_wine ok( hr == 0x800703fa, "got %08x\n", hr ); + todo_wine ok( token_id == (LPWSTR)0xdeadbeef, "got %p\n", token_id ); + } + + ISpObjectTokenCategory_Release( cat ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegDeleteTreeW( HKEY_LOCAL_MACHINE, regcat ); + if (res == ERROR_ACCESS_DENIED) { + skip( "Unable to delete HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\n" ); + + restore_speech( HKEY_CURRENT_USER, FALSE ); + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + } else { + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + restore_speech( HKEY_CURRENT_USER, FALSE ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + } + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %08x\n", res ); + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, regcat, 0, KEY_WRITE, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"bogus"); + regvalue_size = (wcslen(regvalue) + 1) * sizeof( WCHAR ); + res = RegSetValueExW( key, L"DefaultdefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + todo_wine ok( wcscmp(regvalue, token_id), + "GetDefaultTokenId (%s) should not be equal to the bogus DefaultdefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(regvalue) ); + CoTaskMemFree(token_id); + + /* todo: test valid DefaultdefaultTokenId values + observation: if it doesn't begin with HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\ + it will return E_INVALIDARG */ + + ISpObjectTokenCategory_Release( cat ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegOpenKeyExW( HKEY_LOCAL_MACHINE, regcat, 0, KEY_ALL_ACCESS, &key ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + res = RegDeleteValueW( key, L"DefaultdefaultTokenId" ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + RegCloseKey(key); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + token_id = (LPWSTR)0xdeadbeef; + hr = ISpObjectTokenCategory_GetDefaultTokenId( cat, &token_id ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( token_id != (LPWSTR)0xdeadbeef && token_id != NULL, "got %p\n", token_id ); + if (token_id != (LPWSTR)0xdeadbeef) + CoTaskMemFree(token_id); + + ISpObjectTokenCategory_Release( cat ); + restore_speech( HKEY_LOCAL_MACHINE, FALSE ); + hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpObjectTokenCategory, (void **)&cat ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, NULL ); + ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetId( cat, cat_id, FALSE ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + wcscpy(regvalue, L"deadbeef"); + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, regvalue ); + ok( hr == S_OK, "got %08x\n", hr ); + + regvalue_size = sizeof( regvalue ); + regvalue[0] = 0; + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, L"deadbeef"), + "DefaultTokenId in registry (%s) should be equal to the set default token id (%s)\n", + wine_dbgstr_w(regvalue), wine_dbgstr_w(L"deadbeef") ); + + res = RegDeleteTreeW( HKEY_CURRENT_USER, regcat ); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + wcscpy(regvalue, L"deadbeef"); + hr = ISpObjectTokenCategory_SetDefaultTokenId( cat, regvalue ); + ok( hr == S_OK, "got %08x\n", hr ); + regvalue_size = sizeof( regvalue ); + regvalue[0] = 0; + res = RegGetValueW( HKEY_CURRENT_USER, regcat, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + (LPVOID)&regvalue, &regvalue_size); + ok( res == ERROR_SUCCESS, "got %08x\n", res ); + ok( !wcscmp(regvalue, L"deadbeef"), + "GetDefaultTokenId (%s) should be equal to the set DefaultTokenId key (%s)\n", + wine_dbgstr_w(token_id), wine_dbgstr_w(L"deadbeef") ); + + ISpObjectTokenCategory_Release( cat ); +} + static void test_token_enum(void) { ISpObjectTokenEnumBuilder *token_enum; @@ -121,6 +424,16 @@ START_TEST(token) CoInitialize( NULL ); test_data_key(); test_token_category(); + backup_speech( HKEY_LOCAL_MACHINE ); + backup_speech( HKEY_CURRENT_USER ); + test_token_default_id( L"AppLexicons" ); + test_token_default_id( L"AudioInput" ); + test_token_default_id( L"AudioOutput" ); + test_token_default_id( L"PhoneConverters" ); + test_token_default_id( L"Recognizers" ); + test_token_default_id( L"Voices" ); + restore_speech( HKEY_CURRENT_USER, TRUE ); + restore_speech( HKEY_LOCAL_MACHINE, TRUE ); test_token_enum(); CoUninitialize(); } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index d2b70c95cf..ff96796dd2 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -232,6 +232,7 @@ struct token_category LONG ref; ISpRegDataKey *data_key; + WCHAR *subkey; }; static struct token_category *impl_from_ISpObjectTokenCategory( ISpObjectTokenCategory *iface ) @@ -421,6 +422,8 @@ static HRESULT WINAPI token_category_SetId( ISpObjectTokenCategory *iface, res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); if (res) return SPERR_INVALID_REGISTRY_KEY; + This->subkey = _wcsdup(subkey); + hr = CoCreateInstance( &CLSID_SpDataKey, NULL, CLSCTX_ALL, &IID_ISpRegDataKey, (void **)&This->data_key ); if (FAILED(hr)) goto fail; @@ -479,18 +482,147 @@ fail: return hr; } +static HRESULT get_user_speech_key( struct token_category *This, HKEY* key ) +{ + LONG res; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + struct data_key *this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + res = RegOpenKeyExW( HKEY_CURRENT_USER, This->subkey, 0, KEY_ALL_ACCESS, key ); + if (res == ERROR_SUCCESS) { + return S_OK; + } + + FIXME( "(%p): semi-stub\n", This ); + + res = RegCreateKeyW( HKEY_CURRENT_USER, This->subkey, key ); + if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + res = RegGetValueW( this_data_key->key, NULL, L"DefaultdefaultTokenId", + RRF_RT_REG_SZ, NULL, (LPVOID)&regvalue, &regvalue_size); + if (res == ERROR_SUCCESS) { + RegSetValueExW( *key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)regvalue, regvalue_size); + } else if (res != ERROR_FILE_NOT_FOUND) { + FIXME( "returning %08x\n", res ); + return res; + } + + return S_OK; +} + static HRESULT WINAPI token_category_SetDefaultTokenId( ISpObjectTokenCategory *iface, LPCWSTR id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + HRESULT hr; + LONG res; + HKEY key; + + TRACE( "(%p)->(%s)\n", iface, debugstr_w(id) ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_INVALIDARG; + + hr = get_user_speech_key( This, &key ); + if (FAILED(hr)) return hr; + + res = RegSetValueExW( key, L"DefaultTokenId", 0, REG_SZ, (const BYTE*)id, + wcslen( id) * sizeof( WCHAR )); + if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "unable to set DefaultTokenId, returning S_FALSE\n" ); + RegCloseKey( key ); + return S_FALSE; + } + + RegCloseKey( key ); + + return S_OK; +} + +static BOOL get_default_token_from_tokens( struct token_category *This, + LPWSTR token ) +{ + WCHAR subkey_name[256]; + WCHAR subkey_name1[256]; + HKEY key; + LONG res; + struct data_key *this_data_key = impl_from_ISpRegDataKey( This->data_key ); + + res = RegEnumKeyW( this_data_key->key, 0, &subkey_name, sizeof( subkey_name ) ); + if (res != ERROR_SUCCESS) + return FALSE; + + RegOpenKeyExW( this_data_key->key, subkey_name, 0, KEY_ALL_ACCESS, &key ); + if (res != ERROR_SUCCESS) { + WARN( "unable to open subkey %s (%08x)\n", debugstr_w( subkey_name ), res ); + return FALSE; + } + + res = RegEnumKeyW( key, 0, &subkey_name1, sizeof( subkey_name1 ) ); + if (res != ERROR_SUCCESS) + return FALSE; + + RegCloseKey( key ); + + wcscpy( token, L"HKEY_LOCAL_MACHINE\\" ); + wcscat( token, This->subkey ); + wcscat( token, L"\\" ); + wcscat( token, subkey_name ); + wcscat( token, L"\\" ); + wcscat( token, subkey_name1 ); + + return TRUE; } static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory *iface, LPWSTR *id ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); + HRESULT hr; + LONG res; + HKEY key; + WCHAR regvalue[512]; + DWORD regvalue_size = sizeof( regvalue ); + + FIXME( "(%p)->(%p): semi-stub\n", iface, id ); + + if (!This->data_key) + return SPERR_UNINITIALIZED; + + if (!id) + return E_POINTER; + + hr = get_user_speech_key( This, &key ); + if (FAILED(hr)) return hr; + + res = RegGetValueW( key, NULL, L"DefaultTokenId", RRF_RT_REG_SZ, NULL, + &regvalue, &regvalue_size); + RegCloseKey( key ); + if (res == ERROR_FILE_NOT_FOUND) { + res = get_default_token_from_tokens( This, &regvalue ); + + if (res == FALSE) { + return SPERR_NOT_FOUND; + } + } else if (res != ERROR_SUCCESS) { + /* probably not the correct return value */ + FIXME( "returning %08x\n", res ); + return res; + } + + *id = CoTaskMemAlloc( regvalue_size ); + wcscpy( *id, regvalue ); + + return S_OK; } const struct ISpObjectTokenCategoryVtbl token_category_vtbl = -- 2.27.0

1 0

[PATCH] winevulkan: harden calibrated_timestamps failure paths
by Liam Middlebrook Aug. 3, 2020

Aug. 3, 2020

Addresses some comments that Zhiyi had made on the initial review thread. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Andy Ritger <aritger(a)nvidia.com> --- dlls/winevulkan/vulkan.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index be614f1cef..0b3923dc15 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1333,6 +1333,8 @@ VkResult WINAPI wine_vkGetCalibratedTimestampsEXT(VkDevice device, } res = device->funcs.p_vkGetCalibratedTimestampsEXT(device->device, timestamp_count, host_timestamp_infos, timestamps, max_deviation); + if (res != VK_SUCCESS) + return res; for (i = 0; i < timestamp_count; i++) timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]); @@ -1366,7 +1368,10 @@ VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDe res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, host_time_domains); if (res != VK_SUCCESS) + { + heap_free(host_time_domains); return res; + } for (i = 0; i < host_time_domain_count; i++) { -- 2.26.2

2 1

[PATCH 3/3] msvcrt: Import sqrt from musl.
by Piotr Caban Aug. 3, 2020

Aug. 3, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 123 ++++++++++++++++++++++++++++++++++++- dlls/ucrtbase/tests/misc.c | 4 +- 2 files changed, 123 insertions(+), 4 deletions(-)

2 1

[PATCH] kernelbase: Add missing consts to ScrollConsoleScreenBuffer declaration.
by Jacek Caban Aug. 3, 2020

Aug. 3, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 10 +++++----- include/wincon.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] wininet: Move INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT handling to helper.
by Daniel Lehman Aug. 3, 2020

Aug. 3, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/wininet/http.c | 62 ++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 56c995805b..220493718c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2083,6 +2083,38 @@ static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL uni } } +static DWORD get_security_cert_struct(http_request_t *req, INTERNET_CERTIFICATE_INFOA *info) +{ + PCCERT_CONTEXT context; + DWORD len; + + context = (PCCERT_CONTEXT)NETCON_GetCert(req->netconn); + if(!context) + return ERROR_NOT_SUPPORTED; + + memset(info, 0, sizeof(*info)); + info->ftExpiry = context->pCertInfo->NotAfter; + info->ftStart = context->pCertInfo->NotBefore; + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); + info->lpszSubjectInfo = LocalAlloc(0, len); + if(info->lpszSubjectInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, + info->lpszSubjectInfo, len); + len = CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); + info->lpszIssuerInfo = LocalAlloc(0, len); + if(info->lpszIssuerInfo) + CertNameToStrA(context->dwCertEncodingType, + &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, + info->lpszIssuerInfo, len); + info->dwKeySize = NETCON_GetCipherStrength(req->netconn); + + CertFreeCertificateContext(context); + return ERROR_SUCCESS; +} + static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode) { http_request_t *req = (http_request_t*)hdr; @@ -2235,8 +2267,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe } case INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT: { - PCCERT_CONTEXT context; - if(!req->netconn) return ERROR_INTERNET_INVALID_OPERATION; @@ -2245,33 +2275,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe return ERROR_INSUFFICIENT_BUFFER; } - context = (PCCERT_CONTEXT)NETCON_GetCert(req->netconn); - if(context) { - INTERNET_CERTIFICATE_INFOA *info = (INTERNET_CERTIFICATE_INFOA*)buffer; - DWORD len; - - memset(info, 0, sizeof(*info)); - info->ftExpiry = context->pCertInfo->NotAfter; - info->ftStart = context->pCertInfo->NotBefore; - len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); - info->lpszSubjectInfo = LocalAlloc(0, len); - if(info->lpszSubjectInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Subject, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, - info->lpszSubjectInfo, len); - len = CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, NULL, 0); - info->lpszIssuerInfo = LocalAlloc(0, len); - if(info->lpszIssuerInfo) - CertNameToStrA(context->dwCertEncodingType, - &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR|CERT_NAME_STR_CRLF_FLAG, - info->lpszIssuerInfo, len); - info->dwKeySize = NETCON_GetCipherStrength(req->netconn); - CertFreeCertificateContext(context); - return ERROR_SUCCESS; - } - return ERROR_NOT_SUPPORTED; + return get_security_cert_struct(req, (INTERNET_CERTIFICATE_INFOA*)buffer); } case INTERNET_OPTION_CONNECT_TIMEOUT: if (*size < sizeof(DWORD)) -- 2.25.1

3 7

[PATCH 1/3] ucrtbase: Support overriding return value in _matherr.
by Piotr Caban Aug. 3, 2020

Aug. 3, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 130 ++++++++++++++++++++----------------- dlls/ucrtbase/tests/misc.c | 7 ++ 2 files changed, 76 insertions(+), 61 deletions(-)

2 1