Home / Browse / Yabause / Mail / Archive

Donate

Yabause

Email Archive: yabause-cvs (read-only)

2005:	_Jan	_Feb (33)	_Mar (43)	_Apr (67)	_May (9)	_Jun (8)	_Jul (82)	_Aug (99)	_Sep (100)	_Oct (49)	_Nov (34)	_Dec (34)
2006:	_Jan (55)	_Feb (10)	_Mar (2)	_Apr (7)	_May (41)	_Jun (81)	_Jul (22)	_Aug (134)	_Sep (48)	_Oct (25)	_Nov (31)	_Dec (30)
2007:	_Jan (7)	_Feb (13)	_Mar (11)	_Apr (14)	_May (38)	_Jun (34)	_Jul (23)	_Aug (22)	_Sep (58)	_Oct (28)	_Nov (30)	_Dec (42)
2008:	_Jan (46)	_Feb (158)	_Mar (152)	_Apr (27)	_May (148)	_Jun (30)	_Jul (16)	_Aug (40)	_Sep (17)	_Oct (31)	_Nov (43)	_Dec (57)
2009:	_Jan (103)	_Feb (48)	_Mar (45)	_Apr (28)	_May (59)	_Jun (19)	_Jul (3)	_Aug (19)	_Sep (15)	_Oct (4)	_Nov (33)	_Dec (3)
2010:	_Jan (38)	_Feb (10)	_Mar (5)	_Apr (40)	_May (60)	_Jun	_Jul	_Aug (6)	_Sep	_Oct (4)	_Nov (3)	_Dec (1)
2011:	_Jan (5)	_Feb	_Mar	_Apr (28)	_May (1)	_Jun (2)	_Jul (9)	_Aug (5)	_Sep (2)	_Oct	_Nov (71)	_Dec (48)
2012:	_Jan (25)	_Feb (36)	_Mar (16)	_Apr (27)	_May (37)	_Jun (8)	_Jul	_Aug (3)	_Sep (40)	_Oct (17)	_Nov	_Dec (6)
2013:	_Jan (54)	_Feb (39)	_Mar (6)	_Apr (6)	_May (11)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
					1	2
						(1)
3	4	5	6	7	8	9

10	11	12	13	14	15	16
(2)
17	18	19	20	21	22	23
(3)		(2)	(2)			(6)
24	25	26	27	28	29	30
(2)	(3)			(1)	(1)	(14)
31
(3)

[Yabause-cvs] yabause ChangeLog,1.46,1.47

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-31 00:05

Update of /cvsroot/yabause/yabause
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18470

Modified Files:
	ChangeLog 
Log Message:
-Fixed a spelling mistake(Doh!)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/yabause/yabause/ChangeLog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ChangeLog	30 Aug 2008 23:38:34 -0000	1.46
+++ ChangeLog	31 Aug 2008 00:06:07 -0000	1.47
@@ -2,7 +2,7 @@
  vdp1:
   - Added clipping for line-based drawing to software renderer.
  vdp2:
-  - Toggling a screen is now core indepedent.
+  - Toggling a screen is now core independent.
   - Added per-character priority to software renderer.
  gtk port:
   - Fixed fullscreen setting and added a keep ratio one.

[Yabause-cvs] yabause ChangeLog,1.45,1.46

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 23:38

Update of /cvsroot/yabause/yabause
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7130

Modified Files:
	ChangeLog 
Log Message:
-Changed a couple of things so people don't get confused with a couple of changes

Index: ChangeLog
===================================================================
RCS file: /cvsroot/yabause/yabause/ChangeLog,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- ChangeLog	30 Aug 2008 23:28:39 -0000	1.45
+++ ChangeLog	30 Aug 2008 23:38:34 -0000	1.46
@@ -1,9 +1,9 @@
 0.9.6 -> 0.9.7
  vdp1:
-  - Added clipping for line-based drawing.
+  - Added clipping for line-based drawing to software renderer.
  vdp2:
   - Toggling a screen is now core indepedent.
-  - Added per-character priority.
+  - Added per-character priority to software renderer.
  gtk port:
   - Fixed fullscreen setting and added a keep ratio one.
   - Fixed a bug in the vdp2 debugger that was causing the emu to crash.

[Yabause-cvs] yabause ChangeLog,1.44,1.45

From: Guillaume Duhamel <yabause@us...> - 2008-08-30 23:28

Update of /cvsroot/yabause/yabause
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2866

Modified Files:
	ChangeLog 
Log Message:
Updated ChangeLog with CWX and PasNox changes.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/yabause/yabause/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- ChangeLog	30 Aug 2008 22:46:05 -0000	1.44
+++ ChangeLog	30 Aug 2008 23:28:39 -0000	1.45
@@ -1,8 +1,10 @@
 0.9.6 -> 0.9.7
- vdp2
+ vdp1:
+  - Added clipping for line-based drawing.
+ vdp2:
   - Toggling a screen is now core indepedent.
   - Added per-character priority.
- gtk port
+ gtk port:
   - Fixed fullscreen setting and added a keep ratio one.
   - Fixed a bug in the vdp2 debugger that was causing the emu to crash.
   - Full software mode can be compiled again.
@@ -10,8 +12,27 @@
   - Fixed default value for region.
   - Window position is now saved and restored when re-opening the emu.
   - Fixed a problem when changing input cores.
- qt port
+ qt port:
   - Improved compilation process: make (un)install now works.
+  - Fix crash when configuring input while using translated version.
+ windows port:
+  - Changed resolution list generation so it adds the resolution to the list,
+    regardless of whether it supports 60 hz or not.
+  - Fixed error when trying to add blank cheat code.
+  - Fixed all code that allowed the user to choose filename for saving so it
+    automatically places a default extension.
+  - Save and Clear buttons are now enabled when loading a cheat file.
+  - Fixed a bug with AR code adding where it was tracking the wrong edit
+    window.
+  - Fixed a bug when adding raw cheat codes.
+  - Fixed bugs in vdp1 debugger.
+  - Fixed a bug where saving/loading a save state and an error occured would
+    cause sound looping.
+  - Scroll bar in memory editor now works properly when you move the thumb
+    control.
+  - Added support for x64 builds in Visual Studio.
+ general:
+  - Fixed a bug that was causing older save states to fail.
 0.9.5 -> 0.9.6
  sdl joystick core:
   - Fixed it...

[Yabause-cvs] yabause README.WIN,1.17,1.18

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 23:04

Update of /cvsroot/yabause/yabause
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25217

Modified Files:
	README.WIN 
Log Message:
-Updated to include a tid bit about compiling for x64 using Visual C++

Index: README.WIN
===================================================================
RCS file: /cvsroot/yabause/yabause/README.WIN,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- README.WIN	1 Jul 2008 04:15:02 -0000	1.17
+++ README.WIN	30 Aug 2008 23:04:12 -0000	1.18
@@ -12,9 +12,9 @@
 
 
 1) Compiling instructions...................................20
-2) How to use Yabause.......................................62
-3) Contact information.....................................212
-4) Disclaimer..............................................228
+2) How to use Yabause.......................................65
+3) Contact information.....................................215
+4) Disclaimer..............................................231
 
 
 1 Compiling instructions______________________________________
@@ -58,6 +58,9 @@
 src/windows directory and open yabause.vcproj. Now all you have
 to do is build it like any other Visual C++ project.
 
+You can compile for either x86 or x64(for those using Windows XP
+x64 or Vista x64.
+
 
 2 How to use Yabause__________________________________________

[Yabause-cvs] yabause/src Makefile.mng,1.57,1.58

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 22:50

Update of /cvsroot/yabause/yabause/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv19627

Modified Files:
	Makefile.mng 
Log Message:
-Updated version

Index: Makefile.mng
===================================================================
RCS file: /cvsroot/yabause/yabause/src/Makefile.mng,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- Makefile.mng	28 Jun 2008 07:26:26 -0000	1.57
+++ Makefile.mng	30 Aug 2008 22:50:24 -0000	1.58
@@ -24,7 +24,7 @@
 RC = windres
 #DDEFINES=-DDEBUG
 DDEFINES=
-VDEFINES=-DPACKAGE=\"yabause-win\" -DVERSION=\"0.9.6\" -DHAVE_LIBGLUT -DHAVE_LIBGL -D_WIN32_IE=0x0400
+VDEFINES=-DPACKAGE=\"yabause-win\" -DVERSION=\"0.9.7\" -DHAVE_LIBGLUT -DHAVE_LIBGL -D_WIN32_IE=0x0400
 CFLAGS=$(VDEFINES) $(DDEFINES) -O3 -fomit-frame-pointer -fno-strict-aliasing -Wall
 #CFLAGS=$(VDEFINES) $(DDEFINES) -O3 -fno-strict-aliasing -Wall -g
 CFLAGS2= -fomit-frame-pointer -fno-strict-aliasing -Wall

[Yabause-cvs] yabause/src/dreamcast yui.c,1.22,1.23

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 22:48

Update of /cvsroot/yabause/yabause/src/dreamcast
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18881

Modified Files:
	yui.c 
Log Message:
-Updated version

Index: yui.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/dreamcast/yui.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- yui.c	28 Jun 2008 07:26:27 -0000	1.22
+++ yui.c	30 Aug 2008 22:49:03 -0000	1.23
@@ -127,7 +127,7 @@
     while(!start_pressed)   {
         offset = 64 * 640 + 64; /* 64 pixels in from the left, 64 down */
         
-        bfont_draw_str(vram_s + offset, 640, 0, "Yabause 0.9.6");
+        bfont_draw_str(vram_s + offset, 640, 0, "Yabause 0.9.7");
         offset += 640 * 128;
 
         if(phase == 0)  {

[Yabause-cvs] yabause/src/carbon/Yabause.app/Contents Info.plist, 1.13, 1.14

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 22:48

Update of /cvsroot/yabause/yabause/src/carbon/Yabause.app/Contents
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18784

Modified Files:
	Info.plist 
Log Message:
-Updated version

Index: Info.plist
===================================================================
RCS file: /cvsroot/yabause/yabause/src/carbon/Yabause.app/Contents/Info.plist,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Info.plist	28 Jun 2008 07:26:26 -0000	1.13
+++ Info.plist	30 Aug 2008 22:48:21 -0000	1.14
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-        <string>0.9.6</string>
+        <string>0.9.7</string>
 	<key>CFBundleVersion</key>
-        <string>0.9.6</string>
+        <string>0.9.7</string>
 </dict>
 </plist>

[Yabause-cvs] yabause/src/c68k configure.in,1.4,1.5

From: Guillaume Duhamel <yabause@us...> - 2008-08-30 22:45

Update of /cvsroot/yabause/yabause/src/c68k
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17562/src/c68k

Modified Files:
	configure.in 
Log Message:
Updated ChangeLog and version number


Index: configure.in
===================================================================
RCS file: /cvsroot/yabause/yabause/src/c68k/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.in	28 Jun 2008 07:26:26 -0000	1.4
+++ configure.in	30 Aug 2008 22:46:06 -0000	1.5
@@ -1,4 +1,4 @@
-AC_INIT(gen68k, 0.9.6)
+AC_INIT(gen68k, 0.9.7)
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET

[Yabause-cvs] yabause ChangeLog, 1.43, 1.44 configure.in, 1.100, 1.101

From: Guillaume Duhamel <yabause@us...> - 2008-08-30 22:45

Update of /cvsroot/yabause/yabause
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17562

Modified Files:
	ChangeLog configure.in 
Log Message:
Updated ChangeLog and version number


Index: ChangeLog
===================================================================
RCS file: /cvsroot/yabause/yabause/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ChangeLog	28 Jun 2008 07:26:26 -0000	1.43
+++ ChangeLog	30 Aug 2008 22:46:05 -0000	1.44
@@ -1,3 +1,17 @@
+0.9.6 -> 0.9.7
+ vdp2
+  - Toggling a screen is now core indepedent.
+  - Added per-character priority.
+ gtk port
+  - Fixed fullscreen setting and added a keep ratio one.
+  - Fixed a bug in the vdp2 debugger that was causing the emu to crash.
+  - Full software mode can be compiled again.
+  - Fixed segfault when taking screenshots in full software mode.
+  - Fixed default value for region.
+  - Window position is now saved and restored when re-opening the emu.
+  - Fixed a problem when changing input cores.
+ qt port
+  - Improved compilation process: make (un)install now works.
 0.9.5 -> 0.9.6
  sdl joystick core:
   - Fixed it...

Index: configure.in
===================================================================
RCS file: /cvsroot/yabause/yabause/configure.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- configure.in	10 Aug 2008 13:42:49 -0000	1.100
+++ configure.in	30 Aug 2008 22:46:05 -0000	1.101
@@ -1,4 +1,4 @@
-AC_INIT(yabause, 0.9.6)
+AC_INIT(yabause, 0.9.7)
 
 if test "x$host_alias" = "xpowerpc-gekko" ; then
 	config_guess_sucks=$host_alias

[Yabause-cvs] yabause/src/windows yabause.vcproj,1.19,1.20

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 22:37

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14240

Modified Files:
	yabause.vcproj 
Log Message:
-Updated version

Index: yabause.vcproj
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yabause.vcproj,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- yabause.vcproj	30 Aug 2008 04:36:22 -0000	1.19
+++ yabause.vcproj	30 Aug 2008 22:38:04 -0000	1.20
@@ -47,7 +47,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;;C68K_NO_JUMP_TABLE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;;C68K_NO_JUMP_TABLE"
 				RuntimeLibrary="2"
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
@@ -131,7 +131,7 @@
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;;C68K_NO_JUMP_TABLE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;;C68K_NO_JUMP_TABLE"
 				RuntimeLibrary="2"
 				FloatingPointModel="2"
 				UsePrecompiledHeader="0"
@@ -209,7 +209,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;;USESOCKET"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;;USESOCKET"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -287,7 +287,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;;USESOCKET"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;;USESOCKET"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -364,7 +364,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;;C68K_NO_JUMP_TABLE"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;;C68K_NO_JUMP_TABLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -443,7 +443,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;;C68K_NO_JUMP_TABLE"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_WIN32_IE=0x400;_WIN32_WINNT=0x400;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;;C68K_NO_JUMP_TABLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -520,7 +520,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;; USETHREADS"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;; USETHREADS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -598,7 +598,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.6\&quot;; USETHREADS"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;VERSION=\&quot;0.9.7\&quot;; USETHREADS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -675,7 +675,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;NOC68K;VERSION=\&quot;0.9.6\&quot;"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;NOC68K;VERSION=\&quot;0.9.7\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -753,7 +753,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;NOC68K;VERSION=\&quot;0.9.6\&quot;"
+                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_WIN32_IE=0x400;_WIN32_WINNT=0x400;HAVE_C99_VARIADIC_MACROS;HAVE_LIBGLUT;HAVE_LIBGL;NO_CLI;USEM68KCORE;NOC68K;VERSION=\&quot;0.9.7\&quot;"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -1235,7 +1235,7 @@
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Building c68kexec"
-								CommandLine="cl /Od /Ob2 /Oy /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /FD /MD /fp:fast /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /TC /errorReport:prompt  $(InputDir)$(InputFileName)&#x0D;&#x0A;"
+                                                                CommandLine="cl /Od /Ob2 /Oy /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.7\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /FD /MD /fp:fast /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /TC /errorReport:prompt  $(InputDir)$(InputFileName)&#x0D;&#x0A;"
 								AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
 								Outputs="$(TargetDir)$(InputName).obj"
 							/>
@@ -1246,7 +1246,7 @@
 							<Tool
 								Name="VCCustomBuildTool"
 								Description="Building c68kexec"
-								CommandLine="cl /Od /Ob2 /Oy /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /FD /MD /fp:fast /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /TC /errorReport:prompt  $(InputDir)$(InputFileName)&#x0D;&#x0A;"
+                                                                CommandLine="cl /Od /Ob2 /Oy /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.7\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /FD /MD /fp:fast /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /TC /errorReport:prompt  $(InputDir)$(InputFileName)&#x0D;&#x0A;"
 								AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
 								Outputs="$(TargetDir)$(InputName).obj"
 							/>
@@ -1256,7 +1256,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="cl /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /Gm /EHsc /RTC1 /MDd /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /ZI /TC /errorReport:prompt $(InputDir)$(InputFileName)&#x0D;&#x0A;"
+                                                                CommandLine="cl /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.7\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /Gm /EHsc /RTC1 /MDd /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /ZI /TC /errorReport:prompt $(InputDir)$(InputFileName)&#x0D;&#x0A;"
 								AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
 								Outputs="$(TargetDir)$(InputName).obj"
 							/>
@@ -1266,7 +1266,7 @@
 							>
 							<Tool
 								Name="VCCustomBuildTool"
-								CommandLine="cl /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /Gm /EHsc /RTC1 /MDd /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /ZI /TC /errorReport:prompt $(InputDir)$(InputFileName)&#x0D;&#x0A;"
+                                                                CommandLine="cl /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.7\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /Gm /EHsc /RTC1 /MDd /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /ZI /TC /errorReport:prompt $(InputDir)$(InputFileName)&#x0D;&#x0A;"
 								AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
 								Outputs="$(TargetDir)$(InputName).obj"
 							/>

[Yabause-cvs] yabause/src/windows/Installer Installer.vdproj, 1.6, 1.7

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 22:37

Update of /cvsroot/yabause/yabause/src/windows/Installer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14152

Modified Files:
	Installer.vdproj 
Log Message:
-Updated version

Index: Installer.vdproj
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/Installer/Installer.vdproj,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Installer.vdproj	28 Jun 2008 07:26:27 -0000	1.6
+++ Installer.vdproj	30 Aug 2008 22:37:49 -0000	1.7
@@ -3,7 +3,7 @@
 "VSVersion" = "3:800"
 "ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
 "IsWebType" = "8:FALSE"
-"ProjectName" = "8:Yabause"
+"ProjectName" = "8:Yabause Installer"
 "LanguageId" = "3:1033"
 "CodePage" = "3:1252"
 "UILanguageId" = "3:1033"
@@ -465,7 +465,7 @@
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.9.6"
+        "ProductVersion" = "8:0.9.7"
         "Manufacturer" = "8:Yabause Team"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://yabause.org/forums"

[Yabause-cvs] yabause/src core.h,1.14,1.15

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 04:49

Update of /cvsroot/yabause/yabause/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26458

Modified Files:
	core.h 
Log Message:
-Added support for x64 builds in Visual Studio

Guill, Please check to make sure I didn't break anything for you here.

Index: core.h
===================================================================
RCS file: /cvsroot/yabause/yabause/src/core.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- core.h	12 Jul 2008 22:21:34 -0000	1.14
+++ core.h	30 Aug 2008 04:49:18 -0000	1.15
@@ -53,38 +53,46 @@
 #endif
 
 #ifndef GEKKO
-#if defined(__LP64__)
 typedef unsigned char u8;
 typedef unsigned short u16;
+
+typedef signed char s8;
+typedef signed short s16;
+
+#if defined(__LP64__)
+// Generic 64-bit
 typedef unsigned int u32;
 typedef unsigned long u64;
 typedef unsigned long pointer;
 
-typedef signed char s8;
-typedef signed short s16;
 typedef signed int s32;
 typedef signed long s64;
-#else
-typedef unsigned char u8;
-typedef unsigned short u16;
+
+#elif defined(_MSC_VER)
 typedef unsigned long u32;
-#ifdef _MSC_VER
 typedef unsigned __int64 u64;
-#else
 typedef unsigned long long u64;
-#endif
+#ifdef _WIN64
+typedef __int64 pointer;
+#else
 typedef unsigned long pointer;
+#endif
 
-typedef signed char s8;
-typedef signed short s16;
 typedef signed long s32;
-#ifdef _MSC_VER
 typedef __int64 s64;
+typedef signed long long s64;
+
 #else
+// 32-bit Linux GCC/MINGW/etc.
+typedef unsigned long u32;
+typedef unsigned long long u64;
+typedef unsigned long pointer;
+
+typedef signed long s32;
 typedef signed long long s64;
 #endif
-#endif
 #else
+// Gamecube/Wii
 #include <gccore.h>
 typedef unsigned long pointer;
 #endif

[Yabause-cvs] yabause/src/windows yabause.sln, 1.2, 1.3 yabause.vcproj, 1.18, 1.19

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 04:36

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22933

Modified Files:
	yabause.sln yabause.vcproj 
Log Message:
-Added support for x64 builds in Visual Studio
-Fixed a few bugs that were causing the release build not to work correctly

Index: yabause.sln
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yabause.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- yabause.sln	17 Aug 2008 19:04:25 -0000	1.2
+++ yabause.sln	30 Aug 2008 04:36:22 -0000	1.3
@@ -13,49 +13,105 @@
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug - With Netlink|Win32 = Debug - With Netlink|Win32
+		Debug - With Netlink|x64 = Debug - With Netlink|x64
 		Debug no 68k|Win32 = Debug no 68k|Win32
+		Debug no 68k|x64 = Debug no 68k|x64
 		Debug with C68K|Win32 = Debug with C68K|Win32
+		Debug with C68K|x64 = Debug with C68K|x64
 		Debug with Threads|Win32 = Debug with Threads|Win32
+		Debug with Threads|x64 = Debug with Threads|x64
+		Debug(64-bit)|Win32 = Debug(64-bit)|Win32
+		Debug(64-bit)|x64 = Debug(64-bit)|x64
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug - With Netlink|Win32.ActiveCfg = Debug with Threads|Win32
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug - With Netlink|Win32.Build.0 = Debug with Threads|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug - With Netlink|x64.ActiveCfg = Debug with Netlink|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug - With Netlink|x64.Build.0 = Debug no 68k|x64
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug no 68k|Win32.ActiveCfg = Debug|Win32
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug no 68k|Win32.Build.0 = Debug|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug no 68k|x64.ActiveCfg = Debug no 68k|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug no 68k|x64.Build.0 = Debug no 68k|x64
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with C68K|Win32.ActiveCfg = Debug with Threads|Win32
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with C68K|Win32.Build.0 = Debug with Threads|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with C68K|x64.ActiveCfg = Debug with Threads|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with C68K|x64.Build.0 = Debug with Threads|x64
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with Threads|Win32.ActiveCfg = Debug with Threads|Win32
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with Threads|Win32.Build.0 = Debug with Threads|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with Threads|x64.ActiveCfg = Debug with Threads|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug with Threads|x64.Build.0 = Debug with Threads|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug(64-bit)|Win32.ActiveCfg = Release|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug(64-bit)|Win32.Build.0 = Release|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug(64-bit)|x64.ActiveCfg = Debug no 68k|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug(64-bit)|x64.Build.0 = Debug no 68k|x64
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug|Win32.ActiveCfg = Debug with Netlink|Win32
 		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug|Win32.Build.0 = Debug with Netlink|Win32
-		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Release|Win32.ActiveCfg = Debug|Win32
-		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Release|Win32.Build.0 = Debug|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug|x64.ActiveCfg = Debug|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Debug|x64.Build.0 = Debug|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Release|Win32.ActiveCfg = Release|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Release|Win32.Build.0 = Release|Win32
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Release|x64.ActiveCfg = Release|x64
+		{6D979AD9-4479-4B63-87C9-1E75979F9327}.Release|x64.Build.0 = Release|x64
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug - With Netlink|Win32.ActiveCfg = Debug|Win32
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug - With Netlink|Win32.Build.0 = Debug|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug - With Netlink|x64.ActiveCfg = Debug|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug - With Netlink|x64.Build.0 = Debug|x64
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug no 68k|Win32.ActiveCfg = Release|Win32
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug no 68k|Win32.Build.0 = Release|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug no 68k|x64.ActiveCfg = Debug|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug no 68k|x64.Build.0 = Debug|x64
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with C68K|Win32.ActiveCfg = Debug|Win32
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with C68K|Win32.Build.0 = Debug|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with C68K|x64.ActiveCfg = Debug|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with C68K|x64.Build.0 = Debug|x64
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with Threads|Win32.ActiveCfg = Debug|Win32
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with Threads|Win32.Build.0 = Debug|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with Threads|x64.ActiveCfg = Debug|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug with Threads|x64.Build.0 = Debug|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug(64-bit)|Win32.ActiveCfg = Debug|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug(64-bit)|Win32.Build.0 = Debug|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug(64-bit)|x64.ActiveCfg = Debug|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug(64-bit)|x64.Build.0 = Debug|x64
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug|Win32.Build.0 = Debug|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug|x64.ActiveCfg = Debug|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Debug|x64.Build.0 = Debug|x64
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Release|Win32.ActiveCfg = Release|Win32
 		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Release|Win32.Build.0 = Release|Win32
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Release|x64.ActiveCfg = Release|x64
+		{EB71F858-B079-4A01-820E-BF7530E67ACE}.Release|x64.Build.0 = Release|x64
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug - With Netlink|Win32.ActiveCfg = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug - With Netlink|Win32.Build.0 = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug - With Netlink|x64.ActiveCfg = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug - With Netlink|x64.Build.0 = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug no 68k|Win32.ActiveCfg = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug no 68k|Win32.Build.0 = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug no 68k|x64.ActiveCfg = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug no 68k|x64.Build.0 = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with C68K|Win32.ActiveCfg = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with C68K|Win32.Build.0 = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with C68K|x64.ActiveCfg = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with C68K|x64.Build.0 = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with Threads|Win32.ActiveCfg = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with Threads|Win32.Build.0 = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with Threads|x64.ActiveCfg = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug with Threads|x64.Build.0 = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug(64-bit)|Win32.ActiveCfg = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug(64-bit)|Win32.Build.0 = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug(64-bit)|x64.ActiveCfg = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug(64-bit)|x64.Build.0 = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug|Win32.ActiveCfg = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug|Win32.Build.0 = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug|x64.ActiveCfg = Debug
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Debug|x64.Build.0 = Debug
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Release|Win32.ActiveCfg = Release
 		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Release|Win32.Build.0 = Release
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Release|x64.ActiveCfg = Release
+		{40298F61-C97C-4FC3-993B-E78CFC4E9FDF}.Release|x64.Build.0 = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Index: yabause.vcproj
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yabause.vcproj,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- yabause.vcproj	24 Aug 2008 04:34:09 -0000	1.18
+++ yabause.vcproj	30 Aug 2008 04:36:22 -0000	1.19
@@ -11,6 +11,9 @@
 		<Platform
 			Name="Win32"
 		/>
+		<Platform
+			Name="x64"
+		/>
 	</Platforms>
 	<ToolFiles>
 	</ToolFiles>
@@ -50,7 +53,8 @@
 				UsePrecompiledHeader="0"
[...1065 lines suppressed...]
+				</File>
+				<File
+					RelativePath="..\yabause.h"
+					>
+				</File>
+				<File
+					RelativePath="..\ygl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\yui.h"
+					>
+				</File>
+				<Filter
+					Name="68k core"
+					>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter

[Yabause-cvs] yabause/src/windows settings.c, 1.30, 1.31 yui.c, 1.84, 1.85 yuidebug.c, 1.29, 1.30

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 01:00

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4953

Modified Files:
	settings.c yui.c yuidebug.c 
Log Message:
-Fixed all code that allowed the user to choose filename for saving so it automatically places a default extension.

Index: settings.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/settings.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- settings.c	8 Jul 2008 02:40:04 -0000	1.30
+++ settings.c	30 Aug 2008 01:00:50 -0000	1.31
@@ -1724,12 +1724,13 @@
                ZeroMemory(&ofn, sizeof(ofn));
                ofn.lStructSize = sizeof(ofn);
                ofn.hwndOwner = hDlg;
-               ofn.lpstrFilter = "All Files\0*.*\0Text Files\0*.txt\0";
+               ofn.lpstrFilter = "Text Files\0*.txt\0All Files\0*.*\0";
                ofn.nFilterIndex = 1;
                ofn.lpstrFile = logfilename;
                ofn.nMaxFile = sizeof(logfilename);
                ofn.Flags = OFN_OVERWRITEPROMPT;
- 
+               ofn.lpstrDefExt = "TXT";
+
                if (GetSaveFileName(&ofn))
                {
                   SetDlgItemText(hDlg, IDC_LOGFILENAMEET, logfilename);

Index: yui.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yui.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- yui.c	24 Aug 2008 00:14:38 -0000	1.84
+++ yui.c	30 Aug 2008 01:00:50 -0000	1.85
@@ -1262,6 +1262,7 @@
                SetupOFN(&ofn, OFN_DEFAULTSAVE, hWnd,
                         "Yabause Save State files\0*.YSS\0All Files\0*.*\0",
                         yssfilename, sizeof(yssfilename));
+               ofn.lpstrDefExt = "YSS";
 
                if (GetSaveFileName(&ofn))
                {
@@ -1326,7 +1327,7 @@
                SetupOFN(&ofn, OFN_DEFAULTSAVE, hWnd,
                        "Bitmap Files\0*.BMP\0All Files\0*.*\0",
                        bmpfilename, sizeof(bmpfilename));
-               ofn.lpstrDefExt = "bmp";
+               ofn.lpstrDefExt = "BMP";
 
                if (GetSaveFileName(&ofn))
                {

Index: yuidebug.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yuidebug.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- yuidebug.c	23 Aug 2008 19:42:50 -0000	1.29
+++ yuidebug.c	30 Aug 2008 01:00:53 -0000	1.30
@@ -928,6 +928,7 @@
                SetupOFN(&ofn, OFN_DEFAULTSAVE, hDlg,
                         "Bitmap Files\0*.BMP\0All Files\0*.*\0",
                         filename, sizeof(filename));
+               ofn.lpstrDefExt = "BMP";
 
                if (GetSaveFileName(&ofn))
                   SaveBitmap(filename, vdp1texturew, vdp1textureh, vdp1texture);
@@ -1072,6 +1073,7 @@
                         "Bitmap Files\0*.BMP\0All Files\0*.*\0",
                         filename, sizeof(filename));
                ofn.lpstrDefExt = "BMP";
+
                if (GetSaveFileName(&ofn))
                   SaveBitmap(filename, width, height, vdp2texture);
 
@@ -1845,9 +1847,10 @@
 
                // setup ofn structure
                SetupOFN(&ofn, OFN_DEFAULTSAVE, hDlg,
-                        "All Files\0*.*\0WAV Files\0*.WAV\0",
+                        "WAV Files\0*.WAV\0All Files\0*.*\0",
                         tempstr, sizeof(tempstr));
- 
+               ofn.lpstrDefExt = "WAV";
+
                if (GetSaveFileName(&ofn))
                   ScspSlotDebugAudioSaveWav(cursel, tempstr);
 
@@ -1863,8 +1866,9 @@
 
                // setup ofn structure
                SetupOFN(&ofn, OFN_DEFAULTSAVE, hDlg,
-                        "All Files\0*.*\0Binary Files\0*.BIN\0",
+                        "Binary Files\0*.BIN\0All Files\0*.*\0",
                         tempstr, sizeof(tempstr));
+               ofn.lpstrDefExt = "BIN";
 
                if (GetSaveFileName(&ofn))
                   ScspSlotDebugSaveRegisters(cursel, tempstr);
@@ -2403,9 +2407,10 @@
 
                // setup ofn structure
                SetupOFN(&ofn, OFN_DEFAULTSAVE, hDlg,
-                        "All Files\0*.*\0Text Files\0*.txt\0",
+                        "Text Files\0*.txt\0All Files\0*.*\0",
                         logfilename, sizeof(logfilename));
- 
+               ofn.lpstrDefExt = "TXT";
+
                if (GetSaveFileName(&ofn))
                {
                   FILE *fp=fopen(logfilename, "wb");

[Yabause-cvs] yabause/src/c68k gen68k.inc,1.11,1.12

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-30 00:30

Update of /cvsroot/yabause/yabause/src/c68k
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28132

Modified Files:
	gen68k.inc 
Log Message:
-Fixed an issue when compiling with C68K_NO_JUMP_TABLE

Index: gen68k.inc
===================================================================
RCS file: /cvsroot/yabause/yabause/src/c68k/gen68k.inc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gen68k.inc	13 Apr 2008 16:00:50 -0000	1.11
+++ gen68k.inc	30 Aug 2008 00:30:08 -0000	1.12
@@ -548,6 +548,10 @@
 #ifdef C68K_CONST_JUMP_TABLE
     u32 i, j, k;
 #endif
+#ifdef C68K_NO_JUMP_TABLE
+    u32 i, j, k;
+#endif
+
 
     base &= 0xFFFF;
     start1 &= 0xFFFF;
@@ -592,8 +596,6 @@
     else fprintf(ini_file, "\t\tJumpTable[0x%.4X] = &&OP_0x%.4X;\n", (int)base, (int)op);
 #endif
 #else
-    u32 i, j, k;
-
     if (step1 == 0) step1 = 1;
     if (step2 == 0) step2 = 1;
     if (step3 == 0) step3 = 1;

[Yabause-cvs] yabause/src/gtk menu.c,1.24,1.25

From: Guillaume Duhamel <yabause@us...> - 2008-08-29 19:37

Update of /cvsroot/yabause/yabause/src/gtk
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv30575/src/gtk

Modified Files:
	menu.c 
Log Message:
changed string "Save state" to "Save State"


Index: menu.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/gtk/menu.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- menu.c	28 Apr 2008 21:34:27 -0000	1.24
+++ menu.c	29 Aug 2008 19:37:49 -0000	1.25
@@ -131,7 +131,7 @@
     GtkWidget * savestate_save;
     GtkWidget * savestate_load;
 
-    savestate = gtk_menu_item_new_with_mnemonic(_("Save state"));
+    savestate = gtk_menu_item_new_with_mnemonic(_("Save State"));
     gtk_container_add(GTK_CONTAINER(menuitem1_menu), savestate);
 
     savestate_menu = gtk_menu_new();

[Yabause-cvs] yabause/src/gtk yuiwindow.c,1.29,1.30

From: Guillaume Duhamel <yabause@us...> - 2008-08-28 19:26

Update of /cvsroot/yabause/yabause/src/gtk
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5550/src/gtk

Modified Files:
	yuiwindow.c 
Log Message:
Fixed a bug in the function restoring the window position that
prevented resizing of the window. Fixes 2075579


Index: yuiwindow.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/gtk/yuiwindow.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- yuiwindow.c	19 Aug 2008 21:33:11 -0000	1.29
+++ yuiwindow.c	28 Aug 2008 19:25:54 -0000	1.30
@@ -121,6 +121,8 @@
 	g_key_file_set_value(keyfile, "Gtk", "X", buffer);
 	sprintf(buffer, "%d", event->y);
 	g_key_file_set_value(keyfile, "Gtk", "Y", buffer);
+
+	return FALSE;
 }
 
 extern gchar * inifile;

[Yabause-cvs] yabause/src/gtk yuiinputentry.c,1.8,1.9

From: Guillaume Duhamel <yabause@us...> - 2008-08-25 20:47

Update of /cvsroot/yabause/yabause/src/gtk
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13477/src/gtk

Modified Files:
	yuiinputentry.c 
Log Message:
Fixed #2060659 (this was a problem when switching input cores while
scanning)


Index: yuiinputentry.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/gtk/yuiinputentry.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- yuiinputentry.c	15 Jun 2008 16:19:56 -0000	1.8
+++ yuiinputentry.c	25 Aug 2008 20:47:41 -0000	1.9
@@ -149,7 +149,14 @@
 GtkEntry * entry_hack = NULL;
 
 gboolean watch_joy(gpointer name) {
-	u32 i = PERCore->Scan(name);
+	u32 i;
+
+	if (! PERCore->canScan) {
+		is_watching = FALSE;
+		return TRUE;
+	}
+
+	i = PERCore->Scan(name);
 
 	if (i == 0) {
 		return TRUE;

[Yabause-cvs] yabause/src/qt/ui UISettings.cpp, 1.22, 1.23 UISettings.ui, 1.9, 1.10

From: Nox <P@sN...> - 2008-08-25 19:37

Update of /cvsroot/yabause/yabause/src/qt/ui
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17862/src/qt/ui

Modified Files:
	UISettings.cpp UISettings.ui 
Log Message:
Fix crash when configuring input while using translated version

Index: UISettings.cpp
===================================================================
RCS file: /cvsroot/yabause/yabause/src/qt/ui/UISettings.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- UISettings.cpp	18 May 2008 20:14:57 -0000	1.22
+++ UISettings.cpp	25 Aug 2008 19:37:53 -0000	1.23
@@ -78,9 +78,6 @@
 	setupUi( this );
 	if ( p && !p->isFullScreen() )
 		setWindowFlags( Qt::Sheet );
-	
-	//if ( p && p->isVisible() )
-		//setWindowFlags( Qt::Sheet );
 
 	// load cores informations
 	loadCores();
@@ -162,9 +159,10 @@
 	if ( c )
 	{
 		QPushButton* pb = qobject_cast<QPushButton*>( sender() );
-		UIWaitInput wi( c, pb->statusTip(), window() );
+		const QString key = pb->objectName().mid( 2 );
+		UIWaitInput wi( c, key, window() );
 		if ( wi.exec() )
-			wInput->findChild<QLabel*>( QString( "l%1" ).arg( pb->statusTip() ) )->setText( wi.keyString() );
+			wInput->findChild<QLabel*>( QString( "l%1" ).arg( key ) )->setText( wi.keyString() );
 	}
 }
 
@@ -235,7 +233,7 @@
 	cbInput->setCurrentIndex( cbInput->findData( s->value( "Input/PerCore", QtYabause::defaultPERCore().id ).toInt() ) );
 	foreach ( QLabel* l, wInput->findChildren<QLabel*>() )
 		if ( l != lInput )
-			l->setText( s->value( QString( "Input/Keys/%1" ).arg( l->statusTip() ) ).toString() );
+			l->setText( s->value( QString( "Input/Keys/%1" ).arg( l->objectName().mid( 1 ) ) ).toString() );
 	
 	// advanced
 	cbRegion->setCurrentIndex( cbRegion->findData( s->value( "Advanced/Region", mRegions.at( 0 ).id ).toString() ) );
@@ -273,7 +271,8 @@
 	// input
 	s->setValue( "Input/PerCore", cbInput->itemData( cbInput->currentIndex() ).toInt() );
 	foreach ( QLabel* l, wInput->findChildren<QLabel*>() )
-		s->setValue( QString( "Input/Keys/%1" ).arg( l->statusTip() ), l->text() );
+		if ( l != lInput )
+			s->setValue( QString( "Input/Keys/%1" ).arg( l->objectName().mid( 1 ) ), l->text() );
 	
 	// advanced
 	s->setValue( "Advanced/Region", cbRegion->itemData( cbRegion->currentIndex() ).toString() );

Index: UISettings.ui
===================================================================
RCS file: /cvsroot/yabause/yabause/src/qt/ui/UISettings.ui,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- UISettings.ui	18 May 2008 20:14:57 -0000	1.9
+++ UISettings.ui	25 Aug 2008 19:37:53 -0000	1.10
@@ -23,14 +23,27 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>487</width>
-        <height>329</height>
+        <width>491</width>
+        <height>335</height>
        </rect>
       </property>
       <attribute name="title" >
        <string>General</string>
       </attribute>
       <layout class="QGridLayout" >
+       <item row="10" column="0" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>2</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="0" column="0" colspan="2" >
         <widget class="QLabel" name="lBios" >
          <property name="font" >
@@ -112,19 +125,6 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>20</width>
-           <height>2</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="7" column="0" colspan="2" >
         <widget class="QLabel" name="lTranslation" >
          <property name="font" >
@@ -152,19 +152,6 @@
         </widget>
        </item>
       </layout>
-      <zorder>lBios</zorder>
-      <zorder>leBios</zorder>
-      <zorder>tbBios</zorder>
-      <zorder>lCdRom</zorder>
-      <zorder>cbCdRom</zorder>
-      <zorder>leCdRom</zorder>
-      <zorder>tbCdRom</zorder>
-      <zorder>lSaveStates</zorder>
-      <zorder>leSaveStates</zorder>
-      <zorder>tbSaveStates</zorder>
-      <zorder>lTranslation</zorder>
-      <zorder>leTranslation</zorder>
-      <zorder>tbTranslation</zorder>
      </widget>
      <widget class="QWidget" name="wVideo" >
       <property name="geometry" >
@@ -436,8 +423,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>487</width>
-        <height>329</height>
+        <width>491</width>
+        <height>335</height>
        </rect>
       </property>
       <attribute name="title" >
@@ -478,9 +465,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>Up</string>
-         </property>
          <property name="text" >
           <string>Up</string>
          </property>
@@ -488,9 +472,6 @@
        </item>
        <item row="3" column="1" >
         <widget class="QLabel" name="lUp" >
-         <property name="statusTip" >
-          <string>Up</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -507,9 +488,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>A</string>
-         </property>
          <property name="text" >
           <string>A</string>
          </property>
@@ -517,9 +495,6 @@
        </item>
        <item row="3" column="3" >
         <widget class="QLabel" name="lA" >
-         <property name="statusTip" >
-          <string>A</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -536,9 +511,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>Down</string>
-         </property>
          <property name="text" >
           <string>Down</string>
          </property>
@@ -546,9 +518,6 @@
        </item>
        <item row="4" column="1" >
         <widget class="QLabel" name="lDown" >
-         <property name="statusTip" >
-          <string>Down</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -565,9 +534,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>B</string>
-         </property>
          <property name="text" >
           <string>B</string>
          </property>
@@ -575,9 +541,6 @@
        </item>
        <item row="4" column="3" >
         <widget class="QLabel" name="lB" >
-         <property name="statusTip" >
-          <string>B</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -594,9 +557,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>Left</string>
-         </property>
          <property name="text" >
           <string>Left</string>
          </property>
@@ -604,9 +564,6 @@
        </item>
        <item row="5" column="1" >
         <widget class="QLabel" name="lLeft" >
-         <property name="statusTip" >
-          <string>Left</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -623,9 +580,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>C</string>
-         </property>
          <property name="text" >
           <string>C</string>
          </property>
@@ -633,9 +587,6 @@
        </item>
        <item row="5" column="3" >
         <widget class="QLabel" name="lC" >
-         <property name="statusTip" >
-          <string>C</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -652,9 +603,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>Right</string>
-         </property>
          <property name="text" >
           <string>Right</string>
          </property>
@@ -662,9 +610,6 @@
        </item>
        <item row="6" column="1" >
         <widget class="QLabel" name="lRight" >
-         <property name="statusTip" >
-          <string>Right</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -681,9 +626,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>X</string>
-         </property>
          <property name="text" >
           <string>X</string>
          </property>
@@ -691,9 +633,6 @@
        </item>
        <item row="6" column="3" >
         <widget class="QLabel" name="lX" >
-         <property name="statusTip" >
-          <string>X</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -710,9 +649,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>L</string>
-         </property>
          <property name="text" >
           <string>L</string>
          </property>
@@ -720,9 +656,6 @@
        </item>
        <item row="7" column="1" >
         <widget class="QLabel" name="lL" >
-         <property name="statusTip" >
-          <string>Left trigger</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -739,9 +672,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>Y</string>
-         </property>
          <property name="text" >
           <string>Y</string>
          </property>
@@ -749,9 +679,6 @@
        </item>
        <item row="7" column="3" >
         <widget class="QLabel" name="lY" >
-         <property name="statusTip" >
-          <string>Y</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -768,9 +695,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>R</string>
-         </property>
          <property name="text" >
           <string>R</string>
          </property>
@@ -778,9 +702,6 @@
        </item>
        <item row="8" column="1" >
         <widget class="QLabel" name="lR" >
-         <property name="statusTip" >
-          <string>Right trigger</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -797,9 +718,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>Z</string>
-         </property>
          <property name="text" >
           <string>Z</string>
          </property>
@@ -807,9 +725,6 @@
        </item>
        <item row="8" column="3" >
         <widget class="QLabel" name="lZ" >
-         <property name="statusTip" >
-          <string>Z</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>
@@ -826,9 +741,6 @@
            <height>16777215</height>
           </size>
          </property>
-         <property name="statusTip" >
-          <string>Start</string>
-         </property>
          <property name="text" >
           <string>Start</string>
          </property>
@@ -836,9 +748,6 @@
        </item>
        <item row="9" column="1" >
         <widget class="QLabel" name="lStart" >
-         <property name="statusTip" >
-          <string>Start</string>
-         </property>
          <property name="text" >
           <string>-</string>
          </property>

[Yabause-cvs] yabause/src/windows perdx.c, 1.17, 1.18 resource.h, 1.50, 1.51 resource.rc, 1.75, 1.76

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-25 01:40

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3855

Modified Files:
	perdx.c resource.h resource.rc 
Log Message:
-When configuring input settings, windows won't beep if you press buttons other than esc, enter, etc.(bug #1922302)

Index: resource.h
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/resource.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- resource.h	13 May 2008 06:41:07 -0000	1.50
+++ resource.h	25 Aug 2008 01:40:33 -0000	1.51
@@ -56,6 +56,7 @@
 #define IDC_CHEATLIST                   1001
 #define IDC_EDTEXT                      1001
 #define IDC_VERSIONTEXT                 1001
+#define IDC_WAITINPUT                   1001
 #define IDC_EDITTEXT2                   1002
 #define IDC_DRIVELETTERCB               1002
 #define IDC_FULLSCREENSTARTUPCB         1002

Index: perdx.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/perdx.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- perdx.c	10 May 2008 18:28:30 -0000	1.17
+++ perdx.c	25 Aug 2008 01:40:33 -0000	1.18
@@ -882,6 +882,18 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+HHOOK hook;
+
+LRESULT CALLBACK KeyboardHook(int code, WPARAM wParam, LPARAM lParam)
+{
+   if (code >= HC_ACTION)
+      return TRUE;
+
+   return CallNextHookEx(hook, code, wParam, lParam);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
 LRESULT CALLBACK ButtonConfigDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam,
                                      LPARAM lParam)
 {
@@ -916,6 +928,8 @@
          if (!SetTimer(hDlg, 1, 100, NULL))
              return FALSE;
 
+         PostMessage(hDlg, WM_NEXTDLGCTL, (WPARAM)GetDlgItem(hDlg, IDC_WAITINPUT), TRUE);
+         hook = SetWindowsHookEx(WH_KEYBOARD, KeyboardHook, y_hInstance, GetCurrentThreadId());
          return TRUE;
       }
       case WM_COMMAND:
@@ -1030,6 +1044,7 @@
       case WM_DESTROY:
       {
          KillTimer(hDlg, 1);
+         UnhookWindowsHookEx(hook);
          break;
       }
    }

Index: resource.rc
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/resource.rc,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- resource.rc	13 May 2008 06:41:07 -0000	1.75
+++ resource.rc	25 Aug 2008 01:40:33 -0000	1.76
@@ -511,8 +511,7 @@
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "Courier New", 0, 0, 0x0
 BEGIN
-    CTEXT           "Waiting for input...",-1,0,6,110,12
-    DEFPUSHBUTTON   "",IDOK,-6,-6,1,1
+    CTEXT           "Waiting for input...",IDC_WAITINPUT,0,6,110,12
     PUSHBUTTON      "Cancel",IDC_CUSTOMCANCEL,35,20,40,14
 END

[Yabause-cvs] yabause/src/windows hexedit.c, 1.10, 1.11 yabause.vcproj, 1.17, 1.18

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-24 04:34

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27958

Modified Files:
	hexedit.c yabause.vcproj 
Log Message:
-Scroll bar in memory editor now works properly when you move the thumb control(bug #2067438)

Index: yabause.vcproj
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yabause.vcproj,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- yabause.vcproj	17 Aug 2008 02:06:58 -0000	1.17
+++ yabause.vcproj	24 Aug 2008 04:34:09 -0000	1.18
@@ -414,153 +414,6 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\bios.c"
-				>
-			</File>
-			<File
-				RelativePath="..\cdbase.c"
-				>
-			</File>
-			<File
-				RelativePath="..\cheat.c"
-				>
-			</File>
-			<File
-				RelativePath="..\coffelf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\cs0.c"
-				>
-			</File>
-			<File
-				RelativePath="..\cs1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\cs2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\error.c"
-				>
-			</File>
-			<File
-				RelativePath="..\m68kc68k.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug with Threads|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug no 68k|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\m68kcore.c"
-				>
-			</File>
-			<File
-				RelativePath="..\m68kd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\memory.c"
-				>
-			</File>
-			<File
-				RelativePath="..\netlink.c"
-				>
-			</File>
-			<File
-				RelativePath="..\peripheral.c"
-				>
-			</File>
-			<File
-				RelativePath="..\profile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\scsp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\scu.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sh2core.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sh2d.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sh2idle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\sh2int.c"
-				>
-			</File>
-			<File
-				RelativePath="..\smpc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\vdp1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\vdp2.c"
-				>
-			</File>
-			<File
-				RelativePath="..\vdp2debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\vidogl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\vidshared.c"
-				>
-			</File>
-			<File
-				RelativePath="..\vidsoft.c"
-				>
-			</File>
-			<File
-				RelativePath="..\yabause.c"
-				>
-			</File>
-			<File
-				RelativePath="..\ygl.c"
-				>
-			</File>
 			<Filter
 				Name="windows specific"
 				>
@@ -650,18 +503,47 @@
 				</Filter>
 			</Filter>
 			<Filter
-				Name="68k core"
+				Name="emulation core"
 				>
 				<File
-					RelativePath="..\c68k\c68k.c"
+					RelativePath="..\bios.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cdbase.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cheat.c"
+					>
+				</File>
+				<File
+					RelativePath="..\coffelf.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cs0.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cs1.c"
+					>
+				</File>
+				<File
+					RelativePath="..\cs2.c"
+					>
+				</File>
+				<File
+					RelativePath="..\debug.c"
+					>
+				</File>
+				<File
+					RelativePath="..\error.c"
+					>
+				</File>
+				<File
+					RelativePath="..\m68kc68k.c"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
 					<FileConfiguration
 						Name="Debug with Threads|Win32"
 						ExcludedFromBuild="true"
@@ -680,91 +562,199 @@
 					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\c68k\c68k_ini.inc"
+					RelativePath="..\m68kcore.c"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Building C68K inc files"
-							CommandLine="cd  $(InputDir) &amp;&amp; &quot;$(ProjectDir)\Release\gen68k.exe&quot;"
-							AdditionalDependencies="$(ProjectDir)\Release\gen68k.exe"
-							Outputs="c68k_ini.inc; c68k_op0.inc; c68k_op1.inc; c68k_op2.inc; c68k_op3.inc; c68k_op4.inc; c68k_op5.inc; c68k_op6.inc; c68k_op7.inc; c68k_op8.inc; c68k_op9.inc; c68k_opA.inc; c68k_opB.inc; c68k_opC.inc; c68k_opD.inc; c68k_opE.inc; c68k_opF.inc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Building C68K inc files"
-							CommandLine="cd  $(InputDir) &amp;&amp; &quot;$(ProjectDir)\Release\gen68k.exe&quot;"
-							AdditionalDependencies="&quot;$(ProjectDir)\Release\gen68k.exe&quot;"
-							Outputs="c68k_ini.inc; c68k_op0.inc; c68k_op1.inc; c68k_op2.inc; c68k_op3.inc; c68k_op4.inc; c68k_op5.inc; c68k_op6.inc; c68k_op7.inc; c68k_op8.inc; c68k_op9.inc; c68k_opA.inc; c68k_opB.inc; c68k_opC.inc; c68k_opD.inc; c68k_opE.inc; c68k_opF.inc"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug with Threads|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug no 68k|Win32"
-						ExcludedFromBuild="true"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description=""
-							CommandLine=""
-							AdditionalDependencies=""
-						/>
-					</FileConfiguration>
 				</File>
 				<File
-					RelativePath="..\c68k\c68kexec.c"
+					RelativePath="..\m68kd.c"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCustomBuildTool"
-							Description="Building c68kexec"
-							CommandLine="cl /Od /Ob2 /Oy /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /FD /MD /fp:fast /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /TC /errorReport:prompt  $(InputDir)$(InputFileName)"
-							AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
-							Outputs="$(TargetDir)$(InputName).obj"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug|Win32"
+				</File>
+				<File
+					RelativePath="..\memory.c"
+					>
+				</File>
+				<File
+					RelativePath="..\netlink.c"
+					>
+				</File>
+				<File
+					RelativePath="..\peripheral.c"
+					>
+				</File>
+				<File
+					RelativePath="..\profile.c"
+					>
+				</File>
+				<File
+					RelativePath="..\scsp.c"
+					>
+				</File>
+				<File
+					RelativePath="..\scu.c"
+					>
+				</File>
+				<File
+					RelativePath="..\sh2core.c"
+					>
+				</File>
+				<File
+					RelativePath="..\sh2d.c"
+					>
+				</File>
+				<File
+					RelativePath="..\sh2idle.c"
+					>
+				</File>
+				<File
+					RelativePath="..\sh2int.c"
+					>
+				</File>
+				<File
+					RelativePath="..\smpc.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vdp1.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vdp2.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vdp2debug.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vidogl.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vidshared.c"
+					>
+				</File>
+				<File
+					RelativePath="..\vidsoft.c"
+					>
+				</File>
+				<File
+					RelativePath="..\yabause.c"
+					>
+				</File>
+				<File
+					RelativePath="..\ygl.c"
+					>
+				</File>
+				<Filter
+					Name="68k core"
+					>
+					<File
+						RelativePath="..\c68k\c68k.c"
 						>
-						<Tool
-							Name="VCCustomBuildTool"
-							CommandLine="cl /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /Gm /EHsc /RTC1 /MDd /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /ZI /TC /errorReport:prompt $(InputDir)$(InputFileName)&#x0D;&#x0A;"
-							AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
-							Outputs="$(TargetDir)$(InputName).obj"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug with Threads|Win32"
-						ExcludedFromBuild="true"
+						<FileConfiguration
+							Name="Debug with Threads|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug no 68k|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\c68k\c68k_ini.inc"
 						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Debug no 68k|Win32"
-						ExcludedFromBuild="true"
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description="Building C68K inc files"
+								CommandLine="cd  $(InputDir) &amp;&amp; &quot;$(ProjectDir)\Release\gen68k.exe&quot;&#x0D;&#x0A;"
+								AdditionalDependencies="$(ProjectDir)\Release\gen68k.exe"
+								Outputs="c68k_ini.inc; c68k_op0.inc; c68k_op1.inc; c68k_op2.inc; c68k_op3.inc; c68k_op4.inc; c68k_op5.inc; c68k_op6.inc; c68k_op7.inc; c68k_op8.inc; c68k_op9.inc; c68k_opA.inc; c68k_opB.inc; c68k_opC.inc; c68k_opD.inc; c68k_opE.inc; c68k_opF.inc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description="Building C68K inc files"
+								CommandLine="cd  $(InputDir) &amp;&amp; &quot;$(ProjectDir)\Release\gen68k.exe&quot;&#x0D;&#x0A;"
+								AdditionalDependencies="&quot;$(ProjectDir)\Release\gen68k.exe&quot;"
+								Outputs="c68k_ini.inc; c68k_op0.inc; c68k_op1.inc; c68k_op2.inc; c68k_op3.inc; c68k_op4.inc; c68k_op5.inc; c68k_op6.inc; c68k_op7.inc; c68k_op8.inc; c68k_op9.inc; c68k_opA.inc; c68k_opB.inc; c68k_opC.inc; c68k_opD.inc; c68k_opE.inc; c68k_opF.inc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug with Threads|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug no 68k|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description=""
+								CommandLine=""
+								AdditionalDependencies=""
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="..\c68k\c68kexec.c"
 						>
-						<Tool
-							Name="VCCLCompilerTool"
-						/>
-					</FileConfiguration>
-				</File>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								Description="Building c68kexec"
+								CommandLine="cl /Od /Ob2 /Oy /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /FD /MD /fp:fast /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /TC /errorReport:prompt  $(InputDir)$(InputFileName)&#x0D;&#x0A;"
+								AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
+								Outputs="$(TargetDir)$(InputName).obj"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCustomBuildTool"
+								CommandLine="cl /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_WINDOWS&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot; /D &quot;_CRT_NONSTDC_NO_DEPRECATE&quot; /D &quot;_WIN32_IE=0x400&quot; /D &quot;_WIN32_WINNT=0x400&quot; /D &quot;HAVE_C99_VARIADIC_MACROS&quot; /D &quot;HAVE_LIBGLUT&quot; /D &quot;HAVE_LIBGL&quot; /D &quot;NO_CLI&quot; /D &quot;USEM68KCORE&quot; /D &quot;VERSION=\&quot;0.9.6\&quot;&quot; /D &quot;C68K_NO_JUMP_TABLE&quot; /Gm /EHsc /RTC1 /MDd /Fo&quot;$(IntDir)\\&quot; /Fd&quot;$(IntDir)\vc80.pdb&quot; /W0 /nologo /c /Wp64 /ZI /TC /errorReport:prompt $(InputDir)$(InputFileName)&#x0D;&#x0A;"
+								AdditionalDependencies="c68k_ini.inc c68k_op0.inc c68k_op1.inc c68k_op2.inc c68k_op3.inc c68k_op4.inc c68k_op5.inc c68k_op6.inc c68k_op7.inc c68k_op8.inc c68k_op9.inc c68k_opA.inc c68k_opB.inc c68k_opC.inc c68k_opD.inc c68k_opE.inc c68k_opF.inc"
+								Outputs="$(TargetDir)$(InputName).obj"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug with Threads|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Debug no 68k|Win32"
+							ExcludedFromBuild="true"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter

Index: hexedit.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/hexedit.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- hexedit.c	17 Aug 2008 19:04:25 -0000	1.10
+++ hexedit.c	24 Aug 2008 04:34:09 -0000	1.11
@@ -40,6 +40,7 @@
    int editmode;
    addrlist_struct *addrlist;
    int numaddr;
+   u32 maxaddr;
    int selstart, selend;
 } HexEditCtl_struct;
 
@@ -86,7 +87,7 @@
    GetScrollInfo(hwnd, SB_VERT, &cc->scrollinfo);
 
    // Set our newly created structure to the extra area                                                                                                SetCustCtrl(hwnd, ccp);
-   SetWindowLong(hwnd, 0, (LONG)cc);
+   SetWindowLongPtr(hwnd, 0, (LONG_PTR)cc);
    return TRUE;
 }
 
@@ -316,7 +317,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-void MoveCursor(HexEditCtl_struct *cc, int offset)
+void MoveCursor(HexEditCtl_struct *cc, int offset, int scrollpos)
 {
    static int pos;
    u32 addr;
@@ -508,6 +509,33 @@
          }
       }
    }
+   else
+   {
+      u32 counter;
+      u32 counter2;
+      SCROLLINFO si;
+
+      si.cbSize = sizeof(SCROLLINFO);
+      si.fMask = SIF_RANGE | SIF_POS;
+      GetScrollInfo(cc->hwnd, SB_VERT, &si);
+
+      // Figure out where to jump to based on percentage
+      counter = (u32)((u64)cc->maxaddr * (u64)scrollpos / (u64)si.nMax);
+
+      for (i = 0, counter2=0; i < cc->numaddr; i++)
+      {
+         if ((counter2+cc->addrlist[i].end-cc->addrlist[i].start) > counter)
+         {
+            cc->addr=cc->addrlist[i].start+counter-counter2;
+            // round address
+            cc->addr -= (cc->addr % cc->maxcurx);
+            break;
+         }
+         counter2 +=cc->addrlist[i].end-cc->addrlist[i].start;
+      }
+
+      InvalidateRect(cc->hwnd, NULL, FALSE);
+   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -589,7 +617,7 @@
       {
          int oldcury=cc->cury;
          cc->cury = cc->maxcury-1;
-         MoveCursor(cc, cc->maxcurx);
+         MoveCursor(cc, cc->maxcurx, 0);
          cc->cury=oldcury;
          HexEditCtl_SetCaretPos(cc);
          return 0;
@@ -598,23 +626,25 @@
       {
          int oldcury=cc->cury;
          cc->cury = 0;
-         MoveCursor(cc, -cc->maxcurx);
+         MoveCursor(cc, -cc->maxcurx, 0);
          cc->cury=oldcury;
          HexEditCtl_SetCaretPos(cc);
          return 0;
       }
       case SB_PAGEDOWN:
-         MoveCursor(cc, cc->maxcurx*cc->maxcury);
+         MoveCursor(cc, cc->maxcurx*cc->maxcury, 0);
          return 0;
       case SB_PAGEUP:
-         MoveCursor(cc, -(cc->maxcurx*cc->maxcury));
+         MoveCursor(cc, -(cc->maxcurx*cc->maxcury), 0);
          return 0;
       case SB_THUMBTRACK:
 //         cc->addr = 0xFFFFFF00 / 64 * HIWORD(wParam);
 //         InvalidateRect(cc->hwnd, NULL, FALSE);
+         MoveCursor(cc, 0, HIWORD(wParam));
          return 0;
       case SB_THUMBPOSITION:
          SetScrollPos(cc->hwnd, SB_VERT, HIWORD(wParam), TRUE);
+         MoveCursor(cc, 0, HIWORD(wParam));
          return 0;
       default:
          break;
@@ -633,22 +663,22 @@
    switch (wParam)
    {
       case VK_LEFT:
-         MoveCursor(cc, -1);
+         MoveCursor(cc, -1, 0);
          break;
       case VK_UP:
-         MoveCursor(cc, -cc->maxcurx);
+         MoveCursor(cc, -cc->maxcurx, 0);
          break;
       case VK_DOWN:
-         MoveCursor(cc, cc->maxcurx);
+         MoveCursor(cc, cc->maxcurx, 0);
          break;
       case VK_RIGHT:
-         MoveCursor(cc, 1);
+         MoveCursor(cc, 1, 0);
          break;
       case VK_PRIOR:
-         MoveCursor(cc, -(cc->maxcurx*cc->maxcury));
+         MoveCursor(cc, -(cc->maxcurx*cc->maxcury), 0);
          break;
       case VK_NEXT:
-         MoveCursor(cc, (cc->maxcurx*cc->maxcury));
+         MoveCursor(cc, (cc->maxcurx*cc->maxcury), 0);
          break;
       case VK_END:
       {
@@ -737,7 +767,7 @@
 
 LRESULT CALLBACK HexEditCtl(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-   HexEditCtl_struct *cc=(HexEditCtl_struct *)GetWindowLong(hwnd, 0);
+   HexEditCtl_struct *cc=(HexEditCtl_struct *)GetWindowLongPtr(hwnd, 0);
 
    switch(message)
    {
@@ -773,6 +803,7 @@
       case HEX_SETADDRESSLIST:
       {
          addrlist_struct *addrlist;
+         int i;
 
          if (((addrlist_struct *)lParam) != NULL && wParam > 0)
          {
@@ -788,6 +819,8 @@
             cc->numaddr = (int)wParam;
             cc->addr = cc->addrlist[0].start;
             cc->curx = cc->cury = 0;
+            for (i = 0, cc->maxaddr=0; i < cc->numaddr; i++)
+               cc->maxaddr += cc->addrlist[i].end-cc->addrlist[i].start;
             return 0;
          }
          return -1;

[Yabause-cvs] yabause/src/windows yui.c,1.83,1.84

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-24 00:14

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv24051

Modified Files:
	yui.c 
Log Message:
-Fixed a bug where main Yabause window could be closed before Settings dialog when running for the first time(bug #2028061)

Index: yui.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yui.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- yui.c	23 Aug 2008 20:12:27 -0000	1.83
+++ yui.c	24 Aug 2008 00:14:38 -0000	1.84
@@ -963,7 +963,7 @@
       {
          nocorechange = 1;
 
-         if (DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_SETTINGS), NULL, (DLGPROC)SettingsDlgProc) != TRUE)
+         if (DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_SETTINGS), YabWin, (DLGPROC)SettingsDlgProc) != TRUE)
          {
             // exit program with error
             MessageBox (NULL, "yabause.ini must be properly setup before program can be used.", "Error",  MB_OK | MB_ICONINFORMATION);

[Yabause-cvs] yabause/src/windows yui.c,1.82,1.83

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-23 20:12

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27550

Modified Files:
	yui.c 
Log Message:
-Fixed a bug where saving/loading a save state and an error occured would cause sound looping(bug #2058017)

Index: yui.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yui.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- yui.c	20 Aug 2008 17:56:44 -0000	1.82
+++ yui.c	23 Aug 2008 20:12:27 -0000	1.83
@@ -1299,8 +1299,10 @@
             case IDM_SAVESTATE_F8:
             case IDM_SAVESTATE_F9:
             case IDM_SAVESTATE_F10:
+               YuiTempPause();
                if (YabSaveStateSlot(ysspath, LOWORD(wParam)-IDM_SAVESTATE_F2) != 0)
                   MessageBox (hWnd, "Couldn't save state file", "Error",  MB_OK | MB_ICONINFORMATION);
+               YuiTempUnPause();
                break;
             case IDM_LOADSTATE_F2:
             case IDM_LOADSTATE_F3:
@@ -1311,8 +1313,10 @@
             case IDM_LOADSTATE_F8:
             case IDM_LOADSTATE_F9:
             case IDM_LOADSTATE_F10:
+               YuiTempPause();
                if (YabLoadStateSlot(ysspath, LOWORD(wParam)-IDM_LOADSTATE_F2) != 0)
                   MessageBox (hWnd, "Couldn't load state file", "Error",  MB_OK | MB_ICONINFORMATION);
+               YuiTempUnPause();
                break;
             case IDM_CAPTURESCREEN:
             {

[Yabause-cvs] yabause/src/windows yuidebug.c,1.28,1.29

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-23 19:42

Update of /cvsroot/yabause/yabause/src/windows
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15048

Modified Files:
	yuidebug.c 
Log Message:
-Fixed a bug in vdp1 debug where width/height of 0 would the program to crash

Index: yuidebug.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/windows/yuidebug.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- yuidebug.c	23 Aug 2008 17:57:31 -0000	1.28
+++ yuidebug.c	23 Aug 2008 19:42:50 -0000	1.29
@@ -958,7 +958,7 @@
          GetClientRect(GetDlgItem(hDlg, IDC_VDP1TEXTET), &rect);
          FillRect(hdc, &rect, (HBRUSH)GetStockObject(BLACK_BRUSH));
 
-         if (vdp1texture == NULL)
+         if (vdp1texture == NULL || vdp1texturew == 0 || vdp1textureh == 0)
          {
             SetBkColor(hdc, RGB(0,0,0));
             SetTextColor(hdc, RGB(255,255,255));

[Yabause-cvs] yabause/src vdp1.c,1.31,1.32

From: Theo Berkau <cyberwarriorx@us...> - 2008-08-23 19:41

Update of /cvsroot/yabause/yabause/src
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14594

Modified Files:
	vdp1.c 
Log Message:
-Fixed a bug where vdp1 debug function wasn't handling retardedly large addresses.

Index: vdp1.c
===================================================================
RCS file: /cvsroot/yabause/yabause/src/vdp1.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- vdp1.c	8 Jul 2008 21:48:30 -0000	1.31
+++ vdp1.c	23 Aug 2008 19:41:29 -0000	1.32
@@ -581,6 +581,8 @@
             break;
       }
 
+      if (addr > 0x7FFE0)
+         return 0xFFFFFFFF;
       command = T1ReadWord(Vdp1Ram, addr);
       commandCounter++;    
    }

Next Messages