wine-devel November 2018

wine-devel@winehq.org

75 participants
771 discussions

[PATCH 1/4] kernelbase: Implement PathCchFindExtension.
by Zhiyi Zhang 19 Nov '18

19 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 36 +++++++ dlls/kernelbase/tests/path.c | 98 +++++++++++++++++++ include/pathcch.h | 3 + 5 files changed, 139 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 287c5d61d9..7b812eb49d 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -9,7 +9,7 @@ @ stub PathCchCanonicalizeEx @ stub PathCchCombine @ stub PathCchCombineEx -@ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stub PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f3b4fd131f..2372db821e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1038,7 +1038,7 @@ # @ stub PathCchCanonicalizeEx # @ stub PathCchCombine # @ stub PathCchCombineEx -# @ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) # @ stub PathCchIsRoot # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 373c34e979..0e391ecff0 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1,5 +1,6 @@ /* * Copyright 2018 Nikolay Sivov + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -65,3 +66,38 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S return S_OK; } + +HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) +{ + const WCHAR *lastpoint = NULL; + const WCHAR *next; + SIZE_T length; + + TRACE("%s %lu %p\n", wine_dbgstr_w(path), size, extension); + + if (!path || !size || size > PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + + length = strlenW(path); + if (length + 1 > PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + + next = path; + while (*next) + { + if (*next == '\\' || *next == ' ') + lastpoint = NULL; + else if (*next == '.') + lastpoint = next; + next++; + } + + *extension = lastpoint ? lastpoint : path + length; + return S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index cdba51bf3f..5be05a0a67 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -2,6 +2,7 @@ * Path tests for kernelbase.dll * * Copyright 2017 Michael MÃ¼ller + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); +HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); static const struct { @@ -245,6 +247,100 @@ static void test_PathCchAddBackslashEx(void) } } +struct findextension_test +{ + const CHAR *path; + INT extension_offset; +}; + +static const struct findextension_test findextension_tests[] = +{ + {"1.exe", 1}, + {"C:1.exe", 3}, + {"C:\\1.exe", 4}, + {"\\1.exe", 2}, + {"\\\\1.exe", 3}, + {"\\\\?\\C:1.exe", 7}, + {"\\\\?\\C:\\1.exe", 8}, + {"\\\\?\\UNC\\1.exe", 9}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", 21}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", 50}, + + /* Malformed */ + {"", 0}, + {" ", 1}, + {".", 0}, + {"..", 1}, + {"a", 1}, + {"a.", 1}, + {".a.b.", 4}, + {"a. ", 3}, + {"a.\\", 3}, + {"\\\\?\\UNC\\192.168.1.1", 17}, + {"\\\\?\\UNC\\192.168.1.1\\", 20}, + {"\\\\?\\UNC\\192.168.1.1\\a", 21} +}; + +static void test_PathCchFindExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1] = {0}; + const WCHAR *extension; + HRESULT hr; + INT i; + + if (!pPathCchFindExtension) + { + win_skip("PathCchFindExtension() is not available.\n"); + return; + } + + /* Arguments check */ + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(NULL, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(pathW, 0, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + /* Crashed on Windows */ + if (0) + { + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + } + + /* Path length check */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.exe", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH + 1, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(pathW) - 1; i++) pathW[i] = 'a'; + pathW[PATHCCH_MAX_CCH] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + pathW[PATHCCH_MAX_CCH - 1] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(findextension_tests); i++) + { + const struct findextension_test *t = findextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", t->path, S_OK, hr); + if (SUCCEEDED(hr)) + ok(extension - pathW == t->extension_offset, "path %s expect extension offset %d, got %d\n", t->path, + t->extension_offset, extension - pathW); + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -252,8 +348,10 @@ START_TEST(path) pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); + pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); + test_PathCchFindExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 2b2aed4c8f..6bb760ccdb 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -23,6 +23,9 @@ #define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 #define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 +#define PATHCCH_MAX_CCH 0x8000 + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); +HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); -- 2.19.1

2 1

[PATCH] testbot: Add a 'lang' option for the Wine missions.
by Francois Gouget 18 Nov '18

18 Nov '18

Appending ',lang=xxx' sets $LANG when running the Wine tests. This allows running the Wine tests in multiple locales by creating multiple missions with different lang values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 7 ++++ testbot/lib/WineTestBot/LogUtils.pm | 59 +++++++++++++++++++-------- testbot/lib/WineTestBot/Missions.pm | 45 +++++++++++++++++++- testbot/lib/WineTestBot/StepsTasks.pm | 18 +------- testbot/lib/WineTestBot/Utils.pm | 15 ++++++- testbot/web/admin/VMDetails.pl | 1 + 6 files changed, 108 insertions(+), 37 deletions(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 06fb3d87fc..4dda8d51fc 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -334,6 +334,13 @@ sub SetupWineEnvironment($) $ENV{WINEPREFIX} = "$DataDir/wineprefix-$BaseName"; $ENV{DISPLAY} ||= ":0.0"; + my $Lang = $Mission->{lang} || "en_US"; + if ($Lang =~ /^[a-zA-Z0-9\(a)_.-]+$/) + { + $Lang .= ".UTF-8" if ($Lang !~ /\./); + $ENV{LANG} = $Lang; + } + return $BaseName; } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index f142982df4..fee4278105 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -36,6 +36,7 @@ use Algorithm::Diff; use File::Basename; use WineTestBot::Config; # For $MaxUnitSize +use WineTestBot::Utils; # For LocaleName() # @@ -578,31 +579,47 @@ sub GetLogFileNames($;$) { my ($Dir, $IncludeOld) = @_; - my @Candidates = ("exe32.report", "exe64.report", - "win32.report", "wow32.report", "wow64.report", - "log"); - push @Candidates, "old_log" if ($IncludeOld); + my @Globs = qw(exe32.report exe32_*.report + exe64.report exe64_*.report + win32.report win32_*.report + wow32.report wow32_*.report + wow64.report wow64_*.report + log); + push @Globs, "old_log" if ($IncludeOld); - my @Logs; - foreach my $FileName (@Candidates) + my (@Logs, %Seen); + foreach my $Glob (@Globs) { - if ((-f "$Dir/$FileName" and !-z "$Dir/$FileName") or - (-f "$Dir/$FileName.err" and !-z "$Dir/$FileName.err")) + foreach my $FileName (glob("'$Dir/$Glob*'")) { - push @Logs, $FileName; + my $LogName = basename($FileName); + if ($LogName !~ s/\.err$// and $LogName !~ /\.report$/ and + $LogName ne $Glob) # 'log' case + { + # Not a valid log filename (where does this file come from?) + next; + } + next if ($Seen{$LogName}); + $Seen{$LogName} = 1; + + if ((-f "$Dir/$LogName" and !-z "$Dir/$LogName") or + (-f "$Dir/$LogName.err" and !-z "$Dir/$LogName.err")) + { + push @Logs, $LogName; + } } } return \@Logs; } my %_LogFileLabels = ( - "exe32.report" => "32 bit report", - "exe64.report" => "64 bit report", - "win32.report" => "32 bit report", - "wow32.report" => "32 bit WoW report", - "wow64.report" => "64 bit WoW report", - "log" => "task log", - "old_log" => "old logs", + "exe32.report" => '32 bit%s report', + "exe64.report" => '64 bit%s report', + "win32.report" => '32 bit%s report', + "wow32.report" => '32 bit%s WoW report', + "wow64.report" => '64 bit%s WoW report', + "log" => 'task%s log', + "old_log" => 'old%s logs', ); =pod @@ -618,7 +635,15 @@ Returns a user-friendly description of the content of the specified log file. sub GetLogLabel($) { my ($LogFileName) = @_; - return $_LogFileLabels{$LogFileName}; + + my $Extra = ""; + if ($LogFileName =~ /^([^_]+)_(.*)\.report$/) + { + $LogFileName = "$1.report"; + $Extra = " ". LocaleName($2); + } + my $Label = $_LogFileLabels{$LogFileName}; + return defined $Label ? sprintf($Label, $Extra) : $LogFileName; } diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 0dc812d6ba..dcaeb31d1d 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -26,9 +26,12 @@ WineTestBot::Missions - Missions parser and helper functions =cut use Exporter 'import'; -our @EXPORT = qw(DumpMissions GetMissionBaseName ParseMissionStatement +our @EXPORT = qw(DumpMissions GetMissionBaseName GetTaskMissionDescription + ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); +use WineTestBot::Utils; + sub DumpMissions($$) { @@ -89,7 +92,45 @@ sub ParseMissionStatement($) sub GetMissionBaseName($) { my ($Mission) = @_; - return $Mission->{Build}; + + my $BaseName = $Mission->{Build}; + + # Option values may be tainted if they come from the command line + my $Lang = $Mission->{lang} || ""; + $BaseName .= "_$1" if ($Lang =~ /^([a-zA-Z0-9\(a)_.-]+)$/); # untaint + + return $BaseName; +} + +sub GetTaskMissionDescription($) +{ + my ($TaskMission) = @_; + + my $Builds = $TaskMission->{Builds}; + my $Description = + $Builds->{build} ? "build" : + ($Builds->{exe64} and ($Builds->{exe32} or $Builds->{exe32})) ? "32 & 64 bit executable" : + $Builds->{exe32} ? "32 bit executable" : + $Builds->{exe64} ? "64 bit executable" : + ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" : + $Builds->{win32} ? "32 bit" : + $Builds->{wow32} ? "32 bit WoW" : + "64 bit WoW"; + + my $Lang; + foreach my $Mission (@{$TaskMission->{Missions}}) + { + next if (!$Mission->{lang}); + if (defined $Lang) + { + $Description .= " + Locales"; + $Lang = undef; + last; + } + $Lang = $Mission->{lang}; + } + $Description .= " ". LocaleName($Lang) if ($Lang); + return $Description; } sub MergeMissionStatementTasks($) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 8128bf9c57..4a803e775a 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -91,23 +91,7 @@ sub GetTitle($) my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions); if (!defined $ErrMessage and @$Missions == 1) { - my $Builds = $Missions->[0]->{Builds}; - if ($Builds->{build}) - { - push @TitleParts, "build"; - } - elsif ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) - { - push @TitleParts, "32 & 64 bit"; - } - elsif ($Builds->{win32} or $Builds->{wow32}) - { - push @TitleParts, "32 bit"; - } - elsif ($Builds->{wow64}) - { - push @TitleParts, "64 bit"; - } + push @TitleParts, GetTaskMissionDescription($Missions->[0]); } } if ($self->Type ne "suite" and $self->CmdLineArg) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6fa0ccce7c..6681072caa 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -30,9 +30,11 @@ use Exporter 'import'; our @EXPORT = qw(MakeSecureURL SecureConnection GenerateRandomString OpenNewFile CreateNewFile CreateNewLink CreateNewDir DurationToString BuildEMailRecipient IsValidFileName - BuildTag SanitizeTag ShQuote ShArgv2Cmd); + BuildTag SanitizeTag LocaleName ShQuote ShArgv2Cmd); use Fcntl; +use Locale::Language; +use Locale::Country; use WineTestBot::Config; @@ -104,6 +106,17 @@ sub BuildEMailRecipient($$) return $Recipient; } +sub LocaleName($) +{ + my ($Locale) = @_; + + if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.|$)/) + { + return (code2language($1) || $1) .":". (code2country($2) || $2); + } + return $Locale; +} + # # Temporary file helpers diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 4b7799a8cf..4dd9e2501a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -79,6 +79,7 @@ sub GenerateFooter($) print "The supported builds are build for build VMs; exe32 and exe64 for Windows VMs; win32, wow32 and wow64 for Wine VMs.\n"; print "On Wine VMs: \n"; print "The test option can be set to build to only test building, test to only rerun patched tests, module to rerun all of a patched dll or program's tests, or all to always rerun all the tests. \n"; + print "The lang option can be set to run the tests in the specified \$LANG locale. The default is en_US (.UTF-8 can be omitted). \n"; print "If set, the nosubmit option specifies that the WineTest results should not be published online.\n"; print "</td></tr></tbody>\n"; print "</table></div>\n"; -- 2.19.1

1 0

[PATCH 10/10] d3dx9: Try to use IDirect3DDevice9_StretchRect() in D3DXLoadSurfaceFromSurface().
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index cf9a16d9b78..dc26ba716df 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1925,6 +1925,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { IDirect3DSurface9 *surface = src_surface; + D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; D3DSURFACE_DESC src_desc; D3DLOCKED_RECT lock; @@ -1939,6 +1940,37 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, if (!dst_surface || !src_surface) return D3DERR_INVALIDCALL; + if (!dst_palette && !src_palette && !color_key) + { + switch (filter) + { + case D3DX_FILTER_NONE: + d3d_filter = D3DTEXF_NONE; + break; + + case D3DX_FILTER_POINT: + d3d_filter = D3DTEXF_POINT; + break; + + case D3DX_FILTER_LINEAR: + d3d_filter = D3DTEXF_LINEAR; + break; + + default: + d3d_filter = ~0u; + break; + } + + if (d3d_filter != ~0u) + { + IDirect3DSurface9_GetDevice(src_surface, &device); + hr = IDirect3DDevice9_StretchRect(device, src_surface, src_rect, dst_surface, dst_rect, d3d_filter); + IDirect3DDevice9_Release(device); + if (SUCCEEDED(hr)) + return D3D_OK; + } + } + IDirect3DSurface9_GetDesc(src_surface, &src_desc); if (src_desc.Pool == D3DPOOL_DEFAULT && !(src_desc.Usage & D3DUSAGE_DYNAMIC)) { -- 2.11.0

2 1

[PATCH v3] kernel32: Ignore FileIoPriorityHintInfo return success
by Greg Smith 18 Nov '18

18 Nov '18

There is no requirement to act on FileIoPriorityHintInfo Return success when this is passed to SetFileInformationByHandle. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46130 Signed-off-by: Greg Smith <codedonewell(a)gmail.com> --- v3: Fix test bugs. Add parameter validation as per guidance. Expand test coverage for parameter validation. --- dlls/kernel32/file.c | 15 ++++++++++++++- dlls/kernel32/tests/file.c | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index eeccf67e15..6386c7d2b2 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1103,7 +1103,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c case FileStreamInfo: case FileIdBothDirectoryInfo: case FileIdBothDirectoryRestartInfo: - case FileIoPriorityHintInfo: case FileFullDirectoryInfo: case FileFullDirectoryRestartInfo: case FileStorageInfo: @@ -1119,6 +1118,20 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation ); break; + case FileIoPriorityHintInfo: + if ( file == INVALID_HANDLE_VALUE || !info || size != sizeof( FILE_IO_PRIORITY_HINT_INFO ) + || ( ( FILE_IO_PRIORITY_HINT_INFO * ) info )-> PriorityHint < IoPriorityHintVeryLow + || ( ( FILE_IO_PRIORITY_HINT_INFO * ) info )-> PriorityHint >= MaximumIoPriorityHintType ) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + else + { + FIXME( "Ignoring file IO priority hint: %p, %u, %p, %u\n", file, class, info, size ); + return TRUE; + } + case FileStandardInfo: case FileCompressionInfo: case FileAttributeTagInfo: diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 168bdd5e7b..cfcb1c4a93 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4914,6 +4914,7 @@ static void test_SetFileInformationByHandle(void) FILE_STANDARD_INFO stdinfo = { {{0}},{{0}},0,FALSE,FALSE }; FILE_COMPRESSION_INFO compressinfo; FILE_DISPOSITION_INFO dispinfo; + DECLSPEC_ALIGN(8) FILE_IO_PRIORITY_HINT_INFO hintinfo; char tempFileName[MAX_PATH]; char tempPath[MAX_PATH]; HANDLE file; @@ -4950,6 +4951,31 @@ static void test_SetFileInformationByHandle(void) ret = pSetFileInformationByHandle(file, FileAttributeTagInfo, &fileattrinfo, sizeof(fileattrinfo)); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError()); + /* Bug 46130: Star Citizen installer fails when FileIoPriorityHintInfo call does not return sucess */ + /* Bug 46130: Boundary violation test - value too great */ + SetLastError(0xdeadbeef); + hintinfo.PriorityHint = MaximumIoPriorityHintType; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(!ret, "setting FileIoPriorityHintInfo got %d, should have been an error\n", ret); + + /* Bug 46130: Maximum value test */ + SetLastError(0xdeadbeef); + hintinfo.PriorityHint = IoPriorityHintNormal; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(ret, "setting FileIoPriorityHintInfo got %d, error %d\n", ret, GetLastError()); + + /* Bug 46130: Minimum value test */ + SetLastError(0xdeadbeef); + hintinfo.PriorityHint = IoPriorityHintVeryLow; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(ret, "setting FileIoPriorityHintInfo got %d, error %d\n", ret, GetLastError()); + + /* Bug 46130: Boundary violation test - value too low */ + SetLastError(0xdeadbeef); + hintinfo.PriorityHint = IoPriorityHintVeryLow - 1; + ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo)); + ok(!ret, "setting FileIoPriorityHintInfo got %d, should have been an error\n", ret); + memset(&protinfo, 0, sizeof(protinfo)); protinfo.StructureVersion = 1; protinfo.StructureSize = sizeof(protinfo); -- 2.17.1

1 0

[PATCH 07/10] wined3d: Disallow dynamic rendertarget and depth/stencil resources.
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 7 ++++--- dlls/d3d9/tests/device.c | 7 ++++--- dlls/ddraw/surface.c | 4 +++- dlls/wined3d/resource.c | 20 +++++++++++++++----- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 59eec656cdc..c07e98192dd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8944,7 +8944,7 @@ static void test_resource_access(void) case SURFACE_2D: hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 1, tests[j].usage, format, tests[j].pool, &texture_2d); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) + todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH && !tests[j].usage) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -8959,7 +8959,7 @@ static void test_resource_access(void) case SURFACE_CUBE: hr = IDirect3DDevice8_CreateCubeTexture(device, 16, 1, tests[j].usage, format, tests[j].pool, &texture_cube); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) + todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH && !tests[j].usage) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -9091,7 +9091,8 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); - todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET && tests[i].pool == D3DPOOL_DEFAULT) + todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET + && !(tests[i].usage & D3DUSAGE_DYNAMIC) && tests[i].pool == D3DPOOL_DEFAULT) ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f3b9a0ae26e..9f293a81802 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12774,7 +12774,7 @@ static void test_resource_access(void) case SURFACE_2D: hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, tests[j].usage, format, tests[j].pool, &texture_2d, NULL); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) + todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH && !tests[j].usage) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -12789,7 +12789,7 @@ static void test_resource_access(void) case SURFACE_CUBE: hr = IDirect3DDevice9_CreateCubeTexture(device, 16, 1, tests[j].usage, format, tests[j].pool, &texture_cube, NULL); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) + todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH && !tests[j].usage) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -12926,7 +12926,8 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET && tests[i].pool == D3DPOOL_DEFAULT) + todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET + && !(tests[i].usage & D3DUSAGE_DYNAMIC) && tests[i].pool == D3DPOOL_DEFAULT) ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7c13cbfa39c..819044214d5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6189,7 +6189,9 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ /* Videomemory adds localvidmem. This is mutually exclusive with * systemmemory and texturemanage. */ desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; - wined3d_desc.usage |= WINED3DUSAGE_DYNAMIC; + /* Dynamic resources can't be written by the GPU. */ + if (!(wined3d_desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) + wined3d_desc.usage |= WINED3DUSAGE_DYNAMIC; } } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e5016e42e08..82e9019a0ed 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -91,12 +91,22 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; } - if ((access & (WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_GPU)) != WINED3D_RESOURCE_ACCESS_GPU - && bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) + if (bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) { - WARN("Bind flags %s are incompatible with resource access %s.\n", - wined3d_debug_bind_flags(bind_flags), wined3d_debug_resource_access(access)); - return WINED3DERR_INVALIDCALL; + if ((access & (WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_GPU)) != WINED3D_RESOURCE_ACCESS_GPU) + { + WARN("Bind flags %s are incompatible with resource access %s.\n", + wined3d_debug_bind_flags(bind_flags), wined3d_debug_resource_access(access)); + return WINED3DERR_INVALIDCALL; + } + + /* Dynamic usage is incompatible with GPU writes. */ + if (usage & WINED3DUSAGE_DYNAMIC) + { + WARN("Bind flags %s are incompatible with resource usage %s.\n", + wined3d_debug_bind_flags(bind_flags), debug_d3dusage(usage)); + return WINED3DERR_INVALIDCALL; + } } if (!size) -- 2.11.0

2 1

[PATCH 06/10] wined3d: Require exclusive GPU access for rendertarget and depth/stencil resources.
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 9 +++------ dlls/d3d9/tests/device.c | 9 +++------ dlls/wined3d/resource.c | 8 ++++++++ dlls/wined3d/texture.c | 2 -- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 0b40253c58b..59eec656cdc 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8944,8 +8944,7 @@ static void test_resource_access(void) case SURFACE_2D: hr = IDirect3DDevice8_CreateTexture(device, 16, 16, 1, tests[j].usage, format, tests[j].pool, &texture_2d); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 - || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -8960,8 +8959,7 @@ static void test_resource_access(void) case SURFACE_CUBE: hr = IDirect3DDevice8_CreateCubeTexture(device, 16, 1, tests[j].usage, format, tests[j].pool, &texture_cube); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 - || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -9093,8 +9091,7 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); - todo_wine_if((tests[i].usage & D3DUSAGE_DEPTHSTENCIL && tests[i].pool == D3DPOOL_SCRATCH) - || tests[i].usage & D3DUSAGE_RENDERTARGET) + todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET && tests[i].pool == D3DPOOL_DEFAULT) ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4e620d59b84..f3b9a0ae26e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12774,8 +12774,7 @@ static void test_resource_access(void) case SURFACE_2D: hr = IDirect3DDevice9_CreateTexture(device, 16, 16, 1, tests[j].usage, format, tests[j].pool, &texture_2d, NULL); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 - || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -12790,8 +12789,7 @@ static void test_resource_access(void) case SURFACE_CUBE: hr = IDirect3DDevice9_CreateCubeTexture(device, 16, 1, tests[j].usage, format, tests[j].pool, &texture_cube, NULL); - todo_wine_if(j == 10 || j == 13 || j == 16 || j == 17 || j == 20 || j == 23 || j == 24 - || j == 27 || j == 30 || j == 31 || j == 32 || j == 33 || j == 34) + todo_wine_if(j == 10 || j == 13 || j == 16 || j == 23 || j == 30) ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_cube) ? D3D_OK : D3DERR_INVALIDCALL), "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); @@ -12928,8 +12926,7 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - todo_wine_if((tests[i].usage & D3DUSAGE_DEPTHSTENCIL && tests[i].pool == D3DPOOL_SCRATCH) - || tests[i].usage & D3DUSAGE_RENDERTARGET) + todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET && tests[i].pool == D3DPOOL_DEFAULT) ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 30a35c7d425..e5016e42e08 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -91,6 +91,14 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * return WINED3DERR_INVALIDCALL; } + if ((access & (WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_GPU)) != WINED3D_RESOURCE_ACCESS_GPU + && bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) + { + WARN("Bind flags %s are incompatible with resource access %s.\n", + wined3d_debug_bind_flags(bind_flags), wined3d_debug_resource_access(access)); + return WINED3DERR_INVALIDCALL; + } + if (!size) ERR("Attempting to create a zero-sized resource.\n"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index ee3754f1c5d..dbc256f1102 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2909,8 +2909,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - if (desc->bind_flags & WINED3D_BIND_RENDER_TARGET && desc->access & WINED3D_RESOURCE_ACCESS_CPU) - FIXME("Trying to create a CPU accessible render target.\n"); pow2_width = desc->width; pow2_height = desc->height; -- 2.11.0

2 1

[PATCH 05/10] wined3d: Make "driver private" formats always mappable.
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 6 ++---- dlls/wined3d/resource.c | 2 ++ dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 56690091df3..0b40253c58b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9045,11 +9045,9 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(j == 1 && surface_types[i].type != SURFACE_IMAGE) - ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DSurface8_UnlockRect(surface); - todo_wine_if((expected_hr != D3D_OK && surface_types[i].type == SURFACE_2D) - || (j == 1 && surface_types[i].type == SURFACE_CUBE)) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type == SURFACE_2D) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (SUCCEEDED(IDirect3DSurface8_GetContainer(surface, &IID_IDirect3DBaseTexture8, (void **)&texture))) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 05fbafbfb35..30a35c7d425 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -186,6 +186,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->bind_flags = bind_flags; + if (resource->format_flags & WINED3DFMT_FLAG_MAPPABLE) + access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; resource->access = access; resource->width = width; resource->height = height; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 05f210f6fd5..ee3754f1c5d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3012,7 +3012,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return hr; } wined3d_resource_update_draw_binding(&texture->resource); - if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) || desc->format == WINED3DFMT_D16_LOCKABLE) + if (flags & WINED3D_TEXTURE_CREATE_MAPPABLE) texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; texture->texture_ops = texture_ops; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a0abe6a0c2e..aa68799535e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -328,8 +328,10 @@ struct wined3d_format_base_flags * resource size. */ static const struct wined3d_format_base_flags format_base_flags[] = { - {WINED3DFMT_ATI1N, WINED3DFMT_FLAG_BROKEN_PITCH}, - {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_BROKEN_PITCH}, + {WINED3DFMT_ATI1N, WINED3DFMT_FLAG_MAPPABLE | WINED3DFMT_FLAG_BROKEN_PITCH}, + {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_MAPPABLE | WINED3DFMT_FLAG_BROKEN_PITCH}, + {WINED3DFMT_D16_LOCKABLE, WINED3DFMT_FLAG_MAPPABLE}, + {WINED3DFMT_INTZ, WINED3DFMT_FLAG_MAPPABLE}, {WINED3DFMT_R11G11B10_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT}, {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2d2f712d66d..f739e5f79c1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4401,6 +4401,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_NORMALISED 0x00800000 #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 +#define WINED3DFMT_FLAG_MAPPABLE 0x04000000 struct wined3d_rational { -- 2.11.0

2 1

[PATCH] xinput: Avoid calling XInputGetStateEx() in XInputGetState().
by Zebediah Figura 18 Nov '18

18 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46142 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/xinput1_3/xinput_main.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 56bb36a05d..3db70dd787 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -85,13 +85,31 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) return HID_set_state(&controllers[index], vibration); } +/* Some versions of SteamOverlayRenderer hot-patch XInputGetStateEx() and call + * XInputGetState() in the hook, so we need a wrapper. */ +DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) +{ + HID_find_gamepads(controllers); + + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) + return ERROR_DEVICE_NOT_CONNECTED; + + HID_update_state(&controllers[index]); + memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); + + return ERROR_SUCCESS; +} + + DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { DWORD ret; TRACE("(index %u, state %p)!\n", index, state); - ret = XInputGetStateEx(index, state); + ret = xinput_get_state(index, state); if (ret != ERROR_SUCCESS) return ret; @@ -105,17 +123,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state { TRACE("(index %u, state %p)!\n", index, state); - HID_find_gamepads(controllers); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) - return ERROR_DEVICE_NOT_CONNECTED; - - HID_update_state(&controllers[index]); - memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); - - return ERROR_SUCCESS; + return xinput_get_state(index, state); } DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) -- 2.19.1

2 2

[PATCH 04/10] wined3d: Allow binding scratch textures.
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 6 ++---- dlls/d3d9/tests/device.c | 6 ++---- dlls/wined3d/device.c | 6 ------ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 862dbb4c45a..56690091df3 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9055,8 +9055,7 @@ static void test_resource_access(void) if (SUCCEEDED(IDirect3DSurface8_GetContainer(surface, &IID_IDirect3DBaseTexture8, (void **)&texture))) { hr = IDirect3DDevice8_SetTexture(device, 0, texture); - todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice8_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); IDirect3DBaseTexture8_Release(texture); @@ -9121,8 +9120,7 @@ static void test_resource_access(void) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); - todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice8_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ee7d0c622ab..4e620d59b84 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12888,8 +12888,7 @@ static void test_resource_access(void) if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture))) { hr = IDirect3DDevice9_SetTexture(device, 0, texture); - todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); IDirect3DBaseTexture9_Release(texture); @@ -12954,8 +12953,7 @@ static void test_resource_access(void) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); - todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 50ce89ac181..2ae9235b067 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3467,12 +3467,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, return WINED3D_OK; } - if (texture && texture->resource.usage & WINED3DUSAGE_SCRATCH) - { - WARN("Rejecting attempt to set scratch texture.\n"); - return WINED3DERR_INVALIDCALL; - } - if (device->recording) device->recording->changed.textures |= 1u << stage; -- 2.11.0

2 1

[PATCH 03/10] wined3d: Validate that the view resource has depth/stencil bind flags in wined3d_device_set_depth_stencil_view().
by Henri Verbeet 18 Nov '18

18 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 13 ++++++++----- dlls/d3d8/tests/device.c | 5 ++--- dlls/d3d9/device.c | 5 +++-- dlls/d3d9/tests/device.c | 5 ++--- dlls/wined3d/device.c | 14 ++++++++++++-- include/wine/wined3d.h | 2 +- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 476e3e11b78..67996a78e70 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1438,12 +1438,15 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); rtv = ds_impl ? d3d8_surface_acquire_rendertarget_view(ds_impl) : NULL; - wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); d3d8_surface_release_rendertarget_view(ds_impl, rtv); - rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; - if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) - wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); - d3d8_surface_release_rendertarget_view(rt_impl, rtv); + if (SUCCEEDED(hr)) + { + rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; + if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) + wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + d3d8_surface_release_rendertarget_view(rt_impl, rtv); + } wined3d_mutex_unlock(); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9f1d8167af9..862dbb4c45a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9069,9 +9069,8 @@ static void test_resource_access(void) ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, surface); - todo_wine_if(!(surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL)) - ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), - "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dd40ddaa04c..eed3a043a67 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1903,16 +1903,17 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *ds_impl = unsafe_impl_from_IDirect3DSurface9(depth_stencil); struct wined3d_rendertarget_view *rtv; + HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); wined3d_mutex_lock(); rtv = ds_impl ? d3d9_surface_acquire_rendertarget_view(ds_impl) : NULL; - wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); d3d9_surface_release_rendertarget_view(ds_impl, rtv); wined3d_mutex_unlock(); - return D3D_OK; + return hr; } static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *iface, IDirect3DSurface9 **depth_stencil) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index aca578db16c..ee7d0c622ab 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12902,9 +12902,8 @@ static void test_resource_access(void) ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); - todo_wine_if(!(surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL)) - ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), - "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, depth_stencil); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1a322e33de..50ce89ac181 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4504,17 +4504,25 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3D_OK; } -void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view) +HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, + struct wined3d_rendertarget_view *view) { struct wined3d_rendertarget_view *prev; TRACE("device %p, view %p.\n", device, view); + if (view && !(view->resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) + { + WARN("View resource %p has incompatible %s bind flags.\n", + view->resource, wined3d_debug_bind_flags(view->resource->bind_flags)); + return WINED3DERR_INVALIDCALL; + } + prev = device->fb.depth_stencil; if (prev == view) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return; + return WINED3D_OK; } if ((device->fb.depth_stencil = view)) @@ -4522,6 +4530,8 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) wined3d_rendertarget_view_decref(prev); + + return WINED3D_OK; } static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 70b27bb3d3a..f8e201c3d08 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2399,7 +2399,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); -void __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader); -- 2.11.0

2 1

← Newer
1
...
35
36
37
38
39
40
41
...
78
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-devel November 2018