January 2020 - Wine-commits

André Hentschel : d3dx9: Fix some spec file entries.
by Alexandre Julliard 14 Jan '20

14 Jan '20

Module: wine Branch: master Commit: 96dab5abeedbb0908ac11915464f71eb74383bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96dab5abeedbb0908ac11915… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 12 17:04:25 2020 +0100 d3dx9: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 28 ++++++++++++++-------------- dlls/d3dx9_25/d3dx9_25.spec | 28 ++++++++++++++-------------- dlls/d3dx9_26/d3dx9_26.spec | 28 ++++++++++++++-------------- dlls/d3dx9_27/d3dx9_27.spec | 28 ++++++++++++++-------------- dlls/d3dx9_28/d3dx9_28.spec | 28 ++++++++++++++-------------- dlls/d3dx9_29/d3dx9_29.spec | 28 ++++++++++++++-------------- dlls/d3dx9_30/d3dx9_30.spec | 28 ++++++++++++++-------------- dlls/d3dx9_31/d3dx9_31.spec | 28 ++++++++++++++-------------- dlls/d3dx9_32/d3dx9_32.spec | 28 ++++++++++++++-------------- dlls/d3dx9_33/d3dx9_33.spec | 28 ++++++++++++++-------------- dlls/d3dx9_34/d3dx9_34.spec | 28 ++++++++++++++-------------- dlls/d3dx9_35/d3dx9_35.spec | 28 ++++++++++++++-------------- dlls/d3dx9_36/d3dx9_36.spec | 28 ++++++++++++++-------------- dlls/d3dx9_37/d3dx9_37.spec | 28 ++++++++++++++-------------- dlls/d3dx9_38/d3dx9_38.spec | 28 ++++++++++++++-------------- dlls/d3dx9_39/d3dx9_39.spec | 28 ++++++++++++++-------------- dlls/d3dx9_40/d3dx9_40.spec | 28 ++++++++++++++-------------- dlls/d3dx9_41/d3dx9_41.spec | 28 ++++++++++++++-------------- dlls/d3dx9_42/d3dx9_42.spec | 28 ++++++++++++++-------------- dlls/d3dx9_43/d3dx9_43.spec | 28 ++++++++++++++-------------- 20 files changed, 280 insertions(+), 280 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96dab5abeedbb0908ac1…

1 0

Paul Gofman : d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate.
by Alexandre Julliard 14 Jan '20

14 Jan '20

Module: wine Branch: master Commit: 13880f8e6a0a972382de7de04b56bd1a414bef67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13880f8e6a0a972382de7de0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Jan 14 18:18:19 2020 +0100 d3dx9: Pass D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY when appropriate. Manual testing shows that the backward compatible compilation is used in d3dx9 versions below 37. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48302 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/shader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index d7adc18ff6..376b97f5ea 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -424,6 +424,9 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO debugstr_a(data), length, defines, include, debugstr_a(function), debugstr_a(profile), flags, shader, error_msgs, constant_table); + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(data, length, NULL, (D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, function, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_msgs); @@ -504,6 +507,9 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(const WCHAR *filename, const D3DXMACRO return D3DXERR_INVALIDDATA; } + if (D3DX_SDK_VERSION <= 36) + flags |= D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; + hr = D3DCompile(buffer, len, filename_a, (const D3D_SHADER_MACRO *)defines, (ID3DInclude *)include, entrypoint, profile, flags, 0, (ID3DBlob **)shader, (ID3DBlob **)error_messages);

1 0

Jacek Caban : kernel32/tests: Skip instruction pointer check of the last exception in exception race tests.
by Alexandre Julliard 14 Jan '20

14 Jan '20

Module: wine Branch: master Commit: 9b44422a49f2d1a79d6dea3c6d0d462a7a16551b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b44422a49f2d1a79d6dea3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 14 18:46:31 2020 +0100 kernel32/tests: Skip instruction pointer check of the last exception in exception race tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index e6ba746248..a2b5d1f410 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1343,6 +1343,8 @@ static void test_debugger(const char *argv0) if (sizeof(loop_code) > 1) { + struct debuggee_thread *prev_thread; + memset(buf, OP_BP, sizeof(buf)); memcpy(proc_code, &loop_code, sizeof(loop_code)); ret = WriteProcessMemory(pi.hProcess, mem, buf, sizeof(buf), NULL); @@ -1356,7 +1358,7 @@ static void test_debugger(const char *argv0) thread = CreateRemoteThread(pi.hProcess, NULL, 0, (void*)thread_proc, NULL, 0, NULL); ok(thread != NULL, "CreateRemoteThread failed: %u\n", GetLastError()); - next_event(&ctx, 20000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ret = CloseHandle(thread); @@ -1370,10 +1372,8 @@ static void test_debugger(const char *argv0) expect_breakpoint_exception(&ctx, thread_proc + 1); exception_cnt = 1; - debuggee_thread = ctx.current_thread; + prev_thread = ctx.current_thread; fetch_process_context(&ctx); - ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", - get_ip(&ctx.current_thread->ctx)); byte = 0xc3; /* ret */ ret = WriteProcessMemory(pi.hProcess, thread_proc + 1, &byte, 1, NULL); @@ -1387,20 +1387,25 @@ static void test_debugger(const char *argv0) ret = WaitForDebugEvent(&ev, 10); ok(GetLastError() == ERROR_SEM_TIMEOUT, "WaitForDebugEvent returned %x(%u)\n", ret, GetLastError()); - next_event(&ctx, 100); + next_event(&ctx, POLL_EVENT_TIMEOUT); if (ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) break; trace("exception at %p in thread %04x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress, ctx.ev.dwThreadId); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == thread_proc + 1, "ExceptionAddress = %p\n", ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress); - ok(get_ip(&ctx.current_thread->ctx) == thread_proc + 2 - || broken(get_ip(&ctx.current_thread->ctx) == thread_proc), /* sometimes observed on win10 */ - "unexpected instruction pointer %p\n", - get_ip(&ctx.current_thread->ctx)); + ok(get_ip(&prev_thread->ctx) == thread_proc + 2 + || broken(get_ip(&prev_thread->ctx) == thread_proc), /* sometimes observed on win10 */ + "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); + prev_thread = ctx.current_thread; exception_cnt++; } + /* for some reason sometimes on Windows one thread has a different address. this is always the thread + * with the last reported exception, so we simply skip the check for the last exception unless it's the only one. */ + if (exception_cnt == 1) + ok(get_ip(&prev_thread->ctx) == thread_proc + 2, "unexpected instruction pointer %p\n", get_ip(&prev_thread->ctx)); + trace("received %u exceptions\n", exception_cnt); for (;;) @@ -1409,7 +1414,7 @@ static void test_debugger(const char *argv0) || broken(ctx.ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT), /* sometimes happens on vista */ "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); if (ctx.ev.dwDebugEventCode == EXIT_THREAD_DEBUG_EVENT && !--worker_cnt) break; - next_event(&ctx, 2000); + next_event(&ctx, WAIT_EVENT_TIMEOUT); } }

1 0

Francois Gouget : testbot: Standardize building the reference report filenames.
by Alexandre Julliard 14 Jan '20

14 Jan '20

Module: tools Branch: master Commit: 1a7d77739207720bc26d9f1f488b649560eceea9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1a7d77739207720bc26d9f1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 14 12:28:54 2020 +0100 testbot: Standardize building the reference report filenames. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/bin/WineSendLog.pl | 7 ++++--- testbot/lib/WineTestBot/StepsTasks.pm | 7 +++++++ testbot/lib/WineTestBot/Tasks.pm | 6 ++++++ testbot/web/JobDetails.pl | 4 ++-- 7 files changed, 22 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index f33b7bd..ce8f40f 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -510,7 +510,7 @@ foreach my $TestStep (@{$Job->Steps->GetItems()}) { foreach my $TestTask (@{$TestStep->Tasks->GetItems()}) { - my $RefReport = $TestTask->VM->Name ."_". $TestStep->FileType .".report"; + my $RefReport = $TestTask->GetRefReportName($TestStep->FileType .".report"); for my $Suffix ("", ".err") { if (-f "$LatestDir/$RefReport$Suffix") diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index cef7a5c..62bd162 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -305,7 +305,7 @@ sub WrapUpAndExit($;$$$$) if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { # Update the VM's reference WineTest results for WineSendLog.pl - my $RefReport = "$DataDir/latest/". $Task->VM->Name ."_$RptFileName"; + my $RefReport = "$DataDir/latest/". $Task->GetRefReportName($RptFileName); unlink($RefReport); link("$TaskDir/$RptFileName", $RefReport); diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 1cf9541..245128a 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -630,7 +630,7 @@ if ($NewStatus eq 'completed') foreach my $Mission (@{$TaskMissions->{Missions}}) { my $RptFileName = GetMissionBaseName($Mission) .".report"; - my $RefReport = $Task->VM->Name ."_$RptFileName"; + my $RefReport = $Task->GetRefReportName($RptFileName); for my $Suffix ("", ".err") { if (-f "$LatestDir/$RefReport$Suffix") diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 98bfc4c..1ec7db1 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -238,8 +238,9 @@ Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit EOF + # Prepend the VM name to get unique attachment filenames for this email. print $Sendmail "Content-Disposition: attachment; filename=", - $StepTask->VM->Name, "_$LogName\n\n"; + $StepTask->VM->Name, "-$LogName\n\n"; if ($Debug) { print $Sendmail "Not dumping logs in debug mode\n"; @@ -290,8 +291,8 @@ EOF # Skip if there are no errors next if (!$LogErrors->{Groups}); - my $RefFileName = $StepTask->GetFullFileName($StepTask->VM->Name ."_$LogName"); - my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); + my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefReportPath, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) { # Test reports should have reference WineTest results and if not diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 463f150..bad0e24 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -67,6 +67,13 @@ sub GetTaskDir($) return $self->GetStepDir() ."/". $self->TaskNo; } +# Keep in sync with WineTestBot::Task::GetRefReportName() +sub GetRefReportName($$) +{ + my ($self, $ReportName) = @_; + return $self->VM->Name ."_$ReportName"; +} + sub GetTitle($) { my ($self) = @_; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index f9e84d4..0c26904 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -108,6 +108,12 @@ sub RmTree($) rmtree($Dir); } +sub GetRefReportName($$) +{ + my ($self, $ReportName) = @_; + return $self->VM->Name ."_$ReportName"; +} + sub _SetupTask($$) { my ($VM, $self) = @_; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a59fa00..4d08a86 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -529,8 +529,8 @@ EOF if ($LogName =~ /\.report$/) { # Identify new errors in test reports - my $RefFileName = $StepTask->GetFullFileName($VM->Name ."_$LogName"); - (my $_NewGroups, my $_NewErrors, $New) = GetNewLogErrors($RefFileName, $Summary->{Groups}, $Summary->{Errors}); + my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); + (my $_NewGroups, my $_NewErrors, $New) = GetNewLogErrors($RefReportPath, $Summary->{Groups}, $Summary->{Errors}); } foreach my $GroupName (@{$Summary->{Groups}})

1 0

Francois Gouget : testbot/WineRun{Task,WineTest}: Fix parsing error reporting.
by Alexandre Julliard 14 Jan '20

14 Jan '20

Module: tools Branch: master Commit: adea3368f1fc2d4276de3ad497a1f53fcc9904fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=adea3368f1fc2d4276de3ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 14 12:22:51 2020 +0100 testbot/WineRun{Task,WineTest}: Fix parsing error reporting. Use the error message returned by ParseWineTestReport() when it could not open the report instead of recreating it from scratch. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 4 ++-- testbot/bin/WineRunWineTest.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 6a30de3..cef7a5c 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -562,8 +562,8 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { # Could not open the file $NewStatus = 'boterror'; - Error "Unable to open '$RptFileName' for reading: $!\n"; - LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); + Error "$LogErrors->[0]\n"; + LogTaskError("$LogErrors->[0]\n"); } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index a2297cb..1cf9541 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -584,8 +584,8 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) { # Could not open the file $NewStatus = 'boterror'; - Error "Unable to open '$RptFileName' for reading: $!\n"; - LogTaskError("Unable to open '$RptFileName' for reading: $!\n"); + Error "$LogErrors->[0]\n"; + LogTaskError("$LogErrors->[0]\n"); } else {

1 0

Francois Gouget : testbot/Janitor: Notify the administrator when unknown files are found.
by Alexandre Julliard 14 Jan '20

14 Jan '20

Module: tools Branch: master Commit: c6f97393482e5b16b487075f48d35de5bf1410fd URL: https://source.winehq.org/git/tools.git/?a=commit;h=c6f97393482e5b16b487075… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 14 12:24:22 2020 +0100 testbot/Janitor: Notify the administrator when unknown files are found. Report unknown files as soon as they are detected. This means they no longer need an extra week to live. Also the WineTest reports of deleted VMs no longer get reported as 'suspicious'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 54 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 34 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 4eda071..579a432 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -265,34 +265,24 @@ if (opendir(my $dh, "$DataDir/staging")) foreach my $Entry (@Entries) { next if ($Entry eq "." or $Entry eq ".."); + $Entry =~ m%^([^/]+)$%; # untaint my $FileName = "$DataDir/staging/$1"; my $Age = int((-M $FileName) + 0.5); + my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; - if ($Entry !~ /^[0-9a-f]{32}-websubmit_/) + if ($Entry =~ /^[0-9a-f]{32}-websubmit_/) { - if ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) - { - Trace "Found a suspicious staging file: $Entry\n"; - } - - if ($JobPurgeDays != 0) - { - if ($Age >= $JobPurgeDays + 7) - { - DeletePath($FileName); - } - elsif ($Age > $JobPurgeDays) - { - Error "'$FileName' is $Age days old and should have been deleted already. It will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; - } - } + # These files always expire after one day + $TTL = 1 - $Age; } - elsif ($Age >= 1) + elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe|work)$/) { - # The user abandoned the submit procedure half-way through - DeletePath($FileName); + my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; + Error "Found a suspicious file$Deletion: staging/$Entry\n"; } + + DeletePath($FileName) if (defined $TTL and $TTL <= 0); } } else @@ -319,6 +309,11 @@ if (opendir(my $dh, "$DataDir/latest")) next if ($Entry =~ /^TestLauncher[0-9]*\.exe$/); next if ($Entry =~ /^winetest[0-9]*-latest\.exe$/); + $Entry =~ m%^([^/]+)$%; # untaint + my $FileName = "$DataDir/latest/$1"; + my $Age = int((-M $FileName) + 0.5); + my $TTL = $JobPurgeDays ? $JobPurgeDays - $Age : undef; + if ($Entry =~ /^([a-zA-Z0-9_]+)_(?:exe|win|wow)(?:32|64)[a-zA-Z0-9_]*\.report(?:\.err)?$/) { # Keep the reference WineTest reports for all VMs even if they are @@ -326,22 +321,13 @@ if (opendir(my $dh, "$DataDir/latest")) my $VMName = $1; next if ($AllVMs->GetItem($VMName)); } - - Trace "Found a suspicious latest file: $Entry\n"; - if ($JobPurgeDays != 0) + else { - $Entry =~ m%^([^/]+)$%; # untaint - my $FileName = "$DataDir/latest/$1"; - my $Age = int((-M $FileName) + 0.5); - if ($Age >= $JobPurgeDays + 7) - { - DeletePath($FileName); - } - elsif ($Age > $JobPurgeDays) - { - Trace "'$FileName' will be deleted in ", $JobPurgeDays + 7 - $Age, " day(s).\n"; - } + my $Deletion = defined $TTL ? " (deletion in $TTL days)" : ""; + Error "Found a suspicious file$Deletion: latest/$Entry\n"; } + + DeletePath($FileName) if (defined $TTL and $TTL <= 0); } } else

1 0

Michael Müller : setupapi/tests: Add test for IDF_CHECKFIRST and SetupPromptForDiskA/W.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 14d782d18ac61baac2fc479c2bb19fb45cc98883 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14d782d18ac61baac2fc479c… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Jan 11 21:06:40 2020 +0100 setupapi/tests: Add test for IDF_CHECKFIRST and SetupPromptForDiskA/W. With modifications from Hermes Belusca-Maito. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/Makefile.in | 1 + dlls/setupapi/tests/dialog.c | 107 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/dlls/setupapi/tests/Makefile.in b/dlls/setupapi/tests/Makefile.in index bbfdf590d5..83f751c7db 100644 --- a/dlls/setupapi/tests/Makefile.in +++ b/dlls/setupapi/tests/Makefile.in @@ -5,6 +5,7 @@ SOURCES = \ coinst.c \ coinst.spec \ devinst.c \ + dialog.c \ diskspace.c \ install.c \ misc.c \ diff --git a/dlls/setupapi/tests/dialog.c b/dlls/setupapi/tests/dialog.c new file mode 100644 index 0000000000..b6191afa41 --- /dev/null +++ b/dlls/setupapi/tests/dialog.c @@ -0,0 +1,107 @@ +/* + * Unit tests for SetupPromptForDisk + * + * Copyright 2014 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winreg.h" +#include "guiddef.h" +#include "setupapi.h" + +#include "wine/test.h" + +static void test_SetupPromptForDiskA(void) +{ + char path[MAX_PATH]; + char buffer[MAX_PATH]; + UINT ret; + DWORD length; + + GetSystemDirectoryA(path, MAX_PATH); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, sizeof(buffer) - 1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == strlen(path) + 1, "Expect length %u, got %u\n", lstrlenA(path) + 1, length); + ok(!strcmp(path, buffer), "Expected path %s, got %s\n", debugstr_a(path), debugstr_a(buffer)); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, NULL, 0, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %d\n", ret); + ok(length == strlen(path) + 1, "Expect length %u, got %u\n", lstrlenA(path) + 1, length); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, 1, &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, strlen(path), &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskA(0, "Test", "Testdisk", path, "kernel32.dll", NULL, IDF_CHECKFIRST, buffer, strlen(path) + 1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == strlen(path) + 1, "Expect length %u, got %u\n", lstrlenA(path) + 1, length); + ok(!strcmp(path, buffer), "Expected path %s, got %s\n", debugstr_a(path), debugstr_a(buffer)); +} + +static void test_SetupPromptForDiskW(void) +{ + WCHAR path[MAX_PATH]; + WCHAR buffer[MAX_PATH]; + UINT ret; + DWORD length; + + GetSystemDirectoryW(path, MAX_PATH); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, ARRAY_SIZE(buffer) - 1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == lstrlenW(path) + 1, "Expect length %u, got %u\n", lstrlenW(path) + 1, length); + ok(!lstrcmpW(path, buffer), "Expected path %s, got %s\n", debugstr_w(path), debugstr_w(buffer)); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, NULL, 0, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %d\n", ret); + ok(length == lstrlenW(path) + 1, "Expect length %u, got %u\n", lstrlenW(path) + 1, length); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, 1, &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, lstrlenW(path), &length); + ok(ret == DPROMPT_BUFFERTOOSMALL, "Expected DPROMPT_BUFFERTOOSMALL, got %u\n", ret); + + memset(buffer, 0, sizeof(buffer)); + ret = SetupPromptForDiskW(0, L"Test", L"Testdisk", path, L"kernel32.dll", NULL, IDF_CHECKFIRST, buffer, lstrlenW(path) + 1, &length); + ok(ret == DPROMPT_SUCCESS, "Expected DPROMPT_SUCCESS, got %u\n", ret); + ok(length == lstrlenW(path) + 1, "Expect length %u, got %u\n", lstrlenW(path) + 1, length); + ok(!lstrcmpW(path, buffer), "Expected path %s, got %s\n", debugstr_w(path), debugstr_w(buffer)); +} + +START_TEST(dialog) +{ + test_SetupPromptForDiskA(); + test_SetupPromptForDiskW(); +}

1 0

Alistair Leslie-Hughes : gdiplus: Check status as well before using bitmap.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 14adcc694d857d00c5aa2bdc551a2a122c351c4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=14adcc694d857d00c5aa2bdc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 12 23:28:58 2020 +0000 gdiplus: Check status as well before using bitmap. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1966401507..354801348e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3683,7 +3683,7 @@ static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversi IWICBitmapSource_Release(source); } - if (SUCCEEDED(hr)) { + if (SUCCEEDED(hr) && status == Ok) { bitmap->metadata_reader = NULL; if (metadata_reader)

1 0

Andrew Eikum : mscoree: Don't print FIXME for unused config file elements.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 0aaaacd199135a6ef91e2d2fa01a323e2d261973 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aaaacd199135a6ef91e2d2f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 13 10:55:50 2020 -0600 mscoree: Don't print FIXME for unused config file elements. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 035247442c..38f304f3df 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -489,7 +489,7 @@ static HRESULT WINAPI ConfigFileHandler_startElement(ISAXContentHandler *iface, return hr; unknown: - FIXME("Unknown element %s in state %u\n", debugstr_wn(pLocalName,nLocalName), + TRACE("Unknown element %s in state %u\n", debugstr_wn(pLocalName,nLocalName), This->states[This->statenum]); This->states[++This->statenum] = STATE_UNKNOWN;

1 0

Piotr Caban : msvcrt: Fix floating point numbers scanning when null-byte is preceding the number.
by Alexandre Julliard 13 Jan '20

13 Jan '20

Module: wine Branch: master Commit: 287dabd9b6887e94cabfa2a5f9bfe822522095e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=287dabd9b6887e94cabfa2a5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 13 20:17:17 2020 +0100 msvcrt: Fix floating point numbers scanning when null-byte is preceding the number. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48452 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 2 ++ dlls/msvcrt/tests/scanf.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 1833c42dc3..ec3ec79995 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -393,6 +393,8 @@ _FUNCTION_ { /* skip initial whitespace */ while ((nch!=_EOF_) && _ISSPACE_(nch)) nch = _GETC_(file); + if (nch == _EOF_) + break; ctx.unget = nch; #ifdef STRING ctx.file = file; diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 95fd043e6f..57d9cc0ba1 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -165,6 +165,12 @@ static void test_sscanf( void ) ok(double_res >= 1.1e-30-1e-45 && double_res <= 1.1e-30+1e-45, "Got %.18le, expected %.18le\n", double_res, 1.1e-30); + buffer[0] = 0; + double_res = 1; + ret = p_sscanf(buffer, "%lf", &double_res); + ok(ret == -1, "expected 0, got %u\n", ret); + ok(double_res == 1, "Got %lf, expected 1\n", double_res); + /* check strings */ ret = p_sprintf(buffer," %s", pname); ok( ret == 26, "expected 26, got %u\n", ret);

1 0