[WININET]

* 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

diff --git a/reactos/dll/win32/wininet/cookie.c b/reactos/dll/win32/wininet/cookie.c
index 642e009..7595495 100644 (file)
--- a/reactos/dll/win32/wininet/cookie.c
+++ b/reactos/dll/win32/wininet/cookie.c
@@ -20,39 +20,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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 */
 
 #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!
  */
 /* FIXME
  *     Cookies could use A LOT OF MEMORY. We need some kind of memory management here!
  */

diff --git a/reactos/dll/win32/wininet/dialogs.c b/reactos/dll/win32/wininet/dialogs.c
index 07f0eb8..872022f 100644 (file)
--- a/reactos/dll/win32/wininet/dialogs.c
+++ b/reactos/dll/win32/wininet/dialogs.c
@@ -18,42 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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 <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 <cryptuiapi.h>
 

-#include "internet.h"
-
-//#include "wine/unicode.h"
-
-#include "resource.h"
-

 #define MAX_STRING_LEN 1024
 
 #define MAX_STRING_LEN 1024
 

-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-

 struct WININET_ErrorDlgParams
 {
     http_request_t *req;
 struct WININET_ErrorDlgParams
 {
     http_request_t *req;

diff --git a/reactos/dll/win32/wininet/ftp.c b/reactos/dll/win32/wininet/ftp.c
index cc64939..21d0863 100644 (file)
--- a/reactos/dll/win32/wininet/ftp.c
+++ b/reactos/dll/win32/wininet/ftp.c
@@ -27,54 +27,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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"
 
 #include "internet.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-

 typedef struct _ftp_session_t ftp_session_t;
 
 typedef struct
 typedef struct _ftp_session_t ftp_session_t;
 
 typedef struct

diff --git a/reactos/dll/win32/wininet/gopher.c b/reactos/dll/win32/wininet/gopher.c
index 525ba32..784beab 100644 (file)
--- a/reactos/dll/win32/wininet/gopher.c
+++ b/reactos/dll/win32/wininet/gopher.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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.@)
 
 /***********************************************************************
  *           GopherCreateLocatorA (WININET.@)

diff --git a/reactos/dll/win32/wininet/http.c b/reactos/dll/win32/wininet/http.c
index d1fc6d5..240533c 100644 (file)
--- a/reactos/dll/win32/wininet/http.c
+++ b/reactos/dll/win32/wininet/http.c
@@ -27,60 +27,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 
 #ifdef HAVE_ZLIB
 #  include <zlib.h>
 #endif
 

-#include <windef.h>
-#include <winbase.h>
-#include <wininet.h>
-//#include "winerror.h"

 #include <winternl.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/exception.h>

-//#include "wine/unicode.h"

 
 // ReactOS
 #include "inet_ntop.c"
 
 
 // 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};
 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};

diff --git a/reactos/dll/win32/wininet/internet.c b/reactos/dll/win32/wininet/internet.c
index c1ed10d..84adb26 100644 (file)
--- a/reactos/dll/win32/wininet/internet.c
+++ b/reactos/dll/win32/wininet/internet.c
@@ -26,60 +26,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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 "internet.h"

-#include "resource.h"
-
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(wininet);

 
 #define RESPONSE_TIMEOUT        30
 
 
 #define RESPONSE_TIMEOUT        30
 

diff --git a/reactos/dll/win32/wininet/internet.h b/reactos/dll/win32/wininet/internet.h
index 1b6dd26..eb2bf6b 100644 (file)
--- a/reactos/dll/win32/wininet/internet.h
+++ b/reactos/dll/win32/wininet/internet.h
@@ -23,14 +23,36 @@
 #ifndef _WINE_INTERNET_H_
 #define _WINE_INTERNET_H_
 
 #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>
 
 #include <time.h>

+
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif

 #ifdef HAVE_NETDB_H
 # include <netdb.h>
 #endif
 #ifdef HAVE_NETDB_H
 # include <netdb.h>
 #endif


@@ -38,17 +60,36 @@
 # include <sys/types.h>
 # include <netinet/in.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_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>
 
 #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
 extern HMODULE WININET_hModule DECLSPEC_HIDDEN;
 
 #ifndef INET6_ADDRSTRLEN

diff --git a/reactos/dll/win32/wininet/lang/wininet_Bg.rc b/reactos/dll/win32/wininet/lang/wininet_Bg.rc
index 25461fc..fdb2d5c 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Bg.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Bg.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Cs.rc b/reactos/dll/win32/wininet/lang/wininet_Cs.rc
index cbc2c5a..fcdf81d 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Cs.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Cs.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */

diff --git a/reactos/dll/win32/wininet/lang/wininet_Da.rc b/reactos/dll/win32/wininet/lang/wininet_Da.rc
index 767baec..e724c2a 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Da.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Da.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 #pragma code_page(65001)
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 #pragma code_page(65001)
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/wininet/lang/wininet_De.rc b/reactos/dll/win32/wininet/lang/wininet_De.rc
index 893ec88..6af071a 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_De.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_De.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/wininet/lang/wininet_En.rc b/reactos/dll/win32/wininet/lang/wininet_En.rc
index 5c303fc..b18808c 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_En.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_En.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Eo.rc b/reactos/dll/win32/wininet/lang/wininet_Eo.rc
index 8929e7e..7e3ddaa 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Eo.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Eo.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Es.rc b/reactos/dll/win32/wininet/lang/wininet_Es.rc
index a9b6abd..f6df22e 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Es.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Es.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Fi.rc b/reactos/dll/win32/wininet/lang/wininet_Fi.rc
index 302d090..ada8a5a 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Fi.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Fi.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Fr.rc b/reactos/dll/win32/wininet/lang/wininet_Fr.rc
index 255b79d..440f1e6 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Fr.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Fr.rc
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 /* UTF-8 */
 #pragma code_page(65001)
 
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/wininet/lang/wininet_He.rc b/reactos/dll/win32/wininet/lang/wininet_He.rc
index 4de3674..d5dd157 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_He.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_He.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 #pragma code_page(65001)
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 #pragma code_page(65001)
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/wininet/lang/wininet_Hu.rc b/reactos/dll/win32/wininet/lang/wininet_Hu.rc
index 720c146..d5eaef6 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Hu.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Hu.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 /* UTF-8 */
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 /* UTF-8 */

diff --git a/reactos/dll/win32/wininet/lang/wininet_It.rc b/reactos/dll/win32/wininet/lang/wininet_It.rc
index 279f991..8ab7810 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_It.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_It.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 /* UTF-8 */
 #pragma code_page(65001)
 
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/wininet/lang/wininet_Ja.rc b/reactos/dll/win32/wininet/lang/wininet_Ja.rc
index c0c7567..60ad642 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Ja.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Ja.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 /* UTF-8 */
 #pragma code_page(65001)
 
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/wininet/lang/wininet_Ko.rc b/reactos/dll/win32/wininet/lang/wininet_Ko.rc
index f499cb2..d60bf90 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Ko.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Ko.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 #pragma code_page(65001)
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 #pragma code_page(65001)
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/wininet/lang/wininet_Lt.rc b/reactos/dll/win32/wininet/lang/wininet_Lt.rc
index ab048d9..31167da 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Lt.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Lt.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 /* UTF-8 */
 #pragma code_page(65001)
 
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/wininet/lang/wininet_Nl.rc b/reactos/dll/win32/wininet/lang/wininet_Nl.rc
index adb49e6..fe07b67 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Nl.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/wininet/lang/wininet_No.rc b/reactos/dll/win32/wininet/lang/wininet_No.rc
index 9caaa7c..b4f0ff5 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_No.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_No.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 #pragma code_page(65001)
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

diff --git a/reactos/dll/win32/wininet/lang/wininet_Pl.rc b/reactos/dll/win32/wininet/lang/wininet_Pl.rc
index 4faa993..8c92dfd 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Pl.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Pl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Pt.rc b/reactos/dll/win32/wininet/lang/wininet_Pt.rc
index 28da452..3789e2a 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Pt.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Pt.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

diff --git a/reactos/dll/win32/wininet/lang/wininet_Ro.rc b/reactos/dll/win32/wininet/lang/wininet_Ro.rc
index 8412035..065fc10 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Ro.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Ro.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/wininet/lang/wininet_Ru.rc b/reactos/dll/win32/wininet/lang/wininet_Ru.rc
index dbe38f0..a301ff4 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Ru.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 /* UTF-8 */
 #pragma code_page(65001)
 
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/wininet/lang/wininet_Si.rc b/reactos/dll/win32/wininet/lang/wininet_Si.rc
index 3bc0213..d925557 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Si.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Si.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/wininet/lang/wininet_Sr.rc b/reactos/dll/win32/wininet/lang/wininet_Sr.rc
index 37a5742..f25c10b 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Sr.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Sr.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 #pragma code_page(65001)
 
 LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC

diff --git a/reactos/dll/win32/wininet/lang/wininet_Sv.rc b/reactos/dll/win32/wininet/lang/wininet_Sv.rc
index 50e57d0..ec70848 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Sv.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Sv.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Tr.rc b/reactos/dll/win32/wininet/lang/wininet_Tr.rc
index 7d54a68..5aa979a 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Tr.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Tr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDD_PROXYDLG DIALOG 36, 24, 250, 154

diff --git a/reactos/dll/win32/wininet/lang/wininet_Uk.rc b/reactos/dll/win32/wininet/lang/wininet_Uk.rc
index 3ab0ec3..409edc0 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Uk.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Uk.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

-#include "resource.h"
-

 /* UTF-8 */
 #pragma code_page(65001)
 
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/wininet/lang/wininet_Zh.rc b/reactos/dll/win32/wininet/lang/wininet_Zh.rc
index c242fd4..74a0beb 100644 (file)
--- a/reactos/dll/win32/wininet/lang/wininet_Zh.rc
+++ b/reactos/dll/win32/wininet/lang/wininet_Zh.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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)
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/wininet/netconnection.c b/reactos/dll/win32/wininet/netconnection.c
index 96efeaf..de61b08 100644 (file)
--- a/reactos/dll/win32/wininet/netconnection.c
+++ b/reactos/dll/win32/wininet/netconnection.c
@@ -21,79 +21,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 
 #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_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>
 #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
 
 #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 */
 
 #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.
 /* FIXME!!!!!!
  *    This should use winsock - To use winsock the functions will have to change a bit
  *        as they are designed for unix sockets.

diff --git a/reactos/dll/win32/wininet/resource.h b/reactos/dll/win32/wininet/resource.h
index bce5d34..cf1ace7 100644 (file)
--- a/reactos/dll/win32/wininet/resource.h
+++ b/reactos/dll/win32/wininet/resource.h
@@ -18,8 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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
 
 #define IDD_INVCERTDLG   0x398
 #define IDD_AUTHDLG      0x399

diff --git a/reactos/dll/win32/wininet/rsrc.rc b/reactos/dll/win32/wininet/rsrc.rc
index 040a63e..427a066 100644 (file)
--- a/reactos/dll/win32/wininet/rsrc.rc
+++ b/reactos/dll/win32/wininet/rsrc.rc
@@ -19,9 +19,7 @@
  */
 
 #include <windef.h>
  */
 
 #include <windef.h>

-//#include "winbase.h"

 #include <winuser.h>
 #include <winuser.h>

-//#include "winnls.h"

 
 #include "resource.h"
 
 
 #include "resource.h"
 

diff --git a/reactos/dll/win32/wininet/urlcache.c b/reactos/dll/win32/wininet/urlcache.c
index ae94478..0a5c844 100644 (file)
--- a/reactos/dll/win32/wininet/urlcache.c
+++ b/reactos/dll/win32/wininet/urlcache.c
@@ -22,47 +22,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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 "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";
 
 static const char urlcache_ver_prefix[] = "WINE URLCache Ver ";
 static const char urlcache_ver[] = "0.2012001";

diff --git a/reactos/dll/win32/wininet/utility.c b/reactos/dll/win32/wininet/utility.c
index 9cb2df5..b378395 100644 (file)
--- a/reactos/dll/win32/wininet/utility.c
+++ b/reactos/dll/win32/wininet/utility.c
@@ -22,32 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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"
 
 #include "internet.h"
 

-WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-

 #ifndef HAVE_GETADDRINFO
 
 /* critical section to protect non-reentrant gethostbyname() */
 #ifndef HAVE_GETADDRINFO
 
 /* critical section to protect non-reentrant gethostbyname() */

diff --git a/reactos/dll/win32/wininet/wininet_main.c b/reactos/dll/win32/wininet/wininet_main.c
index 84e1fcb..be0517f 100644 (file)
--- a/reactos/dll/win32/wininet/wininet_main.c
+++ b/reactos/dll/win32/wininet/wininet_main.c
@@ -18,17 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * 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.@)
 
 /***********************************************************************
  *             DllInstall (WININET.@)