[PATCH] Move d3dx8core_private.h to the more generic d3dx8_private.=

David Adam DavidAdam at math.cnrs.fr
Sun Dec 9 15:41:24 CST 2007


h

---
 dlls/d3dx8/d3dx8_main.c        |    3 +-
 dlls/d3dx8/d3dx8_private.h     |   73 +++++++++++++++++++++++++++++++++++++=
+++
 dlls/d3dx8/d3dx8core_private.h |   73 -------------------------------------=
---
 dlls/d3dx8/d3dxbuffer.c        |    2 +-
 4 files changed, 75 insertions(+), 76 deletions(-)
 create mode 100644 dlls/d3dx8/d3dx8_private.h
 delete mode 100644 dlls/d3dx8/d3dx8core_private.h

diff --git a/dlls/d3dx8/d3dx8_main.c b/dlls/d3dx8/d3dx8_main.c
index 16c3740..c24aedc 100644
--- a/dlls/d3dx8/d3dx8_main.c
+++ b/dlls/d3dx8/d3dx8_main.c
@@ -30,8 +30,7 @@
 #include "winuser.h"
 #include "wine/debug.h"
 #include "wine/unicode.h"
-#include "d3dx8core.h"
-#include "d3dx8core_private.h"
+#include "d3dx8_private.h"
=20
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
=20
diff --git a/dlls/d3dx8/d3dx8_private.h b/dlls/d3dx8/d3dx8_private.h
new file mode 100644
index 0000000..63cc91e
--- /dev/null
+++ b/dlls/d3dx8/d3dx8_private.h
@@ -0,0 +1,73 @@
+/*
+ * Direct3D X 8 private include file
+ *
+ * Copyright 2002 Raphael Junqueira
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US=
A
+ */
+
+#ifndef __WINE_D3DX8_PRIVATE_H
+#define __WINE_D3DX8_PRIVATE_H
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "d3dx8.h"
+
+/* Interfaces */
+typedef struct ID3DXBufferImpl ID3DXBufferImpl;
+typedef struct ID3DXFontImpl   ID3DXFontImpl;
+
+/* ----------- */
+/* ID3DXBuffer */
+/* ----------- */
+
+/**************************************************************************=
***
+ * Predeclare the interface implementation structures
+ */
+extern const ID3DXBufferVtbl D3DXBuffer_Vtbl;
+
+/**************************************************************************=
***
+ * ID3DXBufferImpl implementation structure
+ */
+struct ID3DXBufferImpl
+{
+  /* IUnknown fields */
+  const ID3DXBufferVtbl *lpVtbl;
+  LONG           ref;
+
+  /* ID3DXBuffer fields */
+  DWORD         *buffer;
+  DWORD          bufferSize;
+};
+
+/* --------- */
+/* ID3DXFont */
+/* --------- */
+
+/**************************************************************************=
***
+ * ID3DXFontImpl implementation structure
+ */
+struct ID3DXFontImpl
+{
+  /* IUnknown fields */
+  const ID3DXFontVtbl *lpVtbl;
+  LONG           ref;
+
+  /* ID3DXFont fields */
+};
+
+#endif /*__WINE_D3DX8_PRIVATE_H */
diff --git a/dlls/d3dx8/d3dx8core_private.h b/dlls/d3dx8/d3dx8core_private.h
deleted file mode 100644
index fb98b38..0000000
--- a/dlls/d3dx8/d3dx8core_private.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Direct3D X 8 private include file
- *
- * Copyright 2002 Raphael Junqueira
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US=
A
- */
-
-#ifndef __WINE_D3DX8CORE_PRIVATE_H
-#define __WINE_D3DX8CORE_PRIVATE_H
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "d3dx8core.h"
-
-/* Interfaces */
-typedef struct ID3DXBufferImpl ID3DXBufferImpl;
-typedef struct ID3DXFontImpl   ID3DXFontImpl;
-
-/* ----------- */
-/* ID3DXBuffer */
-/* ----------- */
-
-/**************************************************************************=
***
- * Predeclare the interface implementation structures
- */
-extern const ID3DXBufferVtbl D3DXBuffer_Vtbl;
-
-/**************************************************************************=
***
- * ID3DXBufferImpl implementation structure
- */
-struct ID3DXBufferImpl
-{
-  /* IUnknown fields */
-  const ID3DXBufferVtbl *lpVtbl;
-  LONG           ref;
-
-  /* ID3DXBuffer fields */
-  DWORD         *buffer;
-  DWORD          bufferSize;
-};
-
-/* --------- */
-/* ID3DXFont */
-/* --------- */
-
-/**************************************************************************=
***
- * ID3DXFontImpl implementation structure
- */
-struct ID3DXFontImpl
-{
-  /* IUnknown fields */
-  const ID3DXFontVtbl *lpVtbl;
-  LONG           ref;
-
-  /* ID3DXFont fields */
-};
-
-#endif /*__WINE_D3DX8CORE_PRIVATE_H */
diff --git a/dlls/d3dx8/d3dxbuffer.c b/dlls/d3dx8/d3dxbuffer.c
index 369714c..56591c0 100644
--- a/dlls/d3dx8/d3dxbuffer.c
+++ b/dlls/d3dx8/d3dxbuffer.c
@@ -31,7 +31,7 @@
 #include "wine/debug.h"
=20
 #include "d3d8.h"
-#include "d3dx8core_private.h"
+#include "d3dx8_private.h"
=20
 WINE_DEFAULT_DEBUG_CHANNEL(d3d);
=20
--=20
1.5.3.2


--=_63sks3idx1gk--



More information about the wine-patches mailing list