- wine-devel - winehq.org

[PATCH 1/2] ntoskrnl.exe: Enable bus devices in IoSetDeviceInterfaceState
by Aric Stewart 14 Nov '18

14 Nov '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)

2 2

[PATCH] testbot: Allow more than one test environment per Wine build.
by Francois Gouget 14 Nov '18

14 Nov '18

This implies not assuming that the mission's build uniquely identifies the testing environment. Let GetMissionBaseName() deal with coming up with a suitable identifier for the wineprefix and test reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This lays the groundwork for testing a given build in multiple locales. testbot/bin/WineRunWineTest.pl | 12 ++++----- testbot/bin/build/WineReconfig.pl | 9 ++++--- testbot/bin/build/WineTest.pl | 38 ++++++++++++++--------------- testbot/lib/Build/Utils.pm | 24 ++++++++++-------- testbot/lib/WineTestBot/Missions.pm | 8 +++++- 5 files changed, 51 insertions(+), 40 deletions(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 3784ef0657..592162ad7b 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -290,10 +290,10 @@ sub WrapUpAndExit($;$$$) if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { # Keep the old report if the new one is missing - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; if (-f "$TaskDir/$RptFileName" and !-z "$TaskDir/$RptFileName") { # Update the VM's reference WineTest results for WineSendLog.pl @@ -549,9 +549,9 @@ elsif (!defined $TAError) # Grab the test reports if any # -foreach my $Build (keys %{$TaskMissions->{Builds}}) +foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; Debug(Elapsed($Start), " Retrieving '$RptFileName'\n"); if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) { @@ -606,9 +606,9 @@ if ($NewStatus eq 'completed') { my $LatestDir = "$DataDir/latest"; my $StepDir = $Step->GetDir(); - foreach my $Build (keys %{$TaskMissions->{Builds}}) + foreach my $Mission (@{$TaskMissions->{Missions}}) { - my $RptFileName = "$Build.report"; + my $RptFileName = GetMissionBaseName($Mission) .".report"; my $RefReport = $Task->VM->Name ."_$RptFileName"; for my $Suffix ("", ".err") { diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 898f72c5b6..cc25da0cc8 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -103,17 +103,18 @@ sub UpdateWinePrefixes($) # Set up brand new WinePrefixes ready for use for testing. # This way we do it once instead of doing it for every test, thus saving - # time. Note that this requires using a different wineprefix for each build. + # time. Note that this requires using a different wineprefix for each + # mission. foreach my $Mission (@{$TaskMissions->{Missions}}) { next if ($Mission->{test} eq "build"); - SetupWineEnvironment($Mission->{Build}); - InfoMsg "\nRecreating the $Mission->{Build} wineprefix\n"; + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRecreating the $BaseName wineprefix\n"; # Wait for the wineprefix creation to complete so it is really done # before the snapshot gets updated. - my $ErrMessage = CreateWinePrefix($Mission->{Build}, "wait"); + my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { LogMsg "$ErrMessage\n"; diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 6df028fa95..4947a12a62 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -84,34 +84,34 @@ sub SetupTest($$) LogMsg "tests\n" if (!$InTests); $InTests = 1; - InfoMsg "\nRunning $Test in the $Mission->{Build} Wine\n"; - SetupWineEnvironment($Mission->{Build}); + my $BaseName = SetupWineEnvironment($Mission); + InfoMsg "\nRunning $Test in the $BaseName Wine\n"; + return $BaseName; } sub DailyWineTest($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - SetupTest("WineTest", $Mission); + my $BaseName = SetupTest("WineTest", $Mission); # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - my $Tag = SanitizeTag("$BaseTag-$Mission->{Build}"); - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t $Tag ". - ShArgv2Cmd(@$Args)); - if (!-f "$Mission->{Build}.report") + my $Tag = SanitizeTag("$BaseTag-$BaseName"); + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -s '../$Mission->{Build}.report'")) + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -s '../$BaseName.report'")) { - LogMsg "WineTest failed to send the $Mission->{Build} report\n"; + LogMsg "WineTest failed to send the $BaseName report\n"; # Soldier on in case it's just a network issue } @@ -153,26 +153,26 @@ sub TestPatch($$) return 1 if (!@TestList); } - SetupTest("the tests", $Mission); + my $BaseName = SetupTest("the tests", $Mission); if (!-d $ENV{WINEPREFIX}) { # FIXME Wait for the wineserver as a workaround for bug 41713. my $ErrMessage = CreateWinePrefix($Mission, "wait"); if (defined $ErrMessage) { - LogMsg "Could not create the $Mission->{Build} wineprefix: $ErrMessage\n"; + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; return 0; } } # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. - RunWine($Mission->{Build}, "./programs/winetest/winetest.exe.so", - "-c -o '../$Mission->{Build}.report' -t test-$Mission->{Build} ". + RunWine($Mission, "./programs/winetest/winetest.exe.so", + "-c -o '../$BaseName.report' -t do.not.submit ". join(" ", @TestList)); - if (!-f "$Mission->{Build}.report") + if (!-f "$BaseName.report") { - LogMsg "WineTest did not produce a report file\n"; + LogMsg "WineTest did not produce the $BaseName report\n"; return 0; } @@ -365,7 +365,7 @@ if ($DataDir =~ /'/) # # Clean up old reports -map { unlink("$_.report") } keys %{$TaskMissions->{Builds}}; +unlink map { GetMissionBaseName($_) .".report" } @{$TaskMissions->{Missions}}; my $Impacts; if ($Action eq "testpatch") diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index aa5c205d2d..06fb3d87fc 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -36,6 +36,7 @@ use Digest::SHA; use File::Path; use WineTestBot::Config; +use WineTestBot::Missions; use WineTestBot::PatchUtils; use WineTestBot::Utils; @@ -327,19 +328,22 @@ sub UpdateAddOns() sub SetupWineEnvironment($) { - my ($Build) = @_; + my ($Mission) = @_; - $ENV{WINEPREFIX} = "$DataDir/wineprefix-$Build"; + my $BaseName = GetMissionBaseName($Mission); + $ENV{WINEPREFIX} = "$DataDir/wineprefix-$BaseName"; $ENV{DISPLAY} ||= ":0.0"; + + return $BaseName; } sub RunWine($$$) { - my ($Build, $Cmd, $CmdArgs) = @_; + my ($Mission, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/wine-$Build' && file $Cmd`; + my $Magic = `cd '$DataDir/wine-$Mission->{Build}' && file $Cmd`; my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/wine-$Build' && set -x && ". + return system("cd '$DataDir/wine-$Mission->{Build}' && set -x && ". "time $Wine $Cmd $CmdArgs"); } @@ -348,24 +352,24 @@ sub RunWine($$$) # WinePrefix helpers # -sub CreateWinePrefix($$) +sub CreateWinePrefix($;$) { - my ($Build, $Wait) = @_; + my ($Mission, $Wait) = @_; return "\$WINEPREFIX is not set!" if (!$ENV{WINEPREFIX}); rmtree($ENV{WINEPREFIX}); # Crash dialogs cause delays so disable them - if (RunWine($Build, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) + if (RunWine($Mission, "./programs/reg/reg.exe.so", "ADD HKCU\\\\Software\\\\Wine\\\\WineDbg /v ShowCrashDialog /t REG_DWORD /d 0")) { - return "Failed to disable the $Build build crash dialogs: $!"; + return "Failed to disable the crash dialogs: $!"; } if ($Wait) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/wine-$Build' && ./server/wineserver -w"); + system("cd '$DataDir/wine-$Mission->{Build}' && ./server/wineserver -w"); } return undef; diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm index 80c1d97227..0dc812d6ba 100644 --- a/testbot/lib/WineTestBot/Missions.pm +++ b/testbot/lib/WineTestBot/Missions.pm @@ -26,7 +26,7 @@ WineTestBot::Missions - Missions parser and helper functions =cut use Exporter 'import'; -our @EXPORT = qw(DumpMissions ParseMissionStatement +our @EXPORT = qw(DumpMissions GetMissionBaseName ParseMissionStatement MergeMissionStatementTasks SplitMissionStatementTasks); @@ -86,6 +86,12 @@ sub ParseMissionStatement($) return (undef, \@Missions); } +sub GetMissionBaseName($) +{ + my ($Mission) = @_; + return $Mission->{Build}; +} + sub MergeMissionStatementTasks($) { my ($MissionStatement) = @_; -- 2.19.1

1 0

[PATCH 2/2] hidclass.sys: Use IoSetDeviceInterfaceState
by Aric Stewart 14 Nov '18

14 Nov '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 18 ------------------ dlls/hidclass.sys/pnp.c | 8 ++++++++ 2 files changed, 8 insertions(+), 18 deletions(-)

2 1

[PATCH] d3dx9: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Nov '18

13 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/font.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 5522dea552..418a3be332 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -105,7 +105,7 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *d if( !desc ) return D3DERR_INVALIDCALL; memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, sizeof(desc->FaceName) / sizeof(CHAR), NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, This->desc.FaceName, -1, desc->FaceName, ARRAY_SIZE(desc->FaceName), NULL, NULL); return D3D_OK; } @@ -284,8 +284,7 @@ HRESULT WINAPI D3DXCreateFontIndirectA(IDirect3DDevice9 *device, const D3DXFONT_ /* Copy everything but the last structure member. This requires the two D3DXFONT_DESC structures to be equal until the FaceName member */ memcpy(&widedesc, desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); - MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, - widedesc.FaceName, sizeof(widedesc.FaceName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, desc->FaceName, -1, widedesc.FaceName, ARRAY_SIZE(widedesc.FaceName)); return D3DXCreateFontIndirectW(device, &widedesc, font); } -- 2.14.5

2 1

[PATCH] advapi32: Add DECL_HOTPATCH to registry functions
by Alistair Leslie-Hughes 13 Nov '18

13 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46135 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/registry.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index b537f69db0..3018372a63 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -363,7 +363,7 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) * * See RegCreateKeyExA. */ -LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -410,7 +410,7 @@ LSTATUS WINAPI RegCreateKeyExW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR * FIXME * MAXIMUM_ALLOWED in access mask not supported by server */ -LSTATUS WINAPI RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegCreateKeyExA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, PHKEY retkey, LPDWORD dispos ) { @@ -516,7 +516,7 @@ LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, * * See RegOpenKeyExA. */ -LSTATUS WINAPI RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) +LSTATUS WINAPI DECLSPEC_HOTPATCH RegOpenKeyExW( HKEY hkey, LPCWSTR name, DWORD options, REGSAM access, PHKEY retkey ) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; @@ -1333,7 +1333,7 @@ LSTATUS WINAPI RegDeleteKeyA( HKEY hkey, LPCSTR name ) * Success: ERROR_SUCCESS * Failure: Error code */ -LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { UNICODE_STRING nameW; @@ -1365,7 +1365,7 @@ LSTATUS WINAPI RegSetValueExW( HKEY hkey, LPCWSTR name, DWORD reserved, * win95 does not care about count for REG_SZ and finds out the len by itself (js) * NT does definitely care (aj) */ -LSTATUS WINAPI RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegSetValueExA( HKEY hkey, LPCSTR name, DWORD reserved, DWORD type, const BYTE *data, DWORD count ) { ANSI_STRING nameA; @@ -1759,7 +1759,7 @@ static DWORD query_perf_data(const WCHAR *query, DWORD *type, void *data, DWORD * * See RegQueryValueExA. */ -LSTATUS WINAPI RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, +LSTATUS WINAPI DECLSPEC_HOTPATCH RegQueryValueExW( HKEY hkey, LPCWSTR name, LPDWORD reserved, LPDWORD type, LPBYTE data, LPDWORD count ) { NTSTATUS status; -- 2.19.1

1 0

[PATCH v2] mf: Add a trace to MFCreateTopology.
by Sven Baars 13 Nov '18

13 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: Don't send patches as patch series dlls/mf/topology.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 924d3863c8..e8389cf4df 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -507,6 +507,8 @@ HRESULT WINAPI MFCreateTopology(IMFTopology **topology) { mftopology *object; + TRACE("(%p)\n", topology); + if (!topology) return E_POINTER; -- 2.17.1

1 1

wine-3.0.4-rc1 Available
by Michael Stefaniuc 13 Nov '18

13 Nov '18

Hello guys, I have pushed wine-3.0.4-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ As the previous Stable versions were boring I've made this one more interesting ;-) - Added the ton of new shell32 icons. - Reverted "arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64." The patch is not enough to make Wine fully ABI compatible on ARM64 anyway and it breaks the build on Debian unstable. - Some bigger patches in msvfw32 and gdiplus that aren't just net new code additions. Though this ones should be kinda safe as I had deferred them to 3.0.4. Now the interesting bits and pieces from the ANNOUNCE file: What's new in this release (see below for details): - Added a lot of icons in Shell32 - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 3.0.4 (total 47): 20961 RegEditX 2.x/3.x reports 'Internal error: could not find RegEdit window' on startup (Wine's builtin 'regedit.exe' needs to provide 'RegEdit_RegEdit' window class name) 22255 Total Commander: Deleting the 1st or 2nd character in an edit box deletes all of them 22333 Total Commander: Application freezes when the current directory field is editable, and you right-click a regular file and click Properties 30185 SuperPower 2 demo crashes on launch 30487 Add icons for 'My Network Places', 'My favorites' 36884 Drakensang: The Dark Eye demo crashes on startup (needs d3dx9_36.dll.D3DXCreateTeapot implementation) 37275 Chess Position Trainer 5 (.NET 4.0 app) wants gdiplus.GdipCreateAdjustableArrowCap implementation 37834 RtlSetCurrentDirectory_U prepends "UNC\" for network paths; the resulting path is invalid 39906 ODB++ Viewer fails to install due to improper bat file handling (quoting or delimiting problem) 40598 Warframe 'launcher.exe' reports 'update failed' ('InternetCrackUrlW' must resize buffer when URL canonicalization fails due to insufficient buffer) 41652 Uplay cannot connect/login to Server 42470 Frequent critical section timeouts in winetricks dotnet46 42577 Far manager: needs virtdisk.dll.GetStorageDependencyInformation 42710 Wechat can not send file to friend 42870 CurrentBuild registry value is missing 43036 SetNamedPipeHandleState returns ERROR_ACCESS_DENIED when setting PIPE_NOWAIT 43125 Device reports coming in too fast 43488 Bluestacks crashes in ITextService::TxGetVScroll() 44369 cmd's %0 path variables (e.g. %~dp0) wrong inside subroutine call 44489 Zwei: The Arges Adventure can't detect installed Indeo 5 codec 44490 Zwei: The Arges Adventure videos play distorted (Indeo 5 encoded) 44981 Xenserver console and Vmware management console (client) v5.5 installer fails on 'hcmon' driver service ('EventLog\\System' needs 'Sources' registry key present for WinVer < Windows 7) 45167 Acronis Disk Director 12 installer fails: action L"_USRCUSTACT_MsiFltSrvInstall_fltsrv_component" returned 1603 (setupapi lasterror leakage) 45199 Many applications and games fail to start/crash after compiling wine with gcc 8.1.0 and -O2 (GOT/PIC register load code now emitted at function entry, missing hotpatch signatures) 45372 Resident Evil 7 requires mfplat.dll.MFCreateMFByteStreamOnStream to be implemented 45478 World of Warcraft: graphical artifacts since 8.0 (BfA) 45495 Toontown Corporate Clash: fails to launch 45521 64-bit Sentinel HASP hardlock.sys kernel driver crashes due ntoskrnl emulate_instruction not handling 'cli' and 'sti' 45529 Custom color scheme applied but wine not respecting current text color of scheme on window columns and statusbar. 45530 No$Gba crashes with pulseaudio assertion in waveOutOpen 45535 Rekordbox 5.3.0 terminates with the message "Unexpected application error" (dwrite:dwritetextlayout_Draw out-of-bounds access on empty clustermetrics after failure to resolve layout fonts) 45552 Kolab E14 Client installation fails 45602 Wargaming Game Center needs msvcp140.dll._Set_last_write_time 45603 Total War:Arena needs POWRPROF.dll.PowerEnumerate 45617 Just Dance 2017: Unimplemented function mfplat.dll.MFCreateSample 45622 Overwatch crashes when trying to save highlights (needs mfplat.MFTRegisterLocal implementation) 45644 chromium 64-bit sandbox >=win10 needs UpdateProcThreadAttribute to handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY 45715 Just Dance 2017: Unimplemented function mfplat.dll.MFCreateMemoryBuffer 45722 cmd for loop doesn't work with tokens and delims 45729 cmd's REM evaluates | 45731 cmd for loops sensitive to whitespace 45770 WMP9 crashes with unimplemented function pidgen.dll.PIDGenSimpW 45784 Bethesda Launcher Updater crashes on unimplemented function msvcp110.xtime_get 45785 Bethesda Launcher Updater crashes on unimplemented function msvcp110._Xtime_diff_to_millis2 45786 GTA downgrader (.NET program latest.exe) crashes: "Can't find matching timezone information" ("America/Sao_Paulo") 45821 Metasploit Console won't start due to missing registry value HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\DataBasePath 46106 Stable: ARM64 build broken with gcc ---------------------------------------------------------------- Changes since 3.0.3: Alex Henrie (116): shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE. shell32: Add document icon. shell32: Add window icon. shell32: Add 512k and 314k floppy drive icons. shell32: Add Internet icon. shell32: Add network icon. shell32: Switch the "My Network Places" icon to the network icon. shell32: Add "Computers Near Me" icon. shell32: Add recent documents icon. shell32: Add settings icon. shell32: Remove alpha channel from 4-bit and 8-bit Internet icons. shell32: Remove alpha channel from 4-bit and 8-bit network icons. shell32: Add search icon. shell32: Add help icon. shell32: Add run icon. shell32: Add sleep icon. shell32: Add eject icon. shell32: Add shutdown icon. shell32: Add "trash full" icon. shell32: Add modem folder icon. shell32: Add application folder icon. shell32: Add printer folder icon. shell32: Add font folder icon. shell32: Scale SVG properly to create 48x48 sleep icons. shell32: Scale SVG properly to create 48x48 shutdown icons. shell32: Add start menu icon. shell32: Add optical disc icon. shell32: Add music CD icon. shell32: Add tree icon. shell32: Add remote folder icon. shell32: Add favorites icon. shell32: Add logoff icon. shell32: Add folder search icon. shell32: Add update icon. shell32: Add rights icon. shell32: Add shutdown confirmation icon. shell32: Add blank icons. shell32: Add unknown drive icon. shell32: Add files icon. shell32: Add file search icon. shell32: Add system search icon. shell32: Add options icon. shell32: Add XP printer folder icon. shell32: Add "add printer" icon. shell32: Add remote printer icon. shell32: Add "print to file" icon. shell32: Add "trash folder" icon. shell32: Add "trash mixed" icon. shell32: Add file overwrite icon. shell32: Add folder overwrite icon. shell32: Add rename icon. shell32: Add folder rename icon. shell32: Add install icon. shell32: Add config file icon. shell32: Add text file icon. shell32: Add batch file icon. shell32: Add library file icon. shell32: Add system font icon. shell32: Add TrueType font icon. shell32: Add PostScript font icon. shell32: Add second run icon. shell32: Add copy icon. shell32: Add backup icon. shell32: Add disk check icon. shell32: Add defragment icon. shell32: Add treeview icon. shell32: Add network folder icon. shell32: Add checklist folder icon. shell32: Add network connections icon. shell32: Add web folder icons. shell32: Add visual settings icon. shell32: Add remote connection icon. shell32: Add window-on-monitor and desktop-on-monitor icons. shell32: Add demo window icons. shell32: Add one-click-open and two-click-open icons. shell32: Add remaining recycle bin icons. shell32: Rename icon 48 from "rights" to "security". shell32: Add users icon and passwords icon. shell32: Add fax machine icons. shell32: Add "restricted" icon. shell32: Add remaining folder icons. shell32: Add "power off" icon. shell32: Rename icon 12 from "cdrom" to "optical drive". shell32: Add remaining optical disc icons. shell32: Add documents icon. shell32: Add video file icon. shell32: Add audio file icon. shell32: Rename floppy.svg to disk_drive.svg. shell32: Add card reader icon. shell32: Add zip drive icon. shell32: Add download icons. shell32: Add removable disk icons. shell32: Add MSN icon. shell32: Add delete icon. shell32: Add move icon. shell32: Add upload icon. shell32: Add print icon. shell32: Add play icon. shell32: Add image file icon. shell32: Add multimedia file icon. shell32: Add users icon. shell32: Add remaining Internet icons. shell32: Add remaining printer icons. shell32: Add remaining help icons. shell32: Add XP install icon. shell32: Add remaining search icons. shell32: Add Jaz drive icon. shell32: Rename icon 137 from "options" to "control panel XP". shell32: Add remaining control panel icons. shell32: Add remaining small icons. wine.inf: Add TCP/IP DataBasePath value. kernel32: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. ntdll: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. oleaut32: Add DECLSPEC_HOTPATCH to functions patched by MS Word 2010. msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. oleaut32: Add DECLSPEC_HOTPATCH to SysAllocStringByteLen. Alexandre Julliard (4): shell32: Move image resources to a resources subdirectory. shell32: Fix some resources ids. winedump: Don't use strncat with source length. widl: Silence a gcc warning. Alistair Leslie-Hughes (10): powrprof: Added PowerEnumerate stub. d3dx9: Return a mesh in D3DXCreateTeapot(). wininet: Always copy the password even if blank. regedit: Don't expand items on initial tree creation. mfplat: Implement MFCreateMFByteStreamOnStream. mfplat: Implement MFCreateMemoryBuffer. mfplat: Forward IMFMediaType to IMFAttributes. mfplat: Implement MFCreateSample. mfplat: Add MFTRegisterLocal stub. mfplat: Correct spec for MFTRegisterLocal. Austin English (1): setupapi: Set LastError on success in SetupInstallFromInfSectionW. Chip Davis (1): libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment. Dmitry Timoshkov (2): kernel32/tests: Add a test for holding a critical section during process termination. ntdll: Don't allow blocking on a critical section during process termination. Fabian Maurer (4): kernel32: Make UpdateProcThreadAttribute handle PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY. cmd: Handle quotes when parsing the folders in the PATH environment variable. ntoskrnl: Emulate sti/cli instructions on x86_64. winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests. Gabriel Ivăncescu (3): ntdll: Properly set the current directory for UNC paths. shell32/autocomplete: Don't crash when there's another AutoComplete object on the same edit control. shell32/autocomplete: Fix handling of Backspace and Delete. Gijs Vermeulen (4): wine.inf: Add "Sources" key. msvcp110: Export _Xtime_diff_to_millis2. include: Add virtdisk.h. msvcp110: Export xtime_get. Henri Verbeet (2): d3d10: Handle D3D10_DRIVER_TYPE_WARP in D3D10CreateDevice(). wined3d: Add GPU information for NVIDIA GeForce GT 720. Hugh McMaster (1): regedit: Use the correct window class name. Jacek Caban (2): ntdll: Allow FileAccessInformation to be queried on files without fds. kernel32: Use proper access flags in CreatePipe. Jactry Zeng (2): riched20: Handle NULL in ITextServices::{TxGetHScroll, TxGetVScroll}. ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT. Jason Edmeades (6): cmd: for /f fails to launch quoted program plus args. cmd: Correct handling of %~0 for batch call. cmd: Handle whitespace in 'for' argument items. cmd: Handle unechoed rem commands inside a (..) section. cmd: Handle special case tokens=* in for /f. cmd: Handle "for" loop handling of tokens, where * does not follow a number. Józef Kucia (1): wined3d: Allow copying between different texture types. Kai Krakow (1): winebus.sys: Do not print HID report read errors. Louis Lenders (1): pidgen: Add stub for PIDGenSimpW. Marcus Meissner (1): ole32: Read vt into a DWORD, as propvariant->vt is 16 bit (Coverity). Michael Müller (2): virtdisk: Add GetStorageDependencyInformation stub. wininet: Resize buffer when call to InternetCanonicalizeUrlW fails in InternetCrackUrlW. Michael Stefaniuc (1): Revert "arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64." Nikolay Sivov (5): comctl32/header: Fix item text color. comctl32: Fix background and text color for DrawStatusText(). dwrite: Avoid possible out-of-bounds cluster metrics access. gdiplus: Partially implement arrow caps. gdiplus: Implement unfilled mode for arrow caps. Piotr Caban (3): msvcp110: Add _Last_write_time(wchar_t) implementation. msvcp140: Add _Last_write_time implementation. msvcp90: Fix EOF delimiter handling in basic_istream<char>::ignore. Rodrigo Saboya (1): wine.inf: Updates E. South America Standard Time DST data. Thomas Faller (1): wine.inf: Set CurrentBuild always to the same value as CurrentBuildNumber. Zebediah Figura (4): msvfw32: Fix driver enumeration. msvfw32: Set fccType in ICInfo(). msvfw32: Reimplement ICGetDisplayFormat(). ddraw: Avoid leaking references to the wined3d device. Zhiyi Zhang (2): crypt32/tests: Add revocation flags tests for CertGetCertificateChain(). crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

Discussing address space for 32bit apps
by Axel Davy 13 Nov '18

13 Nov '18

Hi, Wine emulates windows behavior of restricting virtual address space for 32 bits apps to the low 2GB. One issue though is that in this process space, some of the space is not directly used by the application. Indeed the linux libs loaded by wine (including things like pulseaudio) and the wine dlls take space in the process space. I am a gallium nine developer, and this has been particularly an issue for us for some games, as in addition to all the libs loaded without gallium nine, some extra libs are loaded. Some games will crash very fast. For example Mass Effect 1 complains being out of virtual mem when loading a save. We have a few opened issues related (https://github.com/iXit/Mesa-3D/issues/309 for example). We thought this would be fixed by having gallium nine use wine's HeapAlloc for all its allocations, but this hasn't helped. Indeed the problem doesn't seem to be gallium nine allocating memory, but gallium nine code (and other linux libs) being mapped on the process space and thus preventing that space to be used for allocations. A tester who doesn't use pulseaudio said he didn't run into issues with Mass Effect 1. Indeed the fact pulseaudio takes almost half the space allocated by all the linux libs, which could explain that. I also hit the Mass Effect 1 issue with wine without gallium nine, after an hour of play, which further proves this is not gallium nine specific, though gallium nine makes it worse. Making the game exe Large Space aware fixes the issue, as wine will not prevent allocation to be in the low 2GB. What are your thoughts on this issue ? I understand it could be important for some apps to have the code it calls live in the low 2GB, but all the code of internal libs (libGL, libX11, gallium nine's d3dadapter) and maybe some allocations (pulseaudio, etc) could be mapped on the upper 2GB. Yours, Axel Davy

5 8

[PATCH 1/6] wined3d: Invalidate shader resource bindings when blitting.
by Matteo Bruni 13 Nov '18

13 Nov '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/context.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37abf19d73e..bdd291b74f5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2846,6 +2846,8 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine } context_invalidate_state(context, STATE_SAMPLER(sampler)); } + context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { -- 2.18.1

7 18

[PATCH v6 1/3] mscoree: Add test for registration-less COM components
by Fabian Maurer 13 Nov '18

13 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- v5: check for admin rights before trying to write into system32 fix test failure on xp. dll can't be in same folder as manifest give test runs better names v6: Fix test failure by compiling into temp folder and then moving file --- dlls/mscoree/tests/Makefile.in | 6 +- dlls/mscoree/tests/comtest.c | 356 ++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 23 ++ dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 33 +++ dlls/mscoree/tests/resource.rc | 30 ++ 7 files changed, 474 insertions(+), 1 deletion(-) create mode 100644 dlls/mscoree/tests/comtest.c create mode 100644 dlls/mscoree/tests/comtest.cs create mode 100644 dlls/mscoree/tests/comtest_dll.manifest create mode 100644 dlls/mscoree/tests/comtest_exe.manifest create mode 100644 dlls/mscoree/tests/interfaces.idl create mode 100644 dlls/mscoree/tests/resource.rc diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 7c1ba5cb11..f65e1bc6c2 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,7 +1,11 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid +IMPORTS = ole32 shlwapi uuid shell32 C_SRCS = \ + comtest.c \ debugging.c \ metahost.c \ mscoree.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c new file mode 100644 index 0000000000..e9812eb6b9 --- /dev/null +++ b/dlls/mscoree/tests/comtest.c @@ -0,0 +1,356 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 + */ + +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "mscoree.h" +#include "corerror.h" +#include "shlwapi.h" +#include "shlobj.h" + +#include "wine/test.h" + +#include "initguid.h" +#include "interfaces.h" + +HMODULE hmscoree; + +typedef enum _run_type +{ + run_type_current_working_directory = 0, + run_type_exe_directory, + run_type_system32, +} run_type; + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + strcpy(path_file, path_tmp); + PathAppendA(path_file, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static BOOL compile_cs_to_dll(char *source_path, char *dest_path) +{ + const char *path_csc = "C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + char cmdline[MAX_PATH]; + char path_temp[MAX_PATH] = {0}; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + if (!PathFileExistsA(path_csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + GetTempPathA(MAX_PATH, path_temp); + PathAppendA(path_temp, "comtest.dll"); + + sprintf(cmdline, "%s /t:library /out:\"%s\" \"%s\"", path_csc, path_temp, source_path); + + si.cb = sizeof(si); + ret = CreateProcessA(path_csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + WaitForSingleObject(pi.hProcess, 5000); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsA(path_temp); + ok(ret, "Compilation failed\n"); + + ret = MoveFileA(path_temp, dest_path); + ok(ret, "Moving temporary file failed\n"); + return ret; +} + +static void run_test(BOOL expect_success) +{ + typedef HRESULT (WINAPI *_DllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + ITest *test = NULL; + HRESULT hr; + _DllGetClassObject getClassObject; + IClassFactory *classFactory = NULL; + HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + getClassObject = (_DllGetClassObject)GetProcAddress(hmscoree, "DllGetClassObject"); + hr = getClassObject(&CLSID_Test, &IID_IClassFactory, (void **)&classFactory); + todo_wine_if(!expect_success) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + ITest *test2 = NULL; + hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test2, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test2); + } + IClassFactory_Release(classFactory); + } +} + +static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + + GetTempPathA(MAX_PATH, path_tmp); + + switch (run) + { + case run_type_current_working_directory: + strcpy(path_dll, path_tmp); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_exe_directory: + GetModuleFileNameA(NULL, path_dll, path_dll_size); + PathRemoveFileSpecA(path_dll); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_system32: + GetSystemDirectoryA(path_dll, path_dll_size); + PathAppendA(path_dll, "comtest.dll"); + break; + } +} +static void prepare_and_run_test(const char *dll_source, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + char path_tmp_manifest[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + char path_dll_source[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetTempPathA(MAX_PATH, path_tmp); + GetTempPathA(MAX_PATH, path_tmp_manifest); + PathAppendA(path_tmp_manifest, "manifests"); + + CreateDirectoryA(path_tmp_manifest, NULL); + + if (run == run_type_system32) + { + if (!IsUserAnAdmin()) + { + skip("Can't test dll in system32 due to user not being admin.\n"); + return; + } + } + + if (!write_resource_file(path_tmp, dll_source, "comtest.cs", path_dll_source)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!compile_cs_to_dll(path_dll_source, path_dll)) + goto cleanup; + + if (!write_resource_file(path_tmp_manifest, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp_manifest, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp_manifest; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run: %d, CreateActCtxA failed: %d\n", run, GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + ok(0, "run: %d, Failed to create activation context\n", run); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "run: %d, ActivateActCtx failed: %d\n", run, GetLastError()); + + if (run == run_type_current_working_directory) + SetCurrentDirectoryA(path_tmp); + + run_test(run == run_type_exe_directory); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "run: %d, DeactivateActCtx failed: %d\n", run, GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_dll_source) + { + success = DeleteFileA(path_dll_source); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + RemoveDirectoryA(path_tmp_manifest); + /* dll cleanup is handled by the parent, because it might still be used by the child */ +} + + +static void cleanup_test(run_type run) +{ + char path_dll[MAX_PATH] = {0}; + BOOL success; + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!PathFileExistsA(path_dll)) + return; + + success = DeleteFileA(path_dll); + if (!success) + { + Sleep(500); + success = DeleteFileA(path_dll); + } + ok(success, "DeleteFileA failed: %d\n", GetLastError()); +} + +static void run_child_process(const char *dll_source, run_type run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %s %d", argv[0], argv[1], dll_source, run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + /* Cleanup dll, because it might still have been used by the child */ + cleanup_test(run); +} + +START_TEST(comtest) +{ + int argc; + char **argv; + + CoInitialize(NULL); + + hmscoree = LoadLibraryA("mscoree.dll"); + if (!hmscoree) + { + skip(".NET or mono not available\n"); + return; + } + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + const char *dll_source = argv[2]; + run_type run = atoi(argv[3]); + prepare_and_run_test(dll_source, run); + + goto cleanup; + } + + run_child_process("comtest.cs", run_type_current_working_directory); + run_child_process("comtest.cs", run_type_exe_directory); + run_child_process("comtest.cs", run_type_system32); + +cleanup: + FreeLibrary(hmscoree); + CoUninitialize(); +} diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs new file mode 100644 index 0000000000..4fe2a718b2 --- /dev/null +++ b/dlls/mscoree/tests/comtest.cs @@ -0,0 +1,23 @@ +/* Compile with + csc /target:library /out:dll.dll comtest.cs +*/ + +using System.Runtime.InteropServices; + +namespace DLL +{ + [Guid("1dbc4491-080d-45c5-a15d-1e3c4610bdd9"), ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest + { + void Func(ref int i); + } + + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] + public class Test : ITest + { + public void Func(ref int i) + { + i = 42; + } + } +} diff --git a/dlls/mscoree/tests/comtest_dll.manifest b/dlls/mscoree/tests/comtest_dll.manifest new file mode 100644 index 0000000000..ef6924de9e --- /dev/null +++ b/dlls/mscoree/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="comtest.dll"> + </file> +</assembly> diff --git a/dlls/mscoree/tests/comtest_exe.manifest b/dlls/mscoree/tests/comtest_exe.manifest new file mode 100644 index 0000000000..bc9ce4c045 --- /dev/null +++ b/dlls/mscoree/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/mscoree/tests/interfaces.idl b/dlls/mscoree/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/mscoree/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * 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 "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc new file mode 100644 index 0000000000..9a1b89f656 --- /dev/null +++ b/dlls/mscoree/tests/resource.rc @@ -0,0 +1,30 @@ +/* + * Resources for mscoree test suite. + * + * Copyright 2018 Fabian Maurer + * + * 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 "windef.h" + +/* @makedep: comtest.cs */ +comtest.cs RCDATA comtest.cs + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest -- 2.18.0

2 8

[PATCH] iccvid: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Nov '18

13 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iccvid/iccvid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index 89d282ba78..78c53b336b 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -953,8 +953,8 @@ static LRESULT ICCVID_GetInfo( ICCVID_Info *info, ICINFO *icinfo, DWORD dwSize ) icinfo->dwVersion = ICVERSION; icinfo->dwVersionICM = ICVERSION; - LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, sizeof(icinfo->szName)/sizeof(WCHAR)); - LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, sizeof(icinfo->szDescription)/sizeof(WCHAR)); + LoadStringW(ICCVID_hModule, IDS_NAME, icinfo->szName, ARRAY_SIZE(icinfo->szName)); + LoadStringW(ICCVID_hModule, IDS_DESCRIPTION, icinfo->szDescription, ARRAY_SIZE(icinfo->szDescription)); /* msvfw32 will fill icinfo->szDriver for us */ return sizeof(ICINFO); -- 2.14.5

1 0

[PATCH] hlink: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Nov '18

13 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hlink/hlink_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index b0a20b18bb..4af5961753 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -389,9 +389,9 @@ HRESULT WINAPI HlinkParseDisplayName(LPBC pibc, LPCWSTR pwzDisplayName, BOOL fNo if(fNoForceAbs) FIXME("Unsupported fNoForceAbs\n"); - if(!strncmpiW(pwzDisplayName, file_colonW, sizeof(file_colonW)/sizeof(WCHAR))) { - pwzDisplayName += sizeof(file_colonW)/sizeof(WCHAR); - eaten += sizeof(file_colonW)/sizeof(WCHAR); + if(!strncmpiW(pwzDisplayName, file_colonW, ARRAY_SIZE(file_colonW))) { + pwzDisplayName += ARRAY_SIZE(file_colonW); + eaten += ARRAY_SIZE(file_colonW); while(*pwzDisplayName == '/') { pwzDisplayName++; -- 2.14.5

1 0

[PATCH] combase/tests: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Nov '18

13 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/combase/tests/roapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/combase/tests/roapi.c b/dlls/combase/tests/roapi.c index 3d46772552..05581f8948 100644 --- a/dlls/combase/tests/roapi.c +++ b/dlls/combase/tests/roapi.c @@ -74,10 +74,10 @@ static void test_ActivationFactories(void) return; } - hr = pWindowsCreateString(xmldocumentW, sizeof(xmldocumentW)/sizeof(WCHAR) - 1, &str); + hr = pWindowsCreateString(xmldocumentW, ARRAY_SIZE(xmldocumentW) - 1, &str); ok(hr == S_OK, "got %08x\n", hr); - hr = pWindowsCreateString(nonexistW, sizeof(nonexistW)/sizeof(WCHAR) - 1, &str2); + hr = pWindowsCreateString(nonexistW, ARRAY_SIZE(nonexistW) - 1, &str2); ok(hr == S_OK, "got %08x\n", hr); hr = pRoInitialize(RO_INIT_MULTITHREADED); -- 2.14.5

1 0

[PATCH] avifil32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 13 Nov '18

13 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/avifil32/api.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c index 63a3530591..37fa94169a 100644 --- a/dlls/avifil32/api.c +++ b/dlls/avifil32/api.c @@ -1119,10 +1119,10 @@ HRESULT WINAPI AVIBuildFilterW(LPWSTR szFilter, LONG cbFilter, BOOL fSaving) HeapFree(GetProcessHeap(), 0, lp); /* add "All files" "*.*" filter if enough space left */ - size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, - szAllFiles, (sizeof(szAllFiles) - sizeof(all_files))/sizeof(WCHAR)) + 1; + size = LoadStringW(AVIFILE_hModule, IDS_ALLFILES, szAllFiles, + ARRAY_SIZE(szAllFiles) - ARRAY_SIZE(all_files)) + 1; memcpy( szAllFiles + size, all_files, sizeof(all_files) ); - size += sizeof(all_files) / sizeof(WCHAR); + size += ARRAY_SIZE(all_files); if (cbFilter > size) { memcpy(szFilter, szAllFiles, size * sizeof(szAllFiles[0])); @@ -2109,8 +2109,7 @@ HRESULT WINAPI EditStreamSetInfoA(PAVISTREAM pstream, LPAVISTREAMINFOA asi, return AVIERR_BADSIZE; memcpy(&asiw, asi, sizeof(asiw) - sizeof(asiw.szName)); - MultiByteToWideChar(CP_ACP, 0, asi->szName, -1, - asiw.szName, sizeof(asiw.szName)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, asi->szName, -1, asiw.szName, ARRAY_SIZE(asiw.szName)); return EditStreamSetInfoW(pstream, &asiw, sizeof(asiw)); } -- 2.14.5

1 0

[PATCH 1/5] wincodecs: Fix parameter validation during scaler initialization.
by Nikolay Sivov 13 Nov '18

13 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/scaler.c | 3 + dlls/windowscodecs/tests/bitmap.c | 101 ++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index ebcc790f75..f576ad51fd 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -309,6 +309,9 @@ static HRESULT WINAPI BitmapScaler_Initialize(IWICBitmapScaler *iface, TRACE("(%p,%p,%u,%u,%u)\n", iface, pISource, uiWidth, uiHeight, mode); + if (!pISource || !uiWidth || !uiHeight) + return E_INVALIDARG; + EnterCriticalSection(&This->lock); if (This->source) diff --git a/dlls/windowscodecs/tests/bitmap.c b/dlls/windowscodecs/tests/bitmap.c index 5c225d2abb..34da3b2083 100644 --- a/dlls/windowscodecs/tests/bitmap.c +++ b/dlls/windowscodecs/tests/bitmap.c @@ -1080,6 +1080,106 @@ static void test_WICCreateBitmapFromSectionEx(void) CloseHandle(hsection); } +static void test_bitmap_scaler(void) +{ + IWICBitmapScaler *scaler; + IWICBitmap *bitmap; + UINT width, height; + HRESULT hr; + + hr = IWICImagingFactory_CreateBitmap(factory, 4, 2, &GUID_WICPixelFormat24bppBGR, WICBitmapCacheOnLoad, &bitmap); + ok(hr == S_OK, "Failed to create a bitmap, hr %#x.\n", hr); + + hr = IWICBitmap_GetSize(bitmap, &width, &height); + ok(hr == S_OK, "Failed to get bitmap size, hr %#x.\n", hr); + ok(width == 4, "Unexpected width %u.\n", width); + ok(height == 2, "Unexpected height %u.\n", height); + + hr = IWICImagingFactory_CreateBitmapScaler(factory, &scaler); + ok(hr == S_OK, "Failed to create bitmap scaler, hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, NULL, 0, 0, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 0, 0, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetSize(scaler, NULL, &height); +todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetSize(scaler, &width, NULL); +todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + width = 123; + height = 321; + hr = IWICBitmapScaler_GetSize(scaler, &width, &height); +todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + ok(width == 123, "Unexpected width %u.\n", width); + ok(height == 321, "Unexpected height %u.\n", height); + + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 4, 0, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetSize(scaler, &width, &height); +todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 0, 2, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetSize(scaler, &width, &height); +todo_wine + ok(hr == WINCODEC_ERR_NOTINITIALIZED, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, NULL, 8, 4, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Failed to initialize bitmap scaler, hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == S_OK, "Failed to initialize bitmap scaler, hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 0, 4, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 0, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, NULL, 8, 4, WICBitmapInterpolationModeNearestNeighbor); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_Initialize(scaler, (IWICBitmapSource *)bitmap, 8, 4, + WICBitmapInterpolationModeNearestNeighbor); + ok(hr == WINCODEC_ERR_WRONGSTATE, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetSize(scaler, &width, &height); + ok(hr == S_OK, "Failed to get scaler size, hr %#x.\n", hr); + ok(width == 8, "Unexpected width %u.\n", width); + ok(height == 4, "Unexpected height %u.\n", height); + + hr = IWICBitmapScaler_GetSize(scaler, NULL, &height); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetSize(scaler, &width, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IWICBitmapScaler_GetSize(scaler, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + IWICBitmapScaler_Release(scaler); + + IWICBitmap_Release(bitmap); +} + START_TEST(bitmap) { HRESULT hr; @@ -1096,6 +1196,7 @@ START_TEST(bitmap) test_CreateBitmapFromHICON(); test_CreateBitmapFromHBITMAP(); test_clipper(); + test_bitmap_scaler(); IWICImagingFactory_Release(factory); -- 2.19.1

2 9

[PATCH v2] pdh: Add PdhVbAddCounter stub.
by Andrey Gusev 13 Nov '18

13 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44109 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/pdh/pdh.spec | 2 +- dlls/pdh/pdh_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 72e6fa39f0..5f61a8a42c 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -141,7 +141,7 @@ @ stdcall PdhValidatePathExA(ptr str) @ stdcall PdhValidatePathExW(ptr wstr) @ stdcall PdhValidatePathW(wstr) -@ stub PdhVbAddCounter +@ stdcall PdhVbAddCounter(ptr str ptr) @ stub PdhVbCreateCounterPathList @ stub PdhVbGetCounterPathElements @ stub PdhVbGetCounterPathFromList diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index b648d8b8e6..bc3674a28a 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1083,6 +1083,18 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) return PDH_CSTATUS_NO_COUNTER; } +/*********************************************************************** + * PdhVbAddCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhVbAddCounter( PDH_HQUERY query, LPCSTR path, PDH_HCOUNTER *counter ) +{ + FIXME("%p, %s, %p: stub!\n", query, debugstr_a(path), counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + return PDH_NOT_IMPLEMENTED; +} + /*********************************************************************** * PdhValidatePathExA (PDH.@) */ -- 2.17.2

1 0

[PATCH] oleaut32: Fix calling function with instance and VARIANT return type.
by Dmitry Timoshkov 13 Nov '18

13 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/typelib.c | 59 +++++++++++++++++++++++++++++++++-- dlls/oleaut32/typelib.c | 16 ++++++++-- 2 files changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 03031743df..90f0cb256e 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1199,11 +1199,41 @@ static HRESULT WINAPI ret_false_func(void) return S_FALSE; } -static const void *vtable[] = { NULL, NULL, NULL, inst_func }; +static const WCHAR testW[] = { 'T','e','s','t',0 }; + +static void WINAPI variant_func2(VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); + + ok(V_VT(ret) == VT_I4 || broken(V_VT(ret) == VT_VARIANT) /* win64 */, "unexpected %d\n", V_VT(ret)); + ok(V_I4(ret) == 1234, "unexpected %d\n", V_I4(ret)); + + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void *vtable[] = { NULL, NULL, NULL, inst_func }; +static void *vtable2[] = { NULL, NULL, NULL, inst_func2 }; static void test_DispCallFunc(void) { - const void **inst = vtable; + void **inst; HRESULT res; VARIANT result, args[5]; VARIANTARG *pargs[5]; @@ -1212,6 +1242,30 @@ static void test_DispCallFunc(void) for (i = 0; i < 5; i++) pargs[i] = &args[i]; + memset( args, 0x55, sizeof(args) ); + + types[0] = VT_VARIANT; + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 2; + types[1] = VT_VARIANT; + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(testW); + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)variant_func2, CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + V_VT(&result) = VT_I4; + V_UI4(&result) = 1234; + inst = vtable2; + res = DispCallFunc(&inst, 3 * sizeof(void *), CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + VariantClear(&args[1]); + memset( args, 0x55, sizeof(args) ); types[0] = VT_UI4; V_UI4(&args[0]) = 1; @@ -1310,6 +1364,7 @@ static void test_DispCallFunc(void) types[0] = VT_I4; V_I4(&args[0]) = 3; memset( &result, 0xcc, sizeof(result) ); + inst = vtable; res = DispCallFunc( &inst, 3 * sizeof(void*), CC_STDCALL, VT_I4, 1, types, pargs, &result ); ok( res == S_OK, "DispCallFunc failed %x\n", res ); ok( V_VT(&result) == VT_I4, "wrong result type %d\n", V_VT(&result) ); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4555802a61..52d335fe47 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6720,7 +6720,13 @@ DispCallFunc( break; case VT_DECIMAL: case VT_VARIANT: - args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ + if (pvInstance) + { + args[0] = (DWORD)pvInstance; /* arg 0 is a pointer to the instance */ + args[1] = (DWORD)pvargResult; /* arg 1 is a pointer to the result */ + } + else + args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ call_method( func, argspos, args, &stack_offset ); break; case VT_I8: @@ -6806,7 +6812,13 @@ DispCallFunc( break; case VT_DECIMAL: case VT_VARIANT: - args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ + if (pvInstance) + { + args[0] = (DWORD_PTR)pvInstance; /* arg 0 is a pointer to the instance */ + args[1] = (DWORD_PTR)pvargResult; /* arg 1 is a pointer to the result */ + } + else + args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ call_method( func, argspos, args ); break; case VT_HRESULT: -- 2.17.1

2 4

[PATCH v4 1/7] comctl32/listbox: Disable LBS_NODATA if styles are incompatible with it
by Gabriel Ivăncescu 13 Nov '18

13 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index d0e8e60..3d8804a 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2516,6 +2516,8 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) if (descr->style & LBS_EXTENDEDSEL) descr->style |= LBS_MULTIPLESEL; if (descr->style & LBS_MULTICOLUMN) descr->style &= ~LBS_OWNERDRAWVARIABLE; if (descr->style & LBS_OWNERDRAWVARIABLE) descr->style |= LBS_NOINTEGRALHEIGHT; + if ((descr->style & (LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_SORT)) != LBS_OWNERDRAWFIXED) + descr->style &= ~LBS_NODATA; descr->item_height = LISTBOX_SetFont( descr, 0 ); if (descr->style & LBS_OWNERDRAWFIXED) -- 2.19.1

2 10

[PATCH vkd3d 4/8] tests: Add more tests for mapping resources.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1ddf7c2d4a48..e98dbfae18af 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5364,11 +5364,13 @@ static void test_map_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); /* Resources on a DEFAULT heap cannot be mapped. */ + data = (void *)0xdeadbeef; hr = ID3D12Resource_Map(resource, 0, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); ID3D12Resource_Release(resource); @@ -5385,8 +5387,10 @@ static void test_map_resource(void) else { /* The data pointer must be NULL for the UNKNOWN layout. */ + data = (void *)0xdeadbeef; hr = ID3D12Resource_Map(resource, 0, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); ID3D12Resource_Release(resource); } @@ -5401,11 +5405,39 @@ static void test_map_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); /* Resources on a DEFAULT heap cannot be mapped. */ + data = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); + + ID3D12Resource_Release(resource); + + heap_properties.Type = D3D12_HEAP_TYPE_UPLOAD; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, + &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + + data = NULL; hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data, "Got NULL pointer.\n"); + ID3D12Resource_Unmap(resource, 0, NULL); + + data = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(resource, 1, NULL, &data); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(data == (void *)0xdeadbeef, "Pointer was modified %p.\n", data); + + data = NULL; + hr = ID3D12Resource_Map(resource, 0, NULL, &data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data, "Got NULL pointer.\n"); + ID3D12Resource_Unmap(resource, 1, NULL); + ID3D12Resource_Unmap(resource, 0, NULL); ID3D12Resource_Release(resource); -- 2.18.1

2 1

[PATCH vkd3d 8/8] vkd3d-shader: Avoid SIZE_T.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 8 ++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 7b034482a7c6..22cf57ca9dab 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1651,7 +1651,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha DWORD opcode_token, opcode, previous_token; struct vkd3d_sm4_data *priv = data; unsigned int i, len; - SIZE_T remaining; + size_t remaining; const DWORD *p; DWORD precise; @@ -1679,7 +1679,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha } if (!len || remaining < len) { - WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + WARN("Read invalid length %u (remaining %zu).\n", len, remaining); goto fail; } --len; @@ -1980,7 +1980,7 @@ static int isgn_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) return shader_parse_signature(tag, data, data_size, is); } -int shader_parse_input_signature(const void *dxbc, SIZE_T dxbc_length, +int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_signature *signature) { int ret; @@ -2056,7 +2056,7 @@ void free_shader_desc(struct vkd3d_shader_desc *desc) vkd3d_shader_free_shader_signature(&desc->patch_constant_signature); } -int shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, +int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) { int ret; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 651a5959f1d1..da17e361d4ab 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -795,11 +795,11 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_shader_instruction *ins) DECLSPEC_HIDDEN; BOOL shader_sm4_is_end(void *data, const DWORD **ptr) DECLSPEC_HIDDEN; -int shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, +int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; void free_shader_desc(struct vkd3d_shader_desc *desc) DECLSPEC_HIDDEN; -int shader_parse_input_signature(const void *dxbc, SIZE_T dxbc_length, +int shader_parse_input_signature(const void *dxbc, size_t dxbc_length, struct vkd3d_shader_signature *signature) DECLSPEC_HIDDEN; struct vkd3d_dxbc_compiler; -- 2.18.1

2 1

[PATCH vkd3d 7/8] tests: Add test for trying to map external vkd3d resource.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/vkd3d_api.c | 60 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index e0912c549147..ff5704dff778 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -816,7 +816,62 @@ static VkDeviceMemory allocate_vulkan_image_memory(ID3D12Device *device, return vk_memory; } -static void test_vulkan_resource_present_state(void) +static void test_external_resource_map(void) +{ + struct vkd3d_image_resource_create_info resource_create_info; + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + ID3D12Resource *vk_resource; + VkDeviceMemory vk_memory; + ID3D12Device *device; + VkDevice vk_device; + VkImage vk_image; + ULONG refcount; + HRESULT hr; + void *ptr; + + device = create_device(); + ok(device, "Failed to create device.\n"); + + vk_image = create_vulkan_image(device, 32, 32, + VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + vk_memory = allocate_vulkan_image_memory(device, + VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, vk_image); + + resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_create_info.next = NULL; + resource_create_info.vk_image = vk_image; + resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_create_info.desc.Alignment = 0; + resource_create_info.desc.Width = 32; + resource_create_info.desc.Height = 32; + resource_create_info.desc.DepthOrArraySize = 1; + resource_create_info.desc.MipLevels = 1; + resource_create_info.desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_create_info.desc.SampleDesc.Count = 1; + resource_create_info.desc.SampleDesc.Quality = 0; + resource_create_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_create_info.desc.Flags = 0; + resource_create_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION; + hr = vkd3d_create_image_resource(device, &resource_create_info, &vk_resource); + ok(hr == S_OK, "Failed to create D3D12 resource for Vulkan image, hr %#x.\n", hr); + + ptr = (void *)0xdeadbeef; + hr = ID3D12Resource_Map(vk_resource, 0, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (void *)0xdeadbeef, "Pointer was modified %p.\n", ptr); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(vk_resource); + ok(!gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + + ID3D12Resource_Release(vk_resource); + vk_device = vkd3d_get_vk_device(device); + vkDestroyImage(vk_device, vk_image, NULL); + vkFreeMemory(vk_device, vk_memory, NULL); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +static void test_external_resource_present_state(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -989,6 +1044,7 @@ START_TEST(vkd3d_api) run_test(test_device_parent); run_test(test_vkd3d_queue); run_test(test_resource_internal_refcount); - run_test(test_vulkan_resource_present_state); + run_test(test_external_resource_map); + run_test(test_external_resource_present_state); run_test(test_formats); } -- 2.18.1

2 1

[PATCH vkd3d 6/8] vkd3d: Initialize all members of d3d12_resource for external vkd3d resources.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 80265ca1b6ef..bfbbad58b808 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1321,16 +1321,15 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, if (!(object = vkd3d_malloc(sizeof(*object)))) return E_OUTOFMEMORY; + memset(object, 0, sizeof(*object)); + object->ID3D12Resource_iface.lpVtbl = &d3d12_resource_vtbl; object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; object->u.vk_image = create_info->vk_image; - object->vk_memory = VK_NULL_HANDLE; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; - object->map_count = 0; - object->map_ptr = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; -- 2.18.1

2 1

[PATCH vkd3d 5/8] vkd3d: Do not modify pointer on mapping failures.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 40 +++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f4619efcfb1a..80265ca1b6ef 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -238,6 +238,7 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface) static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **data) { struct d3d12_device *device = heap->device; + HRESULT hr = S_OK; VkResult vr; int rc; @@ -259,18 +260,20 @@ static HRESULT d3d12_heap_map(struct d3d12_heap *heap, UINT64 offset, void **dat { WARN("Failed to map device memory, vr %d.\n", vr); heap->map_ptr = NULL; - *data = NULL; - pthread_mutex_unlock(&heap->mutex); - return hresult_from_vk_result(vr); } + + hr = hresult_from_vk_result(vr); } - *data = (BYTE *)heap->map_ptr + offset; - ++heap->map_count; + if (heap->map_ptr) + { + *data = (BYTE *)heap->map_ptr + offset; + ++heap->map_count; + } pthread_mutex_unlock(&heap->mutex); - return S_OK; + return hr; } static void d3d12_heap_unmap(struct d3d12_heap *heap) @@ -813,8 +816,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); unsigned int sub_resource_count; struct d3d12_device *device; + HRESULT hr = S_OK; VkResult vr; - HRESULT hr; TRACE("iface %p, sub_resource %u, read_range %p, data %p.\n", iface, sub_resource, read_range, data); @@ -853,14 +856,14 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT { if (resource->heap) { - hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_data); + hr = d3d12_heap_map(resource->heap, resource->heap_offset, &resource->map_ptr); } else { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; if ((vr = VK_CALL(vkMapMemory(device->vk_device, resource->vk_memory, - 0, VK_WHOLE_SIZE, 0, &resource->map_data))) < 0) + 0, VK_WHOLE_SIZE, 0, &resource->map_ptr))) < 0) WARN("Failed to map device memory, vr %d.\n", vr); hr = hresult_from_vk_result(vr); @@ -869,16 +872,17 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT if (FAILED(hr)) { WARN("Failed to map resource, hr %#x.\n", hr); - resource->map_data = NULL; - *data = NULL; - return hr; + resource->map_ptr = NULL; } } - *data = resource->map_data; - ++resource->map_count; + if (resource->map_ptr) + { + *data = resource->map_ptr; + ++resource->map_count; + } - return S_OK; + return hr; } static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT sub_resource, @@ -913,7 +917,7 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - resource->map_data = NULL; + resource->map_ptr = NULL; if (resource->heap) d3d12_heap_unmap(resource->heap); @@ -1148,7 +1152,7 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 } resource->map_count = 0; - resource->map_data = NULL; + resource->map_ptr = NULL; resource->heap_properties = *heap_properties; resource->heap_flags = heap_flags; @@ -1326,7 +1330,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; object->map_count = 0; - object->map_data = NULL; + object->map_ptr = NULL; memset(&object->heap_properties, 0, sizeof(object->heap_properties)); object->heap_properties.Type = D3D12_HEAP_TYPE_DEFAULT; object->initial_state = D3D12_RESOURCE_STATE_COMMON; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index daa60cb74eaa..2fc31da08a96 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -231,7 +231,7 @@ struct d3d12_resource unsigned int flags; unsigned int map_count; - void *map_data; + void *map_ptr; struct d3d12_heap *heap; UINT64 heap_offset; -- 2.18.1

2 1

[PATCH vkd3d 3/8] vkd3d: Validate sub-resource index in d3d12_resource_Unmap().
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 80e7319ac30a..f4619efcfb1a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -885,11 +885,19 @@ static void STDMETHODCALLTYPE d3d12_resource_Unmap(ID3D12Resource *iface, UINT s const D3D12_RANGE *written_range) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + unsigned int sub_resource_count; struct d3d12_device *device; TRACE("iface %p, sub_resource %u, written_range %p.\n", iface, sub_resource, written_range); + sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + if (sub_resource >= sub_resource_count) + { + WARN("Sub-resource index %u is out of range (%u sub-resources).\n", sub_resource, sub_resource_count); + return; + } + if (!resource->map_count) { WARN("Resource %p is not mapped.\n", resource); -- 2.18.1

2 1

[PATCH vkd3d 2/8] vkd3d: Validate sub-resource index in d3d12_resource_Map().
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 8 ++++++++ libs/vkd3d/vkd3d_private.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index be8bbed54072..80e7319ac30a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -811,6 +811,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT const D3D12_RANGE *read_range, void **data) { struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); + unsigned int sub_resource_count; struct d3d12_device *device; VkResult vr; HRESULT hr; @@ -826,6 +827,13 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_Map(ID3D12Resource *iface, UINT return E_INVALIDARG; } + sub_resource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + if (sub_resource >= sub_resource_count) + { + WARN("Sub-resource index %u is out of range (%u sub-resources).\n", sub_resource, sub_resource_count); + return E_INVALIDARG; + } + if (d3d12_resource_is_texture(resource)) { /* Textures seem to be mappable only on UMA adapters. */ diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d6c821b75884..daa60cb74eaa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -861,6 +861,11 @@ static inline unsigned int d3d12_resource_desc_get_layer_count(const D3D12_RESOU return desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1; } +static inline unsigned int d3d12_resource_desc_get_sub_resource_count(const D3D12_RESOURCE_DESC *desc) +{ + return d3d12_resource_desc_get_layer_count(desc) * desc->MipLevels; +} + enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; VkSampleCountFlagBits vk_samples_from_dxgi_sample_desc(const DXGI_SAMPLE_DESC *desc) DECLSPEC_HIDDEN; -- 2.18.1

2 1

[PATCH vkd3d 1/8] vkd3d: Assign "heap" and "heap_offset" in more appropriate places.
by Józef Kucia 13 Nov '18

13 Nov '18

From: Józef Kucia <jkucia(a)codeweavers.com> Initializes all fields of struct d3d12_resource in d3d12_resource_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78101a5e1aad..be8bbed54072 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1138,6 +1138,9 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap_flags = heap_flags; resource->initial_state = initial_state; + resource->heap = NULL; + resource->heap_offset = 0; + resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1201,9 +1204,6 @@ HRESULT d3d12_committed_resource_create(struct d3d12_device *device, return hr; } - object->heap = NULL; - object->heap_offset = 0; - TRACE("Created committed resource %p.\n", object); *resource = object; @@ -1243,8 +1243,15 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, else vr = VK_CALL(vkBindImageMemory(vk_device, resource->u.vk_image, heap->vk_memory, heap_offset)); - if (vr < 0) + if (vr == VK_SUCCESS) + { + resource->heap = heap; + resource->heap_offset = heap_offset; + } + else + { WARN("Failed to bind memory, vr %d.\n", vr); + } return hresult_from_vk_result(vr); } @@ -1266,9 +1273,6 @@ HRESULT d3d12_placed_resource_create(struct d3d12_device *device, struct d3d12_h return hr; } - object->heap = heap; - object->heap_offset = heap_offset; - TRACE("Created placed resource %p.\n", object); *resource = object; -- 2.18.1

2 1

[PATCH] testbot: Add support for Wine's PARENTSRC.
by Francois Gouget 13 Nov '18

13 Nov '18

This lets the TestBot take into account that modifying the source in a 'PARENTSRC' module affects the code of other modules. This impacts the time it takes to rebuild Wine and the tests to be rerun with the test=module option. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 29 ++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 6009264a7d..f72cef5202 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -60,13 +60,14 @@ sub UpdateWineData($) mkdir "$DataDir/latest" if (!-d "$DataDir/latest"); - my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt'`; - return $ErrMessage if ($? != 0); + my $ErrMessage = `cd '$WineDir' && git ls-tree -r --name-only HEAD 2>&1 >'$DataDir/latest/winefiles.txt' && egrep '^PARENTSRC *=' dlls/*/Makefile.in programs/*/Makefile.in >'$DataDir/latest/wine-parentsrc.txt'`; + return $? != 0 ? $ErrMessage : undef; } my $_TimeStamp; my $_WineFiles; my $_TestList; +my $_WineParentDirs; =pod =over 12 @@ -111,6 +112,21 @@ sub _LoadWineFiles() } close($fh); } + + $_WineParentDirs = {}; + $FileName = "$DataDir/latest/wine-parentsrc.txt"; + if (open(my $fh, "<", $FileName)) + { + while (my $Line = <$fh>) + { + if ($Line =~ m~^\w+/([^/]+)/Makefile\.in:PARENTSRC *= *\.\./([^/\s]+)~) + { + my ($Child, $Parent) = ($1, $2); + $_WineParentDirs->{$Parent}->{$Child} = 1; + } + } + close($fh); + } } @@ -212,11 +228,14 @@ sub _HandleFile($$$) } elsif ($FilePath =~ m~^(dlls|programs)/([^/]+)/([^/\s]+)$~) { - my ($Root, $Dir, $File) = ($1, $2, $3); + my ($Root, $PatchedDir, $File) = ($1, $2, $3); - my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + foreach my $Dir ($PatchedDir, keys %{$_WineParentDirs->{$PatchedDir} || {}}) + { + my $Module = _CreateTestInfo($Impacts, $Root, $Dir); + $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; + } $Impacts->{PatchedModules} = 1; - $Impacts->{Tests}->{$Module}->{PatchedModule} = 1; if ($File eq "Makefile.in" and $Change ne "modify") { -- 2.19.1

1 0

[PATCH] ieframe/tests: Fix todo_wine for tests that work now.
by Jacek Caban 13 Nov '18

13 Nov '18

Those were fixed by typelib marshaling rewrite. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ieframe/tests/ie.c | 3 --- 1 file changed, 3 deletions(-)

1 0

[PATCH] GDI32: accept TTF-fonts without OS2 table
by Wolfgang Walter 13 Nov '18

13 Nov '18

Signed-off-by: Wolfgang Walter <wine(a)stwm.de> --- fonst partially embedded in PDFs often do not contain an OS2 table. Wine did not accept these fonts and uses another fonts as replacement This leads often to completely unreadable documents as the glyp index does not match the one of the choosen replacement font. This patch accepts such fonts and inserts checks where wine assumed that the OS2 table does exist. Regards, -- Wolfgang Walter Studentenwerk München Anstalt des öffentlichen Rechts

2 6

[PATCH 5/5] wined3d: Introduce a separate structure for OpenGL unordered access view information.
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 21 ++++++++------- dlls/wined3d/view.c | 61 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 15 +++++++++-- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e24c834277..4cd46c66c67 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3875,7 +3875,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_unordered_access_view *view; + struct wined3d_unordered_access_view_gl *view_gl; const struct wined3d_format_gl *format_gl; GLuint texture_name; unsigned int i; @@ -3886,7 +3886,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) { - if (!(view = views[i])) + if (!views[i]) { if (shader->reg_maps.uav_resource_info[i].type) WARN("No unordered access view bound at index %u.\n", i); @@ -3894,16 +3894,17 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; } - if (view->gl_view.name) + view_gl = wined3d_unordered_access_view_gl(views[i]); + if (view_gl->gl_view.name) { - texture_name = view->gl_view.name; + texture_name = view_gl->gl_view.name; level = 0; } - else if (view->resource->type != WINED3D_RTYPE_BUFFER) + else if (view_gl->v.resource->type != WINED3D_RTYPE_BUFFER) { - struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view->resource)); + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); texture_name = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); - level = view->desc.u.texture.level_idx; + level = view_gl->v.desc.u.texture.level_idx; } else { @@ -3912,12 +3913,12 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, continue; } - format_gl = wined3d_format_gl(view->format); + format_gl = wined3d_format_gl(view_gl->v.format); GL_EXTCALL(glBindImageTexture(i, texture_name, level, GL_TRUE, 0, GL_READ_WRITE, format_gl->internal)); - if (view->counter_bo) - GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view->counter_bo)); + if (view_gl->counter_bo) + GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo)); } checkGLcall("Bind unordered access views"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5fff7e749e1..0cfadf7329b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -968,26 +968,26 @@ ULONG CDECL wined3d_unordered_access_view_incref(struct wined3d_unordered_access return refcount; } -static void wined3d_unordered_access_view_destroy_object(void *object) +static void wined3d_unordered_access_view_gl_destroy_object(void *object) { - struct wined3d_unordered_access_view *view = object; + struct wined3d_unordered_access_view_gl *view_gl = object; - if (view->gl_view.name || view->counter_bo) + if (view_gl->gl_view.name || view_gl->counter_bo) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - if (view->gl_view.name) - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); - if (view->counter_bo) - GL_EXTCALL(glDeleteBuffers(1, &view->counter_bo)); + if (view_gl->gl_view.name) + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); + if (view_gl->counter_bo) + GL_EXTCALL(glDeleteBuffers(1, &view_gl->counter_bo)); checkGLcall("delete resources"); context_release(context); } - heap_free(view); + heap_free(view_gl); } ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access_view *view) @@ -1004,7 +1004,8 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_unordered_access_view_destroy_object, view); + wined3d_cs_destroy_object(device->cs, wined3d_unordered_access_view_gl_destroy_object, + wined3d_unordered_access_view_gl(view)); wined3d_resource_decref(resource); } @@ -1069,15 +1070,16 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) { + struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - if (!view->counter_bo) + if (!view_gl->counter_bo) return; - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view->counter_bo)); + GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view_gl->counter_bo)); GL_EXTCALL(glBufferSubData(GL_ATOMIC_COUNTER_BUFFER, 0, sizeof(value), &value)); checkGLcall("set atomic counter"); context_release(context); @@ -1086,16 +1088,17 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) { + struct wined3d_unordered_access_view_gl *view_gl = wined3d_unordered_access_view_gl(view); struct wined3d_bo_address dst, src; DWORD dst_location; - if (!view->counter_bo) + if (!view_gl->counter_bo) return; dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); dst.addr += offset; - src.buffer_object = view->counter_bo; + src.buffer_object = view_gl->counter_bo; src.addr = NULL; context_copy_bo_address(context, &dst, wined3d_buffer_gl(buffer)->buffer_type_hint, @@ -1104,11 +1107,11 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ wined3d_buffer_invalidate_location(buffer, ~dst_location); } -static void wined3d_unordered_access_view_cs_init(void *object) +static void wined3d_unordered_access_view_gl_cs_init(void *object) { - struct wined3d_unordered_access_view *view = object; - struct wined3d_resource *resource = view->resource; - struct wined3d_view_desc *desc = &view->desc; + struct wined3d_unordered_access_view_gl *view_gl = object; + struct wined3d_resource *resource = view_gl->v.resource; + struct wined3d_view_desc *desc = &view_gl->v.desc; const struct wined3d_gl_info *gl_info; gl_info = &resource->device->adapter->gl_info; @@ -1120,12 +1123,12 @@ static void wined3d_unordered_access_view_cs_init(void *object) context = context_acquire(resource->device, NULL, 0); gl_info = context->gl_info; - create_buffer_view(&view->gl_view, context, desc, buffer, view->format); + create_buffer_view(&view_gl->gl_view, context, desc, buffer, view_gl->v.format); if (desc->flags & (WINED3D_VIEW_BUFFER_COUNTER | WINED3D_VIEW_BUFFER_APPEND)) { static const GLuint initial_value = 0; - GL_EXTCALL(glGenBuffers(1, &view->counter_bo)); - GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view->counter_bo)); + GL_EXTCALL(glGenBuffers(1, &view_gl->counter_bo)); + GL_EXTCALL(glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, view_gl->counter_bo)); GL_EXTCALL(glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); checkGLcall("create atomic counter buffer"); @@ -1144,8 +1147,8 @@ static void wined3d_unordered_access_view_cs_init(void *object) if (desc->u.texture.layer_idx || desc->u.texture.layer_count != depth_or_layer_count) { - create_texture_view(&view->gl_view, get_texture_view_target(gl_info, desc, texture_gl), - desc, texture_gl, view->format); + create_texture_view(&view_gl->gl_view, get_texture_view_target(gl_info, desc, texture_gl), + desc, texture_gl, view_gl->v.format); } } } @@ -1164,8 +1167,6 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces wined3d_resource_incref(view->resource = resource); - wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_cs_init, view); - return WINED3D_OK; } @@ -1173,7 +1174,7 @@ HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_des struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_unordered_access_view **view) { - struct wined3d_unordered_access_view *object; + struct wined3d_unordered_access_view_gl *object; HRESULT hr; TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", @@ -1182,15 +1183,17 @@ HRESULT CDECL wined3d_unordered_access_view_create(const struct wined3d_view_des if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_unordered_access_view_init(object, desc, resource, parent, parent_ops))) + if (FAILED(hr = wined3d_unordered_access_view_init(&object->v, desc, resource, parent, parent_ops))) { heap_free(object); WARN("Failed to initialise view, hr %#x.\n", hr); return hr; } + wined3d_cs_init_object(resource->device->cs, wined3d_unordered_access_view_gl_cs_init, object); + TRACE("Created unordered access view %p.\n", object); - *view = object; + *view = &object->v; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b8b3d55d307..2d2f712d66d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3902,9 +3902,7 @@ struct wined3d_unordered_access_view void *parent; const struct wined3d_parent_ops *parent_ops; - struct wined3d_gl_view gl_view; const struct wined3d_format *format; - GLuint counter_bo; struct wined3d_view_desc desc; }; @@ -3918,6 +3916,19 @@ void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_view *view, unsigned int value) DECLSPEC_HIDDEN; +struct wined3d_unordered_access_view_gl +{ + struct wined3d_unordered_access_view v; + struct wined3d_gl_view gl_view; + GLuint counter_bo; +}; + +static inline struct wined3d_unordered_access_view_gl *wined3d_unordered_access_view_gl( + struct wined3d_unordered_access_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_unordered_access_view_gl, v); +} + struct wined3d_swapchain_ops { void (*swapchain_present)(struct wined3d_swapchain *swapchain, -- 2.11.0

2 1

[PATCH 4/5] wined3d: Introduce a separate structure for OpenGL shader resource view information.
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 72 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 16 ++++++++-- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 96572c67247..2e24c834277 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3832,7 +3832,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_bind(view, bind_idx, sampler, context); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context); } } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 8cdd214b67b..5fff7e749e1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -672,23 +672,23 @@ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_v return refcount; } -static void wined3d_shader_resource_view_destroy_object(void *object) +static void wined3d_shader_resource_view_gl_destroy_object(void *object) { - struct wined3d_shader_resource_view *view = object; + struct wined3d_shader_resource_view_gl *view_gl = object; - if (view->gl_view.name) + if (view_gl->gl_view.name) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); checkGLcall("glDeleteTextures"); context_release(context); } - heap_free(view); + heap_free(view_gl); } ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) @@ -705,7 +705,8 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); + wined3d_cs_destroy_object(device->cs, wined3d_shader_resource_view_gl_destroy_object, + wined3d_shader_resource_view_gl(view)); wined3d_resource_decref(resource); } @@ -719,18 +720,18 @@ void * CDECL wined3d_shader_resource_view_get_parent(const struct wined3d_shader return view->parent; } -static void wined3d_shader_resource_view_cs_init(void *object) +static void wined3d_shader_resource_view_gl_cs_init(void *object) { - struct wined3d_shader_resource_view *view = object; - struct wined3d_resource *resource = view->resource; + struct wined3d_shader_resource_view_gl *view_gl = object; + struct wined3d_resource *resource = view_gl->v.resource; const struct wined3d_format *view_format; const struct wined3d_gl_info *gl_info; const struct wined3d_view_desc *desc; GLenum view_target; - view_format = view->format; + view_format = view_gl->v.format; gl_info = &resource->device->adapter->gl_info; - desc = &view->desc; + desc = &view_gl->v.desc; if (resource->type == WINED3D_RTYPE_BUFFER) { @@ -738,7 +739,7 @@ static void wined3d_shader_resource_view_cs_init(void *object) struct wined3d_context *context; context = context_acquire(resource->device, NULL, 0); - create_buffer_view(&view->gl_view, context, desc, buffer, view_format); + create_buffer_view(&view_gl->gl_view, context, desc, buffer, view_format); context_release(context); } else @@ -764,11 +765,11 @@ static void wined3d_shader_resource_view_cs_init(void *object) else if (resource->format->typeless_id == view_format->typeless_id && resource_class == view_class) { - create_texture_view(&view->gl_view, view_target, desc, texture_gl, view_format); + create_texture_view(&view_gl->gl_view, view_target, desc, texture_gl, view_format); } else if (wined3d_format_is_depth_view(resource->format->id, view_format->id)) { - create_texture_view(&view->gl_view, view_target, desc, texture_gl, resource->format); + create_texture_view(&view_gl->gl_view, view_target, desc, texture_gl, resource->format); } else { @@ -792,8 +793,6 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ wined3d_resource_incref(view->resource = resource); - wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_cs_init, view); - return WINED3D_OK; } @@ -801,7 +800,7 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader_resource_view **view) { - struct wined3d_shader_resource_view *object; + struct wined3d_shader_resource_view_gl *object; HRESULT hr; TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", @@ -810,20 +809,22 @@ HRESULT CDECL wined3d_shader_resource_view_create(const struct wined3d_view_desc if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_shader_resource_view_init(object, desc, resource, parent, parent_ops))) + if (FAILED(hr = wined3d_shader_resource_view_init(&object->v, desc, resource, parent, parent_ops))) { heap_free(object); WARN("Failed to initialise view, hr %#x.\n", hr); return hr; } + wined3d_cs_init_object(resource->device->cs, wined3d_shader_resource_view_gl_cs_init, object); + TRACE("Created shader resource view %p.\n", object); - *view = object; + *view = &object->v; return WINED3D_OK; } -void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, +void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -831,26 +832,26 @@ void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view context_active_texture(context, gl_info, unit); - if (view->gl_view.name) + if (view_gl->gl_view.name) { - context_bind_texture(context, view->gl_view.target, view->gl_view.name); + context_bind_texture(context, view_gl->gl_view.target, view_gl->gl_view.name); wined3d_sampler_bind(sampler, unit, NULL, context); return; } - if (view->resource->type == WINED3D_RTYPE_BUFFER) + if (view_gl->v.resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Buffer shader resources not supported.\n"); return; } - texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view->resource)); + texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context, FALSE); wined3d_sampler_bind(sampler, unit, texture_gl, context); } /* Context activation is done by the caller. */ -static void shader_resource_view_bind_and_dirtify(struct wined3d_shader_resource_view *view, +static void shader_resource_view_gl_bind_and_dirtify(struct wined3d_shader_resource_view_gl *view_gl, struct wined3d_context *context) { if (context->active_texture < ARRAY_SIZE(context->rev_tex_unit_map)) @@ -864,11 +865,12 @@ static void shader_resource_view_bind_and_dirtify(struct wined3d_shader_resource context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - context_bind_texture(context, view->gl_view.target, view->gl_view.name); + context_bind_texture(context, view_gl->gl_view.target, view_gl->gl_view.name); } void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view) { + struct wined3d_shader_resource_view_gl *view_gl = wined3d_shader_resource_view_gl(view); unsigned int i, j, layer_count, level_count, base_level, max_level; const struct wined3d_gl_info *gl_info; struct wined3d_texture_gl *texture_gl; @@ -879,22 +881,22 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * TRACE("view %p.\n", view); - context = context_acquire(view->resource->device, NULL, 0); + context = context_acquire(view_gl->v.resource->device, NULL, 0); gl_info = context->gl_info; - layer_count = view->desc.u.texture.layer_count; - level_count = view->desc.u.texture.level_count; - base_level = view->desc.u.texture.level_idx; + layer_count = view_gl->v.desc.u.texture.layer_count; + level_count = view_gl->v.desc.u.texture.level_count; + base_level = view_gl->v.desc.u.texture.level_idx; max_level = base_level + level_count - 1; - texture_gl = wined3d_texture_gl(texture_from_resource(view->resource)); + texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); srgb = !!(texture_gl->t.flags & WINED3D_TEXTURE_IS_SRGB); location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) wined3d_texture_load_location(&texture_gl->t, i * level_count + base_level, context, location); - if (view->gl_view.name) + if (view_gl->gl_view.name) { - shader_resource_view_bind_and_dirtify(view, context); + shader_resource_view_gl_bind_and_dirtify(view_gl, context); } else { @@ -925,7 +927,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } } - if (!view->gl_view.name) + if (!view_gl->gl_view.name) { gl_tex->base_level = base_level; gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50997e57156..b8b3d55d307 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3872,14 +3872,26 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; - struct wined3d_gl_view gl_view; const struct wined3d_format *format; struct wined3d_view_desc desc; }; void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; -void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, unsigned int unit, + +struct wined3d_shader_resource_view_gl +{ + struct wined3d_shader_resource_view v; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_shader_resource_view_gl *wined3d_shader_resource_view_gl( + struct wined3d_shader_resource_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_shader_resource_view_gl, v); +} + +void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl *view_gl, unsigned int unit, struct wined3d_sampler *sampler, struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_unordered_access_view -- 2.11.0

2 1

[PATCH 3/5] wined3d: Introduce a separate structure for OpenGL rendertarget view information.
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 39 ++++++++++++++++++++---------------- dlls/wined3d/view.c | 45 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 13 +++++++++++- 3 files changed, 57 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9784f38c10b..96572c67247 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3053,10 +3053,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win { if (rts[i]) { - context->blit_targets[i].gl_view = rts[i]->gl_view; - context->blit_targets[i].resource = rts[i]->resource; - context->blit_targets[i].sub_resource_idx = rts[i]->sub_resource_idx; - context->blit_targets[i].layer_count = rts[i]->layer_count; + struct wined3d_rendertarget_view_gl *rtv_gl = wined3d_rendertarget_view_gl(rts[i]); + context->blit_targets[i].gl_view = rtv_gl->gl_view; + context->blit_targets[i].resource = rtv_gl->v.resource; + context->blit_targets[i].sub_resource_idx = rtv_gl->v.sub_resource_idx; + context->blit_targets[i].layer_count = rtv_gl->v.layer_count; } if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) rt_mask |= (1u << i); @@ -3064,10 +3065,11 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (dsv) { - ds_info.gl_view = dsv->gl_view; - ds_info.resource = dsv->resource; - ds_info.sub_resource_idx = dsv->sub_resource_idx; - ds_info.layer_count = dsv->layer_count; + struct wined3d_rendertarget_view_gl *dsv_gl = wined3d_rendertarget_view_gl(dsv); + ds_info.gl_view = dsv_gl->gl_view; + ds_info.resource = dsv_gl->v.resource; + ds_info.sub_resource_idx = dsv_gl->v.sub_resource_idx; + ds_info.layer_count = dsv_gl->v.layer_count; } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, @@ -3189,6 +3191,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } else { + const struct wined3d_rendertarget_view_gl *view_gl; unsigned int i; memset(context->blit_targets, 0, sizeof(context->blit_targets)); @@ -3197,21 +3200,23 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (!fb->render_targets[i]) continue; - context->blit_targets[i].gl_view = fb->render_targets[i]->gl_view; - context->blit_targets[i].resource = fb->render_targets[i]->resource; - context->blit_targets[i].sub_resource_idx = fb->render_targets[i]->sub_resource_idx; - context->blit_targets[i].layer_count = fb->render_targets[i]->layer_count; + view_gl = wined3d_rendertarget_view_gl(fb->render_targets[i]); + context->blit_targets[i].gl_view = view_gl->gl_view; + context->blit_targets[i].resource = view_gl->v.resource; + context->blit_targets[i].sub_resource_idx = view_gl->v.sub_resource_idx; + context->blit_targets[i].layer_count = view_gl->v.layer_count; if (!color_location) - color_location = fb->render_targets[i]->resource->draw_binding; + color_location = view_gl->v.resource->draw_binding; } if (fb->depth_stencil) { - ds_info.gl_view = fb->depth_stencil->gl_view; - ds_info.resource = fb->depth_stencil->resource; - ds_info.sub_resource_idx = fb->depth_stencil->sub_resource_idx; - ds_info.layer_count = fb->depth_stencil->layer_count; + view_gl = wined3d_rendertarget_view_gl(fb->depth_stencil); + ds_info.gl_view = view_gl->gl_view; + ds_info.resource = view_gl->v.resource; + ds_info.sub_resource_idx = view_gl->v.sub_resource_idx; + ds_info.layer_count = view_gl->v.layer_count; } context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1e0f49ffd07..8cdd214b67b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -342,25 +342,25 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v return refcount; } -static void wined3d_rendertarget_view_destroy_object(void *object) +static void wined3d_rendertarget_view_gl_destroy_object(void *object) { - struct wined3d_rendertarget_view *view = object; - struct wined3d_device *device = view->resource->device; + struct wined3d_rendertarget_view_gl *view_gl = object; + struct wined3d_device *device = view_gl->v.resource->device; - if (view->gl_view.name) + if (view_gl->gl_view.name) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; context = context_acquire(device, NULL, 0); gl_info = context->gl_info; - context_gl_resource_released(device, view->gl_view.name, FALSE); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + context_gl_resource_released(device, view_gl->gl_view.name, FALSE); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view_gl->gl_view.name); checkGLcall("glDeleteTextures"); context_release(context); } - heap_free(view); + heap_free(view_gl); } ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) @@ -377,7 +377,8 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_cs_destroy_object(device->cs, wined3d_rendertarget_view_destroy_object, view); + wined3d_cs_destroy_object(device->cs, wined3d_rendertarget_view_gl_destroy_object, + wined3d_rendertarget_view_gl(view)); wined3d_resource_decref(resource); } @@ -525,11 +526,11 @@ void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_v wined3d_view_invalidate_location(view->resource, &view->desc, location); } -static void wined3d_render_target_view_cs_init(void *object) +static void wined3d_render_target_view_gl_cs_init(void *object) { - struct wined3d_rendertarget_view *view = object; - struct wined3d_resource *resource = view->resource; - const struct wined3d_view_desc *desc = &view->desc; + struct wined3d_rendertarget_view_gl *view_gl = object; + struct wined3d_resource *resource = view_gl->v.resource; + const struct wined3d_view_desc *desc = &view_gl->v.desc; if (resource->type == WINED3D_RTYPE_BUFFER) { @@ -545,17 +546,17 @@ static void wined3d_render_target_view_cs_init(void *object) else depth_or_layer_count = texture_gl->t.layer_count; - if (resource->format->id != view->format->id - || (view->layer_count != 1 && view->layer_count != depth_or_layer_count)) + if (resource->format->id != view_gl->v.format->id + || (view_gl->v.layer_count != 1 && view_gl->v.layer_count != depth_or_layer_count)) { GLenum resource_class, view_class; resource_class = wined3d_format_gl(resource->format)->view_class; - view_class = wined3d_format_gl(view->format)->view_class; + view_class = wined3d_format_gl(view_gl->v.format)->view_class; if (resource_class != view_class) { FIXME("Render target view not supported, resource format %s, view format %s.\n", - debug_d3dformat(resource->format->id), debug_d3dformat(view->format->id)); + debug_d3dformat(resource->format->id), debug_d3dformat(view_gl->v.format->id)); return; } if (texture_gl->t.swapchain && texture_gl->t.swapchain->desc.backbuffer_count > 1) @@ -564,7 +565,7 @@ static void wined3d_render_target_view_cs_init(void *object) return; } - create_texture_view(&view->gl_view, texture_gl->target, desc, texture_gl, view->format); + create_texture_view(&view_gl->gl_view, texture_gl->target, desc, texture_gl, view_gl->v.format); } } } @@ -612,8 +613,6 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * wined3d_resource_incref(view->resource = resource); - wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_cs_init, view); - return WINED3D_OK; } @@ -621,7 +620,7 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_view_desc *d struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) { - struct wined3d_rendertarget_view *object; + struct wined3d_rendertarget_view_gl *object; HRESULT hr; TRACE("desc %s, resource %p, parent %p, parent_ops %p, view %p.\n", @@ -630,15 +629,17 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_view_desc *d if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_rendertarget_view_init(object, desc, resource, parent, parent_ops))) + if (FAILED(hr = wined3d_rendertarget_view_init(&object->v, desc, resource, parent, parent_ops))) { heap_free(object); WARN("Failed to initialise view, hr %#x.\n", hr); return hr; } + wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_gl_cs_init, object); + TRACE("Created render target view %p.\n", object); - *view = object; + *view = &object->v; return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5b7ddfce10d..50997e57156 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3830,7 +3830,6 @@ struct wined3d_rendertarget_view void *parent; const struct wined3d_parent_ops *parent_ops; - struct wined3d_gl_view gl_view; const struct wined3d_format *format; unsigned int format_flags; unsigned int sub_resource_idx; @@ -3853,6 +3852,18 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) DECLSPEC_HIDDEN; +struct wined3d_rendertarget_view_gl +{ + struct wined3d_rendertarget_view v; + struct wined3d_gl_view gl_view; +}; + +static inline struct wined3d_rendertarget_view_gl *wined3d_rendertarget_view_gl( + struct wined3d_rendertarget_view *view) +{ + return CONTAINING_RECORD(view, struct wined3d_rendertarget_view_gl, v); +} + struct wined3d_shader_resource_view { LONG refcount; -- 2.11.0

2 1

[PATCH 2/5] d3d8: Do not add map access indiscriminately in d3d8_device_create_surface().
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 885849f671a..476e3e11b78 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1166,8 +1166,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1; -- 2.11.0

2 1

[PATCH 1/5] d3d8: Do not add map access indiscriminately in cubetexture_init().
by Henri Verbeet 13 Nov '18

13 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/texture.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 0b86ed9571b..ec5ae034858 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1155,8 +1155,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; desc.height = edge_length; desc.depth = 1; -- 2.11.0

2 1

[PATCH] ws2_32: Return WSAEAFNOSUPPORT when ip4/6 disabled
by Brendan McGrath 13 Nov '18

13 Nov '18

Currently, when IPv6 is disabled by the kernel, attempting to use the 'WebRequest' API with .NET native causes a crash. This can be recreated using the following gist: https://gist.github.com/redmcg/7d81ef833c77bee6965b5f441006f697 This patch fixes the crash by returning WSAEAFNOSUPPORT, as expected by .NET. See: https://referencesource.microsoft.com/#System/net/System/Net/Sockets/Socket… --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe8527..62cd7623eef 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7646,6 +7646,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ if (err == WSAEINVAL) err = WSAESOCKTNOSUPPORT; + else if (err == WSAEOPNOTSUPP && (unixaf == AF_INET4 || unixaf == AF_INET6)) + err = WSAEAFNOSUPPORT; else if (err == WSAEOPNOTSUPP) err = WSAEPROTONOSUPPORT; } -- 2.17.1

1 1

[PATCH] winedump: Add IMAGE_DEBUG_TYPE_REPRO
by André Hentschel 13 Nov '18

13 Nov '18

Signed-off-by: Andr� Hentschel <nerv(a)dawncrow.de> --- include/winnt.h | 1 + tools/winedump/pe.c | 1 + 2 files changed, 2 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 6b5b66002a..035d5bd097 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3739,6 +3739,7 @@ typedef struct _IMAGE_DEBUG_DIRECTORY { #define IMAGE_DEBUG_TYPE_POGO 13 #define IMAGE_DEBUG_TYPE_ILTCG 14 #define IMAGE_DEBUG_TYPE_MPX 15 +#define IMAGE_DEBUG_TYPE_REPRO 16 typedef enum ReplacesCorHdrNumericDefines { diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index ca41bb7439..f8689f7f33 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1382,6 +1382,7 @@ static void dump_dir_debug_dir(const IMAGE_DEBUG_DIRECTORY* idd, int idx) case IMAGE_DEBUG_TYPE_POGO: str = "POGO"; break; case IMAGE_DEBUG_TYPE_ILTCG: str = "ILTCG"; break; case IMAGE_DEBUG_TYPE_MPX: str = "MPX"; break; + case IMAGE_DEBUG_TYPE_REPRO: str = "REPRO"; break; } printf(" Type: %u (%s)\n", idd->Type, str); printf(" SizeOfData: %u\n", idd->SizeOfData); -- 2.17.1

1 0

[PATCH 2/2] d3d11/tests: Fix crashes with debug layer enabled.
by Józef Kucia 13 Nov '18

13 Nov '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 79 ++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 76e0db25cceb..aeba9efe7394 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3755,8 +3755,11 @@ static void test_create_rendertarget_view(void) U1(U(rtv_desc).Buffer).ElementOffset = 0; U2(U(rtv_desc).Buffer).ElementWidth = 64; - hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (!enable_debug_layer) + { + hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)buffer, &rtv_desc, &rtview); @@ -6039,16 +6042,19 @@ static void test_private_data(void) ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - size = 0xdeadbabe; - hr = ID3D11Device_GetPrivateData(device, &test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - ok(size == 0, "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D11Device_GetPrivateData(device, &test_guid, NULL, &ptr); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (!enable_debug_layer) + { + hr = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D11Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D11Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + } hr = ID3D11Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -6298,7 +6304,8 @@ static void test_device_context_state(void) tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); - ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + if (!enable_debug_layer) + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -10277,8 +10284,11 @@ static void test_clear_state(void) ok(!tmp_uav[i], "Got unexpected unordered access view %p in slot %u.\n", tmp_uav[i], i); } - ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); - ok(!count, "Got unexpected scissor rect count %u.\n", count); + if (!enable_debug_layer) + { + ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); + ok(!count, "Got unexpected scissor rect count %u.\n", count); + } memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); @@ -13071,23 +13081,27 @@ static void test_check_multisample_quality_levels(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); todo_wine ok(quality_levels == 0xdeadbeef, "Got unexpected quality_levels %u.\n", quality_levels); + if (!enable_debug_layer) + { + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } + quality_levels = 0xdeadbeef; - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &quality_levels); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); @@ -13599,7 +13613,8 @@ static void test_clear_render_target_view_2d(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); + if (!enable_debug_layer) + ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); check_texture_color(texture, expected_color, 1); ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); @@ -13755,7 +13770,8 @@ static void test_clear_depth_stencil_view(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.25f, 0); check_texture_float(depth_texture, 0.25f, 0); - ID3D11DeviceContext_ClearDepthStencilView(context, NULL, D3D11_CLEAR_DEPTH, 1.0f, 0); + if (!enable_debug_layer) + ID3D11DeviceContext_ClearDepthStencilView(context, NULL, D3D11_CLEAR_DEPTH, 1.0f, 0); check_texture_float(depth_texture, 0.25f, 0); ID3D11Texture2D_Release(depth_texture); @@ -21056,10 +21072,13 @@ static void test_render_target_device_mismatch(void) rtv = (ID3D11RenderTargetView *)0xdeadbeef; ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); ok(!rtv, "Got unexpected render target view %p.\n", rtv); - ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); - ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); - ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); - ID3D11RenderTargetView_Release(rtv); + if (!enable_debug_layer) + { + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D11RenderTargetView_Release(rtv); + } rtv = NULL; ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); @@ -27605,7 +27624,7 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D11DeviceContext_RSSetViewports(context, 2, vp); - count = ARRAY_SIZE(vp); + count = enable_debug_layer ? ARRAY_SIZE(vp) - 1 : ARRAY_SIZE(vp); ID3D11DeviceContext_RSGetViewports(context, &count, vp); ok(count == 2, "Unexpected viewport count %d.\n", count); @@ -27688,6 +27707,9 @@ static void test_multiple_viewports(void) SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + if (enable_debug_layer) + goto done; + /* Viewport count exceeding maximum value. */ ID3D11DeviceContext_RSSetViewports(context, 1, vp); @@ -27709,6 +27731,7 @@ static void test_multiple_viewports(void) ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); +done: ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); -- 2.18.1

3 2

[PATCH 1/2] d3d11/tests: Add option to enable debug layer.
by Józef Kucia 13 Nov '18

13 Nov '18

Some tests crashes with the debug layer enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0174289879bc..76e0db25cceb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -38,6 +38,7 @@ #define SWAPCHAIN_FLAG_SHADER_INPUT 0x1 static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; @@ -1346,6 +1347,9 @@ static ID3D11Device *create_device(const struct device_desc *desc) feature_level_count = ARRAY_SIZE(default_feature_level); } + if (enable_debug_layer) + flags |= D3D11_CREATE_DEVICE_DEBUG; + if ((adapter = create_adapter())) { hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, @@ -2037,7 +2041,7 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level) check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */ todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); - check_interface(device, &IID_ID3D11InfoQueue, FALSE, FALSE); /* Non-debug mode. */ + check_interface(device, &IID_ID3D11InfoQueue, enable_debug_layer, FALSE); hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); @@ -28750,7 +28754,9 @@ START_TEST(d3d11) argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); -- 2.18.1

3 2

[v2 PATCH] gdi32/tests: Fix some test failures on newer Win10 releases.
by Nikolay Sivov 13 Nov '18

13 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d0770905d..4f10e2f38d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,10 @@ static void test_bitmap_font_metrics(void) memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - todo_wine { + todo_wine ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); - ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); - } + ret = GetLastError(); + ok(ret == ERROR_CAN_NOT_COMPLETE || ret == 0xdeadbeef /* Win10 */, "Unexpected error %d.\n", ret); bRet = GetTextMetricsA(hdc, &tm); ok(bRet, "GetTextMetrics error %d\n", GetLastError()); -- 2.19.1

2 1

[PATCH v4] gdi32: Specify the suitable hinting flags explicitly.
by Byeongsik Jeon 13 Nov '18

13 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v4: make a helper function. Because of the GGO_UNHINTED bit, slightly changed from the comment. dlls/gdi32/freetype.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b62288c453..415aabedf1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6801,6 +6801,34 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b return needed; } +static FT_Int get_hinting_flags( UINT format ) +{ + FT_Int hinting_flags = 0; + + switch (format) + { + case GGO_BITMAP: + hinting_flags = FT_LOAD_TARGET_MONO; + break; + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + hinting_flags = FT_LOAD_TARGET_NORMAL; + break; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + hinting_flags = FT_LOAD_TARGET_LCD; + break; + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + hinting_flags = FT_LOAD_TARGET_LCD_V; + break; + } + + return hinting_flags; +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -6863,6 +6891,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, load_flags |= FT_LOAD_NO_HINTING; format &= ~GGO_UNHINTED; } + else + load_flags |= get_hinting_flags( format ); if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1); -- 2.19.1

2 1

[PATCH v5] gdi32: Specify the suitable hinting flags explicitly.
by Huw Davies 13 Nov '18

13 Nov '18

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b62288c453..99b7d8c8f2 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6801,6 +6801,37 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b return needed; } +static FT_Int get_load_flags( UINT format ) +{ + FT_Int load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + + if (format & GGO_UNHINTED) + return load_flags | FT_LOAD_NO_HINTING; + + switch (format & ~GGO_GLYPH_INDEX) + { + case GGO_BITMAP: + load_flags |= FT_LOAD_TARGET_MONO; + break; + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + load_flags |= FT_LOAD_TARGET_NORMAL; + break; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD; + break; + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD_V; + break; + } + + return load_flags; +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -6820,7 +6851,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Vector adv; INT origin_x = 0, origin_y = 0; FT_Angle angle = 0; - FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + FT_Int load_flags = get_load_flags(format); double widthRatio = 1.0; FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; @@ -6859,10 +6890,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, tategaki = check_unicode_tategaki(glyph); } - if(format & GGO_UNHINTED) { - load_flags |= FT_LOAD_NO_HINTING; - format &= ~GGO_UNHINTED; - } + format &= ~GGO_UNHINTED; if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1); -- 2.18.0

1 0

[PATCH] gdi32/tests: Fix some test failures on newer Win10 releases.
by Nikolay Sivov 13 Nov '18

13 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0d0770905d..0e895fef11 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1003,10 +1003,11 @@ static void test_bitmap_font_metrics(void) memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - todo_wine { + todo_wine ok(ret == GDI_ERROR, "GetGlyphOutline should fail for a bitmap font\n"); - ok(GetLastError() == ERROR_CAN_NOT_COMPLETE, "expected ERROR_CAN_NOT_COMPLETE, got %u\n", GetLastError()); - } + ret = GetLastError(); + ok(ret == 0xdeadbeef || broken(ret == ERROR_CAN_NOT_COMPLETE) /* before Win10 */, + "Unexpected error %d.\n", ret); bRet = GetTextMetricsA(hdc, &tm); ok(bRet, "GetTextMetrics error %d\n", GetLastError()); -- 2.19.1

2 1

[PATCH] kernel32: Remove duplicate specfile entries
by Alex Henrie 13 Nov '18

13 Nov '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/kernel32.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c370a068c2..5490b07d8e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -195,7 +195,6 @@ # @ stub BasepFreeActivationContextActivationBlock # @ stub BasepFreeAppCompatData # @ stub BasepMapModuleHandle -# @ stub BaseVerifyUnicodeString @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @@ -286,13 +285,11 @@ @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA # @ stub CreateFileMappingNumaW -@ stdcall CreateHardLinkTransactedA(str str ptr ptr) -@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) -# @ stub CreateHardLinkTransactedA -# @ stub CreateHardLinkTransactedW +@ stdcall CreateHardLinkTransactedA(str str ptr ptr) +@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateHardLinkW(wstr wstr ptr) @ stdcall CreateIoCompletionPort(long long long long) @ stdcall CreateJobObjectA(ptr str) -- 2.19.1

1 0

[PATCH] wincodecs: Grab TIFF decoder reference when creating frames.
by Nikolay Sivov 12 Nov '18

12 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/tiffformat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 966ab3eb4b..3cb2ebc16c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -766,6 +766,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, result->IWICMetadataBlockReader_iface.lpVtbl = &TiffFrameDecode_BlockVtbl; result->ref = 1; result->parent = This; + IWICBitmapDecoder_AddRef(iface); result->index = index; result->decode_info = decode_info; result->cached_tile_x = -1; @@ -776,7 +777,7 @@ static HRESULT WINAPI TiffDecoder_GetFrame(IWICBitmapDecoder *iface, else { hr = E_OUTOFMEMORY; - HeapFree(GetProcessHeap(), 0, result); + IWICBitmapFrameDecode_Release(&result->IWICBitmapFrameDecode_iface); } } else hr = E_OUTOFMEMORY; @@ -851,6 +852,7 @@ static ULONG WINAPI TiffFrameDecode_Release(IWICBitmapFrameDecode *iface) if (ref == 0) { + IWICBitmapDecoder_Release(&This->parent->IWICBitmapDecoder_iface); HeapFree(GetProcessHeap(), 0, This->cached_tile); HeapFree(GetProcessHeap(), 0, This); } -- 2.19.1

2 1

Wine staging 3.20 release
by Alistair Leslie-Hughes 12 Nov '18

12 Nov '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.20 (857 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * xaudio2_7: Use assembly wrapper to call OnVoiceProcessingPassStart callback. Added * [36089] wined3d: Improve dirt rendering in SpinTires Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: SpinTires, Halo online * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

5 4

[PATCH] atl100/tests: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 12 Nov '18

12 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl100/tests/atl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index eecf07934f..bdd3c57eb0 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -304,8 +304,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > sizeof(scrrun_dll_suffixW)/sizeof(WCHAR) - && lstrcmpiW(path+len-sizeof(scrrun_dll_suffixW)/sizeof(WCHAR), scrrun_dll_suffixW), + ok(len > ARRAY_SIZE(scrrun_dll_suffixW) + && lstrcmpiW(path+len-ARRAY_SIZE(scrrun_dll_suffixW), scrrun_dll_suffixW), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); @@ -320,8 +320,8 @@ static void test_typelib(void) FreeLibrary(inst); len = SysStringLen(path); - ok(len > sizeof(mshtml_tlb_suffixW)/sizeof(WCHAR) - && lstrcmpiW(path+len-sizeof(mshtml_tlb_suffixW)/sizeof(WCHAR), mshtml_tlb_suffixW), + ok(len > ARRAY_SIZE(mshtml_tlb_suffixW) + && lstrcmpiW(path+len-ARRAY_SIZE(mshtml_tlb_suffixW), mshtml_tlb_suffixW), "unexpected path %s\n", wine_dbgstr_w(path)); SysFreeString(path); ok(typelib != NULL, "typelib == NULL\n"); -- 2.14.5

1 0

[PATCH] advapi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 12 Nov '18

12 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/registry.c | 8 ++++---- dlls/advapi32/service.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9989097ff4..b537f69db0 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -108,7 +108,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e'}; return (name->Length == sizeof(wow6432nodeW) && - !memicmpW( name->Buffer, wow6432nodeW, sizeof(wow6432nodeW)/sizeof(WCHAR) )); + !memicmpW( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); } /* open the Wow6432Node subkey of the specified key */ @@ -148,9 +148,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES UNICODE_STRING str; /* don't try to create registry root */ - if (!attr->RootDirectory && len > sizeof(registry_root)/sizeof(WCHAR) && - !memicmpW( buffer, registry_root, sizeof(registry_root)/sizeof(WCHAR))) - i += sizeof(registry_root)/sizeof(WCHAR); + if (!attr->RootDirectory && len > ARRAY_SIZE( registry_root ) && + !memicmpW( buffer, registry_root, ARRAY_SIZE( registry_root ))) + i += ARRAY_SIZE( registry_root ); while (i < len && buffer[i] != '\\') i++; if (i == len && !force_wow32) return status; diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 718c964b20..231f0267e9 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -299,7 +299,7 @@ static LPWSTR service_get_pipe_name(void) RegCloseKey(service_current_key); if (ret != ERROR_SUCCESS || type != REG_DWORD) return NULL; - len = sizeof(format)/sizeof(WCHAR) + 10 /* strlenW("4294967295") */; + len = ARRAY_SIZE(format) + 10 /* strlenW("4294967295") */; name = heap_alloc(len * sizeof(WCHAR)); if (!name) return NULL; -- 2.14.5

1 0

[PATCH v2 2/2] mfplat: Implement MFCreateMediaEvent.
by Sven Baars 12 Nov '18

12 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: Add more return value tests. dlls/mfplat/main.c | 361 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 66 +++++++ include/mfapi.h | 2 + include/mfobjects.idl | 103 +++++++++++ 5 files changed, 533 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 33080d0b27..46a697538c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1837,6 +1837,367 @@ HRESULT WINAPI MFCreateMediaType(IMFMediaType **type) return S_OK; } +typedef struct _mfmediaevent +{ + mfattributes attributes; + IMFMediaEvent IMFMediaEvent_iface; + + MediaEventType type; + GUID extended_type; + HRESULT status; + PROPVARIANT value; +} mfmediaevent; + +static inline mfmediaevent *impl_from_IMFMediaEvent(IMFMediaEvent *iface) +{ + return CONTAINING_RECORD(iface, mfmediaevent, IMFMediaEvent_iface); +} + +static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID riid, void **out) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFAttributes) || + IsEqualGUID(riid, &IID_IMFMediaEvent)) + { + *out = &This->IMFMediaEvent_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + ULONG ref = InterlockedIncrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfmediaevent_GetItem(IMFMediaEvent *iface, REFGUID key, PROPVARIANT *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_GetItemType(IMFMediaEvent *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); +} + +static HRESULT WINAPI mfmediaevent_CompareItem(IMFMediaEvent *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); +} + +static HRESULT WINAPI mfmediaevent_Compare(IMFMediaEvent *iface, IMFAttributes *attrs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, attrs, type, result); +} + +static HRESULT WINAPI mfmediaevent_GetUINT32(IMFMediaEvent *iface, REFGUID key, UINT32 *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_GetUINT64(IMFMediaEvent *iface, REFGUID key, UINT64 *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_GetDouble(IMFMediaEvent *iface, REFGUID key, double *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_GetGUID(IMFMediaEvent *iface, REFGUID key, GUID *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_GetStringLength(IMFMediaEvent *iface, REFGUID key, UINT32 *length) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); +} + +static HRESULT WINAPI mfmediaevent_GetString(IMFMediaEvent *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); +} + +static HRESULT WINAPI mfmediaevent_GetAllocatedString(IMFMediaEvent *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); +} + +static HRESULT WINAPI mfmediaevent_GetBlobSize(IMFMediaEvent *iface, REFGUID key, UINT32 *size) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); +} + +static HRESULT WINAPI mfmediaevent_GetBlob(IMFMediaEvent *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI mfmediaevent_GetAllocatedBlob(IMFMediaEvent *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfmediaevent_GetUnknown(IMFMediaEvent *iface, REFGUID key, REFIID riid, void **ppv) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); +} + +static HRESULT WINAPI mfmediaevent_SetItem(IMFMediaEvent *iface, REFGUID key, REFPROPVARIANT value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_DeleteItem(IMFMediaEvent *iface, REFGUID key) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); +} + +static HRESULT WINAPI mfmediaevent_DeleteAllItems(IMFMediaEvent *iface) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfmediaevent_SetUINT32(IMFMediaEvent *iface, REFGUID key, UINT32 value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_SetUINT64(IMFMediaEvent *iface, REFGUID key, UINT64 value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_SetDouble(IMFMediaEvent *iface, REFGUID key, double value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_SetGUID(IMFMediaEvent *iface, REFGUID key, REFGUID value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_SetString(IMFMediaEvent *iface, REFGUID key, const WCHAR *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfmediaevent_SetBlob(IMFMediaEvent *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfmediaevent_SetUnknown(IMFMediaEvent *iface, REFGUID key, IUnknown *unknown) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); +} + +static HRESULT WINAPI mfmediaevent_LockStore(IMFMediaEvent *iface) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfmediaevent_UnlockStore(IMFMediaEvent *iface) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfmediaevent_GetCount(IMFMediaEvent *iface, UINT32 *items) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); +} + +static HRESULT WINAPI mfmediaevent_GetItemByIndex(IMFMediaEvent *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); +} + +static HRESULT WINAPI mfmediaevent_CopyAllItems(IMFMediaEvent *iface, IMFAttributes *dest) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + + FIXME("%p, %p\n", This, dest); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfmediaevent_GetType(IMFMediaEvent *iface, MediaEventType *type) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + + TRACE("%p, %p\n", This, type); + + *type = This->type; + + return S_OK; +} + +static HRESULT WINAPI mfmediaevent_GetExtendedType(IMFMediaEvent *iface, GUID *extended_type) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + + TRACE("%p, %p\n", This, extended_type); + + *extended_type = This->extended_type; + + return S_OK; +} + +static HRESULT WINAPI mfmediaevent_GetStatus(IMFMediaEvent *iface, HRESULT *status) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + + TRACE("%p, %p\n", This, status); + + *status = This->status; + + return S_OK; +} + +static HRESULT WINAPI mfmediaevent_GetValue(IMFMediaEvent *iface, PROPVARIANT *value) +{ + mfmediaevent *This = impl_from_IMFMediaEvent(iface); + + PropVariantCopy(value, &This->value); + + return S_OK; +} + +static const IMFMediaEventVtbl mfmediaevent_vtbl = +{ + mfmediaevent_QueryInterface, + mfmediaevent_AddRef, + mfmediaevent_Release, + mfmediaevent_GetItem, + mfmediaevent_GetItemType, + mfmediaevent_CompareItem, + mfmediaevent_Compare, + mfmediaevent_GetUINT32, + mfmediaevent_GetUINT64, + mfmediaevent_GetDouble, + mfmediaevent_GetGUID, + mfmediaevent_GetStringLength, + mfmediaevent_GetString, + mfmediaevent_GetAllocatedString, + mfmediaevent_GetBlobSize, + mfmediaevent_GetBlob, + mfmediaevent_GetAllocatedBlob, + mfmediaevent_GetUnknown, + mfmediaevent_SetItem, + mfmediaevent_DeleteItem, + mfmediaevent_DeleteAllItems, + mfmediaevent_SetUINT32, + mfmediaevent_SetUINT64, + mfmediaevent_SetDouble, + mfmediaevent_SetGUID, + mfmediaevent_SetString, + mfmediaevent_SetBlob, + mfmediaevent_SetUnknown, + mfmediaevent_LockStore, + mfmediaevent_UnlockStore, + mfmediaevent_GetCount, + mfmediaevent_GetItemByIndex, + mfmediaevent_CopyAllItems, + mfmediaevent_GetType, + mfmediaevent_GetExtendedType, + mfmediaevent_GetStatus, + mfmediaevent_GetValue, +}; + +HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, + const PROPVARIANT *value, IMFMediaEvent **event) +{ + mfmediaevent *object; + + TRACE("%#x, %s, %08x, %p, %p\n", type, debugstr_guid(extended_type), status, value, event); + + object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + init_attribute_object(&object->attributes, 0); + object->IMFMediaEvent_iface.lpVtbl = &mfmediaevent_vtbl; + + object->type = type; + object->extended_type = *extended_type; + object->status = status; + + PropVariantInit(&object->value); + if (value) + PropVariantCopy(&object->value, value); + + *event = &object->IMFMediaEvent_iface; + + return S_OK; +} + typedef struct _mfeventqueue { IMFMediaEventQueue IMFMediaEventQueue_iface; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 4533eeb71c..c828aeab8f 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -48,7 +48,7 @@ @ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper -@ stub MFCreateMediaEvent +@ stdcall MFCreateMediaEvent(long ptr long ptr ptr) @ stdcall MFCreateMediaType(ptr) @ stub MFCreateMediaTypeFromRepresentation @ stdcall MFCreateMemoryBuffer(long ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 61cfbbfe89..2e38f8d65b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -40,6 +40,7 @@ static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -261,6 +262,70 @@ if(0) MFShutdown(); } +static void test_MFCreateMediaEvent(void) +{ + HRESULT hr; + IMFMediaEvent *mediaevent; + + MediaEventType type; + GUID extended_type; + HRESULT status; + PROPVARIANT value; + + PropVariantInit(&value); + value.vt = VT_UNKNOWN; + + hr = MFCreateMediaEvent(MEError, &GUID_NULL, E_FAIL, &value, &mediaevent); + ok(hr == S_OK, "got 0x%08x\n", hr); + + PropVariantClear(&value); + + hr = IMFMediaEvent_GetType(mediaevent, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(type == MEError, "got %#x\n", type); + + hr = IMFMediaEvent_GetExtendedType(mediaevent, &extended_type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&extended_type, &GUID_NULL), "got %s\n", + wine_dbgstr_guid(&extended_type)); + + hr = IMFMediaEvent_GetStatus(mediaevent, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == E_FAIL, "got 0x%08x\n", status); + + PropVariantInit(&value); + hr = IMFMediaEvent_GetValue(mediaevent, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value.vt == VT_UNKNOWN, "got %#x\n", value.vt); + PropVariantClear(&value); + + IMFMediaEvent_Release(mediaevent); + + hr = MFCreateMediaEvent(MEUnknown, &DUMMY_GUID1, S_OK, NULL, &mediaevent); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaEvent_GetType(mediaevent, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(type == MEUnknown, "got %#x\n", type); + + hr = IMFMediaEvent_GetExtendedType(mediaevent, &extended_type); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsEqualGUID(&extended_type, &DUMMY_GUID1), "got %s\n", + wine_dbgstr_guid(&extended_type)); + + hr = IMFMediaEvent_GetStatus(mediaevent, &status); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(status == S_OK, "got 0x%08x\n", status); + + PropVariantInit(&value); + hr = IMFMediaEvent_GetValue(mediaevent, &value); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value.vt == VT_EMPTY, "got %#x\n", value.vt); + PropVariantClear(&value); + + IMFMediaEvent_Release(mediaevent); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; @@ -556,6 +621,7 @@ START_TEST(mfplat) test_register(); test_source_resolver(); test_MFCreateMediaType(); + test_MFCreateMediaEvent(); test_MFCreateAttributes(); test_MFSample(); test_MFCreateFile(); diff --git a/include/mfapi.h b/include/mfapi.h index 0230a08471..4697f50c44 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -69,6 +69,8 @@ HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateFile(MF_FILE_ACCESSMODE accessmode, MF_FILE_OPENMODE openmode, MF_FILE_FLAGS flags, LPCWSTR url, IMFByteStream **bytestream); +HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, + const PROPVARIANT *value, IMFMediaEvent **event); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); diff --git a/include/mfobjects.idl b/include/mfobjects.idl index 67055d3423..5ea26b2c67 100644 --- a/include/mfobjects.idl +++ b/include/mfobjects.idl @@ -435,6 +435,109 @@ cpp_quote("#define MFASYNC_CALLBACK_QUEUE_LONG_FUNCTION 0x00000007") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_PRIVATE_MASK 0xffff0000") cpp_quote("#define MFASYNC_CALLBACK_QUEUE_ALL 0xffffffff") +enum { + MEUnknown = 0, + MEError = 1, + MEExtendedType = 2, + MENonFatalError = 3, + MEGenericV1Anchor = MENonFatalError, + MESessionUnknown = 100, + MESessionTopologySet = 101, + MESessionTopologiesCleared = 102, + MESessionStarted = 103, + MESessionPaused = 104, + MESessionStopped = 105, + MESessionClosed = 106, + MESessionEnded = 107, + MESessionRateChanged = 108, + MESessionScrubSampleComplete = 109, + MESessionCapabilitiesChanged = 110, + MESessionTopologyStatus = 111, + MESessionNotifyPresentationTime = 112, + MENewPresentation = 113, + MELicenseAcquisitionStart = 114, + MELicenseAcquisitionCompleted = 115, + MEIndividualizationStart = 116, + MEIndividualizationCompleted = 117, + MEEnablerProgress = 118, + MEEnablerCompleted = 119, + MEPolicyError = 120, + MEPolicyReport = 121, + MEBufferingStarted = 122, + MEBufferingStopped = 123, + MEConnectStart = 124, + MEConnectEnd = 125, + MEReconnectStart = 126, + MEReconnectEnd = 127, + MERendererEvent = 128, + MESessionStreamSinkFormatChanged = 129, + MESessionV1Anchor = MESessionStreamSinkFormatChanged, + MESourceUnknown = 200, + MESourceStarted = 201, + MEStreamStarted = 202, + MESourceSeeked = 203, + MEStreamSeeked = 204, + MENewStream = 205, + MEUpdatedStream = 206, + MESourceStopped = 207, + MEStreamStopped = 208, + MESourcePaused = 209, + MEStreamPaused = 210, + MEEndOfPresentation = 211, + MEEndOfStream = 212, + MEMediaSample = 213, + MEStreamTick = 214, + MEStreamThinMode = 215, + MEStreamFormatChanged = 216, + MESourceRateChanged = 217, + MEEndOfPresentationSegment = 218, + MESourceCharacteristicsChanged = 219, + MESourceRateChangeRequested = 220, + MESourceMetadataChanged = 221, + MESequencerSourceTopologyUpdated = 222, + MESourceV1Anchor = MESequencerSourceTopologyUpdated, + MESinkUnknown = 300, + MEStreamSinkStarted = 301, + MEStreamSinkStopped = 302, + MEStreamSinkPaused = 303, + MEStreamSinkRateChanged = 304, + MEStreamSinkRequestSample = 305, + MEStreamSinkMarker = 306, + MEStreamSinkPrerolled = 307, + MEStreamSinkScrubSampleComplete = 308, + MEStreamSinkFormatChanged = 309, + MEStreamSinkDeviceChanged = 310, + MEQualityNotify = 311, + MESinkInvalidated = 312, + MEAudioSessionNameChanged = 313, + MEAudioSessionVolumeChanged = 314, + MEAudioSessionDeviceRemoved = 315, + MEAudioSessionServerShutdown = 316, + MEAudioSessionGroupingParamChanged = 317, + MEAudioSessionIconChanged = 318, + MEAudioSessionFormatChanged = 319, + MEAudioSessionDisconnected = 320, + MEAudioSessionExclusiveModeOverride = 321, + MESinkV1Anchor = MEAudioSessionExclusiveModeOverride, + METrustUnknown = 400, + MEPolicyChanged = 401, + MEContentProtectionMessage = 402, + MEPolicySet = 403, + METrustV1Anchor = MEPolicySet, + MEWMDRMLicenseBackupCompleted = 500, + MEWMDRMLicenseBackupProgress = 501, + MEWMDRMLicenseRestoreCompleted = 502, + MEWMDRMLicenseRestoreProgress = 503, + MEWMDRMLicenseAcquisitionCompleted = 506, + MEWMDRMIndividualizationCompleted = 508, + MEWMDRMIndividualizationProgress = 513, + MEWMDRMProximityCompleted = 514, + MEWMDRMLicenseStoreCleaned = 515, + MEWMDRMRevocationDownloadCompleted = 516, + MEWMDRMV1Anchor = MEWMDRMRevocationDownloadCompleted, + MEReservedMax = 10000 +}; + typedef DWORD MediaEventType; [ -- 2.17.1

1 0

[PATCH v6 resend 2/2] hidclass.sys: use IoRegisterDeviceInterface
by Aric Stewart 12 Nov '18

12 Nov '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++------------------------------ dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 4 +--- 3 files changed, 22 insertions(+), 44 deletions(-)

2 1

[PATCH v6 resend 1/2] ntoskrnl.exe: Implement IoRegisterDeviceInterface
by Aric Stewart 12 Nov '18

12 Nov '18

v 6: More comments from Zebediah Figura and Dmitry Timoshkov Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/Makefile.in | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 133 ++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 136 insertions(+), 2 deletions(-)

2 1

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