From 1e7dbd47e79b8a82be9ed7b31d3242bf69e825c9 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Wed, 1 Jan 2014 21:52:15 +0000 Subject: [PATCH] [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 --- reactos/dll/win32/wininet/cookie.c | 29 ---------- reactos/dll/win32/wininet/dialogs.c | 31 +--------- reactos/dll/win32/wininet/ftp.c | 46 --------------- reactos/dll/win32/wininet/gopher.c | 12 +--- reactos/dll/win32/wininet/http.c | 43 +------------- reactos/dll/win32/wininet/internet.c | 53 ------------------ reactos/dll/win32/wininet/internet.h | 53 ++++++++++++++++-- reactos/dll/win32/wininet/lang/wininet_Bg.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Cs.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Da.rc | 2 - reactos/dll/win32/wininet/lang/wininet_De.rc | 2 - reactos/dll/win32/wininet/lang/wininet_En.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Eo.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Es.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Fi.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Fr.rc | 2 - reactos/dll/win32/wininet/lang/wininet_He.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Hu.rc | 2 - reactos/dll/win32/wininet/lang/wininet_It.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Ja.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Ko.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Lt.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Nl.rc | 2 - reactos/dll/win32/wininet/lang/wininet_No.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Pl.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Pt.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Ro.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Ru.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Si.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Sr.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Sv.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Tr.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Uk.rc | 2 - reactos/dll/win32/wininet/lang/wininet_Zh.rc | 2 - reactos/dll/win32/wininet/netconnection.c | 59 +------------------- reactos/dll/win32/wininet/resource.h | 3 +- reactos/dll/win32/wininet/rsrc.rc | 2 - reactos/dll/win32/wininet/urlcache.c | 41 +------------- reactos/dll/win32/wininet/utility.c | 24 -------- reactos/dll/win32/wininet/wininet_main.c | 12 +--- 40 files changed, 55 insertions(+), 407 deletions(-) diff --git a/reactos/dll/win32/wininet/cookie.c b/reactos/dll/win32/wininet/cookie.c index 642e00908fa..75954951d55 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" - -#include -#include -//#include -//#include -#include -#ifdef HAVE_UNISTD_H -# include -#endif - -#include -#include -#include -//#include "winerror.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - -#include #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! */ diff --git a/reactos/dll/win32/wininet/dialogs.c b/reactos/dll/win32/wininet/dialogs.c index 07f0eb807f1..872022f82e8 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" - -#include +#include "internet.h" -#include -#include -#include -//#include "winreg.h" -#include #include -#include -//#include "winerror.h" -#define NO_SHLWAPI_STREAM -//#include "shlwapi.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - #include -#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; diff --git a/reactos/dll/win32/wininet/ftp.c b/reactos/dll/win32/wininet/ftp.c index cc649390869..21d086342ef 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" - -//#include -//#include -#include -//#include -//#include -//#include -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#ifdef HAVE_ARPA_INET_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif -#ifdef HAVE_SYS_IOCTL_H -# include -#endif -//#include -#include - -#include -#include -//#include "wingdi.h" -//#include "winuser.h" -#include -//#include "winnls.h" -//#include "winerror.h" -#include -//#include "winternl.h" -#include - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - -#include #include "internet.h" -WINE_DEFAULT_DEBUG_CHANNEL(wininet); - 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 525ba32277b..784beab58f9 100644 --- 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 */ -#include - -#include - -#include -#include -#include - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); +#include "internet.h" /*********************************************************************** * GopherCreateLocatorA (WININET.@) diff --git a/reactos/dll/win32/wininet/http.c b/reactos/dll/win32/wininet/http.c index d1fc6d52983..240533cc9bf 100644 --- 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 */ -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" +#include "internet.h" -//#include -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#ifdef HAVE_ARPA_INET_H -# include -#endif -//#include -#include -//#include -#ifdef HAVE_UNISTD_H -# include -#endif -//#include -#include #ifdef HAVE_ZLIB # include #endif -#include -#include -#include -//#include "winerror.h" #include -#define NO_SHLWAPI_STREAM -#define NO_SHLWAPI_REG -#define NO_SHLWAPI_STRFCNS -#define NO_SHLWAPI_GDI -#include -#include -//#include "wincrypt.h" -#include -#include - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif -#include "internet.h" -#include #include -//#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}; diff --git a/reactos/dll/win32/wininet/internet.c b/reactos/dll/win32/wininet/internet.c index c1ed10ddea6..84adb264e1e 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" - -//#include -//#include -#include -//#include -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#ifdef HAVE_POLL_H -#include -#endif -#ifdef HAVE_SYS_POLL_H -# include -#endif -#ifdef HAVE_SYS_TIME_H -# include -#endif -//#include -//#include -#ifdef HAVE_UNISTD_H -# include -#endif -//#include - -#include -#include -#include -#include -#include -//#include "winineti.h" -//#include "winnls.h" -#include -//#include "winerror.h" -#define NO_SHLWAPI_STREAM -#include - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - -//#include "wine/exception.h" - #include "internet.h" -#include "resource.h" - -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define RESPONSE_TIMEOUT 30 diff --git a/reactos/dll/win32/wininet/internet.h b/reactos/dll/win32/wininet/internet.h index 1b6dd262e2d..eb2bf6b9958 100644 --- 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_CONFIG_H -# error You must include config.h to use this header -#endif +#include + +#include +#include +#include + +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT -#include "wine/unicode.h" -#include "wine/list.h" +#include +#include +#include +#include +#include +#define NO_SHLWAPI_STREAM +#define NO_SHLWAPI_REG +#define NO_SHLWAPI_GDI +#include + +#include +#include #include + +#ifdef HAVE_ARPA_INET_H +# include +#endif #ifdef HAVE_NETDB_H # include #endif @@ -38,17 +60,36 @@ # include # include #endif +#ifdef HAVE_SYS_IOCTL_H +# include +#endif +#ifdef HAVE_SYS_POLL_H +# include +#endif #ifdef HAVE_SYS_SOCKET_H # include #endif +#ifdef HAVE_SYS_TIME_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif -#if !defined(__MINGW32__) && !defined(_MSC_VER) +#if defined(__MINGW32__) || defined (_MSC_VER) +#include +#else #define closesocket close #define ioctlsocket ioctl #endif /* __MINGW32__ */ #include +#include +WINE_DEFAULT_DEBUG_CHANNEL(wininet); + +#include "resource.h" + 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 25461fc3ce2..fdb2d5c659e 100644 --- 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 */ -#include "resource.h" - 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 cbc2c5a1bb7..fcdf81d9b36 100644 --- 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 */ -#include "resource.h" - 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 767baec233a..e724c2ac1b4 100644 --- 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 */ -#include "resource.h" - #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 893ec886286..6af071a74ac 100644 --- 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 */ -#include "resource.h" - #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 5c303fc824a..b18808c979e 100644 --- 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 */ -#include "resource.h" - 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 8929e7ec0f2..7e3ddaa5c54 100644 --- 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 */ -#include "resource.h" - 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 a9b6abd33c0..f6df22ea000 100644 --- 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 */ -#include "resource.h" - 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 302d090a532..ada8a5ac624 100644 --- 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 */ -#include "resource.h" - 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 255b79dde03..440f1e6f516 100644 --- 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 */ -#include "resource.h" - /* 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 4de3674097a..d5dd1571c59 100644 --- 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 */ -#include "resource.h" - #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 720c146dc6c..d5eaef6a91a 100644 --- 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 */ -#include "resource.h" - 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 279f9915439..8ab781043be 100644 --- 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 */ -#include "resource.h" - /* 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 c0c75678f06..60ad642c989 100644 --- 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 */ -#include "resource.h" - /* 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 f499cb237f5..d60bf90077f 100644 --- 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 */ -#include "resource.h" - #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 ab048d92577..31167da1296 100644 --- 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 */ -#include "resource.h" - /* 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 adb49e6236d..fe07b672215 100644 --- 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 */ -#include "resource.h" - 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 9caaa7c55e7..b4f0ff50607 100644 --- 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 */ -#include "resource.h" - #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 4faa99397cb..8c92dfdbc4e 100644 --- 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 */ -#include "resource.h" - 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 28da452b1b2..3789e2a2de3 100644 --- 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 */ -#include "resource.h" - #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 8412035bc3b..065fc1088d5 100644 --- 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 */ -#include "resource.h" - 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 dbe38f00984..a301ff41158 100644 --- 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 */ -#include "resource.h" - /* 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 3bc0213af38..d9255570c21 100644 --- 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 */ -#include "resource.h" - #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 37a57420514..f25c10ba149 100644 --- 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 */ -#include "resource.h" - #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 50e57d0ed49..ec708482013 100644 --- 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 */ -#include "resource.h" - 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 7d54a68408f..5aa979a2c66 100644 --- 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 */ -#include "resource.h" - 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 3ab0ec34671..409edc03079 100644 --- 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 */ -#include "resource.h" - /* 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 c242fd4f512..74a0beb19ac 100644 --- 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 */ -#include "resource.h" - /* 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 96efeafbc5b..de61b088574 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" - -#define NONAMELESSUNION +#include "internet.h" #include #ifdef HAVE_POLL_H #include #endif -#ifdef HAVE_SYS_POLL_H -# include -#endif -#ifdef HAVE_SYS_TIME_H -# include -#endif -#ifdef HAVE_SYS_SOCKET_H -# include -#endif #ifdef HAVE_SYS_FILIO_H # include #endif -#ifdef HAVE_UNISTD_H -# include -#endif -#ifdef HAVE_SYS_IOCTL_H -# include -#endif #include -#ifdef HAVE_NETDB_H -# include -#endif -#ifdef HAVE_NETINET_IN_H -# include -#endif #ifdef HAVE_NETINET_TCP_H # include #endif -#include -//#include -//#include -//#include -//#include -#include - -//#include "wine/library.h" -#include -#include -#include -//#include "winerror.h" -//#include "wincrypt.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - -#include -#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. diff --git a/reactos/dll/win32/wininet/resource.h b/reactos/dll/win32/wininet/resource.h index bce5d34cf67..cf1ace7bf12 100644 --- 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 */ -//#include -//#include +#pragma once #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 040a63e0f0d..427a066a494 100644 --- a/reactos/dll/win32/wininet/rsrc.rc +++ b/reactos/dll/win32/wininet/rsrc.rc @@ -19,9 +19,7 @@ */ #include -//#include "winbase.h" #include -//#include "winnls.h" #include "resource.h" diff --git a/reactos/dll/win32/wininet/urlcache.c b/reactos/dll/win32/wininet/urlcache.c index ae94478af8a..0a5c84402b1 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include -//#include -//#include -//#include -//#include -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -//#include - -#include -#include -//#include "winuser.h" -#include -#include -//#include "winerror.h" -#include -#include -#include -#include - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - #include "internet.h" -//#include "wine/unicode.h" -#include - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); +#include +#include 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 9cb2df55a3d..b3783959a1a 100644 --- 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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include -//#include "wine/port.h" - -#include -//#include -//#include -//#include - -#include -#include -#include -//#include "winnls.h" - -#if defined(__MINGW32__) || defined (_MSC_VER) -#include -#endif - -#include #include "internet.h" -WINE_DEFAULT_DEBUG_CHANNEL(wininet); - #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 84e1fcb3302..be0517fcfe3 100644 --- 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 */ -//#include - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "winreg.h" -//#include "shlwapi.h" - -#include - -WINE_DEFAULT_DEBUG_CHANNEL(wininet); +#include "internet.h" /*********************************************************************** * DllInstall (WININET.@) -- 2.17.1