wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Nikolay Sivov : shell32: Use shellfolder API to construct FolderItems.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 7c638b00c74a297fc5bcb8c62b2ccfe8ac89a4f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c638b00c74a297fc5bcb8c62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 12:57:49 2017 +0300 shell32: Use shellfolder API to construct FolderItems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 195 ++++++++++++++++++++++--------------- dlls/shell32/tests/shelldispatch.c | 3 + 2 files changed, 118 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c638b00c74a297fc5bcb…

1 0

Alexandre Julliard : ntdll: No longer store the mapping handle with the view.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 5fa8713ddc86ac4202f75dcadd0822a5d1017b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa8713ddc86ac4202f75dcad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 15:03:38 2017 +0200 ntdll: No longer store the mapping handle with the view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 6 ------ dlls/ntdll/virtual.c | 31 +++++++++++-------------------- include/wine/server_protocol.h | 4 +--- server/mapping.c | 15 ++------------- server/protocol.def | 1 - server/request.h | 5 ++--- server/trace.c | 1 - 7 files changed, 16 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fa8713ddc86ac4202f75…

1 0

Alexandre Julliard : server: No longer store the mapping object in the dll structure.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: ab182dbf06412283b613f87dee488d12fc6045c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab182dbf06412283b613f87de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 15:00:04 2017 +0200 server: No longer store the mapping object in the dll structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ---- include/wine/server_protocol.h | 12 +++++------- server/file.h | 1 - server/mapping.c | 6 ------ server/process.c | 19 +++---------------- server/process.h | 2 -- server/protocol.def | 7 ++----- server/request.h | 11 ++++------- server/trace.c | 7 ++----- 9 files changed, 16 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ab182dbf06412283b613f…

1 0

Alexandre Julliard : server: Remove no longer used is_same_file() function.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: bc39a7460e2e895a04ffa03eaba8907bc676d2f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc39a7460e2e895a04ffa03ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:07:58 2017 +0200 server: Remove no longer used is_same_file() function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 6 ------ server/file.h | 1 - 2 files changed, 7 deletions(-) diff --git a/server/file.c b/server/file.c index 3809012..39c8150 100644 --- a/server/file.c +++ b/server/file.c @@ -265,12 +265,6 @@ done: return obj; } -/* check if two file objects point to the same file */ -int is_same_file( struct file *file1, struct file *file2 ) -{ - return is_same_file_fd( file1->fd, file2->fd ); -} - static void file_dump( struct object *obj, int verbose ) { struct file *file = (struct file *)obj; diff --git a/server/file.h b/server/file.h index 512b03a..06ea233 100644 --- a/server/file.h +++ b/server/file.h @@ -136,7 +136,6 @@ extern const char *get_timeout_str( timeout_t timeout ); extern struct file *get_file_obj( struct process *process, obj_handle_t handle, unsigned int access ); extern int get_file_unix_fd( struct file *file ); -extern int is_same_file( struct file *file1, struct file *file2 ); extern struct file *create_file_for_fd( int fd, unsigned int access, unsigned int sharing ); extern struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigned int sharing ); extern void file_set_error(void);

1 0

Alexandre Julliard : server: Implement NtAreMappedFilesTheSame functionality on the server side.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: aa90910e93f568d9e8814996bff46614fbefdc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa90910e93f568d9e8814996b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:55:13 2017 +0200 server: Implement NtAreMappedFilesTheSame functionality on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 35 ++++++++++------------------------- include/wine/server_protocol.h | 19 ++++++++++++++++++- server/mapping.c | 13 +++++++++++++ server/protocol.def | 7 +++++++ server/request.h | 5 +++++ server/trace.c | 10 ++++++++++ 6 files changed, 63 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d6ccddc..c2492d9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1306,25 +1306,6 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /*********************************************************************** - * stat_mapping_file - * - * Stat the underlying file for a memory view. - */ -static NTSTATUS stat_mapping_file( struct file_view *view, struct stat *st ) -{ - NTSTATUS status; - int unix_fd, needs_close; - - if (!view->mapping) return STATUS_NOT_MAPPED_VIEW; - if (!(status = server_get_unix_fd( view->mapping, 0, &unix_fd, &needs_close, NULL, NULL ))) - { - if (fstat( unix_fd, st ) == -1) status = FILE_GetNtStatus(); - if (needs_close) close( unix_fd ); - } - return status; -} - -/*********************************************************************** * map_image * * Map an executable (PE format) image into memory. @@ -3337,7 +3318,6 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *bu NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) { struct file_view *view1, *view2; - struct stat st1, st2; NTSTATUS status; sigset_t sigset; @@ -3354,13 +3334,18 @@ NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID addr1, PVOID addr2) status = STATUS_CONFLICTING_ADDRESSES; else if (view1 == view2) status = STATUS_SUCCESS; - else if (!(view1->protect & SEC_IMAGE) || !(view2->protect & SEC_IMAGE)) + else if ((view1->protect & VPROT_SYSTEM) || (view2->protect & VPROT_SYSTEM)) status = STATUS_NOT_SAME_DEVICE; - else if (!stat_mapping_file( view1, &st1 ) && !stat_mapping_file( view2, &st2 ) && - st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) - status = STATUS_SUCCESS; else - status = STATUS_NOT_SAME_DEVICE; + { + SERVER_START_REQ( is_same_mapping ) + { + req->base1 = wine_server_client_ptr( view1->base ); + req->base2 = wine_server_client_ptr( view2->base ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + } server_leave_uninterrupted_section( &csVirtual, &sigset ); return status; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ff0cb1e..5e42e1a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2289,6 +2289,20 @@ struct add_mapping_committed_range_reply }; + +struct is_same_mapping_request +{ + struct request_header __header; + char __pad_12[4]; + client_ptr_t base1; + client_ptr_t base2; +}; +struct is_same_mapping_reply +{ + struct reply_header __header; +}; + + #define SNAP_PROCESS 0x00000001 #define SNAP_THREAD 0x00000002 @@ -5662,6 +5676,7 @@ enum request REQ_unmap_view, REQ_get_mapping_committed_range, REQ_add_mapping_committed_range, + REQ_is_same_mapping, REQ_create_snapshot, REQ_next_process, REQ_next_thread, @@ -5955,6 +5970,7 @@ union generic_request struct unmap_view_request unmap_view_request; struct get_mapping_committed_range_request get_mapping_committed_range_request; struct add_mapping_committed_range_request add_mapping_committed_range_request; + struct is_same_mapping_request is_same_mapping_request; struct create_snapshot_request create_snapshot_request; struct next_process_request next_process_request; struct next_thread_request next_thread_request; @@ -6246,6 +6262,7 @@ union generic_reply struct unmap_view_reply unmap_view_reply; struct get_mapping_committed_range_reply get_mapping_committed_range_reply; struct add_mapping_committed_range_reply add_mapping_committed_range_reply; + struct is_same_mapping_reply is_same_mapping_reply; struct create_snapshot_reply create_snapshot_reply; struct next_process_reply next_process_reply; struct next_thread_reply next_thread_reply; @@ -6446,6 +6463,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 539 +#define SERVER_PROTOCOL_VERSION 540 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index 03cffd1..b7ddbf5 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -961,3 +961,16 @@ DECL_HANDLER(add_mapping_committed_range) if (view) add_committed_range( view, req->offset, req->offset + req->size ); } + +/* check if two memory maps are for the same file */ +DECL_HANDLER(is_same_mapping) +{ + struct memory_view *view1 = find_mapped_view( current->process, req->base1 ); + struct memory_view *view2 = find_mapped_view( current->process, req->base2 ); + + if (!view1 || !view2) return; + if (!view1->fd || !view2->fd || + !(view1->flags & SEC_IMAGE) || !(view2->flags & SEC_IMAGE) || + !is_same_file_fd( view1->fd, view2->fd )) + set_error( STATUS_NOT_SAME_DEVICE ); +} diff --git a/server/protocol.def b/server/protocol.def index ed0cf7d..dd18031 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1760,6 +1760,13 @@ enum char_info_mode @END +/* Check if two memory maps are for the same file */ +@REQ(is_same_mapping) + client_ptr_t base1; /* first view base address */ + client_ptr_t base2; /* second view base address */ +@END + + #define SNAP_PROCESS 0x00000001 #define SNAP_THREAD 0x00000002 /* Create a snapshot */ diff --git a/server/request.h b/server/request.h index 10a708e..69fbfd3 100644 --- a/server/request.h +++ b/server/request.h @@ -200,6 +200,7 @@ DECL_HANDLER(map_view); DECL_HANDLER(unmap_view); DECL_HANDLER(get_mapping_committed_range); DECL_HANDLER(add_mapping_committed_range); +DECL_HANDLER(is_same_mapping); DECL_HANDLER(create_snapshot); DECL_HANDLER(next_process); DECL_HANDLER(next_thread); @@ -492,6 +493,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_unmap_view, (req_handler)req_get_mapping_committed_range, (req_handler)req_add_mapping_committed_range, + (req_handler)req_is_same_mapping, (req_handler)req_create_snapshot, (req_handler)req_next_process, (req_handler)req_next_thread, @@ -1288,6 +1290,9 @@ C_ASSERT( FIELD_OFFSET(struct add_mapping_committed_range_request, base) == 16 ) C_ASSERT( FIELD_OFFSET(struct add_mapping_committed_range_request, offset) == 24 ); C_ASSERT( FIELD_OFFSET(struct add_mapping_committed_range_request, size) == 32 ); C_ASSERT( sizeof(struct add_mapping_committed_range_request) == 40 ); +C_ASSERT( FIELD_OFFSET(struct is_same_mapping_request, base1) == 16 ); +C_ASSERT( FIELD_OFFSET(struct is_same_mapping_request, base2) == 24 ); +C_ASSERT( sizeof(struct is_same_mapping_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_snapshot_request, attributes) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_snapshot_request, flags) == 16 ); C_ASSERT( sizeof(struct create_snapshot_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index a3acdab..0f034fa 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2276,6 +2276,12 @@ static void dump_add_mapping_committed_range_request( const struct add_mapping_c dump_uint64( ", size=", &req->size ); } +static void dump_is_same_mapping_request( const struct is_same_mapping_request *req ) +{ + dump_uint64( " base1=", &req->base1 ); + dump_uint64( ", base2=", &req->base2 ); +} + static void dump_create_snapshot_request( const struct create_snapshot_request *req ) { fprintf( stderr, " attributes=%08x", req->attributes ); @@ -4571,6 +4577,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_unmap_view_request, (dump_func)dump_get_mapping_committed_range_request, (dump_func)dump_add_mapping_committed_range_request, + (dump_func)dump_is_same_mapping_request, (dump_func)dump_create_snapshot_request, (dump_func)dump_next_process_request, (dump_func)dump_next_thread_request, @@ -4860,6 +4867,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_get_mapping_committed_range_reply, NULL, + NULL, (dump_func)dump_create_snapshot_reply, (dump_func)dump_next_process_reply, (dump_func)dump_next_thread_reply, @@ -5149,6 +5157,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "unmap_view", "get_mapping_committed_range", "add_mapping_committed_range", + "is_same_mapping", "create_snapshot", "next_process", "next_thread", @@ -5429,6 +5438,7 @@ static const struct { "NOT_IMPLEMENTED", STATUS_NOT_IMPLEMENTED }, { "NOT_MAPPED_VIEW", STATUS_NOT_MAPPED_VIEW }, { "NOT_REGISTRY_FILE", STATUS_NOT_REGISTRY_FILE }, + { "NOT_SAME_DEVICE", STATUS_NOT_SAME_DEVICE }, { "NOT_SUPPORTED", STATUS_NOT_SUPPORTED }, { "NO_DATA_DETECTED", STATUS_NO_DATA_DETECTED }, { "NO_IMPERSONATION_TOKEN", STATUS_NO_IMPERSONATION_TOKEN },

1 0

Alexandre Julliard : server: Store the mapped file descriptor in the memory view.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: b1b4f5d451cf2ee821514b5479ddd9aae4d33a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b4f5d451cf2ee821514b547… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:50:43 2017 +0200 server: Store the mapped file descriptor in the memory view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/debugger.c | 9 ++++----- server/file.h | 2 +- server/mapping.c | 11 ++++++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/server/debugger.c b/server/debugger.c index 2eb794a..37f1934 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -169,9 +169,9 @@ static int fill_create_process_event( struct debug_event *event, const void *arg event->data.create_process.name = exe_module->name; event->data.create_process.unicode = 1; - if (exe_module->mapping) /* the doc says write access too, but this doesn't seem a good idea */ - event->data.create_process.file = open_mapping_file( debugger, exe_module->mapping, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE ); + /* the doc says write access too, but this doesn't seem a good idea */ + event->data.create_process.file = open_mapping_file( debugger, exe_module->base, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; } @@ -200,8 +200,7 @@ static int fill_load_dll_event( struct debug_event *event, const void *arg ) event->data.load_dll.dbg_size = dll->dbg_size; event->data.load_dll.name = dll->name; event->data.load_dll.unicode = 1; - if (dll->mapping) - event->data.load_dll.handle = open_mapping_file( debugger, dll->mapping, GENERIC_READ, + event->data.load_dll.handle = open_mapping_file( debugger, dll->base, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE ); return 1; } diff --git a/server/file.h b/server/file.h index b67b749..512b03a 100644 --- a/server/file.h +++ b/server/file.h @@ -147,7 +147,7 @@ extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner extern struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, +extern obj_handle_t open_mapping_file( struct process *process, client_ptr_t base, unsigned int access, unsigned int sharing ); extern struct mapping *grab_mapping_unless_removable( struct mapping *mapping ); extern void free_mapped_views( struct process *process ); diff --git a/server/mapping.c b/server/mapping.c index a75438a..03cffd1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -85,6 +85,7 @@ static const struct object_ops ranges_ops = struct memory_view { struct list entry; /* entry in per-process view list */ + struct fd *fd; /* fd for mapped file */ struct ranges *committed; /* list of committed ranges in this mapping */ unsigned int flags; /* SEC_* flags */ client_ptr_t base; /* view base address (in process addr space) */ @@ -259,6 +260,7 @@ static struct memory_view *find_mapped_view( struct process *process, client_ptr static void free_memory_view( struct memory_view *view ) { + if (view->fd) release_object( view->fd ); if (view->committed) release_object( view->committed ); list_remove( &view->entry ); free( view ); @@ -731,13 +733,15 @@ struct mapping *get_mapping_obj( struct process *process, obj_handle_t handle, u } /* open a new file handle to the file backing the mapping */ -obj_handle_t open_mapping_file( struct process *process, struct mapping *mapping, +obj_handle_t open_mapping_file( struct process *process, client_ptr_t base, unsigned int access, unsigned int sharing ) { obj_handle_t handle; - struct file *file = create_file_for_fd_obj( mapping->fd, access, sharing ); + struct memory_view *view = find_mapped_view( process, base ); + struct file *file; - if (!file) return 0; + if (!view || !view->fd) return 0; + if (!(file = create_file_for_fd_obj( view->fd, access, sharing ))) return 0; handle = alloc_handle( process, file, access, 0 ); release_object( file ); return handle; @@ -925,6 +929,7 @@ DECL_HANDLER(map_view) view->size = req->size; view->start = req->start; view->flags = mapping->flags; + view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; list_add_tail( &current->process->views, &view->entry ); }

1 0

Alexandre Julliard : server: Access the list of committed ranges directly from the mapped view.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 26314a56d327fb08b107f607f4e8871308df30a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26314a56d327fb08b107f607f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:38:46 2017 +0200 server: Access the list of committed ranges directly from the mapped view. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 4 +-- include/wine/server_protocol.h | 8 +++-- server/mapping.c | 67 +++++++++++++++++++++--------------------- server/protocol.def | 4 +-- server/request.h | 14 ++++----- server/trace.c | 4 +-- 6 files changed, 51 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26314a56d327fb08b107f…

1 0

Alexandre Julliard : server: Make the memory ranges structure into a proper object.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: 7e6cf601f4ff3fa613563ed539d42fb43968e037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6cf601f4ff3fa613563ed53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:30:18 2017 +0200 server: Make the memory ranges structure into a proper object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 99 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 74 insertions(+), 25 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 5e71f28..af93be1 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -46,13 +46,39 @@ /* list of memory ranges, used to store committed info */ struct ranges { - unsigned int count; - unsigned int max; + struct object obj; /* object header */ + unsigned int count; /* number of used ranges */ + unsigned int max; /* number of allocated ranges */ struct range { file_pos_t start; file_pos_t end; - } ranges[1]; + } *ranges; +}; + +static void ranges_dump( struct object *obj, int verbose ); +static void ranges_destroy( struct object *obj ); + +static const struct object_ops ranges_ops = +{ + sizeof(struct ranges), /* size */ + ranges_dump, /* dump */ + no_get_type, /* get_type */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + no_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_close_handle, /* close_handle */ + ranges_destroy /* destroy */ }; /* memory view mapped in client address space */ @@ -127,6 +153,18 @@ static size_t page_mask; #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) +static void ranges_dump( struct object *obj, int verbose ) +{ + struct ranges *ranges = (struct ranges *)obj; + fprintf( stderr, "Memory ranges count=%u\n", ranges->count ); +} + +static void ranges_destroy( struct object *obj ) +{ + struct ranges *ranges = (struct ranges *)obj; + free( ranges->ranges ); +} + /* extend a file beyond the current end of file */ static int grow_file( int unix_fd, file_pos_t new_size ) { @@ -262,26 +300,27 @@ static inline void get_section_sizes( const IMAGE_SECTION_HEADER *sec, size_t *m static void add_committed_range( struct mapping *mapping, file_pos_t start, file_pos_t end ) { unsigned int i, j; + struct ranges *committed = mapping->committed; struct range *ranges; - if (!mapping->committed) return; /* everything committed already */ + if (!committed) return; /* everything committed already */ - for (i = 0, ranges = mapping->committed->ranges; i < mapping->committed->count; i++) + for (i = 0, ranges = committed->ranges; i < committed->count; i++) { if (ranges[i].start > end) break; if (ranges[i].end < start) continue; if (ranges[i].start > start) ranges[i].start = start; /* extend downwards */ if (ranges[i].end < end) /* extend upwards and maybe merge with next */ { - for (j = i + 1; j < mapping->committed->count; j++) + for (j = i + 1; j < committed->count; j++) { if (ranges[j].start > end) break; if (ranges[j].end > end) end = ranges[j].end; } if (j > i + 1) { - memmove( &ranges[i + 1], &ranges[j], (mapping->committed->count - j) * sizeof(*ranges) ); - mapping->committed->count -= j - (i + 1); + memmove( &ranges[i + 1], &ranges[j], (committed->count - j) * sizeof(*ranges) ); + committed->count -= j - (i + 1); } ranges[i].end = end; } @@ -290,33 +329,33 @@ static void add_committed_range( struct mapping *mapping, file_pos_t start, file /* now add a new range */ - if (mapping->committed->count == mapping->committed->max) + if (committed->count == committed->max) { - unsigned int new_size = mapping->committed->max * 2; - struct ranges *new_ptr = realloc( mapping->committed, offsetof( struct ranges, ranges[new_size] )); + unsigned int new_size = committed->max * 2; + struct range *new_ptr = realloc( committed->ranges, new_size * sizeof(*new_ptr) ); if (!new_ptr) return; - new_ptr->max = new_size; - ranges = new_ptr->ranges; - mapping->committed = new_ptr; + committed->max = new_size; + committed->ranges = new_ptr; } - memmove( &ranges[i + 1], &ranges[i], (mapping->committed->count - i) * sizeof(*ranges) ); + memmove( &ranges[i + 1], &ranges[i], (committed->count - i) * sizeof(*ranges) ); ranges[i].start = start; ranges[i].end = end; - mapping->committed->count++; + committed->count++; } /* find the range containing start and return whether it's committed */ static int find_committed_range( struct mapping *mapping, file_pos_t start, mem_size_t *size ) { unsigned int i; + struct ranges *committed = mapping->committed; struct range *ranges; - if (!mapping->committed) /* everything is committed */ + if (!committed) /* everything is committed */ { *size = mapping->size - start; return 1; } - for (i = 0, ranges = mapping->committed->ranges; i < mapping->committed->count; i++) + for (i = 0, ranges = committed->ranges; i < committed->count; i++) { if (ranges[i].start > start) { @@ -533,6 +572,21 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s return STATUS_INVALID_FILE_FOR_SECTION; } +static struct ranges *create_ranges(void) +{ + struct ranges *ranges = alloc_object( &ranges_ops ); + + if (!ranges) return NULL; + ranges->count = 0; + ranges->max = 8; + if (!(ranges->ranges = mem_alloc( ranges->max * sizeof(ranges->ranges) ))) + { + release_object( ranges ); + return NULL; + } + return ranges; +} + static unsigned int get_mapping_flags( obj_handle_t handle, unsigned int flags ) { switch (flags & (SEC_IMAGE | SEC_RESERVE | SEC_COMMIT | SEC_FILE)) @@ -639,12 +693,7 @@ static struct object *create_mapping( struct object *root, const struct unicode_ set_error( STATUS_INVALID_PARAMETER ); goto error; } - if (flags & SEC_RESERVE) - { - if (!(mapping->committed = mem_alloc( offsetof(struct ranges, ranges[8]) ))) goto error; - mapping->committed->count = 0; - mapping->committed->max = 8; - } + if ((flags & SEC_RESERVE) && !(mapping->committed = create_ranges())) goto error; mapping->size = (mapping->size + page_mask) & ~((mem_size_t)page_mask); if ((unix_fd = create_temp_file( mapping->size )) == -1) goto error; if (!(mapping->fd = create_anonymous_fd( &mapping_fd_ops, unix_fd, &mapping->obj, @@ -718,12 +767,12 @@ static void mapping_destroy( struct object *obj ) struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); if (mapping->fd) release_object( mapping->fd ); + if (mapping->committed) release_object( mapping->committed ); if (mapping->shared_file) { release_object( mapping->shared_file ); list_remove( &mapping->shared_entry ); } - free( mapping->committed ); } static enum server_fd_type mapping_get_fd_type( struct fd *fd )

1 0

Alexandre Julliard : server: Keep track of mapped memory views.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: a557934c76c0e0bed6b73e5c8f79a0df059ff2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a557934c76c0e0bed6b73e5c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 14:11:49 2017 +0200 server: Keep track of mapped memory views. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 44 ++++++++++++++++--- include/wine/server_protocol.h | 38 ++++++++++++++++- server/file.h | 1 + server/mapping.c | 97 ++++++++++++++++++++++++++++++++++++++++++ server/process.c | 2 + server/process.h | 1 + server/protocol.def | 16 +++++++ server/request.h | 12 ++++++ server/trace.c | 21 +++++++++ 9 files changed, 225 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a557934c76c0e0bed6b73…

1 0

Nikolay Sivov : gdi32: Pick first charmap if none was selected using preferred encoding.
by Alexandre Julliard 26 Sep '17

26 Sep '17

Module: wine Branch: master Commit: d82321006de92dcd74465c905121618a76eae76a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82321006de92dcd74465c905… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 10:13:47 2017 +0100 gdi32: Pick first charmap if none was selected using preferred encoding. FreeType 2.8.1 has similar logic removed from WinFNT module, that always pre-selected first charmap. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 83ca6e2..346e21d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5143,6 +5143,13 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) if (select_charmap( face, *encs )) break; encs++; } + + if (!face->charmap && face->num_charmaps) + { + if (!pFT_Set_Charmap(face, face->charmaps[0])) + return face->charmap->encoding; + } + return *encs; }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
45
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 2017