October 2017 - Wine-Commits

Alexandre Julliard : server: Add a separate object to store the PE shared mapping file.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

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

Alistair Leslie-Hughes : oleaut32/tests: Add VarDateFromStr test.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

Module: wine Branch: master Commit: 884c6ddd516478a94cd4e42ff5510ad226e69bde URL: http://source.winehq.org/git/wine.git/?a=commit;h=884c6ddd516478a94cd4e42ff… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 4 04:40:22 2017 +0000 oleaut32/tests: Add VarDateFromStr test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index a6f9ae5..be6ec91 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3109,6 +3109,8 @@ static void test_VarDateFromStr(void) DFS("6/30/2011 01:20:34"); EXPECT_DBL(40724.05594907407); DFS("6/30/2011 01:20:34 AM"); EXPECT_DBL(40724.05594907407); DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); + DFS("2013-05-14 02:04:12"); EXPECT_DBL(41408.08625000001); + DFS("2013-05-14 02:04:12.017000000"); EXPECT_MISMATCH; /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a data with ideographic space */

1 0

Julian Rüger : German translation for release 2.18
by Jeremy Newman Oct. 4, 2017

Oct. 4, 2017

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 Oct. 4, 2017

Oct. 4, 2017

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 Oct. 4, 2017

Oct. 4, 2017

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 Oct. 4, 2017

Oct. 4, 2017

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: Trace the revert time.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

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

Francois Gouget : testbot: Separate the Libvirt operations from the VM class.
by Alexandre Julliard Oct. 4, 2017

Oct. 4, 2017

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

Fabian Maurer : oleaut32: In userdefined_to_variantvt remove unneeded statement (cppcheck).
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: c0da750e8a8423c62e024667df6387af2fbb5500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0da750e8a8423c62e024667d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Oct 3 17:40:22 2017 +0200 oleaut32: In userdefined_to_variantvt remove unneeded statement (cppcheck). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 311cca3..ebf6d85 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6453,7 +6453,6 @@ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, break; case TKIND_ALIAS: - tdesc = &tattr->tdescAlias; hr = typedescvt_to_variantvt(tinfo2, &tattr->tdescAlias, vt); break;

1 0

Hans Leidekker : webservices: Get rid of insert_string_cb.
by Alexandre Julliard Oct. 3, 2017

Oct. 3, 2017

Module: wine Branch: master Commit: c80c45127e9027fca9d1e42111be72949398722c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80c45127e9027fca9d1e4211… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 3 16:14:45 2017 +0200 webservices: Get rid of insert_string_cb. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/string.c | 12 ------------ dlls/webservices/webservices_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/webservices/string.c b/dlls/webservices/string.c index 75e8b75..45a5512 100644 --- a/dlls/webservices/string.c +++ b/dlls/webservices/string.c @@ -152,18 +152,6 @@ HRESULT insert_string( struct dictionary *dict, unsigned char *data, ULONG len, return S_OK; } -HRESULT CALLBACK insert_string_cb( void *state, const WS_XML_STRING *str, BOOL *found, ULONG *id, WS_ERROR *error ) -{ - struct dictionary *dict = state; - int index = find_string( dict, str->bytes, str->length, id ); - HRESULT hr = S_OK; - - assert( !dict->dict.isConst ); - if (index == -1 || (hr = insert_string( dict, str->bytes, str->length, index, id )) == S_OK) *found = TRUE; - else *found = FALSE; - return hr; -} - HRESULT add_xml_string( WS_XML_STRING *str ) { HRESULT hr = S_OK; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index d30f7a3..f8cc6d9 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -49,7 +49,6 @@ const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; -HRESULT CALLBACK insert_string_cb( void *, const WS_XML_STRING *, BOOL *, ULONG *, WS_ERROR * ) DECLSPEC_HIDDEN; void clear_dict( struct dictionary * ) DECLSPEC_HIDDEN; HRESULT writer_enable_lookup( WS_XML_WRITER * ) DECLSPEC_HIDDEN;

1 0