wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Nikolay Sivov : secur32: Pass correct buffer length to RegQueryValueExW().
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 3769d5750c9849ae007a9a3a5f31f7d383605ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3769d5750c9849ae007a9a3a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 8 15:15:20 2017 +0300 secur32: 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/secur32/secur32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index c7e353f..d3cbb9b 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -575,7 +575,7 @@ static void SECUR32_initializeProviders(void) if (apiRet == ERROR_SUCCESS) { WCHAR securityPkgNames[MAX_PATH]; /* arbitrary len */ - DWORD size = sizeof(securityPkgNames) / sizeof(WCHAR), type; + DWORD size = sizeof(securityPkgNames), type; apiRet = RegQueryValueExW(key, securityProvidersW, NULL, &type, (PBYTE)securityPkgNames, &size);

1 0

Nikolay Sivov : setupapi: Use sizeof() instead of numerical constants for buffer sizes.
by Alexandre Julliard 08 Feb '17

08 Feb '17

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 08 Feb '17

08 Feb '17

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 08 Feb '17

08 Feb '17

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 : comsvcs: Register typelib.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 0bff5fb971865baae9130bcb3bb1261202713a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bff5fb971865baae9130bcb3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 03:50:01 2017 +0000 comsvcs: Register typelib. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/comsvcs/Makefile.in | 3 +++ dlls/comsvcs/comsvcs_tlb.idl | 22 ++++++++++++++++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 24c375d..b2ec13a 100755 --- a/configure +++ b/configure @@ -17798,7 +17798,7 @@ wine_fn_config_dll comm.drv16 enable_win16 wine_fn_config_dll commdlg.dll16 enable_win16 wine_fn_config_dll compobj.dll16 enable_win16 wine_fn_config_dll compstui enable_compstui implib -wine_fn_config_dll comsvcs enable_comsvcs implib +wine_fn_config_dll comsvcs enable_comsvcs clean,implib wine_fn_config_dll concrt140 enable_concrt140 wine_fn_config_dll connect enable_connect wine_fn_config_dll credui enable_credui clean,implib diff --git a/configure.ac b/configure.ac index c6d63b2..43f19de 100644 --- a/configure.ac +++ b/configure.ac @@ -2856,7 +2856,7 @@ WINE_CONFIG_DLL(comm.drv16,enable_win16) WINE_CONFIG_DLL(commdlg.dll16,enable_win16) WINE_CONFIG_DLL(compobj.dll16,enable_win16) WINE_CONFIG_DLL(compstui,,[implib]) -WINE_CONFIG_DLL(comsvcs,,[implib]) +WINE_CONFIG_DLL(comsvcs,,[clean,implib]) WINE_CONFIG_DLL(concrt140) WINE_CONFIG_DLL(connect) WINE_CONFIG_DLL(credui,,[clean,implib]) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index 1bf9f4f..bd71e7d 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -4,3 +4,6 @@ IMPORTS = ole32 C_SRCS = \ main.c + +IDL_SRCS = \ + comsvcs_tlb.idl diff --git a/dlls/comsvcs/comsvcs_tlb.idl b/dlls/comsvcs/comsvcs_tlb.idl new file mode 100644 index 0000000..04041a0 --- /dev/null +++ b/dlls/comsvcs/comsvcs_tlb.idl @@ -0,0 +1,22 @@ +/* + * COM+ Services + * + * Copyright 2017 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 + */ +#pragma makedep regtypelib + +#include "comsvcs.idl"

1 0

Alistair Leslie-Hughes : uuid: Add comsvcs.h.
by Alexandre Julliard 08 Feb '17

08 Feb '17

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

Piotr Caban : ntdll: Add stub implementation of NtQueryInformationThread( ThreadIsIoPending).
by Alexandre Julliard 08 Feb '17

08 Feb '17

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

Austin English : wine.inf: Set default Windows version to win7.
by Alexandre Julliard 08 Feb '17

08 Feb '17

Module: wine Branch: master Commit: 6737ac70d6233f6b10f397ee8f94cb23c3ea04fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6737ac70d6233f6b10f397ee8… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 31 12:59:44 2017 -0600 wine.inf: Set default Windows version to win7. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 6 +----- loader/wine.inf.in | 20 ++++++++++---------- programs/winecfg/appdefaults.c | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 06f9827..1fa40e0 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -489,16 +489,12 @@ void version_init( const WCHAR *appname ) { static const WCHAR configW[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e',0}; static const WCHAR appdefaultsW[] = {'A','p','p','D','e','f','a','u','l','t','s','\\',0}; - static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; HANDLE root, hkey, config_key; BOOL got_win_ver = FALSE; - if (is_win64 || is_wow64) - current_version = &VersionData[WINXP64]; /* default if nothing else is specified */ - else - current_version = &VersionData[WINXP]; + current_version = &VersionData[WIN7]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9a55b38..5dfbd7f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3366,23 +3366,23 @@ HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 [VersionInfo] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.2" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"3790" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [Wow64] diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f674824..d272d1c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -146,7 +146,7 @@ static void update_comboboxes(HWND dialog) return; } if (ver != -1) winver = strdupA( win_versions[ver].szVersion ); - else winver = strdupA("winxp"); + else winver = strdupA("win7"); } WINE_TRACE("winver is %s\n", winver);

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

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

← Newer
1
...
61
62
63
64
65
66
67
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017