wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Alexandre Julliard : server: Keep a reference to the shared PE mapping in mapped views.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 8c944f7a9d202be199ff2804e0236120fca9e95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c944f7a9d202be199ff2804e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 10:08:31 2017 +0200 server: Keep a reference to the shared PE mapping in mapped views. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 57bf716..f9f50ed 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -123,6 +123,7 @@ 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 */ + struct shared_map *shared; /* temp file for shared PE mapping */ unsigned int flags; /* SEC_* flags */ client_ptr_t base; /* view base address (in process addr space) */ mem_size_t size; /* view size */ @@ -311,6 +312,7 @@ static void free_memory_view( struct memory_view *view ) { if (view->fd) release_object( view->fd ); if (view->committed) release_object( view->committed ); + if (view->shared) release_object( view->shared ); list_remove( &view->entry ); free( view ); } @@ -958,6 +960,7 @@ DECL_HANDLER(map_view) 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; + view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; list_add_tail( &current->process->views, &view->entry ); }

1 0

Alexandre Julliard : server: Add a separate object to store the PE shared mapping file.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: wine Branch: master Commit: 71903899aa620e958de42e63f8d0fe51abd5a321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71903899aa620e958de42e63f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 10:06:14 2017 +0200 server: Add a separate object to store the PE shared mapping file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/mapping.c | 100 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 26 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 096c15e..57bf716 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -81,6 +81,42 @@ static const struct object_ops ranges_ops = ranges_destroy /* destroy */ }; +/* file backing the shared sections of a PE image mapping */ +struct shared_map +{ + struct object obj; /* object header */ + struct fd *fd; /* file descriptor of the mapped PE file */ + struct file *file; /* temp file holding the shared data */ + struct list entry; /* entry in global shared maps list */ +}; + +static void shared_map_dump( struct object *obj, int verbose ); +static void shared_map_destroy( struct object *obj ); + +static const struct object_ops shared_map_ops = +{ + sizeof(struct shared_map), /* size */ + shared_map_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 */ + shared_map_destroy /* destroy */ +}; + +static struct list shared_map_list = LIST_INIT( shared_map_list ); + /* memory view mapped in client address space */ struct memory_view { @@ -102,8 +138,7 @@ struct mapping enum cpu_type cpu; /* client CPU (for PE image mapping) */ pe_image_info_t image; /* image info (for PE image mapping) */ struct ranges *committed; /* list of committed ranges in this mapping */ - struct file *shared_file; /* temp file for shared PE mapping */ - struct list shared_entry; /* entry in global shared PE mappings list */ + struct shared_map *shared; /* temp file for shared PE mapping */ }; static void mapping_dump( struct object *obj, int verbose ); @@ -149,8 +184,6 @@ static const struct fd_ops mapping_fd_ops = default_fd_reselect_async /* reselect_async */ }; -static struct list shared_list = LIST_INIT(shared_list); - static size_t page_mask; #define ROUND_SIZE(size) (((size) + page_mask) & ~page_mask) @@ -168,6 +201,21 @@ static void ranges_destroy( struct object *obj ) free( ranges->ranges ); } +static void shared_map_dump( struct object *obj, int verbose ) +{ + struct shared_map *shared = (struct shared_map *)obj; + fprintf( stderr, "Shared mapping fd=%p file=%p\n", shared->fd, shared->file ); +} + +static void shared_map_destroy( struct object *obj ) +{ + struct shared_map *shared = (struct shared_map *)obj; + + release_object( shared->fd ); + release_object( shared->file ); + list_remove( &shared->entry ); +} + /* extend a file beyond the current end of file */ static int grow_file( int unix_fd, file_pos_t new_size ) { @@ -277,13 +325,13 @@ void free_mapped_views( struct process *process ) } /* find the shared PE mapping for a given mapping */ -static struct file *get_shared_file( struct mapping *mapping ) +static struct shared_map *get_shared_file( struct fd *fd ) { - struct mapping *ptr; + struct shared_map *ptr; - LIST_FOR_EACH_ENTRY( ptr, &shared_list, struct mapping, shared_entry ) - if (is_same_file_fd( ptr->fd, mapping->fd )) - return (struct file *)grab_object( ptr->shared_file ); + LIST_FOR_EACH_ENTRY( ptr, &shared_map_list, struct shared_map, entry ) + if (is_same_file_fd( ptr->fd, fd )) + return (struct shared_map *)grab_object( ptr ); return NULL; } @@ -397,6 +445,8 @@ static int find_committed_range( struct memory_view *view, file_pos_t start, mem static int build_shared_mapping( struct mapping *mapping, int fd, IMAGE_SECTION_HEADER *sec, unsigned int nb_sec ) { + struct shared_map *shared; + struct file *file; unsigned int i; mem_size_t total_size; size_t file_size, map_size, max_size; @@ -420,13 +470,12 @@ static int build_shared_mapping( struct mapping *mapping, int fd, } if (!total_size) return 1; /* nothing to do */ - if ((mapping->shared_file = get_shared_file( mapping ))) return 1; + if ((mapping->shared = get_shared_file( mapping->fd ))) return 1; /* create a temp file for the mapping */ if ((shared_fd = create_temp_file( total_size )) == -1) return 0; - if (!(mapping->shared_file = create_file_for_fd( shared_fd, FILE_GENERIC_READ|FILE_GENERIC_WRITE, 0 ))) - return 0; + if (!(file = create_file_for_fd( shared_fd, FILE_GENERIC_READ|FILE_GENERIC_WRITE, 0 ))) return 0; if (!(buffer = malloc( max_size ))) goto error; @@ -457,11 +506,16 @@ static int build_shared_mapping( struct mapping *mapping, int fd, if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; } free( buffer ); + + if (!(shared = alloc_object( &shared_map_ops ))) goto error; + shared->fd = (struct fd *)grab_object( mapping->fd ); + shared->file = file; + list_add_head( &shared_map_list, &shared->entry ); + mapping->shared = shared; return 1; error: - release_object( mapping->shared_file ); - mapping->shared_file = NULL; + release_object( file ); free( buffer ); return 0; } @@ -583,8 +637,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!build_shared_mapping( mapping, unix_fd, sec, nt.FileHeader.NumberOfSections )) goto error; - if (mapping->shared_file) list_add_head( &shared_list, &mapping->shared_entry ); - free( sec ); return 0; @@ -650,7 +702,7 @@ static struct object *create_mapping( struct object *root, const struct unicode_ mapping->size = size; mapping->fd = NULL; - mapping->shared_file = NULL; + mapping->shared = NULL; mapping->committed = NULL; if (!(mapping->flags = get_mapping_flags( handle, flags ))) goto error; @@ -747,9 +799,9 @@ static void mapping_dump( struct object *obj, int verbose ) { struct mapping *mapping = (struct mapping *)obj; assert( obj->ops == &mapping_ops ); - fprintf( stderr, "Mapping size=%08x%08x flags=%08x fd=%p shared_file=%p\n", + fprintf( stderr, "Mapping size=%08x%08x flags=%08x fd=%p shared=%p\n", (unsigned int)(mapping->size >> 32), (unsigned int)mapping->size, - mapping->flags, mapping->fd, mapping->shared_file ); + mapping->flags, mapping->fd, mapping->shared ); } static struct object_type *mapping_get_type( struct object *obj ) @@ -780,11 +832,7 @@ static void mapping_destroy( struct object *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 ); - } + if (mapping->shared) release_object( mapping->shared ); } static enum server_fd_type mapping_get_fd_type( struct fd *fd ) @@ -857,8 +905,8 @@ DECL_HANDLER(get_mapping_info) return; } - if (mapping->shared_file) - reply->shared_file = alloc_handle( current->process, mapping->shared_file, + if (mapping->shared) + reply->shared_file = alloc_handle( current->process, mapping->shared->file, GENERIC_READ|GENERIC_WRITE, 0 ); release_object( mapping ); }

1 0

Julian Rüger : German translation for release 2.18
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 8270d9549e17768160f5be8b8a389f62a71879a8 URL: http://source.winehq.org/git/website.git/?a=commit;h=8270d9549e17768160f5be… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:42:05 2017 +0200 German translation for release 2.18 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017092901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2017092901.xml b/news/de/2017092901.xml new file mode 100644 index 0000000..47eb416 --- /dev/null +++ b/news/de/2017092901.xml @@ -0,0 +1,16 @@ +<news> +<date>29. September 2017</date> +<title>Wine 2.18 freigegeben</title> +<body> + Die Entwicklungsversion 2.18 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.18">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Radiale Gradienten in Direct2D.</li> + <li>Unterstützung von asynchronen Nachrichten in den WebServices.</li> + <li>Verbesserungen an den Virtual-Memory-Write-Watches.</li> + <li>Kompatibilitätskorrekturen für FreeType 2.8.1.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.18.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.17
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 041ebc1e408027def4dcacf298abfb36aff4c601 URL: http://source.winehq.org/git/website.git/?a=commit;h=041ebc1e408027def4dcac… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:37:57 2017 +0200 German translation for release 2.17 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017091501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017091501.xml b/news/de/2017091501.xml new file mode 100644 index 0000000..4ed13d3 --- /dev/null +++ b/news/de/2017091501.xml @@ -0,0 +1,17 @@ +<news> +<date>15. September 2017</date> +<title>Wine 2.17 freigegeben</title> +<body> + Die Entwicklungsversion 2.17 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.17">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Unterstützung des Graustufenmodus in DirectWrite.</li> + <li>Per-Anwendung StartupWMClass in Desktopdateien.</li> + <li>Kompatibilitätsverbesserungen des virtuellen Speichers.</li> + <li>Verbesserte Palettenbehandlung in WindowsCodecs.</li> + <li>Verbesserungen für Antwortnachrichten in den WebServices.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.17.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.16
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 040c68c57317e3f2a66da2fb472638757afd6b38 URL: http://source.winehq.org/git/website.git/?a=commit;h=040c68c57317e3f2a66da2… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:32:43 2017 +0200 German translation for release 2.16 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017090101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2017090101.xml b/news/de/2017090101.xml new file mode 100644 index 0000000..2707612 --- /dev/null +++ b/news/de/2017090101.xml @@ -0,0 +1,17 @@ +<news> +<date>1. September 2017</date> +<title>Wine 2.16 freigegeben</title> +<body> + Die Entwicklungsversion 2.16 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.16">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für das Einfügen von Metafiles in RichEdit.</li> + <li>Bessere Unterstützung von PNG-Graustufenbildern.</li> + <li>Unterstützung der Sicherheitsfeatures beim Laden von Bibliotheken.</li> + <li>Bessere Verarbeitung von Transformationen in GdiPlus.</li> + <li>Rendering-Verbesserungen in DirectWrite.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.16.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 2.15
by Jeremy Newman 04 Oct '17

04 Oct '17

Module: website Branch: master Commit: 5d8e3374f3961beb2dfd279379f727348795fda0 URL: http://source.winehq.org/git/website.git/?a=commit;h=5d8e3374f3961beb2dfd27… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Oct 4 17:28:21 2017 +0200 German translation for release 2.15 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2017082001.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2017082001.xml b/news/de/2017082001.xml new file mode 100644 index 0000000..d642e53 --- /dev/null +++ b/news/de/2017082001.xml @@ -0,0 +1,15 @@ +<news> +<date>20. August 2017</date> +<title>Wine 2.15 freigegeben</title> +<body> + Die Entwicklungsversion 2.15 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/2.15">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für AES-Verschlüsselung.</li> + <li>Verbesserte Bezier-Unterstützung in Direct2D.</li> + <li>Chunked-Transfer-Verbesserungen in WinInet.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/2.x/wine-2.15.tar.xz">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Francois Gouget : testbot: Separate the Libvirt operations from the VM class.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: tools Branch: master Commit: c98fb895228afaddebcbf5cb0847ed146b362280 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c98fb895228afaddebcbf5cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 4 12:37:57 2017 +0200 testbot: Separate the Libvirt operations from the VM class. Libvirt operations can be slow and should be avoided in the single-threaded Engine server. Separating them from the VM class makes the issues more apparent. The new architecture also resets the Libvirt connection whenever a Libvirt error occurs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 9 +- testbot/bin/RevertVM.pl | 5 +- testbot/bin/WineRunBuild.pl | 4 +- testbot/bin/WineRunReconfig.pl | 8 +- testbot/bin/WineRunTask.pl | 9 +- testbot/lib/WineTestBot/Jobs.pm | 8 +- testbot/lib/WineTestBot/LibvirtDomain.pm | 336 +++++++++++++++++++++++++++++++ testbot/lib/WineTestBot/VMs.pm | 295 ++------------------------- 8 files changed, 377 insertions(+), 297 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c98fb895228afaddebcb…

1 0

Francois Gouget : testbot: Trace the revert time.
by Alexandre Julliard 04 Oct '17

04 Oct '17

Module: tools Branch: master Commit: 860dfa0119265290122e1b49ced90a1d44950cc6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=860dfa0119265290122e1b49… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 4 12:32:12 2017 +0200 testbot: Trace the revert time. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/RevertVM.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index f84082f..00a8721 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -222,6 +222,6 @@ if (defined($ErrMessage)) FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM; } -LogMsg "Revert of $VMKey completed\n"; +LogMsg "Revert of $VMKey completed in ", Elapsed($Start), " s\n"; exit 0;

1 0

Fabian Maurer : crypt32: In CRYPT_CollectionAdvanceEnum remove unneeded statement (cppcheck).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: b34ea10112227a0d8554c81fc093c0cf6e1bc1b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34ea10112227a0d8554c81fc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:44:54 2017 +0200 crypt32: In CRYPT_CollectionAdvanceEnum remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/collectionstore.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 8b90270..2c2398d 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -164,7 +164,6 @@ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, Context_AddRef(child); child = contextFuncs->enumContext(storeEntry->store, child); Context_Release(prev); - prev = NULL; } else {

1 0

Fabian Maurer : wineandroid.drv: In AudioClient_IsFormatSupported remove unneeded statement (cppcheck).
by Alexandre Julliard 03 Oct '17

03 Oct '17

Module: wine Branch: master Commit: 67756774f5b8d37fee278959d4ba0400acb9d68f URL: http://source.winehq.org/git/wine.git/?a=commit;h=67756774f5b8d37fee278959d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:43:23 2017 +0200 wineandroid.drv: In AudioClient_IsFormatSupported remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 275b652..84aafb7 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -1079,11 +1079,8 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - if(outpwfx){ + if(outpwfx) *outpwfx = NULL; - if(mode != AUDCLNT_SHAREMODE_SHARED) - outpwfx = NULL; - } hr = waveformat_to_pcm(This, pwfx, &pcm); TRACE("returning: %08x\n", hr);

1 0

← Newer
1
...
40
41
42
43
44
45
46
47
48
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 October 2017