Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56758: [WININET][PSDK] - Better mark ROS-specific changes - Make wininet_ros.diff sensible - Update wininet.h See issue #7117 for more details.
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 12:24:12 2012 New Revision: 56758 URL: http://svn.reactos.org/svn/reactos?rev=56758&view=rev Log: [WININET][PSDK] - Better mark ROS-specific changes - Make wininet_ros.diff sensible - Update wininet.h See issue #7117 for more details. Modified: 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/netconnection.c trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/wininet_ros.diff trunk/reactos/include/psdk/wininet.h 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 Jun 20 12:24:12 2012 @@ -71,6 +71,7 @@ #include "wine/exception.h" #include "wine/unicode.h" +// ReactOS #include "inet_ntop.c" WINE_DEFAULT_DEBUG_CHANNEL(wininet); 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 Jun 20 12:24:12 2012 @@ -291,6 +291,10 @@ if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) return FALSE; + +#ifndef __REACTOS__ + URLCacheContainers_CreateDefaults(); +#endif WININET_hModule = hinstDLL; @@ -3595,6 +3599,7 @@ LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) { + // ReactOS: use select instead of poll fd_set infd; struct timeval tv; BOOL bSuccess = FALSE; 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 Jun 20 12:24:12 2012 @@ -528,7 +528,11 @@ LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value) DECLSPEC_HIDDEN; +#ifndef __REACTOS__ +int sock_get_error(int) DECLSPEC_HIDDEN; +#else #define sock_get_error(x) WSAGetLastError() +#endif extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; extern void URLCacheContainers_DeleteAll(void) DECLSPEC_HIDDEN; 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 Jun 20 12:24:12 2012 @@ -587,7 +587,7 @@ #endif } -#if 0 +#ifndef __REACTOS__ /* translate a unix error code into a winsock one */ int sock_get_error( int err ) { 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 Jun 20 12:24:12 2012 @@ -182,6 +182,7 @@ /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); +// ReactOS r54992 BOOL bDefaultContainersAdded = FALSE; static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash); @@ -519,6 +520,7 @@ static const WCHAR HistoryPrefix[] = {'V','i','s','i','t','e','d',':',0}; static const WCHAR CookieSuffix[] = {0}; static const WCHAR CookiePrefix[] = {'C','o','o','k','i','e',':',0}; + // ReactOS r50916 static const WCHAR UserProfile[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; static const struct { @@ -533,6 +535,7 @@ }; DWORD i; + // ReactOS r50916 if (GetEnvironmentVariableW(UserProfile, NULL, 0) == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND) { TRACE("Environment variable 'USERPROFILE' does not exist!\n"); @@ -592,6 +595,7 @@ if(!lpwszUrl) return ERROR_INVALID_PARAMETER; + // ReactOS r54992 if (!bDefaultContainersAdded) URLCacheContainers_CreateDefaults(); @@ -633,6 +637,7 @@ if (lpwszSearchPattern && dwIndex > 0) return FALSE; + // ReactOS r54992 if (!bDefaultContainersAdded) URLCacheContainers_CreateDefaults(); @@ -1539,6 +1544,7 @@ return FALSE; } + // ReactOS r54992 if (!bDefaultContainersAdded) URLCacheContainers_CreateDefaults(); Modified: trunk/reactos/dll/win32/wininet/wininet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet_ros.diff [iso-8859-1] Wed Jun 20 12:24:12 2012 @@ -1,59 +1,53 @@ ---- wine-1.3.4/dlls/wininet/internet.h 2010-10-01 14:46:44.000000000 -0400 -+++ dll/win32/wininet/internet.h 2010-10-09 15:34:13.000000000 -0400 -@@ -462,7 +462,7 @@ - LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); - int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection); - DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); --int sock_get_error(int); +--- wine-1.3.21/dlls/wininet/internet.h 2012-06-20 13:23:07 +0200 ++++ dll/win32/wininet/internet.h 2012-06-20 13:58:16 +0200 +@@ -528,7 +528,11 @@ BOOL NETCON_is_alive(netconn_t*) DECLSPE + LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; + int NETCON_GetCipherStrength(netconn_t*) DECLSPEC_HIDDEN; + DWORD NETCON_set_timeout(netconn_t *connection, BOOL send, int value) DECLSPEC_HIDDEN; ++#ifndef __REACTOS__ + int sock_get_error(int) DECLSPEC_HIDDEN; ++#else +#define sock_get_error(x) WSAGetLastError() - - extern void URLCacheContainers_CreateDefaults(void); - extern void URLCacheContainers_DeleteAll(void); ---- wine-1.3.4/dlls/wininet/http.c 2010-10-01 14:46:44.000000000 -0400 -+++ dll/win32/wininet/http.c 2010-10-09 15:28:29.000000000 -0400 -@@ -69,6 +69,8 @@ - #include "wine/exception.h" - #include "wine/unicode.h" - -+#include "inet_ntop.c" -+ - WINE_DEFAULT_DEBUG_CHANNEL(wininet); - - static const WCHAR g_szHttp1_0[] = {'H','T','T','P','/','1','.','0',0}; ---- wine-1.3.4/dlls/wininet/netconnection.c 2010-10-01 14:46:44.000000000 -0400 -+++ dll/win32/wininet/netconnection.c 2010-10-09 15:33:53.000000000 -0400 -@@ -547,6 +547,7 @@ - return TRUE; ++#endif + + extern void URLCacheContainers_CreateDefaults(void) DECLSPEC_HIDDEN; + extern void URLCacheContainers_DeleteAll(void) DECLSPEC_HIDDEN; +--- wine-1.3.21/dlls/wininet/netconnection.c 2012-06-20 13:23:07 +0200 ++++ dll/win32/wininet/netconnection.c 2012-06-20 13:40:10 +0200 +@@ -587,6 +587,7 @@ void NETCON_unload(void) + #endif } -+#if 0 ++#ifndef __REACTOS__ /* translate a unix error code into a winsock one */ int sock_get_error( int err ) { -@@ -613,6 +614,7 @@ +@@ -653,6 +654,7 @@ int sock_get_error( int err ) #endif return err; } +#endif /****************************************************************************** - * NETCON_create ---- wine-1.3.4/dlls/wininet/internet.c 2010-10-01 14:46:44.000000000 -0400 -+++ dll/win32/wininet/internet.c 2010-10-09 15:33:04.000000000 -0400 -@@ -292,8 +292,6 @@ + * NETCON_secure_connect +--- wine-1.3.21/dlls/wininet/internet.c 2012-06-20 13:23:07 +0200 ++++ dll/win32/wininet/internet.c 2012-06-20 13:39:47 +0200 +@@ -292,7 +292,9 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES) return FALSE; -- URLCacheContainers_CreateDefaults(); -- ++#ifndef __REACTOS__ + URLCacheContainers_CreateDefaults(); ++#endif + WININET_hModule = hinstDLL; - case DLL_THREAD_ATTACH: -@@ -3569,19 +3567,22 @@ +@@ -3597,19 +3599,23 @@ LPSTR INTERNET_GetResponseBuffer(void) LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) { - struct pollfd pfd; ++ // ReactOS: use select instead of poll + fd_set infd; + struct timeval tv; BOOL bSuccess = FALSE; @@ -78,28 +72,31 @@ { Index: dll/win32/wininet/urlcache.c =================================================================== ---- dll/win32/wininet/urlcache.c (revision 50814) -+++ dll/win32/wininet/urlcache.c (working copy) -@@ -182,6 +182,7 @@ +--- wine-1.3.21/dlls/wininet/urlcache.c 2012-06-20 13:23:07 +0200 ++++ dll/win32/wininet/urlcache.c 2012-06-20 13:41:43 +0200 +@@ -182,6 +182,8 @@ typedef struct _URLCACHECONTAINER /* List of all containers available */ static struct list UrlContainers = LIST_INIT(UrlContainers); ++// ReactOS r54992 +BOOL bDefaultContainersAdded = FALSE; static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash); -@@ -527,6 +528,7 @@ +@@ -518,6 +520,8 @@ void URLCacheContainers_CreateDefaults(v static const WCHAR HistoryPrefix[] = {'V','i','s','i','t','e','d',':',0}; static const WCHAR CookieSuffix[] = {0}; static const WCHAR CookiePrefix[] = {'C','o','o','k','i','e',':',0}; ++ // ReactOS r50916 + static const WCHAR UserProfile[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; static const struct { int nFolder; /* CSIDL_* constant */ -@@ -540,6 +542,12 @@ +@@ -531,6 +535,13 @@ void URLCacheContainers_CreateDefaults(v }; DWORD i; ++ // ReactOS r50916 + if (GetEnvironmentVariableW(UserProfile, NULL, 0) == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND) + { + TRACE("Environment variable 'USERPROFILE' does not exist!\n"); @@ -109,30 +106,33 @@ for (i = 0; i < sizeof(DefaultContainerData) / sizeof(DefaultContainerData[0]); i++) { WCHAR wszCachePath[MAX_PATH]; -@@ -584,6 +592,9 @@ +@@ -584,6 +595,10 @@ static DWORD URLCacheContainers_FindCont if(!lpwszUrl) return ERROR_INVALID_PARAMETER; ++ // ReactOS r54992 + if (!bDefaultContainersAdded) + URLCacheContainers_CreateDefaults(); + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) { int prefix_len = strlenW(pContainer->cache_prefix); -@@ -622,6 +633,9 @@ +@@ -622,6 +637,10 @@ static BOOL URLCacheContainers_Enum(LPCW if (lpwszSearchPattern && dwIndex > 0) return FALSE; ++ // ReactOS r54992 + if (!bDefaultContainersAdded) + URLCacheContainers_CreateDefaults(); + LIST_FOR_EACH_ENTRY(pContainer, &UrlContainers, URLCACHECONTAINER, entry) { if (lpwszSearchPattern) -@@ -1525,6 +1539,9 @@ +@@ -1525,6 +1544,10 @@ BOOL WINAPI FreeUrlCacheSpaceW(LPCWSTR l return FALSE; } ++ // ReactOS r54992 + if (!bDefaultContainersAdded) + URLCacheContainers_CreateDefaults(); + @@ -141,15 +141,26 @@ /* The URL cache has prefix L"" (unlike Cookies and History) */ Index: dll/win32/wininet/http.c =================================================================== ---- dll/win32/wininet/http.c (revision 54234) -+++ dll/win32/wininet/http.c (working copy) -@@ -245,8 +245,17 @@ +--- wine-1.3.21/dlls/wininet/http.c 2012-06-20 13:37:39 +0200 ++++ dll/win32/wininet/http.c 2012-06-20 13:52:44 +0200 +@@ -71,6 +71,9 @@ + #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}; +@@ -243,8 +246,17 @@ void server_release(server_t *server) if(InterlockedDecrement(&server->ref)) return; +#ifndef __REACTOS__ if(!server->ref) - server->keep_until = (DWORD64)GetTickCount() + COLLECT_TIME; +- server->keep_until = GetTickCount64() + COLLECT_TIME; ++ server->keep_until = (DWORD64)GetTickCount() + COLLECT_TIME; +#else + EnterCriticalSection(&connection_pool_cs); + list_remove(&server->entry); @@ -161,7 +172,16 @@ } static server_t *get_server(const WCHAR *name, INTERNET_PORT port) -@@ -1861,6 +1870,7 @@ +@@ -290,7 +302,7 @@ BOOL collect_connections(BOOL collect_al + BOOL remaining = FALSE; + DWORD64 now; + +- now = GetTickCount64(); ++ now = GetTickCount(); + + LIST_FOR_EACH_ENTRY_SAFE(server, server_safe, &connection_pool, server_t, entry) { + LIST_FOR_EACH_ENTRY_SAFE(netconn, netconn_safe, &server->conn_pool, netconn_t, pool_entry) { +@@ -1859,13 +1871,14 @@ static void http_release_netconn(http_re if(!req->netconn) return; @@ -169,7 +189,15 @@ if(reuse && req->netconn->keep_alive) { BOOL run_collector; -@@ -1893,6 +1903,7 @@ + EnterCriticalSection(&connection_pool_cs); + + list_add_head(&req->netconn->server->conn_pool, &req->netconn->pool_entry); +- req->netconn->keep_until = GetTickCount64() + COLLECT_TIME; ++ req->netconn->keep_until = (DWORD64)GetTickCount() + COLLECT_TIME; + req->netconn = NULL; + + run_collector = !collector_running; +@@ -1893,6 +1906,7 @@ static void http_release_netconn(http_re } return; } Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wininet.h [iso-8859-1] Wed Jun 20 12:24:12 2012 @@ -687,7 +687,7 @@ #define INTERNET_STATE_IDLE 0x00000100 #define INTERNET_STATE_BUSY 0x00000200 -#define INTERNET_INVALID_STATUS_CALLBACK ((INTERNET_STATUS_CALLBACK)(-1L)) +#define INTERNET_INVALID_STATUS_CALLBACK ((INTERNET_STATUS_CALLBACK)(-1)) #define FTP_TRANSFER_TYPE_UNKNOWN 0x00000000 #define FTP_TRANSFER_TYPE_ASCII 0x00000001 @@ -1496,6 +1496,7 @@ #define EDITED_CACHE_ENTRY 0x00000008 #define COOKIE_CACHE_ENTRY 0x00100000 #define URLHISTORY_CACHE_ENTRY 0x00200000 +#define DELETED_CACHE_ENTRY 0x00400000 #define TRACK_OFFLINE_CACHE_ENTRY 0x00000010 #define TRACK_ONLINE_CACHE_ENTRY 0x00000020 #define SPARSE_CACHE_ENTRY 0x00010000

1 0

[tfaber] 56757: [NTOSKRNL] - tcpip is called too often. Don't spam the debug log. See issue #7129 for more details.
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 08:32:35 2012 New Revision: 56757 URL: http://svn.reactos.org/svn/reactos?rev=56757&view=rev Log: [NTOSKRNL] - tcpip is called too often. Don't spam the debug log. See issue #7129 for more details. Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=567… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Wed Jun 20 08:32:35 2012 @@ -596,8 +596,8 @@ (!Timeout || Timeout->QuadPart != 0)) { /* HACK: tcpip is broken and waits with spinlocks acquired (bug #7129) */ - DPRINT1("%s called at DISPATCH_LEVEL with non-zero timeout!\n", - __FUNCTION__); + DPRINT("%s called at DISPATCH_LEVEL with non-zero timeout!\n", + __FUNCTION__); } else ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);

1 0

[tfaber] 56756: [WS2_32] - Do not manually allocate an incompatible hostent structure in FindEntryInHosts. Use populate_hostent instead. Fixes buffer overflow in name resolution. See issue #7126 fo...
by tfaber＠svn.reactos.org 20 Jun '12

20 Jun '12

Author: tfaber Date: Wed Jun 20 00:57:53 2012 New Revision: 56756 URL: http://svn.reactos.org/svn/reactos?rev=56756&view=rev Log: [WS2_32] - Do not manually allocate an incompatible hostent structure in FindEntryInHosts. Use populate_hostent instead. Fixes buffer overflow in name resolution. See issue #7126 for more details. Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] Wed Jun 20 00:57:53 2012 @@ -76,7 +76,7 @@ /* ws2_32 internal Functions */ void check_hostent(struct hostent **he); -void populate_hostent(struct hostent *he, char* name, DNS_A_DATA addr); +void populate_hostent(struct hostent *he, char* name, IP4_ADDRESS addr); void free_hostent(struct hostent *he); void free_servent(struct servent* s); Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Wed Jun 20 00:57:53 2012 @@ -529,7 +529,7 @@ } } -void populate_hostent(struct hostent *he, char* name, DNS_A_DATA addr) +void populate_hostent(struct hostent *he, char* name, IP4_ADDRESS addr) { ASSERT(he); @@ -561,8 +561,8 @@ WS_DbgPrint(MID_TRACE,("he->h_addr_list[0] %x\n", he->h_addr_list[0])); RtlCopyMemory(he->h_addr_list[0], - &addr.IpAddress, - sizeof(addr.IpAddress)); + &addr, + sizeof(addr)); he->h_addr_list[1] = NULL; } @@ -813,51 +813,12 @@ return NULL; } - if( !p->Hostent ) - { - p->Hostent = HeapAlloc(GlobalHeap, 0, sizeof(*p->Hostent)); - if( !p->Hostent ) - { - WSASetLastError( WSATRY_AGAIN ); - return NULL; - } - } - - p->Hostent->h_name = HeapAlloc(GlobalHeap, 0, strlen(DnsName)); - if( !p->Hostent->h_name ) - { - WSASetLastError( WSATRY_AGAIN ); - return NULL; - } - - RtlCopyMemory(p->Hostent->h_name, - DnsName, - strlen(DnsName)); - - p->Hostent->h_aliases = HeapAlloc(GlobalHeap, 0, sizeof(char *)); - if( !p->Hostent->h_aliases ) - { - WSASetLastError( WSATRY_AGAIN ); - return NULL; - } - - p->Hostent->h_aliases[0] = 0; - if (strstr(AddressStr, ":")) { DbgPrint("AF_INET6 NOT SUPPORTED!\n"); WSASetLastError(WSAEINVAL); return NULL; } - else - p->Hostent->h_addrtype = AF_INET; - - p->Hostent->h_addr_list = HeapAlloc(GlobalHeap, 0, sizeof(char *)); - if( !p->Hostent->h_addr_list ) - { - WSASetLastError( WSATRY_AGAIN ); - return NULL; - } Address = inet_addr(AddressStr); if (Address == INADDR_NONE) @@ -866,18 +827,7 @@ return NULL; } - p->Hostent->h_addr_list[0] = HeapAlloc(GlobalHeap, 0, sizeof(Address)); - if( !p->Hostent->h_addr_list[0] ) - { - WSASetLastError( WSATRY_AGAIN ); - return NULL; - } - - RtlCopyMemory(p->Hostent->h_addr_list[0], - &Address, - sizeof(Address)); - - p->Hostent->h_length = sizeof(Address); + populate_hostent(p->Hostent, DnsName, Address); return p->Hostent; } @@ -996,7 +946,9 @@ { WS_DbgPrint(MID_TRACE,("populating hostent\n")); WS_DbgPrint(MID_TRACE,("pName is (%s)\n", curr->pName)); - populate_hostent(p->Hostent, (PCHAR)curr->pName, curr->Data.A); + populate_hostent(p->Hostent, + (PCHAR)curr->pName, + curr->Data.A.IpAddress); DnsRecordListFree(dp, DnsFreeRecordList); return p->Hostent; }

1 0

[tfaber] 56755: [WS2_32] - Rewrite completely broken free_hostent and free_servent functions - Readability improvements to check_hostent and populate_hostent
by tfaber＠svn.reactos.org 19 Jun '12

19 Jun '12

Author: tfaber Date: Tue Jun 19 23:51:28 2012 New Revision: 56755 URL: http://svn.reactos.org/svn/reactos?rev=56755&view=rev Log: [WS2_32] - Rewrite completely broken free_hostent and free_servent functions - Readability improvements to check_hostent and populate_hostent Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Tue Jun 19 23:51:28 2012 @@ -518,15 +518,13 @@ sizeof(struct hostent) + MAX_HOSTNAME_LEN + 1); new_he->h_name = (PCHAR)(new_he + 1); - new_he->h_aliases = 0; + new_he->h_aliases = NULL; new_he->h_addrtype = 0; // AF_INET new_he->h_length = 0; // sizeof(in_addr) new_he->h_addr_list = HeapAlloc(GlobalHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(char *) * 2); - RtlZeroMemory(new_he->h_addr_list, - sizeof(char *) * 2); *he = new_he; } } @@ -544,7 +542,7 @@ if( !he->h_aliases ) { he->h_aliases = HeapAlloc(GlobalHeap, 0, sizeof(char *)); - he->h_aliases[0] = 0; + he->h_aliases[0] = NULL; } he->h_addrtype = AF_INET; he->h_length = sizeof(IN_ADDR); //sizeof(struct in_addr); @@ -563,33 +561,33 @@ WS_DbgPrint(MID_TRACE,("he->h_addr_list[0] %x\n", he->h_addr_list[0])); RtlCopyMemory(he->h_addr_list[0], - (char*)&addr.IpAddress, + &addr.IpAddress, sizeof(addr.IpAddress)); - he->h_addr_list[1] = 0; -} - - -#define HFREE(x) if(x) { HeapFree(GlobalHeap, 0, (x)); x=0; } + he->h_addr_list[1] = NULL; +} + void free_hostent(struct hostent *he) { - if(he) - { - char *next = 0; - HFREE(he->h_name); - if(he->h_aliases) - { - next = he->h_aliases[0]; - while(next) { HFREE(next); next++; } - } - if(he->h_addr_list) - { - next = he->h_addr_list[0]; - while(next) { HFREE(next); next++; } - } - HFREE(he->h_addr_list); - HFREE(he->h_aliases); - HFREE(he); + int i; + + if (he) + { + if (he->h_name) + HeapFree(GlobalHeap, 0, he->h_name); + if (he->h_aliases) + { + for (i = 0; he->h_aliases[i]; i++) + HeapFree(GlobalHeap, 0, he->h_aliases[i]); + HeapFree(GlobalHeap, 0, he->h_aliases); + } + if (he->h_addr_list) + { + for (i = 0; he->h_addr_list[i]; i++) + HeapFree(GlobalHeap, 0, he->h_addr_list[i]); + HeapFree(GlobalHeap, 0, he->h_addr_list); + } + HeapFree(GlobalHeap, 0, he); } } @@ -672,13 +670,22 @@ void free_servent(struct servent* s) { - char* next; - HFREE(s->s_name); - next = s->s_aliases[0]; - while(next) { HFREE(next); next++; } - s->s_port = 0; - HFREE(s->s_proto); - HFREE(s); + int i; + + if (s) + { + if (s->s_name) + HeapFree(GlobalHeap, 0, s->s_name); + if (s->s_aliases) + { + for (i = 0; s->s_aliases[i]; i++) + HeapFree(GlobalHeap, 0, s->s_aliases[i]); + HeapFree(GlobalHeap, 0, s->s_aliases); + } + if (s->s_proto) + HeapFree(GlobalHeap, 0, s->s_proto); + HeapFree(GlobalHeap, 0, s); + } } /* This function is far from perfect but it works enough */ @@ -1052,7 +1059,7 @@ * * @unimplemented */ - + static CHAR *no_aliases = 0; static PROTOENT protocols[] = { @@ -1061,7 +1068,7 @@ {"udp", &no_aliases, IPPROTO_UDP}, {NULL, NULL, 0} }; - + LPPROTOENT EXPORT getprotobyname(IN CONST CHAR FAR* name) @@ -1203,14 +1210,14 @@ WSASetLastError( WSANO_RECOVERY ); return NULL; } - + /* Scan the services file ... * * We will be share the buffer on the lines. If the line does not fit in * the buffer, then moving it to the beginning of the buffer and read * the remnants of line from file. */ - + /* Initial Read */ ReadFile(ServicesFile, ServiceDBData, @@ -1219,7 +1226,7 @@ ThisLine = NextLine = ServiceDBData; EndValid = ServiceDBData + ReadSize; ServiceDBData[sizeof(ServiceDBData) - 1] = '\0'; - + while(ReadSize) { for(; *NextLine != '\r' && *NextLine != '\n'; NextLine++) @@ -1227,7 +1234,7 @@ if(NextLine == EndValid) { int LineLen = NextLine - ThisLine; - + if(ThisLine == ServiceDBData) { WS_DbgPrint(MIN_TRACE,("Line too long")); @@ -1236,23 +1243,23 @@ } memmove(ServiceDBData, ThisLine, LineLen); - + ReadFile(ServicesFile, ServiceDBData + LineLen, sizeof( ServiceDBData )-1 - LineLen, &ReadSize, NULL ); - + EndValid = ServiceDBData + LineLen + ReadSize; NextLine = ServiceDBData + LineLen; ThisLine = ServiceDBData; - + if(!ReadSize) break; } } - + *NextLine = '\0'; Comment = strchr( ThisLine, '#' ); if( Comment ) *Comment = '\0'; /* Terminate at comment start */ - + if(DecodeServEntFromString(ThisLine, &ServiceName, &PortNumberStr, @@ -1644,7 +1651,7 @@ return WSAEINVAL; if (nodename == NULL && servname == NULL) return WSAHOST_NOT_FOUND; - + if (!WSAINITIALIZED) return WSANOTINITIALISED; @@ -1681,7 +1688,7 @@ /* Is it an IPv6 address? */ if (strstr(nodename, ":")) return WSAHOST_NOT_FOUND; - + /* Is it an IPv4 address? */ addr = inet_addr(nodename); if (addr != INADDR_NONE) @@ -1720,7 +1727,7 @@ { /* accept only A records */ if (currdns->wType != DNS_TYPE_A) continue; - + ai = new_addrinfo(ai); if (ret == NULL) ret = ai; @@ -1771,7 +1778,7 @@ if (ret == NULL) return WSAHOST_NOT_FOUND; - + if (hints && hints->ai_family != PF_UNSPEC && hints->ai_family != PF_INET) { freeaddrinfo(ret);

1 0

[tkreuzer] 56753: [PSDK] Add ULongMult
by tkreuzer＠svn.reactos.org 19 Jun '12

19 Jun '12

Author: tkreuzer Date: Tue Jun 19 20:17:54 2012 New Revision: 56753 URL: http://svn.reactos.org/svn/reactos?rev=56753&view=rev Log: [PSDK] Add ULongMult Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Tue Jun 19 20:17:54 2012 @@ -681,6 +681,7 @@ return INTSAFE_NAME(_Convert)(Result, pOutput); \ } +DEFINE_SAFE_MULT_U32(ULongMult, ULONG, ULongLongToULong) #ifndef _WIN64 DEFINE_SAFE_MULT_U32(SizeTMult, size_t, ULongLongToSizeT) DEFINE_SAFE_MULT_U32(SIZETMult, SIZE_T, ULongLongToSIZET)

1 0

[tkreuzer] 56752: [PSDK] intsafe.h: Fix a typo
by tkreuzer＠svn.reactos.org 19 Jun '12

19 Jun '12

Author: tkreuzer Date: Tue Jun 19 20:13:00 2012 New Revision: 56752 URL: http://svn.reactos.org/svn/reactos?rev=56752&view=rev Log: [PSDK] intsafe.h: Fix a typo Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Tue Jun 19 20:13:00 2012 @@ -524,7 +524,7 @@ DEFINE_SAFE_ADD(UInt8Add, UINT8) DEFINE_SAFE_ADD(UShortAdd, USHORT) DEFINE_SAFE_ADD(UIntAdd, UINT) -DEFINE_SAFE_ADD(UlongAdd, ULONG) +DEFINE_SAFE_ADD(ULongAdd, ULONG) DEFINE_SAFE_ADD(UIntPtrAdd, UINT_PTR) DEFINE_SAFE_ADD(ULongPtrAdd, ULONG_PTR) DEFINE_SAFE_ADD(DWordPtrAdd, DWORD_PTR)

1 0

[tfaber] 56751: [WS2_32] - Remove ridiculous hack.
by tfaber＠svn.reactos.org 19 Jun '12

19 Jun '12

Author: tfaber Date: Tue Jun 19 16:54:12 2012 New Revision: 56751 URL: http://svn.reactos.org/svn/reactos?rev=56751&view=rev Log: [WS2_32] - Remove ridiculous hack. Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Tue Jun 19 16:54:12 2012 @@ -18,9 +18,6 @@ //DWORD DebugTraceLevel = DEBUG_ULTRA; DWORD DebugTraceLevel = 0; #endif /* DBG */ - -/* To make the linker happy */ -VOID WINAPI KeBugCheck (ULONG BugCheckCode) {} HINSTANCE g_hInstDll; HANDLE GlobalHeap;

1 0

[tkreuzer] 56750: [PSDK] intsafe.h: - Fix type redefinitions when ntdef.h is included - Implement (Rtl)LongLongSub and (Rtl)UlongLongMult - Add some more definitions - misc fixes
by tkreuzer＠svn.reactos.org 19 Jun '12

19 Jun '12

Author: tkreuzer Date: Tue Jun 19 13:05:23 2012 New Revision: 56750 URL: http://svn.reactos.org/svn/reactos?rev=56750&view=rev Log: [PSDK] intsafe.h: - Fix type redefinitions when ntdef.h is included - Implement (Rtl)LongLongSub and (Rtl)UlongLongMult - Add some more definitions - misc fixes Modified: trunk/reactos/include/psdk/intsafe.h Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Tue Jun 19 13:05:23 2012 @@ -36,22 +36,23 @@ /* Handle ntintsafe here too */ #ifdef _NTINTSAFE_H_INCLUDED_ -#ifndef NT_SUCCESS /* Guard agains redefinition from ntstatus.h */ +#ifndef _NTDEF_ /* Guard agains redefinition from ntstatus.h */ typedef _Return_type_success_(return >= 0) long NTSTATUS; +#endif #define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0) -#define STATUS_SUCCESS ((NTSTATUS)0x00000000L) -#endif +#define STATUS_SUCCESS ((NTSTATUS)0x00000000) +#define STATUS_INTEGER_OVERFLOW ((NTSTATUS)0xC0000095) #define INTSAFE_RESULT NTSTATUS #define INTSAFE_SUCCESS STATUS_SUCCESS #define INTSAFE_E_ARITHMETIC_OVERFLOW STATUS_INTEGER_OVERFLOW #define INTSAFE_NAME(name) Rtl##name #else // _NTINTSAFE_H_INCLUDED_ -#ifndef SUCCEEDED /* Guard agains redefinition from winerror.h */ +#ifndef _HRESULT_DEFINED typedef _Return_type_success_(return >= 0) long HRESULT; +#endif #define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0) #define FAILED(hr) (((HRESULT)(hr)) < 0) #define S_OK ((HRESULT)0L) -#endif #define INTSAFE_RESULT HRESULT #define INTSAFE_SUCCESS S_OK #define INTSAFE_E_ARITHMETIC_OVERFLOW ((HRESULT)0x80070216L) @@ -77,17 +78,18 @@ /* Typedefs */ #ifndef _WINNT_ +#ifndef _NTDEF_ typedef char CHAR; +typedef unsigned char UCHAR, UINT8; typedef signed char INT8; -typedef unsigned char UCHAR, UINT8, BYTE; typedef short SHORT; typedef signed short INT16; -typedef unsigned short USHORT, UINT16, WORD; +typedef unsigned short USHORT, UINT16; typedef int INT; +typedef unsigned int UINT32; typedef signed int INT32; -typedef unsigned int UINT, UINT32; typedef long LONG; -typedef unsigned long ULONG, DWORD; +typedef unsigned long ULONG; typedef long long LONGLONG, LONG64; typedef signed long long INT64; typedef unsigned long long ULONGLONG, DWORDLONG, ULONG64, DWORD64, UINT64; @@ -100,6 +102,11 @@ typedef _W64 long LONG_PTR, SSIZE_T; typedef _W64 unsigned long ULONG_PTR, DWORD_PTR, SIZE_T; #endif // _WIN64 +#endif +typedef unsigned char BYTE; +typedef unsigned short WORD; +typedef unsigned int UINT; +typedef unsigned long DWORD; #endif // _WINNT_ /* Just to be sure! */ @@ -110,16 +117,27 @@ C_ASSERT(sizeof(ULONG) == 4); C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR)); +/* Undefine these to avoid conflicts with limits.h */ +#undef CHAR_MIN +#undef CHAR_MAX +#undef INT_MIN +#undef INT_MAX +#undef LONG_MIN +#undef LONG_MAX +#undef UCHAR_MAX +#undef UINT_MAX +#undef ULONG_MAX + /* Integer range margins (use (x-1) to prevent warnings) */ -#define INT8_MIN (-128) -#define SHORT_MIN (-32768) -#define INT16_MIN (-32768) +#define INT8_MIN (-127 - 1) +#define SHORT_MIN (-32767 - 1) +#define INT16_MIN (-32767 - 1) #define INT_MIN (-2147483647 - 1) #define INT32_MIN (-2147483647 - 1) #define LONG_MIN (-2147483647L - 1) -#define LONGLONG_MIN (-9223372036854775808LL) -#define LONG64_MIN (-9223372036854775808LL) -#define INT64_MIN (-9223372036854775808LL) +#define LONGLONG_MIN (-9223372036854775807LL - 1) +#define LONG64_MIN (-9223372036854775807LL - 1) +#define INT64_MIN (-9223372036854775807LL - 1) //#define INT128_MIN (-170141183460469231731687303715884105728) #ifdef _WIN64 #define INT_PTR_MIN INT64_MIN @@ -242,6 +260,12 @@ #define CHAR_ERROR '\0' +/* 32 bit x 32 bit to 64 bit unsigned multiplication */ +#ifndef UInt32x32To64 +#define UInt32x32To64(a,b) ((DWORDLONG)(a)*(DWORDLONG)(b)) +#endif + + #define DEFINE_SAFE_CONVERT_UTOX(_Name, _TypeFrom, _TypeTo) \ _Must_inspect_result_ \ __forceinline \ @@ -253,7 +277,7 @@ if (Input <= _TypeTo ## _MAX) \ { \ *pOutput = (_TypeTo)Input; \ - return S_OK; \ + return INTSAFE_SUCCESS; \ } \ else \ { \ @@ -289,6 +313,8 @@ DEFINE_SAFE_CONVERT_UTOX(UIntPtrToLong, UINT_PTR, LONG) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToIntPtr, UINT_PTR, INT_PTR) DEFINE_SAFE_CONVERT_UTOX(UIntPtrToLongPtr, UINT_PTR, LONG_PTR) +DEFINE_SAFE_CONVERT_UTOX(ULongLongToUInt, ULONGLONG, UINT) +DEFINE_SAFE_CONVERT_UTOX(ULongLongToULong, ULONGLONG, ULONG) #define DEFINE_SAFE_CONVERT_ITOU(_Name, _TypeFrom, _TypeTo) \ @@ -302,7 +328,7 @@ if ((Input >= 0) && (Input <= _TypeTo ## _MAX)) \ { \ *pOutput = (_TypeTo)Input; \ - return S_OK; \ + return INTSAFE_SUCCESS; \ } \ else \ { \ @@ -375,7 +401,7 @@ if ((Input >= _TypeTo ## _MIN) && (Input <= _TypeTo ## _MAX)) \ { \ *pOutput = (_TypeTo)Input; \ - return S_OK; \ + return INTSAFE_SUCCESS; \ } \ else \ { \ @@ -400,76 +426,47 @@ DEFINE_SAFE_CONVERT_ITOI(LongPtrToInt, LONG_PTR, INT) DEFINE_SAFE_CONVERT_ITOI(LongPtrToLong, LONG_PTR, LONG) DEFINE_SAFE_CONVERT_ITOI(LongPtrToIntPtr, LONG_PTR, INT_PTR) +DEFINE_SAFE_CONVERT_ITOI(LongLongToLong, LONGLONG, LONG) +DEFINE_SAFE_CONVERT_ITOI(LongLongToIntPtr, LONGLONG, INT_PTR) +DEFINE_SAFE_CONVERT_ITOI(LongLongToLongPtr, LONGLONG, LONG_PTR) #ifndef _CHAR_UNSIGNED DEFINE_SAFE_CONVERT_ITOI(ShortToChar, SHORT, CHAR) DEFINE_SAFE_CONVERT_ITOI(LongPtrToChar, LONG_PTR, CHAR) #endif -#define DEFINE_SAFE_ADD(_Name, _Type) \ -_Must_inspect_result_ \ -__forceinline \ -INTSAFE_RESULT \ -INTSAFE_NAME(_Name)( \ - _In_ _Type Augend, \ - _In_ _Type Addend, \ - _Out_ _Deref_out_range_(==, Augend + Addend) _Type *pOutput) \ -{ \ - if ((Augend + Addend) >= Augend) \ - { \ - *pOutput = Augend + Addend; \ - return INTSAFE_SUCCESS; \ - } \ - else \ - { \ - *pOutput = _Type ## _ERROR; \ - return INTSAFE_E_ARITHMETIC_OVERFLOW; \ - } \ -} - -DEFINE_SAFE_ADD(UInt8Add, UINT8) -DEFINE_SAFE_ADD(UShortAdd, USHORT) -DEFINE_SAFE_ADD(UIntAdd, UINT) -DEFINE_SAFE_ADD(UlongAdd, ULONG) -DEFINE_SAFE_ADD(UIntPtrAdd, UINT_PTR) -DEFINE_SAFE_ADD(ULongPtrAdd, ULONG_PTR) -DEFINE_SAFE_ADD(DWordPtrAdd, DWORD_PTR) -DEFINE_SAFE_ADD(SizeTAdd, size_t) -DEFINE_SAFE_ADD(SIZETAdd, SIZE_T) -DEFINE_SAFE_ADD(ULongLongAdd, ULONGLONG) - - -#define DEFINE_SAFE_SUB(_Name, _Type) \ -_Must_inspect_result_ \ -__forceinline \ -INTSAFE_RESULT \ -INTSAFE_NAME(_Name)( \ - _In_ _Type Minuend, \ - _In_ _Type Subtrahend, \ - _Out_ _Deref_out_range_(==, Minuend - Subtrahend) _Type* pOutput) \ -{ \ - if (Minuend >= Subtrahend) \ - { \ - *pOutput = Minuend - Subtrahend; \ - return INTSAFE_SUCCESS; \ - } \ - else \ - { \ - *pOutput = _Type ## _ERROR; \ - return INTSAFE_E_ARITHMETIC_OVERFLOW; \ - } \ -} - -DEFINE_SAFE_SUB(UInt8Sub, UINT8) -DEFINE_SAFE_SUB(UShortSub, USHORT) -DEFINE_SAFE_SUB(UIntSub, UINT) -DEFINE_SAFE_SUB(UIntPtrSub, UINT_PTR) -DEFINE_SAFE_SUB(ULongSub, ULONG) -DEFINE_SAFE_SUB(ULongPtrSub, ULONG_PTR) -DEFINE_SAFE_SUB(DWordPtrSub, DWORD_PTR) -DEFINE_SAFE_SUB(SizeTSub, size_t) -DEFINE_SAFE_SUB(SIZETSub, SIZE_T) -DEFINE_SAFE_SUB(ULongLongSub, ULONGLONG) - + +#ifdef _NTINTSAFE_H_INCLUDED_ + +#define RtlInt8ToByte RtlInt8ToUInt8 +#define RtlInt8ToUInt16 RtlInt8ToUShort +#define RtlInt8ToWord RtlInt8ToUShort +#define RtlInt8ToUInt32 RtlInt8ToUInt +#define RtlInt8ToDWord RtlInt8ToULong +#define RtlInt8ToDWordPtr RtlInt8ToULongPtr +#define RtlInt8ToDWordLong RtlInt8ToULongLong +#define RtlInt8ToULong64 RtlInt8ToULongLong +#define RtlInt8ToDWord64 RtlInt8ToULongLong +#define RtlInt8ToUInt64 RtlInt8ToULongLong +#define RtlInt8ToSizeT RtlInt8ToUIntPtr +#define RtlInt8ToSIZET RtlInt8ToULongPtr +#define RtlIntToSizeT RtlIntToUIntPtr +#define RtlULongLongToInt64 RtlULongLongToLongLong +#define RtlULongLongToLong64 RtlULongLongToLongLong +#define RtlULongLongToPtrdiffT RtlULongLongToIntPtr +#define RtlULongLongToSizeT RtlULongLongToUIntPtr +#define RtlULongLongToSSIZET RtlULongLongToLongPtr +#define RtlULongLongToSIZET RtlULongLongToULongPtr +#ifdef _WIN64 +#define RtlIntToUIntPtr RtlIntToULongLong +#define RtlULongLongToIntPtr RtlULongLongToLongLong +#else +#define RtlIntToUIntPtr RtlIntToUInt +#define RtlULongLongToIntPtr RtlULongLongToInt +#define RtlULongLongToUIntPtr RtlULongLongToUInt +#define RtlULongLongToULongPtr RtlULongLongToULong +#endif + +#else // _NTINTSAFE_H_INCLUDED_ #define Int8ToByte Int8ToUInt8 #define Int8ToUInt16 Int8ToUShort @@ -483,6 +480,241 @@ #define Int8ToUInt64 Int8ToULongLong #define Int8ToSizeT Int8ToUIntPtr #define Int8ToSIZET Int8ToULongPtr +#define IntToSizeT IntToUIntPtr +#define ULongLongToInt64 ULongLongToLongLong +#define ULongLongToLong64 ULongLongToLongLong +#define ULongLongToPtrdiffT ULongLongToIntPtr +#define ULongLongToSizeT ULongLongToUIntPtr +#define ULongLongToSSIZET ULongLongToLongPtr +#define ULongLongToSIZET ULongLongToULongPtr +#ifdef _WIN64 +#define IntToUIntPtr IntToULongLong +#define ULongLongToIntPtr ULongLongToLongLong +#else +#define IntToUIntPtr IntToUInt +#define ULongLongToIntPtr ULongLongToInt +#define ULongLongToUIntPtr ULongLongToUInt +#define ULongLongToULongPtr ULongLongToULong +#endif + +#endif // _NTINTSAFE_H_INCLUDED_ + + +#define DEFINE_SAFE_ADD(_Name, _Type) \ +_Must_inspect_result_ \ +__forceinline \ +INTSAFE_RESULT \ +INTSAFE_NAME(_Name)( \ + _In_ _Type Augend, \ + _In_ _Type Addend, \ + _Out_ _Deref_out_range_(==, Augend + Addend) _Type *pOutput) \ +{ \ + if ((Augend + Addend) >= Augend) \ + { \ + *pOutput = Augend + Addend; \ + return INTSAFE_SUCCESS; \ + } \ + else \ + { \ + *pOutput = _Type ## _ERROR; \ + return INTSAFE_E_ARITHMETIC_OVERFLOW; \ + } \ +} + +DEFINE_SAFE_ADD(UInt8Add, UINT8) +DEFINE_SAFE_ADD(UShortAdd, USHORT) +DEFINE_SAFE_ADD(UIntAdd, UINT) +DEFINE_SAFE_ADD(UlongAdd, ULONG) +DEFINE_SAFE_ADD(UIntPtrAdd, UINT_PTR) +DEFINE_SAFE_ADD(ULongPtrAdd, ULONG_PTR) +DEFINE_SAFE_ADD(DWordPtrAdd, DWORD_PTR) +DEFINE_SAFE_ADD(SizeTAdd, size_t) +DEFINE_SAFE_ADD(SIZETAdd, SIZE_T) +DEFINE_SAFE_ADD(ULongLongAdd, ULONGLONG) + + +#define DEFINE_SAFE_SUB(_Name, _Type) \ +_Must_inspect_result_ \ +__forceinline \ +INTSAFE_RESULT \ +INTSAFE_NAME(_Name)( \ + _In_ _Type Minuend, \ + _In_ _Type Subtrahend, \ + _Out_ _Deref_out_range_(==, Minuend - Subtrahend) _Type* pOutput) \ +{ \ + if (Minuend >= Subtrahend) \ + { \ + *pOutput = Minuend - Subtrahend; \ + return INTSAFE_SUCCESS; \ + } \ + else \ + { \ + *pOutput = _Type ## _ERROR; \ + return INTSAFE_E_ARITHMETIC_OVERFLOW; \ + } \ +} + +DEFINE_SAFE_SUB(UInt8Sub, UINT8) +DEFINE_SAFE_SUB(UShortSub, USHORT) +DEFINE_SAFE_SUB(UIntSub, UINT) +DEFINE_SAFE_SUB(UIntPtrSub, UINT_PTR) +DEFINE_SAFE_SUB(ULongSub, ULONG) +DEFINE_SAFE_SUB(ULongPtrSub, ULONG_PTR) +DEFINE_SAFE_SUB(DWordPtrSub, DWORD_PTR) +DEFINE_SAFE_SUB(SizeTSub, size_t) +DEFINE_SAFE_SUB(SIZETSub, SIZE_T) +DEFINE_SAFE_SUB(ULongLongSub, ULONGLONG) + + +_Must_inspect_result_ +__forceinline +INTSAFE_RESULT +INTSAFE_NAME(LongLongSub)( + _In_ LONGLONG Minuend, + _In_ LONGLONG Subtrahend, + _Out_ _Deref_out_range_(==, Minuend - Subtrahend) LONGLONG* pResult) +{ + LONGLONG Result = Minuend - Subtrahend; + + /* The only way the result can overflow, is when the sign of the minuend + and the subtrahend differ. In that case the result is expected to + have the same sign as the minuend, otherwise it overflowed. + Sign equality is checked with a binary xor operation. */ + if ( ((Minuend ^ Subtrahend) < 0) && ((Minuend ^ Result) < 0) ) + { + *pResult = LONGLONG_ERROR; + return INTSAFE_E_ARITHMETIC_OVERFLOW; + } + else + { + *pResult = Result; + return INTSAFE_SUCCESS; + } +} + + +#define DEFINE_SAFE_SUB_S(_Name, _Type1, _Type2, _Convert) \ +_Must_inspect_result_ \ +__forceinline \ +INTSAFE_RESULT \ +INTSAFE_NAME(_Name)( \ + _In_ _Type1 Minuend, \ + _In_ _Type1 Subtrahend, \ + _Out_ _Deref_out_range_(==, Minuend - Subtrahend) _Type1* pOutput) \ +{ \ + return INTSAFE_NAME(_Convert)(((_Type2)Minuend) - ((_Type2)Subtrahend), pOutput); \ +} + +DEFINE_SAFE_SUB_S(LongSub, LONG, LONGLONG, LongLongToLong) +#ifndef _WIN64 +DEFINE_SAFE_SUB_S(IntPtrSub, INT_PTR, LONGLONG, LongLongToIntPtr) +DEFINE_SAFE_SUB_S(LongPtrSub, LONG_PTR, LONGLONG, LongLongToLongPtr) +#endif + + +_Must_inspect_result_ +__forceinline +INTSAFE_RESULT +INTSAFE_NAME(ULongLongMult)( + _In_ ULONGLONG Multiplicand, + _In_ ULONGLONG Multiplier, + _Out_ _Deref_out_range_(==, Multiplicand * Multiplier) ULONGLONG* pOutput) +{ + /* We can split the 64 bit numbers in low and high parts: + M1 = M1Low + M1Hi * 0x100000000 + M2 = M2Low + M2Hi * 0x100000000 + + Then the multiplication looks like this: + M1 * M2 = (M1Low + M1Hi * 0x100000000) + (M2Low + M2Hi * 0x100000000) + = M1Low * M2Low + + M1Low * M2Hi * 0x100000000 + + M2Low * M1Hi * 0x100000000 + + M1Hi * M2Hi * 0x100000000 * 0x100000000 + + We get an overflow when + a) M1Hi * M2Hi != 0, so when M1Hi or M2Hi are not 0 + b) The product of the nonzero high part and the other low part + is larger than 32 bits. + c) The addition of the product from b) shifted left by 32 and + M1Low * M2Low is larger than 64 bits + */ + ULONG M1Low = Multiplicand & 0xffffffff; + ULONG M2Low = Multiplier & 0xffffffff; + ULONG M1Hi = Multiplicand >> 32; + ULONG M2Hi = Multiplier >> 32; + ULONGLONG Temp; + + if (M1Hi == 0) + { + Temp = UInt32x32To64(M1Low, M2Hi); + } + else if (M2Hi == 0) + { + Temp = UInt32x32To64(M1Hi, M2Low); + } + else + { + *pOutput = LONGLONG_ERROR; + return INTSAFE_E_ARITHMETIC_OVERFLOW; + } + + if (Temp > ULONG_MAX) + { + *pOutput = LONGLONG_ERROR; + return INTSAFE_E_ARITHMETIC_OVERFLOW; + } + + return INTSAFE_NAME(ULongLongAdd)(Temp << 32, UInt32x32To64(M1Low, M2Low), pOutput); +} + + +#define DEFINE_SAFE_MULT_U32(_Name, _Type, _Convert) \ +__checkReturn \ +__forceinline \ +INTSAFE_RESULT \ +INTSAFE_NAME(_Name)( \ + _In_ _Type Multiplicand, \ + _In_ _Type Multiplier, \ + _Out_ _Deref_out_range_(==, Multiplicand * Multiplier) _Type* pOutput) \ +{ \ + ULONGLONG Result = UInt32x32To64(Multiplicand, Multiplier); \ + return INTSAFE_NAME(_Convert)(Result, pOutput); \ +} + +#ifndef _WIN64 +DEFINE_SAFE_MULT_U32(SizeTMult, size_t, ULongLongToSizeT) +DEFINE_SAFE_MULT_U32(SIZETMult, SIZE_T, ULongLongToSIZET) +#endif + + +#ifdef _NTINTSAFE_H_INCLUDED_ + +#define RtlUInt16Add RtlUShortAdd +#define RtlWordAdd RtlUShortAdd +#define RtlUInt32Add RtlUIntAdd +#define RtlDWordAdd RtlULongAdd +#define RtlDWordLongAdd RtlULongLongAdd +#define RtlULong64Add RtlULongLongAdd +#define RtlDWord64Add RtlULongLongAdd +#define RtlUInt64Add RtlULongLongAdd +#define RtlUInt16Sub RtlUShortSub +#define RtlWordSub RtlUShortSub +#define RtlUInt32Sub RtlUIntSub +#define RtlDWordSub RtlULongSub +#define RtlDWordLongSub RtlULongLongSub +#define RtlULong64Sub RtlULongLongSub +#define RtlDWord64Sub RtlULongLongSub +#define RtlUInt64Sub RtlULongLongSub +#ifdef _WIN64 +#define RtlIntPtrSub RtlLongLongSub +#define RtlLongPtrSub RtlLongLongSub +#define RtlSizeTMult RtlULongLongMult +#define RtlSIZETMult RtlULongLongMult +#else +#endif + +#else // _NTINTSAFE_H_INCLUDED_ + #define UInt16Add UShortAdd #define WordAdd UShortAdd #define UInt32Add UIntAdd @@ -499,6 +731,14 @@ #define ULong64Sub ULongLongSub #define DWord64Sub ULongLongSub #define UInt64Sub ULongLongSub - +#ifdef _WIN64 +#define IntPtrSub LongLongSub +#define LongPtrSub LongLongSub +#define SizeTMult ULongLongMult +#define SIZETMult ULongLongMult +#else +#endif + +#endif // _NTINTSAFE_H_INCLUDED_ #endif // !_INTSAFE_H_INCLUDED_

1 0

[tfaber] 56749: [NTOSKRNL] - Fix wait asserts to account for the Thread->WaitNext case - At least output a warning in place of the assertion failure in KeWaitForMultipleObjects See issue #7129 for ...
by tfaber＠svn.reactos.org 19 Jun '12

19 Jun '12

Author: tfaber Date: Tue Jun 19 10:43:38 2012 New Revision: 56749 URL: http://svn.reactos.org/svn/reactos?rev=56749&view=rev Log: [NTOSKRNL] - Fix wait asserts to account for the Thread->WaitNext case - At least output a warning in place of the assertion failure in KeWaitForMultipleObjects See issue #7129 for more details. Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=567… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Tue Jun 19 10:43:38 2012 @@ -417,9 +417,12 @@ PLARGE_INTEGER OriginalDueTime = Timeout; ULONG Hand = 0; - ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL || - (KeGetCurrentIrql() == DISPATCH_LEVEL && - Timeout && Timeout->QuadPart == 0)); + if (Thread->WaitNext) + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + else + ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL || + (KeGetCurrentIrql() == DISPATCH_LEVEL && + Timeout && Timeout->QuadPart == 0)); /* Check if the lock is already held */ if (!Thread->WaitNext) goto WaitStart; @@ -587,10 +590,17 @@ LARGE_INTEGER DueTime = {{0}}, NewDueTime, InterruptTime; ULONG Index, Hand = 0; - /* HACK: tcpip is broken and waits with spinlocks acquired (bug #7129) */ - /*ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL || - (KeGetCurrentIrql() == DISPATCH_LEVEL && - Timeout && Timeout->QuadPart == 0));*/ + if (Thread->WaitNext) + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + else if (KeGetCurrentIrql() == DISPATCH_LEVEL && + (!Timeout || Timeout->QuadPart != 0)) + { + /* HACK: tcpip is broken and waits with spinlocks acquired (bug #7129) */ + DPRINT1("%s called at DISPATCH_LEVEL with non-zero timeout!\n", + __FUNCTION__); + } + else + ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); /* Make sure the Wait Count is valid */ if (!WaitBlockArray)

1 0

[tfaber] 56748: [NTOSKRNL] - Disable the assert in KeWaitForMultipleObjects for now, as tcpip isn't straightforward to fix See issue #7129 for more details.
by tfaber＠svn.reactos.org 19 Jun '12

19 Jun '12

Author: tfaber Date: Tue Jun 19 09:47:13 2012 New Revision: 56748 URL: http://svn.reactos.org/svn/reactos?rev=56748&view=rev Log: [NTOSKRNL] - Disable the assert in KeWaitForMultipleObjects for now, as tcpip isn't straightforward to fix See issue #7129 for more details. Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=567… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Tue Jun 19 09:47:13 2012 @@ -587,9 +587,10 @@ LARGE_INTEGER DueTime = {{0}}, NewDueTime, InterruptTime; ULONG Index, Hand = 0; - ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL || + /* HACK: tcpip is broken and waits with spinlocks acquired (bug #7129) */ + /*ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL || (KeGetCurrentIrql() == DISPATCH_LEVEL && - Timeout && Timeout->QuadPart == 0)); + Timeout && Timeout->QuadPart == 0));*/ /* Make sure the Wait Count is valid */ if (!WaitBlockArray)

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