February 2017 - Wine-commits

Louis Lenders : virtdisk: Add stub dll.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: e0d4b6896aa4158407826faf4775bed09de78913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d4b6896aa4158407826faf4… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 2 20:41:20 2017 +0100 virtdisk: Add stub dll. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/virtdisk/Makefile.in | 4 ++++ dlls/virtdisk/virtdisk.spec | 21 ++++++++++++++++++++ dlls/virtdisk/virtdisk_main.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+) diff --git a/configure b/configure index b2ec13a..1cac4e0 100755 --- a/configure +++ b/configure @@ -1439,6 +1439,7 @@ enable_vcomp90 enable_vcruntime140 enable_vdmdbg enable_version +enable_virtdisk enable_vssapi enable_wbemdisp enable_wbemprox @@ -18365,6 +18366,7 @@ wine_fn_config_dll vdmdbg enable_vdmdbg implib wine_fn_config_dll ver.dll16 enable_win16 wine_fn_config_dll version enable_version implib wine_fn_config_test dlls/version/tests version_test +wine_fn_config_dll virtdisk enable_virtdisk wine_fn_config_dll vmm.vxd enable_win16 wine_fn_config_dll vnbt.vxd enable_win16 wine_fn_config_dll vnetbios.vxd enable_win16 diff --git a/configure.ac b/configure.ac index 43f19de..cae8d72 100644 --- a/configure.ac +++ b/configure.ac @@ -3423,6 +3423,7 @@ WINE_CONFIG_DLL(vdmdbg,,[implib]) WINE_CONFIG_DLL(ver.dll16,enable_win16) WINE_CONFIG_DLL(version,,[implib]) WINE_CONFIG_TEST(dlls/version/tests) +WINE_CONFIG_DLL(virtdisk) WINE_CONFIG_DLL(vmm.vxd,enable_win16) WINE_CONFIG_DLL(vnbt.vxd,enable_win16) WINE_CONFIG_DLL(vnetbios.vxd,enable_win16) diff --git a/dlls/virtdisk/Makefile.in b/dlls/virtdisk/Makefile.in new file mode 100644 index 0000000..b91f0e2 --- /dev/null +++ b/dlls/virtdisk/Makefile.in @@ -0,0 +1,4 @@ +MODULE = virtdisk.dll + +C_SRCS = \ + virtdisk_main.c diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec new file mode 100644 index 0000000..2946b66 --- /dev/null +++ b/dlls/virtdisk/virtdisk.spec @@ -0,0 +1,21 @@ +@ stub AddVirtualDiskParent +@ stub AttachVirtualDisk +@ stub BreakMirrorVirtualDisk +@ stub CompactVirtualDisk +@ stub CreateVirtualDisk +@ stub DeleteVirtualDiskMetadata +@ stub DetachVirtualDisk +@ stub EnumerateVirtualDiskMetadata +@ stub ExpandVirtualDisk +@ stub GetAllAttachedVirtualDiskPhysicalPaths +@ stub GetStorageDependencyInformation +@ stub GetVirtualDiskInformation +@ stub GetVirtualDiskMetadata +@ stub GetVirtualDiskOperationProgress +@ stub GetVirtualDiskPhysicalPath +@ stub MergeVirtualDisk +@ stub MirrorVirtualDisk +@ stub OpenVirtualDisk +@ stub ResizeVirtualDisk +@ stub SetVirtualDiskInformation +@ stub SetVirtualDiskMetadata diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c new file mode 100644 index 0000000..0da0dca --- /dev/null +++ b/dlls/virtdisk/virtdisk_main.c @@ -0,0 +1,46 @@ +/* + * Copyright 2017 Louis Lenders + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(virtdisk); + +/***************************************************** + * DllMain (VIRTDISK.@) + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + + return TRUE; +}

1 0

Henri Verbeet : wined3d: Trace the blit parameters in wined3d_select_blitter().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: f4580e2a574d1183950f05c1826194bf6b638eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4580e2a574d1183950f05c18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:33 2017 +0100 wined3d: Trace the blit parameters in wined3d_select_blitter(). Mostly for convenience, in principle these can be reconstructed from the rest of the debug output. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 30a80e5..64a6b9d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5810,6 +5810,12 @@ const struct blit_shader *wined3d_select_blitter(const struct wined3d_gl_info *g }; unsigned int i; + TRACE("gl_info %p, d3d_info %p, blit_op %#x, src_rect %s, src_usage %s, src_pool %s, src_format %s, " + "dst_rect %s, dst_usage %s, dst_pool %s, dst_format %s.\n", gl_info, d3d_info, blit_op, + wine_dbgstr_rect(src_rect), debug_d3dusage(src_usage), debug_d3dpool(src_pool), + src_format ? debug_d3dformat(src_format->id) : "(null)", wine_dbgstr_rect(dst_rect), + debug_d3dusage(dst_usage), debug_d3dpool(dst_pool), debug_d3dformat(dst_format->id)); + for (i = 0; i < sizeof(blitters) / sizeof(*blitters); ++i) { if (blitters[i]->blit_supported(gl_info, d3d_info, blit_op,

1 0

Henri Verbeet : wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported ().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: f576e5c02857a506e63c33e3303e2a0a4bc24e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f576e5c02857a506e63c33e33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:34 2017 +0100 wined3d: Allow decompression blits on system memory resources in arbfp_blit_supported(). In general we prefer to do blits between system memory resources on the CPU, but decompressing DXTn formats in particular is problematic. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f9906b2..85ed462 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7713,6 +7713,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { enum complex_fixup src_fixup; + BOOL decompress; if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; @@ -7735,7 +7736,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, return FALSE; } - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup);

1 0

Henri Verbeet : wined3d: Allow decompression blits on system memory resources in ffp_blit_supported ().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 807733f1c99e2cf2dede66af8381685e35c8b277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=807733f1c99e2cf2dede66af8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 8 16:46:35 2017 +0100 wined3d: Allow decompression blits on system memory resources in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b4e2025..222159b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2930,7 +2930,11 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + BOOL decompress; + + decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); + if (!decompress && (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM)) { TRACE("Source or destination is in system memory.\n"); return FALSE;

1 0

Detlef Riekenberg : localspl: Clear LastError on success in AddMonitor.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 54e52897f89ad09a7e4d2d7c1fecd31b46d7989a URL: http://source.winehq.org/git/wine.git/?a=commit;h=54e52897f89ad09a7e4d2d7c1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 8 09:03:44 2017 +0000 localspl: Clear LastError on success in AddMonitor. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index f359b73..4f6bac3 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1507,6 +1507,8 @@ static BOOL WINAPI fpAddMonitor(LPWSTR pName, DWORD Level, LPBYTE pMonitors) } monitor_unload(pm); + SetLastError(ERROR_SUCCESS); /* Monitor installer depends on this */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, monitorsW, &hroot) != ERROR_SUCCESS) { ERR("unable to create key %s\n", debugstr_w(monitorsW)); return FALSE;

1 0

Detlef Riekenberg : winspool/tests: Test LastError on success of AddMonitor.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 72ca331431feef9cc3f5251876bf64caff7e19ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ca331431feef9cc3f525187… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Feb 8 09:03:45 2017 +0000 winspool/tests: Test LastError on success of AddMonitor. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index f6527c5..3c28bc0 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -434,7 +434,9 @@ static void test_AddMonitor(void) mi2a.pDLLName = entry->dllname; SetLastError(MAGIC_DEAD); res = AddMonitorA(NULL, 2, (LPBYTE) &mi2a); - ok(res, "returned %d with %d (expected '!= 0')\n", res, GetLastError()); + /* Some apps depend on the result of GetLastError() also on success of AddMonitor */ + ok(res && (GetLastError() == ERROR_SUCCESS), + "returned %d with %d (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError()); /* add a monitor twice */ SetLastError(MAGIC_DEAD);

1 0

Nikolay Sivov : shell32: Added IShellImageData stub.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: f04b66e68f9dff392e1eec771062683c767d9942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04b66e68f9dff392e1eec771… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 7 19:27:30 2017 +0300 shell32: Added IShellImageData stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 10 ++ dlls/shell32/shelllink.c | 10 -- dlls/shell32/shellole.c | 384 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 392 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f04b66e68f9dff392e1ee…

1 0

Nikolay Sivov : shell32: Implement IShellImageData::Decode() when created from file path.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: d9d99834f604402a2897037455261f9dd7d98c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d99834f604402a289703745… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 7 19:27:31 2017 +0300 shell32: Implement IShellImageData::Decode() when created from file path. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellole.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- include/shimgdata.idl | 9 ++++++++- 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 038db7f..970ecba 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 -DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 +DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus EXTRALIBS = $(CORESERVICES_LIBS) # AUTHORS file is in the top-level directory EXTRAINCL = -I$(top_srcdir) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index deef21c..46a7b03 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -36,6 +36,7 @@ #include "shlobj.h" #include "shlguid.h" #include "shldisp.h" +#include "gdiplus.h" #include "shimgdata.h" #include "winreg.h" #include "winerror.h" @@ -811,6 +812,23 @@ HRESULT WINAPI SHCreateQueryCancelAutoPlayMoniker(IMoniker **moniker) return CreateClassMoniker(&CLSID_QueryCancelAutoPlay, moniker); } +static HRESULT gpstatus_to_hresult(GpStatus status) +{ + switch (status) + { + case Ok: + return S_OK; + case InvalidParameter: + return E_INVALIDARG; + case OutOfMemory: + return E_OUTOFMEMORY; + case NotImplemented: + return E_NOTIMPL; + default: + return E_FAIL; + } +} + /* IShellImageData */ typedef struct { @@ -818,6 +836,7 @@ typedef struct LONG ref; WCHAR *path; + GpImage *image; } ShellImageData; static inline ShellImageData *impl_from_IShellImageData(IShellImageData *iface) @@ -861,6 +880,7 @@ static ULONG WINAPI ShellImageData_Release(IShellImageData *iface) if (!ref) { + GdipDisposeImage(This->image); HeapFree(GetProcessHeap(), 0, This->path); SHFree(This); } @@ -871,10 +891,30 @@ static ULONG WINAPI ShellImageData_Release(IShellImageData *iface) static HRESULT WINAPI ShellImageData_Decode(IShellImageData *iface, DWORD flags, ULONG cx_desired, ULONG cy_desired) { ShellImageData *This = impl_from_IShellImageData(iface); + GpImage *image; + HRESULT hr; - FIXME("%p, %#x, %u, %u: stub\n", This, flags, cx_desired, cy_desired); + TRACE("%p, %#x, %u, %u\n", This, flags, cx_desired, cy_desired); - return E_NOTIMPL; + if (This->image) + return S_FALSE; + + if (flags & SHIMGDEC_LOADFULL) + FIXME("LOADFULL flag ignored\n"); + + hr = gpstatus_to_hresult(GdipLoadImageFromFile(This->path, &image)); + if (FAILED(hr)) + return hr; + + if (flags & SHIMGDEC_THUMBNAIL) + { + hr = gpstatus_to_hresult(GdipGetImageThumbnail(image, cx_desired, cy_desired, &This->image, NULL, NULL)); + GdipDisposeImage(image); + } + else + This->image = image; + + return hr; } static HRESULT WINAPI ShellImageData_Draw(IShellImageData *iface, HDC hdc, RECT *dest, RECT *src) @@ -1186,6 +1226,7 @@ static HRESULT create_shellimagedata_from_path(const WCHAR *path, IShellImageDat This->ref = 1; This->path = strdupW(path); + This->image = NULL; *data = &This->IShellImageData_iface; return S_OK; diff --git a/include/shimgdata.idl b/include/shimgdata.idl index 2e84298..e913c57 100644 --- a/include/shimgdata.idl +++ b/include/shimgdata.idl @@ -27,11 +27,18 @@ cpp_quote("#ifndef _GDIPLUSENUMS_H") typedef DWORD InterpolationMode; cpp_quote("#endif") -cpp_quote("#ifndef _GDIPLUSHEADERS_H") +cpp_quote("#ifndef _GDIPLUSIMAGING_H") typedef BYTE EncoderParameters; +cpp_quote("#endif") + +cpp_quote("#ifndef _GDIPLUSHEADERS_H") typedef BYTE Image; cpp_quote("#endif") +cpp_quote("#define SHIMGDEC_DEFAULT 0x0") +cpp_quote("#define SHIMGDEC_THUMBNAIL 0x1") +cpp_quote("#define SHIMGDEC_LOADFULL 0x2") + [ object, uuid(53fb8e58-50c0-4003-b4aa-0c8df28e7f3a)

1 0

Nikolay Sivov : shell32: Implement IShellImageData::GetSize().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 5222eca2d5c159ce78f686fd723cdda9a89ebbe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5222eca2d5c159ce78f686fd7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 7 19:27:32 2017 +0300 shell32: Implement IShellImageData::GetSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellole.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 46a7b03..8fb981c 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -1046,10 +1046,22 @@ static HRESULT WINAPI ShellImageDate_SelectPage(IShellImageData *iface, ULONG pa static HRESULT WINAPI ShellImageData_GetSize(IShellImageData *iface, SIZE *size) { ShellImageData *This = impl_from_IShellImageData(iface); + REAL cx, cy; + HRESULT hr; - FIXME("%p, %p: stub\n", This, size); + TRACE("%p, %p\n", This, size); - return E_NOTIMPL; + if (!This->image) + return E_FAIL; + + hr = gpstatus_to_hresult(GdipGetImageDimension(This->image, &cx, &cy)); + if (SUCCEEDED(hr)) + { + size->cx = cx; + size->cy = cy; + } + + return hr; } static HRESULT WINAPI ShellImageData_GetRawDataFormat(IShellImageData *iface, GUID *format)

1 0

Nikolay Sivov : shell32: Implement IShellImageData::Draw().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 258c5279dfb05293b227c8f8729a33c4c5faeb72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=258c5279dfb05293b227c8f87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 7 19:27:33 2017 +0300 shell32: Implement IShellImageData::Draw(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellole.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 8fb981c..d3d972b 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -920,10 +920,30 @@ static HRESULT WINAPI ShellImageData_Decode(IShellImageData *iface, DWORD flags, static HRESULT WINAPI ShellImageData_Draw(IShellImageData *iface, HDC hdc, RECT *dest, RECT *src) { ShellImageData *This = impl_from_IShellImageData(iface); + GpGraphics *graphics; + HRESULT hr; - FIXME("%p, %p, %s, %s: stub\n", This, hdc, wine_dbgstr_rect(dest), wine_dbgstr_rect(src)); + TRACE("%p, %p, %s, %s\n", This, hdc, wine_dbgstr_rect(dest), wine_dbgstr_rect(src)); - return E_NOTIMPL; + if (!This->image) + return E_FAIL; + + if (!dest) + return E_INVALIDARG; + + if (!src) + return S_OK; + + hr = gpstatus_to_hresult(GdipCreateFromHDC(hdc, &graphics)); + if (FAILED(hr)) + return hr; + + hr = gpstatus_to_hresult(GdipDrawImageRectRectI(graphics, This->image, dest->left, dest->top, dest->right - dest->left, + dest->bottom - dest->top, src->left, src->top, src->right - src->left, src->bottom - src->top, + UnitPixel, NULL, NULL, NULL)); + GdipDeleteGraphics(graphics); + + return hr; } static HRESULT WINAPI ShellImageData_NextFrame(IShellImageData *iface)

1 0