From 5e03836603db95347a75e4d7d7906bee606a93ef Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Fri, 29 Mar 2013 17:11:29 +0100
Subject: [PATCH] dplayx: Merge dpinit.h into dplay_global.h.

---
 dlls/dplayx/dpclassfactory.c |  2 +-
 dlls/dplayx/dpinit.h         | 37 ------------------------------------
 dlls/dplayx/dplay.c          |  1 -
 dlls/dplayx/dplay_global.h   |  5 +++++
 dlls/dplayx/dplaysp.c        |  1 -
 dlls/dplayx/dplobby.c        |  1 -
 dlls/dplayx/lobbysp.c        |  1 -
 7 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 dlls/dplayx/dpinit.h

diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c
index 438ad605f9..c64c5fcca4 100644
--- a/dlls/dplayx/dpclassfactory.c
+++ b/dlls/dplayx/dpclassfactory.c
@@ -31,7 +31,7 @@
 #include "dplay.h"
 #include "dplobby.h"
 #include "initguid.h"
-#include "dpinit.h"
+#include "dplay_global.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h
deleted file mode 100644
index 090b67a832..0000000000
--- a/dlls/dplayx/dpinit.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 1999, 2000 Peter Hunnisett
- *
- * 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, USA
- */
-
-#ifndef __WINE_DPINIT_H
-#define __WINE_DPINIT_H
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "dplay_global.h"
-
-extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN;
-extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN;
-extern HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj,
-                                     IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN;
-extern HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj,
-                                      IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN;
-
-
-#endif
diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c
index b7b9cdd123..eb52cd2c94 100644
--- a/dlls/dplayx/dplay.c
+++ b/dlls/dplayx/dplay.c
@@ -35,7 +35,6 @@
 #include "wine/unicode.h"
 #include "wine/debug.h"
 
-#include "dpinit.h"
 #include "dplayx_global.h"
 #include "name_server.h"
 #include "dplayx_queue.h"
diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h
index 18eb807721..0928c1aa53 100644
--- a/dlls/dplayx/dplay_global.h
+++ b/dlls/dplayx/dplay_global.h
@@ -209,4 +209,9 @@ extern HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID
 /* DP external interfaces to call into DPSP interface */
 extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN;
 
+extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN;
+extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN;
+extern HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN;
+extern HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN;
+
 #endif /* __WINE_DPLAY_GLOBAL_INCLUDED */
diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index 9ce6910461..4a8c4a50cd 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -22,7 +22,6 @@
 #include "winerror.h"
 #include "wine/debug.h"
 
-#include "dpinit.h"
 #include "wine/dplaysp.h"
 #include "dplay_global.h"
 #include "name_server.h"
diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c
index cbdd128282..46a2168edb 100644
--- a/dlls/dplayx/dplobby.c
+++ b/dlls/dplayx/dplobby.c
@@ -32,7 +32,6 @@
 #include "dplayx_messages.h"
 #include "dplayx_queue.h"
 #include "dplobby.h"
-#include "dpinit.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c
index 737cb3f066..18d9d006f0 100644
--- a/dlls/dplayx/lobbysp.c
+++ b/dlls/dplayx/lobbysp.c
@@ -23,7 +23,6 @@
 
 #include "lobbysp.h"
 #include "dplay_global.h"
-#include "dpinit.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dplay);