From 2f445854cc8dc618f295c92b87c421ff74643622 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Mon, 2 Dec 2013 20:33:06 +0000
Subject: Some code changes.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88035 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/main.m                                       |  1 +
 .../DFCdrom/Base.lproj/DFCdromPluginConfig.xib      | 18 ++++++++----------
 .../DFCdrom/en.lproj/DFCdromPluginConfig.strings    |  2 +-
 .../DFCdrom/fr.lproj/DFCdromPluginConfig.strings    |  2 +-
 .../DFCdrom/hu.lproj/DFCdromPluginConfig.strings    |  2 +-
 macosx/plugins/DFNet/macsrc/SockDialog.m            | 20 ++++++--------------
 macosx/plugins/DFXVideo/macsrc/GL3Code.m            | 21 +++++++++++----------
 7 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/macosx/main.m b/macosx/main.m
index 9c6034ac..7d37a57b 100755
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -128,6 +128,7 @@ static void AddStringToLogList(NSString *themsg)
 	});
 	[theStr appendString:themsg];
 	while ((newlineRange = [theStr rangeOfString:@"\n"]).location != NSNotFound) {
+		newlineRange = [theStr rangeOfComposedCharacterSequencesForRange:newlineRange];
 		NSString *tmpStr = [theStr substringToIndex:newlineRange.location];
 		if (tmpStr && ![tmpStr isEqualToString:@""]) {
 			NSLog(@"%@", tmpStr);
diff --git a/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib b/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib
index e14062be..a1d16adb 100644
--- a/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib
+++ b/macosx/plugins/DFCdrom/Base.lproj/DFCdromPluginConfig.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4510"/>
+        <deployment defaultVersion="1080" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="DFCdromPluginConfigController">
@@ -33,7 +33,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="169">
-                                    <rect key="frame" x="15" y="19" width="151" height="18"/>
+                                    <rect key="frame" x="15" y="19" width="150" height="18"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <buttonCell key="cell" type="check" title="Use Cached Reading" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="189">
                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -63,7 +63,7 @@
                                     </popUpButtonCell>
                                 </popUpButton>
                                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="266">
-                                    <rect key="frame" x="14" y="46" width="113" height="17"/>
+                                    <rect key="frame" x="15" y="46" width="111" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="CD-ROM Speed:" id="267">
                                         <font key="font" metaFont="system"/>
@@ -93,7 +93,7 @@
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
                                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="172">
-                                    <rect key="frame" x="129" y="15" width="195" height="25"/>
+                                    <rect key="frame" x="129" y="13" width="195" height="27"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="191" id="222"/>
@@ -103,12 +103,10 @@
                                     </sliderCell>
                                 </slider>
                                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Jzm-F5-M7J">
-                                    <rect key="frame" x="14" y="10" width="112" height="34"/>
+                                    <rect key="frame" x="15" y="25" width="110" height="17"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" id="MSf-Ad-auA">
+                                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Cache Size:" id="MSf-Ad-auA">
                                         <font key="font" metaFont="system"/>
-                                        <string key="title">Cache Size:
-</string>
                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
diff --git a/macosx/plugins/DFCdrom/en.lproj/DFCdromPluginConfig.strings b/macosx/plugins/DFCdrom/en.lproj/DFCdromPluginConfig.strings
index a3849ffa..c4bb2ece 100644
--- a/macosx/plugins/DFCdrom/en.lproj/DFCdromPluginConfig.strings
+++ b/macosx/plugins/DFCdrom/en.lproj/DFCdromPluginConfig.strings
@@ -45,4 +45,4 @@
 "267.title" = "CD-ROM Speed:";
 
 /* Class = "NSTextFieldCell"; title = "Cache Size:\n"; ObjectID = "MSf-Ad-auA"; */
-"MSf-Ad-auA.title" = "Cache Size:\n";
+"MSf-Ad-auA.title" = "Cache Size:";
diff --git a/macosx/plugins/DFCdrom/fr.lproj/DFCdromPluginConfig.strings b/macosx/plugins/DFCdrom/fr.lproj/DFCdromPluginConfig.strings
index a3849ffa..c4bb2ece 100644
--- a/macosx/plugins/DFCdrom/fr.lproj/DFCdromPluginConfig.strings
+++ b/macosx/plugins/DFCdrom/fr.lproj/DFCdromPluginConfig.strings
@@ -45,4 +45,4 @@
 "267.title" = "CD-ROM Speed:";
 
 /* Class = "NSTextFieldCell"; title = "Cache Size:\n"; ObjectID = "MSf-Ad-auA"; */
-"MSf-Ad-auA.title" = "Cache Size:\n";
+"MSf-Ad-auA.title" = "Cache Size:";
diff --git a/macosx/plugins/DFCdrom/hu.lproj/DFCdromPluginConfig.strings b/macosx/plugins/DFCdrom/hu.lproj/DFCdromPluginConfig.strings
index a3849ffa..c4bb2ece 100644
--- a/macosx/plugins/DFCdrom/hu.lproj/DFCdromPluginConfig.strings
+++ b/macosx/plugins/DFCdrom/hu.lproj/DFCdromPluginConfig.strings
@@ -45,4 +45,4 @@
 "267.title" = "CD-ROM Speed:";
 
 /* Class = "NSTextFieldCell"; title = "Cache Size:\n"; ObjectID = "MSf-Ad-auA"; */
-"MSf-Ad-auA.title" = "Cache Size:\n";
+"MSf-Ad-auA.title" = "Cache Size:";
diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.m b/macosx/plugins/DFNet/macsrc/SockDialog.m
index 0114f33f..01f4cdc6 100755
--- a/macosx/plugins/DFNet/macsrc/SockDialog.m
+++ b/macosx/plugins/DFNet/macsrc/SockDialog.m
@@ -14,19 +14,13 @@
 void SysMessage(const char *fmt, ...)
 {
 	va_list list;
-	char msg[512];
-	//char cmd[512];
-	
 	va_start(list, fmt);
-	vsprintf(msg, fmt, list);
+	NSString *errString = [[NSString alloc] initWithFormat:@(fmt) arguments:list];
 	va_end(list);
 	
-	//sprintf(cmd, "message %s\n", msg);
-	NSString *errString = @(msg);
-	fprintf(stderr, "%s", msg);
-	NSAlert *alert = [NSAlert alertWithMessageText:@"Error" defaultButton:@"Exit" alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", errString];
+	fprintf(stderr, "message %s\n", [errString UTF8String]);
+	NSAlert *alert = [NSAlert alertWithMessageText:@"Error" defaultButton:@"Stop" alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", errString];
 	[alert setAlertStyle:NSCriticalAlertStyle];
-	//NSInteger result = NSRunAlertPanel(errString, nil, @"Okay", nil, nil);
 	NSInteger result = [alert runModal];
 	if (result == NSAlertDefaultReturn)
 	{
@@ -34,7 +28,8 @@ void SysMessage(const char *fmt, ...)
 		if (theEmuClass) {
 			[theEmuClass stop];
 		} else {
-			NSLog(@"Unable to stop emulation because the Objective-C class \"EmuThreaed\" was not found. Are you using a different emulator than PCSXR?");
+			NSLog(@"Unable to stop emulation because the Objective-C class \"EmuThreaed\" was not found.");
+			NSLog(@"Are you using a different emulator than PCSXR?");
 		}
 	}
 }
@@ -93,10 +88,7 @@ void sockDestroyWaitDlg()
 
 - (id)init
 {
-	if ((self = [super initWithWindowNibName:@"SockDialog"])) {
-		
-	}
-	return self;
+	return self = [self initWithWindowNibName:@"SockDialog"];
 }
 
 @end
diff --git a/macosx/plugins/DFXVideo/macsrc/GL3Code.m b/macosx/plugins/DFXVideo/macsrc/GL3Code.m
index bc4ea3e0..0e8ec435 100644
--- a/macosx/plugins/DFXVideo/macsrc/GL3Code.m
+++ b/macosx/plugins/DFXVideo/macsrc/GL3Code.m
@@ -43,11 +43,14 @@ static int mylog2(int val)
 	
 	// Get pixel format from OpenGL
 	NSOpenGLPixelFormat* pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
-	if (!pixFmt)
+	if (!pixFmt) {
+		NSLog(@"OpenGL 3 context could not be created.");
+		NSLog(@"Legacy context will be tried.");
 		return NO;
+	}
 	
 	[self setPixelFormat:pixFmt];
-
+	
 	return NO;
 }
 
@@ -109,7 +112,7 @@ static int mylog2(int val)
 	myShader = glCreateShader(type);
 	if(myShader == 0)
 	{
-		fprintf(stderr, "impossible de creer le shader\n");
+		NSLog(@"impossible de creer le shader");
 		return 0;
 	}
 	
@@ -145,18 +148,16 @@ static int mylog2(int val)
 		glGetShaderiv(myShader, GL_INFO_LOG_LENGTH, &logsize);
 		
 		/* on alloue un espace memoire dans lequel OpenGL ecrira le message */
-		log = malloc(logsize + 1);
+		log = calloc(logsize + 1, 1);
 		if(log == NULL)
 		{
-			fprintf(stderr, "impossible d'allouer de la memoire !\n");
+			NSLog(@"impossible d'allouer de la memoire!");
 			return 0;
 		}
-		/* initialisation du contenu */
-		memset(log, '\0', logsize + 1);
 		
 		glGetShaderInfoLog(myShader, logsize, &logsize, log);
-		fprintf(stderr, "impossible de compiler le shader '%s' :\n%s",
-				[[filename path] UTF8String], log);
+		NSLog(@"impossible de compiler le shader '%@' :\n%s",
+			  [filename path], log);
 		
 		/* ne pas oublier de liberer la memoire et notre shader */
 		free(log);
@@ -181,7 +182,7 @@ void printProgramInfoLog(GLuint obj)
 	{
 		infoLog = (char *)malloc(infologLength);
 		glGetProgramInfoLog(obj, infologLength, &charsWritten, infoLog);
-		printf("%s\n",infoLog);
+		NSLog(@"%s", infoLog);
 		free(infoLog);
 	}
 }
-- 
cgit v1.2.3