wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Fabian Maurer : shell32: Prevent text truncation inside the old "browse folder" dialog.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: b7bca1be24df0f5f59b1f3bc86d0f599b216a13a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7bca1be24df0f5f59b1f3bc… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Sep 20 23:34:43 2019 +0200 shell32: Prevent text truncation inside the old "browse folder" dialog. We use the same height for the title as in the new "browse folder" dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46404 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 46f0b6f12d..f19b09f8c2 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -274,7 +274,7 @@ FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "OK", 1, 80, 176, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancel", 2, 134, 176, 50, 14, WS_GROUP | WS_TABSTOP - LTEXT "", IDD_TITLE, 5, 4, 180, 12 + LTEXT "", IDD_TITLE, 5, 4, 180, 24 LTEXT "", IDD_STATUS, 5, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT |

1 0

Nikolay Sivov : dwrite: Sort localized strings by locale name.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: c435eb5c5199e06660efc5e35add3fad848b1cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c435eb5c5199e06660efc5e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 19 17:41:02 2019 +0300 dwrite: Sort localized strings by locale name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 14 ++++++++++++++ dlls/dwrite/opentype.c | 3 +++ 3 files changed, 18 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 32ccd63c3e..d0fed98d6f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -237,6 +237,7 @@ extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDE extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; +extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern IDWriteTextAnalyzer *get_text_analyzer(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3fe2b7eaa7..fc72013feb 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -520,6 +520,20 @@ void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) } } +static int localizedstrings_sorting_compare(const void *left, const void *right) +{ + const struct localizedpair *_l = left, *_r = right; + + return strcmpW(_l->locale, _r->locale); +}; + +void sort_localizedstrings(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + + qsort(strings->data, strings->count, sizeof(*strings->data), localizedstrings_sorting_compare); +} + struct collectionloader { struct list entry; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fced4b0411..efae402f91 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2010,6 +2010,9 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP } } + if (*strings) + sort_localizedstrings(*strings); + return exists ? S_OK : E_FAIL; }

1 0

Akihiro Sagawa : dwrite: Prefer Windows platform names regardless of record order.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: ea07bc41907f8d75d6f0bcd44358c2dc777ae4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea07bc41907f8d75d6f0bcd4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 21:04:02 2019 +0900 dwrite: Prefer Windows platform names regardless of record order. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 57 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e8efa1d196..fced4b0411 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1935,10 +1935,9 @@ static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_a static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { + int i, count, candidate_mac, candidate_unicode; const TT_NAME_V0 *header; BYTE *storage_area = 0; - USHORT count = 0; - int i, candidate; WORD format; BOOL exists; HRESULT hr; @@ -1964,7 +1963,7 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP count = GET_BE_WORD(header->count); exists = FALSE; - candidate = -1; + candidate_unicode = candidate_mac = -1; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; USHORT platform; @@ -1972,34 +1971,40 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP if (GET_BE_WORD(record->nameID) != id) continue; - /* Right now only accept unicode and windows encoded fonts */ platform = GET_BE_WORD(record->platformID); - if (platform != OPENTYPE_PLATFORM_UNICODE && - platform != OPENTYPE_PLATFORM_MAC && - platform != OPENTYPE_PLATFORM_WIN) + switch (platform) { - FIXME("platform %i not supported\n", platform); - continue; - } - - /* Skip such entries for now, fonts tend to duplicate those strings as - WIN platform entries. If font does not have WIN or MAC entry for this id, we will - use this Unicode platform entry while assuming en-US locale. */ - if (platform == OPENTYPE_PLATFORM_UNICODE) { - candidate = i; - continue; + /* Skip Unicode or Mac entries for now, fonts tend to duplicate those + strings as WIN platform entries. If font does not have WIN entry for + this id, we will use Mac or Unicode platform entry while assuming + en-US locale. */ + case OPENTYPE_PLATFORM_UNICODE: + if (candidate_unicode == -1) + candidate_unicode = i; + break; + case OPENTYPE_PLATFORM_MAC: + if (candidate_mac == -1) + candidate_mac = i; + break; + case OPENTYPE_PLATFORM_WIN: + if (opentype_decode_namerecord(header, storage_area, i, *strings)) + exists = TRUE; + break; + default: + FIXME("platform %i not supported\n", platform); + break; } - - if (!opentype_decode_namerecord(header, storage_area, i, *strings)) - continue; - - exists = TRUE; } - if (!exists) { - if (candidate != -1) - exists = opentype_decode_namerecord(header, storage_area, candidate, *strings); - else { + if (!exists) + { + if (candidate_mac != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_mac, *strings); + if (!exists && candidate_unicode != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_unicode, *strings); + + if (!exists) + { IDWriteLocalizedStrings_Release(*strings); *strings = NULL; }

1 0

Zebediah Figura : quartz: Get rid of the no longer used base parser.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: d44d83b684a8d6c2299d4501e349047d25f62b46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44d83b684a8d6c2299d4501… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 20 17:35:06 2019 -0500 quartz: Get rid of the no longer used base parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 - dlls/quartz/acmwrapper.c | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 1 - dlls/quartz/filesource.c | 1 - dlls/quartz/parser.c | 709 ------------------------------------- dlls/quartz/parser.h | 77 ---- dlls/quartz/pin.c | 818 ------------------------------------------- dlls/quartz/pin.h | 133 ------- dlls/quartz/quartz_private.h | 12 +- dlls/quartz/videorenderer.c | 1 - dlls/quartz/vmr9.c | 1 - 12 files changed, 1 insertion(+), 1756 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d44d83b684a8d6c2299d…

1 0

Zebediah Figura : winegstreamer: Reimplement the MPEG splitter on top of the mpegaudioparse plugin.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 40a4c782b7f77534535dfa7bb2a97049026fef47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a4c782b7f77534535dfa7b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 20 17:35:05 2019 -0500 winegstreamer: Reimplement the MPEG splitter on top of the mpegaudioparse plugin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/main.c | 1 - dlls/quartz/mpegsplit.c | 890 --------------------------------------- dlls/quartz/quartz_private.h | 1 - dlls/quartz/quartz_strmif.idl | 7 - dlls/quartz/regsvr.c | 27 -- dlls/quartz/tests/mpegsplit.c | 14 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 292 ++++++++++++- dlls/winegstreamer/main.c | 66 +++ 10 files changed, 359 insertions(+), 941 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40a4c782b7f77534535d…

1 0

Francois Gouget : testbot: Fix the VM::RecordResult() documentation.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: f1ffd15cab379f632ce3c02e0b0d7b2e14b86638 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f1ffd15cab379f632ce3c02… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 17:01:54 2019 +0200 testbot: Fix the VM::RecordResult() documentation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d240fb9..37ebf9a 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -652,7 +652,7 @@ sub RecordStatus($$;$) =pod =over 12 -=item C<RecordStatus()> +=item C<RecordResult()> Adds a Record of the specified VM process result.

1 0

Francois Gouget : testbot: Requeue the task if the VM is not ready for it.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: 89f32e99c754122a4075528803b6369ea4d82489 URL: https://source.winehq.org/git/tools.git/?a=commit;h=89f32e99c754122a4075528… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 16:59:31 2019 +0200 testbot: Requeue the task if the VM is not ready for it. In order to run a task a VM should be in the 'running' state and powered on. If either check fails that's not the fault of the task and a second attempt may succeed. So don't end the task with a boterror. Instead requeue it and put the VM offline so its true state is evaluated (and notify the administrator of course). This implies only resetting the VM error count after successfully running a task otherwise we could get into an infinite loop putting it offline at the start of every task. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 1 - testbot/bin/WineRunBuild.pl | 32 ++++++++++++++++++++++--- testbot/bin/WineRunReconfig.pl | 37 ++++++++++++++++++++++++---- testbot/bin/WineRunTask.pl | 37 ++++++++++++++++++++++++---- testbot/bin/WineRunWineTest.pl | 41 +++++++++++++++++++++++++++----- testbot/lib/WineTestBot/LibvirtDomain.pm | 13 ++++++++++ 6 files changed, 143 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=89f32e99c754122a407…

1 0

Francois Gouget : testbot/LibvirtTool: Remove _GetStateName(), it is not used anymore.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: 509752b6e6f5eed17eb72b45076dd8427c84ceb8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=509752b6e6f5eed17eb72b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 16:59:20 2019 +0200 testbot/LibvirtTool: Remove _GetStateName(), it is not used anymore. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index bb68bd0..7f462ea 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -393,23 +393,6 @@ sub IsReady($) ); } -sub _GetStateName($) -{ - my ($State) = @_; - - my %StateNames = ( - Sys::Virt::Domain::STATE_NOSTATE => "no state", - Sys::Virt::Domain::STATE_RUNNING => "running", - Sys::Virt::Domain::STATE_BLOCKED => "blocked", - Sys::Virt::Domain::STATE_PAUSED => "paused", - Sys::Virt::Domain::STATE_SHUTDOWN => "shutdown", - Sys::Virt::Domain::STATE_SHUTOFF => "shutoff", - Sys::Virt::Domain::STATE_CRASHED => "crashed", - Sys::Virt::Domain::STATE_PMSUSPENDED => "pmsuspended", - ); - return $StateNames{$State} || "unknown"; -} - sub PowerOff($) { my ($self) = @_;

1 0

Francois Gouget : testbot/Engine: Let the caller trace VM::Run() errors.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: c52a230ef658608dd68562a466bcc670caa6a241 URL: https://source.winehq.org/git/tools.git/?a=commit;h=c52a230ef658608dd68562a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 19:21:57 2019 +0200 testbot/Engine: Let the caller trace VM::Run() errors. Libraries are not supposed to spam the log and most callers already trace VM::Run() errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 3 ++- testbot/lib/WineTestBot/VMs.pm | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 7375337..4128e9e 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -766,7 +766,8 @@ sub _SacrificeVM($$$) $Host->{dirty}++; $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice"); $Victim->KillChild(); - $Victim->RunPowerOff(); + my $ErrMessage = $Victim->RunPowerOff(); + LogMsg "$ErrMessage\n" if (defined $ErrMessage); return 1; } diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d85df1d..d240fb9 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -379,10 +379,7 @@ sub Run($$$$$$) if (defined $self->ChildPid) { - my $ErrMessage = "Cannot run ". ShArgv2Cmd(@$Args) ." because the ". $self->ChildPid ." process is already using the ". $self->Name ." VM"; - require WineTestBot::Log; - WineTestBot::Log::LogMsg("$ErrMessage\n"); - return $ErrMessage; + return "Cannot run ". ShArgv2Cmd(@$Args) ." because process ". $self->ChildPid ." is already using the ". $self->Name ." VM"; } # There are two $VM->ChildPid race conditions to avoid:

1 0

Francois Gouget : testbot/Engine: Fix recording the new sacrificed VM status.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: tools Branch: master Commit: d1075ec8f78e9e4e928b4f7cceb15ead53b3a9ed URL: https://source.winehq.org/git/tools.git/?a=commit;h=d1075ec8f78e9e4e928b4f7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 23 19:22:00 2019 +0200 testbot/Engine: Fix recording the new sacrificed VM status. The status will not be 'dirty' if VM::RunPowerOff() failed. Recording the right status is important otherwise ScheduleJobs() will attempt to record de VM's current status in its catch-all loop, resulting in a fatal 'Could not change key' error. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Engine/Scheduler.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index 4128e9e..530a2ee 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -764,10 +764,10 @@ sub _SacrificeVM($$$) $Sched->{busyvms}->{$VictimKey} = 1; $Host->{$Victim->Status}--; $Host->{dirty}++; - $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice"); $Victim->KillChild(); my $ErrMessage = $Victim->RunPowerOff(); LogMsg "$ErrMessage\n" if (defined $ErrMessage); + $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : $VM->Status ." sacrifice"); return 1; }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
63
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 2019