[WIP] The ultimate ros amd64 bringup

CMakeLists.txt

@@ -267,7 +267,11 @@ else()
     if(NO_ROSSYM)
         include(sdk/cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)
-        include(sdk/cmake/baseaddress_msvc.cmake)
+        if (ARCH STREQUAL "amd64")
+            include(sdk/cmake/baseaddress_msvc_x64.cmake)
+        else()
+            include(sdk/cmake/baseaddress_msvc.cmake)
+        endif()
     else()
         include(sdk/cmake/baseaddress.cmake)
     endif()

base/applications/atactl/atactl.cpp

@@ -445,7 +445,7 @@ ata_str_to_mode(
     )
 {
     int mode;
-    int len;
+    size_t len;
 
     if(!_stricmp(str, "SATA600"))
         return ATA_SA600;
@@ -1688,7 +1688,7 @@ main (
     )
 {
     //ULONG Flags = 0;
-    int i, j;
+    size_t i, j;
     char a;
     int bus_id = -1;
     int dev_id = -1;

base/applications/cmdutils/dbgprint/dbgprint.c

@@ -17,9 +17,9 @@
 int _tmain(int argc, TCHAR ** argv)
 {
     TCHAR * buf;
-    int bufsize;
+    size_t bufsize;
     int i;
-    int offset;
+    size_t offset;
 
     bufsize = 0;
     for(i = 1; i < argc; i++)
@@ -106,7 +106,7 @@ int _tmain(int argc, TCHAR ** argv)
         offset = 0;
         for(i = 1; i < argc; i++)
         {
-            int length = _tcslen(argv[i]);
+            size_t length = _tcslen(argv[i]);
             _tcsncpy(&buf[offset], argv[i], length);
             offset += length;
             if (i + 1 < argc)

base/applications/network/finger/net.c

@@ -90,7 +90,7 @@ netfinger(char *name)
 	if (lflag)
 		send(s, "/W ", 3, 0);
 	/* send the name followed by <CR><LF> */
-	send(s, name, strlen(name), 0);
+	send(s, name, (int)strlen(name), 0);
 	send(s, "\r\n", 2, 0);
 
 	/*

base/applications/network/ftp/fake.c

@@ -120,14 +120,14 @@ const char *fprintfSocket(int s, const char *format, ...)
    vsprintf(buffer, format, argptr);
    va_end(argptr);
 
-   send(s, buffer, strlen(buffer), 0);
+   send(s, buffer, (int)strlen(buffer), 0);
 
    return NULL;
 }
 
 const char *fputsSocket(const char *format, int s)
 {
-   send(s, format, strlen(format), 0);
+   send(s, format, (int)strlen(format), 0);
 
    return NULL;
 }
@@ -241,7 +241,7 @@ char *getpass (const char * prompt)
   if (in == INVALID_HANDLE_VALUE || err == INVALID_HANDLE_VALUE)
     return NULL;
 
-  if (WriteFile (err, prompt, strlen (prompt), &count, NULL))
+  if (WriteFile (err, prompt, (int)strlen(prompt), &count, NULL))
     {
       int istty = (GetFileType (in) == FILE_TYPE_CHAR);
       DWORD old_flags;

base/applications/network/ftp/main.c

@@ -529,13 +529,13 @@ void help(int argc, const char *argv[])
 	struct cmd *c;
 
 	if (argc == 1) {
-		register int i, j, w, k;
-		int columns, width = 0, lines;
+		register int i, j, k;
+		size_t columns, width = 0, w, lines;
 		extern int NCMDS;
 
 		printf("Commands may be abbreviated.  Commands are:\n\n");
 		for (c = cmdtab; c < &cmdtab[NCMDS]; c++) {
-			int len = strlen(c->c_name);
+			size_t len = strlen(c->c_name);
 
 			if (len > width)
 				width = len;

base/applications/network/whois/whois.c

@@ -156,12 +156,12 @@ int main(int argc, char **argv)
 	while (argc-- > 1)
 	{
 		/* Send the request */
-		send(s, *argv, strlen(*argv), 0);
+		send(s, *argv, (int)strlen(*argv), 0);
 		send(s, " ", 1, 0);
 		argv++;
 	}
 	/* Send the last request */
-	send(s, *argv, strlen(*argv), 0);
+	send(s, *argv, (int)strlen(*argv), 0);
 	send(s, "\r\n", 2, 0);
 
 	/* Receive anything and print it */

base/applications/sc/config.c

@@ -17,7 +17,7 @@ BOOL QueryConfig(LPCTSTR ServiceName)
     DWORD cbBytesNeeded = 0;
     LPQUERY_SERVICE_CONFIG pServiceConfig = NULL;
     LPWSTR lpPtr;
-    INT nLen, i;
+    SSIZE_T nLen, i;
 
 #ifdef SCDBG
     _tprintf(_T("service to show configuration - %s\n\n"), ServiceName);

base/applications/sc/misc.c

@@ -169,7 +169,7 @@ ParseFailureActions(
     SC_ACTION *pActions = NULL;
     LPTSTR pStringBuffer = NULL;
     LPTSTR p;
-    INT nLength;
+    INT_PTR nLength;
     INT nCount = 0;
 
     *pcActions = 0;

base/services/dhcpcsvc/dhcp/adapter.c

@@ -9,7 +9,7 @@ PCHAR *GetSubkeyNames( PCHAR MainKeyName, PCHAR Append ) {
     DWORD Error;
     HKEY MainKey;
     PCHAR *Out, OutKeyName;
-    DWORD CharTotal = 0, AppendLen = 1 + strlen(Append);
+    SIZE_T CharTotal = 0, AppendLen = 1 + strlen(Append);
     DWORD MaxSubKeyLen = 0, MaxSubKeys = 0;
 
     Error = RegOpenKey( HKEY_LOCAL_MACHINE, MainKeyName, &MainKey );

base/services/dhcpcsvc/dhcp/dhclient.c

@@ -435,7 +435,7 @@ void set_name_servers( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
             DH_DbgPrint(MID_TRACE,("Setting DhcpNameserver: %s\n", nsbuf));
 
             RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_SZ,
-                           (LPBYTE)nsbuf, strlen(nsbuf) + 1 );
+                           (LPBYTE)nsbuf, (DWORD)strlen(nsbuf) + 1 );
             free( nsbuf );
         }
 
@@ -529,15 +529,15 @@ void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
               &Adapter->NteContext,
               &Adapter->NteInstance );
         if (hkey) {
-            RegSetValueExA(hkey, "DhcpIPAddress", 0, REG_SZ, (LPBYTE)piaddr(new_lease->address), strlen(piaddr(new_lease->address))+1);
+            RegSetValueExA(hkey, "DhcpIPAddress", 0, REG_SZ, (LPBYTE)piaddr(new_lease->address), (DWORD)strlen(piaddr(new_lease->address))+1);
             Buffer[0] = '\0';
             for(i = 0; i < new_lease->options[DHO_SUBNET_MASK].len; i++)
             {
                 sprintf(&Buffer[strlen(Buffer)], "%u", new_lease->options[DHO_SUBNET_MASK].data[i]);
                 if (i + 1 < new_lease->options[DHO_SUBNET_MASK].len)
                     strcat(Buffer, ".");
             }
-            RegSetValueExA(hkey, "DhcpSubnetMask", 0, REG_SZ, (LPBYTE)Buffer, strlen(Buffer)+1);
+            RegSetValueExA(hkey, "DhcpSubnetMask", 0, REG_SZ, (LPBYTE)Buffer, (DWORD)strlen(Buffer)+1);
             dwEnableDHCP = 1;
             RegSetValueExA(hkey, "EnableDHCP", 0, REG_DWORD, (LPBYTE)&dwEnableDHCP, sizeof(DWORD));
         }
@@ -575,7 +575,7 @@ void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
                 if (i + 1 < new_lease->options[DHO_ROUTERS].len)
                     strcat(Buffer, ".");
             }
-            RegSetValueExA(hkey, "DhcpDefaultGateway", 0, REG_SZ, (LPBYTE)Buffer, strlen(Buffer)+1);
+            RegSetValueExA(hkey, "DhcpDefaultGateway", 0, REG_SZ, (LPBYTE)Buffer, (DWORD)strlen(Buffer)+1);
         }
     }
 

base/services/dhcpcsvc/dhcp/hash.c

@@ -48,7 +48,7 @@ static char copyright[] =
 
 #include <rosdhcp.h>
 
-static __inline int do_hash PROTO ((unsigned char *, int, int));
+static __inline int do_hash PROTO ((unsigned char *, size_t, size_t));
 
 struct hash_table *new_hash ()
 {
@@ -62,12 +62,12 @@ struct hash_table *new_hash ()
 
 static __inline int do_hash (name, len, size)
 	unsigned char *name;
-	int len;
-	int size;
+	size_t len;
+    size_t size;
 {
 	register int accum = 0;
 	register unsigned char *s = name;
-	int i = len;
+	size_t i = len;
 	while (i--) {
 		/* Add the character in... */
 		accum += *s++;
@@ -81,7 +81,7 @@ static __inline int do_hash (name, len, size)
 
 void add_hash (table, name, len, pointer)
 	struct hash_table *table;
-	int len;
+	size_t len;
 	unsigned char *name;
 	unsigned char *pointer;
 {
@@ -109,7 +109,7 @@ void add_hash (table, name, len, pointer)
 
 void delete_hash_entry (table, name, len)
 	struct hash_table *table;
-	int len;
+    size_t len;
 	unsigned char *name;
 {
 	int hashno;
@@ -144,7 +144,7 @@ void delete_hash_entry (table, name, len)
 unsigned char *hash_lookup (table, name, len)
 	struct hash_table *table;
 	unsigned char *name;
-	int len;
+	size_t len;
 {
 	int hashno;
 	struct hash_bucket *bp;

base/services/dhcpcsvc/dhcp/options.c

@@ -451,7 +451,8 @@ pretty_print_option(unsigned int code, unsigned char *data, int len,
 	static char optbuf[32768]; /* XXX */
 	int hunksize = 0, numhunk = -1, numelem = 0;
 	char fmtbuf[32], *op = optbuf;
-	int i, j, k, opleft = sizeof(optbuf);
+    int i, j, k;
+    size_t opleft = sizeof(optbuf);
 	unsigned char *dp = data;
 	struct in_addr foo;
 	char comma;
@@ -552,7 +553,7 @@ pretty_print_option(unsigned int code, unsigned char *data, int len,
 	/* Cycle through the array (or hunk) printing the data. */
 	for (i = 0; i < numhunk; i++) {
 		for (j = 0; j < numelem; j++) {
-			int opcount;
+			size_t opcount;
 			switch (fmtbuf[j]) {
 			case 't':
 				if (emit_quotes) {

base/services/dhcpcsvc/dhcp/socket.c

@@ -13,7 +13,7 @@ ssize_t send_packet( struct interface_info *ip,
                      struct sockaddr_in *broadcast,
                      struct hardware *hardware ) {
     int result =
-        sendto( ip->wfdesc, (char *)p, size, 0,
+        sendto( ip->wfdesc, (char *)p, (int)size, 0,
                 (struct sockaddr *)broadcast, sizeof(*broadcast) );
 
     if (result < 0) {
@@ -33,7 +33,7 @@ ssize_t receive_packet(struct interface_info *ip,
                        struct hardware *hardware ) {
     int recv_addr_size = sizeof(*dest);
     int result =
-        recvfrom (ip -> rfdesc, (char *)packet_data, packet_len, 0,
+        recvfrom (ip -> rfdesc, (char *)packet_data, (int)packet_len, 0,
                   (struct sockaddr *)dest, &recv_addr_size );
     return result;
 }

base/services/dhcpcsvc/include/dhcpd.h

@@ -261,7 +261,7 @@ struct protocol {
 struct hash_bucket {
 	struct hash_bucket *next;
 	unsigned char *name;
-	int len;
+	size_t len;
 	unsigned char *value;
 };
 

base/services/schedsvc/job.c

@@ -126,7 +126,7 @@ SaveJob(
                            0,
                            REG_SZ,
                            (PBYTE)pJob->Command,
-                           (wcslen(pJob->Command) + 1) * sizeof(WCHAR));
+                           (DWORD)(wcslen(pJob->Command) + 1) * sizeof(WCHAR));
     if (lError != ERROR_SUCCESS)
         goto done;
 

base/services/schedsvc/rpcserver.c

@@ -254,7 +254,7 @@ NetrJobEnum(
         {
             TRACE("dwIndex: %lu\n", dwIndex);
             dwEntrySize = sizeof(AT_ENUM) +
-                          (wcslen(CurrentJob->Command) + 1) * sizeof(WCHAR);
+                          (DWORD)(wcslen(CurrentJob->Command) + 1) * sizeof(WCHAR);
             TRACE("dwEntrySize: %lu\n", dwEntrySize);
 
             if ((PreferedMaximumLength != ULONG_MAX) &&

base/services/tcpsvcs/daytime.c

@@ -14,7 +14,7 @@
 static BOOL
 SendTime(SOCKET sock, CHAR *time)
 {
-    DWORD stringSize = strlen(time) + 1;
+    SIZE_T stringSize = strlen(time) + 1;
     if (send(sock, time, stringSize, 0) == SOCKET_ERROR)
     {
         LogEvent(L"DayTime: Error sending data", WSAGetLastError(), 0, LOG_ERROR);

base/services/tcpsvcs/log.c

@@ -70,20 +70,20 @@ LogToFile(LPCWSTR lpMsg,
           UINT flags)
 {
     LPWSTR lpFullMsg = NULL;
-    DWORD msgLen;
+    SIZE_T msgLen;
 
     msgLen = wcslen(lpMsg) + 1;
 
     if (flags & LOG_ERROR)
     {
-        LPVOID lpSysMsg;
+        LPWSTR lpSysMsg;
         DWORD eMsgLen;
 
         eMsgLen = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
                                  NULL,
                                  errNum,
                                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                                 (LPTSTR)&lpSysMsg,
+                                 (LPWSTR)&lpSysMsg,
                                  0,
                                  NULL);
 
@@ -130,7 +130,7 @@ LogToFile(LPCWSTR lpMsg,
 
         bRet = WriteFile(hLogFile,
                          lpFullMsg,
-                         wcslen(lpFullMsg) * sizeof(WCHAR),
+                         (DWORD)wcslen(lpFullMsg) * sizeof(WCHAR),
                          &bytesWritten,
                          &olWrite);
         if (!bRet)

base/services/tcpsvcs/qotd.c

@@ -16,7 +16,7 @@ static WCHAR szFilePath[] = L"\\drivers\\etc\\quotes";
 static BOOL
 SendQuote(SOCKET sock, char* Quote)
 {
-    INT strSize = strlen(Quote);
+    INT strSize = (INT)strlen(Quote);
     if (send(sock, Quote, strSize, 0) == SOCKET_ERROR)
         return FALSE;
 

base/services/telnetd/telnetd.c

@@ -174,7 +174,7 @@ static DWORD WINAPI UserLoginThread(LPVOID data)
   gethostname(hostname, sizeof(hostname));
   sprintf(welcome, "\r\nWelcome to %s, please identify yourself\r\n\r\nuser:", hostname);
 
-  if (send(client->socket, welcome, strlen(welcome), 0) < 0) {   
+  if (send(client->socket, welcome, (int)strlen(welcome), 0) < 0) {   
     closesocket(client->socket);
     free(client);
     return 0;
@@ -190,7 +190,7 @@ static DWORD WINAPI UserLoginThread(LPVOID data)
     }
   }
 
-  if (send(client->socket, pwdPrompt, strlen(pwdPrompt), 0) < 0) {   
+  if (send(client->socket, pwdPrompt, (int)strlen(pwdPrompt), 0) < 0) {   
     closesocket(client->socket);
     free(client);
     return 0;

base/system/smss/pagefile.c

@@ -837,8 +837,8 @@ SmpCreateVolumeDescriptors(VOID)
     /* Query the device map so we can get the drive letters */
     Status = NtQueryInformationProcess(NtCurrentProcess(),
                                        ProcessDeviceMap,
-                                       &ProcessInformation,
-                                       sizeof(ProcessInformation),
+                                       &ProcessInformation.Query,
+                                       sizeof(ProcessInformation.Query),
                                        NULL);
     if (!NT_SUCCESS(Status))
     {