cpp/openttd-patchpack/source Changeset - r81:110264253e7b

Changeset - r81:110264253e7b

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

darkvater - 20 years ago 2004-08-19 09:37:23
darkvater@openttd.org

(svn r82) -Fix ttd.rc issues on non VS compilers
-Fix: network.c more robust (check for NULL pointer), if gethostbyname failes, try resolving IP address

2 files changed with 172 insertions and 158 deletions:

network.c

ttd.rc

157

153

0 comments (0 inline, 0 general)

network.c

➞

Show inline comments

@@ @@ -1116,11 +1116,21 @@ void NetworkIPListInit() { @@
 	DEBUG(misc,0) ("iplist: init for host %s", hostname);
 	he=gethostbyname((char *) hostname);
 	while(he->h_addr_list[i]) {
 		bcaddr = inet_addr(inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
 		_network_ip_list[i]=bcaddr;
 		DEBUG(misc,0) ("iplist: add %s",inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
 		i++;
 	if (he == NULL) {
 		DEBUG(misc, 0) ("iplist: gethostbyname failed for host %s...trying with IP address", hostname);
 		bcaddr = inet_addr(hostname);
 		he = gethostbyaddr(inet_ntoa(*(struct in_addr *)bcaddr), sizeof(bcaddr), AF_INET);
+	}
 	if (he == NULL) {
 		DEBUG(misc, 0) ("iplist: cannot resolve %s", hostname);
 	} else {
 		while(he->h_addr_list[i]) {
 			bcaddr = inet_addr(inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
 			_network_ip_list[i]=bcaddr;
 			DEBUG(misc,0) ("iplist: add %s",inet_ntoa(*(struct in_addr *) he->h_addr_list[i]));
 			i++;
+		}
+	}
 	_network_ip_list[i]=0;

ttd.rc

➞

Show inline comments

 // Microsoft Visual C++ generated resource script.
 //
 #include "resrc1.h"
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "resource.h"
 #define APSTUDIO_HIDDEN_SYMBOLS
 #include "windows.h"
 #undef APSTUDIO_HIDDEN_SYMBOLS
 #include "winres.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 // Neutral (Default) resources
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 #pragma code_page(1252)
 #endif //_WIN32
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
 //
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 ICON                    "mainicon.ico"
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 DIALOGEX 0, 0, 305, 70
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Fatal Application Failure"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     PUSHBUTTON      "&Close",12,7,49,50,14
     PUSHBUTTON      "&Submit report",14,81,49,68,14,WS_DISABLED
     PUSHBUTTON      "&Emergency save",13,155,49,68,14
     PUSHBUTTON      "",15,243,49,55,14,WS_DISABLED
     EDITTEXT        11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL |
                     WS_HSCROLL | NOT WS_TABSTOP
     LTEXT           "",10,36,7,262,34
     ICON            100,IDC_STATIC,9,9,20,20
 END
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 0,3,3,0
  PRODUCTVERSION 0,3,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
  FILEFLAGS 0x0L
 #endif
  FILEOS 0x4L
  FILETYPE 0x1L
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License."
             VALUE "CompanyName", "OpenTTD Developers"
             VALUE "FileDescription", "OpenTTD"
             VALUE "FileVersion", "0.3.3.0"
             VALUE "InternalName", "openttd"
             VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved."
             VALUE "OriginalFilename", "openttd.exe"
             VALUE "ProductName", "OpenTTD"
             VALUE "ProductVersion", "0.3.3.0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
         VALUE "Translation", 0x0, 1200
     END
 END
 #endif    // Neutral (Default) resources
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 // Swedish resources
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
 #ifdef _WIN32
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 #pragma code_page(1252)
 #endif //_WIN32
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
 //
 TEXTINCLUDE
 BEGIN
     "resrc1.h\0"
 END
 TEXTINCLUDE
 BEGIN
     "#include ""resource.h""\r\n"
     "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
     "#include ""windows.h""\r\n"
     "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
     "#include ""winres.h""\r\n"
     "\0"
 END
 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
 END
 #endif    // APSTUDIO_INVOKED
 #endif    // Swedish resources
 /////////////////////////////////////////////////////////////////////////////
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 //Microsoft Developer Studio generated resource script.
 //
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "resource.h"
 #define APSTUDIO_HIDDEN_SYMBOLS
 #include "windows.h"
 #undef APSTUDIO_HIDDEN_SYMBOLS
 #include "afxres.h"
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 // Neutral (Default) resources
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
 #ifdef _WIN32
 LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 #pragma code_page(1252)
 #endif //_WIN32
 /////////////////////////////////////////////////////////////////////////////
 //
 // Icon
 //
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 ICON    DISCARDABLE     "mainicon.ico"
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 DIALOG DISCARDABLE  0, 0, 305, 70
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Fatal Application Failure"
 FONT 8, "MS Sans Serif"
 BEGIN
     PUSHBUTTON      "&Close",12,7,49,50,14
     PUSHBUTTON      "&Submit report",14,81,49,68,14,WS_DISABLED
     PUSHBUTTON      "&Emergency save",13,155,49,68,14
     PUSHBUTTON      "",15,243,49,55,14,WS_DISABLED
     EDITTEXT        11,7,70,291,118,ES_MULTILINE | ES_READONLY | WS_VSCROLL |
                     WS_HSCROLL | NOT WS_TABSTOP
     LTEXT           "",10,36,7,262,34
     ICON            100,IDC_STATIC,9,9,20,20
 END
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION 0,3,3,0
  PRODUCTVERSION 0,3,3,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
  FILEFLAGS 0x0L
 #endif
  FILEOS 0x4L
  FILETYPE 0x1L
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
             VALUE "CompanyName", "OpenTTD Developers\0"
             VALUE "FileDescription", "OpenTTD\0"
             VALUE "FileVersion", "0.3.3.0\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2004. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "openttd.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "OpenTTD\0"
             VALUE "ProductVersion", "0.3.3.0\0"
             VALUE "SpecialBuild", "\0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
         VALUE "Translation", 0x0, 1200
     END
 END
 #endif    // !_MAC
 #endif    // Neutral (Default) resources
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 // Swedish resources
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE)
 #ifdef _WIN32
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 #pragma code_page(1252)
 #endif //_WIN32
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
 //
 TEXTINCLUDE DISCARDABLE
 BEGIN
     "resrc1.h\0"
 END
 TEXTINCLUDE DISCARDABLE
 BEGIN
     "#include ""resource.h""\r\n"
     "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
     "#include ""windows.h""\r\n"
     "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
     "#include ""winres.h""\r\n"
     "\0"
 END
 TEXTINCLUDE DISCARDABLE
 BEGIN
     "\r\n"
     "\0"
 END
 #endif    // APSTUDIO_INVOKED
 #endif    // Swedish resources
 /////////////////////////////////////////////////////////////////////////////
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

0 comments (0 inline, 0 general)