* 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/resource file.
CORE-7716
svn path=/trunk/; revision=61479
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-#include <assert.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-#include <wininet.h>
-//#include "winerror.h"
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
-#include <wine/debug.h>
#include "internet.h"
#define RESPONSE_TIMEOUT 30 /* FROM internet.c */
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
/* FIXME
* Cookies could use A LOT OF MEMORY. We need some kind of memory management here!
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
+#include "internet.h"
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-//#include "winreg.h"
-#include <wininet.h>
#include <winnetwk.h>
-#include <wine/debug.h>
-//#include "winerror.h"
-#define NO_SHLWAPI_STREAM
-//#include "shlwapi.h"
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
#include <cryptuiapi.h>
-#include "internet.h"
-
-//#include "wine/unicode.h"
-
-#include "resource.h"
-
#define MAX_STRING_LEN 1024
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
struct WININET_ErrorDlgParams
{
http_request_t *req;
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <errno.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
-//#include <time.h>
-#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-#include <wininet.h>
-//#include "winnls.h"
-//#include "winerror.h"
-#include <winreg.h>
-//#include "winternl.h"
-#include <shlwapi.h>
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
-#include <wine/debug.h>
#include "internet.h"
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
typedef struct _ftp_session_t ftp_session_t;
typedef struct
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include <config.h>
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wininet.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
+#include "internet.h"
/***********************************************************************
* GopherCreateLocatorA (WININET.@)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
+#include "internet.h"
-//#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-//#include <time.h>
-#include <assert.h>
#ifdef HAVE_ZLIB
# include <zlib.h>
#endif
-#include <windef.h>
-#include <winbase.h>
-#include <wininet.h>
-//#include "winerror.h"
#include <winternl.h>
-#define NO_SHLWAPI_STREAM
-#define NO_SHLWAPI_REG
-#define NO_SHLWAPI_STRFCNS
-#define NO_SHLWAPI_GDI
-#include <shlwapi.h>
-#include <sspi.h>
-//#include "wincrypt.h"
-#include <winuser.h>
-#include <cryptuiapi.h>
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-#include "internet.h"
-#include <wine/debug.h>
#include <wine/exception.h>
-//#include "wine/unicode.h"
// ReactOS
#include "inet_ntop.c"
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0};
static const WCHAR g_szHttp1_1[] = {'H','T','T','P','/','1','.','1',0};
static const WCHAR szOK[] = {'O','K',0};
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-//#include <string.h>
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-//#include <stdlib.h>
-//#include <ctype.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-//#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>
-#include <wininet.h>
-//#include "winineti.h"
-//#include "winnls.h"
-#include <wine/debug.h>
-//#include "winerror.h"
-#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
-//#include "wine/exception.h"
-
#include "internet.h"
-#include "resource.h"
-
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
#define RESPONSE_TIMEOUT 30
#ifndef _WINE_INTERNET_H_
#define _WINE_INTERNET_H_
-#ifndef __WINE_CONFIG_H
-# error You must include config.h to use this header
-#endif
+#include <wine/config.h>
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
-#include "wine/unicode.h"
-#include "wine/list.h"
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <winuser.h>
+#include <wininet.h>
+#define NO_SHLWAPI_STREAM
+#define NO_SHLWAPI_REG
+#define NO_SHLWAPI_GDI
+#include <shlwapi.h>
+
+#include <wine/unicode.h>
+#include <wine/list.h>
#include <time.h>
+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
#ifdef HAVE_NETDB_H
# include <netdb.h>
#endif
# include <sys/types.h>
# include <netinet/in.h>
#endif
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+#ifdef HAVE_SYS_POLL_H
+# include <sys/poll.h>
+#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
-#if !defined(__MINGW32__) && !defined(_MSC_VER)
+#if defined(__MINGW32__) || defined (_MSC_VER)
+#include <ws2tcpip.h>
+#else
#define closesocket close
#define ioctlsocket ioctl
#endif /* __MINGW32__ */
#include <winineti.h>
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(wininet);
+
+#include "resource.h"
+
extern HMODULE WININET_hModule DECLSPEC_HIDDEN;
#ifndef INET6_ADDRSTRLEN
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
/* UTF-8 */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
#pragma code_page(65001)
LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
IDD_PROXYDLG DIALOG 36, 24, 250, 154
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "resource.h"
-
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#define NONAMELESSUNION
+#include "internet.h"
#include <sys/types.h>
#ifdef HAVE_POLL_H
#include <poll.h>
#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
#ifdef HAVE_SYS_FILIO_H
# include <sys/filio.h>
#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
#include <time.h>
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
#ifdef HAVE_NETINET_TCP_H
# include <netinet/tcp.h>
#endif
-#include <stdarg.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <stdio.h>
-//#include <errno.h>
-#include <assert.h>
-
-//#include "wine/library.h"
-#include <windef.h>
-#include <winbase.h>
-#include <wininet.h>
-//#include "winerror.h"
-//#include "wincrypt.h"
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
-#include <wine/debug.h>
-#include "internet.h"
-
-/* To avoid conflicts with the Unix socket headers. we only need it for
- * the error codes anyway. */
-#define USE_WS_PREFIX
-//#include "winsock2.h"
-
#define RESPONSE_TIMEOUT 30 /* FROM internet.c */
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
/* FIXME!!!!!!
* This should use winsock - To use winsock the functions will have to change a bit
* as they are designed for unix sockets.
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-//#include <windef.h>
-//#include <winuser.h>
+#pragma once
#define IDD_INVCERTDLG 0x398
#define IDD_AUTHDLG 0x399
*/
#include <windef.h>
-//#include "winbase.h"
#include <winuser.h>
-//#include "winnls.h"
#include "resource.h"
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-//#include <time.h>
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wininet.h>
-#include <winineti.h>
-//#include "winerror.h"
-#include <winreg.h>
-#include <shlwapi.h>
-#include <shlobj.h>
-#include <shellapi.h>
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
#include "internet.h"
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
+#include <shlobj.h>
+#include <shellapi.h>
static const char urlcache_ver_prefix[] = "WINE URLCache Ver ";
static const char urlcache_ver[] = "0.2012001";
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#include <config.h>
-//#include "wine/port.h"
-
-#include <stdarg.h>
-//#include <stdlib.h>
-//#include <string.h>
-//#include <time.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <wininet.h>
-//#include "winnls.h"
-
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
-#include <wine/debug.h>
#include "internet.h"
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-
#ifndef HAVE_GETADDRINFO
/* critical section to protect non-reentrant gethostbyname() */
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winreg.h"
-//#include "shlwapi.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
+#include "internet.h"
/***********************************************************************
* DllInstall (WININET.@)