September 2020 - Wine-Commits

Nikolay Sivov : widl: Enable [hidden] attribute for enums.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 8eb756c6993e8931059ac51bff668fb6a546123e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eb756c6993e8931059ac51b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 18:10:17 2020 +0300 widl: Enable [hidden] attribute for enums. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7d5aaebf33..b6cd33dd6b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2153,7 +2153,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" },

1 0

Georg Lehmann : winevulkan: Forward declare required structs for function pointer.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: d4b162509f7d1408f933eabde3956fc8df3f86cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4b162509f7d1408f933eabd… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Sep 22 16:31:49 2020 +0200 winevulkan: Forward declare required structs for function pointer. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 070d112e6e..2cddb161d6 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -805,11 +805,12 @@ class VkFunction(object): class VkFunctionPointer(object): - def __init__(self, _type, name, members): + def __init__(self, _type, name, members, forward_decls): self.name = name self.members = members self.type = _type self.required = False + self.forward_decls = forward_decls @staticmethod def from_xml(funcpointer): @@ -846,10 +847,19 @@ class VkFunctionPointer(object): _type = funcpointer.text name = funcpointer.find("name").text - return VkFunctionPointer(_type, name, members) + if "requires" in funcpointer.attrib: + forward_decls = funcpointer.attrib.get("requires").split(",") + else: + forward_decls = [] + return VkFunctionPointer(_type, name, members, forward_decls) def definition(self): - text = "{0} {1})(\n".format(self.type, self.name) + text = "" + # forward declare required structs + for decl in self.forward_decls: + text += "typedef struct {0} {0};\n".format(decl) + + text += "{0} {1})(\n".format(self.type, self.name) first = True if len(self.members) > 0:

1 0

Biswapriyo Nath : include/ddraw.h: Add DDSCAPS2.dwCaps3 flags.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 67a86980077f68ba0a54d3444a4fa595eb2c1aa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67a86980077f68ba0a54d344… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add DDSCAPS2.dwCaps3 flags. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index 881b92dde1..a3fd90dd37 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -376,6 +376,21 @@ typedef struct _DDSCAPS { #define DDSCAPS2_EXTENDEDFORMATPRIMARY 0x40000000 #define DDSCAPS2_ADDITIONALPRIMARY 0x80000000 +/* DDSCAPS2.dwCaps3 */ +#define DDSCAPS3_MULTISAMPLE_MASK 0x0000001f +#define DDSCAPS3_MULTISAMPLE_QUALITY_MASK 0x000000e0 +#define DDSCAPS3_MULTISAMPLE_QUALITY_SHIFT 5 +#define DDSCAPS3_RESERVED1 0x00000100 +#define DDSCAPS3_RESERVED2 0x00000200 +#define DDSCAPS3_LIGHTWEIGHTMIPMAP 0x00000400 +#define DDSCAPS3_AUTOGENMIPMAP 0x00000800 +#define DDSCAPS3_DMAP 0x00001000 +#ifndef D3D_DISABLE_9EX +#define DDSCAPS3_CREATESHAREDRESOURCE 0x00002000 +#define DDSCAPS3_READONLYRESOURCE 0x00004000 +#define DDSCAPS3_OPENSHAREDRESOURCE 0x00008000 +#endif /* !D3D_DISABLE_9EX */ + typedef struct _DDSCAPS2 { DWORD dwCaps; /* capabilities of surface wanted */ DWORD dwCaps2; /* additional capabilities */

1 0

Georg Lehmann : winevulkan: Add is_alias for VkFunctionPointer.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 51b3191cd38704f8d7e8ae5662105a73df715145 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51b3191cd38704f8d7e8ae56… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Sep 22 16:31:48 2020 +0200 winevulkan: Add is_alias for VkFunctionPointer. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1f9bdc156c..070d112e6e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -865,6 +865,8 @@ class VkFunctionPointer(object): text += ");\n" return text + def is_alias(self): + return False class VkHandle(object): def __init__(self, name, _type, parent, alias=None):

1 0

Robert Wilhelm : vbscript: Fix vanishing statements.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: fe59d1a5d35f4d0d9e2a262c25cbfefb91cdad3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe59d1a5d35f4d0d9e2a262c… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 22 22:14:29 2020 +0200 vbscript: Fix vanishing statements. When adding multiple statements (e.g. colon separated SimpleStatements) in function source_add_statement(), tail of linked list was not adjusted. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 5 +++++ dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 80f8699bd8..924d0b973b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -516,12 +516,17 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) if(!stat) return; + /* concatenate both linked lists */ if(ctx->stats) { ctx->stats_tail->next = stat; ctx->stats_tail = stat; }else { ctx->stats = ctx->stats_tail = stat; } + /* find new tail */ + while(ctx->stats_tail->next) { + ctx->stats_tail=ctx->stats_tail->next; + } } static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 621b390523..9f254f502b 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -67,6 +67,9 @@ Call ok(W = 5, "W = " & W & " expected " & 5) x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""") +Dim public1 : public1 = 42 +Call ok(public1 = 42, "public1=" & public1 & " expected & " & 42) + Call ok(true <> false, "true <> false is false") Call ok(not (true <> true), "true <> true is true") Call ok(not ("x" <> "x"), """x"" <> ""x"" is true")

1 0

Biswapriyo Nath : include/ddraw.h: Add missing DDSCAPS2.dwCaps2 flags.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: f4c382f980b2971929e0b5a7681ecfb0bf1356de URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4c382f980b2971929e0b5a7… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add missing DDSCAPS2.dwCaps2 flags. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index 6f7cc0ec27..881b92dde1 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -366,6 +366,15 @@ typedef struct _DDSCAPS { /* indicates surface is part of a stereo flipping chain */ #define DDSCAPS2_STEREOSURFACELEFT 0x00080000 #define DDSCAPS2_VOLUME 0x00200000 +#define DDSCAPS2_NOTUSERLOCKABLE 0x00400000 +#define DDSCAPS2_POINTS 0x00800000 +#define DDSCAPS2_RTPATCHES 0x01000000 +#define DDSCAPS2_NPATCHES 0x02000000 +#define DDSCAPS2_RESERVED3 0x04000000 +#define DDSCAPS2_DISCARDBACKBUFFER 0x10000000 +#define DDSCAPS2_ENABLEALPHACHANNEL 0x20000000 +#define DDSCAPS2_EXTENDEDFORMATPRIMARY 0x40000000 +#define DDSCAPS2_ADDITIONALPRIMARY 0x80000000 typedef struct _DDSCAPS2 { DWORD dwCaps; /* capabilities of surface wanted */

1 0

Alexandre Julliard : server: Keep permanent objects on the standard object list.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 3b3c8619c852513f57ce7388557c8451691fbe00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b3c8619c852513f57ce7388… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 15:34:10 2020 +0200 server: Keep permanent objects on the standard object list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/object.c | 47 ++++++----------------------------------------- server/object.h | 5 +++-- 2 files changed, 9 insertions(+), 43 deletions(-) diff --git a/server/object.c b/server/object.c index 27c1aa58ad..77dec733a5 100644 --- a/server/object.c +++ b/server/object.c @@ -52,22 +52,13 @@ struct namespace #ifdef DEBUG_OBJECTS static struct list object_list = LIST_INIT(object_list); -static struct list static_object_list = LIST_INIT(static_object_list); void dump_objects(void) { - struct list *p; + struct object *ptr; - LIST_FOR_EACH( p, &static_object_list ) - { - struct object *ptr = LIST_ENTRY( p, struct object, obj_list ); - fprintf( stderr, "%p:%d: ", ptr, ptr->refcount ); - dump_object_name( ptr ); - ptr->ops->dump( ptr, 1 ); - } - LIST_FOR_EACH( p, &object_list ) + LIST_FOR_EACH_ENTRY( ptr, &object_list, struct object, obj_list ) { - struct object *ptr = LIST_ENTRY( p, struct object, obj_list ); fprintf( stderr, "%p:%d: ", ptr, ptr->refcount ); dump_object_name( ptr ); ptr->ops->dump( ptr, 1 ); @@ -76,17 +67,11 @@ void dump_objects(void) void close_objects(void) { - struct list *ptr; + struct object *obj, *obj2; - /* release the static objects */ - while ((ptr = list_head( &static_object_list ))) - { - struct object *obj = LIST_ENTRY( ptr, struct object, obj_list ); - /* move it back to the standard list before freeing */ - list_remove( &obj->obj_list ); - list_add_head( &object_list, &obj->obj_list ); - release_object( obj ); - } + /* release the permanent objects */ + LIST_FOR_EACH_ENTRY_SAFE( obj, obj2, &object_list, struct object, obj_list ) + if (obj->is_permanent) release_object( obj ); dump_objects(); /* dump any remaining objects */ } @@ -406,26 +391,6 @@ void unlink_named_object( struct object *obj ) free( name_ptr ); } -/* mark an object as being permanent, i.e. only released at shutdown */ -void make_object_permanent( struct object *obj ) -{ - obj->is_permanent = 1; -#ifdef DEBUG_OBJECTS - list_remove( &obj->obj_list ); - list_add_head( &static_object_list, &obj->obj_list ); -#endif -} - -/* mark an object as no longer permanent */ -void make_object_temporary( struct object *obj ) -{ - obj->is_permanent = 0; -#ifdef DEBUG_OBJECTS - list_remove( &obj->obj_list ); - list_add_head( &object_list, &obj->obj_list ); -#endif -} - /* grab an object (i.e. increment its refcount) and return the object */ struct object *grab_object( void *ptr ) { diff --git a/server/object.h b/server/object.h index f8a3a971d6..394a4aac46 100644 --- a/server/object.h +++ b/server/object.h @@ -145,8 +145,6 @@ extern void *create_named_object( struct object *parent, const struct object_ops extern void *open_named_object( struct object *parent, const struct object_ops *ops, const struct unicode_str *name, unsigned int attributes ); extern void unlink_named_object( struct object *obj ); -extern void make_object_permanent( struct object *obj ); -extern void make_object_temporary( struct object *obj ); extern struct namespace *create_namespace( unsigned int hash_size ); extern void free_kernel_objects( struct object *obj ); /* grab/release_object can take any pointer, but you better make sure */ @@ -180,6 +178,9 @@ extern void dump_objects(void); extern void close_objects(void); #endif +static inline void make_object_permanent( struct object *obj ) { obj->is_permanent = 1; } +static inline void make_object_temporary( struct object *obj ) { obj->is_permanent = 0; } + /* event functions */ struct event;

1 0

Haidong Yu : conhost: Input should be restored and input_thread handle should be closed before return.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: d22e82196496cb6d7f26b984b95409678a76c602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d22e82196496cb6d7f26b984… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Wed Sep 23 09:31:43 2020 +0800 conhost: Input should be restored and input_thread handle should be closed before return. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a775e74961..79cbb8e83a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1652,7 +1652,7 @@ static DWORD WINAPI tty_input( void *param ) { case 3: /* end of text */ LeaveCriticalSection( &console_section ); - return 0; + goto done; case '\n': key_press( console, '\n', VK_RETURN, LEFT_CTRL_PRESSED ); break; @@ -1681,6 +1681,7 @@ static DWORD WINAPI tty_input( void *param ) TRACE( "NtReadFile failed: %#x\n", status ); +done: EnterCriticalSection( &console_section ); if (console->read_ioctl) read_complete( console, status, NULL, 0, FALSE ); if (console->is_unix)

1 0

Pengpeng Dong : conhost: Validate width param in write_output.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: b9f1ec8c44ebe62b4005d4ea2cfd63f700ea8a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9f1ec8c44ebe62b4005d4ea… Author: Pengpeng Dong <dongpengpeng(a)uniontech.com> Date: Wed Sep 23 15:04:39 2020 +0200 conhost: Validate width param in write_output. Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 79cbb8e83a..ed52838528 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1984,6 +1984,8 @@ static NTSTATUS write_output( struct screen_buffer *screen_buffer, const struct char_info_t *dest; char *src; + if (*out_size == sizeof(SMALL_RECT) && !params->width) return STATUS_INVALID_PARAMETER; + entry_size = params->mode == CHAR_INFO_MODE_TEXTATTR ? sizeof(char_info_t) : sizeof(WCHAR); entry_cnt = (in_size - sizeof(*params)) / entry_size;

1 0

Michael Müller : ntdll: Implement NtFilterToken.
by Alexandre Julliard Sept. 23, 2020

Sept. 23, 2020

Module: wine Branch: master Commit: 8c5638aa5e7cfcd5b2844853e744702331a85a17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c5638aa5e7cfcd5b2844853… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Sep 22 17:31:15 2020 -0500 ntdll: Implement NtFilterToken. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/security.c | 63 ++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 21 ++++++++++- include/winnt.h | 5 +++ include/winternl.h | 1 + server/named_pipe.c | 2 +- server/process.c | 2 +- server/protocol.def | 10 ++++++ server/request.h | 8 +++++ server/security.h | 4 ++- server/token.c | 82 ++++++++++++++++++++++++++++++++++++++++-- server/trace.c | 17 +++++++++ 12 files changed, 210 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c5638aa5e7cfcd5b284…

1 0