wine-commits September 2020

wine-commits@winehq.org

1 participants
703 discussions

Biswapriyo Nath : include/ddraw.h: Add DDSCAPS2.dwCaps3 flags.
by Alexandre Julliard 23 Sep '20

23 Sep '20

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

Biswapriyo Nath : include/ddraw.h: Add missing DDSCAPS2.dwCaps2 flags.
by Alexandre Julliard 23 Sep '20

23 Sep '20

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

Biswapriyo Nath : include/ddraw.h: Add missing UpdateOverlay flags.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 577ee2938f89c23a10e63ea9910f2c9c8fdaf426 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577ee2938f89c23a10e63ea9… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add missing UpdateOverlay 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index 528c70aa21..6f7cc0ec27 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -895,6 +895,9 @@ typedef struct _DDPIXELFORMAT { #define DDOVER_BOB 0x00200000 #define DDOVER_OVERRIDEBOBWEAVE 0x00400000 #define DDOVER_INTERLEAVED 0x00800000 +#define DDOVER_BOBHARDWARE 0x01000000 +#define DDOVER_ARGBSCALEFACTORS 0x02000000 +#define DDOVER_DEGRADEARGBSCALING 0x04000000 /* DDPIXELFORMAT.dwFlags */ #define DDPF_ALPHAPIXELS 0x00000001

1 0

Biswapriyo Nath : include/ddraw.h: Add missing members in DDPIXELFORMAT struct.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 7a4ca1b0b2b5203b7ec9c7b56f9ccf25691ba91f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a4ca1b0b2b5203b7ec9c7b5… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 22 10:04:41 2020 +0530 include/ddraw.h: Add missing members in DDPIXELFORMAT struct. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index cb77df19f0..528c70aa21 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -743,6 +743,7 @@ typedef struct _DDPIXELFORMAT { DWORD dwAlphaBitDepth; /* C: how many bits for alpha channels*/ DWORD dwLuminanceBitCount; DWORD dwBumpBitCount; + DWORD dwPrivateFormatBitCount; } DUMMYUNIONNAME1; union { DWORD dwRBitMask; /* 10: mask for red bit*/ @@ -750,12 +751,17 @@ typedef struct _DDPIXELFORMAT { DWORD dwStencilBitDepth; DWORD dwLuminanceBitMask; DWORD dwBumpDuBitMask; + DWORD dwOperations; } DUMMYUNIONNAME2; union { DWORD dwGBitMask; /* 14: mask for green bits*/ DWORD dwUBitMask; /* 14: mask for U bits*/ DWORD dwZBitMask; DWORD dwBumpDvBitMask; + struct { + WORD wFlipMSTypes; + WORD wBltMSTypes; + } MultiSampleCaps; } DUMMYUNIONNAME3; union { DWORD dwBBitMask; /* 18: mask for blue bits*/

1 0

Alexandre Julliard : server: Keep permanent objects on the standard object list.
by Alexandre Julliard 23 Sep '20

23 Sep '20

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

Alexandre Julliard : server: Rename make_object_static() to make_object_permanent().
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 25692223f1cf1f451e4283a2d07a89d1dd7cd3eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=25692223f1cf1f451e4283a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 15:26:10 2020 +0200 server: Rename make_object_static() to make_object_permanent(). This makes it clear that it's the same as the OBJ_PERMANENT flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 2 +- server/handle.c | 2 +- server/object.c | 8 ++++---- server/object.h | 2 +- server/registry.c | 4 ++-- server/request.c | 2 +- server/signal.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/atom.c b/server/atom.c index e14650bde2..b61fa27666 100644 --- a/server/atom.c +++ b/server/atom.c @@ -304,7 +304,7 @@ static struct atom_table *get_global_table( struct winstation *winstation, int c else { global_table = table; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } } else set_error( STATUS_OBJECT_NAME_NOT_FOUND ); diff --git a/server/handle.c b/server/handle.c index b2c7371e69..90f9ea63d6 100644 --- a/server/handle.c +++ b/server/handle.c @@ -298,7 +298,7 @@ static obj_handle_t alloc_global_handle_no_access_check( void *obj, unsigned int { if (!(global_table = alloc_handle_table( NULL, 0 ))) return 0; - make_object_static( &global_table->obj ); + make_object_permanent( &global_table->obj ); } return handle_local_to_global( alloc_entry( global_table, obj, access )); } diff --git a/server/object.c b/server/object.c index 51a9017e30..27c1aa58ad 100644 --- a/server/object.c +++ b/server/object.c @@ -347,7 +347,7 @@ void *create_named_object( struct object *parent, const struct object_ops *ops, done: if (attributes & OBJ_PERMANENT) { - make_object_static( new_obj ); + make_object_permanent( new_obj ); grab_object( new_obj ); } return new_obj; @@ -406,8 +406,8 @@ void unlink_named_object( struct object *obj ) free( name_ptr ); } -/* mark an object as being stored statically, i.e. only released at shutdown */ -void make_object_static( struct object *obj ) +/* 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 @@ -416,7 +416,7 @@ void make_object_static( struct object *obj ) #endif } -/* mark an object as no longer static */ +/* mark an object as no longer permanent */ void make_object_temporary( struct object *obj ) { obj->is_permanent = 0; diff --git a/server/object.h b/server/object.h index 53e37b61a2..f8a3a971d6 100644 --- a/server/object.h +++ b/server/object.h @@ -145,7 +145,7 @@ 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_static( 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 ); diff --git a/server/registry.c b/server/registry.c index 438ec6c6fc..3b2d59fc72 100644 --- a/server/registry.c +++ b/server/registry.c @@ -1742,7 +1742,7 @@ static int load_init_registry_from_file( const char *filename, struct key *key ) save_branch_info[save_branch_count].path = filename; save_branch_info[save_branch_count++].key = (struct key *)grab_object( key ); - make_object_static( &key->obj ); + make_object_permanent( &key->obj ); return (f != NULL); } @@ -1813,7 +1813,7 @@ void init_registry(void) /* create the root key */ root_key = alloc_key( &root_name, current_time ); assert( root_key ); - make_object_static( &root_key->obj ); + make_object_permanent( &root_key->obj ); /* load system.reg into Registry\Machine */ diff --git a/server/request.c b/server/request.c index 45076d90e2..3ef4a244b8 100644 --- a/server/request.c +++ b/server/request.c @@ -871,7 +871,7 @@ static void acquire_lock(void) !(master_socket->fd = create_anonymous_fd( &master_socket_fd_ops, fd, &master_socket->obj, 0 ))) fatal_error( "out of memory\n" ); set_fd_events( master_socket->fd, POLLIN ); - make_object_static( &master_socket->obj ); + make_object_permanent( &master_socket->obj ); } /* open the master server socket and start waiting for new clients */ diff --git a/server/signal.c b/server/signal.c index 8a9cbdd0ed..7c2bf2cc15 100644 --- a/server/signal.c +++ b/server/signal.c @@ -127,7 +127,7 @@ static struct handler *create_handler( signal_callback callback ) return NULL; } set_fd_events( handler->fd, POLLIN ); - make_object_static( &handler->obj ); + make_object_permanent( &handler->obj ); return handler; }

1 0

Alexandre Julliard : server: Use OBJ_PERMANENT for permanent objects.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 82c84548ebee6f2577f65e0a5df21fef898b6990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c84548ebee6f2577f65e0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 11:42:27 2020 +0200 server: Use OBJ_PERMANENT for permanent objects. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/directory.c | 137 ++++++++++++++++++++++------------------------------- server/object.c | 14 +++--- server/process.c | 4 +- 3 files changed, 66 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82c84548ebee6f2577f6…

1 0

Alexandre Julliard : server: Pass all creation arguments to the device creation functions.
by Alexandre Julliard 23 Sep '20

23 Sep '20

Module: wine Branch: master Commit: 5c4d6cf8375b69f15df4e79b23a8c95c634b7421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c4d6cf8375b69f15df4e79b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 23 11:32:47 2020 +0200 server: Pass all creation arguments to the device creation functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 5 +++-- server/device.c | 3 ++- server/directory.c | 10 +++++----- server/file.h | 14 +++++++++----- server/mailslot.c | 5 +++-- server/mapping.c | 4 ++-- server/named_pipe.c | 5 +++-- server/sock.c | 5 +++-- 8 files changed, 30 insertions(+), 21 deletions(-) diff --git a/server/console.c b/server/console.c index 4ed14a2d3f..b0b6de2eef 100644 --- a/server/console.c +++ b/server/console.c @@ -2540,9 +2540,10 @@ static struct object *console_device_open_file( struct object *obj, unsigned int return is_output ? grab_object( current->process->console->active ) : grab_object( current->process->console ); } -struct object *create_console_device( struct object *root, const struct unicode_str *name ) +struct object *create_console_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { - return create_named_object( root, &console_device_ops, name, 0, NULL ); + return create_named_object( root, &console_device_ops, name, attr, sd ); } /* allocate a console for the renderer */ diff --git a/server/device.c b/server/device.c index 371943acee..652da83e1e 100644 --- a/server/device.c +++ b/server/device.c @@ -720,11 +720,12 @@ static struct device *create_device( struct object *root, const struct unicode_s } struct object *create_unix_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd, const char *unix_path ) { struct device *device; - if ((device = create_named_object( root, &device_ops, name, 0, NULL ))) + if ((device = create_named_object( root, &device_ops, name, attr, sd ))) { device->unix_path = strdup( unix_path ); device->manager = NULL; /* no manager, requests go straight to the Unix device */ diff --git a/server/directory.c b/server/directory.c index ef0a1038a5..cae75d2b69 100644 --- a/server/directory.c +++ b/server/directory.c @@ -423,11 +423,11 @@ void init_directories(void) make_object_static( &dir_objtype->obj ); /* devices */ - named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str ); - mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str ); - console_device = create_console_device( &dir_device->obj, &condrv_str ); - socket_device = create_socket_device( &dir_device->obj, &afd_str ); - null_device = create_unix_device( &dir_device->obj, &null_str, "/dev/null" ); + named_pipe_device = create_named_pipe_device( &dir_device->obj, &named_pipe_str, 0, NULL ); + mailslot_device = create_mailslot_device( &dir_device->obj, &mailslot_str, 0, NULL ); + console_device = create_console_device( &dir_device->obj, &condrv_str, 0, NULL ); + socket_device = create_socket_device( &dir_device->obj, &afd_str, 0, NULL ); + null_device = create_unix_device( &dir_device->obj, &null_str, 0, NULL, "/dev/null" ); make_object_static( named_pipe_device ); make_object_static( mailslot_device ); make_object_static( null_device ); diff --git a/server/file.h b/server/file.h index 5fb4e5614b..477720f8b1 100644 --- a/server/file.h +++ b/server/file.h @@ -176,12 +176,16 @@ extern struct object *create_user_data_mapping( struct object *root, const struc /* device functions */ -extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_console_device( struct object *root, const struct unicode_str *name ); -extern struct object *create_socket_device( struct object *root, const struct unicode_str *name ); +extern struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_mailslot_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_console_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); +extern struct object *create_socket_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_unix_device( struct object *root, const struct unicode_str *name, - const char *unix_path ); + unsigned int attr, const struct security_descriptor *sd, const char *unix_path ); /* change notification functions */ diff --git a/server/mailslot.c b/server/mailslot.c index 9c58ed77a5..e0294d946e 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -433,11 +433,12 @@ static void mailslot_device_destroy( struct object *obj ) free( device->mailslots ); } -struct object *create_mailslot_device( struct object *root, const struct unicode_str *name ) +struct object *create_mailslot_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { struct mailslot_device *dev; - if ((dev = create_named_object( root, &mailslot_device_ops, name, 0, NULL )) && + if ((dev = create_named_object( root, &mailslot_device_ops, name, attr, sd )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->mailslots = NULL; diff --git a/server/mapping.c b/server/mapping.c index 8955df7ec2..769a986ae2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -964,8 +964,8 @@ struct object *create_user_data_mapping( struct object *root, const struct unico void *ptr; struct mapping *mapping; - if (!(mapping = create_mapping( root, name, OBJ_OPENIF, sizeof(KSHARED_USER_DATA), - SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, NULL ))) return NULL; + if (!(mapping = create_mapping( root, name, attr, sizeof(KSHARED_USER_DATA), + SEC_COMMIT, 0, FILE_READ_DATA | FILE_WRITE_DATA, sd ))) return NULL; ptr = mmap( NULL, mapping->size, PROT_WRITE, MAP_SHARED, get_unix_fd( mapping->fd ), 0 ); if (ptr != MAP_FAILED) { diff --git a/server/named_pipe.c b/server/named_pipe.c index 1ac35cf118..07a14502b3 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -507,11 +507,12 @@ static void named_pipe_device_destroy( struct object *obj ) free( device->pipes ); } -struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name ) +struct object *create_named_pipe_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { struct named_pipe_device *dev; - if ((dev = create_named_object( root, &named_pipe_device_ops, name, 0, NULL )) && + if ((dev = create_named_object( root, &named_pipe_device_ops, name, attr, sd )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { dev->pipes = NULL; diff --git a/server/sock.c b/server/sock.c index c9cf2d56da..3f19c77964 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1247,9 +1247,10 @@ static struct object *socket_device_open_file( struct object *obj, unsigned int return &sock->obj; } -struct object *create_socket_device( struct object *root, const struct unicode_str *name ) +struct object *create_socket_device( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) { - return create_named_object( root, &socket_device_ops, name, 0, NULL ); + return create_named_object( root, &socket_device_ops, name, attr, sd ); } /* accept a socket */

1 0

Francois Gouget : msvcirt/tests: Fix the spelling of a couple of ok() messages.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: 1a7b256f7c69c50c2a216317e03f9caeb268d0af URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7b256f7c69c50c2a216317… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:36:53 2020 +0200 msvcirt/tests: Fix the spelling of a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 88b893d2be..8ee880480a 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -8365,7 +8365,7 @@ static void test_fstream(void) /* make sure that OPENMODE_in is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_read(pfb->fd, st, 1) == -1, "_read succeded on OPENMODE_out only fstream\n"); + ok(_read(pfb->fd, st, 1) == -1, "_read succeeded on OPENMODE_out only fstream\n"); /* reopen the file for reading */ call_func1(p_fstream_vbase_dtor, &fs); @@ -8389,7 +8389,7 @@ static void test_fstream(void) /* make sure that OPENMODE_out is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeded on OPENMODE_in fstream\n"); + ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeeded on OPENMODE_in fstream\n"); /* cleanup */ call_func1(p_fstream_vbase_dtor, &fs);

1 0

Jiangyi Chen : iphlpapi: Rename local variables shadowing the flags parameters.
by Alexandre Julliard 22 Sep '20

22 Sep '20

Module: wine Branch: master Commit: f6ae4d167048fcd121475fe25031194fc3f19dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6ae4d167048fcd121475fe2… Author: Jiangyi Chen <chenjiangyi(a)uniontech.com> Date: Tue Sep 22 10:18:27 2020 +0000 iphlpapi: Rename local variables shadowing the flags parameters. Signed-off-by: Jiangyi Chen <chenjiangyi(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index d8c2ce029b..0fa446c21a 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1402,7 +1402,7 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw if ((fp = fopen("/proc/net/route", "r"))) { char buf[512], *ptr; - DWORD flags; + DWORD rtf_flags; /* skip header line */ ptr = fgets(buf, sizeof(buf), fp); @@ -1417,10 +1417,10 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForw row.dwForwardDest = strtoul(ptr, &ptr, 16); row.dwForwardNextHop = strtoul(ptr + 1, &ptr, 16); - flags = strtoul(ptr + 1, &ptr, 16); + rtf_flags = strtoul(ptr + 1, &ptr, 16); - if (!(flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID; - else if (flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT; + if (!(rtf_flags & RTF_UP)) row.u1.ForwardType = MIB_IPROUTE_TYPE_INVALID; + else if (rtf_flags & RTF_GATEWAY) row.u1.ForwardType = MIB_IPROUTE_TYPE_INDIRECT; else row.u1.ForwardType = MIB_IPROUTE_TYPE_DIRECT; strtoul(ptr + 1, &ptr, 16); /* refcount, skip */ @@ -1664,7 +1664,7 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO if ((fp = fopen("/proc/net/arp", "r"))) { char buf[512], *ptr; - DWORD flags; + DWORD atf_flags; /* skip header line */ ptr = fgets(buf, sizeof(buf), fp); @@ -1675,14 +1675,14 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BO row.dwAddr = inet_addr(ptr); while (*ptr && !isspace(*ptr)) ptr++; strtoul(ptr + 1, &ptr, 16); /* hw type (skip) */ - flags = strtoul(ptr + 1, &ptr, 16); + atf_flags = strtoul(ptr + 1, &ptr, 16); #ifdef ATF_COM - if (flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; + if (atf_flags & ATF_COM) row.u.Type = MIB_IPNET_TYPE_DYNAMIC; else #endif #ifdef ATF_PERM - if (flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC; + if (atf_flags & ATF_PERM) row.u.Type = MIB_IPNET_TYPE_STATIC; else #endif row.u.Type = MIB_IPNET_TYPE_OTHER;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
71
Older →

Jump to page:

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-commits September 2020