December 2005 - Wine-commits

Alexandre Julliard : server: Added access rights mapping to token objects.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 5fb2e68bb24d2b82a28e4a389d8f80f20c5600ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5fb2e68bb24d2b82a28e4a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:01:08 2005 +0100 server: Added access rights mapping to token objects. --- server/token.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index 11b1f11..53bbc13 100644 --- a/server/token.c +++ b/server/token.c @@ -106,6 +106,7 @@ struct sid_and_attributes }; static void token_dump( struct object *obj, int verbose ); +static unsigned int token_map_access( struct object *obj, unsigned int access ); static void token_destroy( struct object *obj ); static const struct object_ops token_ops = @@ -118,7 +119,7 @@ static const struct object_ops token_ops NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + token_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ token_destroy /* destroy */ @@ -131,6 +132,15 @@ static void token_dump( struct object *o /* FIXME: dump token members */ } +static unsigned int token_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= TOKEN_READ; + if (access & GENERIC_WRITE) access |= TOKEN_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= TOKEN_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static SID *security_sid_alloc( const SID_IDENTIFIER_AUTHORITY *idauthority, int subauthcount, const unsigned int subauth[] ) { int i;

1 0

Alexandre Julliard : server: Added access rights mapping to symlink objects.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: e57f734765c26d928be3e20b7d911c34627ef438 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e57f734765c26d928be3e20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:01:16 2005 +0100 server: Added access rights mapping to symlink objects. --- server/symlink.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/server/symlink.c b/server/symlink.c index 62fb863..fab7c13 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -46,6 +46,7 @@ struct symlink }; static void symlink_dump( struct object *obj, int verbose ); +static unsigned int symlink_map_access( struct object *obj, unsigned int access ); static struct object *symlink_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void symlink_destroy( struct object *obj ); @@ -60,7 +61,7 @@ static const struct object_ops symlink_o NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + symlink_map_access, /* map_access */ symlink_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ symlink_destroy /* destroy */ @@ -102,6 +103,15 @@ static struct object *symlink_lookup_nam return target; } +static unsigned int symlink_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYMBOLIC_LINK_QUERY; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= SYMBOLIC_LINK_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static void symlink_destroy( struct object *obj ) { struct symlink *symlink = (struct symlink *)obj;

1 0

Alexandre Julliard : server: Added access rights mapping to registry key objects.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 32a93960babeedcd48f9e20afe41b7b019dc2ff0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=32a93960babeedcd48f9e20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 15:02:26 2005 +0100 server: Added access rights mapping to registry key objects. --- server/registry.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/server/registry.c b/server/registry.c index 52b4c19..09c7f5a 100644 --- a/server/registry.c +++ b/server/registry.c @@ -134,6 +134,7 @@ struct file_load_info static void key_dump( struct object *obj, int verbose ); +static unsigned int key_map_access( struct object *obj, unsigned int access ); static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); static void key_destroy( struct object *obj ); @@ -147,7 +148,7 @@ static const struct object_ops key_ops = NULL, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + key_map_access, /* map_access */ no_lookup_name, /* lookup_name */ key_close_handle, /* close_handle */ key_destroy /* destroy */ @@ -301,6 +302,15 @@ static inline struct notify *find_notify return NULL; } +static unsigned int key_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= KEY_READ; + if (access & GENERIC_WRITE) access |= KEY_WRITE; + if (access & GENERIC_EXECUTE) access |= KEY_EXECUTE; + if (access & GENERIC_ALL) access |= KEY_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + /* close the notification associated with a handle */ static int key_close_handle( struct object *obj, struct process *process, obj_handle_t handle ) {

1 0

Alexandre Julliard : server: Added access rights mapping to synchronization objects.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 03f46e1321b4c4cbcef405f2cad2f37d5c4054a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=03f46e1321b4c4cbcef405f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:58:44 2005 +0100 server: Added access rights mapping to synchronization objects. --- server/event.c | 12 +++++++++++- server/mutex.c | 12 +++++++++++- server/semaphore.c | 12 +++++++++++- server/timer.c | 12 +++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/server/event.c b/server/event.c index d6c8fef..6aec64a 100644 --- a/server/event.c +++ b/server/event.c @@ -45,6 +45,7 @@ struct event static void event_dump( struct object *obj, int verbose ); static int event_signaled( struct object *obj, struct thread *thread ); static int event_satisfied( struct object *obj, struct thread *thread ); +static unsigned int event_map_access( struct object *obj, unsigned int access ); static int event_signal( struct object *obj, unsigned int access); static const struct object_ops event_ops = @@ -57,7 +58,7 @@ static const struct object_ops event_ops event_satisfied, /* satisfied */ event_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + event_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ no_destroy /* destroy */ @@ -132,6 +133,15 @@ static int event_satisfied( struct objec return 0; /* Not abandoned */ } +static unsigned int event_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int event_signal( struct object *obj, unsigned int access ) { struct event *event = (struct event *)obj; diff --git a/server/mutex.c b/server/mutex.c index 0f1e9f8..4104161 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -47,6 +47,7 @@ struct mutex static void mutex_dump( struct object *obj, int verbose ); static int mutex_signaled( struct object *obj, struct thread *thread ); static int mutex_satisfied( struct object *obj, struct thread *thread ); +static unsigned int mutex_map_access( struct object *obj, unsigned int access ); static void mutex_destroy( struct object *obj ); static int mutex_signal( struct object *obj, unsigned int access ); @@ -60,7 +61,7 @@ static const struct object_ops mutex_ops mutex_satisfied, /* satisfied */ mutex_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + mutex_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ mutex_destroy /* destroy */ @@ -143,6 +144,15 @@ static int mutex_satisfied( struct objec return 1; } +static unsigned int mutex_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int mutex_signal( struct object *obj, unsigned int access ) { struct mutex *mutex = (struct mutex *)obj; diff --git a/server/semaphore.c b/server/semaphore.c index 6cc1012..d818898 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -45,6 +45,7 @@ struct semaphore static void semaphore_dump( struct object *obj, int verbose ); static int semaphore_signaled( struct object *obj, struct thread *thread ); static int semaphore_satisfied( struct object *obj, struct thread *thread ); +static unsigned int semaphore_map_access( struct object *obj, unsigned int access ); static int semaphore_signal( struct object *obj, unsigned int access ); static const struct object_ops semaphore_ops = @@ -57,7 +58,7 @@ static const struct object_ops semaphore semaphore_satisfied, /* satisfied */ semaphore_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + semaphore_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ no_destroy /* destroy */ @@ -133,6 +134,15 @@ static int semaphore_satisfied( struct o return 0; /* not abandoned */ } +static unsigned int semaphore_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | SEMAPHORE_MODIFY_STATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | SEMAPHORE_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static int semaphore_signal( struct object *obj, unsigned int access ) { struct semaphore *sem = (struct semaphore *)obj; diff --git a/server/timer.c b/server/timer.c index 7c20f19..b87dd88 100644 --- a/server/timer.c +++ b/server/timer.c @@ -53,6 +53,7 @@ struct timer static void timer_dump( struct object *obj, int verbose ); static int timer_signaled( struct object *obj, struct thread *thread ); static int timer_satisfied( struct object *obj, struct thread *thread ); +static unsigned int timer_map_access( struct object *obj, unsigned int access ); static void timer_destroy( struct object *obj ); static const struct object_ops timer_ops = @@ -65,7 +66,7 @@ static const struct object_ops timer_ops timer_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ - no_map_access, /* map_access */ + timer_map_access, /* map_access */ no_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ timer_destroy /* destroy */ @@ -196,6 +197,15 @@ static int timer_satisfied( struct objec return 0; } +static unsigned int timer_map_access( struct object *obj, unsigned int access ) +{ + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | TIMER_QUERY_STATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | TIMER_MODIFY_STATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_ALL) access |= TIMER_ALL_ACCESS; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); +} + static void timer_destroy( struct object *obj ) { struct timer *timer = (struct timer *)obj;

1 0

Alexandre Julliard : server: Added infrastructure for access rights mapping.
by Alexandre Julliard 12 Dec '05

12 Dec '05

1 0

Alexandre Julliard : server: Allow the mailslot device to be opened as a file object.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: b0aa29effacd4212e24213693d8e8d9febefe7f7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b0aa29effacd4212e242136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:39:27 2005 +0100 server: Allow the mailslot device to be opened as a file object. --- server/mailslot.c | 45 +++++++++++++++++++++++++++++++++------------ 1 files changed, 33 insertions(+), 12 deletions(-) diff --git a/server/mailslot.c b/server/mailslot.c index f4accf2..ce2fbfd 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -65,6 +65,7 @@ struct mailslot struct mailslot_device { struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ struct namespace *mailslots; /* mailslot namespace */ }; @@ -142,6 +143,7 @@ static const struct fd_ops mail_writer_f }; static void mailslot_device_dump( struct object *obj, int verbose ); +static struct fd *mailslot_device_get_fd( struct object *obj ); static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void mailslot_device_destroy( struct object *obj ); @@ -149,16 +151,26 @@ static void mailslot_device_destroy( str static const struct object_ops mailslot_device_ops = { sizeof(struct mailslot_device), /* size */ - mailslot_device_dump, /* dump */ - no_add_queue, /* add_queue */ - NULL, /* remove_queue */ - NULL, /* signaled */ - no_satisfied, /* satisfied */ - no_signal, /* signal */ - no_get_fd, /* get_fd */ - mailslot_device_lookup_name, /* lookup_name */ - no_close_handle, /* close_handle */ - mailslot_device_destroy /* destroy */ + mailslot_device_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + mailslot_device_get_fd, /* get_fd */ + mailslot_device_lookup_name, /* lookup_name */ + no_close_handle, /* close_handle */ + mailslot_device_destroy /* destroy */ +}; + +static const struct fd_ops mailslot_device_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + default_fd_queue_async, /* queue_async */ + default_fd_cancel_async /* cancel_async */ }; static void mailslot_destroy( struct object *obj) @@ -248,6 +260,12 @@ static void mailslot_device_dump( struct fprintf( stderr, "Mail slot device\n" ); } +static struct fd *mailslot_device_get_fd( struct object *obj ) +{ + struct mailslot_device *device = (struct mailslot_device *)obj; + return device->fd; +} + static struct object *mailslot_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { @@ -266,7 +284,8 @@ static void mailslot_device_destroy( str { struct mailslot_device *device = (struct mailslot_device*)obj; assert( obj->ops == &mailslot_device_ops ); - free( device->mailslots ); + if (device->fd) release_object( device->fd ); + if (device->mailslots) free( device->mailslots ); } struct mailslot_device *create_mailslot_device( struct directory *root, const struct unicode_str *name ) @@ -276,7 +295,9 @@ struct mailslot_device *create_mailslot_ if ((dev = create_named_object_dir( root, name, 0, &mailslot_device_ops )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { - if (!(dev->mailslots = create_namespace( 7 ))) + dev->mailslots = NULL; + if (!(dev->fd = alloc_pseudo_fd( &mailslot_device_fd_ops, &dev->obj )) || + !(dev->mailslots = create_namespace( 7 ))) { release_object( dev ); dev = NULL;

1 0

Alexandre Julliard : server: Allow the named pipe device to be opened as a file object.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 26e60d8ffcadf8835bb2519af48bcda722a3de32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26e60d8ffcadf8835bb2519… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:30:06 2005 +0100 server: Allow the named pipe device to be opened as a file object. --- server/named_pipe.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index bda6bd9..45ebf11 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -102,6 +102,7 @@ struct named_pipe struct named_pipe_device { struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ struct namespace *pipes; /* named pipe namespace */ }; @@ -188,6 +189,7 @@ static const struct fd_ops pipe_client_f }; static void named_pipe_device_dump( struct object *obj, int verbose ); +static struct fd *named_pipe_device_get_fd( struct object *obj ); static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static void named_pipe_device_destroy( struct object *obj ); @@ -201,12 +203,22 @@ static const struct object_ops named_pip NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + named_pipe_device_get_fd, /* get_fd */ named_pipe_device_lookup_name, /* lookup_name */ no_close_handle, /* close_handle */ named_pipe_device_destroy /* destroy */ }; +static const struct fd_ops named_pipe_device_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + default_fd_queue_async, /* queue_async */ + default_fd_cancel_async /* cancel_async */ +}; + static void named_pipe_dump( struct object *obj, int verbose ) { struct named_pipe *pipe = (struct named_pipe *) obj; @@ -370,6 +382,12 @@ static void named_pipe_device_dump( stru fprintf( stderr, "Named pipe device\n" ); } +static struct fd *named_pipe_device_get_fd( struct object *obj ) +{ + struct named_pipe_device *device = (struct named_pipe_device *)obj; + return device->fd; +} + static struct object *named_pipe_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { @@ -389,7 +407,8 @@ static void named_pipe_device_destroy( s { struct named_pipe_device *device = (struct named_pipe_device*)obj; assert( obj->ops == &named_pipe_device_ops ); - free( device->pipes ); + if (device->fd) release_object( device->fd ); + if (device->pipes) free( device->pipes ); } /* this will be deleted as soon an we fix wait_named_pipe */ @@ -403,7 +422,9 @@ struct named_pipe_device *create_named_p if ((dev = create_named_object_dir( root, name, 0, &named_pipe_device_ops )) && get_error() != STATUS_OBJECT_NAME_EXISTS) { - if (!(dev->pipes = create_namespace( 7 ))) + dev->pipes = NULL; + if (!(dev->fd = alloc_pseudo_fd( &named_pipe_device_fd_ops, &dev->obj )) || + !(dev->pipes = create_namespace( 7 ))) { release_object( dev ); dev = NULL;

1 0

Alexandre Julliard : server: Support for opening devices.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 67505c00af371ff3257a9a64df2e07cf45e5b39e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=67505c00af371ff3257a9a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 14:27:45 2005 +0100 server: Support for opening devices. Added support for opening devices directly with the server when they don't correspond to a Unix file. --- dlls/kernel/file.c | 4 ++ dlls/ntdll/directory.c | 4 +- dlls/ntdll/file.c | 16 ++++++++++ include/wine/server_protocol.h | 22 +++++++++++++ server/fd.c | 66 ++++++++++++++++++++++++++++++++++++++-- server/file.h | 1 + server/protocol.def | 12 +++++++ server/request.h | 2 + server/trace.c | 19 ++++++++++++ 9 files changed, 140 insertions(+), 6 deletions(-)

1 0

Alexandre Julliard : server: Use a better error code for a zero-size mapped file.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 2017555b06a2e7c6773383ec613ed54a32d9480e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2017555b06a2e7c6773383e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 12 13:38:43 2005 +0100 server: Use a better error code for a zero-size mapped file. --- server/mapping.c | 2 +- server/trace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index c9813f2..af6f074 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -308,7 +308,7 @@ static struct object *create_mapping( st if (!get_file_size( mapping->file, &size )) goto error; if (!size) { - set_error( STATUS_FILE_INVALID ); + set_error( STATUS_MAPPED_FILE_SIZE_ZERO ); goto error; } } diff --git a/server/trace.c b/server/trace.c index fcc447e..fb1be68 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3848,7 +3848,6 @@ static const struct { "ERROR_CLIPBOARD_NOT_OPEN", 0xc0010000 | ERROR_CLIPBOARD_NOT_OPEN }, { "ERROR_INVALID_INDEX", 0xc0010000 | ERROR_INVALID_INDEX }, { "ERROR_SEEK", 0xc0010000 | ERROR_SEEK }, - { "FILE_INVALID", STATUS_FILE_INVALID }, { "FILE_IS_A_DIRECTORY", STATUS_FILE_IS_A_DIRECTORY }, { "FILE_LOCK_CONFLICT", STATUS_FILE_LOCK_CONFLICT }, { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, @@ -3859,6 +3858,7 @@ static const struct { "INVALID_PARAMETER", STATUS_INVALID_PARAMETER }, { "IO_TIMEOUT", STATUS_IO_TIMEOUT }, { "KEY_DELETED", STATUS_KEY_DELETED }, + { "MAPPED_FILE_SIZE_ZERO", STATUS_MAPPED_FILE_SIZE_ZERO }, { "MEDIA_WRITE_PROTECTED", STATUS_MEDIA_WRITE_PROTECTED }, { "MUTANT_NOT_OWNED", STATUS_MUTANT_NOT_OWNED }, { "NAME_TOO_LONG", STATUS_NAME_TOO_LONG },

1 0

Eric Pouech : kernel32: Get rid of DOSMEM_AllocSelector.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 4e7b8f4a7b7701826b671db6f5277f5dc0abc86a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e7b8f4a7b7701826b671db… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 13:02:35 2005 +0100 kernel32: Get rid of DOSMEM_AllocSelector. --- dlls/kernel/dosmem.c | 16 ---------------- dlls/kernel/kernel32.spec | 5 ----- dlls/kernel/kernel_private.h | 1 - dlls/winedos/int31.c | 4 +++- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/kernel/dosmem.c b/dlls/kernel/dosmem.c index 7bb1b24..30ca6cf 100644 --- a/dlls/kernel/dosmem.c +++ b/dlls/kernel/dosmem.c @@ -254,19 +254,3 @@ LPVOID DOSMEM_MapRealToLinear(DWORD x) TRACE_(selector)("(0x%08lx) returns %p.\n", x, lin ); return lin; } - -/*********************************************************************** - * DOSMEM_AllocSelector - * - * Allocates a protected mode selector for a realmode segment. - */ -WORD DOSMEM_AllocSelector(WORD realsel) -{ - HMODULE16 hModule = GetModuleHandle16("KERNEL"); - WORD sel; - - sel=GLOBAL_CreateBlock( GMEM_FIXED, DOSMEM_dosmem+realsel*16, DOSMEM_64KB, - hModule, WINE_LDT_FLAGS_DATA ); - TRACE_(selector)("(0x%04x) returns 0x%04x.\n", realsel,sel); - return sel; -} diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 701eecd..260c6f6 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1255,8 +1255,3 @@ # Init code @ cdecl __wine_kernel_init() - -################################################################ -# Wine dll separation hacks, these will go away, don't use them -# -@ cdecl DOSMEM_AllocSelector(long) diff --git a/dlls/kernel/kernel_private.h b/dlls/kernel/kernel_private.h index 3ed5f67..98195d4 100644 --- a/dlls/kernel/kernel_private.h +++ b/dlls/kernel/kernel_private.h @@ -110,7 +110,6 @@ extern WORD DOSMEM_BiosSysSeg; /* dosmem.c */ extern BOOL DOSMEM_Init(void); -extern WORD DOSMEM_AllocSelector(WORD); extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */ extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */ extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ diff --git a/dlls/winedos/int31.c b/dlls/winedos/int31.c index 94b6a31..e34b720 100644 --- a/dlls/winedos/int31.c +++ b/dlls/winedos/int31.c @@ -913,7 +913,9 @@ void WINAPI DOSVM_Int31Handler( CONTEXT8 case 0xe000: entryPoint = 190; break; /* __E000H */ case 0xf000: entryPoint = 194; break; /* __F000H */ default: - SET_AX( context, DOSMEM_AllocSelector(BX_reg(context)) ); + FIXME("Real mode segment (%x) to descriptor: no longer supported\n", + BX_reg(context)); + SET_CFLAG( context ); break; } if (entryPoint)

1 0