[INETCOMM]

* 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.
CORE-7716

svn path=/trunk/; revision=61383
This commit is contained in:
Amine Khaldi 2013-12-24 21:14:27 +00:00
parent 40d21d6d6d
commit 1644776d78
8 changed files with 25 additions and 147 deletions

View file

@ -18,27 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <stdarg.h>
//#include <stdio.h>
#include <windef.h>
#include <winbase.h>
//#include "winnt.h"
//#include "winuser.h"
#include <objbase.h>
#include <mimeole.h>
#include <wine/debug.h>
#include "inetcomm_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
typedef struct
{
InternetTransport InetTransport;

View file

@ -18,29 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "winnt.h"
//#include "winuser.h"
#include <ole2.h>
//#include "ocidl.h"
#include <rpcproxy.h>
#include <initguid.h>
#include <mimeole.h>
#include "inetcomm_private.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
#include <rpcproxy.h>
static HINSTANCE instance;

View file

@ -18,11 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include <stdio.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#include <windef.h>
#include <winbase.h>
#include <ole2.h>
#include <initguid.h>
#include <mimeole.h>
#include <winsock2.h>
//#include "winuser.h"
//#include "objbase.h"
#include <imnxport.h>
#include <wine/list.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
typedef struct InternetTransport InternetTransport;
typedef void (*INETXPORT_COMPLETION_FUNCTION)(IInternetTransport *, char *, int);

View file

@ -18,28 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <ws2tcpip.h>
//#include "winnt.h"
#include <objbase.h>
//#include "ole2.h"
#include <mimeole.h>
#include <stdio.h>
#include <wine/debug.h>
#include "inetcomm_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
#include <ws2tcpip.h>
static const WCHAR wszClassName[] = {'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0};

View file

@ -18,32 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#include <stdarg.h>
//#include <stdio.h>
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "winnls.h"
//#include "objbase.h"
#include <ole2.h>
#include <mimeole.h>
#include <mlang.h>
#include <wine/list.h>
#include <wine/unicode.h>
#include <wine/debug.h>
#include "inetcomm_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
#include <mlang.h>
#include <wine/unicode.h>
typedef struct
{

View file

@ -19,30 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#include <stdarg.h>
//#include <stdio.h>
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
//#include "objbase.h"
#include <ole2.h>
#include <mimeole.h>
#include <wine/list.h>
#include <wine/debug.h>
#include "inetcomm_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
typedef struct
{
LPCSTR name;

View file

@ -18,28 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
//#include <stdarg.h>
#include <stdio.h>
#include <windef.h>
#include <winbase.h>
//#include "winnt.h"
//#include "winuser.h"
#include <objbase.h>
#include <mimeole.h>
#include <wine/debug.h>
#include "inetcomm_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
enum parse_state
{
STATE_NONE,

View file

@ -20,27 +20,8 @@
*
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
//#include <stdarg.h>
#include <stdio.h>
#include <windef.h>
#include <winbase.h>
//#include "winnt.h"
//#include "winuser.h"
#include <objbase.h>
#include <mimeole.h>
#include <wine/debug.h>
#include "inetcomm_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(inetcomm);
typedef struct
{
InternetTransport InetTransport;