Commit Graph

664 Commits

Author SHA1 Message Date
hrydgard 7a8d4a1987 Defend against bad parameters for HLE_Printf, early out in symboldb, misc
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@520 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 18:15:53 +00:00
Sonicadvance1 b0aaac3890 Should fix about box in Windows
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@519 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 17:40:21 +00:00
masken f75fafc1ce Moved all relevant code into the Wiimote plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@518 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 17:11:15 +00:00
Shawn Hoffman de9b103524 reversion
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@517 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 16:33:28 +00:00
Shawn Hoffman 73cef0e53b fixed plugin options: no longer ugly on linux, and calls wiimote config/about
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@516 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 16:10:26 +00:00
Shawn Hoffman 6cabff4b0d daco breaks things ^^
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@515 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 15:31:06 +00:00
Maarten ter Huurne 0b600d848a Added new file "Plugins/Plugin_Wiimote.cpp".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@514 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 15:27:09 +00:00
daco65 583d22e72b and suddenly out of nowhere i had 4 resource.h files
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@513 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 15:17:16 +00:00
daco65 f07b75dc09 some patches done by F|res & OmegaDox
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@512 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 15:09:03 +00:00
daco65 af918f2e43 added the wiimote config to the dolphin.ini options.
also commented out the wiimote loading. cause the plugin can't do anything yet it wont load dolphin to start the game.
I also renamed the wiimote plugin. removing the test part. yes its a test but in the end its meant to become a full wiimote plugin right?

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@509 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 13:44:06 +00:00
masken f6e4aad94f Added preliminary Wiimote plugin spec, and an empty test plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@508 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 10:28:23 +00:00
Sonicadvance1 2ab88e167e Some ATI cards have both ATI_draw_buffers AND ARB_draw_buffers, if both, go with ARB_draw_buffers
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@507 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 05:41:26 +00:00
Sonicadvance1 eb150f3114 Linux: Fixed Crashing problem due to locking problems with Xevents in the callback function. This SHOULD also fix the random lockups most/all are having in Linux, cheers
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@506 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 04:32:28 +00:00
XTra.KrazzY daabc11592 Clearing memory on boot
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@505 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-13 00:41:31 +00:00
daco65 7a68316c61 stupid VS2005 compiler and its " i dont understand directories with spaces"
fixed building when the source is located at a place like C:\Documents and settings


also got sick of njoy.h saying the new lines wern't done correctly. so thats fixed too.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@504 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 23:55:59 +00:00
masken db23e9a6c0 Wiimote: added hardcoded example data reporting functions.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@503 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 20:45:06 +00:00
Shawn Hoffman 08a79ec7df win64 build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@502 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 20:08:38 +00:00
masken 6d3ada97a2 Wiimote: fixed SendDataReply() and added a bunch of report handlers.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@501 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 19:35:04 +00:00
XTra.KrazzY ba4143e82b Optimized vertex and pixel shader generation. Medium FPS boost.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@500 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 19:04:13 +00:00
memberTwo.mb2 3cc7e501af fix windows build.
fix debug from VS IDE.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@499 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 13:46:45 +00:00
nakeee bd2fb238b6 changed lzo to minilzo, fixing compile on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@498 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 09:59:10 +00:00
nakeee ea75d5adce fixed casting to pointer, Im not 100% sure it's currect so please give it a look
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@497 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 09:37:19 +00:00
nakeee e5a126e231 lzo compiles on linux (almost working)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@496 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 09:15:54 +00:00
nakeee 7230dc58da fixed convertion between const char * and wxString to make code compile
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@495 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 07:58:19 +00:00
XTra.KrazzY 8f04cf2f4b LZO commit fix. Linux developers: Please add LZO to SConstruct, if necessary.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@494 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 00:22:35 +00:00
XTra.KrazzY 795c3bc4e0 Added the LZO external library. Added very fast LZO save state compression.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@493 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 00:08:55 +00:00
Shawn Hoffman 8dbfcaef4f added notes column and it resizes columns in a better looking way now (like the old gui)
still need to find a way to colorize columns individually, seems to be a problem with wxw
if there is a defaultgcm selected, hitting play boots that gcm.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@492 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-11 21:24:49 +00:00
Maarten ter Huurne eb1228cdb1 Moved SysMessage() from the video plugin into the main app, so the GUI and non-GUI executable can handle it in a different way. This fixes a crash in DolphinNoGUI when SysMessage() was called and tried to use a non-initialized wxWidgets. (this commit contains changes that should have been in revision 489)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@490 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-10 01:03:22 +00:00
Maarten ter Huurne 54c2a07de5 Moved SysMessage() from the video plugin into the main app, so the GUI and non-GUI executable can handle it in a different way. This fixes a crash in DolphinNoGUI when SysMessage() was called and tried to use a non-initialized wxWidgets.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@489 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-10 01:01:28 +00:00
Shawn Hoffman 38ff37539d updated gui a little bit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@488 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-09 23:34:13 +00:00
Maarten ter Huurne 7ae9fb085b Removed Host_CreateDisplay() and Host_CloseDisplay() since these functions do not exist in "Host.h".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@487 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-09 23:26:09 +00:00
masken 09ba0a3a11 Fixed a couple of unused variable warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@486 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 20:14:07 +00:00
nakeee 86a9c845c3 much ctor order
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@485 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 18:35:24 +00:00
nakeee 566a4ebc82 casting
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@484 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 07:36:30 +00:00
nakeee 7026025a2d more warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@483 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 07:09:34 +00:00
nakeee 8201ead1d9 compiler doesn't like unmatched '' even in comments
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@482 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 06:48:23 +00:00
nakeee 39a08656f7 warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@481 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 06:41:03 +00:00
tmator 01f7662ca6 osx build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@479 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 06:06:59 +00:00
Sonicadvance1 462b3184e2 Added some Fog functions to the GL plugin, doesn't effect games at all. Quick change to GLInit.cpp that doesn't do much as well
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@477 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-08 04:03:42 +00:00
Maarten ter Huurne ed7a5a46d0 Removed time trial restriction ;)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@476 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 21:06:55 +00:00
Maarten ter Huurne 64390ff77d Fixed indentation. I am making this a separate commit so the next commit will show the actual code changes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@475 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 21:02:57 +00:00
nakeee ac83588c3a continue changing src to Src
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@474 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 20:29:31 +00:00
nakeee 21171d8b1b git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@473 8ced0084-cf51-0410-be5f-012b33b47a6e 2008-09-07 20:26:38 +00:00
nakeee 5fb796fd19 use gen get opts for parsing MainNoGui command line, this doesn't do much yet
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@472 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 20:24:05 +00:00
Maarten ter Huurne 885e1c5185 Removed ini file that was in the wrong place.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@471 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 19:47:07 +00:00
Maarten ter Huurne 9e692e4770 Removed "break" after "return" to avoid warning in GCC.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@470 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 19:29:33 +00:00
masken f5c7f61ed3 Wiimote: added a bunch of HID packet handling. LogManager: removed double line breaks in Win32 log files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@469 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 18:54:33 +00:00
Sonicadvance1 d6ac59f1cc Linux: Moved resize to the callback function, where the Xevents are being checked on, possibly fixing the random freezing bug
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@468 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 18:09:38 +00:00
Shawn Hoffman 8f7c509a13 windows x64 build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@467 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 17:11:52 +00:00
daco65 6c0fd0b31f forgot to remove icon before committing...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@466 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 16:21:28 +00:00
daco65 ad3bea4c04 changed keyForControl to an unsigned int. it was in conflict with main.cpp
also changed the pre-build events so that it now compiles even when the dolphin source is located in a dir with a space(like C:\documents and settings)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@465 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 16:12:56 +00:00
Shawn Hoffman 55002b9db2 changed Memory::Shutdown with a patch from mOoOo
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@464 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 14:56:05 +00:00
nakeee 9637314efb another unused packed
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@463 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 14:14:24 +00:00
nakeee 4c1de84039 unused fogcolor removed, shouldn't BPMEM_FOGPARAM3 and BPMEM_FOGCOLOR be united with BPMEM_FOGBMAGNITUDE?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@462 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 14:11:21 +00:00
nakeee 426b40417b no negative ketForControl
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@461 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 14:07:37 +00:00
nakeee 0882a71e56 unused sample
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@460 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 14:05:47 +00:00
nakeee 5af15b6fd3 added ()
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@459 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 14:04:25 +00:00
nakeee 43634d53df fixed warnings
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@458 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 13:58:56 +00:00
nakeee e77e1cbabc removed unesserary __attribute__ ((packed));
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@457 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 13:51:39 +00:00
Maarten ter Huurne 6cd9700dcf Explicitly convert negative numbers to u32 to avoid warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@456 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 13:17:46 +00:00
Maarten ter Huurne 4952852799 Removed header because "HTTP.cpp" was the only source that included it, and that source was removed.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@455 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 13:04:40 +00:00
Maarten ter Huurne 7beada8f54 Removed "HTTP.cpp" from list of files to build, because the source file was removed too.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@454 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 13:03:32 +00:00
hrydgard 81e937041f fix 64-bit build too on Platform SDK 6.0, fix project file.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@453 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 11:07:55 +00:00
hrydgard 5a69fca0be Add some missing GPL headers, fix building with Platform SDK 6.0, delete unused HTTP code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@452 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 10:29:46 +00:00
Maarten ter Huurne 5ac0c33530 Fixed "bcl" instruction in the case where the branch is always taken. The old code would emit a "jne" that can skip the updating of LR depending on the state the host CPU happens to be in.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@451 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 07:04:41 +00:00
daco65 72ca1e2355 refixed. my mistake sorry
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@450 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-06 23:38:12 +00:00
daco65 3078f66763 fixed some issues with ExtendedTrace.cpp for 64bit builds. not sure about the (PDWORD64) tho (i had bad exp. with that in past projects).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@449 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-06 23:05:06 +00:00
nakeee 953085d4d9 include fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@448 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-06 21:56:20 +00:00
masken 10e9add26d Fixed Common logging.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@447 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-06 21:12:19 +00:00
masken 565a4d28ec Added ExtendedTrace crash logging. Wiimote HLE can now create an L2CAP connection.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@446 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-06 13:41:44 +00:00
nakeee f6298b9f31 forgot return value on windows
can't check it though


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@445 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 15:22:25 +00:00
nakeee 3749fb510b added getuserdirectory
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@444 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 13:12:47 +00:00
nakeee dc28cbec1c map renamed to icon
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@443 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 12:16:01 +00:00
nakeee 6edc234303 added createdir and isdirectory for nix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@442 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 11:59:28 +00:00
Maarten ter Huurne cf36d4ba58 Fixed ProtectFunction(): it should copy parameters using the padded size. Actually, I am not sure this function is correct, but at least its implementation is now equivalent to the original (before rev 439).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@441 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 01:48:16 +00:00
Sonicadvance1 6d53aaed21 Linux: Made PadSimple actually work in Linux, removed the SDL dependency since Fires yelled at me (a long time ago).Tmator, you will have to use something else and Video Plugin Skips key events in Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@440 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 01:07:41 +00:00
Maarten ter Huurne 722ea233a1 Align stack to 16-byte boundary when compiling in 32-bit mode with GCC. This is required to run anything on OS X and to support SSE instructions on Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@439 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 00:02:53 +00:00
masken f96d19a1fb Wiimote: added ACL connection setup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@438 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 06:50:38 +00:00
Maarten ter Huurne 53cdd29228 Removed CHAR typedef.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@437 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 00:41:06 +00:00
Maarten ter Huurne bccb1756b2 Replaced "CHAR" by "char": there is no mention of type CHAR on MSDN, the argument to which CHAR* is passed is documented as being char* and the function would be broken if sizeof(CHAR) would be different from 1.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@436 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 00:40:18 +00:00
Maarten ter Huurne bd7996354a Removed "INT" typedef: it was not used in any plugin spec. It was used DX9 video plugin, but for arguments where MSDN lists a plain "int", so I replaced "INT" by "int" to make things clearer.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@435 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 00:27:24 +00:00
Maarten ter Huurne 4b3c4492ea Replaced "WORD" by "u16", except where it is part of the Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@434 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 00:12:32 +00:00
Maarten ter Huurne 36058428a0 Replaced "unsigned __int64" by "u64".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@433 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 00:02:21 +00:00
Maarten ter Huurne 6e2416b389 Replaced "unsigned __int32" by "u32".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@432 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-02 23:44:54 +00:00
Maarten ter Huurne 36b464cbc8 Replaced "unsigned __int16" by "u16".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@431 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-02 23:32:05 +00:00
Shawn Hoffman 179752449d removed PortableSockets.cpp from the vs05 project file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@430 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-02 02:35:08 +00:00
Maarten ter Huurne 1154027808 Replaced type "DWORD" by "u32", except where "DWORD" is used to access the Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@429 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 22:48:56 +00:00
Maarten ter Huurne f3f17b4a19 Removed parts of PortableSockets that we do not use. If you need more functionality later, resurrect it from old SVN revisions or re-download the source (see top of the header). However, DO NOT use performance counters to do timing, since the counter value can be different for different CPU cores.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@428 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 22:13:11 +00:00
masken 012041bab5 Added puts() HLE, WIIMOTE logging section and experimental virtual connection request.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@427 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 21:29:27 +00:00
gigaherz b1cd01819b replace _DEBUG with LOGGING in the #ifs. Thanks to Xuefer for this change.
also unbroke somethign which shouldn't have been there in the last commit.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@426 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 15:18:32 +00:00
gigaherz a7ec1a2562 Made banners/icons show up in linux. It doesn't seem to use the right height, but I have to leave now so that will have to wait.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@425 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 15:04:59 +00:00
gigaherz b0f51a0b98 Reverted the "warning removal" changes because they broke debug building in windows. Used #ifdef _DEBUG to disable those lines in release builds instead.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@424 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 14:49:34 +00:00
XTra.KrazzY 10eef7f60e Build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@423 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 13:31:24 +00:00
nakeee 4bbfff3cac many warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@422 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 12:11:08 +00:00
Maarten ter Huurne cad45aea72 Replaced CPFifo by SCPFifoStruct: both were identical and there is no point in having two definitions.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@421 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 09:12:30 +00:00
Sonicadvance1 6638ed20a6 Woops, my fault
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@420 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 08:50:16 +00:00
Sonicadvance1 454cee4d1e Your Holy savior has come to save the day. Also fixed compiling in Linux, a memory leak, and checks if a glxcontext was created
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@419 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 08:32:33 +00:00
gigaherz ead647d422 Added code to display the first icon (I tried to display it animated, but failed).
It still uses just one imagelist, so I had to "expand" the icons to 96x32 (adding transparent pixels to the right).
Sorry I don't know how to do this better and it's 4am.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@418 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 02:10:42 +00:00
gigaherz f0b41b1f0d Fixed display of banners.
Turns out the YAGCD stuff was wrong, and it messed up the meaning of two bits. Also I had a bug in the CI8(C8) icon format display (wrong unswizzling).

Next will be adding icon display & animation, in a separate column

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@417 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 00:43:35 +00:00
Maarten ter Huurne 73a5e1cb91 ao_play() uses "uint_32" as the type for the byte count, so use that in the calling code as well.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@416 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 23:20:36 +00:00
Maarten ter Huurne f9d04ae1ad Put dsp_thread_debug() entirely inside the "#ifdef _WIN32" block, since it is only used on Windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@415 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 23:06:21 +00:00
gigaherz 56608cecc9 Added code to display the banners from the memcards. Doesn't overlay the icons yet.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@413 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 22:28:43 +00:00
Maarten ter Huurne 9a7b828eba Removed function FilterDown(), which was neither used nor implemented.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@412 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 21:52:28 +00:00
Maarten ter Huurne d4db1a6657 Changed BYTE* to u8* after all, since these pointers are not directly related to Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@411 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 21:49:57 +00:00
gigaherz 532c675a3a Added animation reading. It seems to work fine for the first frame, but none of my saves have >1 frames so I can't test the reading of the other frames, which should work fine anyway.
Only missing is DISPLAYING the banner and the animation/icon.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@410 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 21:08:47 +00:00
gigaherz be6c1518ea Added ReadBannerRGBA8 function to GCMemcard class.
Also "#if FALSE"'d the debug code which outputs BMPs of the banners (because I'm too lazy, the BMPs will "look" upside-down, while the actual image is ok).

Next step will be to also allow reading animations.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@409 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 20:35:41 +00:00
Maarten ter Huurne 0bebbcb5f4 Replaced type "BYTE" by "u8", except where "BYTE" is used to access the Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@408 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 14:32:35 +00:00
hrydgard af1e42ec90 Fix build
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@406 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 14:00:54 +00:00
Maarten ter Huurne 2c7a92e1b7 Split off type definitions from "Common.h" into new header "CommonTypes.h". This is a preparation for sharing the type definitions between the Dolphin core and the plugin specs.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@405 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 13:54:25 +00:00
hrydgard 09406d76c4 Fix/workaround at least one class of buffer underruns in the GL plugin. Fix some bad deletes (instead of delete []). etc.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@404 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 13:36:52 +00:00
Maarten ter Huurne d9e129ae99 Removed WEAK_SYMBOL: it is not used anywhere.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@403 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 13:13:36 +00:00
Maarten ter Huurne 5c6dfa3bbe Moved declaration of EXPORT and CALL inside the include guards. I accidentally placed it outside in revision 336.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@402 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 12:22:03 +00:00
XTra.KrazzY 2f0eb72ba1 Added compression support for save states. Decompression is still buggy so compression is off by default.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@401 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 09:38:41 +00:00
hrydgard a9c6a59307 don't lookup things in symbol map unnecessarily in the ppcanalyst, helps slowdowns in debugger in debug mode
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@400 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 08:39:57 +00:00
hrydgard 55c18d1d10 some cleanup, don't update the log window too often
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@399 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 08:29:43 +00:00
hrydgard 8bd78a21b4 Fix Pad_DX9 crash
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@398 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 06:53:23 +00:00
hrydgard af60e06bb0 Simulate Wii bootup better (info from wiibrew.org)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@397 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 06:52:16 +00:00
hrydgard b89e56cbcb linux build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@396 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 23:30:41 +00:00
hrydgard e5deb10714 bugfix the texcache bugfixes :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@395 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 23:15:11 +00:00
hrydgard 20d0c53781 Fix same texcache bug on DX side
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@394 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 23:06:40 +00:00
hrydgard db303de0db Fix texture cache bug in OpenGL plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@393 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 22:55:09 +00:00
XTra.KrazzY 432084ebe7 handled state saving IO errors
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@392 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 22:36:28 +00:00
hrydgard 718a1c6a3f missing files, sorry
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@391 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 22:15:37 +00:00
hrydgard 005cbbb379 Basic VBA-style save state system implemented - kb shortcuts only working on Windows. Keyboard shortcut system added. More cleanup in GFX plugins.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@390 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 22:06:53 +00:00
hrydgard 85565688d7 New SaveState folder for states. Removed some outdated code. Removed an unnecessary level of indirection for plugin calls. Assorted cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@389 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 19:19:40 +00:00
hrydgard 6b6003c563 add zlib include directory to all configurations of Core.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@388 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 16:45:07 +00:00
hrydgard e4825be7a8 more statesave bugfixes...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@387 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 16:24:45 +00:00
hrydgard 4608333a56 State saving progress. Most core state seems to be saved/loaded correctly, not so for video yet unfortunately.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@386 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 16:05:32 +00:00
XTra.KrazzY 95eb8f9ef3 Save states now work (to some extent). Please report special cases which cause crashes or anything of the sort. Also removed debug messages from state management
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@385 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 15:54:44 +00:00
gigaherz 06f0b02ecd Fixed a few bugs with the memcard manager, and memcard classes:
- Now the GCMemcard class will use the backup dir/bat if the main one is outdated/corrupted.
 - I fixed a few bugs in Delete. It still doesn't work, but at least it doesn't make the program crash.

I included a small changei n the sln so that debug/x64 builds use release/x64 njoy, this way there's no build errors annoying people trying to debug Dolphin. ;)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@384 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 13:44:44 +00:00
hrydgard 53afa1f900 reverted quantizer fix - causes heavy slowdown in some games. I have a better idea :p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@383 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 13:17:07 +00:00
hrydgard 5ac5a04982 More state save code, "proper" fix for the quantizer problem
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@382 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 13:06:17 +00:00
hrydgard ff0a613427 Cleaning up XK's mess, added a simple profiler, minor disasm fix. Too lazy to split it up into individual changes. Savestates not yet working.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@381 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 12:11:25 +00:00
Maarten ter Huurne 838f37112e Fixed compilation on Mac OS X by testing for Linux explicitly instead of assuming that non-Windows equals Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@380 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 08:49:34 +00:00
Sonicadvance1 3e029639df Removed jpeg dependency in GL plugin, added Rumble to Linux nJoy. and reverted my accidental Dolphin ini file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@379 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-29 09:55:17 +00:00
Shawn Hoffman c32f116596 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@376 8ced0084-cf51-0410-be5f-012b33b47a6e 2008-08-28 22:15:00 +00:00
XTra.KrazzY 2e760d69fe Added save/load state support in the UI
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@375 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 21:30:13 +00:00
Maarten ter Huurne 1716ef46bb Use compact syntax for converting C strings to C++ strings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@374 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 19:22:36 +00:00
Maarten ter Huurne cfd31f4385 Build both GUI and non-GUI executable.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@373 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 18:58:11 +00:00
XTra.KrazzY f8b4311b66 Final typo and error fixes and include reordering
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@372 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 09:19:46 +00:00
XTra.KrazzY 531230c03d *another* typo fix. Sorry
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@371 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 08:11:40 +00:00
XTra.KrazzY f3fb7a9102 typo fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@370 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 08:09:25 +00:00
XTra.KrazzY e05e2179c3 I have broken something, but more may be broken
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@369 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 08:00:40 +00:00
XTra.KrazzY 051c2e0784 A lot of save state groundwork. Please notify if compilation breaks because
I haven't compiled


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@368 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 07:58:04 +00:00
XTra.KrazzY 8a33d6787b git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@367 8ced0084-cf51-0410-be5f-012b33b47a6e 2008-08-28 07:42:48 +00:00
Maarten ter Huurne e764723832 Fixed warnings about comparison between signed and unsigned integer expressions.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@366 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 16:12:05 +00:00
Maarten ter Huurne 541a86de26 Removed unused function x86SetJ8().
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@365 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 13:42:32 +00:00
Maarten ter Huurne ad748bfc05 Fixed CALL range check.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@364 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 13:29:35 +00:00
Maarten ter Huurne 9b1ddfcc69 Fixed BE32 macro to make sure it returns an unsigned int.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@363 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:51:03 +00:00
Sonicadvance1 a5d51aa2ce Linux Speed up
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@362 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:47:57 +00:00
daco65 6b718a6936 just some typo correction
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@361 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:44:29 +00:00
XTra.KrazzY cb43ed49cd Small warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@360 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:44:22 +00:00
Maarten ter Huurne 105e1c325f Fixed warnings about field initialisation order.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@359 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:33:49 +00:00
Maarten ter Huurne ae7d236fdf Fixed warnings about field initialisation order.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@358 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:27:03 +00:00
Maarten ter Huurne b64722d4d5 Fixed warnings about field initialisation order.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@357 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:23:52 +00:00
Maarten ter Huurne 57c5cb12e9 Fixed warnings about missing braces in array initialisation.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@356 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:17:47 +00:00
Maarten ter Huurne a8f5185ef0 This header is Windows specific, so disabled it for other platforms, to avoid GCC complaining about a #pragma it cannot understand.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@355 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:09:56 +00:00
daco65 794f656188 fixed Video_SaveState & Video_LoadState in OGL/DX that made dolphin unable to load the plugins
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@352 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:45:51 +00:00
Maarten ter Huurne 6c5f0fc0f3 Do not force-enable logging.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@351 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:38:15 +00:00
Maarten ter Huurne c0da275501 Fixed warning about initialisation order. Also made code layout consistent within this file.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@350 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:33:45 +00:00
Maarten ter Huurne bbeca155de Added "const" to the data type. This fixes loads of compile warnings and the resulting file seems to still be a valid XPM (in fact, some of the files already had "const").
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@349 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:24:16 +00:00
Maarten ter Huurne b6f82eb871 Avoid warning about redefining macro. It would be nice though if someone could add a comment describing what is Windows-specific about the JITting of stb/sth/stw.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@348 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:17:50 +00:00
Maarten ter Huurne b9feea5412 Removed unnecessary extra terminating zero: sprintf() already zero-terminates its output.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@347 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 10:41:21 +00:00
Maarten ter Huurne ef61bd8995 Removed superfluous arguments passed to WRITE() for string formatting.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@346 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 10:30:19 +00:00
XTra.KrazzY a0ae17c5ff Fixed message box calls (they aren't even necessary, just checking whether the saving made it into the VideoCommon library
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@345 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 10:01:46 +00:00
Maarten ter Huurne 8876637c9f Fixed invalid use of sprintf.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@344 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 09:54:11 +00:00
Maarten ter Huurne f8d7231be8 Fixed "no newline at end of file" warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@342 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 09:27:57 +00:00
Maarten ter Huurne f31ae87152 Fixed "no newline at end of file" warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@341 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 09:27:38 +00:00
Maarten ter Huurne 4aa233f1f6 Only include <windows.h> when compiling for Windows.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@340 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 09:07:02 +00:00
Maarten ter Huurne 7d0bf8a101 Fixed "no newline at end of file" warning.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@339 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 09:05:52 +00:00
daco65 f55722e288 Fix for XK's commit. XK, if its wrong punch me in the face
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@337 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 01:45:31 +00:00
Maarten ter Huurne d8b3122e0d Minimized symbol visibility for GCC build. Fixes problem with two instances of x64Emitter getting mixed up and generating only part of the required opcodes. I get video on 32-bit Linux now :)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@336 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 01:42:11 +00:00
Maarten ter Huurne d720368d48 Clear the full size of the EXRAM.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@335 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 01:05:54 +00:00
Maarten ter Huurne 0f3e8ddced On platforms where the OpenGL library uses the CDECL calling convention, the stack should be increased after making a call.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@334 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 01:04:54 +00:00
Maarten ter Huurne a8982b1d18 Corrected case of "MultiDI.cpp|h".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@333 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 00:07:57 +00:00
XTra.KrazzY 7a2cdef912 Preliminary video save state support. More work is necessary, this is just some infrastructure for inter-project communication.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@332 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 23:40:18 +00:00
Maarten ter Huurne 734586a0ab Include system headers using "#include <file.h>", so GCC will not issue warnings about them.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@331 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 23:32:54 +00:00
XTra.KrazzY 60a5a592f9 A little housekeeping on Vertex Shader in DX9. Pending more work but my shader code is still too buggy to commit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@330 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 23:11:15 +00:00
Maarten ter Huurne 59974dfb5b Only use "-fPIC" for compiling objects that will be part of dynamic libs. Make SConscripts inherit the compile flags from the top level instead of overriding them.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 22:28:42 +00:00
Maarten ter Huurne 0ebba1bde0 Restructured main SCons file in the same way as the one for the GL plugin.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@328 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 21:02:23 +00:00
Maarten ter Huurne 93f45b773c Fixed typo introduced in rev 323.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@327 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 14:09:59 +00:00
daco65 1365abfbff OGL resolution fixing in Windows. report if anything went wrong (worked great here for me)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@326 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 13:15:25 +00:00
Maarten ter Huurne cedb93df9c Use CP_START constant: its value is 0, but using the constant anyway makes the code easier to read.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@325 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 13:06:38 +00:00
Maarten ter Huurne 19336445df IsElfWii(): return false if open fails. Also query file size only once.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@324 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 13:02:54 +00:00
Maarten ter Huurne ef6fb30b3c Refactored BlobReaders: instead of constructor + IsValid() method, a factory method is used which returns NULL if no valid BlobReader could be created. The new code does more sanity checks and leaks less objects.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@323 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 12:40:09 +00:00
Maarten ter Huurne 4c54c0cad8 Documented the change of rev 320 in a comment, so people reading the code will not be tempted to remove it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@322 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 12:06:43 +00:00
Maarten ter Huurne 8e69d942e9 Implemented querying file size on POSIX. Also fixed size rounding of mmap() on POSIX.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@321 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 11:44:17 +00:00
Maarten ter Huurne fdf02ce331 Allow 32-bit writes to the VI: although this is officially not allowed, the hardware seems to accept it (for example, DesktopMan GC Tetris uses it).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@320 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 10:20:41 +00:00
Maarten ter Huurne afced1fa98 Implemented OpenGL_Update() for SDL.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@319 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 01:21:25 +00:00
Maarten ter Huurne 2d6d3ddad8 Restructured OpenGL_Update() to reduce duplicated code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@318 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 01:15:19 +00:00
Maarten ter Huurne 8013f92863 Support SDL video on any platform. It is only enabled by default on Mac OS X though. So in practice nothing changes, but we have more flexibility in debugging.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@317 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 00:57:16 +00:00
Maarten ter Huurne 6a426c1654 Cleanup and refactoring. Only the platform specific parts are in a platform specific block now, the rest is shared instead of duplicated.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@316 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 00:18:00 +00:00
hrydgard 236bb74c92 Forgot to move some enums.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@315 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 21:15:52 +00:00
hrydgard 84336bd7b6 little Logwindow feature - enable/disable all logs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@314 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 21:02:56 +00:00
hrydgard ab4333ebac Small build fix, re-add CPU check
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@313 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 20:43:37 +00:00
hrydgard fd188ec09e Switch between JIT and Interpreter at runtime using the debug window (pause first!)
Plus assorted cleanup & fixes.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@312 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 20:34:11 +00:00
tmator 35fdbdc360 Remove MACOSX define, now use __APPLE__
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@311 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 19:44:11 +00:00
Maarten ter Huurne 1a2e350158 Declare EAX as input register for CPUID.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@310 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 10:21:19 +00:00
Maarten ter Huurne 8a06c0fdc7 Added call to DetectCPU() which is present in "Main.cpp" but was lacking in "MainNoGUI.cpp".
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@309 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-25 08:51:08 +00:00
Maarten ter Huurne 8185f7689a Fixed build on Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@306 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 22:39:36 +00:00
hrydgard 90cf2c12c3 The arrows are back in the codeview!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@305 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 22:22:55 +00:00
hrydgard a47f8cbe9a more fixes, prefix filter for export symbols
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@304 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 21:54:59 +00:00
Maarten ter Huurne 4871626af8 Fixed "no newline at end of file" warnings issued by GCC 4.2.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@303 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 21:50:41 +00:00
hrydgard 5079ed0e5d linux build fix?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@301 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 21:32:35 +00:00
hrydgard 71ea240890 More symbol magic+bugfixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@300 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 21:30:59 +00:00
Sonicadvance1 241896ee4c Build fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@299 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 20:32:46 +00:00
hrydgard b9f5fd1f44 Very simple call tree browser added to code window, bottom left.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@298 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 20:25:36 +00:00
Maarten ter Huurne 1b1f0ecae9 The simple form of "cpuid" should work on 64-bit platforms; on 32-bit platforms it is safer to use the version that does not modify EBX.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@297 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 20:13:49 +00:00
Maarten ter Huurne 7151ec6f4f GCC does not accept namespace as a prefix when defining functions (in general or because we are already inside the namespace?).
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@296 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 19:48:42 +00:00
Maarten ter Huurne 2babda7a80 Explicitly convert from C string to wxString. Fixes build on Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@295 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 19:47:10 +00:00
hrydgard c0c6fc9e6d Ok, part 2/2 of the symbol code rewrite. You can now create and use function signature files. A monkey ball signature file included. Now to add some cooler features...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@294 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 18:50:51 +00:00
XTra.KrazzY 23665a7b93 Cross compatibility function union (strcasecmp, unlink)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@293 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 16:25:52 +00:00
hrydgard f44a06465a Change some project settings. Reorganize the symbol database code, step 1/2.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@292 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 15:46:08 +00:00
Maarten ter Huurne e3d7c44a8e For the SDL version of this driver, set the video mode in the CPU thread, otherwise GL calls will crash. There is a big comment block with all the details.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@291 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 14:47:19 +00:00
Maarten ter Huurne 6f1600304f 64-bit constant needs "ULL" suffix.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@290 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 11:37:31 +00:00
Sonicadvance1 18270f0904 Linux: When you resize Window, it now resizes video, if you go above start dimension, it goes weird. Gotta look in to it
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@289 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 10:50:24 +00:00
Sonicadvance1 5f925882d9 Windows Build Fix for GL plugin from my last rev
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@288 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 10:24:17 +00:00
Sonicadvance1 05cbb94cbb GL plugin now centers video output, you can set it to render to the full window and FPS can be shown. FPS and stretch to Window res is set in INI. Maybe also the window res actually changes correctly when resizing window in Windows?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@287 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 10:10:48 +00:00
XTra.KrazzY 98b9cfb2de TEV shader compilation bugfix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@286 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 08:54:23 +00:00
Sonicadvance1 8f6d7ad5e9 ...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@285 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 19:50:28 +00:00
masken 657dfff6f8 Fixed new warnings from r282.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@284 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 15:33:40 +00:00
masken ae5b59747a Turned on Warnings as Errors for all vcprojs. Fixed almost all of the warnings in win32. Added many SVN Ignore settings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@283 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 15:28:24 +00:00
hrydgard 8be70a8ed2 Finally hacked Super Monkey Ball into submission! Some bonus hacking tools included.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@282 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 15:15:25 +00:00
masken 0849a96d81 Added SYSCONF files. Fixed the return value of FileIO::Read().
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@281 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 14:53:33 +00:00
Sonicadvance1 d697eb6a85 Fix Compiling for people, Silly ector breaking things ;p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@280 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 11:18:39 +00:00
hrydgard f82bf2ae9a Lots of FP hacking for little gain, super monkey ball is only slightly more sane (wow, it rhymed). Temporary no-speed-limit hack: Hold TAB.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@279 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 09:20:36 +00:00
Maarten ter Huurne 0becaa3223 Make sure SDL can hijack main() so it can do its initialisation. Only implemented for non-GUI executable so far.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@278 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 08:42:52 +00:00
Sonicadvance1 19bcb6a21c Linux side doesn't need libjpeg, crazy Mac users
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@277 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 07:53:03 +00:00
Sonicadvance1 c56a27a3d2 Forgot to put GL in the Windows Title bar as well
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@276 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 07:50:27 +00:00
Sonicadvance1 6e3069f99e Should fix Linux building, also adds GL/DX to the title in their respective plugins when in use
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@275 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 03:48:40 +00:00
Maarten ter Huurne efd894fe1e Include SDL header as "SDL.h". This works with the CFLAGS output of pkg-config, picking up SDL no matter where it is installed.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@274 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 21:19:56 +00:00
Maarten ter Huurne cb5aa5435b On non-Windows platforms, #define _M_IX86 for 32-bit platforms and _M_X64 for 64-bit platforms. Until now, 64-bit was always selected, which broke Dolphin on 32-bit Linux and OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@273 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 19:28:00 +00:00
Maarten ter Huurne 31c0bc4508 Implemented FPU precision control for 32-bit non-Windows platforms.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@272 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 17:46:13 +00:00
Maarten ter Huurne 292120453e Implemented FPU rounding control for 32-bit non-Windows platforms. I renamed the _RC_* constants that were previously #defined, because the bit patterns used by the hardware do not match those used by Windows; the new constants match the hardware.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@271 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 12:17:55 +00:00
Maarten ter Huurne 418e37029c Typecast function pointer argument of CALL() to void*, since this is not an automatic conversion for GCC.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@267 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 11:21:51 +00:00
Maarten ter Huurne 936bfbd867 Implemented Find4GBBase() on 32-bit non-Windows platforms. I am not sure the pointer acquired is any good though.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@266 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 10:38:53 +00:00
Maarten ter Huurne e74dd5d9f9 Added missing #include.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@265 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 00:13:26 +00:00
Maarten ter Huurne d27b79f413 Added "jpeg" to list of libs to link against.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@264 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-22 00:06:27 +00:00
hrydgard 465ee5fd86 Save states - more boring groundwork. Far from done.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@263 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 23:28:07 +00:00
Maarten ter Huurne 28edd4d31b Fixed compilation when logging is enaled: it tried to log a non-existing field ("name"); I replaced it by an existing field ("type").
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@262 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 23:23:15 +00:00
Maarten ter Huurne 1acdd6b8e0 Fixed compile errors in conversion of C string to wxString when compiling with GCC against wx with Unicode support.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@261 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 23:11:29 +00:00
hrydgard 6a4d697f5f statesave prep: Change coretiming to index/registration model, instead of storing pointers. This will make it possible to save/load the event queue.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@258 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 20:01:18 +00:00
hrydgard 9e3747e2f3 SaveState preparations #1 - Annotate all(?) state. (NO SCHEDULE PROMISE!)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@257 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 18:23:10 +00:00
hrydgard 92031705cd Forgot some defines.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@256 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 17:57:26 +00:00
hrydgard 3ef0eb979d Move some code out of the plugins into VideoCommon. No functional change.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@255 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 17:49:06 +00:00
hrydgard 5e4da92d42 Very basic JIT results viewer.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@254 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 17:22:55 +00:00
Maarten ter Huurne 4e9b5a40fd Look for libs in MacPorts install dir (/opt/local). This seems to be the easiest way to get libjpeg on OS X.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@253 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 00:27:10 +00:00
hrydgard 05c04bd03e fix bug that prevented ogl plugin from recognizing many resolutions, like my favorite 1920x1200
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@252 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 00:05:48 +00:00
hrydgard 77cec36ad4 Force the result of single precision arithmetic to have single precision only, also in jit. That is, another attempt at fixing the FPU bug in Zelda.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@251 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-20 23:25:48 +00:00
Maarten ter Huurne adafeaa8b4 Simplified conversion to C++ string.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@250 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-20 18:43:14 +00:00