October 2019 - Wine-devel - list.winehq.org

[PATCH] msvcp110: Add more exports.
by Gijs Vermeulen 01 Oct '19

01 Oct '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 00c3707ea4..eebc430b1e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1572,8 +1572,8 @@ @ cdecl -arch=win64 ?_Launch(a)_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Link @ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Link -@ stub -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Link(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Link_wchar +@ cdecl -arch=win64 ?_Link(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Link_wchar @ cdecl -arch=win32 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPAV123(a)PAVfacet@23(a)I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac(a)_Locimp@locale(a)std@@CAXPEAV123(a)PEAVfacet@23(a)_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor(a)_Locimp@locale(a)std@@CAXPAV123(a)ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor @@ -1773,8 +1773,8 @@ @ cdecl -arch=win64 ?_Swap_all(a)_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all @ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPBD0(a)Z(str str) tr2_sys__Symlink @ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEBD0(a)Z(str str) tr2_sys__Symlink -@ stub -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z -@ stub -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z +@ cdecl -arch=win32 ?_Symlink(a)sys@tr2(a)std@@YAHPB_W0(a)Z(wstr wstr) tr2_sys__Symlink_wchar +@ cdecl -arch=win64 ?_Symlink(a)sys@tr2(a)std@@YAHPEB_W0(a)Z(wstr wstr) tr2_sys__Symlink_wchar @ extern ?_Sync(a)ios_base@std@@0_NA ios_base_Sync @ cdecl -arch=win32 ?_Syserror_map(a)std@@YAPBDH(a)Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map(a)std@@YAPEBDH(a)Z(long) _Syserror_map @@ -1807,8 +1807,8 @@ @ cdecl -arch=win64 ?_Tidy(a)ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy @ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPBD(a)Z(str) tr2_sys__Unlink @ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEBD(a)Z(str) tr2_sys__Unlink -@ stub -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z -@ stub -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z +@ cdecl -arch=win32 ?_Unlink(a)sys@tr2(a)std@@YAHPB_W(a)Z(wstr) tr2_sys__Unlink_wchar +@ cdecl -arch=win64 ?_Unlink(a)sys@tr2(a)std@@YAHPEB_W(a)Z(wstr) tr2_sys__Unlink_wchar @ cdecl -arch=arm ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UAEXXZ(ptr) basic_streambuf_char__Unlock @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@UEAAXXZ(ptr) basic_streambuf_char__Unlock @@ -3732,7 +3732,7 @@ @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) @ cdecl _Cnd_do_broadcast_at_thread_exit() -@ cdecl _Cnd_init(ptr) +@ cdecl _Cnd_init(ptr) @ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) @ cdecl _Cnd_signal(ptr) @ cdecl _Cnd_timedwait(ptr ptr ptr) @@ -3891,9 +3891,9 @@ @ stub _Xp_setw @ stub _Xp_sqrtx @ stub _Xp_subx -@ stub _Xtime_diff_to_millis +@ cdecl _Xtime_diff_to_millis(ptr) @ cdecl _Xtime_diff_to_millis2(ptr ptr) -@ cdecl _Xtime_get_ticks() +@ cdecl -ret64 _Xtime_get_ticks() @ stub __Wcrtomb_lk # extern _Zero @ cdecl towctrans(long long) -- 2.23.0

2 1

[PATCH 1/2] msvcrt: Implement %D format for strftime
by Vijay Kiran Kamuju 01 Oct '19

01 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 14 ++++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index faf1a6dcb46..1bc9f3802b2 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%D", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c72b3ed21ee..7fe85295185 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1157,6 +1157,20 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; +#if _MSVCR_VER>=140 + case 'D': + if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = '/'; + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + if(ret < max) + str[ret++] = '/'; + if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) + return 0; + break; +#endif case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 02ea1297bb2..77221566b54 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,14 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); + ok(retA == 8, "expected 8, got %d\n", (int)retA); + ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#D", &epoch); + ok(retA == 6, "expected 6, got %d\n", (int)retA); + ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "00:00"), "got %s\n", bufA); -- 2.21.0

3 5

[PATCH v2] ntdll: Add exception handling around DbgBreakPoint.
by Akihiro Sagawa 01 Oct '19

01 Oct '19

In v2, fix test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47509 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/tests/debugger.c | 31 +++++++++++++++++++++++-------- dlls/ntdll/process.c | 19 ++++++++++++++++++- 2 files changed, 41 insertions(+), 9 deletions(-)

2 2

[PATCH] include: Add Media Session capabilities flags definition.
by Nikolay Sivov 01 Oct '19

01 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/mfapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 346bd38d92..43f5cd6087 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -380,6 +380,14 @@ typedef enum MF_TOPOSTATUS_ENDED = 400, } MF_TOPOSTATUS; +/* Media Session capabilities. */ +#define MFSESSIONCAP_START 0x00000001 +#define MFSESSIONCAP_SEEK 0x00000002 +#define MFSESSIONCAP_PAUSE 0x00000004 +#define MFSESSIONCAP_RATE_FORWARD 0x00000010 +#define MFSESSIONCAP_RATE_REVERSE 0x00000020 +#define MFSESSIONCAP_DOES_NOT_USE_NETWORK 0x00000040 + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); -- 2.23.0

1 0

[PATCH] dmime: IDirectMusicPerformance8 SetNotificationHandle to set a minimum timeout if not already set
by Alistair Leslie-Hughes 01 Oct '19

01 Oct '19

- Reformat to use spaces - Changed FIXME -> TRACE - Remove stub from trace. - Set the mimimum timeout if one hasn't been specified. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/performance.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b4d01017..cc7783d9ef 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -519,12 +519,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGraph(IDirectMusicPerforma static HRESULT WINAPI IDirectMusicPerformance8Impl_SetNotificationHandle(IDirectMusicPerformance8 *iface, HANDLE hNotification, REFERENCE_TIME rtMinimum) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, 0x%s): stub\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); - This->hNotification = hNotification; - if (rtMinimum) This->rtMinimum = rtMinimum; - return S_OK; + TRACE("(%p, %p, 0x%s)\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); + + This->hNotification = hNotification; + if (rtMinimum) + This->rtMinimum = rtMinimum; + else if(!This->rtMinimum) + This->rtMinimum = 20000000; /* 2 seconds */ + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_GetNotificationPMsg(IDirectMusicPerformance8 *iface, -- 2.17.1

1 0

[PATCH 1/2] testbot/Submit: Preserve the uploaded file on the first submit page.
by Francois Gouget 01 Oct '19

01 Oct '19

The file input type cannot take an initial path for obvious security reasons. So when going back to the first page show the currently selected filename along with an option to unset it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 75 ++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 22 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2cc9c8022..b9ead7451 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -58,7 +58,7 @@ sub _Upload($) { my ($self) = @_; - my $Src = $self->CGI->upload("FileName"); + my $Src = $self->CGI->upload("Upload"); if (defined $Src) { my $OldUMask = umask(002); @@ -76,7 +76,7 @@ sub _Upload($) { umask($OldUMask); delete $self->{FileName}; - $self->{ErrField} = "FileName"; + $self->{ErrField} = "Upload"; $self->{ErrMessage} = "Unable to save the uploaded file"; return undef; } @@ -84,7 +84,7 @@ sub _Upload($) else { delete $self->{FileName}; - $self->{ErrField} = "FileName"; + $self->{ErrField} = "Upload"; $self->{ErrMessage} = "Unable to upload the file"; return undef; } @@ -476,7 +476,8 @@ sub GetHeaderText($) } elsif ($self->{Page} == 1) { - return "Specify the patch file that you want to upload and submit " . + return defined $self->{FileName} ? "" : + "Specify the patch file that you want to upload and submit " . "for testing.<br>\n" . "You can also specify a Windows .exe file, this would normally be " . "a Wine test executable that you cross-compiled." @@ -539,9 +540,18 @@ sub GenerateFields($) elsif ($self->{Page} == 1) { print "<div class='ItemProperty'><label>File</label>", - "<div class='ItemValue'>", - "<input type='file' name='FileName' size='64' maxlength='64' />", - " <span class='Required'>*</span></div></div>\n"; + "<div class='ItemValue'>"; + if (defined $self->{FileName}) + { + $self->_GenerateStateField("FileName"); + print "<input type='submit' name='Action' value='Unset'/> $self->{FileName}"; + } + else + { + print "<input type='file' name='Upload' size='64' maxlength='64'/>", + " <span class='Required'>*</span>"; + } + print "</div></div>\n"; my $Branches = CreateBranches(); if (!defined $self->{Branch}) @@ -727,12 +737,42 @@ sub _SetPage($$) delete $self->{PropertyDescriptors}; } +sub OnUnset($) +{ + my ($self) = @_; + + if (!$self->_ValidateFileName()) + { + # Ignore the error. What counts is not using a suspicious FileName. + delete $self->{ErrField}; + delete $self->{ErrMessage}; + } + elsif (defined $self->{FileName}) + { + my $StagingFilePath = $self->_GetStagingFilePath(); + unlink($StagingFilePath) if ($StagingFilePath); + delete $self->{FileName}; + } + delete $self->{TestExecutable}; + delete $self->{CmdLineArg}; + + return 1; +} + sub OnPage1Next($) { my ($self) = @_; - if (!$self->_ValidateFileName() or !$self->_Upload() or !$self->Validate() or - !$self->_ValidateVMSelection("deselect")) + if (defined $self->{FileName}) + { + return undef if (!$self->_ValidateFileName()); + } + else + { + $self->{FileName} = $self->GetParam("Upload"); + return undef if (!$self->_ValidateFileName() or !$self->_Upload()); + } + if (!$self->Validate() or !$self->_ValidateVMSelection("deselect")) { return undef; } @@ -779,19 +819,6 @@ sub OnPage2Prev($) { my ($self) = @_; - if (!$self->_ValidateFileName()) - { - # Ignore the error. What counts is not using a suspicious FileName. - delete $self->{ErrField}; - delete $self->{ErrMessage}; - } - elsif (defined $self->{FileName}) - { - my $StagingFilePath = $self->_GetStagingFilePath(); - unlink($StagingFilePath) if ($StagingFilePath); - delete $self->{FileName}; - } - $self->_SetPage(1); return 1; } @@ -1076,6 +1103,10 @@ sub OnAction($$) { return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); } + elsif ($Action eq "Unset") + { + return $self->OnUnset(); + } elsif ($Action eq "Submit") { return $self->OnSubmit(); -- 2.20.1

1 1

[PATCH] testbot/WineRunBuild: Tweak the 'powered off VM' notification email.
by Francois Gouget 01 Oct '19

01 Oct '19

Show the Libvirt Domain's state and point to the job page as we do in the other WineRun* scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 89582a103..71e7e39f4 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -337,15 +337,18 @@ if (!$Debug and $VM->Status ne "running") Error("The VM is not ready for use (" . $VM->Status . ")\n"); WrapUpAndExit('queued'); } -if (!$VM->GetDomain()->IsPoweredOn()) +my $Domain = $VM->GetDomain(); +if (!$Domain->IsPoweredOn()) { # Maybe the VM was prepared in advance and got taken down by a power outage? # Requeue the task and treat this event as a failed revert to avoid infinite # loops. Error("The VM is not powered on\n"); NotifyAdministrator("Putting the ". $VM->Name ." VM offline", - "The VM is not powered on despite its status being 'running'.\n". - "The VM has been put offline and the TestBot will try to regain\n". + "The ". $VM->Name ." VM should have been powered on to run the task\n". + "below but its state was ". $Domain->GetStateDescription() ." instead.\n". + MakeSecureURL(GetTaskURL($JobId, $StepNo, $TaskNo)) ."\n\n". + "So the VM has been put offline and the TestBot will try to regain\n". "access to it."); WrapUpAndExit('queued', undef, undef, 'boterror vm off'); } -- 2.20.1

1 0

[PATCH] testbot/SetWinLocale: Untaint the hostname if specified on the command line.
by Francois Gouget 01 Oct '19

01 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index dc739d102..7ddbdedaa 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -385,6 +385,7 @@ while (@ARGV) } } +# Check and untaint parameters my ($BaseVMName, $VMLocale, %AddLocales, $KeyboardIds, $CountryId); if (!defined $Usage) { @@ -449,7 +450,7 @@ if (!defined $Usage) Error("'$OptVM' should not be a locale VM\n"); $Usage = 2; } - $VMLocale = "$1_$2"; + $VMLocale = "$1_$2"; # untaint $OptDefault = $VMLocale eq "sr_RS" ? "sr-Latn-CS" : "$1-$2"; } elsif ($OptRefresh) @@ -471,6 +472,15 @@ if (!defined $Usage) Error("you must specify the Windows machine to work on\n"); $Usage = 2; } + elsif ($OptHostName =~ /^([a-zA-Z0-9.-]+)$/) + { + $OptHostName = $1; # untaint + } + else + { + Error("'$OptHostName' is not a valid hostname\n"); + $Usage = 2; + } } $OptLocale ||= $OptDefault; -- 2.20.1

1 0

[PATCH] testbot/SetWinLocale: Add and remove some country and keyboard codes.
by Francois Gouget 01 Oct '19

01 Oct '19

The codes for Serbia seem to have changed after Windows 8.1. So remove them until they are needed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index ca750b792..dc739d102 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -96,6 +96,8 @@ my %Countries = ( "AF" => 3, # Afganistan "AL" => 6, # Albania "AM" => 7, # Armenia + "AR" => 11, # Argentina + "AT" => 14, # Austria "AZ" => 5, # Azerbaijan "BA" => 25, # Bosnia and Herzegovina "BE" => 21, # Belgium @@ -103,9 +105,10 @@ my %Countries = ( "BN" => 37, # Brunei Darussalam "BR" => 32, # Brazil "BY" => 29, # Belarus + "CA" => 39, # Canada "CH" => 223, # Switzerland "CN" => 45, # China - "CS" => 271, # Serbia + "CX" => 12, # Australia "CZ" => 75, # Czech Republic "DE" => 94, # Germany "DK" => 61, # Denmark @@ -127,6 +130,7 @@ my %Countries = ( "IR" => 116, # Iran "IS" => 110, # Iceland "IT" => 118, # Italy + "KI" => 133, # Kiribati "JP" => 122, # Japan "KE" => 129, # Kenya "KG" => 130, # Kyrgyzstan @@ -141,6 +145,9 @@ my %Countries = ( "MY" => 167, # Malaysia "NL" => 176, # Netherlands "NO" => 177, # Norway + "NP" => 178, # Nepal + "PE" => 187, # Peru + "PF" => 318, # French Polynesia "PK" => 190, # Pakistan "PL" => 191, # Poland "PT" => 193, # Portugal @@ -152,6 +159,7 @@ my %Countries = ( "SK" => 143, # Slovakia "SN" => 210, # Senegal "TH" => 227, # Thailand + "TO" => 231, # Tonga "TR" => 235, # Turkey "TW" => 237, # Taiwan "UA" => 241, # Ukraine @@ -231,7 +239,6 @@ my %Keyboards = ( "sk-SK" => ["041b:0000041b"], # Slovak - Slovakia "sl-SI" => ["0424:00000424"], # Slovenian - Slovenia "sq-AL" => ["041c:0000041c"], # Albanian - Albania - "sr-Latn-RS" => ["241a:0000081a"], # Serbian - Serbia (Latin) "sv-FI" => ["081d:0000041d"], # Swedish - Finland "sv-SE" => ["041d:0000041d"], # Swedish - Sweden "sw-KE" => ["0441:00000409"], # Swahili - Kenya -- 2.20.1

1 0