[ros-diffs] [fireball] 34680: - Merge 34679.

Author: fireball
Date: Tue Jul 22 06:26:59 2008
New Revision: 34680

URL: http://svn.reactos.org/svn/reactos?rev=34680&view=rev
Log:
- Merge 34679.

Modified:
    branches/nwin32/include/ddk/winddi.h
    branches/nwin32/include/reactos/win32k/ntgdityp.h

Modified: branches/nwin32/include/ddk/winddi.h
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/include/ddk/winddi.h?rev…
==============================================================================
--- branches/nwin32/include/ddk/winddi.h [iso-8859-1] (original)
+++ branches/nwin32/include/ddk/winddi.h [iso-8859-1] Tue Jul 22 06:26:59 2008
@@ -3818,12 +3818,6 @@
   IN POINTL  *pptlBrushOrg,
   IN MIX  mix);
 
-typedef VOID 
-(APIENTRY *PFN_DrvMovePanning)(
-  IN LONG    x,
-  IN LONG    y,
-  IN FLONG   fl);
-
 typedef BOOL
 (APIENTRY *PFN_DrvPlgBlt)(
   IN SURFOBJ  *psoTrg,

Modified: branches/nwin32/include/reactos/win32k/ntgdityp.h
URL:
http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n…
==============================================================================
--- branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original)
+++ branches/nwin32/include/reactos/win32k/ntgdityp.h [iso-8859-1] Tue Jul 22 06:26:59
2008
@@ -568,7 +568,13 @@
 typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG);
 
 //
-// Most of these are definded in ddk/winddi.h
+// Declarations missing in ddk/winddi.h
+//
+typedef VOID (APIENTRY *PFN_DrvMovePanning)(LONG, LONG, FLONG);
+
+
+//
+// Most of these are defined in ddk/winddi.h
 //
 typedef struct _DRIVER_FUNCTIONS
 {