[zguo] 49119: Revert wininet Wine 1.2RC sync for release. Resource file left intact. See issue #5663 for more details.
Author: zguo Date: Mon Oct 11 19:19:48 2010 New Revision: 49119
URL: http://svn.reactos.org/svn/reactos?rev=49119&view=rev Log: Revert wininet Wine 1.2RC sync for release. Resource file left intact. See issue #5663 for more details.
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/ftp.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -1176,7 +1176,7 @@ } } } - return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); }
static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read)
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/http.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -1756,7 +1756,7 @@ } }
- return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); }
static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size)
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -812,7 +812,7 @@ } }
- return INET_QueryOption(hdr, option, buffer, size, unicode); + return INET_QueryOption(option, buffer, size, unicode); }
static const object_vtbl_t APPINFOVtbl = {
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/internet.h [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -160,7 +160,6 @@ DWORD dwFlags; DWORD_PTR dwContext; DWORD dwError; - ULONG ErrorMask; DWORD dwInternalFlags; LONG refs; INTERNET_STATUS_CALLBACK lpfnStatusCB;
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -134,7 +134,6 @@ MAKE_FUNCPTR(SSL_write); MAKE_FUNCPTR(SSL_read); MAKE_FUNCPTR(SSL_pending); -MAKE_FUNCPTR(SSL_get_error); MAKE_FUNCPTR(SSL_get_ex_new_index); MAKE_FUNCPTR(SSL_get_ex_data); MAKE_FUNCPTR(SSL_set_ex_data);
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/urlcache.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -2435,6 +2435,7 @@ DWORD dwFileSizeLow = 0; DWORD dwFileSizeHigh = 0; BYTE cDirectory = 0; + int len; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL;
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/utility.c [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -307,7 +307,6 @@ case INTERNET_STATUS_CONNECTING_TO_SERVER: case INTERNET_STATUS_CONNECTED_TO_SERVER: lpvNewInfo = heap_strdupAtoW(lpvStatusInfo); - dwStatusInfoLength *= sizeof(WCHAR); break; case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_REDIRECT:
Modified: branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/dll/wi... ============================================================================== --- branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -6,7 +6,6 @@ <importlibrary definition="wininet.spec" /> <include base="wininet">.</include> <include base="ReactOS">include/reactos/wine</include> - <include base="zlib">.</include> <define name="__WINESRC__" /> <define name="_WINE" />
@@ -23,7 +22,6 @@ <library>secur32</library> <library>crypt32</library> <library>ws2_32</library> - <library>zlib</library> <library>pseh</library> <file>cookie.c</file> <file>dialogs.c</file>
Modified: branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/includ... ============================================================================== --- branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/include/psdk/wininet.h [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -122,9 +122,6 @@ )
#define INTERNET_ERROR_MASK_INSERT_CDROM 0x1 -#define INTERNET_ERROR_MASK_COMBINED_SEC_CERT 0x2 -#define INTERNET_ERROR_MASK_NEED_MSN_SSPI_PKG 0x4 -#define INTERNET_ERROR_MASK_LOGIN_FAILURE_DISPLAY_ENTITY_BODY 0x8
#define INTERNET_OPTIONS_MASK (~INTERNET_FLAGS_MASK) #define WININET_API_FLAG_ASYNC 0x00000001
Modified: branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_12/reactos/includ... ============================================================================== --- branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_12/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Oct 11 19:19:48 2010 @@ -99,43 +99,37 @@ #define HAVE_FPCLASS 1
/* Define if FreeType 2 is installed */ -#define HAVE_FREETYPE 1 +/* #undef HAVE_FREETYPE */
/* Define to 1 if you have the <freetype/freetype.h> header file. */ -#define HAVE_FREETYPE_FREETYPE_H 1 +/* #undef HAVE_FREETYPE_FREETYPE_H */
/* Define to 1 if you have the <freetype/ftglyph.h> header file. */ -#define HAVE_FREETYPE_FTGLYPH_H 1 - -/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ -#define HAVE_FREETYPE_FTLCDFIL_H 1 - -/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ -#define HAVE_FREETYPE_FTMODAPI_H 1 +/* #undef HAVE_FREETYPE_FTGLYPH_H */
/* Define to 1 if you have the <freetype/ftnames.h> header file. */ /* #undef HAVE_FREETYPE_FTNAMES_H */
/* Define to 1 if you have the <freetype/ftoutln.h> header file. */ -#define HAVE_FREETYPE_FTOUTLN_H 1 +/* #undef HAVE_FREETYPE_FTOUTLN_H */
/* Define to 1 if you have the <freetype/ftsnames.h> header file. */ -#define HAVE_FREETYPE_FTSNAMES_H 1 +/* #undef HAVE_FREETYPE_FTSNAMES_H */
/* Define if you have the <freetype/fttrigon.h> header file. */ -#define HAVE_FREETYPE_FTTRIGON_H 1 +/* #undef HAVE_FREETYPE_FTTRIGON_H */
/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ -#define HAVE_FREETYPE_FTWINFNT_H 1 +/* #undef HAVE_FREETYPE_FTWINFNT_H */
/* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ /* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */
/* Define to 1 if you have the <freetype/ttnameid.h> header file. */ -#define HAVE_FREETYPE_TTNAMEID_H 1 +/* #undef HAVE_FREETYPE_TTNAMEID_H */
/* Define to 1 if you have the <freetype/tttables.h> header file. */ -#define HAVE_FREETYPE_TTTABLES_H 1 +/* #undef HAVE_FREETYPE_TTTABLES_H */
/* Define to 1 if the system has the type `fsblkcnt_t'. */ /* #undef HAVE_FSBLKCNT_T */ @@ -150,13 +144,7 @@ /* #undef HAVE_FSTATVFS */
/* Define to 1 if you have the <ft2build.h> header file. */ -#define HAVE_FT2BUILD_H 1 - -/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ -/* #undef HAVE_FT_LOAD_SFNT_TABLE */ - -/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ -#define HAVE_FT_TRUETYPEENGINETYPE 1 +/* #undef HAVE_FT2BUILD_H */
/* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1
-
zguo＠svn.reactos.org