[akhaldi] 61477: [WINDOWSCODECS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already ex...
Author: akhaldi Date: Wed Jan 1 21:40:23 2014 New Revision: 61477
URL: http://svn.reactos.org/svn/reactos?rev=61477&view=rev Log: [WINDOWSCODECS] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716
Added: trunk/reactos/dll/win32/windowscodecs/guid.c (with props) Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/bitmap.c trunk/reactos/dll/win32/windowscodecs/bmpdecode.c trunk/reactos/dll/win32/windowscodecs/bmpencode.c trunk/reactos/dll/win32/windowscodecs/clipper.c trunk/reactos/dll/win32/windowscodecs/clsfactory.c trunk/reactos/dll/win32/windowscodecs/colorcontext.c trunk/reactos/dll/win32/windowscodecs/colortransform.c trunk/reactos/dll/win32/windowscodecs/converter.c trunk/reactos/dll/win32/windowscodecs/fliprotate.c trunk/reactos/dll/win32/windowscodecs/gifformat.c trunk/reactos/dll/win32/windowscodecs/icnsformat.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/main.c trunk/reactos/dll/win32/windowscodecs/metadatahandler.c trunk/reactos/dll/win32/windowscodecs/palette.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/scaler.c trunk/reactos/dll/win32/windowscodecs/stream.c trunk/reactos/dll/win32/windowscodecs/tgaformat.c trunk/reactos/dll/win32/windowscodecs/tiffformat.c trunk/reactos/dll/win32/windowscodecs/wincodecs_private.h
Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CMa... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -51,6 +51,7 @@ tgaformat.c tiffformat.c ungif.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def
Modified: trunk/reactos/dll/win32/windowscodecs/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bit... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bitmap.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
typedef struct BitmapImpl { IWICBitmap IWICBitmap_iface;
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] Wed Jan 1 21:40:23 2014 @@ -16,29 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> +#include "wincodecs_private.h"
#include <assert.h> -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" #include <wingdi.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
typedef struct { DWORD bc2Size;
Modified: trunk/reactos/dll/win32/windowscodecs/bmpencode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/bmp... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/bmpencode.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,28 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" +#include "wincodecs_private.h" + #include <wingdi.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
struct bmp_pixelformat { const WICPixelFormatGUID *guid;
Modified: trunk/reactos/dll/win32/windowscodecs/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/cli... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/clipper.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/clipper.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,20 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "objbase.h" -#include "wincodec.h" - #include "wincodecs_private.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
typedef struct BitmapClipper { IWICBitmapClipper IWICBitmapClipper_iface;
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] Wed Jan 1 21:40:23 2014 @@ -16,30 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -#include <objbase.h> -//#include "ocidl.h" -#include <initguid.h> -//#include "wincodec.h" -#include <wincodecsdk.h> - #include "wincodecs_private.h"
-#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include <initguid.h> +#include <wincodecsdk.h>
extern HRESULT WINAPI WIC_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLSPEC_HIDDEN;
Modified: trunk/reactos/dll/win32/windowscodecs/colorcontext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/col... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/colorcontext.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/colorcontext.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h"
typedef struct ColorContext { IWICColorContext IWICColorContext_iface;
Modified: trunk/reactos/dll/win32/windowscodecs/colortransform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/col... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/colortransform.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/colortransform.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h"
typedef struct ColorTransform { IWICColorTransform IWICColorTransform_iface;
Modified: trunk/reactos/dll/win32/windowscodecs/converter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/con... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/converter.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
struct FormatConverter;
Modified: trunk/reactos/dll/win32/windowscodecs/fliprotate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/fli... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/fliprotate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/fliprotate.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h"
typedef struct FlipRotator { IWICBitmapFlipRotator IWICBitmapFlipRotator_iface;
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] Wed Jan 1 21:40:23 2014 @@ -17,31 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <winnls.h> #include <ole2.h> -//#include "wincodec.h" #include <wincodecsdk.h>
#include "ungif.h" - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
static LPWSTR strdupAtoW(const char *src) {
Added: 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 (added) +++ trunk/reactos/dll/win32/windowscodecs/guid.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -0,0 +1,20 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <initguid.h> +#include <wincodec.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); +DEFINE_GUID(GUID_WineContainerFormatTga, 0x0c44fda1,0xa5c5,0x4298,0x96,0x85,0x47,0x3f,0xc1,0x7c,0xd3,0x22); +DEFINE_GUID(GUID_VendorWine, 0xddf46da1,0x7dc1,0x404e,0x98,0xf2,0xef,0xa4,0x8d,0xfc,0x95,0x0a); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
Propchange: trunk/reactos/dll/win32/windowscodecs/guid.c ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/dll/win32/windowscodecs/icnsformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/icn... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/icnsformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -15,15 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h>
#ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H #define GetCurrentProcess GetCurrentProcess_Mac @@ -82,19 +73,7 @@ #undef DPRINTF #endif
-#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "wincodec.h" - -//#include "wincodecs_private.h" - -#include <wine/debug.h> -//#include "wine/library.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h"
#if defined(HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H) && \ MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4
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] Wed Jan 1 21:40:23 2014 @@ -16,26 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <wingdi.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
#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] Wed Jan 1 21:40:23 2014 @@ -17,30 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <wingdi.h> -//#include "winreg.h" -#include <objbase.h> -//#include "shellapi.h" -//#include "wincodec.h" #include <wincodecsdk.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
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] Wed Jan 1 21:40:23 2014 @@ -17,30 +17,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <winreg.h> -#include <objbase.h> -//#include "wincodec.h" #include <wincodecsdk.h>
-//#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/unicode.h> #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
static const WCHAR mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; static const WCHAR author_valuename[] = {'A','u','t','h','o','r',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] Wed Jan 1 21:40:23 2014 @@ -16,19 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -#include <wine/port.h> +#include "wincodecs_private.h"
#ifdef HAVE_UNISTD_H # include <unistd.h> #endif -//#include <stdarg.h> + #include <stdio.h> -//#include <string.h> #include <setjmp.h>
#ifdef SONAME_LIBJPEG @@ -46,19 +40,7 @@ #undef boolean #endif
-#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/library.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
#ifdef SONAME_LIBJPEG WINE_DECLARE_DEBUG_CHANNEL(jpeg);
Modified: trunk/reactos/dll/win32/windowscodecs/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/mai... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/main.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,25 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS -#include <config.h> - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
extern BOOL WINAPI WIC_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN;
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] Wed Jan 1 21:40:23 2014 @@ -17,30 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -//#include <stdarg.h> +#include "wincodecs_private.h" + #include <stdio.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> #include <winternl.h> -#include <objbase.h> -//#include "wincodec.h" #include <wincodecsdk.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
typedef struct MetadataHandler { IWICMetadataWriter IWICMetadataWriter_iface;
Modified: trunk/reactos/dll/win32/windowscodecs/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/pal... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/palette.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -17,27 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winreg.h" -#include <objbase.h> -#include <wincodec.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#include "wincodecs_private.h"
typedef struct { IWICPalette IWICPalette_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] Wed Jan 1 21:40:23 2014 @@ -16,34 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -#include <wine/port.h> - -//#include <stdarg.h> +#include "wincodecs_private.h"
#ifdef HAVE_PNG_H #include <png.h> #endif
-#define NONAMELESSUNION -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "wincodec.h" #include <wincodecsdk.h>
-#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/library.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
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] Wed Jan 1 21:40:23 2014 @@ -17,27 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <ole2.h> -#include <wincodec.h> #include <wine/unicode.h> - -//#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
typedef struct PropertyBag { IPropertyBag2 IPropertyBag2_iface;
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] Wed Jan 1 21:40:23 2014 @@ -18,28 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "wincodec.h" +#include "wincodecs_private.h" + #include <wincodecsdk.h> - -#include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
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] Wed Jan 1 21:40:23 2014 @@ -16,34 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#define COBJMACROS -#include <stdarg.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" +#include "wincodecs_private.h" + #include <winreg.h> -//#include "winerror.h" - #include <objbase.h> -//#include "ocidl.h" -//#include "wincodec.h" #include <wincodecsdk.h>
-#include <wine/debug.h> #include <wine/unicode.h> - -#include "wincodecs_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
/*********************************************************************** * interface for self-registering
Modified: trunk/reactos/dll/win32/windowscodecs/scaler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/sca... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/scaler.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,26 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
typedef struct BitmapScaler { IWICBitmapScaler IWICBitmapScaler_iface;
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] Wed Jan 1 21:40:23 2014 @@ -16,22 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <wine/debug.h> - -#define COBJMACROS -#include <windef.h> -#include <winbase.h> +#include "wincodecs_private.h" + #include <winreg.h> -#include <objbase.h> #include <shlwapi.h> -#include <wincodec.h> -#include "wincodecs_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
/****************************************** * StreamOnMemory implementation
Modified: trunk/reactos/dll/win32/windowscodecs/tgaformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/tga... ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/tgaformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/tgaformat.c [iso-8859-1] Wed Jan 1 21:40:23 2014 @@ -16,28 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <wincodec.h> - #include "wincodecs_private.h" - -#include <wine/debug.h> -//#include "wine/library.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
#include "pshpack1.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] Wed Jan 1 21:40:23 2014 @@ -16,14 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <config.h> -#include <wine/port.h> - -#include <stdarg.h> +#include "wincodecs_private.h" + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -31,21 +25,10 @@ #include <tiffio.h> #endif
-#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> #include <oleauto.h> -//#include "wincodec.h" #include <wincodecsdk.h>
-#include "wincodecs_private.h" - -#include <wine/debug.h> #include <wine/library.h> - -WINE_DEFAULT_DEBUG_CHANNEL(wincodecs);
#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] Wed Jan 1 21:40:23 2014 @@ -18,6 +18,27 @@
#ifndef WINCODECS_PRIVATE_H #define WINCODECS_PRIVATE_H + +#include <wine/config.h> +#include <wine/port.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <wincodec.h> + +#include <wine/debug.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