[ros-diffs] [greatlrd] 27550: fixed most of the compinning errors of ddraw but not all
greatlrd at svn.reactos.org
greatlrd at svn.reactos.org
Mon Jul 9 21:56:20 CEST 2007
Author: greatlrd
Date: Mon Jul 9 23:56:19 2007
New Revision: 27550
URL: http://svn.reactos.org/svn/reactos?rev=27550&view=rev
Log:
fixed most of the compinning errors of ddraw
but not all
Modified:
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c
branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw.c Mon Jul 9 23:56:19 2007
@@ -30,13 +30,13 @@
#define COBJMACROS
#define NONAMELESSUNION
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
+//#endif
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_private.h Mon Jul 9 23:56:19 2007
@@ -34,12 +34,10 @@
# include <windows.h>
#endif
-/* Bug in ReactOS PSDK */
-typedef struct _RGNDATA
-{
- RGNDATAHEADER rdh;
- char Buffer[1];
-} RGNDATA, *PRGNDATA, *NPRGNDATA, *LPRGNDATA;
+
+
+
+
#include "ddraw.h"
#include "ddrawi.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/ddraw_thunks.c Mon Jul 9 23:56:19 2007
@@ -27,15 +27,13 @@
#define COBJMACROS
#define NONAMELESSUNION
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/device.c Mon Jul 9 23:56:19 2007
@@ -36,15 +36,14 @@
#define COBJMACROS
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/direct3d.c Mon Jul 9 23:56:19 2007
@@ -26,15 +26,14 @@
#define COBJMACROS
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/executebuffer.c Mon Jul 9 23:56:19 2007
@@ -31,15 +31,14 @@
#define COBJMACROS
#define NONAMELESSUNION
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/gamma.c Mon Jul 9 23:56:19 2007
@@ -28,15 +28,14 @@
#define COBJMACROS
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/light.c Mon Jul 9 23:56:19 2007
@@ -29,15 +29,14 @@
#define COBJMACROS
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/main.c Mon Jul 9 23:56:19 2007
@@ -33,14 +33,14 @@
#define COBJMACROS
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
# include "winreg.h"
-#endif
+//#endif
/* using the GPL PSEH libary for SEH Support */
#include <pseh/pseh.h>
@@ -594,7 +594,7 @@
{
Ret = E_INVALIDARG;
}
- SEH_END;
+ _SEH_END;
TRACE(" End of enumeration\n");
return Ret;
@@ -633,7 +633,7 @@
{
Ret = E_INVALIDARG;
}
- SEH_END;
+ _SEH_END;
TRACE("End of enumeration\n");
return Ret;
@@ -1056,7 +1056,7 @@
}
HRESULT WINAPI
-D3DParseUnknownCommand(DWORD arg0, DWORD arg1)
+D3DParseUnknownCommand(LPVOID arg0, LPVOID* arg1)
{
if (IsPassthrough())
return pD3DParseUnknownCommand(arg0, arg1);
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/material.c Mon Jul 9 23:56:19 2007
@@ -30,15 +30,14 @@
#define COBJMACROS
#define NONAMELESSUNION
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/parent.c Mon Jul 9 23:56:19 2007
@@ -31,15 +31,14 @@
#define COBJMACROS
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/surface.c Mon Jul 9 23:56:19 2007
@@ -34,15 +34,14 @@
#define COBJMACROS
#define NONAMELESSUNION
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/texture.c Mon Jul 9 23:56:19 2007
@@ -30,15 +30,13 @@
#define COBJMACROS
#define NONAMELESSUNION
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/vertexbuffer.c Mon Jul 9 23:56:19 2007
@@ -29,15 +29,14 @@
#define COBJMACROS
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
Modified: branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c?rev=27550&r1=27549&r2=27550&view=diff
==============================================================================
--- branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c (original)
+++ branches/reactx/reactos/dll/directx/WineD3D-0.9.36-Parallels/dlls/ddraw/viewport.c Mon Jul 9 23:56:19 2007
@@ -30,15 +30,14 @@
#define COBJMACROS
#define NONAMELESSUNION
-#ifndef WINE_NATIVEWIN32
+//#ifndef WINE_NATIVEWIN32
# include "windef.h"
# include "winbase.h"
# include "winnls.h"
# include "winerror.h"
# include "wingdi.h"
-#endif
-#include "wine/exception.h"
-#include "excpt.h"
+//#endif
+
#include "ddraw.h"
#include "d3d.h"
More information about the Ros-diffs
mailing list