[akhaldi] 61720: [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 ...
Author: akhaldi Date: Mon Jan 20 11:28:30 2014 New Revision: 61720
URL: http://svn.reactos.org/svn/reactos?rev=61720&view=rev Log: [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
Modified: trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/dll/directx/wine/dplayx/dplay_global.h trunk/reactos/dll/directx/wine/dplayx/dplaysp.c trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h trunk/reactos/dll/directx/wine/dplayx/dplobby.c trunk/reactos/dll/directx/wine/dplayx/lobbysp.c trunk/reactos/dll/directx/wine/dplayx/lobbysp.h trunk/reactos/dll/directx/wine/dplayx/name_server.c trunk/reactos/dll/directx/wine/dplayx/name_server.h
Modified: trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpc... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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 {
Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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
Modified: trunk/reactos/dll/directx/wine/dplayx/dplay_global.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplay_global.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplay_global.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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;
Modified: trunk/reactos/dll/directx/wine/dplayx/dplaysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplaysp.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplaysp.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -18,20 +18,9 @@ * 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 );
Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_global.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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 */
Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_global.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -19,15 +19,33 @@ #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;
Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_main.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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;
Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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 {
Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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 @@
#include <poppack.h>
-#endif +#endif /* __WINE_DPLAYX_MESSAGES__ */
Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplayx_queue.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -25,11 +25,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)
Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dpl... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/dplobby.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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,
Modified: trunk/reactos/dll/directx/wine/dplayx/lobbysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/lob... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/lobbysp.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/lobbysp.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -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 );
Modified: trunk/reactos/dll/directx/wine/dplayx/lobbysp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/lob... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/lobbysp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/lobbysp.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -18,13 +18,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); @@ -516,4 +509,4 @@ */ extern DWORD gdwDPlaySPRefCount DECLSPEC_HIDDEN;
-#endif +#endif /* __WINE_LOBBY_SP_H */
Modified: trunk/reactos/dll/directx/wine/dplayx/name_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/nam... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/name_server.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/name_server.c [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -19,27 +19,11 @@
/* 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 "dplayx_global.h" + #include <mmsystem.h>
-//#include "dplayx_global.h" -#include "name_server.h" -//#include "dplaysp.h" -//#include "dplayx_messages.h" -//#include "dplayx_queue.h" - /* FIXME: Need to create a crit section, store and use it */ - -WINE_DEFAULT_DEBUG_CHANNEL(dplay);
/* NS specific structures */ struct NSCacheData
Modified: trunk/reactos/dll/directx/wine/dplayx/name_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/nam... ============================================================================== --- trunk/reactos/dll/directx/wine/dplayx/name_server.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplayx/name_server.h [iso-8859-1] Mon Jan 20 11:28:30 2014 @@ -18,15 +18,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,
-
akhaldi＠svn.reactos.org