[ros-diffs] [fireball] 33191: - All DxEng APIs are STDCALL. The only possible exception are FASTCALLs, but this is to be determined and fixed by Magnus. - Also fix numerous typos, greatlordisms, and other shamefully-looking strings.

Author: fireball
Date: Tue Apr 29 12:00:31 2008
New Revision: 33191

URL: http://svn.reactos.org/svn/reactos?rev=33191&view=rev
Log:
- All DxEng APIs are STDCALL. The only possible exception are FASTCALLs, but this is to be
determined and fixed by Magnus.
- Also fix numerous typos, greatlordisms, and other shamefully-looking strings.

Modified:
    trunk/reactos/include/reactos/drivers/directx/dxeng.h
    trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c

Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di…
==============================================================================
--- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Tue Apr 29 12:00:31
2008
@@ -1,6 +1,6 @@
 
 /************************************************************************/
-/* This driver interface are exported from win32k.sys to dxg.sys        */
+/* These functions are imported from win32k.sys by dxg.sys              */
 /************************************************************************/
 #define DXENG_INDEX_Resverd0                            0x00
 #define DXENG_INDEX_DxEngNUIsTermSrv                    0x01
@@ -70,7 +70,7 @@
 } DXEGSHDEVDATA,*PDXEGSHDEVDATA;
 
 /************************************************************************/
-/* win32k.sys internal protypes for the driver functions it export      */
+/* win32k.sys internal protypes for driver functions it exports         */
 /************************************************************************/
 BOOLEAN STDCALL DxEngNUIsTermSrv();
 PDC STDCALL DxEngLockDC(HDC hDC);
@@ -86,39 +86,37 @@
 DWORD STDCALL DxEngScreenAccessCheck();
 BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask);
 
-/* prototypes are not done yet, I need gather all my notes
- * to make them correct
- */
-BOOLEAN DxEngRedrawDesktop();
-ULONG DxEngDispUniq();
-ULONG DxEngVisRgnUniq();
-HDEV *DxEngEnumerateHdev(HDEV *hdev);
-BOOL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp);
-BOOLEAN DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse);
-BOOLEAN DxEngCleanDC(HDC hdc);
-BOOLEAN DxEngIncDispUniq();
+/* Prototypes for the following functions are not yet finished */
+BOOLEAN STDCALL DxEngRedrawDesktop();
+ULONG STDCALL DxEngDispUniq();
+ULONG STDCALL DxEngVisRgnUniq();
+HDEV* STDCALL DxEngEnumerateHdev(HDEV *hdev);
+BOOL STDCALL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp);
+BOOLEAN STDCALL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse);
+BOOLEAN STDCALL DxEngCleanDC(HDC hdc);
+BOOLEAN STDCALL DxEngIncDispUniq();
 
-DWORD DxEngCreateMemoryDC(DWORD x1);
+DWORD STDCALL DxEngCreateMemoryDC(DWORD x1);
 
-DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1);
-DWORD DxEngUnreferenceHdev(DWORD x1);
-DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
-DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
-DWORD DxEngSpSpritesVisible(DWORD x1);
-DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3);
-DWORD DxEngDeleteDC(DWORD x1, DWORD x2);
-DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3);
-DWORD DxEngSelectBitmap(DWORD x1, DWORD x2);
-DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2);
-DWORD DxEngDeleteSurface(DWORD x1);
-DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2);
-DWORD DxEngAltLockSurface(DWORD x1);
-DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4);
-DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2);
-DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2);
-DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2);
-DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3);
+DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1);
+DWORD STDCALL DxEngUnreferenceHdev(DWORD x1);
+DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
+DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
+DWORD STDCALL DxEngSpSpritesVisible(DWORD x1);
+DWORD STDCALL DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3);
+DWORD STDCALL DxEngDeleteDC(DWORD x1, DWORD x2);
+DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3);
+DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2);
+DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2);
+DWORD STDCALL DxEngDeleteSurface(DWORD x1);
+DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2);
+DWORD STDCALL DxEngAltLockSurface(DWORD x1);
+DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4);
+DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2);
+DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2);
+DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2);
+DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3);
 DWORD STDCALL DxEngGetRedirectionBitmap(DWORD x1);
-DWORD DxEngLoadImage(DWORD x1,DWORD x2);
+DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2);
 
 

Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Tue Apr 29 12:00:31
2008
@@ -1,11 +1,9 @@
 /*
- * COPYRIGHT:        See COPYING in the top level directory
- * PROJECT:          ReactOS kernel
- * PURPOSE:          Native driver enumate of dxeng implementation
- * FILE:             subsys/win32k/ntddraw/dxeng.c
- * PROGRAMER:        Magnus olsen (magnus(a)greatlord.com)
- * REVISION HISTORY:
- *       15/10-2007   Magnus Olsen
+ * PROJECT:          ReactOS Win32 Subsystem
+ * LICENSE:          GPL - See COPYING in the top level directory
+ * FILE:             subsystems/win32/win32k/ntddraw/dxeng.c
+ * PURPOSE:          Implementation of DxEng functions
+ * PROGRAMMERS:      Magnus Olsen (magnus(a)greatlord.com)
  */
 
 #include <w32k.h>
@@ -102,6 +100,7 @@
 *
 *--*/
 BOOL
+STDCALL
 DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp)
 {
     DPRINT1("ReactX Calling : DxEngGetDeviceGammaRamp\n");
@@ -242,6 +241,7 @@
 *
 *--*/
 BOOLEAN
+STDCALL
 DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Test)
 {
     DPRINT1("ReactX Calling : DxEngSetDeviceGammaRamp\n");
@@ -646,6 +646,7 @@
 /************************************************************************/
 /* Enumerate all drivers in win32k */
 HDEV *
+STDCALL
 DxEngEnumerateHdev(HDEV *hdev)
 {
     /* FIXME Enumerate all drivers in win32k */
@@ -656,7 +657,9 @@
 /************************************************************************/
 /* DxEngCreateMemoryDC                                                  */
 /************************************************************************/
-DWORD DxEngCreateMemoryDC(DWORD x1)
+DWORD
+STDCALL
+DxEngCreateMemoryDC(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -676,7 +679,9 @@
 /************************************************************************/
 /* DxEngIsHdevLockedByCurrentThread                                     */
 /************************************************************************/
-DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1)
+DWORD
+STDCALL
+DxEngIsHdevLockedByCurrentThread(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -686,7 +691,9 @@
 /************************************************************************/
 /* DxEngUnreferenceHdev                                                 */
 /************************************************************************/
-DWORD DxEngUnreferenceHdev(DWORD x1)
+DWORD
+STDCALL
+DxEngUnreferenceHdev(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -695,7 +702,9 @@
 /************************************************************************/
 /* DxEngGetDesktopDC                                                    */
 /************************************************************************/
-DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3)
+DWORD
+STDCALL
+DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -704,7 +713,9 @@
 /************************************************************************/
 /* DxEngDeleteDC                                                        */
 /************************************************************************/
-DWORD DxEngDeleteDC(DWORD x1, DWORD x2)
+DWORD
+STDCALL
+DxEngDeleteDC(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -713,7 +724,9 @@
 /************************************************************************/
 /* DxEngCleanDC                                                         */
 /************************************************************************/
-BOOLEAN DxEngCleanDC(HDC hdc)
+BOOLEAN
+STDCALL
+DxEngCleanDC(HDC hdc)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -730,7 +743,7 @@
 /************************************************************************/
 /* DxEngSetDCState                                                      */
 /************************************************************************/
-DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3)
+DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -739,7 +752,7 @@
 /************************************************************************/
 /* DxEngSelectBitmap                                                    */
 /************************************************************************/
-DWORD DxEngSelectBitmap(DWORD x1, DWORD x2)
+DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -748,7 +761,7 @@
 /************************************************************************/
 /* DxEngSetBitmapOwner                                                  */
 /************************************************************************/
-DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2)
+DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -757,7 +770,7 @@
 /************************************************************************/
 /* DxEngDeleteSurface                                                   */
 /************************************************************************/
-DWORD DxEngDeleteSurface(DWORD x1)
+DWORD STDCALL DxEngDeleteSurface(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -766,7 +779,7 @@
 /************************************************************************/
 /* DxEngGetSurfaceData                                                  */
 /************************************************************************/
-DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2)
+DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -775,7 +788,7 @@
 /************************************************************************/
 /* DxEngAltLockSurface                                                  */
 /************************************************************************/
-DWORD DxEngAltLockSurface(DWORD x1)
+DWORD STDCALL DxEngAltLockSurface(DWORD x1)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -784,7 +797,7 @@
 /************************************************************************/
 /* DxEngUploadPaletteEntryToSurface                                     */
 /************************************************************************/
-DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4)
+DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -793,7 +806,7 @@
 /************************************************************************/
 /* DxEngMarkSurfaceAsDirectDraw                                         */
 /************************************************************************/
-DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2)
+DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -802,7 +815,7 @@
 /************************************************************************/
 /* DxEngSelectPaletteToSurface                                          */
 /************************************************************************/
-DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2)
+DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -811,7 +824,7 @@
 /************************************************************************/
 /* DxEngSyncPaletteTableWithDevice                                      */
 /************************************************************************/
-DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2)
+DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -820,7 +833,7 @@
 /************************************************************************/
 /* DxEngSetPaletteState                                                 */
 /************************************************************************/
-DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3)
+DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -839,7 +852,7 @@
 /************************************************************************/
 /* DxEngLoadImage                                                       */
 /************************************************************************/
-DWORD DxEngLoadImage(DWORD x1,DWORD x2)
+DWORD STDCALL DxEngLoadImage(DWORD x1,DWORD x2)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -848,7 +861,7 @@
 /************************************************************************/
 /* DxEngSpTearDownSprites                                               */
 /************************************************************************/
-DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
+DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -857,7 +870,7 @@
 /************************************************************************/
 /* DxEngSpUnTearDownSprites                                             */
 /************************************************************************/
-DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
+DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3)
 {
     UNIMPLEMENTED;
     return FALSE;
@@ -866,8 +879,8 @@
 /************************************************************************/
 /* DxEngSpSpritesVisible                                                */
 /************************************************************************/
-DWORD DxEngSpSpritesVisible(DWORD x1)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
+DWORD STDCALL DxEngSpSpritesVisible(DWORD x1)
+{
+    UNIMPLEMENTED;
+    return FALSE;
+}