[ros-diffs] [akhaldi] 61479: [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...

Author: akhaldi
Date: Wed Jan  1 21:52:15 2014
New Revision: 61479

URL: http://svn.reactos.org/svn/reactos?rev=61479&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/wininet/cookie.c
    trunk/reactos/dll/win32/wininet/dialogs.c
    trunk/reactos/dll/win32/wininet/ftp.c
    trunk/reactos/dll/win32/wininet/gopher.c
    trunk/reactos/dll/win32/wininet/http.c
    trunk/reactos/dll/win32/wininet/internet.c
    trunk/reactos/dll/win32/wininet/internet.h
    trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_De.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_En.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_He.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_It.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_No.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc
    trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc
    trunk/reactos/dll/win32/wininet/netconnection.c
    trunk/reactos/dll/win32/wininet/resource.h
    trunk/reactos/dll/win32/wininet/rsrc.rc
    trunk/reactos/dll/win32/wininet/urlcache.c
    trunk/reactos/dll/win32/wininet/utility.c
    trunk/reactos/dll/win32/wininet/wininet_main.c

Modified: trunk/reactos/dll/win32/wininet/cookie.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c…
==============================================================================
--- trunk/reactos/dll/win32/wininet/cookie.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/cookie.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -20,38 +20,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
-
-#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!

Modified: trunk/reactos/dll/win32/wininet/dialogs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.…
==============================================================================
--- trunk/reactos/dll/win32/wininet/dialogs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/dialogs.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -18,41 +18,12 @@
  * 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 <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-//#include "winreg.h"
-#include <wininet.h>
+#include "internet.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
 {

Modified: trunk/reactos/dll/win32/wininet/ftp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re…
==============================================================================
--- trunk/reactos/dll/win32/wininet/ftp.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/ftp.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -27,53 +27,7 @@
  * 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;
 

Modified: trunk/reactos/dll/win32/wininet/gopher.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/gopher.c…
==============================================================================
--- trunk/reactos/dll/win32/wininet/gopher.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/gopher.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -18,17 +18,7 @@
  * 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.@)

Modified: trunk/reactos/dll/win32/wininet/http.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r…
==============================================================================
--- trunk/reactos/dll/win32/wininet/http.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/http.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -27,59 +27,18 @@
  * 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 <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>
+#include "internet.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};

Modified: trunk/reactos/dll/win32/wininet/internet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet…
==============================================================================
--- trunk/reactos/dll/win32/wininet/internet.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/internet.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -26,60 +26,7 @@
  * 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
 

Modified: trunk/reactos/dll/win32/wininet/internet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet…
==============================================================================
--- trunk/reactos/dll/win32/wininet/internet.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/internet.h	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -23,14 +23,36 @@
 #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/unicode.h"
-#include "wine/list.h"
+#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 <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
@@ -38,16 +60,35 @@
 # 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
-
-#if !defined(__MINGW32__) && !defined(_MSC_VER)
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#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;
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Bg.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Cs.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -18,8 +18,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Da.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -16,8 +16,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_De.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -16,8 +16,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_En.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Eo.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Es.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Fi.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Fr.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -21,8 +21,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_He.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -16,8 +16,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Hu.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_It.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -18,8 +18,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Ja.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Ko.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -16,8 +16,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Lt.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Nl.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_No.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Pl.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Pt.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -18,8 +18,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Ro.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -16,8 +16,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Ru.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Si.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Sr.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -16,8 +16,6 @@
  * 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 "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Sv.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -15,8 +15,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -17,8 +17,6 @@
  * 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 "resource.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Uk.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -18,8 +18,6 @@
  * 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 "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…
==============================================================================
--- trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc	[iso-8859-1] Wed Jan  1 21:52:15
2014
@@ -18,8 +18,6 @@
  * 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 "resource.h"
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/wininet/netconnection.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne…
==============================================================================
--- trunk/reactos/dll/win32/wininet/netconnection.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/netconnection.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -21,78 +21,21 @@
  * 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

Modified: trunk/reactos/dll/win32/wininet/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/resource…
==============================================================================
--- trunk/reactos/dll/win32/wininet/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/resource.h	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -18,8 +18,7 @@
  * 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

Modified: trunk/reactos/dll/win32/wininet/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?…
==============================================================================
--- trunk/reactos/dll/win32/wininet/rsrc.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/rsrc.rc	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -19,9 +19,7 @@
  */
 
 #include <windef.h>
-//#include "winbase.h"
 #include <winuser.h>
-//#include "winnls.h"
 
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/wininet/urlcache.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache…
==============================================================================
--- trunk/reactos/dll/win32/wininet/urlcache.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/urlcache.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -22,47 +22,10 @@
  * 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 "internet.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);
 
 static const char urlcache_ver_prefix[] = "WINE URLCache Ver ";
 static const char urlcache_ver[] = "0.2012001";

Modified: trunk/reactos/dll/win32/wininet/utility.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.…
==============================================================================
--- trunk/reactos/dll/win32/wininet/utility.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/utility.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -22,31 +22,7 @@
  * 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
 

Modified: trunk/reactos/dll/win32/wininet/wininet_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_…
==============================================================================
--- trunk/reactos/dll/win32/wininet/wininet_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wininet/wininet_main.c	[iso-8859-1] Wed Jan  1 21:52:15 2014
@@ -18,17 +18,7 @@
  * 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.@)