mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 09:25:10 +00:00
[WINDOWSCODECS]
* Move some inclusions to the main header. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61828
This commit is contained in:
parent
a70f7bf4a0
commit
2d1bffa08b
16 changed files with 8 additions and 44 deletions
|
@ -19,7 +19,6 @@
|
|||
#include "wincodecs_private.h"
|
||||
|
||||
#include <assert.h>
|
||||
#include <wingdi.h>
|
||||
|
||||
typedef struct {
|
||||
DWORD bc2Size;
|
||||
|
|
|
@ -18,9 +18,6 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <initguid.h>
|
||||
#include <wincodecsdk.h>
|
||||
|
||||
extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
|
||||
|
||||
typedef struct {
|
||||
|
|
|
@ -19,9 +19,7 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <winnls.h>
|
||||
#include <ole2.h>
|
||||
#include <wincodecsdk.h>
|
||||
|
||||
#include "ungif.h"
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -18,8 +18,6 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <wingdi.h>
|
||||
|
||||
#include <pshpack1.h>
|
||||
|
||||
typedef struct {
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <wingdi.h>
|
||||
#include <wincodecsdk.h>
|
||||
|
||||
typedef struct {
|
||||
IWICComponentFactory IWICComponentFactory_iface;
|
||||
LONG ref;
|
||||
|
|
|
@ -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};
|
||||
|
|
|
@ -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
|
||||
|
@ -40,8 +37,6 @@
|
|||
#undef boolean
|
||||
#endif
|
||||
|
||||
#include <wine/library.h>
|
||||
|
||||
#ifdef SONAME_LIBJPEG
|
||||
WINE_DECLARE_DEBUG_CHANNEL(jpeg);
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <winternl.h>
|
||||
#include <wincodecsdk.h>
|
||||
|
||||
typedef struct MetadataHandler {
|
||||
IWICMetadataWriter IWICMetadataWriter_iface;
|
||||
|
|
|
@ -22,10 +22,6 @@
|
|||
#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)
|
||||
{
|
||||
BYTE header[8];
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <ole2.h>
|
||||
#include <wine/unicode.h>
|
||||
|
||||
typedef struct PropertyBag {
|
||||
IPropertyBag2 IPropertyBag2_iface;
|
||||
LONG ref;
|
||||
|
|
|
@ -20,8 +20,6 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <wincodecsdk.h>
|
||||
|
||||
HRESULT WINAPI IWICBitmapClipper_Initialize_Proxy_W(IWICBitmapClipper *iface,
|
||||
IWICBitmapSource *pISource, const WICRect *prc)
|
||||
{
|
||||
|
|
|
@ -18,12 +18,6 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <winreg.h>
|
||||
#include <objbase.h>
|
||||
#include <wincodecsdk.h>
|
||||
|
||||
#include <wine/unicode.h>
|
||||
|
||||
/***********************************************************************
|
||||
* interface for self-registering
|
||||
*/
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
|
||||
#include "wincodecs_private.h"
|
||||
|
||||
#include <winreg.h>
|
||||
#include <shlwapi.h>
|
||||
|
||||
/******************************************
|
||||
|
|
|
@ -25,11 +25,6 @@
|
|||
#include <tiffio.h>
|
||||
#endif
|
||||
|
||||
#include <oleauto.h>
|
||||
#include <wincodecsdk.h>
|
||||
|
||||
#include <wine/library.h>
|
||||
|
||||
#ifdef SONAME_LIBTIFF
|
||||
|
||||
/* Workaround for broken libtiff 4.x headers on some 64-bit hosts which
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue