Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 05:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDIPLUS]

Browse source 
* 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

svn path=/trunk/; revision=61359
This commit is contained in:
Amine Khaldi 2013-12-23 18:33:45 +00:00
parent 92cf82554d
commit f9bea6048d
15 changed files with 17 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/gdiplus/brush.c
View file

@ -16,23 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
/* /*
Unix stuff Unix stuff

12
reactos/dll/win32/gdiplus/customlinecap.c
View file

@ -16,19 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from,
GpCustomLineCap** to) GpCustomLineCap** to)

15
reactos/dll/win32/gdiplus/font.c
View file

@ -17,21 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "gdiplus_private.h"
/* PANOSE is 10 bytes in size, need to pack the structure properly */ /* PANOSE is 10 bytes in size, need to pack the structure properly */

17
reactos/dll/win32/gdiplus/gdiplus.c
View file

@ -16,25 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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" #include "gdiplus_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
static const REAL mm_per_inch = 25.4; static const REAL mm_per_inch = 25.4;
static const REAL point_per_inch = 72.0; static const REAL point_per_inch = 72.0;

22
reactos/dll/win32/gdiplus/gdiplus_private.h
View file

@ -19,24 +19,30 @@
#ifndef __WINE_GP_PRIVATE_H_ #ifndef __WINE_GP_PRIVATE_H_
#define __WINE_GP_PRIVATE_H_ #define __WINE_GP_PRIVATE_H_
#include <math.h>
#include <stdarg.h>
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#define _INC_WINDOWS #define _INC_WINDOWS
#define COM_NO_WINDOWS_H #define COM_NO_WINDOWS_H
#include <math.h> #define NONAMELESSUNION
#include <stdarg.h> #define COBJMACROS
#define INITGUID
#include <windef.h> #include <windef.h>
#include <wingdi.h>
#include <winbase.h> #include <winbase.h>
//#include "winuser.h" #include <wingdi.h>
#include <ole2.h>
#include <objbase.h>
//#include "ocidl.h"
#include <wincodecsdk.h> #include <wincodecsdk.h>
#include <gdiplus.h>
#include <wine/unicode.h>
#include <wine/list.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 GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER)
#define MAX_ARC_PTS (13) #define MAX_ARC_PTS (13)

23
reactos/dll/win32/gdiplus/graphics.c
View file

@ -16,31 +16,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
//#include <stdarg.h> #include "gdiplus_private.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 <winreg.h> #include <winreg.h>
//#include "gdiplus.h"
#include "gdiplus_private.h"
#include <shlwapi.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: /* Mike "tamlin" Nordell 2012-09-14 for ReactOS:
* NOTE: Wine uses per-GpGraphics id's ('contid' starting from zero in * NOTE: Wine uses per-GpGraphics id's ('contid' starting from zero in

14
reactos/dll/win32/gdiplus/graphicspath.c
View file

@ -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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
typedef struct path_list_node_t path_list_node_t; typedef struct path_list_node_t path_list_node_t;
struct path_list_node_t { struct path_list_node_t {

26
reactos/dll/win32/gdiplus/image.c
View file

@ -17,32 +17,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <stdarg.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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #include <assert.h>
#include <olectl.h>
#define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24)

9
reactos/dll/win32/gdiplus/imageattributes.c
View file

@ -16,16 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr, GpStatus WINGDIPAPI GdipCloneImageAttributes(GDIPCONST GpImageAttributes *imageattr,
GpImageAttributes **cloneImageattr) GpImageAttributes **cloneImageattr)

13
reactos/dll/win32/gdiplus/matrix.c
View file

@ -16,20 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
/* Multiplies two matrices of the form /* Multiplies two matrices of the form
* *

22
reactos/dll/win32/gdiplus/metafile.c
View file

@ -16,29 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
//#include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
typedef struct EmfPlusRecordHeader typedef struct EmfPlusRecordHeader
{ {

12
reactos/dll/win32/gdiplus/pathiterator.c
View file

@ -17,19 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator **iterator, GpPath* path) GpStatus WINGDIPAPI GdipCreatePathIter(GpPathIterator **iterator, GpPath* path)
{ {

12
reactos/dll/win32/gdiplus/pen.c
View file

@ -16,19 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
static DWORD gdip_to_gdi_dash(GpDashStyle dash) static DWORD gdip_to_gdi_dash(GpDashStyle dash)
{ {

12
reactos/dll/win32/gdiplus/region.c
View file

@ -16,19 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
/********************************************************** /**********************************************************
* *

13
reactos/dll/win32/gdiplus/stringformat.c
View file

@ -17,20 +17,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 "gdiplus_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang,
GpStringFormat **format) GpStringFormat **format)