[DPLAYX]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61720

diff --git a/reactos/dll/directx/wine/dplayx/dpclassfactory.c b/reactos/dll/directx/wine/dplayx/dpclassfactory.c
index 67f36ca..e2300dd 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dpclassfactory.c
+++ b/reactos/dll/directx/wine/dplayx/dpclassfactory.c
@@ -17,23 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "objbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "dplay.h"
-//#include "dplobby.h"
-//#include "initguid.h"
-#include "dplay_global.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
-
+#include "dplayx_global.h"
 
 typedef struct
 {

diff --git a/reactos/dll/directx/wine/dplayx/dplay.c b/reactos/dll/directx/wine/dplayx/dplay.c
index e4514bf..01243fd 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplay.c
+++ b/reactos/dll/directx/wine/dplayx/dplay.c
@@ -17,31 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define COBJMACROS
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <stdarg.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-//#include "winerror.h"
-//#include "winbase.h"
-//#include "winnt.h"
-#include <winreg.h>
-//#include "winnls.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
-
 #include "dplayx_global.h"
-#include "name_server.h"
-//#include "dplayx_queue.h"
-//#include "dplaysp.h"
-//#include "dplay_global.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* FIXME: Should this be externed? */
 extern HRESULT DPL_CreateCompoundAddress

diff --git a/reactos/dll/directx/wine/dplayx/dplay_global.h b/reactos/dll/directx/wine/dplayx/dplay_global.h
index 7e4177e..6acb120 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplay_global.h
+++ b/reactos/dll/directx/wine/dplayx/dplay_global.h
@@ -19,17 +19,6 @@
 #ifndef __WINE_DPLAY_GLOBAL_INCLUDED
 #define __WINE_DPLAY_GLOBAL_INCLUDED
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#include "dplaysp.h"
-#include "lobbysp.h"
-#include "dplayx_queue.h"
-
 extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback,
                                 LPCVOID lpAddress, DWORD dwAddressSize,
                                 LPVOID lpContext ) DECLSPEC_HIDDEN;

diff --git a/reactos/dll/directx/wine/dplayx/dplaysp.c b/reactos/dll/directx/wine/dplayx/dplaysp.c
index 56aa7e6..d01e1c1 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplaysp.c
+++ b/reactos/dll/directx/wine/dplayx/dplaysp.c
@@ -18,21 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <string.h>
-//#include "winerror.h"
-#include <wine/debug.h>
-
-//#include "dplaysp.h"
-//#include "dplay_global.h"
-#include "name_server.h"
-//#include "dplayx_messages.h"
-
-#include "dplayx_global.h" /* FIXME: For global hack */
+#include "dplayx_global.h"
 
 /* FIXME: Need to add interface locking inside procedures */
 
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
-
 /* Prototypes */
 static BOOL DPSP_CreateIUnknown( LPVOID lpSP );
 static BOOL DPSP_DestroyIUnknown( LPVOID lpSP );

diff --git a/reactos/dll/directx/wine/dplayx/dplayx_global.c b/reactos/dll/directx/wine/dplayx/dplayx_global.c
index 86551b5..723744c 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplayx_global.c
+++ b/reactos/dll/directx/wine/dplayx/dplayx_global.c
@@ -29,24 +29,7 @@
  *
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <wine/debug.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/unicode.h>
-
-//#include "wingdi.h"
-//#include "winuser.h"
-
 #include "dplayx_global.h"
-//#include "dplayx_messages.h" /* For CreateMessageReceptionThread only */
-
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* FIXME: Need to do all that fun other dll referencing type of stuff */
 

diff --git a/reactos/dll/directx/wine/dplayx/dplayx_global.h b/reactos/dll/directx/wine/dplayx/dplayx_global.h
index db86a90..e388e07 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplayx_global.h
+++ b/reactos/dll/directx/wine/dplayx/dplayx_global.h
@@ -19,16 +19,34 @@
 #ifndef __WINE_DPLAYX_GLOBAL
 #define __WINE_DPLAYX_GLOBAL
 
+#include <wine/config.h>
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 
-#include <stdarg.h>
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #include <windef.h>
 #include <winbase.h>
-//#include "winuser.h"
+#include <winreg.h>
 #include <dplay.h>
 
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+#include "dplaysp.h"
+#include "lobbysp.h"
+#include "dplayx_queue.h"
+#include "dplay_global.h"
+#include "dplayx_messages.h"
+#include "name_server.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dplay);
+
 BOOL DPLAYX_ConstructData(void) DECLSPEC_HIDDEN;
 BOOL DPLAYX_DestructData(void) DECLSPEC_HIDDEN;
 

diff --git a/reactos/dll/directx/wine/dplayx/dplayx_main.c b/reactos/dll/directx/wine/dplayx/dplayx_main.c
index ac8eb9c..423ee70 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplayx_main.c
+++ b/reactos/dll/directx/wine/dplayx/dplayx_main.c
@@ -57,20 +57,9 @@
  *    somehow.
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-//#include "winerror.h"
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <rpcproxy.h>
-#include <wine/debug.h>
 #include "dplayx_global.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
+#include <rpcproxy.h>
 
 static HINSTANCE instance;
 

diff --git a/reactos/dll/directx/wine/dplayx/dplayx_messages.c b/reactos/dll/directx/wine/dplayx/dplayx_messages.c
index 952e480..bed90dc 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplayx_messages.c
+++ b/reactos/dll/directx/wine/dplayx/dplayx_messages.c
@@ -20,21 +20,7 @@
  *  o Messaging interface required for both DirectPlay and DirectPlayLobby.
  */
 
-//#include <stdarg.h>
-//#include <string.h>
-//#include "windef.h"
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winerror.h"
-
-//#include "dplayx_messages.h"
-//#include "dplay_global.h"
 #include "dplayx_global.h"
-#include "name_server.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 typedef struct tagMSGTHREADINFO
 {

diff --git a/reactos/dll/directx/wine/dplayx/dplayx_messages.h b/reactos/dll/directx/wine/dplayx/dplayx_messages.h
index 5bba7fc..755f8be 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplayx_messages.h
+++ b/reactos/dll/directx/wine/dplayx/dplayx_messages.h
@@ -19,15 +19,6 @@
 #ifndef __WINE_DPLAYX_MESSAGES__
 #define __WINE_DPLAYX_MESSAGES__
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dplay.h"
-//#include "rpc.h" /* For GUID */
-
-#include "dplay_global.h"
-
 DWORD CreateLobbyMessageReceptionThread( HANDLE hNotifyEvent, HANDLE hStart,
                                          HANDLE hDeath, HANDLE hConnRead ) DECLSPEC_HIDDEN;
 
@@ -220,4 +211,4 @@ typedef const DPMSG_FORWARDADDPLAYERNACK* LPCDPMSG_FORWARDADDPLAYERNACK;
 
 #include <poppack.h>
 
-#endif
+#endif /* __WINE_DPLAYX_MESSAGES__ */

diff --git a/reactos/dll/directx/wine/dplayx/dplayx_queue.h b/reactos/dll/directx/wine/dplayx/dplayx_queue.h
index 33467ee..3cd4f0b 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplayx_queue.h
+++ b/reactos/dll/directx/wine/dplayx/dplayx_queue.h
@@ -26,11 +26,6 @@
 #ifndef __WINE_DPLAYX_QUEUE_H
 #define __WINE_DPLAYX_QUEUE_H
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-
 #define DPQ_INSERT(a,b,c) DPQ_INSERT_IN_TAIL(a,b,c)
 
 /*

diff --git a/reactos/dll/directx/wine/dplayx/dplobby.c b/reactos/dll/directx/wine/dplayx/dplobby.c
index f8ccc6a..27fd91b 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/dplobby.c
+++ b/reactos/dll/directx/wine/dplayx/dplobby.c
@@ -16,25 +16,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#include <stdarg.h>
-//#include <string.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <winreg.h>
-#include <winnls.h>
-#include <wine/debug.h>
 
 #include "dplayx_global.h"
-#include "dplayx_messages.h"
-//#include "dplayx_queue.h"
-//#include "dplobby.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
 
 /* Forward declarations for this module helper methods */
 HRESULT DPL_CreateCompoundAddress ( LPCDPCOMPOUNDADDRESSELEMENT lpElements, DWORD dwElementCount,

diff --git a/reactos/dll/directx/wine/dplayx/lobbysp.c b/reactos/dll/directx/wine/dplayx/lobbysp.c
index 40f17fa..3ed5e98 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/lobbysp.c
+++ b/reactos/dll/directx/wine/dplayx/lobbysp.c
@@ -18,13 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "winerror.h"
-#include <wine/debug.h>
-
-//#include "lobbysp.h"
-#include "dplay_global.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
+#include "dplayx_global.h"
 
 /* Prototypes */
 static BOOL DPLSP_CreateIUnknown( LPVOID lpSP );

diff --git a/reactos/dll/directx/wine/dplayx/lobbysp.h b/reactos/dll/directx/wine/dplayx/lobbysp.h
index e24d94b..2a214a9 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/lobbysp.h
+++ b/reactos/dll/directx/wine/dplayx/lobbysp.h
@@ -19,13 +19,6 @@
 #ifndef __WINE_LOBBY_SP_H
 #define __WINE_LOBBY_SP_H
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-#include "dplobby.h"
-
 /* GUID for IDPLobbySP {5A4E5A20-2CED-11d0-A889-00A0C905433C} */
 DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20, 0x2ced, 0x11d0, 0xa8, 0x89, 0x0, 0xa0, 0xc9, 0x5, 0x43, 0x3c);
 typedef struct IDPLobbySP *LPDPLOBBYSP;
@@ -516,4 +509,4 @@ DECLARE_INTERFACE_(IDPLobbySP,IUnknown)
  */
 extern DWORD gdwDPlaySPRefCount DECLSPEC_HIDDEN;
 
-#endif
+#endif /* __WINE_LOBBY_SP_H */

diff --git a/reactos/dll/directx/wine/dplayx/name_server.c b/reactos/dll/directx/wine/dplayx/name_server.c
index 63a1013..ffc8098 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/name_server.c
+++ b/reactos/dll/directx/wine/dplayx/name_server.c
@@ -19,28 +19,12 @@
 
 /* NOTE: Methods with the NS_ prefix are name server methods */
 
-//#include <stdarg.h>
-//#include <string.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winnls.h"
-#include <wine/unicode.h>
-#include <wine/debug.h>
-#include <mmsystem.h>
+#include "dplayx_global.h"
 
-//#include "dplayx_global.h"
-#include "name_server.h"
-//#include "dplaysp.h"
-//#include "dplayx_messages.h"
-//#include "dplayx_queue.h"
+#include <mmsystem.h>
 
 /* FIXME: Need to create a crit section, store and use it */
 
-WINE_DEFAULT_DEBUG_CHANNEL(dplay);
-
 /* NS specific structures */
 struct NSCacheData
 {

diff --git a/reactos/dll/directx/wine/dplayx/name_server.h b/reactos/dll/directx/wine/dplayx/name_server.h
index b4a9406..6213cce 100644 (file)
--- a/reactos/dll/directx/wine/dplayx/name_server.h
+++ b/reactos/dll/directx/wine/dplayx/name_server.h
@@ -19,15 +19,6 @@
 #ifndef __WINE_DPLAYX_NAMESERVER
 #define __WINE_DPLAYX_NAMESERVER
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "dplay.h"
-//#include "dplaysp.h"
-#include "dplayx_messages.h"
-//#include "dplay_global.h"
-
 void NS_SetLocalComputerAsNameServer( LPCDPSESSIONDESC2 lpsd, LPVOID lpNSInfo ) DECLSPEC_HIDDEN;
 void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr,
                                        DWORD dwHdrSize,