[patch] Proposed patch

0.63-64bit-gcc4.patch (text/plain), 2.74 KB, created by Gustavo Ribeiro Alves on 2005-12-08 20:44:18 UTC

*** src/dos/drive_cache.cpp	2004/11/13 12:08:43	1.40
--- src/dos/drive_cache.cpp	2004/12/16 10:30:15	1.41
***************
*** 17,23 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  
! /* $Id: drive_cache.cpp,v 1.40 2004/11/13 12:08:43 qbix79 Exp $ */
  
  #include "drives.h"
  #include "dos_inc.h"
--- 17,23 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  
! /* $Id: drive_cache.cpp,v 1.41 2004/12/16 10:30:15 qbix79 Exp $ */
  
  #include "drives.h"
  #include "dos_inc.h"
***************
*** 317,323 ****
  {
  	char* cpos = strchr(shortName,'~');
  	if (cpos) {
! 		Bits compareCount1	= (int)cpos - (int)shortName;
  		char* endPos		= strchr(cpos,'.');
  		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
  		
--- 317,324 ----
  {
  	char* cpos = strchr(shortName,'~');
  	if (cpos) {
! /* the following code is replaced as it's not safe when char* is 64 bits */
! /*		Bits compareCount1	= (int)cpos - (int)shortName;
  		char* endPos		= strchr(cpos,'.');
  		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
  		
***************
*** 327,332 ****
--- 328,345 ----
  
  		compareCount2 -= numberSize;
  		if (compareCount2>compareCount1) compareCount1 = compareCount2;
+ */
+ 		size_t compareCount1 = strcspn(shortName,"~");
+ 		size_t numberSize    = strcspn(cpos,".");
+ 		size_t compareCount2 = strcspn(compareName,".");
+ 		if(compareCount2 > 8) compareCount2 = 8;
+ 		/* We want 
+ 		 * compareCount2 -= numberSize;
+ 		 * if (compareCount2>compareCount1) compareCount1 = compareCount2;
+ 		 * but to prevent negative numbers: 
+ 		 */
+ 		if(compareCount2 > compareCount1 + numberSize)
+ 			compareCount1 = compareCount2 - numberSize;
  		return strncmp(compareName,shortName,compareCount1);
  	}
  	return strcmp(compareName,shortName);

*** src/gui/midi_alsa.h	2004/08/04 09:12:54	1.9
--- src/gui/midi_alsa.h	2004/12/16 11:17:42	1.10
***************
*** 16,22 ****
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  
! /* $Id: midi_alsa.h,v 1.9 2004/08/04 09:12:54 qbix79 Exp $ */
  
  #define ALSA_PCM_OLD_HW_PARAMS_API
  #define ALSA_PCM_OLD_SW_PARAMS_API
--- 16,22 ----
   *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
  
! /* $Id: midi_alsa.h,v 1.10 2004/12/16 11:17:42 qbix79 Exp $ */
  
  #define ALSA_PCM_OLD_HW_PARAMS_API
  #define ALSA_PCM_OLD_SW_PARAMS_API
***************
*** 112,118 ****
  			}
  			break;
  		default:
! 			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (int)msg);
  			send_event(1);
  			break;
  		}
--- 112,118 ----
  			}
  			break;
  		default:
! 			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08lx", (long)msg);
  			send_event(1);
  			break;
  		}