[akhaldi] 61359: [GDIPLUS] * 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...
Author: akhaldi Date: Mon Dec 23 18:33:45 2013 New Revision: 61359
URL: http://svn.reactos.org/svn/reactos?rev=61359&view=rev Log: [GDIPLUS] * 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. CORE-7716
Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/customlinecap.c trunk/reactos/dll/win32/gdiplus/font.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/graphicspath.c trunk/reactos/dll/win32/gdiplus/image.c trunk/reactos/dll/win32/gdiplus/imageattributes.c trunk/reactos/dll/win32/gdiplus/matrix.c trunk/reactos/dll/win32/gdiplus/metafile.c trunk/reactos/dll/win32/gdiplus/pathiterator.c trunk/reactos/dll/win32/gdiplus/pen.c trunk/reactos/dll/win32/gdiplus/region.c trunk/reactos/dll/win32/gdiplus/stringformat.c
Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?r... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" - -#define COBJMACROS -//#include "objbase.h" -//#include "olectl.h" -//#include "ole2.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
/* Unix stuff
Modified: trunk/reactos/dll/win32/gdiplus/customlinecap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/customlin... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/customlinecap.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, GpCustomLineCap** to)
Modified: trunk/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/font.c?re... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/font.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,21 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winnls.h" -//#include "winreg.h" -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL (gdiplus); - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h"
/* PANOSE is 10 bytes in size, need to pack the structure properly */
Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.c... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,24 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -#include <wine/debug.h> -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "winreg.h" -//#include "shlwapi.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0;
Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_p... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -19,24 +19,30 @@ #ifndef __WINE_GP_PRIVATE_H_ #define __WINE_GP_PRIVATE_H_
+#include <math.h> +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H
-#include <math.h> -#include <stdarg.h> +#define NONAMELESSUNION +#define COBJMACROS + +#define INITGUID
#include <windef.h> +#include <winbase.h> #include <wingdi.h> -#include <winbase.h> -//#include "winuser.h" - -#include <objbase.h> -//#include "ocidl.h" +#include <ole2.h> #include <wincodecsdk.h> +#include <gdiplus.h> + +#include <wine/unicode.h> #include <wine/list.h>
-#include <gdiplus.h> +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
#define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13)
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] Mon Dec 23 18:33:45 2013 @@ -16,31 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> -//#include <math.h> -//#include <limits.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" -#include <wine/unicode.h> - -#define COBJMACROS -//#include "objbase.h" -//#include "ocidl.h" -//#include "olectl.h" -//#include "ole2.h" +#include "gdiplus_private.h"
#include <winreg.h> - -//#include "gdiplus.h" -#include "gdiplus_private.h" #include <shlwapi.h> -#include <wine/debug.h> -//#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
/* Mike "tamlin" Nordell 2012-09-14 for ReactOS: * NOTE: Wine uses per-GpGraphics id's ('contid' starting from zero in
Modified: trunk/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphicsp... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,21 +17,7 @@ * */
-//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
typedef struct path_list_node_t path_list_node_t; struct path_list_node_t {
Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?r... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,32 +17,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include <stdarg.h> +#include "gdiplus_private.h" + #include <assert.h> - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define NONAMELESSUNION - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "wingdi.h" - -#define COBJMACROS -//#include "objbase.h" -#include <ole2.h> #include <olectl.h> - -#include <initguid.h> -//#include "wincodec.h" -//#include "gdiplus.h" -#include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
#define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24)
Modified: trunk/reactos/dll/win32/gdiplus/imageattributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/imageattr... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/imageattributes.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,16 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include "windef.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpImageAttributes **cloneImageattr)
Modified: trunk/reactos/dll/win32/gdiplus/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/matrix.c?... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/matrix.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,20 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
/* Multiplies two matrices of the form *
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] Mon Dec 23 18:33:45 2013 @@ -16,29 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> -//#include <math.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "wine/unicode.h" - -#define COBJMACROS -//#include "objbase.h" -//#include "ocidl.h" -//#include "olectl.h" -//#include "ole2.h" - -//#include "winreg.h" -//#include "shlwapi.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> -//#include "wine/list.h" - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
typedef struct EmfPlusRecordHeader {
Modified: trunk/reactos/dll/win32/gdiplus/pathiterator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pathitera... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/pathiterator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/pathiterator.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,19 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator **iterator, GpPath* path) {
Modified: trunk/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/pen.c?rev... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/pen.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
static DWORD gdip_to_gdi_dash(GpDashStyle dash) {
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] Mon Dec 23 18:33:45 2013 @@ -16,19 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
/********************************************************** *
Modified: trunk/reactos/dll/win32/gdiplus/stringformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/stringfor... ============================================================================== --- trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/stringformat.c [iso-8859-1] Mon Dec 23 18:33:45 2013 @@ -17,20 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winnls.h" - -//#include "objbase.h" - -//#include "gdiplus.h" #include "gdiplus_private.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStringFormat **format)
-
akhaldi＠svn.reactos.org