[ros-diffs] [fireball] 48380: - Fix incorrect function definitions. To be submitted upstream.

Author: fireball
Date: Sat Jul 31 12:08:50 2010
New Revision: 48380

URL: http://svn.reactos.org/svn/reactos?rev=48380&view=rev
Log:
- Fix incorrect function definitions. To be submitted upstream.

Modified:
    branches/arwinss/reactos/dll/win32/gdi32/bitmap.c
    branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c
    branches/arwinss/reactos/dll/win32/gdi32/font.c
    branches/arwinss/reactos/dll/win32/gdi32/painting.c

Modified: branches/arwinss/reactos/dll/win32/gdi32/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32…
==============================================================================
--- branches/arwinss/reactos/dll/win32/gdi32/bitmap.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/gdi32/bitmap.c [iso-8859-1] Sat Jul 31 12:08:50
2010
@@ -433,7 +433,7 @@
  */
 LONG WINAPI SetBitmapBits(
     HBITMAP hbitmap, /* [in] Handle to bitmap */
-    LONG count,        /* [in] Number of bytes in bitmap array */
+    DWORD count,       /* [in] Number of bytes in bitmap array */
     LPCVOID bits)      /* [in] Address of array with bitmap bits */
 {
     BITMAPOBJ *bmp;

Modified: branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32…
==============================================================================
--- branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/gdi32/enhmetafile.c [iso-8859-1] Sat Jul 31
12:08:50 2010
@@ -177,7 +177,7 @@
 X(EMR_TRANSPARENTBLT),
 X(EMR_RESERVED_117),
 X(EMR_GRADIENTFILL),
-X(EMR_SETLINKEDUFI),
+X(EMR_SETLINKEDUFIS),
 X(EMR_SETTEXTJUSTIFICATION),
 X(EMR_COLORMATCHTOTARGETW),
 X(EMR_CREATECOLORSPACEW)
@@ -2180,7 +2180,7 @@
 	case EMR_SETICMPROFILEW:
 	case EMR_TRANSPARENTBLT:
 	case EMR_GRADIENTFILL:
-	case EMR_SETLINKEDUFI:
+	case EMR_SETLINKEDUFIS:
 	case EMR_COLORMATCHTOTARGETW:
 	case EMR_CREATECOLORSPACEW:
 

Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32…
==============================================================================
--- branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] Sat Jul 31 12:08:50 2010
@@ -3218,7 +3218,7 @@
 /***********************************************************************
  *           GetTextCharset    (GDI32.@)
  */
-UINT WINAPI GetTextCharset(HDC hdc)
+int WINAPI GetTextCharset(HDC hdc)
 {
     /* MSDN docs say this is equivalent */
     return GetTextCharsetInfo(hdc, NULL, 0);
@@ -3227,7 +3227,7 @@
 /***********************************************************************
  *           GetTextCharsetInfo    (GDI32.@)
  */
-UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags)
+int WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags)
 {
     UINT ret = DEFAULT_CHARSET;
     DC *dc = get_dc_ptr(hdc);

Modified: branches/arwinss/reactos/dll/win32/gdi32/painting.c
URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32…
==============================================================================
--- branches/arwinss/reactos/dll/win32/gdi32/painting.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/dll/win32/gdi32/painting.c [iso-8859-1] Sat Jul 31 12:08:50
2010
@@ -671,7 +671,7 @@
  *          PolyPolygon  (GDI32.@)
  */
 BOOL WINAPI PolyPolygon( HDC hdc, const POINT* pt, const INT* counts,
-                             UINT polygons )
+                             int polygons )
 {
     BOOL ret = FALSE;
     DC * dc = get_dc_ptr( hdc );
@@ -883,7 +883,7 @@
  *      PolyDraw (GDI32.@)
  */
 BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes,
-                       DWORD cCount)
+                       int cCount)
 {
     DC *dc;
     BOOL result = FALSE;