- wine-devel - winehq.org

[PATCH v4 1/6] jscript: Factor local_ref_scopes_t structure out of function_code_t.
by Paul Gofman 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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 17 Jun '21

17 Jun '21

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

[PATCH v2] uiautomationcore: Add stub UiaNodeFromFocus function.
by Vijay Kiran Kamuju 17 Jun '21

17 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50576 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/uiautomationcore/tests/uiautomation.c | 17 ++++++++ dlls/uiautomationcore/uia_main.c | 12 ++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 45 +++++++++++++++++++++ 4 files changed, 75 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index cbcba1af294..1a1794b251b 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -86,7 +86,24 @@ if (hr == S_OK) UnregisterClassA("HostProviderFromHwnd class", NULL); } +static void test_UiaNodeFromFocus(void) +{ + HRESULT hr; + UiaCacheRequest req; + SAFEARRAY *data; + + hr = UiaNodeFromFocus(NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = UiaNodeFromFocus(&req, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = UiaNodeFromFocus(&req, &data, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); +} + START_TEST(uiautomation) { test_UiaHostProviderFromHwnd(); + test_UiaNodeFromFocus(); } diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 42014af6035..83ceca32954 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -89,3 +89,15 @@ HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **pr FIXME("(%p, %p): stub\n", hwnd, provider); return E_NOTIMPL; } + +HRESULT WINAPI UiaNodeFromFocus(UiaCacheRequest *request, SAFEARRAY **data, BSTR *tree) +{ + FIXME("(%p, %p, %p): stub\n", request, data, tree); + + if (!request || !data || !tree) + return E_INVALIDARG; + + *data = NULL; + *tree = NULL; + return S_OK; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index c9b96ab39ef..77596c360fb 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -76,7 +76,7 @@ #@ stub UiaIAccessibleFromProvider @ stdcall UiaLookupId(long ptr) @ stub UiaNavigate -@ stub UiaNodeFromFocus +@ stdcall UiaNodeFromFocus(ptr ptr ptr) @ stub UiaNodeFromHandle @ stub UiaNodeFromPoint @ stub UiaNodeFromProvider diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..7eda5e5c3cd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -39,6 +39,12 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT); DECLARE_HANDLE(HUIATEXTRANGE); DECLARE_HANDLE(HUIAEVENT); +enum AutomationElementMode +{ + AutomationElementMode_None, + AutomationElementMode_Full +}; + enum AutomationIdentifierType { AutomationIdentifierType_Property, @@ -52,6 +58,16 @@ enum AutomationIdentifierType AutomationIdentifierType_Style }; +enum ConditionType +{ + ConditionType_True = 0, + ConditionType_False = 1, + ConditionType_Property = 2, + ConditionType_And = 3, + ConditionType_Or = 4, + ConditionType_Not = 5 +}; + enum ProviderType { ProviderType_BaseHwnd, @@ -59,11 +75,40 @@ enum ProviderType ProviderType_NonClientArea, }; +enum TreeScope +{ + TreeScope_None, + TreeScope_Element, + TreeScope_Children, + TreeScope_Descendents, + TreeScope_Parent, + TreeScope_Ancestors, + TreeScope_Subtree +}; + +typedef struct +{ + enum ConditionType ConditionType; +} UiaCondition; + +typedef struct +{ + UiaCondition *pViewCondition; + enum TreeScope Scope; + + PROPERTYID *pProperties; + int cProperties; + PATTERNID *pPatterns; + int cPatterns; + enum AutomationElementMode automationElementMode; +} UiaCacheRequest; + typedef SAFEARRAY * WINAPI UiaProviderCallback(HWND hwnd,enum ProviderType providerType); HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); +HRESULT WINAPI UiaNodeFromFocus(UiaCacheRequest *pRequest, SAFEARRAY **ppRequestData, BSTR *ppTreeStructure); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); -- 2.32.0

1 0

[PATCH] uiautomationcore: Add stub UiaNodeFromFocus function.
by Vijay Kiran Kamuju 17 Jun '21

17 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50576 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/uiautomationcore/uia_main.c | 8 ++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 45 +++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 77460aa174c..49fc97748b9 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -104,3 +104,11 @@ HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **pr FIXME("(%p, %p): stub\n", hwnd, provider); return E_NOTIMPL; } + +HRESULT WINAPI UiaNodeFromFocus(UiaCacheRequest *request, SAFEARRAY **data, BSTR *tree) +{ + FIXME("(%p, %p, %p): stub\n", request, data, tree); + + *tree = NULL; + return S_OK; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 5da89c3451c..f3bfb500c8b 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -76,7 +76,7 @@ #@ stub UiaIAccessibleFromProvider @ stdcall UiaLookupId(long ptr) @ stub UiaNavigate -@ stub UiaNodeFromFocus +@ stdcall UiaNodeFromFocus(ptr ptr ptr) @ stub UiaNodeFromHandle @ stub UiaNodeFromPoint @ stub UiaNodeFromProvider diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index de486710158..7eda5e5c3cd 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -39,6 +39,12 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT); DECLARE_HANDLE(HUIATEXTRANGE); DECLARE_HANDLE(HUIAEVENT); +enum AutomationElementMode +{ + AutomationElementMode_None, + AutomationElementMode_Full +}; + enum AutomationIdentifierType { AutomationIdentifierType_Property, @@ -52,6 +58,16 @@ enum AutomationIdentifierType AutomationIdentifierType_Style }; +enum ConditionType +{ + ConditionType_True = 0, + ConditionType_False = 1, + ConditionType_Property = 2, + ConditionType_And = 3, + ConditionType_Or = 4, + ConditionType_Not = 5 +}; + enum ProviderType { ProviderType_BaseHwnd, @@ -59,11 +75,40 @@ enum ProviderType ProviderType_NonClientArea, }; +enum TreeScope +{ + TreeScope_None, + TreeScope_Element, + TreeScope_Children, + TreeScope_Descendents, + TreeScope_Parent, + TreeScope_Ancestors, + TreeScope_Subtree +}; + +typedef struct +{ + enum ConditionType ConditionType; +} UiaCondition; + +typedef struct +{ + UiaCondition *pViewCondition; + enum TreeScope Scope; + + PROPERTYID *pProperties; + int cProperties; + PATTERNID *pPatterns; + int cPatterns; + enum AutomationElementMode automationElementMode; +} UiaCacheRequest; + typedef SAFEARRAY * WINAPI UiaProviderCallback(HWND hwnd,enum ProviderType providerType); HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); +HRESULT WINAPI UiaNodeFromFocus(UiaCacheRequest *pRequest, SAFEARRAY **ppRequestData, BSTR *ppTreeStructure); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); -- 2.30.0

2 2

[RFC PATCH] dinput: Introduce new HID joystick backend.
by Rémi Bernon 17 Jun '21

17 Jun '21

Sending this as RFC because I'm not completely sure how to proceed (and also because ideally it would depend on 206872 which is not merged yet). The problem is that this new backend will fail most dinput(8) tests until it's more properly implemented, although the testbot doesn't have HID devices to test with. It could also cause issues if the new backend is enumerated and somehow is selected by default for some reason. Either we don't really care, or the new backend could be conditionally enabled with a configure flag? dlls/dinput/Makefile.in | 3 +- dlls/dinput/dinput_main.c | 3 +- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick_hid.c | 431 +++++++++++++++++++++++++++++++++++ dlls/dinput8/Makefile.in | 3 +- 5 files changed, 438 insertions(+), 3 deletions(-) create mode 100644 dlls/dinput/joystick_hid.c diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index a22c8a72180..f2347927ed6 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput.dll IMPORTLIB = dinput -IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0700 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) @@ -12,6 +12,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c7b932aca44..88ee1855675 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -80,7 +80,8 @@ static const struct dinput_device *dinput_devices[] = &keyboard_device, &joystick_linuxinput_device, &joystick_linux_device, - &joystick_osx_device + &joystick_osx_device, + &joystick_hid_device, }; HINSTANCE DINPUT_instance; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 7e0f56c68df..c11b64585d9 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -67,6 +67,7 @@ struct DevicePlayer { extern const struct dinput_device mouse_device DECLSPEC_HIDDEN; extern const struct dinput_device keyboard_device DECLSPEC_HIDDEN; +extern const struct dinput_device joystick_hid_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c new file mode 100644 index 00000000000..3e9d1dc69b9 --- /dev/null +++ b/dlls/dinput/joystick_hid.c @@ -0,0 +1,431 @@ +/* DirectInput HID Joystick device + * + * Copyright 2021 Rémi Bernon 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 <assert.h> +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winuser.h" +#include "winerror.h" +#include "winreg.h" + +#include "ddk/hidsdi.h" +#include "devguid.h" +#include "dinput.h" +#include "setupapi.h" + +#include "wine/debug.h" + +#include "dinput_private.h" +#include "device_private.h" +#include "joystick_private.h" + +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(hidjoy); + +DEFINE_GUID( hid_joystick_guid, 0x9e573edb, 0x7734, 0x11d2, 0x8d, 0x4a, 0x23, 0x90, 0x3f, 0xb6, 0xbd, 0xf7 ); + +struct hid_joystick +{ + IDirectInputDeviceImpl base; + + HANDLE device; + PHIDP_PREPARSED_DATA preparsed; +}; + +static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) +{ + return CONTAINING_RECORD( CONTAINING_RECORD( iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface ), + struct hid_joystick, base ); +} + +static ULONG WINAPI hid_joystick_Release( IDirectInputDevice8W *iface ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + struct hid_joystick tmp = *impl; + ULONG res; + + if (!(res = IDirectInputDevice2WImpl_Release( iface ))) + { + HidD_FreePreparsedData( tmp.preparsed ); + CloseHandle( tmp.device ); + } + + return res; +} + +static HRESULT WINAPI hid_joystick_GetCapabilities( IDirectInputDevice8W *iface, DIDEVCAPS *caps ) +{ + FIXME( "iface %p, caps %p stub!\n", iface, caps ); + + if (!caps) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumObjects( IDirectInputDevice8W *iface, + LPDIENUMDEVICEOBJECTSCALLBACKW callback, void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, REFGUID guid, DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: + return IDirectInputDevice2WImpl_GetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_SetProperty( IDirectInputDevice8W *iface, REFGUID guid, const DIPROPHEADER *header ) +{ + FIXME( "iface %p, guid %s, header %p stub!\n", iface, debugstr_guid( guid ), header ); + + if (!header) return DIERR_INVALIDPARAM; + if (!IS_DIPROP( guid )) return DI_OK; + + switch (LOWORD( guid )) + { + default: + return IDirectInputDevice2WImpl_SetProperty( iface, guid, header ); + } +} + +static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) +{ + FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + + if (!ptr) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, + DIDEVICEOBJECTINSTANCEW *instance, DWORD obj, DWORD how ) +{ + FIXME( "iface %p, instance %p, obj %#x, how %#x stub!\n", iface, instance, obj, how ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, REFGUID rguid, + const DIEFFECT *effect, IDirectInputEffect **out, + IUnknown *outer ) +{ + FIXME( "iface %p, rguid %s, effect %p, out %p, outer %p stub!\n", iface, debugstr_guid( rguid ), + effect, out, outer ); + + if (!out) return E_POINTER; + if (!rguid || !effect) return DI_NOEFFECT; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, + void *ref, DWORD type ) +{ + FIXME( "iface %p, callback %p, ref %p, type %#x stub!\n", iface, callback, ref, type ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetEffectInfo( IDirectInputDevice8W *iface, DIEFFECTINFOW *info, REFGUID guid ) +{ + FIXME( "iface %p, info %p, guid %s stub!\n", iface, info, debugstr_guid( guid ) ); + + if (!info) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_GetForceFeedbackState( IDirectInputDevice8W *iface, DWORD *out ) +{ + FIXME( "iface %p, out %p stub!\n", iface, out ); + + if (!out) return E_POINTER; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SendForceFeedbackCommand( IDirectInputDevice8W *iface, DWORD flags ) +{ + FIXME( "iface %p, flags %x stub!\n", iface, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8W *iface, + LPDIENUMCREATEDEFFECTOBJECTSCALLBACK callback, + void *ref, DWORD flags ) +{ + FIXME( "iface %p, callback %p, ref %p, flags %#x stub!\n", iface, callback, ref, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_Poll( IDirectInputDevice8W *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_BuildActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + FIXME( "iface %p, format %p, username %s, flags %#x stub!\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return E_NOTIMPL; +} + +static HRESULT WINAPI hid_joystick_SetActionMap( IDirectInputDevice8W *iface, DIACTIONFORMATW *format, + const WCHAR *username, DWORD flags ) +{ + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + + TRACE( "iface %p, format %p, username %s, flags %#x.\n", iface, format, debugstr_w(username), flags ); + + if (!format) return DIERR_INVALIDPARAM; + + return _set_action_map( iface, format, username, flags, impl->base.data_format.wine_df ); +} + +static const IDirectInputDevice8WVtbl hid_joystick_vtbl = +{ + /*** IUnknown methods ***/ + IDirectInputDevice2WImpl_QueryInterface, + IDirectInputDevice2WImpl_AddRef, + hid_joystick_Release, + /*** IDirectInputDevice methods ***/ + hid_joystick_GetCapabilities, + hid_joystick_EnumObjects, + hid_joystick_GetProperty, + hid_joystick_SetProperty, + IDirectInputDevice2WImpl_Acquire, + IDirectInputDevice2WImpl_Unacquire, + hid_joystick_GetDeviceState, + IDirectInputDevice2WImpl_GetDeviceData, + IDirectInputDevice2WImpl_SetDataFormat, + IDirectInputDevice2WImpl_SetEventNotification, + IDirectInputDevice2WImpl_SetCooperativeLevel, + hid_joystick_GetObjectInfo, + hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_RunControlPanel, + IDirectInputDevice2WImpl_Initialize, + /*** IDirectInputDevice2 methods ***/ + hid_joystick_CreateEffect, + hid_joystick_EnumEffects, + hid_joystick_GetEffectInfo, + hid_joystick_GetForceFeedbackState, + hid_joystick_SendForceFeedbackCommand, + hid_joystick_EnumCreatedEffectObjects, + IDirectInputDevice2WImpl_Escape, + hid_joystick_Poll, + IDirectInputDevice2WImpl_SendDeviceData, + /*** IDirectInputDevice7 methods ***/ + IDirectInputDevice7WImpl_EnumEffectsInFile, + IDirectInputDevice7WImpl_WriteEffectToFile, + /*** IDirectInputDevice8 methods ***/ + hid_joystick_BuildActionMap, + hid_joystick_SetActionMap, + IDirectInputDevice8WImpl_GetImageInfo, +}; + +static HRESULT hid_joystick_device_open( DWORD index, WCHAR *device_path, HANDLE *device, DWORD version, + PHIDP_PREPARSED_DATA *preparsed, HIDD_ATTRIBUTES *attrs, + HIDP_CAPS *caps, DIDEVICEINSTANCEW *instance ) +{ + RAWINPUTDEVICELIST *list; + DWORD count, i, j; + + GetRawInputDeviceList( NULL, &count, sizeof(*list) ); + if (!(list = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*list) ))) return DIERR_OUTOFMEMORY; + GetRawInputDeviceList( list, &count, sizeof(*list) ); + + for (i = 0; i < count; ++i) if (list[i].dwType == RIM_TYPEHID) break; + for (j = 0; j < index && i < count; ++i) if (list[i].dwType == RIM_TYPEHID) ++j; + if (i == count) + { + HeapFree( GetProcessHeap(), 0, list ); + return DIERR_DEVICENOTREG; + } + + count = MAX_PATH; + GetRawInputDeviceInfoW( list[i].hDevice, RIDI_DEVICENAME, device_path, &count ); + HeapFree( GetProcessHeap(), 0, list ); + + TRACE( "Opening %s\n", debugstr_w(device_path) ); + *device = CreateFileW( device_path, GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + *preparsed = NULL; + + if (*device == INVALID_HANDLE_VALUE) return DI_NOTATTACHED; + if (!HidD_GetPreparsedData( *device, preparsed )) goto failed; + if (!HidD_GetAttributes( *device, attrs )) goto failed; + if (HidP_GetCaps( *preparsed, caps ) != HIDP_STATUS_SUCCESS) goto failed; + + if (caps->UsagePage == HID_USAGE_PAGE_GAME) FIXME( "Unimplemented HID game usage page!\n" ); + if (caps->UsagePage == HID_USAGE_PAGE_SIMULATION) FIXME( "Unimplemented HID simulation usage page!\n" ); + if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; + if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; + + instance->guidInstance = hid_joystick_guid; + instance->guidInstance.Data3 = index; + instance->guidProduct = DInput_PIDVID_Product_GUID; + instance->guidProduct.Data1 = MAKELONG( attrs->VendorID, attrs->ProductID ); + instance->dwDevType = get_device_type( version, caps->Usage != HID_USAGE_GENERIC_GAMEPAD ) | DIDEVTYPE_HID; + instance->guidFFDriver = GUID_NULL; + instance->wUsagePage = caps->UsagePage; + instance->wUsage = caps->Usage; + + if (!HidD_GetProductString( *device, instance->tszInstanceName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( *device, instance->tszProductName, MAX_PATH )) goto failed; + return DI_OK; + +failed: + CloseHandle( *device ); + *device = INVALID_HANDLE_VALUE; + HidD_FreePreparsedData( *preparsed ); + *preparsed = NULL; + return DI_NOTATTACHED; +} + +static HRESULT hid_joystick_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instance, + DWORD version, int index ) +{ + PHIDP_PREPARSED_DATA preparsed; + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + HIDP_CAPS caps; + HRESULT hr; + HANDLE device; + WCHAR device_path[MAX_PATH]; + + TRACE( "type %x, flags %#x, instance %p, version %04x, index %d\n", type, flags, instance, version, index ); + + if (instance->dwSize != sizeof(DIDEVICEINSTANCEW)) return DIERR_INVALIDPARAM; + if (version < 0x0800 && type != DIDEVTYPE_JOYSTICK) return DIERR_INVALIDPARAM; + if (version >= 0x0800 && type != DI8DEVCLASS_ALL && type != DI8DEVCLASS_GAMECTRL) + return DIERR_INVALIDPARAM; + + if (FAILED(hr = hid_joystick_device_open( index, device_path, &device, version, + &preparsed, &attrs, &caps, instance ))) + return hr; + if (hr != DI_OK) return hr; + + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + + TRACE( "Found device with usage %04x:%04x, type %x, instance %s %s, product %s %s, ffdriver %s\n", + instance->wUsagePage, instance->wUsage, instance->dwDevType, debugstr_guid( &instance->guidProduct ), + debugstr_w( instance->tszProductName ), debugstr_guid( &instance->guidInstance ), + debugstr_w( instance->tszInstanceName ), debugstr_guid( &instance->guidFFDriver ) ); + + return DI_OK; +} + +static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, REFGUID guid, IDirectInputDevice8W **out ) +{ + struct hid_joystick *impl = NULL; + PHIDP_PREPARSED_DATA preparsed; + DIDEVICEINSTANCEW instance = {sizeof(instance)}; + HIDD_ATTRIBUTES attrs = {sizeof(attrs)}; + DIDATAFORMAT *format = NULL; + HIDP_CAPS caps; + HRESULT hr; + HANDLE device; + WCHAR device_path[MAX_PATH]; + DWORD index, size = sizeof(*impl); + GUID tmp_guid = *guid; + + TRACE( "dinput %p, guid %s, out %p\n", dinput, debugstr_guid( guid ), out ); + + *out = NULL; + tmp_guid.Data3 = hid_joystick_guid.Data3; + if (!IsEqualGUID( &hid_joystick_guid, &tmp_guid )) return DIERR_DEVICENOTREG; + index = guid->Data3; + + if (FAILED(hr = hid_joystick_device_open( index, device_path, &device, dinput->dwVersion, + &preparsed, &attrs, &caps, &instance ))) + return hr; + if (hr != DI_OK) return hr; + + if (FAILED(hr = direct_input_device_alloc( size, &hid_joystick_vtbl, guid, dinput, (void **)&impl ))) + goto failed; + + impl->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": hid_joystick.base.crit"); + impl->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; + + impl->device = device; + impl->preparsed = preparsed; + + if (!(format = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*format) ))) goto failed; + impl->base.data_format.wine_df = format; + + TRACE( "Created %p\n", impl ); + + *out = &impl->base.IDirectInputDevice8W_iface; + return DI_OK; + +failed: + HeapFree( GetProcessHeap(), 0, format ); + HeapFree( GetProcessHeap(), 0, impl ); + HidD_FreePreparsedData( preparsed ); + CloseHandle( device ); + return hr; +} + +const struct dinput_device joystick_hid_device = +{ + "Wine HID joystick driver", + hid_joystick_enum_device, + hid_joystick_create_device, +}; diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 35b3bfb75f5..71eecd770b3 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -1,6 +1,6 @@ MODULE = dinput8.dll IMPORTLIB = dinput8 -IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 +IMPORTS = dinput8 dxguid uuid comctl32 ole32 user32 advapi32 hid EXTRADEFS = -DDIRECTINPUT_VERSION=0x0800 EXTRALIBS = $(IOKIT_LIBS) $(FORCEFEEDBACK_LIBS) PARENTSRC = ../dinput @@ -13,6 +13,7 @@ C_SRCS = \ dinput_main.c \ effect_linuxinput.c \ joystick.c \ + joystick_hid.c \ joystick_linux.c \ joystick_linuxinput.c \ joystick_osx.c \ -- 2.31.0

2 3

[PATCH] windowscodecs: Add initial support for WICPngDecoder2
by Vijay Kiran Kamuju 17 Jun '21

17 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45940 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/unix_lib.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index f1be96dd11d..d6baea38a1c 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -47,6 +47,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICImagingFactory2, ImagingFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, + {&CLSID_WICPngDecoder2, PngDecoder_CreateInstance}, {&CLSID_WICPngEncoder, PngEncoder_CreateInstance}, {&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance}, {&CLSID_WICGifDecoder, GifDecoder_CreateInstance}, diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 268a1cd9d16..4b184ef60eb 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -69,7 +69,8 @@ HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULO HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) { - if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)) + if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)|| + IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder2)) return png_decoder_create(info, result); if (IsEqualGUID(decoder_clsid, &CLSID_WICTiffDecoder)) -- 2.32.0

2 1

[PATCH] ntdll/tests: Relax tests for RtlWaitOnAddress() timeout.
by Zebediah Figura 17 Jun '21

17 Jun '21

RtlWaitOnAddress() shouldn't be waiting for less than 100 ms here, and it isn't, but using GetTickCount() to measure this can result in up to 15 ms of error, causing frequent test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Note that this never seems to fail on Windows, though. It may be that Windows is updating the user shared data on every system call. That's not exactly trivial for Wine to do, though. dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a7f8eaa84e1..82f8188d176 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2304,7 +2304,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2319,7 +2319,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, size, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status); -- 2.30.2

1 0

[PATCH 1/5] server: Correctly access the sir_lsap_sel field.
by Zebediah Figura 17 Jun '21

17 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6b0c4af6b11..23c750243a6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -427,10 +427,10 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl memcpy( &win, wsaddr, sizeof(win) ); uaddr->irda.sir_family = AF_IRDA; if (sscanf( win.irdaServiceName, "LSAP-SEL%u", &lsap_sel ) == 1) - uaddr->sir_lsap_sel = lsap_sel; + uaddr->irda.sir_lsap_sel = lsap_sel; else { - uaddr->sir_lsap_sel = LSAP_ANY; + uaddr->irda.sir_lsap_sel = LSAP_ANY; memcpy( uaddr->irda.sir_name, win.irdaServiceName, sizeof(win.irdaServiceName) ); } memcpy( &uaddr->irda.sir_addr, win.irdaDeviceID, sizeof(win.irdaDeviceID) ); -- 2.30.2

3 7

[PATCH] shell32: Always create default known folder directories
by Andrew Eikum 17 Jun '21

17 Jun '21

Some applications query for the default path, but this would fail on older prefixes where the new default path was never created. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/shell32/shellpath.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index f71b660a7aa..005e905baaa 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4688,6 +4688,13 @@ static HRESULT _SHRegisterFolders(HKEY hRootKey, HANDLE hToken, } } } + else + { + /* create the default dir, which may be different from the path + * stored in the registry. */ + SHGetFolderPathW(NULL, folders[i] | CSIDL_FLAG_CREATE, + hToken, SHGFP_TYPE_DEFAULT, path); + } } if (hUserKey) RegCloseKey(hUserKey); -- 2.32.0

1 0

[PATCH] reg/tests: Test key and value creation in 32-bit and 64-bit registry views
by Hugh McMaster 17 Jun '21

17 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 133 ++++++++++++++++++++++++++++++++++ programs/reg/tests/import.c | 39 ++++++---- programs/reg/tests/reg_test.h | 2 + 3 files changed, 159 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 384eb9012c7..264693ab349 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -274,6 +274,16 @@ static void test_command_syntax(void) /* Test empty type */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v emptyType /t \"\" /d WineTest /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + /* 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); + + 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); + + 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); } static void test_key_formats(void) @@ -849,6 +859,117 @@ static void test_reg_multi_sz(void) delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } +static void test_registry_view_win32(void) +{ + HKEY hkey; + DWORD r; + BOOL is_wow64, is_win32; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win32 = !is_wow64 && (sizeof(void *) == sizeof(int)); + + if (!is_win32) return; + + /* Try adding to the 32-bit registry view (32-bit Windows) */ + 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); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, 0); + + /* Try adding to the 64-bit registry view, which doesn't exist on 32-bit Windows */ + 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); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, 0); +} + +static void test_registry_view_win64(void) +{ + HKEY hkey; + DWORD r; + BOOL is_wow64, is_win64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + is_win64 = !is_wow64 && (sizeof(void *) > sizeof(int)); + + if (!is_win64) return; + + /* Try adding to the 32-bit registry view (64-bit Windows) */ + 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); + + todo_wine 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); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + 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); + + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); +} + +static void test_registry_view_wow64(void) +{ + HKEY hkey; + DWORD r; + BOOL is_wow64; + + IsWow64Process(GetCurrentProcess(), &is_wow64); + + if (!is_wow64) return; + + /* Try adding to the 32-bit registry view (WOW64) */ + 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); + + 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); + + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + + /* Try adding to the 64-bit registry view (WOW64) */ + 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); + + 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); + + todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); +} + START_TEST(add) { DWORD r; @@ -868,4 +989,16 @@ START_TEST(add) test_reg_dword(); test_reg_dword_big_endian(); test_reg_multi_sz(); + + /* Check if reg.exe is running with elevated privileges */ + if (!is_elevated_process()) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping registry view tests\n"); + return; + } + + test_registry_view_win32(); + test_registry_view_win64(); + test_registry_view_wow64(); } diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index c8a6b079a6a..2d8ece8990b 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -18,6 +18,29 @@ #include "reg_test.h" +BOOL is_elevated_process(void) +{ + LONG err; + HKEY hkey; + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + + if (err == ERROR_ACCESS_DENIED) + return FALSE; + + if (err == ERROR_FILE_NOT_FOUND) + { + if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ, NULL, &hkey, NULL)) + return FALSE; + + RegCloseKey(hkey); + RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + } + + return TRUE; +} + static BOOL write_file(const void *str, DWORD size) { HANDLE file; @@ -3466,30 +3489,16 @@ static void test_unicode_import_with_whitespace(void) static void test_import_win31(void) { - LONG err; HKEY hkey; DWORD r; /* Check if reg.exe is running with elevated privileges */ - err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - if (err == ERROR_ACCESS_DENIED) + if (!is_elevated_process()) { win_skip("reg.exe is not running with elevated privileges; " "skipping Windows 3.1 import tests\n"); return; } - if (err == ERROR_FILE_NOT_FOUND) - { - if (RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ, NULL, &hkey, NULL)) - { - win_skip("reg.exe is not running with elevated privileges; " - "skipping Windows 3.1 import tests\n"); - return; - } - RegCloseKey(hkey); - RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); - } /* Test simple value */ test_import_str("REGEDIT\r\n" diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index db525619978..fdc747af1e9 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -90,6 +90,8 @@ extern const char *embedded_null_test; extern const char *escaped_null_test; /* import.c */ +BOOL is_elevated_process(void); + #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) #define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r) BOOL import_reg(const char *file, unsigned line, const char *contents, BOOL unicode, DWORD *rc); -- 2.32.0

1 0

[PATCH] ntdll: Avoid declaration-after-statement warning.
by Gijs Vermeulen 17 Jun '21

17 Jun '21

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntdll/unix/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index c1ff0289cf2..140e7fc8e0d 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -894,10 +894,11 @@ void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) { #if defined(MACH_TASK_BASIC_INFO) struct mach_task_basic_info info; + mach_msg_type_number_t infoCount; if (unix_pid != -1) return; /* FIXME: Retrieve information for other processes. */ - mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT; + infoCount = MACH_TASK_BASIC_INFO_COUNT; if(task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) { pvmi->VirtualSize = info.resident_size + info.virtual_size; -- 2.32.0

2 1

[PATCH] include: Add IMFWorkQueueServicesEx definition.
by Nikolay Sivov 17 Jun '21

17 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfidl.idl | 160 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/include/mfidl.idl b/include/mfidl.idl index 4e1a29d43d6..76e0d0dfeb4 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -1270,6 +1270,165 @@ interface IMFRealTimeClientEx : IUnknown ); } +[ + object, + uuid(35fe1bb8-a3a9-40fe-bbec-eb569c9ccca3), +] +interface IMFWorkQueueServices : IUnknown +{ + [local] + HRESULT BeginRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteBeginRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndRegisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndRegisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteEndRegisterTopologyWorkQueuesWithMMCSS( + [in] IUnknown *result + ); + + [local] + HRESULT BeginUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginUnregisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteBeginUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndUnregisterTopologyWorkQueuesWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndUnregisterTopologyWorkQueuesWithMMCSS)] + HRESULT RemoteEndUnregisterTopologyWorkQueuesWithMMCSS( + [in] IUnknown *result + ); + + HRESULT GetTopologyWorkQueueMMCSSClass( + [in] DWORD queue, + [out, size_is(*classname_len)] LPWSTR classname, + [in, out] DWORD *classname_len + ); + + HRESULT GetTopologyWorkQueueMMCSSTaskId( + [in] DWORD queue, + [out] DWORD *taksid + ); + + [local] + HRESULT BeginRegisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteBeginRegisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndRegisterPlatformWorkQueueWithMMCSS( + [in] IMFAsyncResult *result, + [out] DWORD *taskid + ); + + [call_as(EndRegisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteEndRegisterPlatformWorkQueueWithMMCSS( + [in] IUnknown *result, + [out] DWORD *taskid + ); + + [local] + HRESULT BeginUnregisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginUnregisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteBeginUnregisterPlatformWorkQueueWithMMCSS( + [in] DWORD platform_queue, + [in] IMFRemoteAsyncCallback *callback + ); + + [local] + HRESULT EndUnregisterPlatformWorkQueueWithMMCSS( + [in] IMFAsyncResult *result + ); + + [call_as(EndUnregisterPlatformWorkQueueWithMMCSS)] + HRESULT RemoteEndUnregisterPlatformWorkQueueWithMMCSS( + [in] IUnknown *result + ); + + HRESULT GetPlaftormWorkQueueMMCSSClass( + [in] DWORD platform_queue, + [out, size_is(*classname_len)] LPWSTR classname, + [in, out] DWORD *classname_len + ); + + HRESULT GetPlatformWorkQueueMMCSSTaskId( + [in] DWORD platform_queue, + [out] DWORD *taskid + ); +} + +[ + object, + uuid(96bf961b-40fe-42f1-ba9d-320238b49700), +] +interface IMFWorkQueueServicesEx : IMFWorkQueueServices +{ + HRESULT GetTopologyWorkQueueMMCSSPriority( + [in] DWORD queueid, + [out] LONG *priority + ); + + [local] + HRESULT BeginRegisterPlatformWorkQueueWithMMCSSEx( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] LONG priority, + [in] IMFAsyncCallback *callback, + [in] IUnknown *state + ); + + [call_as(BeginRegisterPlatformWorkQueueWithMMCSSEx)] + HRESULT RemoteBeginRegisterPlatformWorkQueueWithMMCSSEx( + [in] DWORD platform_queue, + [in] LPCWSTR classname, + [in] DWORD taskid, + [in] LONG priority, + [in] IMFRemoteAsyncCallback *callback + ); + + HRESULT GetPlatformWorkQueueMMCSSPriority( + [in] DWORD platform_queue, + [out] LONG *priority + ); +} + enum { MF_ACTIVATE_CUSTOM_MIXER_ALLOWFAIL = 0x00000001, @@ -1386,6 +1545,7 @@ cpp_quote("EXTERN_GUID(MR_CAPTURE_POLICY_VOLUME_SERVICE, 0x24030acd, 0x107a, 0x4 cpp_quote("EXTERN_GUID(MR_STREAM_VOLUME_SERVICE, 0xf8b5fa2f, 0x32ef, 0x46f5, 0xb1, 0x72, 0x13, 0x21, 0x21, 0x2f, 0xb2, 0xc4);") cpp_quote("EXTERN_GUID(MR_AUDIO_POLICY_SERVICE, 0x911fd737, 0x6775, 0x4ab0, 0xa6, 0x14, 0x29, 0x78, 0x62, 0xfd, 0xac, 0x88);") cpp_quote("EXTERN_GUID(MF_PROPERTY_HANDLER_SERVICE, 0xa3face02, 0x32b8, 0x41dd, 0x90, 0xe7, 0x5f, 0xef, 0x7c, 0x89, 0x91, 0xb5);") +cpp_quote("EXTERN_GUID(MF_WORKQUEUE_SERVICES, 0x8e37d489, 0x41e0, 0x413a, 0x90, 0x68, 0x28, 0x7c, 0x88, 0x6d, 0x8d, 0xda);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_SAMPLE_TIME_OFFSET, 0x62e3d776, 0x8100, 0x4e03, 0xa6, 0xe8, 0xbd, 0x38, 0x57, 0xac, 0x9c, 0x47);") cpp_quote("EXTERN_GUID(MF_SAMPLEGRABBERSINK_IGNORE_CLOCK, 0x0efda2c0, 0x2b69, 0x4e2e, 0xab, 0x8d, 0x46, 0xdc, 0xbf, 0xf7, 0xd2, 0x5d);") -- 2.30.2

1 0

[PATCH v4] winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Giovanni Mascellani 17 Jun '21

17 Jun '21

The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Currently MFVideoRotationFormat_0 is always set, because I couldn't find anyway to query this property in GStreamer. The obvious place for this metadata item would probably be GstVideoInfo, but I cannot see anything related there. Can some GStreamer wizard help? v2: * add test; * reformat enumeration in a way which, I hope, is more correct. v3: * tweak enumeration again. v4: * fix enumeration values. dlls/mfplat/tests/mfplat.c | 7 +++++++ dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ff24c2c0ec0..f1c041b7eb4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -664,6 +664,7 @@ static void test_source_resolver(void) HRESULT hr; GUID guid; float rate; + UINT32 rotation; if (!pMFCreateSourceResolver) { @@ -849,6 +850,12 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "Failed to get rotation, hr %#x.\n", hr); + if (hr == S_OK) + ok(rotation == MFVideoRotationFormat_0, "Got wrong rotation %u.\n", rotation); + IMFMediaType_Release(media_type); hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..382210ad9e2 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,14 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat +{ + MFVideoRotationFormat_0 = 0, + MFVideoRotationFormat_90 = 90, + MFVideoRotationFormat_180 = 180, + MFVideoRotationFormat_270 = 270 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001, -- 2.32.0

2 1

[PATCH] mf: Use CRT allocation functions.
by Nikolay Sivov 17 Jun '21

17 Jun '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/clock.c | 26 ++++++++---------- dlls/mf/copier.c | 6 ++-- dlls/mf/evr.c | 18 ++++++------ dlls/mf/main.c | 57 ++++++++++++-------------------------- dlls/mf/mf_private.h | 3 +- dlls/mf/samplegrabber.c | 17 +++++------- dlls/mf/sar.c | 11 ++++---- dlls/mf/session.c | 61 ++++++++++++++++++++--------------------- dlls/mf/topology.c | 32 ++++++++------------- 9 files changed, 93 insertions(+), 138 deletions(-) diff --git a/dlls/mf/clock.c b/dlls/mf/clock.c index a9ca9b4528b..4a3ad7ec7c1 100644 --- a/dlls/mf/clock.c +++ b/dlls/mf/clock.c @@ -19,7 +19,6 @@ #define COBJMACROS #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "mf_private.h" @@ -174,7 +173,7 @@ static ULONG WINAPI sink_notification_Release(IUnknown *iface) if (!refcount) { IMFClockStateSink_Release(notification->sink); - heap_free(notification); + free(notification); } return refcount; @@ -194,8 +193,7 @@ static void clock_notify_async_sink(struct presentation_clock *clock, MFTIME sys IMFAsyncResult *result; HRESULT hr; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = malloc(sizeof(*object)))) return; object->IUnknown_iface.lpVtbl = &sinknotificationvtbl; @@ -279,7 +277,7 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) { list_remove(&sink->entry); IMFClockStateSink_Release(sink->state_sink); - heap_free(sink); + free(sink); } LIST_FOR_EACH_ENTRY_SAFE(timer, timer2, &clock->timers, struct clock_timer, entry) { @@ -287,7 +285,7 @@ static ULONG WINAPI present_clock_Release(IMFPresentationClock *iface) IUnknown_Release(&timer->IUnknown_iface); } DeleteCriticalSection(&clock->cs); - heap_free(clock); + free(clock); } return refcount; @@ -456,8 +454,7 @@ static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *ifac if (!state_sink) return E_INVALIDARG; - sink = heap_alloc(sizeof(*sink)); - if (!sink) + if (!(sink = malloc(sizeof(*sink)))) return E_OUTOFMEMORY; sink->state_sink = state_sink; @@ -496,7 +493,7 @@ static HRESULT WINAPI present_clock_AddClockStateSink(IMFPresentationClock *ifac if (FAILED(hr)) { IMFClockStateSink_Release(sink->state_sink); - heap_free(sink); + free(sink); } return hr; @@ -520,7 +517,7 @@ static HRESULT WINAPI present_clock_RemoveClockStateSink(IMFPresentationClock *i { IMFClockStateSink_Release(sink->state_sink); list_remove(&sink->entry); - heap_free(sink); + free(sink); break; } } @@ -868,7 +865,7 @@ static ULONG WINAPI clock_timer_Release(IUnknown *iface) { IMFAsyncResult_Release(timer->result); IMFAsyncCallback_Release(timer->callback); - heap_free(timer); + free(timer); } return refcount; @@ -890,12 +887,12 @@ static HRESULT WINAPI present_clock_timer_SetTimer(IMFTimer *iface, DWORD flags, TRACE("%p, %#x, %s, %p, %p, %p.\n", iface, flags, debugstr_time(time), callback, state, cancel_key); - if (!(clock_timer = heap_alloc_zero(sizeof(*clock_timer)))) + if (!(clock_timer = calloc(1, sizeof(*clock_timer)))) return E_OUTOFMEMORY; if (FAILED(hr = MFCreateAsyncResult(NULL, NULL, state, &clock_timer->result))) { - heap_free(clock_timer); + free(clock_timer); return hr; } @@ -1140,8 +1137,7 @@ HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock) TRACE("%p.\n", clock); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFPresentationClock_iface.lpVtbl = &presentationclockvtbl; diff --git a/dlls/mf/copier.c b/dlls/mf/copier.c index 1a07d6abefd..b05ae3383ab 100644 --- a/dlls/mf/copier.c +++ b/dlls/mf/copier.c @@ -23,7 +23,6 @@ #include "mf_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -92,7 +91,7 @@ static ULONG WINAPI sample_copier_transform_Release(IMFTransform *iface) if (transform->buffer_type) IMFMediaType_Release(transform->buffer_type); DeleteCriticalSection(&transform->cs); - heap_free(transform); + free(transform); } return refcount; @@ -576,8 +575,7 @@ HRESULT WINAPI MFCreateSampleCopierMFT(IMFTransform **transform) TRACE("%p.\n", transform); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFTransform_iface.lpVtbl = &sample_copier_transform_vtbl; diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 6a4332965b6..d048ea59681 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -286,7 +286,7 @@ static ULONG WINAPI video_stream_sink_Release(IMFStreamSink *iface) if (stream->allocator) IMFVideoSampleAllocator_Release(stream->allocator); DeleteCriticalSection(&stream->cs); - heap_free(stream); + free(stream); } return refcount; @@ -1053,7 +1053,7 @@ static HRESULT video_renderer_stream_create(struct video_renderer *renderer, uns unsigned int value; HRESULT hr; - if (!(stream = heap_alloc_zero(sizeof(*stream)))) + if (!(stream = calloc(1, sizeof(*stream)))) return E_OUTOFMEMORY; stream->IMFStreamSink_iface.lpVtbl = &video_stream_sink_vtbl; @@ -1179,7 +1179,7 @@ static ULONG WINAPI video_renderer_sink_Release(IMFMediaSink *iface) if (renderer->attributes) IMFAttributes_Release(renderer->attributes); DeleteCriticalSection(&renderer->cs); - heap_free(renderer); + free(renderer); } return refcount; @@ -1456,7 +1456,7 @@ static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) IMFMediaSink_Release(iface); renderer->streams[i] = NULL; } - heap_free(renderer->streams); + free(renderer->streams); renderer->stream_count = 0; renderer->stream_size = 0; IMFMediaEventQueue_Shutdown(renderer->event_queue); @@ -1637,8 +1637,8 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) /* Create stream sinks for inputs that mixer already has by default. */ if (SUCCEEDED(IMFTransform_GetStreamCount(renderer->mixer, &input_count, &output_count))) { - ids = heap_calloc(input_count, sizeof(*ids)); - oids = heap_calloc(output_count, sizeof(*oids)); + ids = calloc(input_count, sizeof(*ids)); + oids = calloc(output_count, sizeof(*oids)); if (ids && oids) { @@ -1652,8 +1652,8 @@ static HRESULT video_renderer_configure_mixer(struct video_renderer *renderer) } - heap_free(ids); - heap_free(oids); + free(ids); + free(oids); } } @@ -2766,7 +2766,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, TRACE("%p, %p, %p.\n", attributes, user_context, obj); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaSink_iface.lpVtbl = &video_renderer_sink_vtbl; diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 236bc45c9ec..acbb8377e52 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -29,7 +29,6 @@ #include "mf_private.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -93,7 +92,7 @@ static ULONG WINAPI activate_object_Release(IMFActivate *iface) if (activate->object) IUnknown_Release(activate->object); IMFAttributes_Release(activate->attributes); - heap_free(activate); + free(activate); } return refcount; @@ -461,15 +460,14 @@ HRESULT create_activation_object(void *context, const struct activate_funcs *fun struct activate_object *object; HRESULT hr; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFActivate_iface.lpVtbl = &activate_object_vtbl; object->refcount = 1; if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) { - heap_free(object); + free(object); return hr; } object->funcs = funcs; @@ -620,12 +618,12 @@ static ULONG WINAPI file_scheme_handler_Release(IMFSchemeHandler *iface) IMFAsyncResult_Release(result->result); if (result->object) IUnknown_Release(result->object); - heap_free(result); + free(result); } DeleteCriticalSection(&handler->cs); if (handler->resolver) IMFSourceResolver_Release(handler->resolver); - heap_free(handler); + free(handler); } return refcount; @@ -683,8 +681,8 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) { if (context->props) IPropertyStore_Release(context->props); - heap_free(context->url); - heap_free(context); + free(context->url); + free(context); } return refcount; @@ -697,23 +695,6 @@ static const IUnknownVtbl create_object_context_vtbl = create_object_context_Release, }; -static WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret = NULL; - - if (str) - { - unsigned int size; - - size = (lstrlenW(str) + 1) * sizeof(WCHAR); - ret = heap_alloc(size); - if (ret) - memcpy(ret, str, size); - } - - return ret; -} - static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *iface, const WCHAR *url, DWORD flags, IPropertyStore *props, IUnknown **cancel_cookie, IMFAsyncCallback *callback, IUnknown *state) { @@ -730,8 +711,7 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) return hr; - context = heap_alloc(sizeof(*context)); - if (!context) + if (!(context = malloc(sizeof(*context)))) { IMFAsyncResult_Release(caller); return E_OUTOFMEMORY; @@ -743,7 +723,7 @@ static HRESULT WINAPI file_scheme_handler_BeginCreateObject(IMFSchemeHandler *if if (context->props) IPropertyStore_AddRef(context->props); context->flags = flags; - context->url = heap_strdupW(url); + context->url = wcsdup(url); if (!context->url) { IMFAsyncResult_Release(caller); @@ -800,7 +780,7 @@ static HRESULT WINAPI file_scheme_handler_EndCreateObject(IMFSchemeHandler *ifac *object = found->object; hr = IMFAsyncResult_GetStatus(found->result); IMFAsyncResult_Release(found->result); - heap_free(found); + free(found); } else { @@ -838,7 +818,7 @@ static HRESULT WINAPI file_scheme_handler_CancelObjectCreation(IMFSchemeHandler IMFAsyncResult_Release(found->result); if (found->object) IUnknown_Release(found->object); - heap_free(found); + free(found); } return found ? S_OK : MF_E_UNEXPECTED; @@ -957,7 +937,7 @@ static HRESULT WINAPI file_scheme_handler_callback_Invoke(IMFAsyncCallback *ifac } } - handler_result = heap_alloc(sizeof(*handler_result)); + handler_result = malloc(sizeof(*handler_result)); if (handler_result) { handler_result->result = caller; @@ -1000,8 +980,7 @@ static HRESULT file_scheme_handler_construct(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - handler = heap_alloc_zero(sizeof(*handler)); - if (!handler) + if (!(handler = calloc(1, sizeof(*handler)))) return E_OUTOFMEMORY; handler->IMFSchemeHandler_iface.lpVtbl = &file_scheme_handler_vtbl; @@ -1098,8 +1077,7 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned int i, index; WCHAR *buffW; - buffW = heap_calloc(maxlen, sizeof(*buffW)); - if (!buffW) + if (!(buffW = calloc(maxlen, sizeof(*buffW)))) return E_OUTOFMEMORY; memset(dst, 0, sizeof(*dst)); @@ -1135,7 +1113,7 @@ static HRESULT mf_get_handler_strings(const WCHAR *path, WCHAR filter, unsigned if (FAILED(hr)) PropVariantClear(dst); - heap_free(buffW); + free(buffW); return hr; } @@ -1276,7 +1254,7 @@ static ULONG WINAPI simple_type_handler_Release(IMFMediaTypeHandler *iface) if (handler->media_type) IMFMediaType_Release(handler->media_type); DeleteCriticalSection(&handler->cs); - heap_free(handler); + free(handler); } return refcount; @@ -1410,8 +1388,7 @@ HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler) TRACE("%p.\n", handler); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaTypeHandler_iface.lpVtbl = &simple_type_handler_vtbl; diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index cc270a8cf57..2f81eaa13b0 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -20,7 +20,6 @@ #include "mfidl.h" #include "mfapi.h" -#include "wine/heap.h" #include "wine/debug.h" static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) @@ -41,7 +40,7 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co if (new_capacity < count) new_capacity = max_capacity; - if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + if (!(new_elements = realloc(*elements, new_capacity * size))) return FALSE; *elements = new_elements; diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 4a0be291015..e0287e1e1db 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -24,7 +24,6 @@ #include "mf_private.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -105,7 +104,7 @@ static void sample_grabber_free_private(void *user_context) struct sample_grabber_activate_context *context = user_context; IMFMediaType_Release(context->media_type); IMFSampleGrabberSinkCallback_Release(context->callback); - heap_free(context); + free(context); } static struct sample_grabber *impl_from_IMFMediaSink(IMFMediaSink *iface) @@ -194,7 +193,7 @@ static void stream_release_pending_item(struct scheduled_item *item) PropVariantClear(&item->u.marker.context); break; } - heap_free(item); + free(item); } static ULONG WINAPI sample_grabber_stream_Release(IMFStreamSink *iface) @@ -386,7 +385,7 @@ static HRESULT stream_queue_sample(struct sample_grabber *grabber, IMFSample *sa if (FAILED(hr = IMFSample_GetSampleTime(sample, &sampletime))) return hr; - if (!(item = heap_alloc_zero(sizeof(*item)))) + if (!(item = calloc(1, sizeof(*item)))) return E_OUTOFMEMORY; item->type = ITEM_TYPE_SAMPLE; @@ -467,7 +466,7 @@ static HRESULT stream_place_marker(struct sample_grabber *grabber, MFSTREAMSINK_ return S_OK; } - if (!(item = heap_alloc_zero(sizeof(*item)))) + if (!(item = calloc(1, sizeof(*item)))) return E_OUTOFMEMORY; item->type = ITEM_TYPE_MARKER; @@ -866,7 +865,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFAttributes_Release(grabber->sample_attributes); sample_grabber_release_pending_items(grabber); DeleteCriticalSection(&grabber->cs); - heap_free(grabber); + free(grabber); } return refcount; @@ -1401,8 +1400,7 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use if (FAILED(IMFMediaType_GetMajorType(context->media_type, &guid))) return MF_E_INVALIDMEDIATYPE; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaSink_iface.lpVtbl = &sample_grabber_sink_vtbl; @@ -1478,8 +1476,7 @@ HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type, IMFSa if (!media_type || !callback || !activate) return E_POINTER; - context = heap_alloc_zero(sizeof(*context)); - if (!context) + if (!(context = calloc(1, sizeof(*context)))) return E_OUTOFMEMORY; context->media_type = media_type; diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 9030b3a81c0..77cbfcb21da 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -26,7 +26,6 @@ #include "audioclient.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -121,7 +120,7 @@ static void release_pending_object(struct queued_object *object) PropVariantClear(&object->u.marker.context); break; } - heap_free(object); + free(object); } static struct audio_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) @@ -279,7 +278,7 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) audio_renderer_release_audio_client(renderer); CloseHandle(renderer->buffer_ready_event); DeleteCriticalSection(&renderer->cs); - heap_free(renderer); + free(renderer); } return refcount; @@ -1332,7 +1331,7 @@ static HRESULT stream_queue_sample(struct audio_renderer *renderer, IMFSample *s { struct queued_object *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->type = OBJECT_TYPE_SAMPLE; @@ -1372,7 +1371,7 @@ static HRESULT stream_place_marker(struct audio_renderer *renderer, MFSTREAMSINK struct queued_object *marker; HRESULT hr = S_OK; - if (!(marker = heap_alloc_zero(sizeof(*marker)))) + if (!(marker = calloc(1, sizeof(*marker)))) return E_OUTOFMEMORY; marker->type = OBJECT_TYPE_MARKER; @@ -1843,7 +1842,7 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, TRACE("%p, %p, %p.\n", attributes, user_context, obj); - if (!(renderer = heap_alloc_zero(sizeof(*renderer)))) + if (!(renderer = calloc(1, sizeof(*renderer)))) return E_OUTOFMEMORY; renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl; diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 24aae77ac3a..8d9325abc53 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -28,7 +28,6 @@ #include "evr.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" #include "mf_private.h" @@ -431,7 +430,7 @@ static ULONG WINAPI session_op_Release(IUnknown *iface) default: ; } - heap_free(op); + free(op); } return refcount; @@ -448,7 +447,7 @@ static HRESULT create_session_op(enum session_command command, struct session_op { struct session_op *op; - if (!(op = heap_alloc_zero(sizeof(*op)))) + if (!(op = calloc(1, sizeof(*op)))) return E_OUTOFMEMORY; op->IUnknown_iface.lpVtbl = &session_op_vtbl; @@ -511,7 +510,7 @@ static void session_clear_topologies(struct media_session *session) { list_remove(&ptr->entry); IMFTopology_Release(ptr->topology); - heap_free(ptr); + free(ptr); } } @@ -640,7 +639,7 @@ static void transform_release_sample(struct sample *sample) list_remove(&sample->entry); if (sample->sample) IMFSample_Release(sample->sample); - heap_free(sample); + free(sample); } static void transform_stream_drop_samples(struct transform_stream *stream) @@ -666,10 +665,10 @@ static void release_topo_node(struct topo_node *node) transform_stream_drop_samples(&node->u.transform.inputs[i]); for (i = 0; i < node->u.transform.output_count; ++i) transform_stream_drop_samples(&node->u.transform.outputs[i]); - heap_free(node->u.transform.inputs); - heap_free(node->u.transform.outputs); - heap_free(node->u.transform.input_map); - heap_free(node->u.transform.output_map); + free(node->u.transform.inputs); + free(node->u.transform.outputs); + free(node->u.transform.input_map); + free(node->u.transform.output_map); break; case MF_TOPOLOGY_OUTPUT_NODE: if (node->u.sink.allocator) @@ -688,7 +687,7 @@ static void release_topo_node(struct topo_node *node) IUnknown_Release(node->object.object); if (node->node) IMFTopologyNode_Release(node->node); - heap_free(node); + free(node); } static void session_shutdown_current_topology(struct media_session *session) @@ -771,7 +770,7 @@ static void session_clear_presentation(struct media_session *session) IMFMediaSource_Release(source->source); if (source->pd) IMFPresentationDescriptor_Release(source->pd); - heap_free(source); + free(source); } LIST_FOR_EACH_ENTRY_SAFE(node, node2, &session->presentation.nodes, struct topo_node, entry) @@ -790,7 +789,7 @@ static void session_clear_presentation(struct media_session *session) IMFMediaSinkPreroll_Release(sink->preroll); if (sink->event_generator) IMFMediaEventGenerator_Release(sink->event_generator); - heap_free(sink); + free(sink); } } @@ -1078,7 +1077,7 @@ static void session_release_media_source(struct media_source *source) IMFMediaSource_Release(source->source); if (source->pd) IMFPresentationDescriptor_Release(source->pd); - heap_free(source); + free(source); } static HRESULT session_add_media_source(struct media_session *session, IMFTopologyNode *node, IMFMediaSource *source) @@ -1089,7 +1088,7 @@ static HRESULT session_add_media_source(struct media_session *session, IMFTopolo if (session_get_media_source(session, source)) return S_FALSE; - if (!(media_source = heap_alloc_zero(sizeof(*media_source)))) + if (!(media_source = calloc(1, sizeof(*media_source)))) return E_OUTOFMEMORY; media_source->source = source; @@ -1150,7 +1149,7 @@ static HRESULT session_add_media_sink(struct media_session *session, IMFTopology return S_FALSE; } - if (!(media_sink = heap_alloc_zero(sizeof(*media_sink)))) + if (!(media_sink = calloc(1, sizeof(*media_sink)))) return E_OUTOFMEMORY; media_sink->sink = sink; @@ -1188,14 +1187,14 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) hr = IMFTransform_GetStreamCount(node->object.transform, &input_count, &output_count); if (SUCCEEDED(hr) && (input_count > 1 || output_count > 1)) { - input_map = heap_calloc(input_count, sizeof(*input_map)); - output_map = heap_calloc(output_count, sizeof(*output_map)); + input_map = calloc(input_count, sizeof(*input_map)); + output_map = calloc(output_count, sizeof(*output_map)); if (FAILED(IMFTransform_GetStreamIDs(node->object.transform, input_count, input_map, output_count, output_map))) { /* Assume sequential identifiers. */ - heap_free(input_map); - heap_free(output_map); + free(input_map); + free(output_map); input_map = output_map = NULL; } } @@ -1205,13 +1204,13 @@ static HRESULT session_set_transform_stream_info(struct topo_node *node) node->u.transform.input_map = input_map; node->u.transform.output_map = output_map; - streams = heap_calloc(input_count, sizeof(*streams)); + streams = calloc(input_count, sizeof(*streams)); for (i = 0; i < input_count; ++i) list_init(&streams[i].samples); node->u.transform.inputs = streams; node->u.transform.input_count = input_count; - streams = heap_calloc(output_count, sizeof(*streams)); + streams = calloc(output_count, sizeof(*streams)); for (i = 0; i < output_count; ++i) { list_init(&streams[i].samples); @@ -1306,7 +1305,7 @@ static HRESULT session_append_node(struct media_session *session, IMFTopologyNod IMFStreamDescriptor *sd; HRESULT hr = S_OK; - if (!(topo_node = heap_alloc_zero(sizeof(*topo_node)))) + if (!(topo_node = calloc(1, sizeof(*topo_node)))) return E_OUTOFMEMORY; IMFTopologyNode_GetNodeType(node, &topo_node->type); @@ -1573,7 +1572,7 @@ static void session_set_topology(struct media_session *session, DWORD flags, IMF { struct queued_topology *queued_topology; - if ((queued_topology = heap_alloc_zero(sizeof(*queued_topology)))) + if ((queued_topology = calloc(1, sizeof(*queued_topology)))) { queued_topology->topology = topology; IMFTopology_AddRef(queued_topology->topology); @@ -1655,7 +1654,7 @@ static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) if (session->quality_manager) IMFQualityManager_Release(session->quality_manager); DeleteCriticalSection(&session->cs); - heap_free(session); + free(session); } return refcount; @@ -2596,7 +2595,7 @@ static void session_set_sink_stream_state(struct media_session *session, IMFStre static struct sample *transform_create_sample(IMFSample *sample) { - struct sample *sample_entry = heap_alloc_zero(sizeof(*sample_entry)); + struct sample *sample_entry = calloc(1, sizeof(*sample_entry)); if (sample_entry) { @@ -2660,7 +2659,7 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, unsigned int i; HRESULT hr = E_UNEXPECTED; - if (!(buffers = heap_calloc(node->u.transform.output_count, sizeof(*buffers)))) + if (!(buffers = calloc(node->u.transform.output_count, sizeof(*buffers)))) return E_OUTOFMEMORY; for (i = 0; i < node->u.transform.output_count; ++i) @@ -2703,7 +2702,7 @@ static HRESULT transform_node_pull_samples(const struct media_session *session, IMFSample_Release(buffers[i].pSample); } - heap_free(buffers); + free(buffers); return hr; } @@ -3611,8 +3610,7 @@ HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **ses TRACE("%p, %p.\n", config, session); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; @@ -3749,7 +3747,7 @@ static ULONG WINAPI standard_quality_manager_Release(IMFQualityManager *iface) if (manager->topology) IMFTopology_Release(manager->topology); DeleteCriticalSection(&manager->cs); - heap_free(manager); + free(manager); } return refcount; @@ -3941,8 +3939,7 @@ HRESULT WINAPI MFCreateStandardQualityManager(IMFQualityManager **manager) TRACE("%p.\n", manager); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFQualityManager_iface.lpVtbl = &standard_quality_manager_vtbl; diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index a054eca27e1..f97c0cc75d3 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -256,7 +256,7 @@ static void topology_clear(struct topology *topology) topology_node_disconnect(topology->nodes.nodes[i]); IMFTopologyNode_Release(&topology->nodes.nodes[i]->IMFTopologyNode_iface); } - heap_free(topology->nodes.nodes); + free(topology->nodes.nodes); topology->nodes.nodes = NULL; topology->nodes.count = 0; topology->nodes.size = 0; @@ -274,7 +274,7 @@ static ULONG WINAPI topology_Release(IMFTopology *iface) if (topology->attributes) IMFAttributes_Release(topology->attributes); topology_clear(topology); - heap_free(topology); + free(topology); } return refcount; @@ -885,8 +885,7 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) if (!topology) return E_POINTER; - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFTopology_iface.lpVtbl = &topologyvtbl; @@ -961,11 +960,11 @@ static ULONG WINAPI topology_node_Release(IMFTopologyNode *iface) if (node->outputs.streams[i].preferred_type) IMFMediaType_Release(node->outputs.streams[i].preferred_type); } - heap_free(node->inputs.streams); - heap_free(node->outputs.streams); + free(node->inputs.streams); + free(node->outputs.streams); IMFAttributes_Release(node->attributes); DeleteCriticalSection(&node->cs); - heap_free(node); + free(node); } return refcount; @@ -1767,8 +1766,7 @@ static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_ { HRESULT hr; - *node = heap_alloc_zero(sizeof(**node)); - if (!*node) + if (!(*node = calloc(1, sizeof(**node)))) return E_OUTOFMEMORY; (*node)->IMFTopologyNode_iface.lpVtbl = &topologynodevtbl; @@ -1777,7 +1775,7 @@ static HRESULT create_topology_node(MF_TOPOLOGY_TYPE node_type, struct topology_ hr = MFCreateAttributes(&(*node)->attributes, 0); if (FAILED(hr)) { - heap_free(*node); + free(*node); return hr; } (*node)->id = ((TOPOID)GetCurrentProcessId() << 32) | InterlockedIncrement(&next_node_id); @@ -1931,9 +1929,7 @@ static ULONG WINAPI topology_loader_Release(IMFTopoLoader *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) - { - heap_free(loader); - } + free(loader); return refcount; } @@ -2692,8 +2688,7 @@ HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader) if (!loader) return E_POINTER; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFTopoLoader_iface.lpVtbl = &topologyloadervtbl; @@ -2751,9 +2746,7 @@ static ULONG WINAPI seq_source_Release(IMFSequencerSource *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) - { - heap_free(seq_source); - } + free(seq_source); return refcount; } @@ -2855,8 +2848,7 @@ HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource ** if (!seq_source) return E_POINTER; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFSequencerSource_iface.lpVtbl = &seqsourcevtbl; -- 2.30.2

1 0

[PATCH 1/6] hidclass.sys: Simplify signed / unsigned item value parsing.
by Rémi Bernon 17 Jun '21

17 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 109 ++++++++++++++------------------- 1 file changed, 46 insertions(+), 63 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 65c2f9aadae..cf0e8436b91 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -256,29 +256,6 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) } } -static int getValue(int bsize, int source, BOOL allow_negative) -{ - int mask = 0xff; - int negative = 0x80; - int outofrange = 0x100; - int value; - unsigned int i; - - if (bsize == 4) - return source; - - for (i = 1; i < bsize; i++) - { - mask = (mask<<8) + 0xff; - negative = (negative<<8); - outofrange = (outofrange<<8); - } - value = (source&mask); - if (allow_negative && value&negative) - value = -1 * (outofrange - value); - return value; -} - static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, unsigned int *feature_index, struct feature *feature) @@ -342,17 +319,35 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l int usages_top = 0; USAGE usages[256]; int i; + UINT32 value; + INT32 signed_value; for (i = index; i < length;) { BYTE b0 = descriptor[i++]; - int bSize = b0 & 0x03; + int size = b0 & 0x03; int bType = (b0 >> 2) & 0x03; int bTag = (b0 >> 4) & 0x0F; - bSize = (bSize == 3) ? 4 : bSize; - if (bType == TAG_TYPE_RESERVED && bTag == 0x0F && bSize == 2 && - i + 2 < length) + if (size == 3) size = 4; + if (length - i < size) + { + ERR("Need %d bytes to read item value\n", size); + return -1; + } + + if (size == 0) signed_value = value = 0; + else if (size == 1) signed_value = (INT8)(value = *(UINT8 *)(descriptor + i)); + else if (size == 2) signed_value = (INT16)(value = *(UINT16 *)(descriptor + i)); + else if (size == 4) signed_value = (INT32)(value = *(UINT32 *)(descriptor + i)); + else + { + ERR("Unexpected item value size %d.\n", size); + return -1; + } + i += size; + + if (bType == TAG_TYPE_RESERVED && bTag == 0x0F && size == 2) { /* Long data items: Should be unused */ ERR("Long Data Item, should be unused\n"); @@ -360,19 +355,9 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l } else { - int bSizeActual = 0; - int itemVal = 0; unsigned int j; - for (j = 0; j < bSize; j++) - { - if (i + j < length) - { - itemVal += descriptor[i + j] << (8 * j); - bSizeActual++; - } - } - TRACE(" 0x%x[%i], type %i , tag %i, size %i, val %i\n",b0,i-1,bType, bTag, bSize, itemVal ); + TRACE(" 0x%x[%i], type %i , tag %i, size %i, val %i\n",b0,i-size-1,bType, bTag, size, value ); if (bType == TAG_TYPE_MAIN) { @@ -392,7 +377,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l feature->type = HidP_Output; else feature->type = HidP_Feature; - parse_io_feature(bSize, itemVal, bTag, feature_index, feature); + parse_io_feature(size, value, bTag, feature_index, feature); if (j < usages_top) caps->NotRange.Usage = usages[j]; feature->caps = *caps; @@ -429,9 +414,9 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l list_init(&subcollection->collections); new_caps(caps); - parse_collection(bSize, itemVal, subcollection); + parse_collection(size, value, subcollection); - if ((i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, stack)) < 0) return i; + if ((i = parse_descriptor(descriptor, i, length, feature_index, collection_index, subcollection, caps, stack)) < 0) return i; continue; } case TAG_MAIN_END_COLLECTION: @@ -446,34 +431,34 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l switch(bTag) { case TAG_GLOBAL_USAGE_PAGE: - caps->UsagePage = getValue(bSize, itemVal, FALSE); + caps->UsagePage = value; break; case TAG_GLOBAL_LOGICAL_MINIMUM: - caps->LogicalMin = getValue(bSize, itemVal, TRUE); + caps->LogicalMin = signed_value; break; case TAG_GLOBAL_LOGICAL_MAXIMUM: - caps->LogicalMax = getValue(bSize, itemVal, TRUE); + caps->LogicalMax = signed_value; break; case TAG_GLOBAL_PHYSICAL_MINIMUM: - caps->PhysicalMin = getValue(bSize, itemVal, TRUE); + caps->PhysicalMin = signed_value; break; case TAG_GLOBAL_PHYSICAL_MAXIMUM: - caps->PhysicalMax = getValue(bSize, itemVal, TRUE); + caps->PhysicalMax = signed_value; break; case TAG_GLOBAL_UNIT_EXPONENT: - caps->UnitsExp = getValue(bSize, itemVal, TRUE); + caps->UnitsExp = signed_value; break; case TAG_GLOBAL_UNIT: - caps->Units = getValue(bSize, itemVal, TRUE); + caps->Units = signed_value; break; case TAG_GLOBAL_REPORT_SIZE: - caps->BitSize = getValue(bSize, itemVal, FALSE); + caps->BitSize = value; break; case TAG_GLOBAL_REPORT_ID: - caps->ReportID = getValue(bSize, itemVal, FALSE); + caps->ReportID = value; break; case TAG_GLOBAL_REPORT_COUNT: - caps->ReportCount = getValue(bSize, itemVal, FALSE); + caps->ReportCount = value; break; case TAG_GLOBAL_PUSH: { @@ -521,44 +506,44 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l } else { - usages[usages_top++] = getValue(bSize, itemVal, FALSE); + usages[usages_top++] = value; caps->IsRange = FALSE; } break; case TAG_LOCAL_USAGE_MINIMUM: - caps->Range.UsageMin = getValue(bSize, itemVal, FALSE); + caps->Range.UsageMin = value; caps->IsRange = TRUE; break; case TAG_LOCAL_USAGE_MAXIMUM: - caps->Range.UsageMax = getValue(bSize, itemVal, FALSE); + caps->Range.UsageMax = value; caps->IsRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_INDEX: - caps->NotRange.DesignatorIndex = getValue(bSize, itemVal, FALSE); + caps->NotRange.DesignatorIndex = value; caps->IsDesignatorRange = FALSE; break; case TAG_LOCAL_DESIGNATOR_MINIMUM: - caps->Range.DesignatorMin = getValue(bSize, itemVal, FALSE); + caps->Range.DesignatorMin = value; caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_DESIGNATOR_MAXIMUM: - caps->Range.DesignatorMax = getValue(bSize, itemVal, FALSE); + caps->Range.DesignatorMax = value; caps->IsDesignatorRange = TRUE; break; case TAG_LOCAL_STRING_INDEX: - caps->NotRange.StringIndex = getValue(bSize, itemVal, FALSE); + caps->NotRange.StringIndex = value; caps->IsStringRange = FALSE; break; case TAG_LOCAL_STRING_MINIMUM: - caps->Range.StringMin = getValue(bSize, itemVal, FALSE); + caps->Range.StringMin = value; caps->IsStringRange = TRUE; break; case TAG_LOCAL_STRING_MAXIMUM: - caps->Range.StringMax = getValue(bSize, itemVal, FALSE); + caps->Range.StringMax = value; caps->IsStringRange = TRUE; break; case TAG_LOCAL_DELIMITER: - FIXME("delimiter %d not implemented!\n", itemVal); + FIXME("delimiter %d not implemented!\n", value); return -1; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); @@ -570,8 +555,6 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); return -1; } - - i += bSize; } } return i; -- 2.31.0

2 7

[PATCH v6] iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo.
by Yeshun Ye 17 Jun '21

17 Jun '21

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++++- dlls/iphlpapi/tests/iphlpapi.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 09414d26dde..21edd9ee128 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -706,9 +706,16 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) DWORD i; PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList; BOOL firstIPAddr = TRUE; + NET_LUID luid; + GUID guid; /* on Win98 this is left empty, but whatever */ - getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); + ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr->AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..b6e62138256 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1115,6 +1115,9 @@ static void testGetAdaptersInfo(void) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); + NET_LUID luid; + GUID guid; + char AdapterName[ARRAY_SIZE(ptr->AdapterName)]; apiReturn = GetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, @@ -1122,6 +1125,13 @@ static void testGetAdaptersInfo(void) apiReturn); ptr = buf; while (ptr) { + ConvertInterfaceIndexToLuid(ptr->Index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcmp(ptr->AdapterName, AdapterName), "expected '%s' got '%s'\n", ptr->AdapterName, AdapterName); ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n"); -- 2.20.1

2 1

[PATCH v3] winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Giovanni Mascellani 17 Jun '21

17 Jun '21

The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- Currently MFVideoRotationFormat_0 is always set, because I couldn't find anyway to query this property in GStreamer. The obvious place for this metadata item would probably be GstVideoInfo, but I cannot see anything related there. Can some GStreamer wizard help? v2: * add test; * reformat enumeration in a way which, I hope, is more correct. v3: * tweak enumeration again. dlls/mfplat/tests/mfplat.c | 7 +++++++ dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ff24c2c0ec0..f1c041b7eb4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -664,6 +664,7 @@ static void test_source_resolver(void) HRESULT hr; GUID guid; float rate; + UINT32 rotation; if (!pMFCreateSourceResolver) { @@ -849,6 +850,12 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "Failed to get rotation, hr %#x.\n", hr); + if (hr == S_OK) + ok(rotation == MFVideoRotationFormat_0, "Got wrong rotation %u.\n", rotation); + IMFMediaType_Release(media_type); hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..04431648842 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,14 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat +{ + MFVideoRotationFormat_0 = 0, + MFVideoRotationFormat_90 = 1, + MFVideoRotationFormat_180 = 2, + MFVideoRotationFormat_270 = 3 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001, -- 2.32.0

1 0

[PATCH v2] winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Giovanni Mascellani 17 Jun '21

17 Jun '21

The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- The same attribute is also set by Windows for media sources obtained from the standard source resolver. Currently MFVideoRotationFormat_0 is always set, because I couldn't find anyway to query this property in GStreamer. The obvious place for this metadata item would probably be GstVideoInfo, but I cannot see anything related there. Can some GStreamer wizard help? v2: * add test; * reformat enumeration in a way which, I hope, is more correct. dlls/mfplat/tests/mfplat.c | 7 +++++++ dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ff24c2c0ec0..f1c041b7eb4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -664,6 +664,7 @@ static void test_source_resolver(void) HRESULT hr; GUID guid; float rate; + UINT32 rotation; if (!pMFCreateSourceResolver) { @@ -849,6 +850,12 @@ static void test_source_resolver(void) ok(hr == S_OK, "Failed to get media sub type, hr %#x.\n", hr); todo_wine ok(IsEqualGUID(&guid, &MFVideoFormat_M4S2), "Unexpected sub type %s.\n", debugstr_guid(&guid)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_VIDEO_ROTATION, &rotation); + ok(hr == S_OK || broken(hr == MF_E_ATTRIBUTENOTFOUND) /* Win7 */, "Failed to get rotation, hr %#x.\n", hr); + if (hr == S_OK) + ok(rotation == MFVideoRotationFormat_0, "Got wrong rotation %u.\n", rotation); + IMFMediaType_Release(media_type); hr = IMFPresentationDescriptor_SelectStream(descriptor, 0); diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..28798f734a5 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,13 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat { + MFVideoRotationFormat_0 = 0, + MFVideoRotationFormat_90 = 1, + MFVideoRotationFormat_180 = 2, + MFVideoRotationFormat_270 = 3 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001, -- 2.32.0

2 1

[PATCH v3 1/6] jscript: Parse 'let' and 'const' variable declarations.
by Paul Gofman 16 Jun '21

16 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't allow 'const' variable declaration in compat mode. dlls/jscript/compile.c | 5 +++++ dlls/jscript/lex.c | 2 ++ dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 37 ++++++++++++++++++++++++++++++++----- dlls/jscript/tests/lang.js | 34 ++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 6 files changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9bb9ff13d14..2a17639641f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1138,6 +1138,11 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; + if (iter->block_scope) + FIXME("Block scope variables are not supported.\n"); + if (iter->constant) + FIXME("Constant variables are not supported.\n"); + hres = emit_identifier_ref(ctx, iter->identifier, 0); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index efed1038a95..695615721a7 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -41,6 +41,7 @@ static const struct { {L"break", kBREAK, TRUE}, {L"case", kCASE}, {L"catch", kCATCH}, + {L"const", kCONST}, {L"continue", kCONTINUE, TRUE}, {L"default", kDEFAULT}, {L"delete", kDELETE}, @@ -54,6 +55,7 @@ static const struct { {L"if", kIF}, {L"in", kIN}, {L"instanceof", kINSTANCEOF}, + {L"let", kLET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {L"new", kNEW}, {L"null", kNULL}, {L"return", kRETURN, TRUE}, diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index b88a52af242..c4dd0752ee9 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -95,6 +95,7 @@ literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; typedef struct _variable_declaration_t { const WCHAR *identifier; + BOOL block_scope, constant; expression_t *expr; struct _variable_declaration_t *next; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f11119143b8..fd8ea7e7aa7 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -87,7 +87,7 @@ static variable_list_t *variable_list_add(parser_ctx_t*,variable_list_t*,variabl static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); static statement_t *new_block_statement(parser_ctx_t*,unsigned,statement_list_t*); -static statement_t *new_var_statement(parser_ctx_t*,unsigned,variable_list_t*); +static statement_t *new_var_statement(parser_ctx_t*,BOOL,BOOL,unsigned,variable_list_t*); static statement_t *new_expression_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_if_statement(parser_ctx_t*,unsigned,expression_t*,statement_t*,statement_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,BOOL,expression_t*,statement_t*); @@ -168,8 +168,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kGET kIN kSET -%token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH +%token <identifier> kBREAK kCASE kCATCH kCONST kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR +%token <identifier> kGET kIN kLET kSET kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE +%token <identifier> kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL /* tokens */ @@ -182,6 +183,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <source_elements> FunctionBody %type <statement> Statement %type <statement> Block +%type <statement> LexicalDeclaration %type <statement> VariableStatement %type <statement> EmptyStatement %type <statement> ExpressionStatement @@ -291,6 +293,7 @@ FormalParameterList_opt /* ECMA-262 3rd Edition 12 */ Statement : Block { $$ = $1; } + | LexicalDeclaration { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } | FunctionExpression { $$ = new_expression_statement(ctx, @$, $1); } @@ -322,10 +325,25 @@ Block : '{' StatementList '}' { $$ = new_block_statement(ctx, @2, $2); } | '{' '}' { $$ = new_block_statement(ctx, @$, NULL); } +/* ECMA-262 10th Edition 13.3.1, TODO: BindingList*/ +LexicalDeclaration + : kLET VariableDeclarationList semicolon_opt + { $$ = new_var_statement(ctx, TRUE, FALSE, @$, $2); } + | kCONST VariableDeclarationList semicolon_opt + { + if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("const var declaration in legacy mode.\n", + debugstr_w($1)); + set_error(ctx, @$, JS_E_SYNTAX); + YYABORT; + } + $$ = new_var_statement(ctx, TRUE, TRUE, @$, $2); + } + /* ECMA-262 3rd Edition 12.2 */ VariableStatement : kVAR VariableDeclarationList semicolon_opt - { $$ = new_var_statement(ctx, @$, $2); } + { $$ = new_var_statement(ctx, FALSE, FALSE, @$, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationList @@ -834,6 +852,7 @@ ReservedAsIdentifier : kBREAK { $$ = $1; } | kCASE { $$ = $1; } | kCATCH { $$ = $1; } + | kCONST { $$ = $1; } | kCONTINUE { $$ = $1; } | kDEFAULT { $$ = $1; } | kDELETE { $$ = $1; } @@ -847,6 +866,7 @@ ReservedAsIdentifier | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } + | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } @@ -1144,8 +1164,10 @@ static variable_list_t *variable_list_add(parser_ctx_t *ctx, variable_list_t *li return list; } -static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_list_t *variable_list) +static statement_t *new_var_statement(parser_ctx_t *ctx, BOOL block_scope, BOOL constant, unsigned loc, + variable_list_t *variable_list) { + variable_declaration_t *var; var_statement_t *ret; ret = new_statement(ctx, STAT_VAR, sizeof(*ret), loc); @@ -1153,6 +1175,11 @@ static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_ return NULL; ret->variable_list = variable_list->head; + for (var = ret->variable_list; var; var = var->next) + { + var->block_scope = block_scope; + var->constant = constant; + } return &ret->stat; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9e6e6ad239f..0db86c89985 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -2030,3 +2030,37 @@ Math = 6; ok(Math === 6, "NaN !== 6"); reportSuccess(); + +function test_es5_keywords() { + var let = 1 + var tmp + ok(let == 1, "let != 1"); + + tmp = false + try { + eval('var var = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var var = 1;'"); + + tmp = false + try { + eval('var const = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var const = 1;'"); + + tmp = false + try { + eval('const c1 = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'const c1 = 1;'"); +} +test_es5_keywords(); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7e46848d40e..24906de5231 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1207,3 +1207,20 @@ sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); }); + + +sync_test("declaration_let", function() { + ok(a === undefined, "a is not undefined"); + var a = 3; + + { + let a = 2; + + ok(a == 2, "a != 2"); + + a = 4; + ok(a == 4, "a != 4"); + } + + todo_wine.ok(a == 3, "a != 3"); +}); -- 2.31.1

3 13

[PATCH] shell32: Don't specify the startup directory for CreateProcessW() in SHELL_ExecuteW().
by Paul Gofman 16 Jun '21

16 Jun '21

Doing so fails process creation for relative current directory as the directory already made current. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/shell32/shlexec.c | 17 ++++++----------- dlls/shell32/tests/shlexec.c | 12 ++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index ee1e832df33..49f7867ef7e 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -318,7 +318,6 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, UINT gcdret = 0; WCHAR curdir[MAX_PATH]; DWORD dwCreationFlags; - const WCHAR *lpDirectory = NULL; TRACE("Execute %s from directory %s\n", debugstr_w(lpCmd), debugstr_w(psei->lpDirectory)); @@ -326,17 +325,13 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, * a bad working directory */ if (psei->lpDirectory && psei->lpDirectory[0]) { - DWORD attr = GetFileAttributesW(psei->lpDirectory); - if (attr != INVALID_FILE_ATTRIBUTES && attr & FILE_ATTRIBUTE_DIRECTORY) - lpDirectory = psei->lpDirectory; + /* ShellExecute specifies the command from psei->lpDirectory + * if present. Not from the current dir as CreateProcess does */ + if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir ))) + if( !SetCurrentDirectoryW( psei->lpDirectory )) + ERR("cannot set directory %s\n", debugstr_w(psei->lpDirectory )); } - /* ShellExecute specifies the command from psei->lpDirectory - * if present. Not from the current dir as CreateProcess does */ - if( lpDirectory ) - if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir))) - if( !SetCurrentDirectoryW( lpDirectory)) - ERR("cannot set directory %s\n", debugstr_w(lpDirectory)); ZeroMemory(&startup,sizeof(STARTUPINFOW)); startup.cb = sizeof(STARTUPINFOW); startup.dwFlags = STARTF_USESHOWWINDOW; @@ -345,7 +340,7 @@ static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, if (!(psei->fMask & SEE_MASK_NO_CONSOLE)) dwCreationFlags |= CREATE_NEW_CONSOLE; if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, - lpDirectory, &startup, &info)) + NULL, &startup, &info)) { /* Give 30 seconds to the app to come up, if desired. Probably only needed when starting app immediately before making a DDE connection. */ diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 2481fb6faa2..968953f9abb 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2816,6 +2816,7 @@ static void test_directory(void) char path[MAX_PATH + 10], curdir[MAX_PATH]; char params[1024], dirpath[1024]; INT_PTR rc; + BOOL ret; sprintf(path, "%s\\test2.exe", tmpdir); CopyFileA(argv0, path, FALSE); @@ -2876,7 +2877,18 @@ static void test_directory(void) okChildString("argvA0", path); okChildString("argvA3", "Exec"); okChildPath("longPath", path); + + SetCurrentDirectoryA(tmpdir); + ret = CreateDirectoryA( "tmp", NULL ); + ok(ret || GetLastError() == ERROR_ALREADY_EXISTS, "Failed to create 'tmp' err %u\n", GetLastError()); + rc=shell_execute_ex(SEE_MASK_NOZONECHECKS|SEE_MASK_FLAG_NO_UI, + NULL, path, params, "tmp", NULL); + okShell(rc > 32, "returned %lu\n", rc); + DeleteFileA(path); + + RemoveDirectoryA("tmp"); + SetCurrentDirectoryA(curdir); } START_TEST(shlexec) -- 2.31.1

1 0

[PATCH resend] msdrm: Add stub DRMRegisterContent function.
by Vijay Kiran Kamuju 16 Jun '21

16 Jun '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50595 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Please send the review comments, this just went off the list.

1 0

[PATCH] windowscodecs/tests: Use winetest_push_context for DDS tests.
by Ziqing Hui 16 Jun '21

16 Jun '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 291 ++++++++++++++------------- 1 file changed, 151 insertions(+), 140 deletions(-)

2 1

[PATCH resend 1/5] ntoskrnl.exe/tests: Add tests with and without report IDs.
by Rémi Bernon 16 Jun '21

16 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending to run the tests again. The w864 crash should be fixed but I still expect spurious test failures on w7u_qxl, which sometimes misses bus message arrival, in the PnP driver test so unrelated to these changes, as well as some even less frequent spurious failures. dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- dlls/ntoskrnl.exe/tests/driver_hid.c | 108 +++++++++++++++++---------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 56 +++++++++++--- 3 files changed, 114 insertions(+), 54 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 2f7e27e0d87..5fdaa922f45 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1436,7 +1436,7 @@ @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stdcall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject -@ stdcall -private ZwOpenKey(ptr long ptr) NtOpenKey +@ stdcall ZwOpenKey(ptr long ptr) NtOpenKey @ stdcall -private ZwOpenKeyEx(ptr long ptr long) NtOpenKeyEx @ stdcall -private ZwOpenKeyTransacted(ptr long ptr long) NtOpenKeyTransacted @ stdcall -private ZwOpenKeyTransactedEx(ptr long ptr long long) NtOpenKeyTransactedEx @@ -1476,7 +1476,7 @@ @ stdcall -private ZwQuerySystemInformation(long ptr long ptr) NtQuerySystemInformation @ stdcall -private ZwQuerySystemInformationEx(long ptr long ptr long ptr) NtQuerySystemInformationEx @ stdcall -private ZwQueryTimerResolution(ptr ptr ptr) NtQueryTimerResolution -@ stdcall -private ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey +@ stdcall ZwQueryValueKey(long ptr long ptr long ptr) NtQueryValueKey @ stdcall -private ZwQueryVirtualMemory(long ptr long ptr long ptr) NtQueryVirtualMemory @ stdcall -private ZwQueryVolumeInformationFile(long ptr ptr long long) NtQueryVolumeInformationFile @ stdcall -private ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) NtReadFile diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index 1fe644250f7..3a9f4867de4 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -40,6 +40,7 @@ static UNICODE_STRING control_symlink; static unsigned int got_start_device; +static DWORD report_id; static NTSTATUS WINAPI driver_pnp(DEVICE_OBJECT *device, IRP *irp) { @@ -85,49 +86,54 @@ static NTSTATUS WINAPI driver_power(DEVICE_OBJECT *device, IRP *irp) return PoCallDriver(ext->NextDeviceObject, irp); } -#include "psh_hid_macros.h" - -static const unsigned char report_descriptor[] = +static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) { - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_JOYSTICK), - COLLECTION(1, Application), - USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_X), - USAGE(1, HID_USAGE_GENERIC_Y), - LOGICAL_MINIMUM(1, -128), - LOGICAL_MAXIMUM(1, 127), - REPORT_SIZE(1, 8), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - - USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), - USAGE_MINIMUM(1, 1), - USAGE_MAXIMUM(1, 8), - LOGICAL_MINIMUM(1, 0), - LOGICAL_MAXIMUM(1, 1), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 1), - REPORT_COUNT(1, 8), - REPORT_SIZE(1, 1), - INPUT(1, Data|Var|Abs), - +#include "psh_hid_macros.h" +/* Replace REPORT_ID with USAGE_PAGE when id is 0 */ +#define REPORT_ID_OR_USAGE_PAGE(size, id) SHORT_ITEM_1((id ? 8 : 0), 1, id) + const unsigned char report_descriptor[] = + { USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), - USAGE(1, HID_USAGE_GENERIC_HATSWITCH), - LOGICAL_MINIMUM(1, 1), - LOGICAL_MAXIMUM(1, 8), - PHYSICAL_MINIMUM(1, 0), - PHYSICAL_MAXIMUM(1, 8), - REPORT_SIZE(1, 4), - REPORT_COUNT(1, 2), - INPUT(1, Data|Var|Abs), - END_COLLECTION, -}; - + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Logical), + REPORT_ID_OR_USAGE_PAGE(1, report_id), + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_X), + USAGE(1, HID_USAGE_GENERIC_Y), + LOGICAL_MINIMUM(1, -128), + LOGICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 8), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(1, 8), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 4), + REPORT_COUNT(1, 2), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; +#undef REPORT_ID_OR_USAGE_PAGE #include "pop_hid_macros.h" -static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) -{ static BOOL test_failed; IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); const ULONG in_size = stack->Parameters.DeviceIoControl.InputBufferLength; @@ -202,9 +208,13 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_READ_REPORT: { - ULONG expected_size = 4; + ULONG expected_size = report_id ? 5 : 4; ok(!in_size, "got input size %u\n", in_size); - if (!test_failed) todo_wine ok(out_size == expected_size, "got output size %u\n", out_size); + if (!test_failed) + { + todo_wine_if(!report_id) + ok(out_size == expected_size, "got output size %u\n", out_size); + } if (out_size != expected_size) test_failed = TRUE; ret = STATUS_NOT_IMPLEMENTED; @@ -278,17 +288,33 @@ static void WINAPI driver_unload(DRIVER_OBJECT *driver) NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *registry) { + static const int info_size = offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ); + char buffer[offsetof( KEY_VALUE_PARTIAL_INFORMATION, Data ) + sizeof(DWORD)]; HID_MINIDRIVER_REGISTRATION params = { .Revision = HID_REVISION, .DriverObject = driver, .RegistryPath = registry, }; + UNICODE_STRING name_str; + OBJECT_ATTRIBUTES attr; NTSTATUS ret; + HANDLE hkey; + DWORD size; if ((ret = winetest_init())) return ret; + InitializeObjectAttributes(&attr, registry, 0, NULL, NULL); + ret = ZwOpenKey(&hkey, KEY_ALL_ACCESS, &attr); + ok(!ret, "ZwOpenKey returned %#x\n", ret); + + RtlInitUnicodeString(&name_str, L"ReportID"); + size = info_size + sizeof(report_id); + ret = ZwQueryValueKey(hkey, &name_str, KeyValuePartialInformation, buffer, size, &size); + ok(!ret, "ZwQueryValueKey returned %#x\n", ret); + memcpy(&report_id, buffer + info_size, size - info_size); + driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 4b744d813d8..e9390698fc6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1634,25 +1634,27 @@ static inline void check_hidp_value_caps_(int line, HIDP_VALUE_CAPS *caps, const } } -static void test_hidp(HANDLE file) +static void test_hidp(HANDLE file, int report_id) { - static const HIDP_CAPS expect_hidp_caps = + const HIDP_CAPS expect_hidp_caps = { .Usage = HID_USAGE_GENERIC_JOYSTICK, .UsagePage = HID_USAGE_PAGE_GENERIC, .InputReportByteLength = 5, - .NumberLinkCollectionNodes = 1, + .NumberLinkCollectionNodes = 2, .NumberInputButtonCaps = 1, .NumberInputValueCaps = 3, .NumberInputDataIndices = 11, }; - static const HIDP_BUTTON_CAPS expect_button_caps[] = + const HIDP_BUTTON_CAPS expect_button_caps[] = { { .UsagePage = HID_USAGE_PAGE_BUTTON, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsRange = TRUE, .IsAbsolute = TRUE, .Range.UsageMin = 1, @@ -1661,13 +1663,15 @@ static void test_hidp(HANDLE file) .Range.DataIndexMax = 9, }, }; - static const HIDP_VALUE_CAPS expect_value_caps[] = + const HIDP_VALUE_CAPS expect_value_caps[] = { { .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsAbsolute = TRUE, .BitSize = 8, .ReportCount = 1, @@ -1677,9 +1681,11 @@ static void test_hidp(HANDLE file) }, { .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsAbsolute = TRUE, .BitSize = 8, .ReportCount = 1, @@ -1690,9 +1696,11 @@ static void test_hidp(HANDLE file) }, { .UsagePage = HID_USAGE_PAGE_GENERIC, + .ReportID = report_id, .BitField = 2, .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .LinkCollection = 1, .IsAbsolute = TRUE, .BitSize = 4, .ReportCount = 2, @@ -1709,6 +1717,13 @@ static void test_hidp(HANDLE file) .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, .LinkUsagePage = HID_USAGE_PAGE_GENERIC, .CollectionType = 1, + .NumberOfChildren = 1, + .FirstChild = 1, + }, + { + .LinkUsage = HID_USAGE_GENERIC_JOYSTICK, + .LinkUsagePage = HID_USAGE_PAGE_GENERIC, + .CollectionType = 2, }, }; @@ -1956,20 +1971,26 @@ static void test_hidp(HANDLE file) ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength + 1); ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_InitializeReportForID returned %#x\n", status); + status = HidP_InitializeReportForID(HidP_Input, 1 - report_id, preparsed_data, report, caps.InputReportByteLength); + todo_wine_if(!report_id) + ok(status == HIDP_STATUS_REPORT_DOES_NOT_EXIST, "HidP_InitializeReportForID returned %#x\n", status); memset(report, 0xcd, sizeof(report)); - status = HidP_InitializeReportForID(HidP_Input, 0, preparsed_data, report, caps.InputReportByteLength); + status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength); + todo_wine_if(report_id) ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); memset(buffer, 0xcd, sizeof(buffer)); memset(buffer, 0, caps.InputReportByteLength); + buffer[0] = report_id; + todo_wine_if(report_id) ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); HidD_FreePreparsedData(preparsed_data); CloseHandle(file); } -static void test_hid_device(void) +static void test_hid_device(DWORD report_id) { char buffer[200]; SP_DEVICE_INTERFACE_DETAIL_DATA_A *iface_detail = (void *)buffer; @@ -1984,6 +2005,8 @@ static void test_hid_device(void) HDEVINFO set; HANDLE file; + winetest_push_context("report %d", report_id); + set = SetupDiGetClassDevsA(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); ok(set != INVALID_HANDLE_VALUE, "failed to get device list, error %#x\n", GetLastError()); @@ -2014,7 +2037,7 @@ static void test_hid_device(void) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok(file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError()); - test_hidp(file); + test_hidp(file, report_id); CloseHandle(file); @@ -2022,9 +2045,11 @@ static void test_hid_device(void) InitializeObjectAttributes(&attr, &string, OBJ_CASE_INSENSITIVE, NULL, NULL); status = NtOpenFile(&file, SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); todo_wine ok(status == STATUS_UNSUCCESSFUL, "got %#x\n", status); + + winetest_pop_context(); } -static void test_hid_driver(struct testsign_context *ctx) +static void test_hid_driver(struct testsign_context *ctx, DWORD report_id) { static const char hardware_id[] = "test_hardware_id\0"; char path[MAX_PATH], dest[MAX_PATH], *filepart; @@ -2034,13 +2059,21 @@ static void test_hid_driver(struct testsign_context *ctx) SC_HANDLE manager, service; BOOL ret, need_reboot; HANDLE catalog, file; + LSTATUS status; HDEVINFO set; + HKEY hkey; FILE *f; GetCurrentDirectoryA(ARRAY_SIZE(cwd), cwd); GetTempPathA(ARRAY_SIZE(tempdir), tempdir); SetCurrentDirectoryA(tempdir); + status = RegCreateKeyExW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\winetest", 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!status, "RegCreateKeyExW returned %#x\n", status); + + status = RegSetValueExW(hkey, L"ReportID", 0, REG_DWORD, (void *)&report_id, sizeof(report_id)); + ok(!status, "RegSetValueExW returned %#x\n", status); + load_resource(L"driver_hid.dll", driver_filename); ret = MoveFileExW(driver_filename, L"winetest.sys", MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING); ok(ret, "failed to move file, error %u\n", GetLastError()); @@ -2088,7 +2121,7 @@ static void test_hid_driver(struct testsign_context *ctx) /* Tests. */ - test_hid_device(); + test_hid_device(report_id); /* Clean up. */ @@ -2219,7 +2252,8 @@ START_TEST(ntoskrnl) test_pnp_driver(&ctx); subtest("driver_hid"); - test_hid_driver(&ctx); + test_hid_driver(&ctx, 0); + test_hid_driver(&ctx, 1); out: testsign_cleanup(&ctx); -- 2.31.0

3 12

[PATCH] include: Add IAuthenticateEx interface definition.
by Dmitry Timoshkov 16 Jun '21

16 Jun '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/urlmon.idl | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 867d3ebc959..0aab6588658 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -404,6 +404,37 @@ interface IAuthenticate : IUnknown [out] LPWSTR *pszPassword); } +/***************************************************************************** + * IAuthenticateEx interface + */ +[ + object, + uuid(2ad1edaf-d83d-48b5-9adf-03dbe19f53bd), + pointer_default(unique) +] + +interface IAuthenticateEx : IAuthenticate +{ + typedef [unique] IAuthenticateEx *LPAUTHENTICATIONEX; + + typedef enum { + AUTHENTICATEF_PROXY = 0x00000001, + AUTHENTICATEF_BASIC = 0x00000002, + AUTHENTICATEF_HTTP = 0x00000004 + } AUTHENTICATEF; + + typedef struct _tagAUTHENTICATEINFO { + DWORD dwFlags; + DWORD dwReserved; + } AUTHENTICATEINFO; + + HRESULT AuthenticateEx( + [out] HWND *phwnd, + [out] LPWSTR *pszUsername, + [out] LPWSTR *pszPassword, + [in] AUTHENTICATEINFO *pauthinfo); +} + /***************************************************************************** * IHttpNegotiate interface */ -- 2.31.1

1 0

[PATCH vkd3d 1/9] tests: Add tests for shader float64 instructions.
by Conor McCarthy 16 Jun '21

16 Jun '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 332 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 332 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f289a10d..55c9ca4d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -41,6 +41,11 @@ struct ivec4 int x, y, z, w; }; +struct dvec2 +{ + double x, y; +}; + static bool compare_uvec4(const struct uvec4* v1, const struct uvec4 *v2) { return v1->x == v2->x && v1->y == v2->y && v1->z == v2->z && v1->w == v2->w; @@ -651,6 +656,21 @@ static bool is_memory_pool_L1_supported(ID3D12Device *device) return !architecture.UMA; } +static bool is_shader_float64_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.DoublePrecisionFloatShaderOps; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -7510,6 +7530,7 @@ static void test_shader_instructions(void) D3D12_SHADER_BYTECODE shader; struct test_context context; ID3D12CommandQueue *queue; + bool test_shader_float64; ID3D12Resource *cb; unsigned int i; HRESULT hr; @@ -9054,6 +9075,278 @@ static void test_shader_instructions(void) 0x00100e46, 0x00000001, 0x0100003e, }; static struct named_shader ps_swapc5 = {"swapc5", ps_swapc5_code, sizeof(ps_swapc5_code)}; + static const DWORD ps_dmov_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(-src0.y, dst.x, dst.y); + asuint(-src0.x, dst.z, dst.w); + } +#endif + 0x43425844, 0x16bd7e63, 0x6b535ab7, 0xb7f182c2, 0x6f3819a8, 0x00000001, 0x000000f0, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000e0, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000064, 0x00000050, + 0x00000019, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x070000c7, 0x001000f2, 0x00000000, 0x802084e6, 0x00000041, + 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, + 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dmov = {"dmov", ps_dmov_code, sizeof(ps_dmov_code)}; + static const DWORD ps_dadd_code[] = + { + /* Also test constant double2 vector. */ +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = double2(src0 + 1.0000002433080226l, src0 + 2.000000481493771l); + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0x23e20252, 0xf4d2708e, 0x87956944, 0xc61e7052, 0x00000001, 0x00000100, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000f0, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, + 0x0000001d, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x0b0000bf, 0x001000f2, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00005002, 0x41500000, 0x3ff00000, 0x40a00000, 0x40000000, 0x05000036, 0x001020f2, + 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dadd = {"dadd", ps_dadd_code, sizeof(ps_dadd_code)}; + static const DWORD ps_dmin_dmax_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(min(src0.x, src0.y), dst.x, dst.y); + asuint(max(src0.x, src0.y), dst.z, dst.w); + } +#endif + 0x43425844, 0x6f8b547e, 0x3552757c, 0x92a81fa1, 0x00990b21, 0x00000001, 0x00000130, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000120, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000a4, 0x00000050, + 0x00000029, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c1, 0x00100032, 0x00000000, 0x00208ee6, 0x00000000, + 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, + 0x00000000, 0x090000c0, 0x00100032, 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x00208446, + 0x00000000, 0x00000000, 0x05000036, 0x001020c2, 0x00000000, 0x00100406, 0x00000000, 0x0100003e, + 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dmin_dmax = {"dmin_dmax", ps_dmin_dmax_code, sizeof(ps_dmin_dmax_code)}; + static const DWORD ps_dmovc_code[] = + { +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + asuint(src0 > 1.0 ? src0 : 4.5, dst.x, dst.y); + dst.zw = 0; + } +#endif + 0x43425844, 0x43c017c3, 0x117edcff, 0xd44d42dc, 0xb3affdd5, 0x00000001, 0x00000154, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000144, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000c8, 0x00000050, + 0x00000032, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x0b0000c5, 0x00100012, 0x00000000, 0x00005002, 0x00000000, + 0x3ff00000, 0x00000000, 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x0d0000c8, 0x00100032, + 0x00000000, 0x00100006, 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x00005002, 0x00000000, + 0x40120000, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, + 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dmovc = {"dmovc", ps_dmovc_code, sizeof(ps_dmovc_code)}; + static const DWORD ps_dmodifier_code[] = + { + /* Already tested negation in the dmov test. */ +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + asuint(abs(src0), dst.x, dst.y); + asuint(saturate(src0) + 1.5, dst.z, dst.w); + } +#endif + 0x43425844, 0x15bb537e, 0x47ef3ae3, 0xba88acf7, 0x0b3624e0, 0x00000001, 0x00000144, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000134, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000b8, 0x00000050, + 0x0000002e, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060020c7, 0x00100032, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x0a0000bf, 0x00100032, 0x00000000, 0x00100446, 0x00000000, 0x00005002, 0x00000000, + 0x3ff80000, 0x00000000, 0x00000000, 0x05000036, 0x001020c2, 0x00000000, 0x00100406, 0x00000000, + 0x070000c7, 0x00100032, 0x00000000, 0x80208446, 0x00000081, 0x00000000, 0x00000000, 0x05000036, + 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, + 0x00000000, + }; + static struct named_shader ps_dmodifier = {"dmodifier", ps_dmodifier_code, sizeof(ps_dmodifier_code)}; + static const DWORD ps_deq_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x == src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0x24c9cee6, 0xd38c521f, 0xcde7c8b6, 0xc173a8e3, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c3, 0x00100012, 0x00000000, 0x00208ee6, 0x00000000, + 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_deq = {"deq", ps_deq_code, sizeof(ps_deq_code)}; + static const DWORD ps_dne_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x != src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0x99700929, 0x3b743000, 0xdfc89958, 0xfc2b89ab, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c6, 0x00100012, 0x00000000, 0x00208ee6, 0x00000000, + 0x00000000, 0x00208446, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dne = {"dne", ps_dne_code, sizeof(ps_dne_code)}; + static const DWORD ps_dtou_code[] = + { +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + dst = uint4(src0, -src0, 0, 0); + } +#endif + 0x43425844, 0x6ca74abd, 0xe970e02d, 0xa65b35db, 0xd2f58586, 0x00000001, 0x00000128, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000118, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050, + 0x00000027, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d7, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x070000d7, 0x00100022, 0x00000000, 0x80208446, 0x00000041, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, + 0x00000021, 0x00000000, + }; + static struct named_shader ps_dtou = {"dtou", ps_dtou_code, sizeof(ps_dtou_code)}; + static const DWORD ps_dtoi_code[] = + { +#if 0 + double src0; + + void main(out uint4 dst : SV_Target) + { + dst = int4(src0, -src0, 0, 0); + } +#endif + 0x43425844, 0x38d82727, 0x8666b36c, 0x91954b7e, 0xf376163a, 0x00000001, 0x00000128, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000118, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000009c, 0x00000050, + 0x00000027, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d6, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x070000d6, 0x00100022, 0x00000000, 0x80208446, 0x00000041, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, 0x00000008, + 0x00000021, 0x00000000, + }; + static const struct named_shader ps_dtoi = {"dtoi", ps_dtoi_code, sizeof(ps_dtoi_code)}; + static const DWORD ps_ftod_code[] = + { +#if 0 + float2 src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = double2(src0.x, src0.y); + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0xad43f67d, 0x04a1aba0, 0x253502f1, 0x2c9c1735, 0x00000001, 0x000000ec, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000dc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, + 0x00000018, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000ca, 0x001000f2, 0x00000000, 0x00208046, 0x00000000, + 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_ftod = {"ftod", ps_ftod_code, sizeof(ps_ftod_code)}; + static const DWORD ps_ddiv_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + asuint(src0.x / src0.y, dst.x, dst.y); + dst.zw = 0; + } +#endif + 0x43425844, 0x1c8a3236, 0x400a6b3b, 0x5554bf56, 0x4ff834b8, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000d2, 0x00100032, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x05000036, 0x00102032, 0x00000000, 0x00100046, + 0x00000000, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000021, 0x00000000, + }; + static const struct named_shader ps_ddiv = {"ddiv", ps_ddiv_code, sizeof(ps_ddiv_code)}; + static const DWORD ps_drcp_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + double2 a = rcp(src0); + asuint(a.x, dst.x, dst.y); + asuint(a.y, dst.z, dst.w); + } +#endif + 0x43425844, 0xdcbd25ba, 0x2d5cccb9, 0x84ed8028, 0x3d62632a, 0x00000001, 0x000000ec, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x000000dc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000060, 0x00000050, + 0x00000018, 0x0102186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x060000d4, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, + 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000021, 0x00000000, + }; + static struct named_shader ps_drcp = {"drcp", ps_drcp_code, sizeof(ps_drcp_code)}; static const struct { const struct named_shader *ps; @@ -9290,13 +9583,21 @@ static void test_shader_instructions(void) struct vec4 src1; struct vec4 src2; } f; + struct + { + struct dvec2 src0; + struct dvec2 src1; + struct dvec2 src2; + } d; } input; union { struct uvec4 u; struct ivec4 i; struct vec4 f; + struct dvec2 d; } output; + bool is_float64; bool skip_on_warp; } uint_tests[] = @@ -9526,6 +9827,29 @@ static void test_shader_instructions(void) {&ps_movc, {{{0, 1, 1, 0}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{5, 2, 3, 8}}}, {&ps_movc, {{{1, 1, 1, 1}, {1, 2, 3, 4}, {5, 6, 7, 8}}}, {{1, 2, 3, 4}}}, + {&ps_dmov, {.d = {{2.5 + 1.0e-9, -3.5 - 1.0e-9}}}, {.d = {3.5 + 1.0e-9, -2.5 - 1.0e-9}}, true}, + {&ps_dadd, {.d = {{2.5, 0.0}}}, {.d = {2.5 + 1.0000002433080226, 2.5 + 2.000000481493771}}, true}, + {&ps_dmin_dmax, {.d = {{-1.0, 1.0}}}, {.d = {-1.0, 1.0}}, true}, + {&ps_dmovc, {.d = {{0.5, 0.0}}}, {.d = {4.5}}, true}, + {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5}}, true}, + {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true}, + {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true}, + {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true}, + {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, + {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true}, + {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true}, + {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true}, + {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true}, + {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true}, + {&ps_dtou, {.d = {{ INFINITY}}}, {{~0u, 0 }}, true}, + {&ps_dtou, {.d = {{ -1.0}}}, {{ 0, 1 }}, true}, + {&ps_dtou, {.d = {{ 1.0}}}, {{ 1, 0 }}, true}, + {&ps_dtoi, {.d = {{ 1.0}}}, {.i = {1, -1}}, true}, + {&ps_ftod, {.f = {{-2.5f, 2.5f}}}, {.d = {-2.5, 2.5}}, true}, + {&ps_ddiv, {.d = {{ 2.0, 4.0}}}, {.d = {0.5}}, true}, + {&ps_ddiv, {.d = {{ 2.0, -4.0}}}, {.d = {-0.5}}, true}, + {&ps_drcp, {.d = {{ 2.0, -0.5}}}, {.d = {0.5, -2.0}}, true}, + { &ps_swapc0, {{{0, 0, 0, 0}, {0xdead, 0xc0de, 0xffff, 0xeeee}, {0xaaaa, 0xbbbb, 0xcccc, 0xdddd}}}, @@ -9818,6 +10142,8 @@ static void test_shader_instructions(void) return; command_list = context.list; queue = context.queue; + /* Float64 instructions are not supported and pipeline state creation will fail. */ + test_shader_float64 = is_shader_float64_supported(context.device) && vkd3d_test_platform_is_windows(); context.root_signature = create_cb_root_signature(context.device, 0, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_NONE); @@ -9888,6 +10214,12 @@ static void test_shader_instructions(void) continue; } + if (uint_tests[i].is_float64 && !test_shader_float64) + { + skip("Skipping shader '%s' float64 test.\n", uint_tests[i].ps->name); + continue; + } + if (current_ps != uint_tests[i].ps) { if (context.pipeline_state) -- 2.31.1

4 18

[PATCH 1/6] reg/tests: Modify delete_key() to support use of RegDeleteKeyEx()
by Hugh McMaster 16 Jun '21

16 Jun '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 35 +++++++++++++++++++------------- programs/reg/tests/copy.c | 32 ++++++++++++++--------------- programs/reg/tests/export.c | 14 ++++++------- programs/reg/tests/import.c | 38 +++++++++++++++++------------------ programs/reg/tests/reg_test.h | 4 ++-- 5 files changed, 65 insertions(+), 58 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 7fad8333ed5..d2548c7d170 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -138,15 +138,22 @@ void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path RegCloseKey(new_key); } -void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *path) +void delete_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam) { - if (path && *path) - { - LONG err; + LONG err; - err = RegDeleteKeyA(hkey, path); + if (!path) return; + + if (!sam) + { + err = RegDeleteKeyA(root, path); lok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got error %d\n", err); } + else + { + err = RegDeleteKeyExA(root, path, sam, 0); + lok(err == ERROR_SUCCESS, "RegDeleteKeyExA failed: got error %d\n", err); + } } LONG delete_tree(const HKEY key, const char *subkey) @@ -345,7 +352,7 @@ static void test_add(void) verify_reg(hkey, NULL, REG_SZ, "", 1, 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Specifying a value name doesn't initialize the Default value in a new key */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v Test /t REG_SZ /d \"Just me here\" /f", &r); @@ -357,7 +364,7 @@ static void test_add(void) verify_reg_nonexist(hkey, NULL); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Adding a registry key via WinAPI doesn't initialize the Default value... */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); @@ -423,7 +430,7 @@ static void test_reg_none(void) verify_reg(hkey, "none1", REG_NONE, "\0", 2, 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_reg_sz(void) @@ -501,7 +508,7 @@ static void test_reg_sz(void) verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_reg_expand_sz(void) @@ -542,7 +549,7 @@ static void test_reg_expand_sz(void) verify_reg(hkey, "expand3", REG_EXPAND_SZ, "", 1, 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_reg_binary(void) @@ -606,7 +613,7 @@ static void test_reg_binary(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_reg_dword(void) @@ -709,7 +716,7 @@ static void test_reg_dword(void) verify_reg(hkey, "DWORD_LE", REG_DWORD_LITTLE_ENDIAN, &dword, sizeof(dword), 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } /* REG_DWORD_BIG_ENDIAN is broken in every version of Windows. It behaves @@ -742,7 +749,7 @@ static void test_reg_dword_big_endian(void) verify_reg(hkey, "Test4", REG_DWORD_BIG_ENDIAN, &dword, sizeof(dword), 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_reg_multi_sz(void) @@ -841,7 +848,7 @@ static void test_reg_multi_sz(void) verify_reg(hkey, "multi21", REG_MULTI_SZ, "two\\0\\0strings\0", 16, 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } START_TEST(add) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 763135c2a0f..dafd0e90a3a 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -143,7 +143,7 @@ static void test_copy_empty_key(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); @@ -154,7 +154,7 @@ static void test_copy_empty_key(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); @@ -165,7 +165,7 @@ static void test_copy_empty_key(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); @@ -213,7 +213,7 @@ static void test_copy_simple_data(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); @@ -224,7 +224,7 @@ static void test_copy_simple_data(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); @@ -235,7 +235,7 @@ static void test_copy_simple_data(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); @@ -406,8 +406,8 @@ static void test_copy_hex_data(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, COPY_SRC); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, COPY_SRC, 0); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Try copying after importing alternative registry data types */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -425,8 +425,8 @@ static void test_copy_hex_data(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, COPY_SRC); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, COPY_SRC, 0); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Try copying more complex hex data */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -531,8 +531,8 @@ static void test_copy_escaped_null_values(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, COPY_SRC); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, COPY_SRC, 0); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_copy_key_class(void) @@ -573,8 +573,8 @@ static void test_copy_key_class(void) RegCloseKey(hkey); - delete_key(HKEY_CURRENT_USER, COPY_SRC); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, COPY_SRC, 0); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_copy_overwrite(void) @@ -611,8 +611,8 @@ static void test_copy_overwrite(void) verify_reg(hkey, NULL, REG_SZ, "Constant value", 15, 0); close_key(hkey); - delete_key(HKEY_CURRENT_USER, COPY_SRC); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, COPY_SRC, 0); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } START_TEST(copy) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 1348b8eebdb..b45660a0e6e 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -297,8 +297,8 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); - delete_key(hkey, "Subkey1"); - delete_key(hkey, "Subkey2"); + delete_key(hkey, "Subkey1", 0); + delete_key(hkey, "Subkey2", 0); /* Test the export order of registry values. Windows exports registry values * in order of creation; Wine uses alphabetical order. @@ -310,7 +310,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test registry export with empty hex data */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); @@ -327,7 +327,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test registry export after importing alternative registry data types */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -345,7 +345,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -364,7 +364,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test registry export with embedded null characters */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -401,7 +401,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); /* Test registry export with forward and back slashes */ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index 06f9cb05f6c..5d673ede8c1 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -860,7 +860,7 @@ static void test_import(void) open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1", 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" @@ -869,7 +869,7 @@ static void test_import(void) open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2", 0); /* Test key creation */ test_import_str("REGEDIT4\n\n" @@ -896,13 +896,13 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1c "); - delete_key(hkey, "Subkey1c "); + delete_key(hkey, "Subkey1c ", 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1d\t"); - delete_key(hkey, "Subkey1d\t"); + delete_key(hkey, "Subkey1d\t", 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" @@ -913,7 +913,7 @@ static void test_import(void) open_key(hkey, "Subkey1e", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(hkey, "Subkey1e"); + delete_key(hkey, "Subkey1e", 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" @@ -925,7 +925,7 @@ static void test_import(void) open_key(hkey, "Subkey1f\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(hkey, "Subkey1f\\\\"); + delete_key(hkey, "Subkey1f\\\\", 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" @@ -938,7 +938,7 @@ static void test_import(void) open_key(hkey, "Subkey1g\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(hkey, "Subkey1g\\\\"); + delete_key(hkey, "Subkey1g\\\\", 0); /* Test key deletion. We start by creating some registry keys. */ test_import_str("REGEDIT4\n\n" @@ -1183,7 +1183,7 @@ static void test_import(void) verify_reg_nonexist(hkey, "Wine54b"); verify_key(hkey, "Subkey2"); - delete_key(hkey, "Subkey2"); + delete_key(hkey, "Subkey2", 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2399,7 +2399,7 @@ static void test_unicode_import(void) open_key(hkey, "Subkey\"1", 0, &subkey); verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1", 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" @@ -2408,7 +2408,7 @@ static void test_unicode_import(void) open_key(hkey, "Subkey/2", 0, &subkey); verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); close_key(subkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); + delete_key(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2", 0); /* Test key creation */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -2435,13 +2435,13 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1c "); - delete_key(hkey, "Subkey1c "); + delete_key(hkey, "Subkey1c ", 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_key(hkey, "Subkey1d\t"); - delete_key(hkey, "Subkey1d\t"); + delete_key(hkey, "Subkey1d\t", 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" @@ -2452,7 +2452,7 @@ static void test_unicode_import(void) open_key(hkey, "Subkey1e", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(hkey, "Subkey1e"); + delete_key(hkey, "Subkey1e", 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" @@ -2464,7 +2464,7 @@ static void test_unicode_import(void) open_key(hkey, "Subkey1f\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(hkey, "Subkey1f\\\\"); + delete_key(hkey, "Subkey1f\\\\", 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" @@ -2477,7 +2477,7 @@ static void test_unicode_import(void) open_key(hkey, "Subkey1g\\\\", 0, &subkey); verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); close_key(subkey); - delete_key(hkey, "Subkey1g\\\\"); + delete_key(hkey, "Subkey1g\\\\", 0); /* Test key deletion. We start by creating some registry keys. */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -2725,7 +2725,7 @@ static void test_unicode_import(void) verify_reg_nonexist(hkey, "Wine54b"); verify_key(hkey, "Subkey2"); - delete_key(hkey, "Subkey2"); + delete_key(hkey, "Subkey2", 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3315,7 +3315,7 @@ static void test_import_with_whitespace(void) close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_unicode_import_with_whitespace(void) @@ -3461,7 +3461,7 @@ static void test_unicode_import_with_whitespace(void) close_key(hkey); - delete_key(HKEY_CURRENT_USER, KEY_BASE); + delete_key(HKEY_CURRENT_USER, KEY_BASE, 0); } static void test_import_win31(void) @@ -3585,7 +3585,7 @@ static void test_import_win31(void) close_key(hkey); - delete_key(HKEY_CLASSES_ROOT, KEY_BASE); + delete_key(HKEY_CLASSES_ROOT, KEY_BASE, 0); } START_TEST(import) diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 28e2d8e3abe..140f01580e8 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -62,8 +62,8 @@ void verify_key_nonexist_(const char *file, unsigned line, HKEY key_base, const #define add_key(k,p,s) add_key_(__FILE__,__LINE__,k,p,s) void add_key_(const char *file, unsigned line, const HKEY hkey, const char *path, HKEY *subkey); -#define delete_key(k,p) delete_key_(__FILE__,__LINE__,k,p) -void delete_key_(const char *file, unsigned line, const HKEY hkey, const char *path); +#define delete_key(r,p,s) delete_key_(__FILE__,__LINE__,r,p,s) +void delete_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam); LONG delete_tree(const HKEY key, const char *subkey); -- 2.32.0

1 5

[PATCH] winegstreamer: Expose the MF_MT_VIDEO_ROTATION attribute.
by Giovanni Mascellani 16 Jun '21

16 Jun '21

The stricter checks imposed by commit ac39b313b618ab8d1613302c3604ba505afff0df, while being valid in general, require that media source attaches to media types the attributes that application can request. This patch exposes the MF_MT_VIDEO_ROTATION attribute, which is for example requested by Legend of Keepers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- The same attribute is also set by Windows for media sources obtained from the standard source resolver. Currently MFVideoRotationFormat_0 is always set, because I couldn't find anyway to query this property in GStreamer. The obvious place for this metadata item would probably be GstVideoInfo, but I cannot see anything related there. Can some GStreamer wizard help? dlls/winegstreamer/mfplat.c | 1 + include/mfapi.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index bb632c2cc2c..dfa448afcfe 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -596,6 +596,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + IMFMediaType_SetUINT32(type, &MF_MT_VIDEO_ROTATION, MFVideoRotationFormat_0); return type; } diff --git a/include/mfapi.h b/include/mfapi.h index e4a1f6a3dc0..788b267845e 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -449,6 +449,13 @@ typedef enum _MFWaveFormatExConvertFlags MFWaveFormatExConvertFlag_ForceExtensible = 1, } MFWaveFormatExConvertFlags; +typedef enum _MFVideoRotationFormat { + MFVideoRotationFormat_0, + MFVideoRotationFormat_90, + MFVideoRotationFormat_180, + MFVideoRotationFormat_270 +} MFVideoRotationFormat; + enum _MFT_ENUM_FLAG { MFT_ENUM_FLAG_SYNCMFT = 0x00000001, -- 2.32.0

2 1

[PATCH vkd3d v2 1/3] tests: Add test for uniform dynamic indexing of bounded descriptor arrays.
by Conor McCarthy 16 Jun '21

16 Jun '21

From: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 195 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index f289a10d..0cdb22e0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -740,7 +740,7 @@ static ID3D12PipelineState *create_compute_pipeline_state_(unsigned int line, ID ID3D12RootSignature *root_signature, const D3D12_SHADER_BYTECODE cs) { D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc; - ID3D12PipelineState *pipeline_state; + ID3D12PipelineState *pipeline_state = NULL; HRESULT hr; memset(&pipeline_state_desc, 0, sizeof(pipeline_state_desc)); @@ -33817,6 +33817,198 @@ static void test_hull_shader_patch_constant_inputs(void) destroy_test_context(&context); } +static void test_resource_arrays(void) +{ + ID3D12Resource *input_buffers[8], *output_buffers[6]; + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; + ID3D12GraphicsCommandList *command_list; + unsigned int descriptor_count; + struct test_context context; + ID3D12DescriptorHeap *heap; + ID3D12CommandQueue *queue; + ID3D12Device *device; + unsigned int i; + HRESULT hr; + + static const D3D12_DESCRIPTOR_RANGE descriptor_ranges[] = + { + {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, 8, 2, 2, 0}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, 6, 1, 3, D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND}, + }; + + static const struct uvec4 cb_data[] = + { + {0, 0}, + {1, 1}, + {0, 5}, + {1, 4}, + {2, 0}, + {3, 1}, + }; + + static const D3D12_ROOT_PARAMETER root_parameters[] = + { + {D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE, + .DescriptorTable = {ARRAY_SIZE(descriptor_ranges), descriptor_ranges}}, + {D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS, .Constants = {2, 1, ARRAY_SIZE(cb_data) * 4}}, + }; + + static const DWORD cs_code[] = + { +#if 0 + cbuffer cb : register(b2, space1) + { + uint2 c[6]; + } + + Buffer<uint> t1[2] : register(t2, space2); + Buffer<uint> t2[] : register(t4, space2); + + RWBuffer<uint> u1[2] : register(u1, space3); + RWBuffer<uint> u2[] : register(u3, space3); + + [numthreads(1, 1, 1)] + void main() + { + u1[c[0].x][0] = t1[c[0].y][0]; + u1[c[1].x][0] = t1[c[1].y][0]; + u2[c[2].x][0] = t2[c[2].y][0]; + u2[c[3].x][0] = t2[c[3].y][0]; + u2[c[4].x][0] = t2[c[4].y][0]; + u2[c[5].x][0] = t2[c[5].y][0]; + } +#endif + 0x43425844, 0xef615fd3, 0x708c1d93, 0xdb9908b4, 0xb1853d57, 0x00000001, 0x000004c8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000474, 0x00050051, 0x0000011d, 0x0100086a, + 0x07000059, 0x00308e46, 0x00000000, 0x00000002, 0x00000002, 0x00000006, 0x00000001, 0x07000858, + 0x00307e46, 0x00000000, 0x00000002, 0x00000003, 0x00004444, 0x00000002, 0x07000858, 0x00307e46, + 0x00000001, 0x00000004, 0xffffffff, 0x00004444, 0x00000002, 0x0700089c, 0x0031ee46, 0x00000000, + 0x00000001, 0x00000002, 0x00004444, 0x00000003, 0x0700089c, 0x0031ee46, 0x00000001, 0x00000003, + 0xffffffff, 0x00004444, 0x00000003, 0x02000068, 0x00000001, 0x0400009b, 0x00000001, 0x00000001, + 0x00000001, 0x07000036, 0x00100012, 0x00000000, 0x0030801a, 0x00000000, 0x00000002, 0x00000000, + 0x0d00002d, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x06207e46, 0x00000000, 0x00000002, 0x0010000a, 0x00000000, 0x07000036, 0x00100022, 0x00000000, + 0x0030800a, 0x00000000, 0x00000002, 0x00000000, 0x0d0000a4, 0x0621e0f2, 0x00000000, 0x00000001, + 0x0010001a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100006, + 0x00000000, 0x07000036, 0x00100012, 0x00000000, 0x0030801a, 0x00000000, 0x00000002, 0x00000001, + 0x0d00002d, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x06207e46, 0x00000000, 0x00000002, 0x0010000a, 0x00000000, 0x07000036, 0x00100022, 0x00000000, + 0x0030800a, 0x00000000, 0x00000002, 0x00000001, 0x0d0000a4, 0x0621e0f2, 0x00000000, 0x00000001, + 0x0010001a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100006, + 0x00000000, 0x07000036, 0x00100012, 0x00000000, 0x0030801a, 0x00000000, 0x00000002, 0x00000002, + 0x0d00002d, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x06207e46, 0x00000001, 0x00000004, 0x0010000a, 0x00000000, 0x07000036, 0x00100022, 0x00000000, + 0x0030800a, 0x00000000, 0x00000002, 0x00000002, 0x0d0000a4, 0x0621e0f2, 0x00000001, 0x00000003, + 0x0010001a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100006, + 0x00000000, 0x07000036, 0x00100012, 0x00000000, 0x0030801a, 0x00000000, 0x00000002, 0x00000003, + 0x0d00002d, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x06207e46, 0x00000001, 0x00000004, 0x0010000a, 0x00000000, 0x07000036, 0x00100022, 0x00000000, + 0x0030800a, 0x00000000, 0x00000002, 0x00000003, 0x0d0000a4, 0x0621e0f2, 0x00000001, 0x00000003, + 0x0010001a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100006, + 0x00000000, 0x07000036, 0x00100012, 0x00000000, 0x0030801a, 0x00000000, 0x00000002, 0x00000004, + 0x0d00002d, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x06207e46, 0x00000001, 0x00000004, 0x0010000a, 0x00000000, 0x07000036, 0x00100022, 0x00000000, + 0x0030800a, 0x00000000, 0x00000002, 0x00000004, 0x0d0000a4, 0x0621e0f2, 0x00000001, 0x00000003, + 0x0010001a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100006, + 0x00000000, 0x07000036, 0x00100012, 0x00000000, 0x0030801a, 0x00000000, 0x00000002, 0x00000005, + 0x0d00002d, 0x00100012, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x06207e46, 0x00000001, 0x00000004, 0x0010000a, 0x00000000, 0x07000036, 0x00100022, 0x00000000, + 0x0030800a, 0x00000000, 0x00000002, 0x00000005, 0x0d0000a4, 0x0621e0f2, 0x00000001, 0x00000003, + 0x0010001a, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00100006, + 0x00000000, 0x0100003e, + }; + + static const uint32_t srv_data[] = {0x1, 0x4, 0x9, 0x10, 0x19, 0x24, 0x31, 0x40}; + static const uint32_t uav_data[] = {0x1, 0x4, 0x40, 0x31, 0x9, 0x10}; + + if (!init_compute_test_context(&context)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + for (i = 0, descriptor_count = 0; i < ARRAY_SIZE(descriptor_ranges); ++i) + { + descriptor_count += descriptor_ranges[i].NumDescriptors; + } + heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, descriptor_count); + + for (i = 0; i < ARRAY_SIZE(input_buffers); ++i) + { + input_buffers[i] = create_default_buffer(device, sizeof(uint32_t), + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + upload_buffer_data(input_buffers[i], 0, sizeof(srv_data[i]), &srv_data[i], queue, command_list); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, input_buffers[i], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + + memset(&srv_desc, 0, sizeof(srv_desc)); + srv_desc.Format = DXGI_FORMAT_R32_UINT; + srv_desc.ViewDimension = D3D12_SRV_DIMENSION_BUFFER; + srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + srv_desc.Buffer.FirstElement = 0; + srv_desc.Buffer.NumElements = 1; + ID3D12Device_CreateShaderResourceView(device, input_buffers[i], &srv_desc, + get_cpu_descriptor_handle(&context, heap, i)); + } + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + { + output_buffers[i] = create_default_buffer(device, sizeof(uint32_t), + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_R32_UINT; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.FirstElement = 0; + uav_desc.Buffer.NumElements = 1; + ID3D12Device_CreateUnorderedAccessView(device, output_buffers[i], NULL, &uav_desc, + get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(input_buffers) + i)); + } + + todo + context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, + shader_bytecode(cs_code, sizeof(cs_code))); + if (!context.pipeline_state) + { + skip("Shader descriptor arrays are not supported.\n"); + goto done; + } + + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, + 0, get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetComputeRoot32BitConstants(command_list, 1, ARRAY_SIZE(cb_data) * 4, cb_data, 0); + + ID3D12GraphicsCommandList_Dispatch(command_list, 1, 1, 1); + + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + { + transition_sub_resource_state(command_list, output_buffers[i], 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_buffer_uint(output_buffers[i], queue, command_list, uav_data[i], 0); + reset_command_list(command_list, context.allocator); + } + +done: + for (i = 0; i < ARRAY_SIZE(output_buffers); ++i) + ID3D12Resource_Release(output_buffers[i]); + for (i = 0; i < ARRAY_SIZE(input_buffers); ++i) + ID3D12Resource_Release(input_buffers[i]); + ID3D12DescriptorHeap_Release(heap); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -33985,4 +34177,5 @@ START_TEST(d3d12) run_test(test_sampler_register_space); run_test(test_hull_shader_relative_addressing); run_test(test_hull_shader_patch_constant_inputs); + run_test(test_resource_arrays); } -- 2.31.1

2 12

[PATCH v5] iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo.
by Yeshun Ye 16 Jun '21

16 Jun '21

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++++- dlls/iphlpapi/tests/iphlpapi.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 09414d26dde..21edd9ee128 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -706,9 +706,16 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) DWORD i; PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList; BOOL firstIPAddr = TRUE; + NET_LUID luid; + GUID guid; /* on Win98 this is left empty, but whatever */ - getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); + ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr->AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..e61f2cbd382 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1115,6 +1115,9 @@ static void testGetAdaptersInfo(void) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); + NET_LUID luid; + GUID guid; + char AdapterName[MAX_ADAPTER_NAME_LENGTH + 4]; apiReturn = GetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, @@ -1122,6 +1125,13 @@ static void testGetAdaptersInfo(void) apiReturn); ptr = buf; while (ptr) { + ConvertInterfaceIndexToLuid(ptr->Index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcasecmp(ptr->AdapterName, AdapterName), "expected '%s' got '%s'\n", ptr->AdapterName, AdapterName); ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n"); -- 2.20.1

2 1

[PATCH v5] dpnet: Implement IDirectPlay8Address GetURLW/A.
by Alistair Leslie-Hughes 16 Jun '21

16 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/Makefile.in | 2 +- dlls/dpnet/address.c | 115 ++++++++++++++++++++++++++--- dlls/dpnet/tests/address.c | 143 +++++++++++++++++++++++++++++++++++++ 3 files changed, 249 insertions(+), 11 deletions(-) diff --git a/dlls/dpnet/Makefile.in b/dlls/dpnet/Makefile.in index bcf07772e39..9d979a34f22 100644 --- a/dlls/dpnet/Makefile.in +++ b/dlls/dpnet/Makefile.in @@ -1,6 +1,6 @@ MODULE = dpnet.dll IMPORTLIB = dpnet -IMPORTS = dxguid uuid ole32 advapi32 ws2_32 +IMPORTS = dxguid uuid ole32 advapi32 ws2_32 user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6aa62a97785..6819638a2b8 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -45,6 +45,22 @@ static char *heap_strdupA( const char *str ) return ret; } +static inline WCHAR *heap_strdupAtoW(const char *str) +{ + LPWSTR ret = NULL; + + if(str) { + DWORD len; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len*sizeof(WCHAR)); + if(ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + } + + return ret; +} + static BOOL add_component(IDirectPlay8AddressImpl *This, struct component *item) { if(This->comp_count == This->comp_array_size) @@ -256,20 +272,99 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Clear(IDirectPlay8Address *iface) return DPN_OK; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *pwszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLW(IDirectPlay8Address *iface, WCHAR *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr = DPNERR_BUFFERTOOSMALL; + int i; + WCHAR buffer[1024] = {0}; + int position = 0; + + TRACE("(%p, %p, %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + for(i=0; i < This->comp_count; i++) + { + struct component *entry = This->components[i]; + + if(position) + lstrcatW(&buffer[position++], L";"); + + switch(entry->type) + { + case DPNA_DATATYPE_GUID: + position += wsprintfW( &buffer[position], L"%s=%%7B%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X%%7D", + entry->name, entry->data.guid.Data1, entry->data.guid.Data2, entry->data.guid.Data3, + entry->data.guid.Data4[0], entry->data.guid.Data4[1], entry->data.guid.Data4[2], + entry->data.guid.Data4[3], entry->data.guid.Data4[4], entry->data.guid.Data4[5], + entry->data.guid.Data4[6], entry->data.guid.Data4[7] ); + + break; + case DPNA_DATATYPE_STRING: + position += wsprintfW(&buffer[position], L"%s=%s", entry->name, entry->data.string); + break; + case DPNA_DATATYPE_DWORD: + position += wsprintfW(&buffer[position], L"%s=%d", entry->name, entry->data.value); + break; + case DPNA_DATATYPE_STRING_ANSI: + { + WCHAR *str = heap_strdupAtoW(entry->data.ansi); + position += wsprintfW(&buffer[position], L"%s=%s", entry->name, str); + heap_free(str); + break; + } + case DPNA_DATATYPE_BINARY: + default: + FIXME("Unsupported type %d\n", entry->type); + } + } + + if(url && *length >= lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1) + { + lstrcpyW(url, DPNA_HEADER); + lstrcatW(url, buffer); + hr = DPN_OK; + } + + *length = lstrlenW(buffer) + lstrlenW(DPNA_HEADER) + 1; + + return hr; } -static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, CHAR *pszURL, - DWORD *pdwNumChars) +static HRESULT WINAPI IDirectPlay8AddressImpl_GetURLA(IDirectPlay8Address *iface, char *url, DWORD *length) { - IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); - TRACE("(%p): stub\n", This); - return DPN_OK; + IDirectPlay8AddressImpl *This = impl_from_IDirectPlay8Address(iface); + HRESULT hr; + WCHAR *buffer = NULL; + + TRACE("(%p, %p %p)\n", This, url, length); + + if(!length || (!url && *length != 0)) + return DPNERR_INVALIDPOINTER; + + if(url && *length) + { + url[0] = '\0'; + buffer = heap_alloc(*length * sizeof(WCHAR)); + } + + hr = IDirectPlay8Address_GetURLW(iface, buffer, length); + if(hr == DPN_OK) + { + DWORD size; + size = WideCharToMultiByte(CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL); + if(size <= *length) + WideCharToMultiByte(CP_ACP, 0, buffer, -1, url, *length, NULL, NULL); + else + { + *length = size; + hr = DPNERR_BUFFERTOOSMALL; + } + } + heap_free(buffer); + return hr; } static HRESULT WINAPI IDirectPlay8AddressImpl_GetSP(IDirectPlay8Address *iface, GUID *pguidSP) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index a8d31c9854a..0e8b8da3b09 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -304,6 +304,147 @@ static void address_setsp(void) } } +static void address_urlW(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + WCHAR *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(bufflen == 66, "got %d\n", bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!lstrlenW(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLW(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen * sizeof(WCHAR)); + + hr = IDirectPlay8Address_GetURLW(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost", buffer), "got %s\n", wine_dbgstr_w(buffer)); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + +static void address_urlA(void) +{ + HRESULT hr; + IDirectPlay8Address *localaddr = NULL; + static const char urlA1[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D"; + static const char urlA2[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321"; + static const char urlA3[] = "x-directplay:/provider=%7BEBFE7BA0-628D-11D2-AE0F-006097B01411%7D;port=4321;hostname=localhost"; + static const char localhostA[] = "localhost"; + + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&localaddr); + ok(hr == S_OK, "Failed to create IDirectPlay8Address object\n"); + if(SUCCEEDED(hr)) + { + char *buffer = NULL; + DWORD bufflen = 0, bufflen2; + DWORD port = 4321; + + hr = IDirectPlay8Address_SetSP(localaddr, &CLSID_DP8SP_TCPIP); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, NULL); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 10; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_INVALIDPOINTER, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + bufflen2 = bufflen/2; + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen2); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + ok(!strlen(buffer), "wrong length\n"); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA1, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD), DPNA_DATATYPE_DWORD); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA2, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhostA, sizeof(localhostA), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + bufflen = 0; + hr = IDirectPlay8Address_GetURLA(localaddr, NULL, &bufflen); + ok(hr == DPNERR_BUFFERTOOSMALL, "got 0x%08x\n", hr); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufflen); + + hr = IDirectPlay8Address_GetURLA(localaddr, buffer, &bufflen); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpA(urlA3, buffer), "got %s\n", buffer); + HeapFree(GetProcessHeap(), 0, buffer); + + IDirectPlay8Address_Release(localaddr); + } +} + static void address_duplicate(void) { HRESULT hr; @@ -381,6 +522,8 @@ START_TEST(address) address_addcomponents(); address_setsp(); address_duplicate(); + address_urlW(); + address_urlA(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH v2 1/7] ws2_32/tests: Add a couple more tests for getsockname().
by Zebediah Figura 16 Jun '21

16 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 76d0a3f3b19..c8ac0d0ad8a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3592,6 +3592,7 @@ static void test_getsockname(void) ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); sa_get = sa_set; + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); ok(ret == SOCKET_ERROR, "expected failure\n"); ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); @@ -3600,12 +3601,21 @@ static void test_getsockname(void) ret = bind(sock, (struct sockaddr *) &sa_set, sa_set_len); ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); - ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ok(!ret, "got %d\n", ret); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); + sa_get_len = sizeof(sa_get) - 1; + WSASetLastError(0xdeadbeef); + ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(sa_get_len == sizeof(sa_get) - 1, "got size %d\n", sa_get_len); + closesocket(sock); h = gethostbyname(""); @@ -5546,11 +5556,11 @@ todo_wine static void test_WSASendTo(void) { SOCKET s; - struct sockaddr_in addr; + struct sockaddr_in addr, ret_addr; char buf[12] = "hello world"; WSABUF data_buf; DWORD bytesSent; - int ret; + int ret, len; addr.sin_family = AF_INET; addr.sin_port = htons(139); @@ -5566,6 +5576,11 @@ static void test_WSASendTo(void) ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK, "WSASendTo() failed: %d/%d\n", ret, WSAGetLastError()); + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + WSASetLastError(12345); ret = WSASendTo(s, &data_buf, 1, NULL, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL); ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, @@ -5575,6 +5590,12 @@ static void test_WSASendTo(void) ret = WSASendTo(s, &data_buf, 1, &bytesSent, 0, (struct sockaddr *)&addr, sizeof(addr), NULL, NULL); ok(!ret, "expected success\n"); ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr.sin_family == AF_INET, "got family %u\n", ret_addr.sin_family); + ok(ret_addr.sin_port, "expected nonzero port\n"); } static DWORD WINAPI recv_thread(LPVOID arg) -- 2.30.2

2 8

[PATCH 1/7] ws2_32/tests: Add a couple more tests for getsockname().
by Zebediah Figura 16 Jun '21

16 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 76d0a3f3b19..2d2b4c40141 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3592,6 +3592,7 @@ static void test_getsockname(void) ok(sock != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); sa_get = sa_set; + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); ok(ret == SOCKET_ERROR, "expected failure\n"); ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); @@ -3600,12 +3601,21 @@ static void test_getsockname(void) ret = bind(sock, (struct sockaddr *) &sa_set, sa_set_len); ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + WSASetLastError(0xdeadbeef); ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); - ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); + sa_get_len = sizeof(sa_get) - 1; + WSASetLastError(0xdeadbeef); + ret = getsockname(sock, (struct sockaddr *)&sa_get, &sa_get_len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(sa_get_len == sizeof(sa_get) - 1, "got size %d\n", sa_get_len); + closesocket(sock); h = gethostbyname(""); @@ -5546,11 +5556,11 @@ todo_wine static void test_WSASendTo(void) { SOCKET s; - struct sockaddr_in addr; + struct sockaddr_in addr, ret_addr; char buf[12] = "hello world"; WSABUF data_buf; DWORD bytesSent; - int ret; + int ret, len; addr.sin_family = AF_INET; addr.sin_port = htons(139); @@ -5566,6 +5576,11 @@ static void test_WSASendTo(void) ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK, "WSASendTo() failed: %d/%d\n", ret, WSAGetLastError()); + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + WSASetLastError(12345); ret = WSASendTo(s, &data_buf, 1, NULL, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL); ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, @@ -5575,6 +5590,12 @@ static void test_WSASendTo(void) ret = WSASendTo(s, &data_buf, 1, &bytesSent, 0, (struct sockaddr *)&addr, sizeof(addr), NULL, NULL); ok(!ret, "expected success\n"); ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + len = sizeof(ret_addr); + ret = getsockname(s, (struct sockaddr *)&ret_addr, &len); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr.sin_family == AF_INET, "got family %u\n", ret_addr.sin_family); + ok(ret_addr.sin_port, "expected nonzero port\n"); } static DWORD WINAPI recv_thread(LPVOID arg) -- 2.30.2

2 10

[PATCH 4/4] winetest: Enable visual styles.
by Zhiyi Zhang 16 Jun '21

16 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winetest/main.c | 3 +++ programs/winetest/winetest.manifest | 16 ++++++++++++++++ programs/winetest/winetest.rc | 3 +++ 3 files changed, 22 insertions(+) create mode 100644 programs/winetest/winetest.manifest diff --git a/programs/winetest/main.c b/programs/winetest/main.c index a05c8f9939b..64a807b6c73 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -29,6 +29,7 @@ #include <stdio.h> #include <assert.h> #include <windows.h> +#include <commctrl.h> #include <winternl.h> #include <mshtml.h> @@ -1265,6 +1266,8 @@ int __cdecl main( int argc, char *argv[] ) int interactive = 1; int i; + InitCommonControls(); + if (!LoadStringA( 0, IDS_BUILD_ID, build_id, sizeof(build_id) )) build_id[0] = 0; pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsWow64Process"); diff --git a/programs/winetest/winetest.manifest b/programs/winetest/winetest.manifest new file mode 100644 index 00000000000..a3b110b5eda --- /dev/null +++ b/programs/winetest/winetest.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winetest" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index a3898b6ce01..4571a752f66 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -88,6 +88,9 @@ BEGIN DEFPUSHBUTTON "Close", IDCANCEL, 55, 40, 40, 14 END +/* @makedep: winetest.manifest */ +1 RT_MANIFEST winetest.manifest + /* @makedep: winetest.ico */ IDI_WINE ICON "winetest.ico" -- 2.30.2

1 0

[PATCH 3/4] winedbg: Enable visual styles.
by Zhiyi Zhang 16 Jun '21

16 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/winedbg/winedbg.manifest | 16 ++++++++++++++++ programs/winedbg/winedbg.rc | 3 +++ 2 files changed, 19 insertions(+) create mode 100644 programs/winedbg/winedbg.manifest diff --git a/programs/winedbg/winedbg.manifest b/programs/winedbg/winedbg.manifest new file mode 100644 index 00000000000..5061d141f16 --- /dev/null +++ b/programs/winedbg/winedbg.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Winedbg" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 7ad7686d28a..af0018c3cf2 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -75,3 +75,6 @@ BEGIN DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END + +/* @makedep: winedbg.manifest */ +1 RT_MANIFEST winedbg.manifest -- 2.30.2

1 0

[PATCH 2/4] uninstaller: Enable visual styles.
by Zhiyi Zhang 16 Jun '21

16 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/uninstaller/Makefile.in | 2 +- programs/uninstaller/main.c | 3 +++ programs/uninstaller/resource.h | 1 + programs/uninstaller/uninstaller.manifest | 16 ++++++++++++++++ programs/uninstaller/uninstaller.rc | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 programs/uninstaller/uninstaller.manifest diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 146e6204baa..d37316c14c7 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -1,6 +1,6 @@ MODULE = uninstaller.exe IMPORTS = advapi32 -DELAYIMPORTS = shlwapi shell32 user32 gdi32 +DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 42aa53631f1..8941d3a47ad 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -23,6 +23,7 @@ #include <string.h> #include <windows.h> +#include <commctrl.h> #include <shlwapi.h> #include "resource.h" #include "regstr.h" @@ -176,6 +177,8 @@ int __cdecl wmain(int argc, WCHAR *argv[]) Wow64RevertWow64FsRedirection( redir ); } + InitCommonControls(); + while( i<argc ) { token = argv[i++]; diff --git a/programs/uninstaller/resource.h b/programs/uninstaller/resource.h index 72ba160d5bd..35ac91f01a2 100644 --- a/programs/uninstaller/resource.h +++ b/programs/uninstaller/resource.h @@ -19,6 +19,7 @@ */ #include <windef.h> +#include <winuser.h> #define IDS_APPNAME 1000 #define IDS_UNINSTALLFAILED 1001 diff --git a/programs/uninstaller/uninstaller.manifest b/programs/uninstaller/uninstaller.manifest new file mode 100644 index 00000000000..ee41796562e --- /dev/null +++ b/programs/uninstaller/uninstaller.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Uninstaller" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/uninstaller/uninstaller.rc b/programs/uninstaller/uninstaller.rc index 4afc6845bc0..631f81e0f77 100644 --- a/programs/uninstaller/uninstaller.rc +++ b/programs/uninstaller/uninstaller.rc @@ -41,3 +41,6 @@ STRINGTABLE { \t\t Use '--list' to determine the application GUID.\n\ \ [no option] Launch the graphical version of this program.\n\n" } + +/* @makedep: uninstaller.manifest */ +1 RT_MANIFEST uninstaller.manifest -- 2.30.2

1 0

[PATCH 1/4] clock: Enable visual styles.
by Zhiyi Zhang 16 Jun '21

16 Jun '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/clock/Makefile.in | 2 +- programs/clock/clock.manifest | 16 ++++++++++++++++ programs/clock/clock.rc | 3 +++ programs/clock/clock_res.h | 1 + programs/clock/main.c | 3 +++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 programs/clock/clock.manifest diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in index 060e2ff0881..ad1681aeef0 100644 --- a/programs/clock/Makefile.in +++ b/programs/clock/Makefile.in @@ -1,5 +1,5 @@ MODULE = clock.exe -IMPORTS = comdlg32 shell32 user32 gdi32 +IMPORTS = comdlg32 shell32 user32 gdi32 comctl32 EXTRADLLFLAGS = -mwindows -mno-cygwin diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest new file mode 100644 index 00000000000..4a9f38c4ff8 --- /dev/null +++ b/programs/clock/clock.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.Clock" version="0.0.0.0"/> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> diff --git a/programs/clock/clock.rc b/programs/clock/clock.rc index 8e3b9ef4b7c..0d19369b9f4 100644 --- a/programs/clock/clock.rc +++ b/programs/clock/clock.rc @@ -49,3 +49,6 @@ STRINGTABLE { IDS_CLOCK, "Clock" } + +/* @makedep: clock.manifest */ +1 RT_MANIFEST clock.manifest diff --git a/programs/clock/clock_res.h b/programs/clock/clock_res.h index b7abf1c35d3..32fd9ff8a0f 100644 --- a/programs/clock/clock_res.h +++ b/programs/clock/clock_res.h @@ -17,6 +17,7 @@ */ #include <windef.h> +#include <winuser.h> #define MAIN_MENU 0x100 #define IDM_ANALOG 0x101 diff --git a/programs/clock/main.c b/programs/clock/main.c index 43364745ea5..e64e66dffe6 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -26,6 +26,7 @@ #include <stdio.h> #include "windows.h" +#include "commctrl.h" #include "commdlg.h" #include "shellapi.h" @@ -389,6 +390,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show MSG msg; WNDCLASSW class; + InitCommonControls(); + /* Setup Globals */ memset(&Globals.hFont, 0, sizeof (Globals.hFont)); Globals.bAnalog = TRUE; -- 2.30.2

1 0

[PATCH] configure: Work around Xcode 12's ld assuming 16KB page sizes.
by Brendan Shanks 15 Jun '21

15 Jun '21

Starting in Xcode 12, ld rounds page sizes and alignments up to 16KB for all architectures. Passing '-segalign 0x1000' resets this back to 4KB. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- I haven't noticed any ill effects from this, but it seems desirable to keep the PAGEZERO size consistent with previous versions and other OSes. configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 94e586e07b2..603359b6110 100644 --- a/configure.ac +++ b/configure.ac @@ -762,10 +762,10 @@ case $host_os in AC_SUBST(APPKIT_LIBS,"-framework AppKit") AC_SUBST(SYSTEMCONFIGURATION_LIBS,"-framework SystemConfiguration") - WINELOADER_LDFLAGS="-Wl,-pie,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],, -- 2.31.1

1 0

[PATCH] msxml3: Null check url in parseURL.
by Jefferson Carpenter 15 Jun '21

15 Jun '21

3 2

[PATCH] ntoskrnl.exe/tests: Don't call CertFreeCertificateContext on cleanup.
by Rémi Bernon 15 Jun '21

15 Jun '21

It seems to crash the test on w864. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f9549b804bd..af26638e305 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -235,15 +235,11 @@ static void testsign_cleanup(struct testsign_context *ctx) ret = CertDeleteCertificateFromStore(ctx->root_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertFreeCertificateContext(ctx->root_cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); ret = CertCloseStore(ctx->root_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); ret = CertDeleteCertificateFromStore(ctx->publisher_cert); ok(ret, "Failed to remove certificate, error %u\n", GetLastError()); - ret = CertFreeCertificateContext(ctx->publisher_cert); - ok(ret, "Failed to free certificate, error %u\n", GetLastError()); ret = CertCloseStore(ctx->publisher_store, CERT_CLOSE_STORE_CHECK_FLAG); ok(ret, "Failed to close store, error %u\n", GetLastError()); -- 2.31.0

2 1

[PATCH v2 1/6] hid: Implement HidP_SetUsageValueArray stub.
by Rémi Bernon 15 Jun '21

15 Jun '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Pass driver parameters through the registry. Supersedes: 207594-207600 dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 10 ++++++++++ include/ddk/hidpi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 98508a456ce..edfdb004fd0 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -37,7 +37,7 @@ @ stub HidP_SetData @ stub HidP_SetScaledUsageValue @ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) -@ stub HidP_SetUsageValueArray +@ stdcall HidP_SetUsageValueArray(long long long long ptr long ptr ptr long) @ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) @ stub HidP_UnsetUsages diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2933c2ff7ef..9eedf12b694 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -642,6 +642,16 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, return rc; } +NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, char *value_buf, USHORT value_len, + PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + FIXME( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u stub!\n", + report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); + + return HIDP_STATUS_NOT_IMPLEMENTED; +} NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index fb497f3282f..8c970673ec1 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -201,6 +201,9 @@ NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR Re ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, + PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength ); NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); -- 2.31.0

3 14

[PATCH v2 1/7] server: Implement IOCTL_AFD_GET_EVENTS.
by Zebediah Figura 15 Jun '21

15 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/socket.c | 6 ++++++ include/wine/afd.h | 7 +++++++ server/sock.c | 22 ++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 088f29f85ff..3b8206474f0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1181,6 +1181,12 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_GET_EVENTS: + if (in_size) FIXME( "unexpected input size %u\n", in_size ); + + status = STATUS_BAD_DEVICE_TYPE; + break; + case IOCTL_AFD_RECV: { const struct afd_recv_params *params = in_buffer; diff --git a/include/wine/afd.h b/include/wine/afd.h index 2eb3e6f12a9..46d242c7582 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -36,6 +36,7 @@ #define IOCTL_AFD_RECV CTL_CODE(FILE_DEVICE_BEEP, 0x805, METHOD_NEITHER, FILE_ANY_ACCESS) #define IOCTL_AFD_POLL CTL_CODE(FILE_DEVICE_BEEP, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_EVENT_SELECT CTL_CODE(FILE_DEVICE_BEEP, 0x821, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_AFD_GET_EVENTS CTL_CODE(FILE_DEVICE_BEEP, 0x822, METHOD_NEITHER, FILE_ANY_ACCESS) enum afd_poll_bit { @@ -125,6 +126,12 @@ struct afd_event_select_params_32 int mask; }; +struct afd_get_events_params +{ + int flags; + NTSTATUS status[13]; +}; + #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index 3556ee21aa3..1d992d8f9e4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2011,6 +2011,28 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } return 1; + case IOCTL_AFD_GET_EVENTS: + { + struct afd_get_events_params params = {0}; + unsigned int i; + + if (get_reply_max_size() < sizeof(params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + params.flags = sock->pending_events & sock->mask; + for (i = 0; i < ARRAY_SIZE( params.status ); ++i) + params.status[i] = sock_get_ntstatus( sock->errors[i] ); + + sock->pending_events = 0; + sock_reselect( sock ); + + set_reply_data( &params, sizeof(params) ); + return 0; + } + case IOCTL_AFD_EVENT_SELECT: { struct event *event = NULL; -- 2.30.2

1 6

[PATCH v2 1/4] mf: Reset END_OF_PRESENTATION flags after stopping the session.
by Giovanni Mascellani 15 Jun '21

15 Jun '21

After end of presentation, the session should return to the stopped state, which means that can be restarted again. END_OF_PRESENTATION flags should not remain set in this case. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mf/session.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 9f233295773..ef2d15c9ef5 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -1061,6 +1061,7 @@ static void session_set_stopped(struct media_session *session, HRESULT status) { MediaEventType event_type; IMFMediaEvent *event; + struct media_source *source;; session->state = SESSION_STATE_STOPPED; event_type = session->presentation.flags & SESSION_FLAG_END_OF_PRESENTATION ? MESessionEnded : MESessionStopped; @@ -1071,6 +1072,11 @@ static void session_set_stopped(struct media_session *session, HRESULT status) IMFMediaEventQueue_QueueEvent(session->event_queue, event); IMFMediaEvent_Release(event); } + session->presentation.flags &= ~SESSION_FLAG_END_OF_PRESENTATION; + LIST_FOR_EACH_ENTRY(source, &session->presentation.sources, struct media_source, entry) + { + source->flags &= ~SOURCE_FLAG_END_OF_PRESENTATION; + } session_command_complete(session); } -- 2.32.0

4 7

[PATCH v2 1/5] jscript: Parse 'let' and 'const' variable declarations.
by Paul Gofman 15 Jun '21

15 Jun '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - don't allow 'const' variable declaration in compat mode. dlls/jscript/compile.c | 5 +++++ dlls/jscript/lex.c | 2 ++ dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 37 ++++++++++++++++++++++++++++++++----- dlls/jscript/tests/lang.js | 34 ++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/es5.js | 17 +++++++++++++++++ 6 files changed, 91 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9bb9ff13d14..2a17639641f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1138,6 +1138,11 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t if(!iter->expr) continue; + if (iter->block_scope) + FIXME("Block scope variables are not supported.\n"); + if (iter->constant) + FIXME("Constant variables are not supported.\n"); + hres = emit_identifier_ref(ctx, iter->identifier, 0); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index efed1038a95..695615721a7 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -41,6 +41,7 @@ static const struct { {L"break", kBREAK, TRUE}, {L"case", kCASE}, {L"catch", kCATCH}, + {L"const", kCONST}, {L"continue", kCONTINUE, TRUE}, {L"default", kDEFAULT}, {L"delete", kDELETE}, @@ -54,6 +55,7 @@ static const struct { {L"if", kIF}, {L"in", kIN}, {L"instanceof", kINSTANCEOF}, + {L"let", kLET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {L"new", kNEW}, {L"null", kNULL}, {L"return", kRETURN, TRUE}, diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index b88a52af242..c4dd0752ee9 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -95,6 +95,7 @@ literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; typedef struct _variable_declaration_t { const WCHAR *identifier; + BOOL block_scope, constant; expression_t *expr; struct _variable_declaration_t *next; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f11119143b8..fd8ea7e7aa7 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -87,7 +87,7 @@ static variable_list_t *variable_list_add(parser_ctx_t*,variable_list_t*,variabl static void *new_statement(parser_ctx_t*,statement_type_t,size_t,unsigned); static statement_t *new_block_statement(parser_ctx_t*,unsigned,statement_list_t*); -static statement_t *new_var_statement(parser_ctx_t*,unsigned,variable_list_t*); +static statement_t *new_var_statement(parser_ctx_t*,BOOL,BOOL,unsigned,variable_list_t*); static statement_t *new_expression_statement(parser_ctx_t*,unsigned,expression_t*); static statement_t *new_if_statement(parser_ctx_t*,unsigned,expression_t*,statement_t*,statement_t*); static statement_t *new_while_statement(parser_ctx_t*,unsigned,BOOL,expression_t*,statement_t*); @@ -168,8 +168,9 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kGET kIN kSET -%token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH +%token <identifier> kBREAK kCASE kCATCH kCONST kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR +%token <identifier> kGET kIN kLET kSET kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE +%token <identifier> kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL /* tokens */ @@ -182,6 +183,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <source_elements> FunctionBody %type <statement> Statement %type <statement> Block +%type <statement> LexicalDeclaration %type <statement> VariableStatement %type <statement> EmptyStatement %type <statement> ExpressionStatement @@ -291,6 +293,7 @@ FormalParameterList_opt /* ECMA-262 3rd Edition 12 */ Statement : Block { $$ = $1; } + | LexicalDeclaration { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } | FunctionExpression { $$ = new_expression_statement(ctx, @$, $1); } @@ -322,10 +325,25 @@ Block : '{' StatementList '}' { $$ = new_block_statement(ctx, @2, $2); } | '{' '}' { $$ = new_block_statement(ctx, @$, NULL); } +/* ECMA-262 10th Edition 13.3.1, TODO: BindingList*/ +LexicalDeclaration + : kLET VariableDeclarationList semicolon_opt + { $$ = new_var_statement(ctx, TRUE, FALSE, @$, $2); } + | kCONST VariableDeclarationList semicolon_opt + { + if(ctx->script->version < SCRIPTLANGUAGEVERSION_ES5) { + WARN("const var declaration in legacy mode.\n", + debugstr_w($1)); + set_error(ctx, @$, JS_E_SYNTAX); + YYABORT; + } + $$ = new_var_statement(ctx, TRUE, TRUE, @$, $2); + } + /* ECMA-262 3rd Edition 12.2 */ VariableStatement : kVAR VariableDeclarationList semicolon_opt - { $$ = new_var_statement(ctx, @$, $2); } + { $$ = new_var_statement(ctx, FALSE, FALSE, @$, $2); } /* ECMA-262 3rd Edition 12.2 */ VariableDeclarationList @@ -834,6 +852,7 @@ ReservedAsIdentifier : kBREAK { $$ = $1; } | kCASE { $$ = $1; } | kCATCH { $$ = $1; } + | kCONST { $$ = $1; } | kCONTINUE { $$ = $1; } | kDEFAULT { $$ = $1; } | kDELETE { $$ = $1; } @@ -847,6 +866,7 @@ ReservedAsIdentifier | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } + | kLET { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } @@ -1144,8 +1164,10 @@ static variable_list_t *variable_list_add(parser_ctx_t *ctx, variable_list_t *li return list; } -static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_list_t *variable_list) +static statement_t *new_var_statement(parser_ctx_t *ctx, BOOL block_scope, BOOL constant, unsigned loc, + variable_list_t *variable_list) { + variable_declaration_t *var; var_statement_t *ret; ret = new_statement(ctx, STAT_VAR, sizeof(*ret), loc); @@ -1153,6 +1175,11 @@ static statement_t *new_var_statement(parser_ctx_t *ctx, unsigned loc, variable_ return NULL; ret->variable_list = variable_list->head; + for (var = ret->variable_list; var; var = var->next) + { + var->block_scope = block_scope; + var->constant = constant; + } return &ret->stat; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9e6e6ad239f..0db86c89985 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -2030,3 +2030,37 @@ Math = 6; ok(Math === 6, "NaN !== 6"); reportSuccess(); + +function test_es5_keywords() { + var let = 1 + var tmp + ok(let == 1, "let != 1"); + + tmp = false + try { + eval('var var = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var var = 1;'"); + + tmp = false + try { + eval('var const = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'var const = 1;'"); + + tmp = false + try { + eval('const c1 = 1;'); + } + catch(e) { + tmp = true + } + ok(tmp === true, "Expected exception for 'const c1 = 1;'"); +} +test_es5_keywords(); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 7e46848d40e..24906de5231 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1207,3 +1207,20 @@ sync_test("head_setter", function() { document.head = ""; ok(typeof(document.head) === "object", "typeof(document.head) = " + typeof(document.head)); }); + + +sync_test("declaration_let", function() { + ok(a === undefined, "a is not undefined"); + var a = 3; + + { + let a = 2; + + ok(a == 2, "a != 2"); + + a = 4; + ok(a == 4, "a != 4"); + } + + todo_wine.ok(a == 3, "a != 3"); +}); -- 2.31.1

3 9

[PATCH resend 1/4] iphlpapi: Implement asynchronous events for IcmpSendEcho2(Ex).
by Gabriel Ivăncescu 15 Jun '21

15 Jun '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/iphlpapi/icmp.c | 108 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 100 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef0321..ceeab69 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -106,9 +106,42 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); typedef struct { int sid; + LONG lock_count; + HANDLE lock_event; IP_OPTION_INFORMATION default_opts; } icmp_t; +static void icmp_lock(icmp_t *icp) +{ + InterlockedIncrement(&icp->lock_count); +} + +static void icmp_unlock(icmp_t *icp) +{ + if (InterlockedDecrement(&icp->lock_count) == 0x80000000) + { + if (icp->lock_event) + SetEvent(icp->lock_event); + } +} + +static void icmp_wait_for_released_locks(icmp_t *icp) +{ + HANDLE event = CreateEventW(NULL, TRUE, FALSE, NULL); + + icp->lock_event = event; + if (InterlockedExchangeAdd(&icp->lock_count, 0x80000000) != 0) + { + do + { + if (event) WaitForSingleObjectEx(event, INFINITE, TRUE); + else SleepEx(1, TRUE); + } + while (icp->lock_count != 0x80000000); + } + if (event) CloseHandle(event); +} + #define IP_OPTS_UNKNOWN 0 #define IP_OPTS_DEFAULT 1 #define IP_OPTS_CUSTOM 2 @@ -347,6 +380,30 @@ done: return res; } +struct icmp_get_reply_async_ctx +{ + icmp_t *icp; + HANDLE event; + unsigned char *buffer; + void *reply_buf; + DWORD reply_size; + DWORD send_time; + DWORD timeout; +}; + +static DWORD WINAPI icmp_get_reply_async_func(VOID *parameter) +{ + struct icmp_get_reply_async_ctx *ctx = parameter; + + icmp_get_reply(ctx->icp->sid, ctx->buffer, ctx->send_time, ctx->reply_buf, ctx->reply_size, ctx->timeout); + + SetEvent(ctx->event); + + icmp_unlock(ctx->icp); + HeapFree(GetProcessHeap(), 0, ctx); + return 0; +} + /* @@ -381,6 +438,7 @@ HANDLE WINAPI Icmp6CreateFile(VOID) } icp->sid=sid; icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; + icp->lock_count=0; return (HANDLE)icp; } @@ -439,6 +497,7 @@ HANDLE WINAPI IcmpCreateFile(VOID) } icp->sid=sid; icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; + icp->lock_count=0; return (HANDLE)icp; } @@ -455,6 +514,9 @@ BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) return FALSE; } + /* Windows waits until all outstanding async requests are complete or timed out */ + icmp_wait_for_released_locks(icp); + close( icp->sid ); HeapFree(GetProcessHeap (), 0, icp); return TRUE; @@ -526,6 +588,7 @@ DWORD WINAPI IcmpSendEcho2Ex( unsigned char *buffer; int reqsize, repsize; DWORD send_time; + DWORD res = 0; TRACE("(%p, %p, %p, %p, %08x, %08x, %p, %d, %p, %p, %d, %d)\n", IcmpHandle, Event, ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, @@ -553,11 +616,6 @@ DWORD WINAPI IcmpSendEcho2Ex( return 0; } - if (Event) - { - FIXME("unsupported for events\n"); - return 0; - } if (ApcRoutine) { FIXME("unsupported for APCs\n"); @@ -569,6 +627,8 @@ DWORD WINAPI IcmpSendEcho2Ex( return 0; } + icmp_lock(icp); + /* Prepare the request */ id=getpid() & 0xFFFF; seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; @@ -580,7 +640,7 @@ DWORD WINAPI IcmpSendEcho2Ex( buffer = HeapAlloc(GetProcessHeap(), 0, max( repsize, reqsize )); if (buffer == NULL) { SetLastError(ERROR_OUTOFMEMORY); - return 0; + goto done; } icmp_header=(struct icmp*)buffer; @@ -661,10 +721,42 @@ DWORD WINAPI IcmpSendEcho2Ex( } } HeapFree(GetProcessHeap(), 0, buffer); - return 0; + goto done; } - return icmp_get_reply(icp->sid, buffer, send_time, ReplyBuffer, ReplySize, Timeout); + if (Event) + { + struct icmp_get_reply_async_ctx *ctx = HeapAlloc(GetProcessHeap(), 0, sizeof(*ctx)); + + if (ctx) + { + ctx->icp = icp; + ctx->event = Event; + ctx->buffer = buffer; + ctx->reply_buf = ReplyBuffer; + ctx->reply_size = ReplySize; + ctx->send_time = send_time; + ctx->timeout = Timeout; + if (QueueUserWorkItem(icmp_get_reply_async_func, ctx, WT_EXECUTEDEFAULT | WT_EXECUTELONGFUNCTION)) + { + SetLastError(ERROR_IO_PENDING); + return 0; + } + + HeapFree(GetProcessHeap(), 0, ctx); + } + else + SetLastError(ERROR_OUTOFMEMORY); + + HeapFree(GetProcessHeap(), 0, buffer); + goto done; + } + + res = icmp_get_reply(icp->sid, buffer, send_time, ReplyBuffer, ReplySize, Timeout); + +done: + icmp_unlock(icp); + return res; } /* -- 2.31.1

1 3

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel