[akhaldi] 61828: [WINDOWSCODECS] * Move some inclusions to the main header. * Improve the GUIDs situation. CORE-7716
Author: akhaldi Date: Sun Jan 26 12:05:45 2014 New Revision: 61828
URL: http://svn.reactos.org/svn/reactos?rev=61828&view=rev Log: [WINDOWSCODECS] * Move some inclusions to the main header. * Improve the GUIDs situation. CORE-7716
Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/guid.c trunk/reactos/dll/win32/windowscodecs/icoformat.c trunk/reactos/dll/win32/windowscodecs/imgfactory.c trunk/reactos/dll/win32/windowscodecs/info.c trunk/reactos/dll/win32/windowscodecs/jpegformat.c trunk/reactos/dll/win32/windowscodecs/metadatahandler.c trunk/reactos/dll/win32/windowscodecs/pngformat.c trunk/reactos/dll/win32/windowscodecs/propertybag.c trunk/reactos/dll/win32/windowscodecs/proxy.c trunk/reactos/dll/win32/windowscodecs/regsvr.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h
Modified: trunk/reactos/dll/win32/windowscodecs/bmpdecode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bmp... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpdecode.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,7 +19,6 @@ #include "wincodecs_private.h"
#include <assert.h> -#include <wingdi.h>
typedef struct { DWORD bc2Size;
Modified: trunk/reactos/dll/win32/windowscodecs/clsfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cls... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clsfactory.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -17,9 +17,6 @@ */
#include "wincodecs_private.h" - -#include <initguid.h> -#include <wincodecsdk.h>
extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/win32/windowscodecs/gifformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gif... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/gifformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,9 +19,7 @@
#include "wincodecs_private.h"
-#include <winnls.h> #include <ole2.h> -#include <wincodecsdk.h>
#include "ungif.h"
Modified: trunk/reactos/dll/win32/windowscodecs/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/gui... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -10,7 +10,7 @@ #include <winbase.h> #include <objbase.h> #include <initguid.h> -#include <wincodec.h> +#include <wincodecsdk.h>
DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04); DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c);
Modified: trunk/reactos/dll/win32/windowscodecs/icoformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/ico... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icoformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -17,8 +17,6 @@ */
#include "wincodecs_private.h" - -#include <wingdi.h>
#include <pshpack1.h>
Modified: trunk/reactos/dll/win32/windowscodecs/imgfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/img... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/imgfactory.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -18,9 +18,6 @@ */
#include "wincodecs_private.h" - -#include <wingdi.h> -#include <wincodecsdk.h>
typedef struct { IWICComponentFactory IWICComponentFactory_iface;
Modified: trunk/reactos/dll/win32/windowscodecs/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/inf... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/info.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,10 +19,6 @@
#include "wincodecs_private.h"
-#include <winreg.h> -#include <wincodecsdk.h> - -#include <wine/unicode.h> #include <wine/list.h>
static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0};
Modified: trunk/reactos/dll/win32/windowscodecs/jpegformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/jpe... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/jpegformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -22,9 +22,6 @@ # include <unistd.h> #endif
-#include <stdio.h> -#include <setjmp.h> - #ifdef SONAME_LIBJPEG /* This is a hack, so jpeglib.h does not redefine INT32 and the like*/ #define XMD_H @@ -39,8 +36,6 @@ #undef UINT16 #undef boolean #endif - -#include <wine/library.h>
#ifdef SONAME_LIBJPEG WINE_DECLARE_DEBUG_CHANNEL(jpeg);
Modified: trunk/reactos/dll/win32/windowscodecs/metadatahandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/met... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/metadatahandler.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -21,7 +21,6 @@
#include <stdio.h> #include <winternl.h> -#include <wincodecsdk.h>
typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface;
Modified: trunk/reactos/dll/win32/windowscodecs/pngformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/png... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/pngformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -21,10 +21,6 @@ #ifdef HAVE_PNG_H #include <png.h> #endif - -#include <wincodecsdk.h> - -#include <wine/library.h>
static HRESULT read_png_chunk(IStream *stream, BYTE *type, BYTE **data, ULONG *data_size) {
Modified: trunk/reactos/dll/win32/windowscodecs/propertybag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pro... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/propertybag.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -19,9 +19,6 @@
#include "wincodecs_private.h"
-#include <ole2.h> -#include <wine/unicode.h> - typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface; LONG ref;
Modified: trunk/reactos/dll/win32/windowscodecs/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pro... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/proxy.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -20,8 +20,6 @@
#include "wincodecs_private.h"
-#include <wincodecsdk.h> - HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface, IWICBitmapSource *pISource, const WICRect *prc) {
Modified: trunk/reactos/dll/win32/windowscodecs/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/reg... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/regsvr.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -17,12 +17,6 @@ */
#include "wincodecs_private.h" - -#include <winreg.h> -#include <objbase.h> -#include <wincodecsdk.h> - -#include <wine/unicode.h>
/*********************************************************************** * interface for self-registering
Modified: trunk/reactos/dll/win32/windowscodecs/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/str... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/stream.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -18,7 +18,6 @@
#include "wincodecs_private.h"
-#include <winreg.h> #include <shlwapi.h>
/******************************************
Modified: trunk/reactos/dll/win32/windowscodecs/tiffformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/tif... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tiffformat.c [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -24,11 +24,6 @@ #ifdef HAVE_TIFFIO_H #include <tiffio.h> #endif - -#include <oleauto.h> -#include <wincodecsdk.h> - -#include <wine/library.h>
#ifdef SONAME_LIBTIFF
Modified: trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/win... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h [iso-8859-1] Sun Jan 26 12:05:45 2014 @@ -34,10 +34,16 @@
#include <windef.h> #include <winbase.h> +#include <wingdi.h> +#include <winreg.h> #include <objbase.h> -#include <wincodec.h> +#include <oleauto.h> +#include <wincodecsdk.h>
#include <wine/debug.h> +#include <wine/library.h> +#include <wine/unicode.h> + WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
DEFINE_GUID(CLSID_WineTgaDecoder, 0xb11fc79a,0x67cc,0x43e6,0xa9,0xce,0xe3,0xd5,0x49,0x45,0xd3,0x04);
-
akhaldi＠svn.reactos.org