Commit graph

590 commits

Author SHA1 Message Date
Peter Tissen dad82aa1eb Gui logging in main thread
Do the logging to the GUI log element in the main thread. Not doing this
causes issues with the GTK backend of wxWidgets. Plus it's just common
sense to try to limit gui calls to one thread.
2014-04-02 17:57:50 +02:00
Peter Tissen bcb9ad94c1 correct some merge error that happened from automatic git merging 2014-04-01 19:19:51 +02:00
Alexandro Sánchez Bach bc095322c3 Merge pull request #153 from Bigpet/wxString_exorcism
wxString exorcism
2014-04-01 18:25:33 +02:00
Peter Tissen febe8624bf remove redundant c_str -> string -> c_str conversions 2014-04-01 17:22:57 +02:00
Peter Tissen 8ac226ae69 replace all instances of wxString with std::string in all cases not
directly involved in either the GUI or other wxWidget classes like wxFile
2014-04-01 16:23:03 +02:00
Alexandro Sánchez Bach fa4473de49 Merge pull request #147 from lioncash/mem-leaks
Fix some memleaks in unedat.cpp
2014-03-31 21:41:24 +02:00
Alexandro Sánchez Bach a09ad031ec cellSaveData* (cellSysutil) improvements
* cellSaveData improvements: cellSaveDataListLoad2 should work perfectly
(ignoring the fact that there is no dialog, and the first entry is
chosen automatically). cellSaveDataListSave2 has improved too. Some code
refactoring is required though.
* Reverted (deleted) Emu/SysCalls/Dialogs/ folder which I accidentally
included while merging Nekotekina's branch (including minor SaveData
changes).
* Modified some small things in cellGcmSys.
2014-03-31 20:30:07 +02:00
Peter Tissen b1894ac6cb fix implicit conversion error 2014-03-31 17:35:05 +02:00
Peter Tissen 8a000940da upgrade to VS2013 to use variadic templates for type safe printing 2014-03-31 17:35:04 +02:00
lioncash c4b64c8d9f Fix variable typos in unedat.cpp
Also fixed possible uninitialized variable usage. Initializes length to zero.
2014-03-31 08:59:52 -04:00
lioncash e47e37a8d2 Fix some memory leaks in unedat.cpp. 2014-03-31 08:56:24 -04:00
Alexandro Sánchez Bach 01dbb8eb9a Merge pull request #145 from Nekotekina/master
Fixed conflicts.
2014-03-31 12:04:34 +02:00
Alexandro Sánchez Bach 8011cc8ec4 Merge pull request #146 from darkf/stuff
Add FindGLEW to CMake build and fix naming error
2014-03-31 11:23:17 +02:00
Alexandro Sánchez Bach 66ec7c0d63 Merge pull request #144 from acmiyaguchi/gcm
Reorganize cellGcmSys module
2014-03-31 11:18:40 +02:00
darkf 61d0e4ee54 Rename xor to xor_ to allow build to continue in compliant compilers 2014-03-31 00:55:27 -07:00
darkf 8007693084 Add FindGLEW to CMake modules along with some compiler flags 2014-03-31 00:00:30 -07:00
Anthony Miyaguchi 2106fb83b2 Added cellGcmSetUserHandler that already existed but was never added. 2014-03-30 18:01:51 -07:00
Anthony Miyaguchi b571f14fe4 Function declaration at top needed for another function. 2014-03-30 17:56:03 -07:00
Anthony Miyaguchi eab81deb27 Reordered functions for organization. 2014-03-30 17:54:57 -07:00
Anthony Miyaguchi a62552b086 Organized the cellGcmSys_init() functions in a more sane manner. 2014-03-30 17:54:34 -07:00
Hykem 196c2ffe5b Updated the crypto engine:
- Updated AES and SHA-1 source code;
- Fixed a few code warnings;
- Implemented EDAT/SDAT decryption.

Started SPURS implementation:
- Added an internal SPURSManager class draft;
- Added several drafts for cellSpurs functions.

Implemented key.edat decryption in sceNpDrmIsAvailable:
- NOTE: Currently, the decrypted key.edat is stored under dev_hdd1/titleID and the user must replace this file in dev_hdd0. This behavior will change in the future as it's currently intended for controlled testing only.
2014-03-30 21:09:49 +01:00
Alexandro Sánchez Bach e6aa1a9553 Merge pull request #142 from lioncash/hdd
Misc HDD stuff
2014-03-30 12:23:47 +02:00
Lioncash b9de74f5c6 Move VHDDManager over to using vector. Also fix some variable and function name typos. 2014-03-30 00:13:00 -04:00
Lioncash 479ef45aec Fix a case where m_hdd_file is passed to m_file uninitialized.
Due to the way initializations work in C++, despite the order of the initializations in the initialization list, it will actually do the initializing in the order the class variables are defined.
2014-03-30 00:08:16 -04:00
Alexandro Sánchez Bach ae5d06d4be Merge pull request #141 from lioncash/bounds
Memset the ringbuffer in m_fs_config by the size of the actual ringbuffer struct, not FsRingBufferConfig's size..
2014-03-30 00:18:02 +01:00
Alexandro Sánchez Bach 3e328cdea5 Merge pull request #140 from lioncash/misc-things
Fix missing unary increment operator in DisAsmFrame
2014-03-30 00:15:47 +01:00
Lioncash 12b627fa9c Memset the ringbuffer in m_fs_config by the size of the actual ringbuffer struct, not FsRingBufferConfig. 2014-03-29 16:28:39 -04:00
Lioncash d6bcf14cc0 Fix missing unary increment operator in DisAsmFrame 2014-03-29 16:13:05 -04:00
Alexandro Sánchez Bach 7804c56584 Merge pull request #138 from bagedevimo/nix-fix
More *nix fixes.
2014-03-29 16:26:08 +01:00
Ben Anderson 33f7f37ca7 Fixes null ptr in gcc, probably to do with operator precedence. @Bigpet was all over this one. 2014-03-30 03:21:41 +13:00
Ben Anderson 84c9323750 Fixes GL fix, which was broken. Added -g flag to cmake, so we can have debug builds. 2014-03-30 03:15:46 +13:00
Alexandro Sánchez Bach 4c6aa34810 Merge pull request #135 from bagedevimo/path-fix
Nix Path fix.
2014-03-29 09:50:26 +01:00
Ben Anderson e24027eccb Added call to GlewInit() under *nix, should fix cairo display crashes. 2014-03-29 21:11:43 +13:00
Ben Anderson b317b2feda Commenting out all of this, should fix the pathing glitches on *nix, without breaking windows functionality. 2014-03-29 20:52:39 +13:00
Alexandro Sánchez Bach a7fbd5c9b6 Merge pull request #133 from bagedevimo/fix
Fixes invalid conversion from wxStringConst, to std::string under gcc-4-8
2014-03-29 07:05:57 +01:00
Ben Anderson 6141c33630 Fixes invalid conversion from wxStringConst, to std::string under gcc-4.8 2014-03-29 13:52:27 +13:00
Alexandro Sánchez Bach 503c24453a cellSaveData* progress & reverted commit 950fcfe
* Reverted commit
950fcfe4ef
(Reverted ConLog changes) that fixed the "Bad flip!" error since there
is a better way of solving it. It will be fixed soon.
* Moved cellSaveData to cellSysutil (but preserving the functions in a
separated file named: cellSysutil_SaveData.cpp).
* Progress on cellSaveDataList* functions.
* Added a small margin to the new Settings dialog. :-)
2014-03-28 20:06:15 +01:00
Alexandro Sánchez Bach 64b80f5a2e Merge pull request #132 from O1L/master
GUI: Config -> Settings menu reworked.
2014-03-28 19:37:32 +01:00
O1L 1be14f818a GUI: some changes in Config -> Settings 2014-03-28 21:17:44 +04:00
Alexandro Sánchez Bach 5bf70afb21 Merge pull request #131 from bagedevimo/x11
Fixes X11 threading issue, under Linux
2014-03-28 13:03:54 +01:00
Ben Anderson b36a5a95f0 x11 fix 2014-03-29 00:33:51 +13:00
Hykem 98b4a35fb5 Merge pull request #130 from nohbdy/bugfix
Minor code and memory initialization fixes
2014-03-28 04:53:28 +00:00
Hykem e03b68f12f Merge pull request #129 from acmiyaguchi/master
Fix a hang after failing to run an *.elf file and stopping emulator
2014-03-28 04:52:51 +00:00
Alexandro Sánchez Bach 950fcfe4ef Reverted ConLog changes of commit 5ea58d94
This was causing a "Bad flip!" error on Arkedo Series 02 Swap!. I guess
we will have to search for a better solution. I just reverted the
ConLog.cpp / ConLog.h files.

Related commit:
5ea58d9451
2014-03-28 05:32:24 +01:00
Alexandro Sánchez Bach 2c7269e3de PSF Loader improved & issue #126 fixed
* Improved PSF Loader: Now you can get the value of the PARAM.SFO
entries directly with the GetString(key), GetInteger(key) methods.
GameInfo related lines were removed since they have nothing to do with
PSF files.
* cellGame, cellSysutil, and GameViewer are modified because of the PSF
Loader changes.
* Removed unnecessary null pointer checks:
https://github.com/DHrpcs3/rpcs3/issues/126
2014-03-28 05:20:13 +01:00
nohbdy d533572ee9 Minor code and memory initialization fixes
* Explicitly initialize member variables in SELFDecrypter, MemInfo, and
VirtualMemoryBlock
* Zero out memory used for counter/nonce in aes-ctr
* Fix use of a ControlInfo pointer after it is added to an Array via
Array::Move (which makes it an invalid pointer) in
SELFDecrypter::LoadHeaders
2014-03-27 22:16:14 -05:00
Anthony Miyaguchi 544bacf54e Quick one line change fixes a hang after failing to run an *.elf file and stopping the emulator via the Stop button. 2014-03-27 18:57:28 -07:00
Alexandro Sánchez Bach 64145d7d62 Merge pull request #124 from xsacha/master
Linux build fix
2014-03-27 23:17:59 +01:00
Alexandro Sánchez Bach 1fd42c34c2 Minor fixes
* Modified some .gitignore's
* Removed some #include <vector>'s
and other stuff...
2014-03-27 16:40:58 +01:00
Alexandro Sánchez Bach c541176a32 Merge pull request #125 from lioncash/ui
Simplify some VFS-related code.
2014-03-27 16:08:04 +01:00