Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52105: [WINHTTP] - Sync to wine 1.3.21
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 21:39:34 2011 New Revision: 52105 URL: http://svn.reactos.org/svn/reactos?rev=52105&view=rev Log: [WINHTTP] - Sync to wine 1.3.21 Modified: trunk/reactos/dll/win32/winhttp/net.c trunk/reactos/dll/win32/winhttp/request.c trunk/reactos/dll/win32/winhttp/url.c trunk/reactos/dll/win32/winhttp/winhttp_private.h Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Sun Jun 5 21:39:34 2011 @@ -134,6 +134,7 @@ MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( X509_STORE_CTX_get_ex_data ); +MAKE_FUNCPTR( X509_STORE_CTX_get_chain ); MAKE_FUNCPTR( i2d_X509 ); MAKE_FUNCPTR( sk_value ); MAKE_FUNCPTR( sk_num ); @@ -374,13 +375,14 @@ X509 *cert; int i; PCCERT_CONTEXT endCert = NULL; + struct stack_st *chain = (struct stack_st *)pX509_STORE_CTX_get_chain( ctx ); ret = TRUE; - for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++) + for (i = 0; ret && i < psk_num(chain); i++) { PCCERT_CONTEXT context; - cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i); + cert = (X509 *)psk_value(chain, i); if ((context = X509_to_cert_context( cert ))) { if (i == 0) @@ -488,6 +490,7 @@ LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( X509_STORE_CTX_get_ex_data ); + LOAD_FUNCPTR( X509_STORE_CTX_get_chain ); LOAD_FUNCPTR( i2d_X509 ); LOAD_FUNCPTR( sk_value ); LOAD_FUNCPTR( sk_num ); Modified: trunk/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Sun Jun 5 21:39:34 2011 @@ -504,7 +504,7 @@ sprintfW( ret, fmt, scheme, request->connect->hostname ); if (request->connect->hostport) { - static const WCHAR colonFmt[] = { ':','%','d',0 }; + static const WCHAR colonFmt[] = { ':','%','u',0 }; sprintfW( ret + strlenW( ret ), colonFmt, request->connect->hostport ); @@ -870,7 +870,7 @@ static BOOL secure_proxy_connect( request_t *request ) { static const WCHAR verbConnect[] = {'C','O','N','N','E','C','T',0}; - static const WCHAR fmt[] = {'%','s',':','%','d',0}; + static const WCHAR fmt[] = {'%','s',':','%','u',0}; BOOL ret = FALSE; LPWSTR path; connect_t *connect = request->connect; @@ -1837,7 +1837,7 @@ if (!(request->hdr.disable_flags & WINHTTP_DISABLE_COOKIES)) record_cookies( request ); - if (status == 301 || status == 302) + if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) { if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; Modified: trunk/reactos/dll/win32/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] Sun Jun 5 21:39:34 2011 @@ -299,7 +299,7 @@ static BOOL calc_length( URL_COMPONENTS *uc, DWORD flags, LPDWORD len ) { - static const WCHAR formatW[] = {'%','d',0}; + static const WCHAR formatW[] = {'%','u',0}; INTERNET_SCHEME scheme; *len = 0; @@ -360,7 +360,7 @@ */ BOOL WINAPI WinHttpCreateUrl( LPURL_COMPONENTS uc, DWORD flags, LPWSTR url, LPDWORD required ) { - static const WCHAR formatW[] = {'%','d',0}; + static const WCHAR formatW[] = {'%','u',0}; static const WCHAR twoslashW[] = {'/','/'}; DWORD len; Modified: trunk/reactos/dll/win32/winhttp/winhttp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] Sun Jun 5 21:39:34 2011 @@ -204,38 +204,38 @@ LPDWORD written; } write_data_t; -object_header_t *addref_object( object_header_t * ); -object_header_t *grab_object( HINTERNET ); -void release_object( object_header_t * ); -HINTERNET alloc_handle( object_header_t * ); -BOOL free_handle( HINTERNET ); - -void set_last_error( DWORD ); -DWORD get_last_error( void ); -void send_callback( object_header_t *, DWORD, LPVOID, DWORD ); -void close_connection( request_t * ); - -BOOL netconn_close( netconn_t * ); -BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ); -BOOL netconn_connected( netconn_t * ); -BOOL netconn_create( netconn_t *, int, int, int ); -BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ); -BOOL netconn_init( netconn_t *, BOOL ); -void netconn_unload( void ); -BOOL netconn_query_data_available( netconn_t *, DWORD * ); -BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); -BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ); -BOOL netconn_secure_connect( netconn_t *, WCHAR * ); -BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); -DWORD netconn_set_timeout( netconn_t *, BOOL, int ); -const void *netconn_get_certificate( netconn_t * ); -int netconn_get_cipher_strength( netconn_t * ); - -BOOL set_cookies( request_t *, const WCHAR * ); -BOOL add_cookie_headers( request_t * ); -BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ); -void delete_domain( domain_t * ); -BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ); +object_header_t *addref_object( object_header_t * ) DECLSPEC_HIDDEN; +object_header_t *grab_object( HINTERNET ) DECLSPEC_HIDDEN; +void release_object( object_header_t * ) DECLSPEC_HIDDEN; +HINTERNET alloc_handle( object_header_t * ) DECLSPEC_HIDDEN; +BOOL free_handle( HINTERNET ) DECLSPEC_HIDDEN; + +void set_last_error( DWORD ) DECLSPEC_HIDDEN; +DWORD get_last_error( void ) DECLSPEC_HIDDEN; +void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; +void close_connection( request_t * ) DECLSPEC_HIDDEN; + +BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; +BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; +BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; +BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; +BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN; +BOOL netconn_init( netconn_t *, BOOL ) DECLSPEC_HIDDEN; +void netconn_unload( void ) DECLSPEC_HIDDEN; +BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN; +BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; +BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t *, int ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR * ) DECLSPEC_HIDDEN; +BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ) DECLSPEC_HIDDEN; +DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; +const void *netconn_get_certificate( netconn_t * ) DECLSPEC_HIDDEN; +int netconn_get_cipher_strength( netconn_t * ) DECLSPEC_HIDDEN; + +BOOL set_cookies( request_t *, const WCHAR * ) DECLSPEC_HIDDEN; +BOOL add_cookie_headers( request_t * ) DECLSPEC_HIDDEN; +BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN; +void delete_domain( domain_t * ) DECLSPEC_HIDDEN; +BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) DECLSPEC_HIDDEN; static inline void *heap_alloc( SIZE_T size ) {

1 0

[cgutman] 52104: [URLMON_WINETEST] - Sync to wine 1.3.21
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 21:35:31 2011 New Revision: 52104 URL: http://svn.reactos.org/svn/reactos?rev=52104&view=rev Log: [URLMON_WINETEST] - Sync to wine 1.3.21 Modified: trunk/rostests/winetests/urlmon/misc.c trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/sec_mgr.c trunk/rostests/winetests/urlmon/stream.c trunk/rostests/winetests/urlmon/uri.c trunk/rostests/winetests/urlmon/url.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/urlmon/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/misc.c?r… Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol… Modified: trunk/rostests/winetests/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/sec_mgr.… Modified: trunk/rostests/winetests/urlmon/stream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/stream.c… Modified: trunk/rostests/winetests/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re… Modified: trunk/rostests/winetests/urlmon/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re…

1 0

[cgutman] 52103: [URLMON] - Sync to wine 1.3.21
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 21:29:41 2011 New Revision: 52103 URL: http://svn.reactos.org/svn/reactos?rev=52103&view=rev Log: [URLMON] - Sync to wine 1.3.21 Added: trunk/reactos/dll/win32/urlmon/urlmon.rgs (with props) Removed: trunk/reactos/dll/win32/urlmon/regsvr.c Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt trunk/reactos/dll/win32/urlmon/bindctx.c trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/download.c trunk/reactos/dll/win32/urlmon/ftp.c trunk/reactos/dll/win32/urlmon/gopher.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/internet.c trunk/reactos/dll/win32/urlmon/mimefilter.c trunk/reactos/dll/win32/urlmon/mk.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/protproxy.c trunk/reactos/dll/win32/urlmon/rsrc.rc trunk/reactos/dll/win32/urlmon/sec_mgr.c trunk/reactos/dll/win32/urlmon/session.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/umstream.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon.inf trunk/reactos/dll/win32/urlmon/urlmon.rbuild trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl trunk/reactos/include/psdk/urlmon.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeList… Modified: trunk/reactos/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c… Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… Modified: trunk/reactos/dll/win32/urlmon/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/download.… Modified: trunk/reactos/dll/win32/urlmon/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/ftp.c?rev… Modified: trunk/reactos/dll/win32/urlmon/gopher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/gopher.c?… Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… Modified: trunk/reactos/dll/win32/urlmon/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/internet.… Modified: trunk/reactos/dll/win32/urlmon/mimefilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mimefilte… Modified: trunk/reactos/dll/win32/urlmon/mk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/mk.c?rev=… Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… Modified: trunk/reactos/dll/win32/urlmon/protproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protproxy… Removed: trunk/reactos/dll/win32/urlmon/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/regsvr.c?… Modified: trunk/reactos/dll/win32/urlmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/rsrc.rc?r… Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/sec_mgr.c… Modified: trunk/reactos/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c… Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… Modified: trunk/reactos/dll/win32/urlmon/umstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umstream.… Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… Modified: trunk/reactos/dll/win32/urlmon/urlmon.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.in… Modified: trunk/reactos/dll/win32/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rb… Added: trunk/reactos/dll/win32/urlmon/urlmon.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.rg… Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… Modified: trunk/reactos/dll/win32/urlmon/urlmon_urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ur… Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re…

1 0

[akhaldi] 52102: [CMAKE] * Use our oldnames library instead of libcoldname.
by akhaldi＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: akhaldi Date: Sun Jun 5 21:24:00 2011 New Revision: 52102 URL: http://svn.reactos.org/svn/reactos?rev=52102&view=rev Log: [CMAKE] * Use our oldnames library instead of libcoldname. Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt trunk/reactos/dll/win32/glu32/CMakeLists.txt Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Sun Jun 5 21:24:00 2011 @@ -36,7 +36,7 @@ else() #FIXME : can't build if this is enabled, check if this is needed #set_target_properties(ksproxy PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") - target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 -lcoldname) + target_link_libraries(ksproxy -lsupc++ -lgcc -lmingw32 oldnames) endif(MSVC) target_link_libraries(ksproxy stlport strmiids) Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Sun Jun 5 21:24:00 2011 @@ -111,7 +111,7 @@ set_entrypoint(glu32 0) -target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 -lcoldname) +target_link_libraries(glu32 stlport -lsupc++ -lgcc -lmingw32 oldnames) add_importlibs(glu32 opengl32

1 0

[akhaldi] 52101: [CMAKE] * Temporarily add libcoldname.a
by akhaldi＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: akhaldi Date: Sun Jun 5 21:04:31 2011 New Revision: 52101 URL: http://svn.reactos.org/svn/reactos?rev=52101&view=rev Log: [CMAKE] * Temporarily add libcoldname.a Added: trunk/reactos/importlibs/libcoldname.a (with props) Added: trunk/reactos/importlibs/libcoldname.a URL: http://svn.reactos.org/svn/reactos/trunk/reactos/importlibs/libcoldname.a?r… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/importlibs/libcoldname.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 52100: [CRT/INTRINSICS] Timo Kreuzer: * Change inline assembly constraint from "r" to "q". "r" means any kind of register, including *si and *di, these cannot be used for 8bit operations ...
by akhaldi＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: akhaldi Date: Sun Jun 5 20:59:09 2011 New Revision: 52100 URL: http://svn.reactos.org/svn/reactos?rev=52100&view=rev Log: [CRT/INTRINSICS] Timo Kreuzer: * Change inline assembly constraint from "r" to "q". "r" means any kind of register, including *si and *di, these cannot be used for 8bit operations on x86, only x64 has sil, dil registers. But gcc is stupid and doesn't get that if we don't tell it explicitly, by using "q", which will only allow a, b, c, d registers. Fixes an assembler error messages that can occur under certain circumstances. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Jun 5 20:59:09 2011 @@ -911,7 +911,7 @@ __INTRIN_INLINE unsigned char _rotr8(unsigned char value, unsigned char shift) { unsigned char retval; - __asm__("rorb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + __asm__("rorb %b[shift], %b[retval]" : [retval] "=qm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; }

1 0

[akhaldi] 52099: [CMAKE] * chkstk is already part of msvcrtex. Just update it.
by akhaldi＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: akhaldi Date: Sun Jun 5 20:57:13 2011 New Revision: 52099 URL: http://svn.reactos.org/svn/reactos?rev=52099&view=rev Log: [CMAKE] * chkstk is already part of msvcrtex. Just update it. Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Jun 5 20:57:13 2011 @@ -38,6 +38,7 @@ if(ARCH MATCHES i386) list(APPEND MSVCRTEX_SOURCE except/i386/chkstk_asm.s + except/i386/chkstk_ms.s math/i386/ci.c math/i386/ftol2_asm.s math/i386/alldiv_asm.s @@ -55,7 +56,7 @@ set_source_files_properties(startup/crtdll.c PROPERTIES COMPILE_DEFINITIONS CRTDLL) if(NOT MSVC) - target_link_libraries(msvcrtex chkstk oldnames) + target_link_libraries(msvcrtex oldnames) endif() add_dependencies(msvcrtex psdk)

1 0

[sir_richard] 52098: [FREELDR]: Some ARM architectures do not necessarily have CS0_BASE at 0x00000000, for example, most Ti OMAP Platforms have DDR at 0x80000000. The current FreeLDR algorithms wou...
by sir_richard＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: sir_richard Date: Sun Jun 5 20:48:34 2011 New Revision: 52098 URL: http://svn.reactos.org/svn/reactos?rev=52098&view=rev Log: [FREELDR]: Some ARM architectures do not necessarily have CS0_BASE at 0x00000000, for example, most Ti OMAP Platforms have DDR at 0x80000000. The current FreeLDR algorithms would build FreeLDR "page entries" for every page from 0 to 0x7FFF0000 and mark it as unusable, then build the actual valid entries from 0x80000000 -> end of RAM, thus resulting in large memory consumption (and in the bloat of the PFN database later once NTOS loads) and boot time. Therefore, the algorithm is changed to start the PFN database at the lowest valid RAM page described by the Firemware descriptors, and entries therefore will be offset. This means a 128MB embedded system no longer appears to have 2048+128MB of RAM worth of PFN entries. NOTE: Windows does not do this, opting instead to force manufacturers/use pull-up resistors/reconfigure the ARM Bus to map RAM at 0x00000000. For wider portability, I believe it makes more sense to simply do this "trick" in the boot loader. Modified: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arcem… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arcemul/mm.c [iso-8859-1] Sun Jun 5 20:48:34 2011 @@ -30,7 +30,6 @@ { { MemoryFirmwareTemporary, 0x80, 0x10 }, 4, }, // File system read buffer. FILESYSBUFFER { { MemoryFirmwareTemporary, 0x90, 0x10 }, 5, }, // Disk read buffer for int 13h. DISKREADBUFFER { { MemoryFirmwarePermanent, 0xA0, 0x60 }, 6, }, // ROM / Video - { { MemorySpecialMemory, 0xFFF, 1 }, 7, }, // unusable memory #elif __arm__ // This needs to be done per-platform specific way #endif @@ -55,7 +54,8 @@ // RtlZeroMemory(BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); BiosMemoryMapEntryCount = MachVtbl.GetMemoryMap(BiosMemoryMap, - sizeof(BiosMemoryMap) / sizeof(BIOS_MEMORY_MAP)); + sizeof(BiosMemoryMap) / + sizeof(BIOS_MEMORY_MAP)); // // Copy the entries to our structure Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sun Jun 5 20:48:34 2011 @@ -48,6 +48,8 @@ ULONG TotalPagesInLookupTable = 0; ULONG FreePagesInLookupTable = 0; ULONG LastFreePageHint = 0; +ULONG MmLowestPhysicalPage = 0xFFFFFFFF; +ULONG MmHighestPhysicalPage = 0; extern ULONG_PTR MmHeapPointer; extern ULONG_PTR MmHeapStart; @@ -75,7 +77,7 @@ // Find address for the page lookup table TotalPagesInLookupTable = MmGetAddressablePageCountIncludingHoles(); PageLookupTableAddress = MmFindLocationForPageLookupTable(TotalPagesInLookupTable); - LastFreePageHint = TotalPagesInLookupTable; + LastFreePageHint = MmHighestPhysicalPage; if (PageLookupTableAddress == 0) { @@ -102,20 +104,21 @@ { ULONG PagesNeeded; ULONG HeapStart; +#ifndef _M_ARM MEMORY_TYPE Type; PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTable; // HACK: Make it so it doesn't overlap kernel space Type = RealPageLookupTable[0x100].PageAllocated; MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, LoaderSystemCode); - +#endif // Find contigious memory block for HEAP:STACK PagesNeeded = HEAP_PAGES + STACK_PAGES; HeapStart = MmFindAvailablePages(PageLookupTable, TotalPagesInLookupTable, PagesNeeded, FALSE); - +#ifndef _M_ARM // Unapply the hack MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, Type); - +#endif if (HeapStart == 0) { UiMessageBox("Critical error: Can't allocate heap!"); @@ -156,7 +159,7 @@ ULONG MmGetAddressablePageCountIncludingHoles(VOID) { MEMORY_DESCRIPTOR* MemoryDescriptor = NULL; - ULONG EndPage = 0; + ULONG PageCount; // // Go through the whole memory map to get max address @@ -166,18 +169,30 @@ // // Check if we got a higher end page address // - if (MemoryDescriptor->BasePage + MemoryDescriptor->PageCount > EndPage) + if (MemoryDescriptor->BasePage + MemoryDescriptor->PageCount > MmHighestPhysicalPage) { // - // Yes, remember it - // - EndPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; + // Yes, remember it if this is real memory + // + if (MemoryDescriptor->MemoryType == MemoryFree) MmHighestPhysicalPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; + } + + // + // Check if we got a higher (usable) start page address + // + if (MemoryDescriptor->BasePage < MmLowestPhysicalPage) + { + // + // Yes, remember it if this is real memory + // + if (MemoryDescriptor->MemoryType == MemoryFree) MmLowestPhysicalPage = MemoryDescriptor->BasePage; } } - - DPRINTM(DPRINT_MEMORY, "MmGetAddressablePageCountIncludingHoles() returning 0x%x\n", EndPage); - - return EndPage; + + DPRINTM(DPRINT_MEMORY, "lo/hi %lx %lxn", MmLowestPhysicalPage, MmHighestPhysicalPage); + PageCount = MmHighestPhysicalPage - MmLowestPhysicalPage; + DPRINTM(DPRINT_MEMORY, "MmGetAddressablePageCountIncludingHoles() returning 0x%x\n", PageCount); + return PageCount; } PVOID MmFindLocationForPageLookupTable(ULONG TotalPageCount) @@ -260,7 +275,7 @@ // We will go through and mark pages again according to the memory map // But this will mark any holes not described in the map as allocated // - MmMarkPagesInLookupTable(PageLookupTable, 0, TotalPageCount, LoaderFirmwarePermanent); + MmMarkPagesInLookupTable(PageLookupTable, MmLowestPhysicalPage, TotalPageCount, LoaderFirmwarePermanent); // // Parse the whole memory map @@ -307,9 +322,9 @@ case MemorySpecialMemory: { // - // Special reserved memory - // - MemoryMapPageAllocated = LoaderSpecialMemory; + // OS Loader Stack + // + MemoryMapPageAllocated = LoaderOsloaderStack; break; } default: @@ -343,6 +358,7 @@ PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTable; ULONG Index; + StartPage -= MmLowestPhysicalPage; for (Index=StartPage; Index<(StartPage+PageCount); Index++) { #if 0 @@ -362,6 +378,7 @@ PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTable; ULONG Index; + StartPage -= MmLowestPhysicalPage; for (Index=StartPage; Index<(StartPage+PageCount); Index++) { RealPageLookupTable[Index].PageAllocated = MemoryType; @@ -416,7 +433,7 @@ if (AvailablePagesSoFar >= PagesNeeded) { - return Index; + return Index + MmLowestPhysicalPage; } } } @@ -438,7 +455,7 @@ if (AvailablePagesSoFar >= PagesNeeded) { - return Index - AvailablePagesSoFar + 1; + return Index - AvailablePagesSoFar + 1 + MmLowestPhysicalPage; } } } @@ -472,7 +489,7 @@ if (AvailablePagesSoFar >= PagesNeeded) { - return Index; + return Index + MmLowestPhysicalPage; } } @@ -488,7 +505,7 @@ { if (RealPageLookupTable[Index].PageAllocated == LoaderFree) { - LastFreePageHint = Index + 1; + LastFreePageHint = Index + 1 + MmLowestPhysicalPage; break; } } @@ -501,6 +518,7 @@ ULONG Index; StartPage = MmGetPageNumberFromAddress(PageAddress); + StartPage -= MmLowestPhysicalPage; // Make sure they aren't trying to go past the // end of availabe memory

1 0

[cgutman] 52097: [WSOCK32] - Fix the spec file - Fixes FF regression
by cgutman＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: cgutman Date: Sun Jun 5 20:40:57 2011 New Revision: 52097 URL: http://svn.reactos.org/svn/reactos?rev=52097&view=rev Log: [WSOCK32] - Fix the spec file - Fixes FF regression Modified: trunk/reactos/dll/win32/wsock32/wsock32.spec Modified: trunk/reactos/dll/win32/wsock32/wsock32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wsock32/wsock32.… ============================================================================== --- trunk/reactos/dll/win32/wsock32/wsock32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wsock32/wsock32.spec [iso-8859-1] Sun Jun 5 20:40:57 2011 @@ -7,9 +7,9 @@ 7 stdcall getsockopt(long long long ptr ptr) ws2_32.getsockopt 8 stdcall htonl(long) ws2_32.htonl 9 stdcall htons(long) ws2_32.htons -10 stdcall ioctlsocket(long long ptr) ws2_32.ioctlsocket -11 stdcall inet_addr(str) ws2_32.inet_addr -12 stdcall inet_ntoa(ptr) ws2_32.inet_ntoa +10 stdcall inet_addr(str) ws2_32.inet_addr +11 stdcall inet_ntoa(ptr) ws2_32.inet_ntoa +12 stdcall ioctlsocket(long long ptr) ws2_32.ioctlsocket 13 stdcall listen(long long) ws2_32.listen 14 stdcall ntohl(long) ws2_32.ntohl 15 stdcall ntohs(long) ws2_32.ntohs

1 0

[akhaldi] 52096: [CMAKE] * Fix msvcrtex unix build.
by akhaldi＠svn.reactos.org 05 Jun '11

05 Jun '11

Author: akhaldi Date: Sun Jun 5 19:44:33 2011 New Revision: 52096 URL: http://svn.reactos.org/svn/reactos?rev=52096&view=rev Log: [CMAKE] * Fix msvcrtex unix build. Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Jun 5 19:44:33 2011 @@ -39,7 +39,7 @@ list(APPEND MSVCRTEX_SOURCE except/i386/chkstk_asm.s math/i386/ci.c - math/i386/ftol2_asm.S + math/i386/ftol2_asm.s math/i386/alldiv_asm.s ) endif()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs