February 2017 - Wine-Commits

Alistair Leslie-Hughes : dpnet/test: Share code between tests.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: afe438a8d013c87997b8374f3ef91447bc59c7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe438a8d013c87997b8374f3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 7 21:27:20 2017 +0000 dpnet/test: Share code between tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/address.c | 28 +------- dlls/dpnet/tests/client.c | 150 +----------------------------------------- dlls/dpnet/tests/dpnet_test.h | 32 +++++++++ dlls/dpnet/tests/server.c | 16 ++--- 4 files changed, 42 insertions(+), 184 deletions(-) diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 16ba6a7..4aed626 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -22,6 +22,8 @@ #include <dplay8.h> #include "wine/test.h" +#include "dpnet_test.h" + /* {6733C6E8-A0D6-450E-8C18-CEACF331DC27} */ static const GUID IID_Random = {0x6733c6e8, 0xa0d6, 0x450e, { 0x8c, 0x18, 0xce, 0xac, 0xf3, 0x31, 0xdc, 0x27 } }; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; @@ -353,32 +355,6 @@ static void address_duplicate(void) } } -/* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) -{ - DWORD size, ver; - BOOL isstub = FALSE; - char *p, *data; - - size = GetFileVersionInfoSizeA(filename, &ver); - if (!size) return FALSE; - - data = HeapAlloc(GetProcessHeap(), 0, size); - if (!data) return FALSE; - - if (GetFileVersionInfoA(filename, ver, size, data)) - { - char buf[256]; - - sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); - if (VerQueryValueA(data, buf, (void**)&p, &size)) - isstub = !lstrcmpiA("wcodstub.dll", p); - } - HeapFree(GetProcessHeap(), 0, data); - - return isstub; -} - START_TEST(address) { HRESULT hr; diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index a1817a4..d2edcbe 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -24,9 +24,10 @@ #include <dplobby8.h> #include <winver.h> #define COBJMACROS -#include <netfw.h> #include "wine/test.h" +#include "dpnet_test.h" + static IDirectPlay8Peer* peer = NULL; static IDirectPlay8Client* client = NULL; static IDirectPlay8LobbiedApplication* lobbied = NULL; @@ -609,153 +610,6 @@ static void test_cleanup_dp_peer(void) CoUninitialize(); } -static BOOL is_process_elevated(void) -{ - HANDLE token; - if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) - { - TOKEN_ELEVATION_TYPE type; - DWORD size; - BOOL ret; - - ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); - CloseHandle( token ); - return (ret && type == TokenElevationTypeFull); - } - return FALSE; -} - -static BOOL is_firewall_enabled(void) -{ - HRESULT hr, init; - INetFwMgr *mgr = NULL; - INetFwPolicy *policy = NULL; - INetFwProfile *profile = NULL; - VARIANT_BOOL enabled = VARIANT_FALSE; - - init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); - - hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, - (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); - if (hr != S_OK) goto done; - - hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); - ok( hr == S_OK, "got %08x\n", hr ); - -done: - if (policy) INetFwPolicy_Release( policy ); - if (profile) INetFwProfile_Release( profile ); - if (mgr) INetFwMgr_Release( mgr ); - if (SUCCEEDED( init )) CoUninitialize(); - return (enabled == VARIANT_TRUE); -} - -enum firewall_op -{ - APP_ADD, - APP_REMOVE -}; - -static HRESULT set_firewall( enum firewall_op op ) -{ - static const WCHAR testW[] = {'d','p','n','e','t','_','t','e','s','t',0}; - HRESULT hr, init; - INetFwMgr *mgr = NULL; - INetFwPolicy *policy = NULL; - INetFwProfile *profile = NULL; - INetFwAuthorizedApplication *app = NULL; - INetFwAuthorizedApplications *apps = NULL; - BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); - - if (!GetModuleFileNameW( NULL, image, MAX_PATH )) - { - SysFreeString( image ); - return E_FAIL; - } - init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); - - hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, - (void **)&mgr ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); - if (hr != S_OK) goto done; - - INetFwProfile_get_AuthorizedApplications( profile, &apps ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, - &IID_INetFwAuthorizedApplication, (void **)&app ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); - if (hr != S_OK) goto done; - - name = SysAllocString( testW ); - hr = INetFwAuthorizedApplication_put_Name( app, name ); - SysFreeString( name ); - ok( hr == S_OK, "got %08x\n", hr ); - if (hr != S_OK) goto done; - - if (op == APP_ADD) - hr = INetFwAuthorizedApplications_Add( apps, app ); - else if (op == APP_REMOVE) - hr = INetFwAuthorizedApplications_Remove( apps, image ); - else - hr = E_INVALIDARG; - -done: - if (app) INetFwAuthorizedApplication_Release( app ); - if (apps) INetFwAuthorizedApplications_Release( apps ); - if (policy) INetFwPolicy_Release( policy ); - if (profile) INetFwProfile_Release( profile ); - if (mgr) INetFwMgr_Release( mgr ); - if (SUCCEEDED( init )) CoUninitialize(); - SysFreeString( image ); - return hr; -} - -/* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) -{ - DWORD size, ver; - BOOL isstub = FALSE; - char *p, *data; - - size = GetFileVersionInfoSizeA(filename, &ver); - if (!size) return FALSE; - - data = HeapAlloc(GetProcessHeap(), 0, size); - if (!data) return FALSE; - - if (GetFileVersionInfoA(filename, ver, size, data)) - { - char buf[256]; - - sprintf(buf, "\\StringFileInfo\\%04x%04x\\OriginalFilename", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), 1200); - if (VerQueryValueA(data, buf, (void**)&p, &size)) - isstub = !lstrcmpiA("wcodstub.dll", p); - } - HeapFree(GetProcessHeap(), 0, data); - - return isstub; -} - START_TEST(client) { BOOL firewall_enabled; diff --git a/dlls/dpnet/tests/dpnet_test.h b/dlls/dpnet/tests/dpnet_test.h new file mode 100644 index 0000000..1de2559 --- /dev/null +++ b/dlls/dpnet/tests/dpnet_test.h @@ -0,0 +1,32 @@ +/* + * Copyright 2016 Alistair Leslie-Hughes + * + * 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 + */ +#ifndef __DPNET_PRIVATE_H__ +#define __DPNET_PRIVATE_H__ + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +extern BOOL is_firewall_enabled(void) DECLSPEC_HIDDEN; +extern BOOL is_process_elevated(void) DECLSPEC_HIDDEN; +extern HRESULT set_firewall( enum firewall_op op ) DECLSPEC_HIDDEN; +extern BOOL is_stub_dll(const char *filename) DECLSPEC_HIDDEN; + +#endif diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index bfc21b0..2f52c58 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -24,6 +24,8 @@ #include <netfw.h> #include "wine/test.h" +#include "dpnet_test.h" + /* {CD0C3D4B-E15E-4CF2-9EA8-6E1D6548C5A5} */ static const GUID appguid = { 0xcd0c3d4b, 0xe15e, 0x4cf2, { 0x9e, 0xa8, 0x6e, 0x1d, 0x65, 0x48, 0xc5, 0xa5 } }; static WCHAR sessionname[] = {'w','i','n','e','g','a','m','e','s','s','e','r','v','e','r',0}; @@ -182,7 +184,7 @@ static void test_server_info(void) } } -static BOOL is_process_elevated(void) +BOOL is_process_elevated(void) { HANDLE token; if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) @@ -198,7 +200,7 @@ static BOOL is_process_elevated(void) return FALSE; } -static BOOL is_firewall_enabled(void) +BOOL is_firewall_enabled(void) { HRESULT hr, init; INetFwMgr *mgr = NULL; @@ -231,13 +233,7 @@ done: return (enabled == VARIANT_TRUE); } -enum firewall_op -{ - APP_ADD, - APP_REMOVE -}; - -static HRESULT set_firewall( enum firewall_op op ) +HRESULT set_firewall( enum firewall_op op ) { static const WCHAR dpnsvrW[] = {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\', @@ -341,7 +337,7 @@ done: } /* taken from programs/winetest/main.c */ -static BOOL is_stub_dll(const char *filename) +BOOL is_stub_dll(const char *filename) { DWORD size, ver; BOOL isstub = FALSE;

1 0

Nikolay Sivov : setupapi: Use sizeof() instead of numerical constants for buffer sizes.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 01080e6750abcad22ac30df0e4efe669b458f8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=01080e6750abcad22ac30df0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 15:11:42 2017 +0300 setupapi: Use sizeof() instead of numerical constants for buffer sizes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 63e578c..ffb5fad 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -903,7 +903,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( for (dwIndex = 0; ; dwIndex++) { - dwLength = 40; + dwLength = sizeof(szKeyName) / sizeof(WCHAR); lError = RegEnumKeyExW(hClassesKey, dwIndex, szKeyName, @@ -927,7 +927,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( return FALSE; } - dwLength = 256 * sizeof(WCHAR); + dwLength = sizeof(szClassName); if (!RegQueryValueExW(hClassKey, Class, NULL,

1 0

Nikolay Sivov : shell32: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 0bfb97dcba29552b51d8609fcc6e7bbc04bb8320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bfb97dcba29552b51d8609fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 14:55:57 2017 +0300 shell32: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9230623..8569b53 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3209,8 +3209,8 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix, HRESULT hr; WCHAR shellFolderPath[MAX_PATH], userShellFolderPath[MAX_PATH]; LPCWSTR pShellFolderPath, pUserShellFolderPath; - DWORD dwType, dwPathLen = MAX_PATH; HKEY userShellFolderKey, shellFolderKey; + DWORD dwType, dwPathLen; TRACE("%p,%s,%s,%p\n",rootKey, debugstr_w(userPrefix), debugstr_w(value), path); @@ -3245,6 +3245,7 @@ static HRESULT _SHGetUserShellFolderPath(HKEY rootKey, LPCWSTR userPrefix, return E_FAIL; } + dwPathLen = MAX_PATH * sizeof(WCHAR); if (!RegQueryValueExW(userShellFolderKey, value, NULL, &dwType, (LPBYTE)path, &dwPathLen) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) {

1 0

Nikolay Sivov : winex11: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 703e82094bbc76532d666ffc51862a4e990d974f URL: http://source.winehq.org/git/wine.git/?a=commit;h=703e82094bbc76532d666ffc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 14:46:30 2017 +0300 winex11: Pass correct buffer length to RegQueryValueExW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 186899f..1c1df93 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -967,7 +967,7 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) HKEY key; WCHAR *p, name[MAX_PATH * 2], valueW[64]; char valueA[64]; - DWORD size, ret; + DWORD ret; if (!info->szModName[0]) return 0; @@ -982,7 +982,7 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) /* @@ Wine registry key: HKCU\Software\Wine\X11 Driver\Cursors */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\X11 Driver\\Cursors", &key )) { - size = sizeof(valueW) / sizeof(WCHAR); + DWORD size = sizeof(valueW); ret = RegQueryValueExW( key, name, NULL, NULL, (BYTE *)valueW, &size ); RegCloseKey( key ); if (!ret)

1 0

Alistair Leslie-Hughes : uuid: Add comsvcs.h.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 533a18f143e78e27c355e49ea6e9cb4d2f1723e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533a18f143e78e27c355e49ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 03:49:51 2017 +0000 uuid: Add comsvcs.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uuid/uuid.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 4834dee..92ec9d0 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -88,6 +88,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "msdasc.h" #include "netcfgx.h" #include "shimgdata.h" +#include "comsvcs.h" /* FIXME: cguids declares GUIDs but does not define their values */

1 0

Francois Gouget : winetest: Flush the report file to disk between each test.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 7bc46c15ef4ebbc71609588142ccdce11cb6762a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc46c15ef4ebbc7160958814… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 14:12:07 2017 +0100 winetest: Flush the report file to disk between each test. Should Windows crash, this makes it easier to know which test is responsible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 1eb49b6..48b71c5 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -626,6 +626,10 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) PROCESS_INFORMATION pi; DWORD wait, status; + /* Flush to disk so we know which test caused Windows to crash if it does */ + if (out_file) + FlushFileBuffers(out_file); + GetStartupInfoA (&si); si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = GetStdHandle( STD_INPUT_HANDLE );

1 0

Nikolay Sivov : shell32: Implement IShellImageData::Decode() when created from file path.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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: Added IShellImageData stub.
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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::Draw().
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

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

Piotr Caban : ntdll: Add stub implementation of NtQueryInformationThread( ThreadIsIoPending).
by Alexandre Julliard Feb. 8, 2017

Feb. 8, 2017

Module: wine Branch: master Commit: 05ab8b98be81929a742d98ba3f1baf95aeabfe78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ab8b98be81929a742d98ba3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 2 19:27:26 2017 +0100 ntdll: Add stub implementation of NtQueryInformationThread(ThreadIsIoPending). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 1 + dlls/kernel32/thread.c | 13 +++++++++++-- dlls/ntdll/thread.c | 9 ++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 001128b..334bdf4 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1969,6 +1969,7 @@ todo_wine case ThreadAffinityMask: case ThreadQuerySetWin32StartAddress: + case ThreadIsIoPending: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 82ccebe..de46618 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -918,8 +918,17 @@ LANGID WINAPI GetThreadUILanguage( void ) */ BOOL WINAPI GetThreadIOPendingFlag( HANDLE thread, PBOOL io_pending ) { - FIXME("%p, %p\n", thread, io_pending); - *io_pending = FALSE; + NTSTATUS status; + + TRACE("%p, %p\n", thread, io_pending); + + status = NtQueryInformationThread( thread, ThreadIsIoPending, + io_pending, sizeof(*io_pending), NULL ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } return TRUE; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index e3cc11a..c9a5da6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1157,6 +1157,14 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, } } return status; + case ThreadIsIoPending: + FIXME( "ThreadIsIoPending info class not supported yet\n" ); + if (length != sizeof(BOOL)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_DENIED; + + *(BOOL*)data = FALSE; + if (ret_len) *ret_len = sizeof(BOOL); + return STATUS_SUCCESS; case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -1167,7 +1175,6 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadIdealProcessor: case ThreadPriorityBoost: case ThreadSetTlsArrayAddress: - case ThreadIsIoPending: default: FIXME( "info class %d not supported yet\n", class ); return STATUS_NOT_IMPLEMENTED;

1 0