November 2018 - Wine-Devel - list.winehq.org

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

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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 Nov. 13, 2018

Nov. 13, 2018

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