CdromId fix;

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@86908 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 13 insertions, 12 deletions

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 750b54e8..7918466a 100755
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -272,7 +272,7 @@ int CheckCdrom() {
 	unsigned char time[4], *buf;
 	unsigned char mdir[4096];
 	char exename[256];
-	int i, c;
+	int i, len, c;
 
 	FreePPFCache();
 
@@ -282,8 +282,9 @@ int CheckCdrom() {
 
 	READTRACK();
 
-	CdromLabel[0] = '\0';
-	CdromId[0] = '\0';
+	memset(CdromLabel, 0, sizeof(CdromLabel));
+	memset(CdromId, 0, sizeof(CdromId));
+	memset(exename, 0, sizeof(exename));
 
 	strncpy(CdromLabel, buf + 52, 32);
 
@@ -323,14 +324,13 @@ int CheckCdrom() {
 		return -1;		// SYSTEM.CNF and PSX.EXE not found
 
 	if (CdromId[0] == '\0') {
-		i = strlen(exename);
-		if (i >= 2) {
-			if (exename[i - 2] == ';') i-= 2;
-			c = 8; i--;
-			while (i >= 0 && c >= 0) {
-				if (isalnum(exename[i])) CdromId[c--] = exename[i];
-				i--;
-			}
+		len = strlen(exename);
+		c = 0;
+		for (i = 0; i < len; ++i) {
+			if (exename[i] == ';' || c >= sizeof(CdromId) - 1)
+				break;
+			if (isalnum(exename[i])) 
+				CdromId[c++] = exename[i];
 		}
 	}
 
@@ -349,6 +349,7 @@ int CheckCdrom() {
 	}
 	SysPrintf(_("CD-ROM Label: %.32s\n"), CdromLabel);
 	SysPrintf(_("CD-ROM ID: %.9s\n"), CdromId);
+	SysPrintf(_("CD-ROM EXE Name: %.255s\n"), exename);
 
 	BuildPPFCache();
 	LoadSBI(NULL);
diff --git a/plugins/dfsound/openal.c b/plugins/dfsound/openal.c
index b283bfca..c1fa42cb 100755
--- a/plugins/dfsound/openal.c
+++ b/plugins/dfsound/openal.c
@@ -36,7 +36,7 @@
  */
 
 #define BUFFER_SIZE_TOTAL   (32768)
-#define BUFFER_SIZE         (2048)
+#define BUFFER_SIZE         (1024)
 #define BUFFER_QUANTITY     (BUFFER_SIZE_TOTAL / BUFFER_SIZE)
 
 /******************************************************************************/