Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[akhaldi] 68444: [INSENG] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 22:31:17 2015 New Revision: 68444 URL: http://svn.reactos.org/svn/reactos?rev=68444&view=rev Log: [INSENG] Sync with Wine Staging 1.7.47. CORE-9924 Added: trunk/reactos/dll/win32/inseng/inseng_classes.idl - copied, changed from r68415, trunk/reactos/dll/win32/inseng/inseng.idl trunk/reactos/dll/win32/inseng/inseng_classes.rgs - copied unchanged from r68415, trunk/reactos/dll/win32/inseng/inseng.rgs Removed: trunk/reactos/dll/win32/inseng/inseng.idl trunk/reactos/dll/win32/inseng/inseng.rgs Modified: trunk/reactos/dll/win32/inseng/CMakeLists.txt trunk/reactos/dll/win32/inseng/inseng.rc trunk/reactos/dll/win32/inseng/inseng_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/inseng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/inseng/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/CMakeLists.txt [iso-8859-1] Sun Jul 19 22:31:17 2015 @@ -10,6 +10,6 @@ add_library(inseng SHARED ${SOURCE} inseng.rc) set_module_type(inseng win32dll) -target_link_libraries(inseng wine) +target_link_libraries(inseng uuid wine) add_importlibs(inseng msvcrt kernel32 ntdll) add_cd_file(TARGET inseng DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/win32/inseng/inseng.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.id… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng.idl (removed) @@ -1,35 +0,0 @@ -/* - * COM Classes for inseng - * - * Copyright 2010 Alexandre Julliard - * - * 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 register - -[ - helpstring("Microsoft Active Setup Engine"), - threading(apartment), - uuid(6e449686-c509-11cf-aafa-00aa00b6015c) -] -coclass ActiveSetupEng { } - -[ - helpstring("Download Site Manager"), - threading(apartment), - uuid(bfc880f1-7484-11d0-8309-00aa00b6015c) -] -coclass DLManager { } Modified: trunk/reactos/dll/win32/inseng/inseng.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.rc… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng.rc [iso-8859-1] Sun Jul 19 22:31:17 2015 @@ -1 +1 @@ -1 WINE_REGISTRY "inseng.rgs" +1 WINE_REGISTRY "inseng_classes.rgs" Removed: trunk/reactos/dll/win32/inseng/inseng.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng.rg… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng.rgs (removed) @@ -1,17 +0,0 @@ -HKCR -{ - NoRemove Interface - { - } - NoRemove CLSID - { - '{6E449686-C509-11CF-AAFA-00AA00B6015C}' = s 'Microsoft Active Setup Engine' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - } - '{BFC880F1-7484-11D0-8309-00AA00B6015C}' = s 'Download Site Manager' - { - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - } - } -} Copied: trunk/reactos/dll/win32/inseng/inseng_classes.idl (from r68415, trunk/reactos/dll/win32/inseng/inseng.idl) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng_cl… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng_classes.idl [iso-8859-1] Sun Jul 19 22:31:17 2015 @@ -20,16 +20,4 @@ #pragma makedep register -[ - helpstring("Microsoft Active Setup Engine"), - threading(apartment), - uuid(6e449686-c509-11cf-aafa-00aa00b6015c) -] -coclass ActiveSetupEng { } - -[ - helpstring("Download Site Manager"), - threading(apartment), - uuid(bfc880f1-7484-11d0-8309-00aa00b6015c) -] -coclass DLManager { } +#include "inseng.idl" Modified: trunk/reactos/dll/win32/inseng/inseng_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/inseng_ma… ============================================================================== --- trunk/reactos/dll/win32/inseng/inseng_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inseng/inseng_main.c [iso-8859-1] Sun Jul 19 22:31:17 2015 @@ -33,13 +33,344 @@ //#include "winuser.h" #include <ole2.h> #include <rpcproxy.h> -//#include "initguid.h" +#include <initguid.h> +#include <inseng.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(inseng); +static inline void *heap_alloc(size_t len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + static HINSTANCE instance; + +struct InstallEngine { + IInstallEngine2 IInstallEngine2_iface; + LONG ref; +}; + +static inline InstallEngine *impl_from_IInstallEngine2(IInstallEngine2 *iface) +{ + return CONTAINING_RECORD(iface, InstallEngine, IInstallEngine2_iface); +} + +static HRESULT WINAPI InstallEngine_QueryInterface(IInstallEngine2 *iface, REFIID riid, void **ppv) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IInstallEngine2_iface; + }else if(IsEqualGUID(&IID_IInstallEngine, riid)) { + TRACE("(%p)->(IID_IInstallEngine %p)\n", This, ppv); + *ppv = &This->IInstallEngine2_iface; + }else if(IsEqualGUID(&IID_IInstallEngine2, riid)) { + TRACE("(%p)->(IID_IInstallEngine2 %p)\n", This, ppv); + *ppv = &This->IInstallEngine2_iface; + }else { + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI InstallEngine_AddRef(IInstallEngine2 *iface) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI InstallEngine_GetEngineStatus(IInstallEngine2 *iface, DWORD *status) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%p)\n", This, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetCifFile(IInstallEngine2 *iface, const char *cab_name, const char *cif_name) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s %s)\n", This, debugstr_a(cab_name), debugstr_a(cif_name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_DownloadComponents(IInstallEngine2 *iface, DWORD flags) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%x)\n", This, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_InstallComponents(IInstallEngine2 *iface, DWORD flags) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%x)\n", This, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_EnumInstallIDs(IInstallEngine2 *iface, UINT index, char **id) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%d %p)\n", This, index, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_EnumDownloadIDs(IInstallEngine2 *iface, UINT index, char **id) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%d %p)\n", This, index, id); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_IsComponentInstalled(IInstallEngine2 *iface, const char *id, DWORD *status) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_a(id), status); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_RegisterInstallEngineCallback(IInstallEngine2 *iface, IInstallEngineCallback *callback) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%p)\n", This, callback); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_UnregisterInstallEngineCallback(IInstallEngine2 *iface) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetAction(IInstallEngine2 *iface, const char *id, DWORD action, DWORD priority) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s %d %d)\n", This, debugstr_a(id), action, priority); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_GetSizes(IInstallEngine2 *iface, const char *id, COMPONENT_SIZES *sizes) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_a(id), sizes); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_LaunchExtraCommand(IInstallEngine2 *iface, const char *inf_name, const char *section) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s %s)\n", This, debugstr_a(inf_name), debugstr_a(section)); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_GetDisplayName(IInstallEngine2 *iface, const char *id, const char *name) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s %s)\n", This, debugstr_a(id), debugstr_a(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetBaseUrl(IInstallEngine2 *iface, const char *base_name) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_a(base_name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetDownloadDir(IInstallEngine2 *iface, const char *download_dir) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_a(download_dir)); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetInstallDrive(IInstallEngine2 *iface, char drive) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%c)\n", This, drive); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetInstallOptions(IInstallEngine2 *iface, DWORD flags) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%x)\n", This, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetHWND(IInstallEngine2 *iface, HWND hwnd) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%p)\n", This, hwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_SetIStream(IInstallEngine2 *iface, IStream *stream) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%p)\n", This, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_Abort(IInstallEngine2 *iface, DWORD flags) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%x)\n", This, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_Suspend(IInstallEngine2 *iface) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine_Resume(IInstallEngine2 *iface) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine2_SetLocalCif(IInstallEngine2 *iface, const char *cif) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_a(cif)); + return E_NOTIMPL; +} + +static HRESULT WINAPI InstallEngine2_GetICifFile(IInstallEngine2 *iface, ICifFile **cif_file) +{ + InstallEngine *This = impl_from_IInstallEngine2(iface); + FIXME("(%p)->(%p)\n", This, cif_file); + return E_NOTIMPL; +} + +static const IInstallEngine2Vtbl InstallEngine2Vtbl = { + InstallEngine_QueryInterface, + InstallEngine_AddRef, + InstallEngine_Release, + InstallEngine_GetEngineStatus, + InstallEngine_SetCifFile, + InstallEngine_DownloadComponents, + InstallEngine_InstallComponents, + InstallEngine_EnumInstallIDs, + InstallEngine_EnumDownloadIDs, + InstallEngine_IsComponentInstalled, + InstallEngine_RegisterInstallEngineCallback, + InstallEngine_UnregisterInstallEngineCallback, + InstallEngine_SetAction, + InstallEngine_GetSizes, + InstallEngine_LaunchExtraCommand, + InstallEngine_GetDisplayName, + InstallEngine_SetBaseUrl, + InstallEngine_SetDownloadDir, + InstallEngine_SetInstallDrive, + InstallEngine_SetInstallOptions, + InstallEngine_SetHWND, + InstallEngine_SetIStream, + InstallEngine_Abort, + InstallEngine_Suspend, + InstallEngine_Resume, + InstallEngine2_SetLocalCif, + InstallEngine2_GetICifFile +}; + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + return S_OK; +} + +static HRESULT WINAPI InstallEngineCF_CreateInstance(IClassFactory *iface, IUnknown *outer, + REFIID riid, void **ppv) +{ + InstallEngine *engine; + HRESULT hres; + + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); + + engine = heap_alloc(sizeof(*engine)); + if(!engine) + return E_OUTOFMEMORY; + + engine->IInstallEngine2_iface.lpVtbl = &InstallEngine2Vtbl; + engine->ref = 1; + + hres = IInstallEngine2_QueryInterface(&engine->IInstallEngine2_iface, riid, ppv); + IInstallEngine2_Release(&engine->IInstallEngine2_iface); + return hres; +} + +static const IClassFactoryVtbl InstallEngineCFVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + InstallEngineCF_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory InstallEngineCF = { &InstallEngineCFVtbl }; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -60,8 +391,12 @@ */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { - FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); - + if(IsEqualGUID(rclsid, &CLSID_InstallEngine)) { + TRACE("(CLSID_InstallEngine %s %p)\n", debugstr_guid(iid), ppv); + return IClassFactory_QueryInterface(&InstallEngineCF, iid, ppv); + } + + FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 19 22:31:17 2015 @@ -84,7 +84,7 @@ reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.47 reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.37 reactos/dll/win32/initpki # Synced to WineStaging-1.7.37 -reactos/dll/win32/inseng # Synced to WineStaging-1.7.37 +reactos/dll/win32/inseng # Synced to WineStaging-1.7.47 reactos/dll/win32/iphlpapi # Out of sync reactos/dll/win32/itircl # Synced to WineStaging-1.7.37 reactos/dll/win32/itss # Synced to WineStaging-1.7.37

1 0

[ekohl] 68443: [DISKPART] Fix MSVC build failure.
by ekohl＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: ekohl Date: Sun Jul 19 17:52:46 2015 New Revision: 68443 URL: http://svn.reactos.org/svn/reactos?rev=68443&view=rev Log: [DISKPART] Fix MSVC build failure. Modified: trunk/reactos/base/system/diskpart/resource.h Modified: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Sun Jul 19 17:52:46 2015 @@ -134,6 +134,5 @@ #define IDS_HELP_CMD_SHRINK 139 #define IDS_HELP_CMD_UNIQUEID 140 - #define IDS_ERROR_INVALID_ARGS 211 -#define IDS_ERROR_INVALID_DISK 212 +#define IDS_ERROR_INVALID_DISK 212

1 0

[ekohl] 68442: [DISKPART] Implement the "list disk" and "select disk" commands.
by ekohl＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: ekohl Date: Sun Jul 19 17:33:29 2015 New Revision: 68442 URL: http://svn.reactos.org/svn/reactos?rev=68442&view=rev Log: [DISKPART] Implement the "list disk" and "select disk" commands. Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/diskpart/diskpart.h trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/diskpart/lang/ru-RU.rc trunk/reactos/base/system/diskpart/lang/sq-AL.rc trunk/reactos/base/system/diskpart/lang/tr-TR.rc trunk/reactos/base/system/diskpart/list.c trunk/reactos/base/system/diskpart/resource.h trunk/reactos/base/system/diskpart/select.c Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -42,7 +42,7 @@ add_executable(diskpart ${SOURCE} diskpart.rc) set_module_type(diskpart win32cui UNICODE) -add_importlibs(diskpart user32 advapi32 msvcrt kernel32) +add_importlibs(diskpart user32 advapi32 msvcrt kernel32 ntdll) if(MSVC) add_importlibs(diskpart ntdll) Modified: trunk/reactos/base/system/diskpart/diskpart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -2,8 +2,7 @@ * PROJECT: ReactOS DiskPart * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/diskpart.c - * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ @@ -13,9 +12,18 @@ /* INCLUDES ******************************************************************/ #include <stdio.h> +#include <stdlib.h> #define WIN32_NO_STATUS #include <windef.h> +#include <winbase.h> +#define NTOS_MODE_USER +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/umfuncs.h> #include "resource.h" @@ -32,15 +40,20 @@ extern COMMAND cmds[]; /* NOERR codes for the program */ -#define ERROR_NONE 0 -#define ERROR_FATAL 1 -#define ERROR_CMD_ARG 2 -#define ERROR_FILE 3 -#define ERROR_SERVICE 4 -#define ERROR_SYNTAX 5 +//#define ERROR_NONE 0 +//#define ERROR_FATAL 1 +//#define ERROR_CMD_ARG 2 +//#define ERROR_FILE 3 +//#define ERROR_SERVICE 4 +//#define ERROR_SYNTAX 5 #define MAX_STRING_SIZE 1024 #define MAX_ARGS_COUNT 256 + +/* GLOBAL VARIABLES ***********************************************************/ + +ULONG CurrentDisk; +ULONG CurrentPartition; /* PROTOTYPES *****************************************************************/ Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -37,9 +37,21 @@ /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "Disk ### Status\tSize\tFree\tDyn\tGpt\n" - IDS_LIST_DISK_LINE "-------- ------\t----\t----\t---\t---\n" - IDS_LIST_VOLUME_HEAD "Volume ###\tLtr\tLabel\n" + IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" + IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" + IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" + IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label\n" +END + +/* Select command strings */ +STRINGTABLE +BEGIN + IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -58,8 +70,6 @@ /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_CURRENT_DSK_STATUS "is now the selected disk." - IDS_MSG_NO_DISK "There is no disk currently selected.\nPlease select a disk and try again." IDS_MSG_ARG_SYNTAX_ERROR "The argument(s) specified for this command are not valid.\nFor more information on the command type:" END @@ -111,6 +121,8 @@ BEGIN IDS_ERROR_MSG_NO_SCRIPT "Error opening script: %s\n" IDS_ERROR_MSG_BAD_ARG "Error processing argument: %s\n" + IDS_ERROR_INVALID_ARGS "Invalid arguments\n" + IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -38,9 +38,21 @@ /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "Disc ### Stare\tDimensiune\tLiber\tDyn\tGpt\n" - IDS_LIST_DISK_LINE "-------- ------\t----\t----\t---\t---\n" + IDS_LIST_DISK_HEAD "\n Disc ### Stare Dimensiune Liber Dyn Gpt\n" + IDS_LIST_DISK_LINE " -------- ---------- ---------- ------- --- ---\n" + IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" IDS_LIST_VOLUME_HEAD "Volum ###\tLtr\tEtichetÄ\n" +END + +/* Select command strings */ +STRINGTABLE +BEGIN + IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -59,8 +71,6 @@ /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_CURRENT_DSK_STATUS " a devenit discul curent." - IDS_MSG_NO_DISK "Momentan nici un disc nu este selectat.\nAlegeÈi un disc apoi reÃ®ncercaÈi." IDS_MSG_ARG_SYNTAX_ERROR "Argument(e) nevalid(e) pentru aceastÄ comandÄ.\nPentru mai multe informaÈii, executaÈi comanda:" END @@ -112,6 +122,8 @@ BEGIN IDS_ERROR_MSG_NO_SCRIPT "Eroare la deschiderea fiÈierului script: %s\n" IDS_ERROR_MSG_BAD_ARG "Eroare la prelucrarea argumentului: %s\n" + IDS_ERROR_INVALID_ARGS "Invalid arguments\n" + IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -39,9 +39,21 @@ /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "ÐÐ¸ÑÐº ### Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ\tÐ Ð°Ð·Ð¼ÐµÑ\tÐ¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾\tÐÐ¸Ð½\tGPT\n" - IDS_LIST_DISK_LINE "-------- ---------\t------\t--------\t---\t---\n" + IDS_LIST_DISK_HEAD "\n ÐÐ¸ÑÐº ### Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ Ð Ð°Ð·Ð¼ÐµÑ Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÐÐ¸Ð½ GPT\n" + IDS_LIST_DISK_LINE " -------- ---------- ------- -------- --- ---\n" + IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" IDS_LIST_VOLUME_HEAD "Ð¢Ð¾Ð¼ ###\tÐÐ¼Ñ\tÐÐµÑÐºÐ°\n" +END + +/* Select command strings */ +STRINGTABLE +BEGIN + IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -60,8 +72,6 @@ /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_CURRENT_DSK_STATUS "Ð²ÑÐ±ÑÐ°Ð½ ÑÐµÐºÑÑÐ¸Ð¼ Ð´Ð¸ÑÐºÐ¾Ð¼." - IDS_MSG_NO_DISK "ÐÐ¸ÑÐº Ð´Ð»Ñ Ð¿ÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ðµ Ð²ÑÐ±ÑÐ°Ð½.\nÐÑÐ±ÐµÑÐ¸ÑÐµ Ð´Ð¸ÑÐº Ð¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐµ Ð¿Ð¾Ð¿ÑÑÐºÑ." IDS_MSG_ARG_SYNTAX_ERROR "Ð£ÐºÐ°Ð·Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ.\nÐ§ÑÐ¾Ð±Ñ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ Ð´Ð°Ð½Ð½Ð¾Ð¹ ÐºÐ¾Ð¼Ð°Ð½Ð´Ðµ, Ð²Ð²ÐµÐ´Ð¸ÑÐµ:" END @@ -113,6 +123,8 @@ BEGIN IDS_ERROR_MSG_NO_SCRIPT "ÐÑÐ¸Ð±ÐºÐ° Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÐºÑÐ¸Ð¿ÑÐ°: %s\n" IDS_ERROR_MSG_BAD_ARG "ÐÑÐ¸Ð±ÐºÐ° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð²: %s\n" + IDS_ERROR_INVALID_ARGS "Invalid arguments\n" + IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -41,9 +41,21 @@ /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "Disk ### Status\tSize\tFree\tDyn\tGpt\n" - IDS_LIST_DISK_LINE "-------- ------\t----\t----\t---\t---\n" + IDS_LIST_DISK_HEAD "\n Disk ### Status Size Free Dyn Gpt\n" + IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" + IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" IDS_LIST_VOLUME_HEAD "Volume ###\tLtr\tLabel\n" +END + +/* Select command strings */ +STRINGTABLE +BEGIN + IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -62,8 +74,6 @@ /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_CURRENT_DSK_STATUS "Ã«shtÃ« disku i pÃ«rzgjedhur." - IDS_MSG_NO_DISK "Nuk ka disk tÃ« pÃ«rzgjedhur.\nJu lutem zgjidhni njÃ« disk dhe provoni pÃ«rsÃ«ri." IDS_MSG_ARG_SYNTAX_ERROR "Argumente(t) e specifikuara per kete komande nuk jane tÃ« vlefshme.\nPÃ«r mÃ« shume informacione mbi komanden shkruani:" END @@ -115,6 +125,8 @@ BEGIN IDS_ERROR_MSG_NO_SCRIPT "Error nÃ« hapjen e skriptes: %s\n" IDS_ERROR_MSG_BAD_ARG "Error argumenti i procesimit: %s\n" + IDS_ERROR_INVALID_ARGS "Invalid arguments\n" + IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -39,9 +39,21 @@ /* Detail header titles */ STRINGTABLE BEGIN - IDS_LIST_DISK_HEAD "Disk ### Durum\tBoyut\tBoÅ\tDev\tGpt\n" - IDS_LIST_DISK_LINE "-------- ------\t----\t----\t---\t---\n" + IDS_LIST_DISK_HEAD "\n Disk ### Durum Boyut BoÅ Dev Gpt\n" + IDS_LIST_DISK_LINE " -------- ---------- ------- ------- --- ---\n" + IDS_LIST_DISK_FORMAT "%c %7lu %-10s %4I64u %-2s %4I64u %-2s %1s %1s\n" IDS_LIST_VOLUME_HEAD "Birim ###\tHarf\tEtiket\n" +END + +/* Select command strings */ +STRINGTABLE +BEGIN + IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_DISK "\nDisk %lu is now the selected disk.\n\n" + IDS_SELECT_NO_VOLUME "\nThere is no volume currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_VOLUME "\nVolume %lu is now the selected volume.\n\n" + IDS_SELECT_NO_PARTITION "\nThere is no partition currently selected.\nPlease select a disk and try again.\n\n" + IDS_SELECT_PARTITION "\nPartition %lu is now the selected partition.\n\n" END /* Disk Status */ @@ -60,8 +72,6 @@ /* CMD Messages for commands */ STRINGTABLE BEGIN - IDS_MSG_CURRENT_DSK_STATUS "Åimdi seÃ§ili disktir." - IDS_MSG_NO_DISK "Bir disk Åimdilik seÃ§ilmemiÅ.\nLÃ¼tfen bir disk seÃ§iniz ve yeniden deneyiniz." IDS_MSG_ARG_SYNTAX_ERROR "Bu komut iÃ§in belirtilen deÄiÅtirgen(ler) geÃ§erli deÄil.\nKomu tÃ¼rÃ¼ Ã¼zerinde daha Ã§ok bilgi iÃ§in:" END @@ -113,6 +123,8 @@ BEGIN IDS_ERROR_MSG_NO_SCRIPT "Betik aÃ§mada yanlÄ±ÅlÄ±k: %s\n" IDS_ERROR_MSG_BAD_ARG "DeÄiÅtirgen iÅlemede yanlÄ±ÅlÄ±k: %s\n" + IDS_ERROR_INVALID_ARGS "Invalid arguments\n" + IDS_ERROR_INVALID_DISK "Invalid disk\n" END /* Active help descriptions */ Modified: trunk/reactos/base/system/diskpart/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/list.… ============================================================================== --- trunk/reactos/base/system/diskpart/list.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/list.c [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -2,38 +2,168 @@ * PROJECT: ReactOS DiskPart * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/list.c - * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ #include "diskpart.h" -static VOID list_disk(VOID) +#define NDEBUG +#include <debug.h> + +static +ULONGLONG +RoundingDivide( + IN ULONGLONG Dividend, + IN ULONGLONG Divisor) { + return (Dividend + Divisor / 2) / Divisor; +} + + +static +VOID +ListDisk(VOID) +{ + WCHAR Buffer[MAX_PATH]; + OBJECT_ATTRIBUTES ObjectAttributes; + SYSTEM_DEVICE_INFORMATION Sdi; + IO_STATUS_BLOCK Iosb; + DISK_GEOMETRY DiskGeometry; + ULONG ReturnSize; + ULONG DiskNumber; + UNICODE_STRING Name; + HANDLE FileHandle; + NTSTATUS Status; + + ULARGE_INTEGER DiskSize; + ULARGE_INTEGER FreeSize; + LPWSTR lpSizeUnit; + LPWSTR lpFreeUnit; + + + Status = NtQuerySystemInformation(SystemDeviceInformation, + &Sdi, + sizeof(SYSTEM_DEVICE_INFORMATION), + &ReturnSize); + if (!NT_SUCCESS(Status)) + { + return; + } + /* Header labels */ PrintResourceString(IDS_LIST_DISK_HEAD); PrintResourceString(IDS_LIST_DISK_LINE); - printf("\n\n"); + for (DiskNumber = 0; DiskNumber < Sdi.NumberOfDisks; DiskNumber++) + { + swprintf(Buffer, + L"\\Device\\Harddisk%d\\Partition0", + DiskNumber); + RtlInitUnicodeString(&Name, + Buffer); + + InitializeObjectAttributes(&ObjectAttributes, + &Name, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &Iosb, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + if (NT_SUCCESS(Status)) + { + Status = NtDeviceIoControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + IOCTL_DISK_GET_DRIVE_GEOMETRY, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY)); + if (NT_SUCCESS(Status)) + { + DiskSize.QuadPart = DiskGeometry.Cylinders.QuadPart * + (ULONGLONG)DiskGeometry.TracksPerCylinder * + (ULONGLONG)DiskGeometry.SectorsPerTrack * + (ULONGLONG)DiskGeometry.BytesPerSector; + if (DiskSize.QuadPart >= 10737418240) /* 10 GB */ + { + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1073741824); + lpSizeUnit = L"GB"; + } + else + { + DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, 1048576); + if (DiskSize.QuadPart == 0) + DiskSize.QuadPart = 1; + lpSizeUnit = L"MB"; + } + + /* FIXME */ + FreeSize.QuadPart = 0; + lpFreeUnit = L"B"; + + PrintResourceString(IDS_LIST_DISK_FORMAT, + (CurrentDisk == DiskNumber) ? L'*': ' ', + DiskNumber, + L"Online", + DiskSize.QuadPart, + lpSizeUnit, + FreeSize.QuadPart, + lpFreeUnit, + L" ", + L" "); + } + else + { + printf("Status 0x%lx\n", Status); + + } + + NtClose(FileHandle); + } + else + { + printf("Status 0x%lx\n", Status); + + } + } + + wprintf(L"\n\n"); } -static VOID list_partition(VOID) +static +VOID +ListPartition(VOID) { printf("List Partition!!\n"); } -static VOID list_volume(VOID) +static +VOID +ListVolume(VOID) { PrintResourceString(IDS_LIST_VOLUME_HEAD); } -static VOID list_vdisk(VOID) +static +VOID +ListVdisk(VOID) { printf("List VDisk!!\n"); } -BOOL list_main(INT argc, LPWSTR *argv) +BOOL +list_main( + INT argc, + LPWSTR *argv) { /* gets the first word from the string */ if (argc == 1) @@ -43,14 +173,14 @@ } /* determines which to list (disk, partition, etc.) */ - if(!wcsicmp(argv[1], L"disk")) - list_disk(); - else if(!wcsicmp(argv[1], L"partition")) - list_partition(); - else if(!wcsicmp(argv[1], L"volume")) - list_volume(); - else if(!wcsicmp(argv[1], L"vdisk")) - list_vdisk(); + if (!wcsicmp(argv[1], L"disk")) + ListDisk(); + else if (!wcsicmp(argv[1], L"partition")) + ListPartition(); + else if (!wcsicmp(argv[1], L"volume")) + ListVolume(); + else if (!wcsicmp(argv[1], L"vdisk")) + ListVdisk(); else PrintResourceString(IDS_HELP_CMD_LIST); Modified: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -2,8 +2,7 @@ * PROJECT: ReactOS DiskPart * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/lang/resource.h - * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ @@ -33,9 +32,17 @@ #define IDS_DETAIL_INFO_CRASH_DSK 19 #define IDS_DETAIL_INFO_CLST_DSK 20 -#define IDS_LIST_DISK_HEAD 21 -#define IDS_LIST_DISK_LINE 22 -#define IDS_LIST_VOLUME_HEAD 23 +#define IDS_LIST_DISK_HEAD 3300 +#define IDS_LIST_DISK_LINE 3301 +#define IDS_LIST_DISK_FORMAT 3302 +#define IDS_LIST_VOLUME_HEAD 3303 + +#define IDS_SELECT_NO_DISK 4400 +#define IDS_SELECT_DISK 4401 +#define IDS_SELECT_NO_VOLUME 4402 +#define IDS_SELECT_VOLUME 4403 +#define IDS_SELECT_NO_PARTITION 4404 +#define IDS_SELECT_PARTITION 4405 #define IDS_STATUS_YES 31 #define IDS_STATUS_NO 32 @@ -46,8 +53,6 @@ #define IDS_STATUS_OFFLINE 37 #define IDS_STATUS_NO_MEDIA 38 -#define IDS_MSG_CURRENT_DSK_STATUS 39 -#define IDS_MSG_NO_DISK 40 #define IDS_MSG_ARG_SYNTAX_ERROR 41 #define IDS_HELP_CMD_DESC_ACTIVE 58 @@ -128,3 +133,7 @@ #define IDS_HELP_CMD_SETID 138 #define IDS_HELP_CMD_SHRINK 139 #define IDS_HELP_CMD_UNIQUEID 140 + + +#define IDS_ERROR_INVALID_ARGS 211 +#define IDS_ERROR_INVALID_DISK 212 Modified: trunk/reactos/base/system/diskpart/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/selec… ============================================================================== --- trunk/reactos/base/system/diskpart/select.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/select.c [iso-8859-1] Sun Jul 19 17:33:29 2015 @@ -2,14 +2,140 @@ * PROJECT: ReactOS DiskPart * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/select.c - * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ #include "diskpart.h" -BOOL select_main(INT argc, LPWSTR *argv) +#define NDEBUG +#include <debug.h> + + +ULONG CurrentDisk = (ULONG)-1; +ULONG CurrentPartition = (ULONG)-1; + + +static +VOID +SelectDisk( + INT argc, + LPWSTR *argv) { + SYSTEM_DEVICE_INFORMATION Sdi; + ULONG ReturnSize; + NTSTATUS Status; + LONG value; + LPWSTR endptr = NULL; + + DPRINT("Select Disk()\n"); + + if (argc > 3) + { + PrintResourceString(IDS_ERROR_INVALID_ARGS); + return; + } + + if (argc == 2) + { + if (CurrentDisk == (ULONG)-1) + PrintResourceString(IDS_SELECT_NO_DISK); + else + PrintResourceString(IDS_SELECT_DISK, CurrentDisk); + return; + } + + value = wcstol(argv[2], &endptr, 10); + if (((value == 0) && (endptr == argv[2])) || + (value < 0)) + { + PrintResourceString(IDS_ERROR_INVALID_ARGS); + return; + } + + Status = NtQuerySystemInformation(SystemDeviceInformation, + &Sdi, + sizeof(SYSTEM_DEVICE_INFORMATION), + &ReturnSize); + if (!NT_SUCCESS(Status)) + { + return; + } + + if ((ULONG)value >= Sdi.NumberOfDisks) + { + PrintResourceString(IDS_ERROR_INVALID_DISK); + return; + } + + CurrentDisk = (ULONG)value; + CurrentPartition = (ULONG)-1; + + PrintResourceString(IDS_SELECT_DISK, CurrentDisk); +} + + +static +VOID +SelectPartition( + INT argc, + LPWSTR *argv) +{ + LONG value; + LPWSTR endptr = NULL; + + DPRINT("Select Partition()\n"); + + if (argc > 3) + { + PrintResourceString(IDS_ERROR_INVALID_ARGS); + return; + } + + if (argc == 2) + { + if (CurrentPartition == (ULONG)-1) + PrintResourceString(IDS_SELECT_NO_PARTITION); + else + PrintResourceString(IDS_SELECT_PARTITION, CurrentPartition); + return; + } + + value = wcstol(argv[2], &endptr, 10); + if (((value == 0) && (endptr == argv[2])) || + (value < 0)) + { + PrintResourceString(IDS_ERROR_INVALID_ARGS); + return; + } + + /* FIXME: Check the new partition number */ + + CurrentPartition = (ULONG)value; + + PrintResourceString(IDS_SELECT_PARTITION, CurrentPartition); +} + + +BOOL +select_main( + INT argc, + LPWSTR *argv) +{ + /* gets the first word from the string */ + if (argc == 1) + { + PrintResourceString(IDS_HELP_CMD_SELECT); + return TRUE; + } + + /* determines which to list (disk, partition, etc.) */ + if (!wcsicmp(argv[1], L"disk")) + SelectDisk(argc, argv); + else if (!wcsicmp(argv[1], L"partition")) + SelectPartition(argc, argv); + else + PrintResourceString(IDS_HELP_CMD_SELECT); + return TRUE; }

1 0

[tfaber] 68441: [OLE32_WINETEST] - Skip ole32:dragdrop test_DoDragDrop if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-182 ONLINE-441 ROST...
by tfaber＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: tfaber Date: Sun Jul 19 17:16:38 2015 New Revision: 68441 URL: http://svn.reactos.org/svn/reactos?rev=68441&view=rev Log: [OLE32_WINETEST] - Skip ole32:dragdrop test_DoDragDrop if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-182 ONLINE-441 ROSTESTS-181 Modified: trunk/rostests/winetests/ole32/dragdrop.c Modified: trunk/rostests/winetests/ole32/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ole32/dragdrop.… ============================================================================== --- trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ole32/dragdrop.c [iso-8859-1] Sun Jul 19 17:16:38 2015 @@ -574,5 +574,13 @@ register_dummy_class(); test_Register_Revoke(); +#ifdef __REACTOS__ + if (!winetest_interactive && + !strcmp(winetest_platform, "windows")) + { + skip("ROSTESTS-182: Skipping ole32_winetest:dragdrop test_DoDragDrop because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif test_DoDragDrop(); }

1 0

[akhaldi] 68440: [IMAADP32.ACM] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 13:33:54 2015 New Revision: 68440 URL: http://svn.reactos.org/svn/reactos?rev=68440&view=rev Log: [IMAADP32.ACM] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c [iso-8859-1] Sun Jul 19 13:33:54 2015 @@ -509,8 +509,8 @@ { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0x1; - add->wPid = 0x22; + add->wMid = MM_MICROSOFT; + add->wPid = MM_MSFT_ACM_IMAADPCM; add->vdwACM = 0x3320000; add->vdwDriver = 0x04000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 19 13:33:54 2015 @@ -78,7 +78,7 @@ reactos/dll/win32/iccvid # Synced to WineStaging-1.7.37 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.47 -reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.37 +reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.37 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.47

1 0

[akhaldi] 68439: [PSDK] Update mm{reg, system}.h. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 13:33:09 2015 New Revision: 68439 URL: http://svn.reactos.org/svn/reactos?rev=68439&view=rev Log: [PSDK] Update mm{reg,system}.h. CORE-9924 Modified: trunk/reactos/include/psdk/mmreg.h trunk/reactos/include/psdk/mmsystem.h Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Sun Jul 19 13:33:09 2015 @@ -137,6 +137,18 @@ #define MM_UNMAPPED 0xffff #define MM_PID_UNMAPPED MM_UNMAPPED +#ifndef MM_MICROSOFT +#define MM_MICROSOFT 0x01 +#endif +#define MM_MSFT_ACM_MSADPCM 0x21 +#define MM_MSFT_ACM_IMAADPCM 0x22 +#define MM_MSFT_ACM_GSM610 0x24 +#define MM_MSFT_ACM_G711 0x25 +#define MM_MSFT_ACM_PCM 0x26 + +#define MM_FRAUNHOFER_IIS 0xAC +#define MM_FHGIIS_MPEGLAYER3_DECODE 0x09 + #if !defined(WAVE_FORMAT_EXTENSIBLE) #define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ #endif Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Sun Jul 19 13:33:09 2015 @@ -38,7 +38,10 @@ #define mmioFOURCC(c0,c1,c2,c3) MAKEFOURCC(c0,c1,c2,c3) #endif +#ifndef MM_MICROSOFT #define MM_MICROSOFT 1 /* Microsoft Corp. */ +#endif + #define MM_CREATIVE 2 /* Creative labs */ #define MM_JOY1MOVE 0x3A0

1 0

[akhaldi] 68438: [GDIPLUS_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 13:31:38 2015 New Revision: 68438 URL: http://svn.reactos.org/svn/reactos?rev=68438&view=rev Log: [GDIPLUS_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924 Modified: trunk/rostests/winetests/gdiplus/graphics.c trunk/rostests/winetests/gdiplus/image.c trunk/rostests/winetests/gdiplus/metafile.c trunk/rostests/winetests/gdiplus/region.c Modified: trunk/rostests/winetests/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/graphic… ============================================================================== --- trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/graphics.c [iso-8859-1] Sun Jul 19 13:31:38 2015 @@ -2405,6 +2405,27 @@ /* We get the same kind of write-only HDC for a "normal" bitmap */ status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, NULL, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + color = GetPixel(hdc, 0, 0); + todo_wine expect(0x0c0b0d, color); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + GdipDisposeImage((GpImage*)bitmap); + + /* If we don't draw to the HDC, the bits are never accessed */ + status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, (BYTE*)1, &bitmap); expect(Ok, status); status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); @@ -3680,6 +3701,62 @@ GdipDeleteFont(font); } + /* Font with units = UnitWorld */ + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + GpPointF pt = {0.0, 100.0}; + GpImage* image; + REAL expected_width, expected_height; + + graphics = create_graphics(td[i].res_x, td[i].res_y, td[i].unit, td[i].page_scale, &image); + + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &pt, 1); + expect(Ok, status); + + status = GdipCreateFont(family, pt.Y, FontStyleRegular, UnitWorld, &font); + expect(Ok, status); + + status = GdipGetFontUnit(font, &font_unit); + expect(Ok, status); + expect(UnitWorld, font_unit); + + lf.lfHeight = 0xdeadbeef; + status = GdipGetLogFontW(font, graphics, &lf); + expect(Ok, status); + ok(lf.lfHeight == -100, "%u: expected -100, got %d\n", i, lf.lfHeight); + + set_rect_empty(&rc); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rc, format, &bounds, &chars, &lines); + expect(Ok, status); + + if (i == 0) + { + base_cx = bounds.Width; + base_cy = bounds.Height; + } + + pt.X = 1.0; + pt.Y = 1.0; + + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &pt, 1); + expect(Ok, status); + + /* height is constant in device space, width is proportional to height in world space */ + expected_width = base_cx * pt.Y; + expected_height = base_cy * pt.Y; + + if (td[i].unit == UnitDisplay || td[i].unit == UnitPixel) + ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); + else + todo_wine ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); + ok(fabs(expected_height - bounds.Height) <= 0.001, "%u: expected %f, got %f\n", i, expected_height, bounds.Height); + + GdipDeleteGraphics(graphics); + GdipDisposeImage(image); + GdipDeleteFont(font); + } + GdipDeleteFontFamily(family); GdipDeleteStringFormat(format); } @@ -3742,6 +3819,128 @@ } } +static void test_pen_thickness(void) +{ + static const struct test_data + { + REAL res_x, res_y, scale; + GpUnit pen_unit, page_unit; + REAL pen_width; + INT cx, cy; + } td[] = + { + { 10.0, 10.0, 1.0, UnitPixel, UnitPixel, 1.0, 1, 1 }, + { 10.0, 10.0, 3.0, UnitPixel, UnitPixel, 2.0, 2, 2 }, + { 10.0, 10.0, 30.0, UnitPixel, UnitInch, 1.0, 1, 1 }, + { 10.0, 10.0, 1.0, UnitWorld, UnitPixel, 1.0, 1, 1 }, + { 10.0, 10.0, 3.0, UnitWorld, UnitPixel, 2.0, 6, 6 }, + { 10.0, 10.0, 2.0, UnitWorld, UnitInch, 1.0, 20, 20 }, + }; + GpStatus status; + int i, j; + GpGraphics *graphics; + union + { + GpBitmap *bitmap; + GpImage *image; + } u; + GpPen *pen; + GpPointF corner; + BitmapData bd; + INT min, max, size; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + status = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat24bppRGB, NULL, &u.bitmap); + expect(Ok, status); + + status = GdipBitmapSetResolution(u.bitmap, td[i].res_x, td[i].res_y); + expect(Ok, status); + + status = GdipGetImageGraphicsContext(u.image, &graphics); + expect(Ok, status); + + status = GdipSetPageUnit(graphics, td[i].page_unit); + expect(Ok, status); + + status = GdipSetPageScale(graphics, td[i].scale); + expect(Ok, status); + + status = GdipCreatePen1(0xffffffff, td[i].pen_width, td[i].pen_unit, &pen); + expect(Ok, status); + + corner.X = corner.Y = 100.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &corner, 1); + expect(Ok, status); + + status = GdipDrawLine(graphics, pen, corner.X/2, 0, corner.X/2, corner.Y); + expect(Ok, status); + + status = GdipDrawLine(graphics, pen, 0, corner.Y/2, corner.X, corner.Y/2); + expect(Ok, status); + + status = GdipBitmapLockBits(u.bitmap, NULL, ImageLockModeRead, PixelFormat24bppRGB, &bd); + expect(Ok, status); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[j*3] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].cx, "%u: expected %d, got %d\n", i, td[i].cx, size); + + min = -1; + max = -2; + + for (j=0; j<100; j++) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + min = j; + break; + } + } + + for (j=99; j>=0; j--) + { + if (((BYTE*)bd.Scan0)[bd.Stride*j] == 0xff) + { + max = j; + break; + } + } + + size = max-min+1; + + ok(size == td[i].cy, "%u: expected %d, got %d\n", i, td[i].cy, size); + + status = GdipBitmapUnlockBits(u.bitmap, &bd); + expect(Ok, status); + + GdipDeletePen(pen); + GdipDeleteGraphics(graphics); + GdipDisposeImage(u.image); + } +} + /* Many people on the net ask why there is so much difference in rendered * text height between gdiplus and gdi32, this test suggests an answer to * that question. Important: this test assumes that font dpi == device dpi. @@ -4430,12 +4629,13 @@ static void test_alpha_hdc(void) { GpStatus status; - HDC hdc; + HDC hdc, gp_hdc; HBITMAP hbm, old_hbm; GpGraphics *graphics; ULONG *bits; BITMAPINFO bmi; GpRectF bounds; + COLORREF colorref; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4468,6 +4668,21 @@ expect(Ok, status); expect(0xffaaaaaa, bits[0]); + + bits[0] = 0xdeadbeef; + + status = GdipGetDC(graphics, &gp_hdc); + expect(Ok, status); + + colorref = GetPixel(gp_hdc, 0, 4); + expect(0xefbead, colorref); + + SetPixel(gp_hdc, 0, 4, 0xffffff); + + expect(0xffffff, bits[0]); + + status = GdipReleaseDC(graphics, gp_hdc); + expect(Ok, status); SelectObject(hdc, old_hbm); @@ -5641,6 +5856,7 @@ test_measure_string(); test_font_height_scaling(); test_transform(); + test_pen_thickness(); test_GdipMeasureString(); test_constructor_destructor(); test_save_restore(); Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Sun Jul 19 13:31:38 2015 @@ -1341,6 +1341,12 @@ 0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, 0x01,0x00,0x3b +}; +/* 1x1 pixel transparent gif */ +static const unsigned char transparentgif[] = { +0x47,0x49,0x46,0x38,0x39,0x61,0x01,0x00,0x01,0x00,0xf0,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x21,0xf9,0x04,0x01,0x00,0x00,0x00,0x00,0x2c,0x00,0x00,0x00,0x00, +0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44,0x01,0x00,0x3b }; /* 1x1 pixel bmp */ static const unsigned char bmpimage[66] = { @@ -2430,6 +2436,51 @@ 0x00,0x00,0x02,0x02,0x44,0x01,0x00,0x3b }; +/* Generated with ImageMagick: + * convert -transparent black -delay 100 -size 8x2 xc:black \ + * -dispose none -page +0+0 -size 2x2 xc:red \ + * -dispose background -page +2+0 -size 2x2 xc:blue \ + * -dispose previous -page +4+0 -size 2x2 xc:green \ + * -dispose undefined -page +6+0 -size 2x2 xc:gray \ + * test.gif + */ +static const unsigned char gifanimation2[] = { + 0x47, 0x49, 0x46, 0x38, 0x39, 0x61, 0x08, 0x00, + 0x02, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x21, 0xf9, 0x04, 0x01, 0x64, + 0x00, 0x00, 0x00, 0x21, 0xff, 0x0b, 0x4e, 0x45, + 0x54, 0x53, 0x43, 0x41, 0x50, 0x45, 0x32, 0x2e, + 0x30, 0x03, 0x01, 0x00, 0x00, 0x00, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x00, + 0x02, 0x04, 0x84, 0x8f, 0x09, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x04, 0x64, 0x00, 0x00, 0x00, 0x2c, + 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x08, 0x64, + 0x00, 0x00, 0x00, 0x2c, 0x02, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x81, 0x00, 0x00, 0xff, + 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, + 0xff, 0x02, 0x03, 0x44, 0x34, 0x05, 0x00, 0x21, + 0xf9, 0x04, 0x0c, 0x64, 0x00, 0x00, 0x00, 0x2c, + 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, + 0x81, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, + 0x80, 0x00, 0x00, 0x80, 0x00, 0x02, 0x03, 0x44, + 0x34, 0x05, 0x00, 0x21, 0xf9, 0x04, 0x00, 0x64, + 0x00, 0x00, 0x00, 0x2c, 0x06, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0x80, 0x7e, 0x7e, 0x7e, + 0x00, 0x00, 0x00, 0x02, 0x02, 0x84, 0x51, 0x00, + 0x3b +}; + +static ARGB gifanimation2_pixels[5][4] = { + {0, 0, 0, 0}, + {0xffff0000, 0, 0, 0}, + {0xffff0000, 0xff0000ff, 0, 0}, + {0xffff0000, 0, 0xff008000, 0}, + {0xffff0000, 0, 0, 0xff7e7e7e} +}; + static void test_multiframegif(void) { LPSTREAM stream; @@ -2441,6 +2492,11 @@ ARGB color; UINT count; GUID dimension; + PixelFormat pixel_format; + INT palette_size, i, j; + char palette_buf[256]; + ColorPalette *palette; + ARGB *palette_entries; /* Test frame functions with an animated GIF */ hglob = GlobalAlloc (0, sizeof(gifanimation)); @@ -2459,6 +2515,16 @@ return; } + stat = GdipGetImagePixelFormat((GpImage*)bmp, &pixel_format); + expect(Ok, stat); + expect(PixelFormat32bppARGB, pixel_format); + + stat = GdipGetImagePaletteSize((GpImage*)bmp, &palette_size); + expect(Ok, stat); + ok(palette_size == sizeof(ColorPalette) || + broken(palette_size == sizeof(ColorPalette)+sizeof(ARGB[3])), + "palette_size = %d\n", palette_size); + /* Bitmap starts at frame 0 */ color = 0xdeadbeef; stat = GdipBitmapGetPixel(bmp, 0, 0, &color); @@ -2550,6 +2616,10 @@ return; } + stat = GdipGetImagePixelFormat((GpImage*)bmp, &pixel_format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, pixel_format); + /* Check metadata */ stat = GdipImageGetFrameDimensionsCount((GpImage*)bmp,&count); expect(Ok, stat); @@ -2566,6 +2636,98 @@ GdipDisposeImage((GpImage*)bmp); IStream_Release(stream); + + /* Test with a non-animated transparent gif */ + hglob = GlobalAlloc (0, sizeof(transparentgif)); + data = GlobalLock (hglob); + memcpy(data, transparentgif, sizeof(transparentgif)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + IStream_Release(stream); + ok(stat == Ok, "Failed to create a Bitmap\n"); + + stat = GdipGetImagePixelFormat((GpImage*)bmp, &pixel_format); + expect(Ok, stat); + expect(PixelFormat8bppIndexed, pixel_format); + + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipGetImagePaletteSize((GpImage*)bmp, &palette_size); + expect(Ok, stat); + ok(palette_size == sizeof(ColorPalette)+sizeof(ARGB), + "palette_size = %d\n", palette_size); + + memset(palette_buf, 0xfe, sizeof(palette_buf)); + palette = (ColorPalette*)palette_buf; + stat = GdipGetImagePalette((GpImage*)bmp, palette, + sizeof(ColorPalette)+sizeof(ARGB)); + palette_entries = palette->Entries; + expect(Ok, stat); + expect(PaletteFlagsHasAlpha, palette->Flags); + expect(2, palette->Count); + expect(0, palette_entries[0]); + expect(0xff000000, palette_entries[1]); + + count = 12345; + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + expect(Ok, stat); + expect(1, count); + + GdipDisposeImage((GpImage*)bmp); + + /* Test frame dispose methods */ + hglob = GlobalAlloc (0, sizeof(gifanimation2)); + data = GlobalLock (hglob); + memcpy(data, gifanimation2, sizeof(gifanimation2)); + GlobalUnlock(hglob); + + hres = CreateStreamOnHGlobal(hglob, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream\n"); + + stat = GdipCreateBitmapFromStream(stream, &bmp); + ok(stat == Ok, "Failed to create a Bitmap\n"); + IStream_Release(stream); + + stat = GdipImageGetFrameDimensionsList((GpImage*)bmp, &dimension, 1); + expect(Ok, stat); + expect_guid(&FrameDimensionTime, &dimension, __LINE__, FALSE); + + stat = GdipImageGetFrameCount((GpImage*)bmp, &dimension, &count); + expect(Ok, stat); + expect(5, count); + + stat = GdipBitmapGetPixel(bmp, 0, 0, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 3); + stat = GdipBitmapGetPixel(bmp, 2, 0, &color); + expect(Ok, stat); + ok(color==0 || broken(color==0xff0000ff), "color = %x\n", color); + if(color != 0) { + win_skip("broken animated gif support\n"); + GdipDisposeImage((GpImage*)bmp); + return; + } + + for(i=0; i<6; i++) { + stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, i%5); + expect(Ok, stat); + + for(j=0; j<4; j++) { + stat = GdipBitmapGetPixel(bmp, j*2, 0, &color); + expect(Ok, stat); + ok(gifanimation2_pixels[i%5][j] == color, "at %d,%d got %x, expected %x\n", i, j, color, gifanimation2_pixels[i%5][j]); + } + } + + GdipDisposeImage((GpImage*)bmp); } static void test_rotateflip(void) @@ -3948,8 +4110,9 @@ ok(status == OutOfMemory || broken(status == InvalidParameter) /* before win7 */, "expected OutOfMemory, got %d\n", status); else + expect(Ok, status); + if (status == Ok) { - expect(Ok, status); status = GdipGetImagePixelFormat(thumb, &format); expect(Ok, status); ok(format == PixelFormat32bppPARGB || broken(format != PixelFormat32bppPARGB) /* before win7 */, @@ -4388,6 +4551,91 @@ GdipDisposeImage((GpImage *)bitmap); } +static BOOL get_encoder_clsid(LPCWSTR mime, GUID *format, CLSID *clsid) +{ + GpStatus status; + UINT n_codecs, info_size, i; + ImageCodecInfo *info; + BOOL ret = FALSE; + + status = GdipGetImageEncodersSize(&n_codecs, &info_size); + expect(Ok, status); + + info = GdipAlloc(info_size); + + status = GdipGetImageEncoders(n_codecs, info_size, info); + expect(Ok, status); + + for (i = 0; i < n_codecs; i++) + { + if (!lstrcmpW(info[i].MimeType, mime)) + { + *format = info[i].FormatID; + *clsid = info[i].Clsid; + ret = TRUE; + break; + } + } + + GdipFree(info); + return ret; +} + +static void test_supported_encoders(void) +{ + static const WCHAR bmp_mimetype[] = {'i', 'm', 'a','g', 'e', '/', 'b', 'm', 'p', 0}; + static const WCHAR jpeg_mimetype[] = {'i','m','a','g','e','/','j','p','e','g', 0}; + static const WCHAR gif_mimetype[] = {'i','m','a','g','e','/','g','i','f', 0}; + static const WCHAR tiff_mimetype[] = {'i','m','a','g','e','/','t','i','f','f', 0}; + static const WCHAR png_mimetype[] = {'i','m','a','g','e','/','p','n','g', 0}; + static const struct test_data + { + LPCWSTR mime; + const GUID *format; + BOOL todo; + } td[] = + { + { bmp_mimetype, &ImageFormatBMP, FALSE }, + { jpeg_mimetype, &ImageFormatJPEG, FALSE }, + { gif_mimetype, &ImageFormatGIF, TRUE }, + { tiff_mimetype, &ImageFormatTIFF, FALSE }, + { png_mimetype, &ImageFormatPNG, FALSE } + }; + GUID format, clsid; + BOOL ret; + HRESULT hr; + GpStatus status; + GpBitmap *bm; + IStream *stream; + HGLOBAL hmem; + int i; + + status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bm); + ok(status == Ok, "GdipCreateBitmapFromScan0 error %d\n", status); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + ret = get_encoder_clsid(td[i].mime, &format, &clsid); + ok(ret, "%s encoder is not in the list\n", wine_dbgstr_w(td[i].mime)); + expect_guid(td[i].format, &format, __LINE__, FALSE); + + hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_NODISCARD, 16); + + hr = CreateStreamOnHGlobal(hmem, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal error %#x\n", hr); + + status = GdipSaveImageToStream((GpImage *)bm, stream, &clsid, NULL); + if (td[i].todo) + todo_wine ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + else + ok(status == Ok, "GdipSaveImageToStream error %d\n", status); + + IStream_Release(stream); + } + + GdipDisposeImage((GpImage *)bm); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -4400,6 +4648,7 @@ GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_supported_encoders(); test_CloneBitmapArea(); test_ARGB_conversion(); test_DrawImage_scale(); Modified: trunk/rostests/winetests/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/metafil… ============================================================================== --- trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/metafile.c [iso-8859-1] Sun Jul 19 13:31:38 2015 @@ -951,6 +951,84 @@ expect(Ok, stat); } +static void test_converttoemfplus(void) +{ + GpStatus (WINAPI *pGdipConvertToEmfPlus)( const GpGraphics *graphics, GpMetafile *metafile, BOOL *succ, + EmfType emfType, const WCHAR *description, GpMetafile **outmetafile); + static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; + GpStatus stat; + GpMetafile *metafile, *metafile2 = NULL, *emhmeta; + GpGraphics *graphics; + HDC hdc; + BOOL succ; + HMODULE mod = GetModuleHandleA("gdiplus.dll"); + + pGdipConvertToEmfPlus = (void*)GetProcAddress( mod, "GdipConvertToEmfPlus"); + if(!pGdipConvertToEmfPlus) + { + /* GdipConvertToEmfPlus was introduced in Windows Vista. */ + win_skip("GDIPlus version 1.1 not available\n"); + return; + } + + hdc = CreateCompatibleDC(0); + + stat = GdipRecordMetafile(hdc, MetafileTypeEmf, &frame, MetafileFrameUnitPixel, description, &metafile); + expect(Ok, stat); + + stat = GdipRecordMetafile(hdc, EmfTypeEmfPlusOnly, &frame, MetafileFrameUnitPixel, description, &emhmeta); + expect(Ok, stat); + + DeleteDC(hdc); + + if (stat != Ok) + return; + + stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); + expect(Ok, stat); + + /* Invalid Parameters */ + stat = pGdipConvertToEmfPlus(NULL, metafile, &succ, EmfTypeEmfPlusOnly, description, &metafile2); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, NULL, &succ, EmfTypeEmfPlusOnly, description, &metafile2); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, &succ, EmfTypeEmfPlusOnly, description, NULL); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeInvalid, NULL, &metafile2); + expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, MetafileTypeEmfPlusDual+1, NULL, &metafile2); + expect(InvalidParameter, stat); + + /* If we are already an Enhanced Metafile then the conversion fails. */ + stat = pGdipConvertToEmfPlus(graphics, emhmeta, NULL, EmfTypeEmfPlusOnly, NULL, &metafile2); + todo_wine expect(InvalidParameter, stat); + + stat = pGdipConvertToEmfPlus(graphics, metafile, NULL, EmfTypeEmfPlusOnly, NULL, &metafile2); + todo_wine expect(Ok, stat); + if(metafile2) + GdipDisposeImage((GpImage*)metafile2); + + succ = FALSE; + stat = pGdipConvertToEmfPlus(graphics, metafile, &succ, EmfTypeEmfPlusOnly, NULL, &metafile2); + todo_wine expect(Ok, stat); + if(metafile2) + GdipDisposeImage((GpImage*)metafile2); + + stat = GdipDeleteGraphics(graphics); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)emhmeta); + expect(Ok, stat); +} + START_TEST(metafile) { struct GdiplusStartupInput gdiplusStartupInput; @@ -975,6 +1053,7 @@ test_emfonly(); test_fillrect(); test_pagetransform(); + test_converttoemfplus(); GdiplusShutdown(gdiplusToken); } Modified: trunk/rostests/winetests/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/region.… ============================================================================== --- trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/region.c [iso-8859-1] Sun Jul 19 13:31:38 2015 @@ -118,13 +118,13 @@ /* Windows always fails to create an empty path in a region */ if (data[4] == RGNDATA_PATH) { - struct _path_header + struct path_header { DWORD size; DWORD magic; DWORD count; DWORD flags; - } *path_header = (struct _path_header *)(data + 5); + } *path_header = (struct path_header *)(data + 5); if (!path_header->count) { ok_(__FILE__, line)(status == GenericError, "expected GenericError, got %d\n", status); @@ -2202,6 +2202,68 @@ GdipDeleteMatrix(identity); } +static void test_GdipCreateRegionRgnData(void) +{ + GpGraphics *graphics = NULL; + GpRegion *region, *region2; + HDC hdc = GetDC(0); + GpStatus status; + BYTE buf[512]; + UINT needed; + BOOL ret; + + status = GdipCreateRegionRgnData(NULL, 0, NULL); + ok(status == InvalidParameter, "status %d\n", status); + + status = GdipCreateFromHDC(hdc, &graphics); + ok(status == Ok, "status %d\n", status); + + status = GdipCreateRegion(&region); + ok(status == Ok, "status %d\n", status); + + /* infinite region */ + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %d\n", status); + expect(20, needed); + + status = GdipCreateRegionRgnData(buf, needed, NULL); + ok(status == InvalidParameter, "status %d\n", status); + + status = GdipCreateRegionRgnData(buf, needed, &region2); + ok(status == Ok, "status %d\n", status); + + ret = FALSE; + status = GdipIsInfiniteRegion(region2, graphics, &ret); + ok(status == Ok, "status %d\n", status); + ok(ret, "got %d\n", ret); + GdipDeleteRegion(region2); + + /* empty region */ + status = GdipSetEmpty(region); + ok(status == Ok, "status %d\n", status); + + memset(buf, 0xee, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + ok(status == Ok, "status %d\n", status); + expect(20, needed); + + status = GdipCreateRegionRgnData(buf, needed, &region2); + ok(status == Ok, "status %d\n", status); + + ret = FALSE; + status = GdipIsEmptyRegion(region2, graphics, &ret); + ok(status == Ok, "status %d\n", status); + ok(ret, "got %d\n", ret); + GdipDeleteRegion(region2); + + GdipDeleteGraphics(graphics); + GdipDeleteRegion(region); + ReleaseDC(0, hdc); +} + START_TEST(region) { struct GdiplusStartupInput gdiplusStartupInput; @@ -2228,6 +2290,7 @@ test_isvisiblepoint(); test_isvisiblerect(); test_excludeinfinite(); + test_GdipCreateRegionRgnData(); GdiplusShutdown(gdiplusToken); }

1 0

[akhaldi] 68437: [GDIPLUS] Sync with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 13:31:15 2015 New Revision: 68437 URL: http://svn.reactos.org/svn/reactos?rev=68437&view=rev Log: [GDIPLUS] Sync with Wine Staging 1.7.47. CORE-9924 Added: trunk/reactos/dll/win32/gdiplus/gdiplus11.manifest (with props) Modified: trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.rc trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/metafile.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -450,7 +450,7 @@ matrix = graphics->worldtrans; - if (font->unit == UnitPixel) + if (font->unit == UnitPixel || font->unit == UnitWorld) { height = units_to_pixels(font->emSize, graphics->unit, graphics->yres); if (graphics->unit != UnitDisplay) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.rc [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -20,3 +20,6 @@ /* @makedep: gdiplus.manifest */ WINE_MANIFEST 24 gdiplus.manifest + +/* @makedep: gdiplus11.manifest */ +WINE_MANIFEST11 24 gdiplus11.manifest Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -610,7 +610,7 @@ 610 stdcall GdipFindFirstImageItem(ptr ptr) 611 stub GdipFindNextImageItem 612 stdcall GdipGetImageItemData(ptr ptr) -613 stub GdipCreateEffect +613 stdcall -stub GdipCreateEffect(ptr ptr) 614 stdcall GdipDeleteEffect(ptr) 615 stub GdipGetEffectParameterSize 616 stub GdipGetEffectParameters @@ -621,7 +621,7 @@ 621 stub GdipBitmapGetHistogram 622 stub GdipBitmapGetHistogramSize 623 stub GdipBitmapConvertFormat -624 stub GdipImageSetAbort +624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort 626 stub GdipDrawImageFX 627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) Added: trunk/reactos/dll/win32/gdiplus/gdiplus11.manifest URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus1… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus11.manifest (added) +++ trunk/reactos/dll/win32/gdiplus/gdiplus11.manifest [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly> Propchange: trunk/reactos/dll/win32/gdiplus/gdiplus11.manifest ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -47,8 +47,14 @@ #define MAX_DASHLEN (16) /* this is a limitation of gdi */ #define INCH_HIMETRIC (2540) -#define VERSION_MAGIC 0xdbc01001 +#define VERSION_MAGIC 0xdbc01001 +#define VERSION_MAGIC2 0xdbc01002 #define TENSION_CONST (0.3) + +#define GIF_DISPOSE_UNSPECIFIED 0 +#define GIF_DISPOSE_DO_NOT_DISPOSE 1 +#define GIF_DISPOSE_RESTORE_TO_BKGND 2 +#define GIF_DISPOSE_RESTORE_TO_PREV 3 COLORREF ARGB2COLORREF(ARGB color) DECLSPEC_HIDDEN; HBITMAP ARGB2BMP(ARGB color) DECLSPEC_HIDDEN; @@ -120,6 +126,26 @@ b = ((bg&0xff)*bg_alpha + (fg&0xff)*fg_alpha)/a; g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*fg_alpha)/a; r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*fg_alpha)/a; + + return (a<<24)|(r<<16)|(g<<8)|b; +} + +/* fg is premult, bg and return value are not */ +static inline ARGB color_over_fgpremult(ARGB bg, ARGB fg) +{ + BYTE b, g, r, a; + BYTE bg_alpha, fg_alpha; + + fg_alpha = (fg>>24)&0xff; + + if (fg_alpha == 0) return bg; + + bg_alpha = (((bg>>24)&0xff) * (0xff-fg_alpha)) / 0xff; + + a = bg_alpha + fg_alpha; + b = ((bg&0xff)*bg_alpha + (fg&0xff)*0xff)/a; + g = (((bg>>8)&0xff)*bg_alpha + ((fg>>8)&0xff)*0xff)/a; + r = (((bg>>16)&0xff)*bg_alpha + ((fg>>16)&0xff)*0xff)/a; return (a<<24)|(r<<16)|(g<<8)|b; } @@ -278,7 +304,7 @@ struct GpImage{ IPicture *picture; - IStream *stream; /* source stream */ + IWICBitmapDecoder *decoder; ImageType type; GUID format; UINT flags; Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -247,6 +247,7 @@ (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0); width *= units_to_pixels(pen->width, pen->unit == UnitWorld ? graphics->unit : pen->unit, graphics->xres); + width *= graphics->scale; } if(pen->dash == DashStyleCustom){ @@ -349,21 +350,28 @@ return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); } -/* Draw non-premultiplied ARGB data to the given graphics object */ +/* Draw ARGB data to the given graphics object */ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, - const BYTE *src, INT src_width, INT src_height, INT src_stride) + const BYTE *src, INT src_width, INT src_height, INT src_stride, const PixelFormat fmt) { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; INT x, y; - for (x=0; x<src_width; x++) - { - for (y=0; y<src_height; y++) + for (y=0; y<src_height; y++) + { + for (x=0; x<src_width; x++) { ARGB dst_color, src_color; + src_color = ((ARGB*)(src + src_stride * y))[x]; + + if (!(src_color & 0xff000000)) + continue; + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); - src_color = ((ARGB*)(src + src_stride * y))[x]; - GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); + if (fmt & PixelFormatPAlpha) + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over_fgpremult(dst_color, src_color)); + else + GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); } } @@ -371,7 +379,7 @@ } static GpStatus alpha_blend_hdc_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, - const BYTE *src, INT src_width, INT src_height, INT src_stride) + const BYTE *src, INT src_width, INT src_height, INT src_stride, PixelFormat fmt) { HDC hdc; HBITMAP hbitmap; @@ -395,7 +403,8 @@ hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE) + if (GetDeviceCaps(graphics->hdc, SHADEBLENDCAPS) == SB_NONE || + fmt & PixelFormatPAlpha) memcpy(temp_bits, src, src_width * src_height * 4); else convert_32bppARGB_to_32bppPARGB(src_width, src_height, temp_bits, @@ -411,7 +420,7 @@ } static GpStatus alpha_blend_pixels_hrgn(GpGraphics *graphics, INT dst_x, INT dst_y, - const BYTE *src, INT src_width, INT src_height, INT src_stride, HRGN hregion) + const BYTE *src, INT src_width, INT src_height, INT src_stride, HRGN hregion, PixelFormat fmt) { GpStatus stat=Ok; @@ -461,7 +470,7 @@ stat = alpha_blend_bmp_pixels(graphics, rects[i].left, rects[i].top, &src[(rects[i].left - dst_x) * 4 + (rects[i].top - dst_y) * src_stride], rects[i].right - rects[i].left, rects[i].bottom - rects[i].top, - src_stride); + src_stride, fmt); } GdipFree(rgndata); @@ -494,7 +503,7 @@ ExtSelectClipRgn(graphics->hdc, hregion, RGN_AND); stat = alpha_blend_hdc_pixels(graphics, dst_x, dst_y, src, src_width, - src_height, src_stride); + src_height, src_stride, fmt); RestoreDC(graphics->hdc, save); @@ -505,27 +514,29 @@ } static GpStatus alpha_blend_pixels(GpGraphics *graphics, INT dst_x, INT dst_y, - const BYTE *src, INT src_width, INT src_height, INT src_stride) -{ - return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL); + const BYTE *src, INT src_width, INT src_height, INT src_stride, PixelFormat fmt) +{ + return alpha_blend_pixels_hrgn(graphics, dst_x, dst_y, src, src_width, src_height, src_stride, NULL, fmt); } static ARGB blend_colors(ARGB start, ARGB end, REAL position) { - ARGB result=0; - ARGB i; - INT a1, a2, a3; - - a1 = (start >> 24) & 0xff; - a2 = (end >> 24) & 0xff; - - a3 = (int)(a1*(1.0f - position)+a2*(position)); - - result |= a3 << 24; - - for (i=0xff; i<=0xff0000; i = i << 8) - result |= (int)((start&i)*(1.0f - position)+(end&i)*(position))&i; - return result; + INT start_a, end_a, final_a; + INT pos; + + pos = gdip_round(position * 0xff); + + start_a = ((start >> 24) & 0xff) * (pos ^ 0xff); + end_a = ((end >> 24) & 0xff) * pos; + + final_a = start_a + end_a; + + if (final_a < 0xff) return 0; + + return (final_a / 0xff) << 24 | + ((((start >> 16) & 0xff) * start_a + (((end >> 16) & 0xff) * end_a)) / final_a) << 16 | + ((((start >> 8) & 0xff) * start_a + (((end >> 8) & 0xff) * end_a)) / final_a) << 8 | + (((start & 0xff) * start_a + ((end & 0xff) * end_a)) / final_a); } static ARGB blend_line_gradient(GpLineGradient* brush, REAL position) @@ -645,8 +656,9 @@ return (r == g) && (g == b); } -static void apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, - UINT width, UINT height, INT stride, ColorAdjustType type) +/* returns preferred pixel format for the applied attributes */ +static PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, + UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) { UINT x, y; INT i; @@ -657,6 +669,9 @@ const struct color_key *key; BYTE min_blue, min_green, min_red; BYTE max_blue, max_green, max_red; + + if (!data || fmt != PixelFormat32bppARGB) + return PixelFormat32bppARGB; if (attributes->colorkeys[type].enabled) key = &attributes->colorkeys[type]; @@ -690,6 +705,9 @@ attributes->colorremaptables[ColorAdjustTypeDefault].enabled) { const struct color_remap_table *table; + + if (!data || fmt != PixelFormat32bppARGB) + return PixelFormat32bppARGB; if (attributes->colorremaptables[type].enabled) table = &attributes->colorremaptables[type]; @@ -720,6 +738,9 @@ int gray_matrix[5][5]; BOOL identity; + if (!data || fmt != PixelFormat32bppARGB) + return PixelFormat32bppARGB; + if (attributes->colormatrices[type].enabled) colormatrices = &attributes->colormatrices[type]; else @@ -758,6 +779,9 @@ { REAL gamma; + if (!data || fmt != PixelFormat32bppARGB) + return PixelFormat32bppARGB; + if (attributes->gamma_enabled[type]) gamma = attributes->gamma[type]; else @@ -782,6 +806,8 @@ *src_color = (*src_color & 0xff000000) | (red << 16) | (green << 8) | blue; } } + + return fmt; } /* Given a bitmap and its source rectangle, find the smallest rectangle in the @@ -1226,7 +1252,7 @@ if (stat == Ok) apply_image_attributes(fill->imageattributes, fill->bitmap_bits, bitmap->width, bitmap->height, - src_stride, ColorAdjustTypeBitmap); + src_stride, ColorAdjustTypeBitmap, lockeddata.PixelFormat); if (stat != Ok) { @@ -2115,7 +2141,7 @@ HFONT unscaled_font; TEXTMETRICW textmet; - if (font->unit == UnitPixel) + if (font->unit == UnitPixel || font->unit == UnitWorld) font_height = font->emSize; else { @@ -2138,8 +2164,8 @@ GpMatrix xform = *matrix; GdipTransformMatrixPoints(&xform, pt, 3); } - if (graphics) - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); @@ -2979,15 +3005,18 @@ return OutOfMemory; src_stride = sizeof(ARGB) * src_area.Width; - /* Read the bits we need from the source bitmap into an ARGB buffer. */ + /* Read the bits we need from the source bitmap into a compatible buffer. */ lockeddata.Width = src_area.Width; lockeddata.Height = src_area.Height; lockeddata.Stride = src_stride; - lockeddata.PixelFormat = PixelFormat32bppARGB; lockeddata.Scan0 = src_data; + if (!do_resampling && bitmap->format == PixelFormat32bppPARGB) + lockeddata.PixelFormat = apply_image_attributes(imageAttributes, NULL, 0, 0, 0, ColorAdjustTypeBitmap, bitmap->format); + else + lockeddata.PixelFormat = PixelFormat32bppARGB; stat = GdipBitmapLockBits(bitmap, &src_area, ImageLockModeRead|ImageLockModeUserInputBuf, - PixelFormat32bppARGB, &lockeddata); + lockeddata.PixelFormat, &lockeddata); if (stat == Ok) stat = GdipBitmapUnlockBits(bitmap, &lockeddata); @@ -3000,7 +3029,7 @@ apply_image_attributes(imageAttributes, src_data, src_area.Width, src_area.Height, - src_stride, ColorAdjustTypeBitmap); + src_stride, ColorAdjustTypeBitmap, lockeddata.PixelFormat); if (do_resampling) { @@ -3048,7 +3077,8 @@ } stat = alpha_blend_pixels(graphics, dst_area.left, dst_area.top, - dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride); + dst_data, dst_area.right - dst_area.left, dst_area.bottom - dst_area.top, dst_stride, + lockeddata.PixelFormat); GdipFree(src_data); @@ -3998,7 +4028,8 @@ if (stat == Ok) stat = alpha_blend_pixels_hrgn(graphics, gp_bound_rect.X, gp_bound_rect.Y, (BYTE*)pixel_data, gp_bound_rect.Width, - gp_bound_rect.Height, gp_bound_rect.Width * 4, hregion); + gp_bound_rect.Height, gp_bound_rect.Width * 4, hregion, + PixelFormat32bppARGB); GdipFree(pixel_data); } @@ -4730,6 +4761,9 @@ scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); @@ -5705,7 +5739,7 @@ { stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); } - else if (!graphics->hdc || graphics->alpha_hdc || + else if (!graphics->hdc || (graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha)) { /* Create a fake HDC and fill it with a constant color. */ @@ -5797,7 +5831,7 @@ /* Write the changed pixels to the real target. */ alpha_blend_pixels(graphics, 0, 0, graphics->temp_bits, graphics->temp_hbitmap_width, graphics->temp_hbitmap_height, - graphics->temp_hbitmap_width * 4); + graphics->temp_hbitmap_width * 4, PixelFormat32bppARGB); /* Clean up. */ DeleteDC(graphics->temp_hdc); @@ -6352,7 +6386,7 @@ /* draw the result */ stat = alpha_blend_pixels(graphics, min_x, min_y, pixel_data, pixel_area.Width, - pixel_area.Height, pixel_data_stride); + pixel_area.Height, pixel_data_stride, PixelFormat32bppARGB); GdipFree(pixel_data); Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -23,6 +23,8 @@ #include <ole2.h> #include <olectl.h> +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); + #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) static const struct @@ -52,8 +54,7 @@ IWICPalette *wic_palette; ColorPalette *palette = NULL; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); if (hr != S_OK) return NULL; hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); @@ -69,22 +70,36 @@ } if (hr == S_OK) { + WICBitmapPaletteType type; + BOOL alpha; UINT count; - BOOL mono, gray; - - IWICPalette_IsBlackWhite(wic_palette, &mono); - IWICPalette_IsGrayscale(wic_palette, &gray); IWICPalette_GetColorCount(wic_palette, &count); palette = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(UINT) + count * sizeof(ARGB)); IWICPalette_GetColors(wic_palette, count, palette->Entries, &palette->Count); - if (mono) - palette->Flags = 0; - else if (gray) - palette->Flags = PaletteFlagsGrayScale; - else - palette->Flags = PaletteFlagsHalftone; + IWICPalette_GetType(wic_palette, &type); + switch(type) { + case WICBitmapPaletteTypeFixedGray4: + case WICBitmapPaletteTypeFixedGray16: + case WICBitmapPaletteTypeFixedGray256: + palette->Flags = PaletteFlagsGrayScale; + break; + case WICBitmapPaletteTypeFixedHalftone8: + case WICBitmapPaletteTypeFixedHalftone27: + case WICBitmapPaletteTypeFixedHalftone64: + case WICBitmapPaletteTypeFixedHalftone125: + case WICBitmapPaletteTypeFixedHalftone216: + case WICBitmapPaletteTypeFixedHalftone252: + case WICBitmapPaletteTypeFixedHalftone256: + palette->Flags = PaletteFlagsHalftone; + break; + default: + palette->Flags = 0; + } + IWICPalette_HasAlpha(wic_palette, &alpha); + if(alpha) + palette->Flags |= PaletteFlagsHasAlpha; } IWICPalette_Release(wic_palette); } @@ -119,6 +134,15 @@ return x; } + +#ifndef __REACTOS__ +GpStatus WINGDIPAPI GdipCreateEffect(const GUID guid, CGpEffect **effect) +{ + FIXME("(%s, %p): stub\n", debugstr_guid(&guid), effect); + *effect = NULL; + return NotImplemented; +} +#endif GpStatus WINGDIPAPI GdipBitmapApplyEffect(GpBitmap* bitmap, CGpEffect* effect, RECT* roi, BOOL useAuxData, VOID** auxData, INT* auxDataSize) @@ -1853,7 +1877,7 @@ (*bitmap)->height = height; (*bitmap)->format = format; (*bitmap)->image.picture = NULL; - (*bitmap)->image.stream = NULL; + (*bitmap)->image.decoder = NULL; (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; (*bitmap)->bits = bits; @@ -2070,9 +2094,9 @@ GdipFree(dst->prop_item); dst->prop_item = src->prop_item; dst->prop_count = src->prop_count; - if (dst->image.stream) - IStream_Release(dst->image.stream); - dst->image.stream = src->image.stream; + if (dst->image.decoder) + IWICBitmapDecoder_Release(dst->image.decoder); + dst->image.decoder = src->image.decoder; dst->image.frame_count = src->image.frame_count; dst->image.current_frame = src->image.current_frame; dst->image.format = src->image.format; @@ -2118,8 +2142,8 @@ } if (image->picture) IPicture_Release(image->picture); - if (image->stream) - IStream_Release(image->stream); + if (image->decoder) + IWICBitmapDecoder_Release(image->decoder); GdipFree(image->palette); return Ok; @@ -3026,8 +3050,8 @@ PROPVARIANT id, value; BOOL ret = FALSE; - IWICMetadataReader_GetMetadataFormat(reader, &format); - if (!IsEqualGUID(&format, guid)) return FALSE; + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (FAILED(hr) || !IsEqualGUID(&format, guid)) return FALSE; PropVariantInit(&id); PropVariantInit(&value); @@ -3053,8 +3077,8 @@ PROPVARIANT id, value; PropertyItem *item = NULL; - IWICMetadataReader_GetMetadataFormat(reader, &format); - if (!IsEqualGUID(&format, guid)) return NULL; + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (FAILED(hr) || !IsEqualGUID(&format, guid)) return NULL; PropVariantInit(&id); PropVariantInit(&value); @@ -3162,8 +3186,7 @@ if (!get_bool_property(reader, &GUID_MetadataFormatLSD, global_flagW)) return NULL; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); if (hr != S_OK) return NULL; hr = IWICImagingFactory_CreatePalette(factory, &palette); @@ -3221,14 +3244,13 @@ return index; } -static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) -{ - static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; +static LONG get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *format, const WCHAR *property) +{ HRESULT hr; IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT block_count, i; - PropertyItem *delay; + PropertyItem *prop; LONG value = 0; hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); @@ -3242,13 +3264,15 @@ hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); if (hr == S_OK) { - delay = get_property(reader, &GUID_MetadataFormatGCE, delayW); - if (delay) + prop = get_property(reader, format, property); + if (prop) { - if (delay->type == PropertyTagTypeShort && delay->length == 2) - value = *(SHORT *)delay->value; - - GdipFree(delay); + if (prop->type == PropertyTagTypeByte && prop->length == 1) + value = *(BYTE *)prop->value; + else if (prop->type == PropertyTagTypeShort && prop->length == 2) + value = *(SHORT *)prop->value; + + GdipFree(prop); } IWICMetadataReader_Release(reader); } @@ -3262,6 +3286,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) { + static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *block_reader; @@ -3290,7 +3315,7 @@ hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); if (hr == S_OK) { - value[i] = get_gif_frame_delay(frame); + value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, delayW); IWICBitmapFrameDecode_Release(frame); } else value[i] = 0; @@ -3384,15 +3409,174 @@ IWICBitmapFrameDecode_Release(frame); } +static PropertyItem* create_prop(PROPID propid, PROPVARIANT* value) +{ + PropertyItem *item = NULL; + UINT item_size = propvariant_size(value); + + if (item_size) + { + item_size += sizeof(*item); + item = GdipAlloc(item_size); + if (propvariant_to_item(value, item, item_size, propid) != Ok) + { + GdipFree(item); + item = NULL; + } + } + + return item; +} + +static ULONG get_ulong_by_index(IWICMetadataReader* reader, ULONG index) +{ + PROPVARIANT value; + HRESULT hr; + ULONG result=0; + + hr = IWICMetadataReader_GetValueByIndex(reader, index, NULL, NULL, &value); + if (SUCCEEDED(hr)) + { + switch (value.vt) + { + case VT_UI4: + result = value.u.ulVal; + break; + default: + ERR("unhandled case %u\n", value.vt); + break; + } + PropVariantClear(&value); + } + return result; +} + +static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) +{ + HRESULT hr; + IWICBitmapFrameDecode *frame; + IWICMetadataBlockReader *block_reader; + IWICMetadataReader *reader; + UINT block_count, i, j; + struct keyword_info { + const char* name; + PROPID propid; + BOOL seen; + } keywords[] = { + { "Title", PropertyTagImageTitle }, + { "Author", PropertyTagArtist }, + { "Description", PropertyTagImageDescription }, + { "Copyright", PropertyTagCopyright }, + { "Software", PropertyTagSoftwareUsed }, + { "Source", PropertyTagEquipModel }, + { "Comment", PropertyTagExifUserComment }, + }; + BOOL seen_gamma=FALSE; + + hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); + if (hr != S_OK) return; + + hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); + if (hr == S_OK) + { + hr = IWICMetadataBlockReader_GetCount(block_reader, &block_count); + if (hr == S_OK) + { + for (i = 0; i < block_count; i++) + { + hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); + if (hr == S_OK) + { + GUID format; + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunktEXt, &format)) + { + PROPVARIANT name, value; + PropertyItem* item; + + hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &name, &value); + + if (SUCCEEDED(hr)) + { + if (name.vt == VT_LPSTR) + { + for (j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++) + if (!strcmp(keywords[j].name, name.u.pszVal)) + break; + if (j < sizeof(keywords)/sizeof(keywords[0]) && !keywords[j].seen) + { + keywords[j].seen = TRUE; + item = create_prop(keywords[j].propid, &value); + if (item) + add_property(bitmap, item); + GdipFree(item); + } + } + + PropVariantClear(&name); + PropVariantClear(&value); + } + } + else if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunkgAMA, &format)) + { + PropertyItem* item; + + if (!seen_gamma) + { + item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 2); + if (item) + { + ULONG *rational; + item->length = sizeof(ULONG) * 2; + item->type = PropertyTagTypeRational; + item->id = PropertyTagGamma; + rational = item->value = item + 1; + rational[0] = 100000; + rational[1] = get_ulong_by_index(reader, 0); + add_property(bitmap, item); + seen_gamma = TRUE; + GdipFree(item); + } + } + } + + IWICMetadataReader_Release(reader); + } + } + } + IWICMetadataBlockReader_Release(block_reader); + } + + IWICBitmapFrameDecode_Release(frame); +} + +static GpStatus initialize_decoder_wic(IStream *stream, REFGUID container, IWICBitmapDecoder **decoder) +{ + IWICImagingFactory *factory; + HRESULT hr; + + TRACE("%p,%s\n", stream, wine_dbgstr_guid(container)); + + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) return hresult_to_status(hr); + hr = IWICImagingFactory_CreateDecoder(factory, container, NULL, decoder); + IWICImagingFactory_Release(factory); + if (FAILED(hr)) return hresult_to_status(hr); + + hr = IWICBitmapDecoder_Initialize(*decoder, stream, WICDecodeMetadataCacheOnLoad); + if (FAILED(hr)) return hresult_to_status(hr); + return Ok; +} + typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame); -static GpStatus decode_image_wic(IStream *stream, GDIPCONST CLSID *clsid, +static GpStatus decode_frame_wic(IWICBitmapDecoder *decoder, BOOL force_conversion, UINT active_frame, metadata_reader_func metadata_reader, GpImage **image) { GpStatus status=Ok; GpBitmap *bitmap; HRESULT hr; - IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICBitmapSource *source=NULL; IWICMetadataBlockReader *block_reader; @@ -3404,48 +3588,36 @@ UINT width, height, frame_count; BitmapData lockeddata; WICRect wrc; - HRESULT initresult; - - TRACE("%p,%s,%u,%p\n", stream, wine_dbgstr_guid(clsid), active_frame, image); - - initresult = CoInitialize(NULL); - - hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapDecoder, (void**)&decoder); - if (FAILED(hr)) goto end; - - hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnLoad); - if (SUCCEEDED(hr)) - { - IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); - hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); - } - + + TRACE("%p,%u,%p\n", decoder, active_frame, image); + + IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); if (SUCCEEDED(hr)) /* got frame */ { hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &wic_format); if (SUCCEEDED(hr)) { - IWICBitmapSource *bmp_source; - IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICBitmapSource, (void **)&bmp_source); - - for (i=0; pixel_formats[i].wic_format; i++) + if (!force_conversion) { - if (IsEqualGUID(&wic_format, pixel_formats[i].wic_format)) + for (i=0; pixel_formats[i].wic_format; i++) { - source = bmp_source; - gdip_format = pixel_formats[i].gdip_format; - palette_type = pixel_formats[i].palette_type; - break; + if (IsEqualGUID(&wic_format, pixel_formats[i].wic_format)) + { + source = (IWICBitmapSource*)frame; + IWICBitmapSource_AddRef(source); + gdip_format = pixel_formats[i].gdip_format; + palette_type = pixel_formats[i].palette_type; + break; + } } } if (!source) { /* unknown format; fall back on 32bppARGB */ - hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, bmp_source, &source); + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)frame, &source); gdip_format = PixelFormat32bppARGB; - IWICBitmapSource_Release(bmp_source); } TRACE("%s => %#x\n", wine_dbgstr_guid(&wic_format), gdip_format); } @@ -3520,11 +3692,6 @@ } } - IWICBitmapDecoder_Release(decoder); - -end: - if (SUCCEEDED(initresult)) CoUninitialize(); - if (FAILED(hr) && status == Ok) status = hresult_to_status(hr); if (status == Ok) @@ -3533,7 +3700,8 @@ bitmap->image.flags |= ImageFlagsReadOnly|ImageFlagsHasRealPixelSize|ImageFlagsHasRealDPI|ImageFlagsColorSpaceRGB; bitmap->image.frame_count = frame_count; bitmap->image.current_frame = active_frame; - bitmap->image.stream = stream; + bitmap->image.decoder = decoder; + IWICBitmapDecoder_AddRef(decoder); if (palette) { GdipFree(bitmap->image.palette); @@ -3544,25 +3712,214 @@ if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite)) bitmap->image.palette->Flags = 0; } - /* Pin the source stream */ - IStream_AddRef(stream); TRACE("=> %p\n", *image); } return status; } -static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) -{ - return decode_image_wic(stream, &CLSID_WICIcoDecoder, active_frame, NULL, image); -} - -static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) +static GpStatus decode_image_wic(IStream *stream, REFGUID container, + metadata_reader_func metadata_reader, GpImage **image) +{ + IWICBitmapDecoder *decoder; + GpStatus status; + + status = initialize_decoder_wic(stream, container, &decoder); + if(status != Ok) + return status; + + status = decode_frame_wic(decoder, FALSE, 0, metadata_reader, image); + IWICBitmapDecoder_Release(decoder); + return status; +} + +static GpStatus select_frame_wic(GpImage *image, UINT active_frame) +{ + GpImage *new_image; + GpStatus status; + + status = decode_frame_wic(image->decoder, FALSE, active_frame, NULL, &new_image); + if(status != Ok) + return status; + + memcpy(&new_image->format, &image->format, sizeof(GUID)); + free_image_data(image); + if (image->type == ImageTypeBitmap) + *(GpBitmap *)image = *(GpBitmap *)new_image; + else if (image->type == ImageTypeMetafile) + *(GpMetafile *)image = *(GpMetafile *)new_image; + new_image->type = ~0; + GdipFree(new_image); + return Ok; +} + +static HRESULT get_gif_frame_rect(IWICBitmapFrameDecode *frame, + UINT *left, UINT *top, UINT *width, UINT *height) +{ + static const WCHAR leftW[] = {'L','e','f','t',0}; + static const WCHAR topW[] = {'T','o','p',0}; + + *left = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, leftW); + *top = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, topW); + + return IWICBitmapFrameDecode_GetSize(frame, width, height); +} + +static HRESULT blit_gif_frame(GpBitmap *bitmap, IWICBitmapFrameDecode *frame, BOOL first_frame) +{ + UINT i, j, left, top, width, height; + IWICBitmapSource *source; + BYTE *new_bits; + HRESULT hr; + + hr = get_gif_frame_rect(frame, &left, &top, &width, &height); + if(FAILED(hr)) + return hr; + + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)frame, &source); + if(FAILED(hr)) + return hr; + + new_bits = GdipAlloc(width*height*4); + if(!new_bits) + return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(source, NULL, width*4, width*height*4, new_bits); + IWICBitmapSource_Release(source); + if(FAILED(hr)) { + GdipFree(new_bits); + return hr; + } + + for(i=0; i<height && i+top<bitmap->height; i++) { + for(j=0; j<width && j+left<bitmap->width; j++) { + DWORD *src = (DWORD*)(new_bits+i*width*4+j*4); + DWORD *dst = (DWORD*)(bitmap->bits+(i+top)*bitmap->stride+(j+left)*4); + + if(first_frame || *src>>24 != 0) + *dst = *src; + } + } + GdipFree(new_bits); + return hr; +} + +static DWORD get_gif_background_color(GpBitmap *bitmap) +{ + BYTE bgcolor_idx = 0; + UINT i; + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagIndexBackground) { + bgcolor_idx = *(BYTE*)bitmap->prop_item[i].value; + break; + } + } + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) { + BYTE transparent_idx; + transparent_idx = *(BYTE*)bitmap->prop_item[i].value; + + if(transparent_idx == bgcolor_idx) + return 0; + } + } + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagGlobalPalette) { + if(bitmap->prop_item[i].length/3 > bgcolor_idx) { + BYTE *color = ((BYTE*)bitmap->prop_item[i].value)+bgcolor_idx*3; + return color[2] + (color[1]<<8) + (color[0]<<16) + (0xff<<24); + } + break; + } + } + + FIXME("can't get gif background color\n"); + return 0xffffffff; +} + +static GpStatus select_frame_gif(GpImage* image, UINT active_frame) +{ + static const WCHAR disposalW[] = {'D','i','s','p','o','s','a','l',0}; + + GpBitmap *bitmap = (GpBitmap*)image; + IWICBitmapFrameDecode *frame; + int cur_frame=0, disposal; + BOOL bgcolor_set = FALSE; + DWORD bgcolor = 0; + HRESULT hr; + + if(active_frame > image->current_frame) { + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, image->current_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + IWICBitmapFrameDecode_Release(frame); + + if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) + cur_frame = image->current_frame; + else if(disposal != GIF_DISPOSE_RESTORE_TO_PREV) + cur_frame = image->current_frame+1; + } + + while(cur_frame != active_frame) { + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, cur_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + + if(disposal==GIF_DISPOSE_UNSPECIFIED || disposal==GIF_DISPOSE_DO_NOT_DISPOSE) { + hr = blit_gif_frame(bitmap, frame, cur_frame==0); + if(FAILED(hr)) + return hresult_to_status(hr); + }else if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) { + UINT left, top, width, height, i, j; + + if(!bgcolor_set) { + bgcolor = get_gif_background_color(bitmap); + bgcolor_set = TRUE; + } + + hr = get_gif_frame_rect(frame, &left, &top, &width, &height); + if(FAILED(hr)) + return hresult_to_status(hr); + for(i=top; i<top+height && i<bitmap->height; i++) { + DWORD *bits = (DWORD*)(bitmap->bits+i*bitmap->stride); + for(j=left; j<left+width && j<bitmap->width; j++) + bits[j] = bgcolor; + } + } + + IWICBitmapFrameDecode_Release(frame); + cur_frame++; + } + + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, active_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + + hr = blit_gif_frame(bitmap, frame, cur_frame==0); + IWICBitmapFrameDecode_Release(frame); + if(FAILED(hr)) + return hresult_to_status(hr); + + image->current_frame = active_frame; + return Ok; +} + +static GpStatus decode_image_icon(IStream* stream, GpImage **image) +{ + return decode_image_wic(stream, &GUID_ContainerFormatIco, NULL, image); +} + +static GpStatus decode_image_bmp(IStream* stream, GpImage **image) { GpStatus status; GpBitmap* bitmap; - status = decode_image_wic(stream, &CLSID_WICBmpDecoder, active_frame, NULL, image); + status = decode_image_wic(stream, &GUID_ContainerFormatBmp, NULL, image); bitmap = (GpBitmap*)*image; @@ -3575,27 +3932,49 @@ return status; } -static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) -{ - return decode_image_wic(stream, &CLSID_WICJpegDecoder, active_frame, NULL, image); -} - -static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) -{ - return decode_image_wic(stream, &CLSID_WICPngDecoder, active_frame, NULL, image); -} - -static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) -{ - return decode_image_wic(stream, &CLSID_WICGifDecoder, active_frame, gif_metadata_reader, image); -} - -static GpStatus decode_image_tiff(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) -{ - return decode_image_wic(stream, &CLSID_WICTiffDecoder, active_frame, NULL, image); -} - -static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) +static GpStatus decode_image_jpeg(IStream* stream, GpImage **image) +{ + return decode_image_wic(stream, &GUID_ContainerFormatJpeg, NULL, image); +} + +static GpStatus decode_image_png(IStream* stream, GpImage **image) +{ + return decode_image_wic(stream, &GUID_ContainerFormatPng, png_metadata_reader, image); +} + +static GpStatus decode_image_gif(IStream* stream, GpImage **image) +{ + IWICBitmapDecoder *decoder; + UINT frame_count; + GpStatus status; + HRESULT hr; + + status = initialize_decoder_wic(stream, &GUID_ContainerFormatGif, &decoder); + if(status != Ok) + return status; + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + if(FAILED(hr)) + return hresult_to_status(hr); + + status = decode_frame_wic(decoder, frame_count > 1, 0, gif_metadata_reader, image); + IWICBitmapDecoder_Release(decoder); + if(status != Ok) + return status; + + if(frame_count > 1) { + GdipFree((*image)->palette); + (*image)->palette = NULL; + } + return Ok; +} + +static GpStatus decode_image_tiff(IStream* stream, GpImage **image) +{ + return decode_image_wic(stream, &GUID_ContainerFormatTiff, NULL, image); +} + +static GpStatus decode_image_olepicture_metafile(IStream* stream, GpImage **image) { IPicture *pic; @@ -3614,7 +3993,7 @@ *image = GdipAlloc(sizeof(GpMetafile)); if(!*image) return OutOfMemory; (*image)->type = ImageTypeMetafile; - (*image)->stream = NULL; + (*image)->decoder = NULL; (*image)->picture = pic; (*image)->flags = ImageFlagsNone; (*image)->frame_count = 1; @@ -3629,12 +4008,15 @@ typedef GpStatus (*encode_image_func)(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params); -typedef GpStatus (*decode_image_func)(IStream *stream, REFCLSID clsid, UINT active_frame, GpImage **image); +typedef GpStatus (*decode_image_func)(IStream *stream, GpImage **image); + +typedef GpStatus (*select_image_func)(GpImage *image, UINT active_frame); typedef struct image_codec { ImageCodecInfo info; encode_image_func encode_func; decode_image_func decode_func; + select_image_func select_func; } image_codec; typedef enum { @@ -3699,14 +4081,28 @@ return GenericError; } +static GpStatus get_decoder_info_from_image(GpImage *image, const struct image_codec **result) +{ + int i; + + for (i = 0; i < NUM_CODECS; i++) { + if ((codecs[i].info.Flags & ImageCodecFlagsDecoder) && + IsEqualIID(&codecs[i].info.FormatID, &image->format)) + { + *result = &codecs[i]; + return Ok; + } + } + + TRACE("no match for format: %s\n", wine_dbgstr_guid(&image->format)); + return GenericError; +} + GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage *image, GDIPCONST GUID *dimensionID, UINT frame) { GpStatus stat; - LARGE_INTEGER seek; - HRESULT hr; const struct image_codec *codec = NULL; - GpImage *new_image; TRACE("(%p,%s,%u)\n", image, debugstr_guid(dimensionID), frame); @@ -3728,43 +4124,21 @@ if (image->current_frame == frame) return Ok; - if (!image->stream) - { - TRACE("image doesn't have an associated stream\n"); + if (!image->decoder) + { + TRACE("image doesn't have an associated decoder\n"); return Ok; } /* choose an appropriate image decoder */ - stat = get_decoder_info(image->stream, &codec); + stat = get_decoder_info_from_image(image, &codec); if (stat != Ok) { WARN("can't find decoder info\n"); return stat; } - /* seek to the start of the stream */ - seek.QuadPart = 0; - hr = IStream_Seek(image->stream, seek, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - return hresult_to_status(hr); - - /* call on the image decoder to do the real work */ - stat = codec->decode_func(image->stream, &codec->info.Clsid, frame, &new_image); - - if (stat == Ok) - { - memcpy(&new_image->format, &codec->info.FormatID, sizeof(GUID)); - free_image_data(image); - if (image->type == ImageTypeBitmap) - *(GpBitmap *)image = *(GpBitmap *)new_image; - else if (image->type == ImageTypeMetafile) - *(GpMetafile *)image = *(GpMetafile *)new_image; - new_image->type = ~0; - GdipFree(new_image); - return Ok; - } - - return stat; + return codec->select_func(image, frame); } GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) @@ -3784,7 +4158,7 @@ if (FAILED(hr)) return hresult_to_status(hr); /* call on the image decoder to do the real work */ - stat = codec->decode_func(stream, &codec->info.Clsid, 0, image); + stat = codec->decode_func(stream, image); /* take note of the original data format */ if (stat == Ok) @@ -3860,11 +4234,12 @@ * These functions encode an image in different image file formats. */ -static GpStatus encode_image_WIC(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +static GpStatus encode_image_wic(GpImage *image, IStream* stream, + REFGUID container, GDIPCONST EncoderParameters* params) { GpStatus stat; GpBitmap *bitmap; + IWICImagingFactory *factory; IWICBitmapEncoder *encoder; IWICBitmapFrameEncode *frameencode; IPropertyBag2 *encoderoptions; @@ -3875,7 +4250,6 @@ WICPixelFormatGUID wicformat; GpRect rc; BitmapData lockeddata; - HRESULT initresult; UINT i; if (image->type != ImageTypeBitmap) @@ -3891,15 +4265,13 @@ rc.Width = width; rc.Height = height; - initresult = CoInitialize(NULL); - - hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapEncoder, (void**)&encoder); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); if (FAILED(hr)) - { - if (SUCCEEDED(initresult)) CoUninitialize(); return hresult_to_status(hr); - } + hr = IWICImagingFactory_CreateEncoder(factory, container, NULL, &encoder); + IWICImagingFactory_Release(factory); + if (FAILED(hr)) + return hresult_to_status(hr); hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); @@ -3994,34 +4366,37 @@ hr = IWICBitmapEncoder_Commit(encoder); IWICBitmapEncoder_Release(encoder); - - if (SUCCEEDED(initresult)) CoUninitialize(); - return hresult_to_status(hr); } static GpStatus encode_image_BMP(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICBmpEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatBmp, params); } static GpStatus encode_image_tiff(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICTiffEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatTiff, params); } static GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICPngEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatPng, params); } static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICJpegEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params); +} + +static GpStatus encode_image_gif(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_wic(image, stream, &CLSID_WICGifEncoder, params); } /***************************************************************************** @@ -4202,7 +4577,8 @@ /* SigMask */ bmp_sig_mask, }, encode_image_BMP, - decode_image_bmp + decode_image_bmp, + select_frame_wic }, { { /* JPEG */ @@ -4221,7 +4597,8 @@ /* SigMask */ jpeg_sig_mask, }, encode_image_jpeg, - decode_image_jpeg + decode_image_jpeg, + select_frame_wic }, { { /* GIF */ @@ -4232,15 +4609,16 @@ /* FormatDescription */ gif_format, /* FilenameExtension */ gif_extension, /* MimeType */ gif_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsEncoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 2, /* SigSize */ 6, /* SigPattern */ gif_sig_pattern, /* SigMask */ gif_sig_mask, }, - NULL, - decode_image_gif + encode_image_gif, + decode_image_gif, + select_frame_gif }, { { /* TIFF */ @@ -4259,7 +4637,8 @@ /* SigMask */ tiff_sig_mask, }, encode_image_tiff, - decode_image_tiff + decode_image_tiff, + select_frame_wic }, { { /* EMF */ @@ -4278,7 +4657,8 @@ /* SigMask */ emf_sig_mask, }, NULL, - decode_image_olepicture_metafile + decode_image_olepicture_metafile, + NULL }, { { /* WMF */ @@ -4297,7 +4677,8 @@ /* SigMask */ wmf_sig_mask, }, NULL, - decode_image_olepicture_metafile + decode_image_olepicture_metafile, + NULL }, { { /* PNG */ @@ -4316,7 +4697,8 @@ /* SigMask */ png_sig_mask, }, encode_image_png, - decode_image_png + decode_image_png, + select_frame_wic }, { { /* ICO */ @@ -4335,7 +4717,8 @@ /* SigMask */ ico_sig_mask, }, NULL, - decode_image_icon + decode_image_icon, + select_frame_wic }, }; @@ -4850,3 +5233,12 @@ return stat; } + +/***************************************************************************** + * GdipImageSetAbort [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) +{ + FIXME("(%p, %p): stub\n", image, pabort); + return NotImplemented; +} Modified: trunk/reactos/dll/win32/gdiplus/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/metafile… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/metafile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/metafile.c [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -1105,10 +1105,11 @@ TRACE("(%p,%p,%p,%u,%s,%p)\n", ref, metafile, succ, emfType, debugstr_w(description), out_metafile); - if(!ref || !metafile || !out_metafile) - return InvalidParameter; - - *succ = FALSE; + if(!ref || !metafile || !out_metafile || emfType < EmfTypeEmfOnly || emfType > EmfTypeEmfPlusDual) + return InvalidParameter; + + if(succ) + *succ = FALSE; *out_metafile = NULL; if(!(calls++)) Modified: trunk/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/region.c… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/region.c [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -532,224 +532,6 @@ return GdipCreateRegionRect(&rectf, region); } - -static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) -{ - mbuf->buffer = buffer; - mbuf->size = size; - mbuf->pos = 0; -} - -static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) -{ - if (mbuf->size - mbuf->pos >= size) - { - const void *data = mbuf->buffer + mbuf->pos; - mbuf->pos += size; - return data; - } - return NULL; -} - -static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, region_element *node, INT *count) -{ - GpStatus status; - const DWORD *type; - - type = buffer_read(mbuf, sizeof(DWORD)); - if (!type) return Ok; - - TRACE("type %#x\n", *type); - - node->type = *type; - - switch (node->type) - { - case CombineModeReplace: - case CombineModeIntersect: - case CombineModeUnion: - case CombineModeXor: - case CombineModeExclude: - case CombineModeComplement: - { - region_element *left, *right; - - left = GdipAlloc(sizeof(region_element)); - if (!left) return OutOfMemory; - right = GdipAlloc(sizeof(region_element)); - if (!right) - { - GdipFree(left); - return OutOfMemory; - } - - status = read_element(mbuf, region, left, count); - if (status == Ok) - { - status = read_element(mbuf, region, right, count); - if (status == Ok) - { - node->elementdata.combine.left = left; - node->elementdata.combine.right = right; - region->num_children += 2; - return Ok; - } - } - - GdipFree(left); - GdipFree(right); - return status; - } - - case RegionDataRect: - { - const GpRectF *rc; - - rc = buffer_read(mbuf, sizeof(GpRectF)); - if (!rc) - { - ERR("failed to read rect data\n"); - return InvalidParameter; - } - - node->elementdata.rect = *rc; - *count += 1; - return Ok; - } - - case RegionDataPath: - { - GpPath *path; - const struct path_header *path_header; - const BYTE *types; - - path_header = buffer_read(mbuf, sizeof(struct path_header)); - if (!path_header) - { - ERR("failed to read path header\n"); - return InvalidParameter; - } - if (path_header->magic != VERSION_MAGIC) - { - ERR("invalid path header magic %#x\n", path_header->magic); - return InvalidParameter; - } - - /* Windows always fails to create an empty path in a region */ - if (!path_header->count) - { - TRACE("refusing to create an empty path in a region\n"); - return GenericError; - } - - status = GdipCreatePath(FillModeAlternate, &path); - if (status) return status; - - node->elementdata.path = path; - - if (!lengthen_path(path, path_header->count)) - return OutOfMemory; - - path->pathdata.Count = path_header->count; - - if (path_header->flags & ~FLAGS_INTPATH) - FIXME("unhandled path flags %#x\n", path_header->flags); - - if (path_header->flags & FLAGS_INTPATH) - { - const packed_point *pt; - DWORD i; - - pt = buffer_read(mbuf, sizeof(packed_point) * path_header->count); - if (!pt) - { - ERR("failed to read packed %u path points\n", path_header->count); - return InvalidParameter; - } - - for (i = 0; i < path_header->count; i++) - { - path->pathdata.Points[i].X = (REAL)pt[i].X; - path->pathdata.Points[i].Y = (REAL)pt[i].Y; - } - } - else - { - const GpPointF *ptf; - - ptf = buffer_read(mbuf, sizeof(GpPointF) * path_header->count); - if (!ptf) - { - ERR("failed to read %u path points\n", path_header->count); - return InvalidParameter; - } - memcpy(path->pathdata.Points, ptf, sizeof(GpPointF) * path_header->count); - } - - types = buffer_read(mbuf, path_header->count); - if (!types) - { - ERR("failed to read %u path types\n", path_header->count); - return InvalidParameter; - } - memcpy(path->pathdata.Types, types, path_header->count); - if (path_header->count & 3) - { - if (!buffer_read(mbuf, 4 - (path_header->count & 3))) - { - ERR("failed to read rounding %u bytes\n", 4 - (path_header->count & 3)); - return InvalidParameter; - } - } - - *count += 1; - return Ok; - } - - case RegionDataEmptyRect: - case RegionDataInfiniteRect: - *count += 1; - return Ok; - - default: - FIXME("element type %#x is not supported\n", *type); - break; - } - - return InvalidParameter; -} - -GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) -{ - GpStatus status; - struct memory_buffer mbuf; - const struct region_header *region_header; - INT count; - - if (!data || !size) return InvalidParameter; - - TRACE("%p, %d, %p\n", data, size, region); - - init_memory_buffer(&mbuf, data, size); - - region_header = buffer_read(&mbuf, sizeof(struct region_header)); - if (!region_header || region_header->magic != VERSION_MAGIC) - return InvalidParameter; - - status = GdipCreateRegion(region); - if (status != Ok) return status; - - count = 0; - status = read_element(&mbuf, *region, &(*region)->node, &count); - if (status == Ok && !count) - status = InvalidParameter; - - if (status != Ok) - GdipDeleteRegion(*region); - - return status; -} - /****************************************************************************** * GdipCreateRegionHrgn [GDIPLUS.@] @@ -1071,6 +853,232 @@ return Ok; } +static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) +{ + mbuf->buffer = buffer; + mbuf->size = size; + mbuf->pos = 0; +} + +static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) +{ + if (mbuf->size - mbuf->pos >= size) + { + const void *data = mbuf->buffer + mbuf->pos; + mbuf->pos += size; + return data; + } + return NULL; +} + +static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, region_element *node, INT *count) +{ + GpStatus status; + const DWORD *type; + + type = buffer_read(mbuf, sizeof(*type)); + if (!type) return Ok; + + TRACE("type %#x\n", *type); + + node->type = *type; + + switch (node->type) + { + case CombineModeReplace: + case CombineModeIntersect: + case CombineModeUnion: + case CombineModeXor: + case CombineModeExclude: + case CombineModeComplement: + { + region_element *left, *right; + + left = GdipAlloc(sizeof(region_element)); + if (!left) return OutOfMemory; + right = GdipAlloc(sizeof(region_element)); + if (!right) + { + GdipFree(left); + return OutOfMemory; + } + + status = read_element(mbuf, region, left, count); + if (status == Ok) + { + status = read_element(mbuf, region, right, count); + if (status == Ok) + { + node->elementdata.combine.left = left; + node->elementdata.combine.right = right; + region->num_children += 2; + return Ok; + } + } + + GdipFree(left); + GdipFree(right); + return status; + } + + case RegionDataRect: + { + const GpRectF *rc; + + rc = buffer_read(mbuf, sizeof(*rc)); + if (!rc) + { + ERR("failed to read rect data\n"); + return InvalidParameter; + } + + node->elementdata.rect = *rc; + *count += 1; + return Ok; + } + + case RegionDataPath: + { + GpPath *path; + const struct path_header *path_header; + const BYTE *types; + + path_header = buffer_read(mbuf, sizeof(*path_header)); + if (!path_header) + { + ERR("failed to read path header\n"); + return InvalidParameter; + } + if (path_header->magic != VERSION_MAGIC) + { + ERR("invalid path header magic %#x\n", path_header->magic); + return InvalidParameter; + } + + /* Windows always fails to create an empty path in a region */ + if (!path_header->count) + { + TRACE("refusing to create an empty path in a region\n"); + return GenericError; + } + + status = GdipCreatePath(FillModeAlternate, &path); + if (status) return status; + + node->elementdata.path = path; + + if (!lengthen_path(path, path_header->count)) + return OutOfMemory; + + path->pathdata.Count = path_header->count; + + if (path_header->flags & ~FLAGS_INTPATH) + FIXME("unhandled path flags %#x\n", path_header->flags); + + if (path_header->flags & FLAGS_INTPATH) + { + const packed_point *pt; + DWORD i; + + pt = buffer_read(mbuf, sizeof(*pt) * path_header->count); + if (!pt) + { + ERR("failed to read packed %u path points\n", path_header->count); + return InvalidParameter; + } + + for (i = 0; i < path_header->count; i++) + { + path->pathdata.Points[i].X = (REAL)pt[i].X; + path->pathdata.Points[i].Y = (REAL)pt[i].Y; + } + } + else + { + const GpPointF *ptf; + + ptf = buffer_read(mbuf, sizeof(*ptf) * path_header->count); + if (!ptf) + { + ERR("failed to read %u path points\n", path_header->count); + return InvalidParameter; + } + memcpy(path->pathdata.Points, ptf, sizeof(*ptf) * path_header->count); + } + + types = buffer_read(mbuf, path_header->count); + if (!types) + { + ERR("failed to read %u path types\n", path_header->count); + return InvalidParameter; + } + memcpy(path->pathdata.Types, types, path_header->count); + if (path_header->count & 3) + { + if (!buffer_read(mbuf, 4 - (path_header->count & 3))) + { + ERR("failed to read rounding %u bytes\n", 4 - (path_header->count & 3)); + return InvalidParameter; + } + } + + *count += 1; + return Ok; + } + + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + *count += 1; + return Ok; + + default: + FIXME("element type %#x is not supported\n", *type); + break; + } + + return InvalidParameter; +} + +/***************************************************************************** + * GdipCreateRegionRgnData [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRegion **region) +{ + const struct region_header *region_header; + struct memory_buffer mbuf; + GpStatus status; + INT count; + + TRACE("(%p, %d, %p)\n", data, size, region); + + if (!data || !size) + return InvalidParameter; + + init_memory_buffer(&mbuf, data, size); + + region_header = buffer_read(&mbuf, sizeof(*region_header)); + if (!region_header || (region_header->magic != VERSION_MAGIC && + region_header->magic != VERSION_MAGIC2)) + return InvalidParameter; + + status = GdipCreateRegion(region); + if (status != Ok) + return status; + + count = 0; + status = read_element(&mbuf, *region, &(*region)->node, &count); + if (status == Ok && !count) + status = InvalidParameter; + + if (status != Ok) + { + GdipDeleteRegion(*region); + *region = NULL; + } + + return status; +} + /***************************************************************************** * GdipGetRegionDataSize [GDIPLUS.@] */ @@ -1098,16 +1106,12 @@ { new_hdc = CreateCompatibleDC(0); if (!new_hdc) - { - ERR("CreateCompatibleDC failed\n"); return OutOfMemory; - } stat = GdipCreateFromHDC(new_hdc, &new_graphics); graphics = new_graphics; if (stat != Ok) { - ERR("GdipCreateFromHDC failed: 0x%x\n", stat); DeleteDC(new_hdc); return stat; } @@ -1116,10 +1120,7 @@ { graphics->hdc = new_hdc = CreateCompatibleDC(0); if (!new_hdc) - { - ERR("CreateCompatibleDC failed\n"); return OutOfMemory; - } } save_state = SaveDC(graphics->hdc); @@ -1132,15 +1133,7 @@ if (stat == Ok) { *hrgn = PathToRegion(graphics->hdc); - if (*hrgn == NULL) - { - ERR("PathToRegion failed\n"); - } stat = *hrgn ? Ok : OutOfMemory; - } - else - { - ERR("trace_path failed: 0x%x\n", stat); } RestoreDC(graphics->hdc, save_state); @@ -1176,18 +1169,11 @@ stat = GdipCreatePath(FillModeAlternate, &path); if (stat != Ok) - { - ERR("GdipCreatePath failed: 0x%x\n", stat); return stat; - } stat = GdipAddPathRectangle(path, rc->X, rc->Y, rc->Width, rc->Height); if (stat == Ok) stat = get_path_hrgn(path, graphics, hrgn); - else - { - ERR("GdipAddPathRectangle failed: 0x%x\n", stat); - } GdipDeletePath(path); @@ -1218,7 +1204,7 @@ case CombineModeIntersect: return get_region_hrgn(element->elementdata.combine.right, graphics, hrgn); case CombineModeXor: case CombineModeExclude: - left = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + left = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; case CombineModeUnion: case CombineModeComplement: *hrgn = NULL; @@ -1243,7 +1229,7 @@ *hrgn = left; return Ok; case CombineModeXor: case CombineModeComplement: - right = CreateRectRgn(-4194304, -4194304, 4194304, 4194304); + right = CreateRectRgn(-(1 << 22), -(1 << 22), 1 << 22, 1 << 22); break; case CombineModeUnion: case CombineModeExclude: DeleteObject(left); @@ -1297,18 +1283,12 @@ */ GpStatus WINGDIPAPI GdipGetRegionHRgn(GpRegion *region, GpGraphics *graphics, HRGN *hrgn) { - GpStatus status; TRACE("(%p, %p, %p)\n", region, graphics, hrgn); if (!region || !hrgn) return InvalidParameter; - status = get_region_hrgn(&region->node, graphics, hrgn); - if (status != Ok) - { - ERR("get_region_hrgn() failed. region->node.type = 0x%x\n", region->node.type); - } - return status; + return get_region_hrgn(&region->node, graphics, hrgn); } GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BOOL *res) Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 19 13:31:15 2015 @@ -70,7 +70,7 @@ reactos/dll/win32/faultrep # Synced to WineStaging-1.7.37 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.47 -reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.37 +reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.47 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/hlink # Synced to WineStaging-1.7.37 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.37

1 0

[akhaldi] 68436: [PSDK] Update gdiplus{flat, types}.h. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 13:27:27 2015 New Revision: 68436 URL: http://svn.reactos.org/svn/reactos?rev=68436&view=rev Log: [PSDK] Update gdiplus{flat,types}.h. CORE-9924 Modified: trunk/reactos/include/psdk/gdiplusflat.h trunk/reactos/include/psdk/gdiplustypes.h Modified: trunk/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplusflat.h… ============================================================================== --- trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplusflat.h [iso-8859-1] Sun Jul 19 13:27:27 2015 @@ -421,6 +421,7 @@ GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType); GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT); +GpStatus WINGDIPAPI GdipImageSetAbort(GpImage*,GdiplusAbort*); GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**); Modified: trunk/reactos/include/psdk/gdiplustypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/gdiplustypes.… ============================================================================== --- trunk/reactos/include/psdk/gdiplustypes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/gdiplustypes.h [iso-8859-1] Sun Jul 19 13:27:27 2015 @@ -54,6 +54,7 @@ typedef BOOL (CALLBACK * ImageAbort)(VOID *); typedef ImageAbort DrawImageAbort; typedef ImageAbort GetThumbnailImageAbort; +typedef struct GdiplusAbort GdiplusAbort; typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType,UINT,UINT,const BYTE*,VOID*);

1 0

[akhaldi] 68435: [PSDK] Import inseng.idl from Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 19 Jul '15

19 Jul '15

Author: akhaldi Date: Sun Jul 19 13:26:11 2015 New Revision: 68435 URL: http://svn.reactos.org/svn/reactos?rev=68435&view=rev Log: [PSDK] Import inseng.idl from Wine Staging 1.7.47. CORE-9924 Added: trunk/reactos/include/psdk/inseng.idl (with props) Modified: trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Sun Jul 19 13:26:11 2015 @@ -56,6 +56,7 @@ imnxport.idl indexsrv.idl inputscope.idl + inseng.idl metahost.idl mimeinfo.idl mimeole.idl Added: trunk/reactos/include/psdk/inseng.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/inseng.idl?re… ============================================================================== --- trunk/reactos/include/psdk/inseng.idl (added) +++ trunk/reactos/include/psdk/inseng.idl [iso-8859-1] Sun Jul 19 13:26:11 2015 @@ -0,0 +1,136 @@ +/* + * Copyright 2015 Jacek Caban for CodeWeavers + * + * 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 __WIDL__ +#define threading(model) +#endif + +cpp_quote("#if 0") +import "unknwn.idl"; +cpp_quote("#endif") + +interface IStream; + +/* FIXME: Add full declarations. */ +interface ICifComponent; +interface IEnumCifComponents; +interface ICifGroup; +interface IEnumCifGroups; +interface ICifMode; +interface IEnumCifModes; + +typedef struct { + DWORD cbSize; + DWORD dwInstallSize; + DWORD dwWinDriveSize; + DWORD dwDownloadSize; + DWORD dwDependancySize; + DWORD dwInstallDriveReq; + DWORD dwWinDriveReq; + DWORD dwDownloadDriveReq; + char chWinDrive; + char chInstallDrive; + char chDownloadDrive; + DWORD dwTotalDownloadSize; +} COMPONENT_SIZES; + +[ + uuid(6e449688-c509-11cf-aafa-00aa00b6015c), + local +] +interface ICifFile : IUnknown +{ + HRESULT EnumComponents(IEnumCifComponents **enum_components, DWORD filter, void *pv); + HRESULT FindComponent(const char *id, ICifComponent **p); + HRESULT EnumGroups(IEnumCifGroups **enum_groups, DWORD filter, void *pv); + HRESULT FindGroup(const char *id, ICifGroup **p); + HRESULT EnumModes(IEnumCifModes **cuf_modes, DWORD filter, void *pv); + HRESULT FindMode(const char *id, ICifMode **p); + HRESULT GetDescription(char *desc, DWORD size); + HRESULT GetDetDlls(char **dlls, DWORD size); +} + +[ + uuid(6e449685-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngineCallback : IUnknown +{ + HRESULT OnEngineStatusChange(DWORD status, DWORD substatus); + HRESULT OnStartInstall(DWORD dl_size, DWORD install_size); + HRESULT OnStartComponent(const char *id, DWORD dl_size, DWORD install_size, const char *string); + HRESULT OnComponentProgress(const char *id, DWORD phrase, const char *string, + const char *msg_string, ULONG progress, ULONG max); + HRESULT OnStopComponent(const char *id, HRESULT error, DWORD phrase, const char *string, DWORD status); + HRESULT OnStopInstall(HRESULT error, const char *error_string, DWORD status); + HRESULT OnEngineProblem(DWORD problem, LPDWORD action); +} + +[ + uuid(6e449684-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngine : IUnknown +{ + HRESULT GetEngineStatus(DWORD *status); + HRESULT SetCifFile(const char *cab_name, const char *cif_name); + HRESULT DownloadComponents(DWORD flags); + HRESULT InstallComponents(DWORD flags); + HRESULT EnumInstallIDs(UINT index, char **id); + HRESULT EnumDownloadIDs(UINT index, char **id); + HRESULT IsComponentInstalled(const char *id, DWORD *status); + HRESULT RegisterInstallEngineCallback(IInstallEngineCallback *callback); + HRESULT UnregisterInstallEngineCallback(); + HRESULT SetAction(const char *id, DWORD action, DWORD priority); + HRESULT GetSizes(const char *id, COMPONENT_SIZES *sizes); + HRESULT LaunchExtraCommand(const char *inf_name, const char *section); + HRESULT GetDisplayName(const char *id, const char *name); + HRESULT SetBaseUrl(const char *base_name); + HRESULT SetDownloadDir(const char *download_dir); + HRESULT SetInstallDrive(char drive); + HRESULT SetInstallOptions(DWORD flags); + HRESULT SetHWND(HWND hwnd); + HRESULT SetIStream(IStream *stream); + HRESULT Abort(DWORD flags); + HRESULT Suspend(); + HRESULT Resume(); +} + +[ + uuid(6e449689-c509-11cf-aafa-00aa00b6015c), + local +] +interface IInstallEngine2 : IInstallEngine +{ + HRESULT SetLocalCif(const char *cif); + HRESULT GetICifFile(ICifFile **cif_file); +} + +[ + helpstring("Microsoft Active Setup Engine"), + threading(apartment), + uuid(6e449686-c509-11cf-aafa-00aa00b6015c) +] +coclass InstallEngine { } + +[ + helpstring("Download Site Manager"), + threading(apartment), + uuid(bfc880f1-7484-11d0-8309-00aa00b6015c) +] +coclass DownloadSiteMgr { } Propchange: trunk/reactos/include/psdk/inseng.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
26
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

Ros-diffs July 2015