citra-emu
/
citra
Archived
1
0
Fork 0
Commit Graph

6828 Commits

Author SHA1 Message Date
Weiyi Wang 241f10a669
Merge pull request #4233 from lioncash/debug
kernel/svc: Do nothing if svcOutputDebugString's length is <= 0
2018-09-17 21:21:06 -04:00
Lioncash 5ddd382a9b kernel/svc: Do nothing if svcOutputDebugString's length is <= 0
While likely very uncommon, this sanitizes the input and does nothing in
the event of the length being equal to or less than zero, avoiding
constructing a std::string when there's no need to. It also avoids an
out-of-memory scenario, as a negative value would wrap around to its
equivalent unsigned representation in std::string's constructor.

e.g. If someone was silly and a length of -1 was specified, this would
make a string with a length of 0xFFFFFFFFFFFFFFFF on a 64-bit platform,
which will obviously eventually fail due to the allocation being way too
large.
2018-09-17 19:52:53 -04:00
Pengfei Zhu dc863724ac
Merge pull request #4231 from CaptV0rt3x/port-1336
Port #1336 from yuzu
2018-09-17 22:37:40 +08:00
Pengfei Zhu 9a1446886c
Merge pull request #4223 from FearlessTobi/port-1301
Port #1301 from yuzu: "game_list: Resolve variable shadowing within LoadCompatibilityList()"
2018-09-17 22:25:04 +08:00
Pengfei Zhu 4377d12549
Merge pull request #4222 from FearlessTobi/port-1298
Port #1298 from yuzu: "audio_core/sink_details: Change std::string parameter into std::string_view"
2018-09-17 22:24:49 +08:00
CaptV0rt3x 48fafaba3e Antialias game list compatibility pixmaps 2018-09-17 19:00:28 +05:30
Lioncash d864d9bf03 game_list: Resolve variable shadowing within LoadCompatibilityList()
"value" is already a used variable name within the outermost ranged-for
loop, so this variable was shadowing the outer one. This isn't a bug,
but it will get rid of a -Wshadow warning.
2018-09-15 15:54:20 +02:00
Lioncash 52f12e303a game_list: Use QJsonValueRef() within LoadCompatibilityList()
This way, we aren't constructing unnecessary QJsonValue instances.
2018-09-15 15:53:36 +02:00
Lioncash 93bd630d40 audio_core/sink_details: Change std::string parameter into std::string_view
The given string is only ever used for lookup and comparison, so we can
just utilize a non-owning view to string data here
2018-09-15 15:48:24 +02:00
Vamsi Krishna 2ba62ec196
Merge pull request #4219 from zhaowenlan1779/qt-config-fix
citra_qt: add Camera tab to "System" category
2018-09-15 11:55:12 +05:30
Pengfei Zhu 9a8959d0a1
Merge pull request #4215 from zhaowenlan1779/tx-update
Update translations (2018-9-15)
2018-09-15 14:20:51 +08:00
zhupengfei 9bd8edb3b6
citra_qt: add Camera tab to "System" category 2018-09-15 14:19:45 +08:00
zhupengfei 9ae4b72b80
Update translations (2018-9-15) 2018-09-15 06:18:53 +08:00
Weiyi Wang 6767f4562b
Merge pull request #4187 from spycrab/qt_config_sidebar
Qt/Configure: Use sidebar to divide tabs into smaller groups
2018-09-14 16:45:45 -04:00
Weiyi Wang 8c354ff6b1
Merge pull request #4210 from valentinvanelslande/ipc
ipc: fix typo
2018-09-13 12:53:26 -04:00
Valentin Vanelslande dce26367a2
ipc: fix typo 2018-09-13 11:51:08 -05:00
Weiyi Wang 0a4d338ffa
Merge pull request #4138 from FearlessTobi/change-web-links
web_service: Unify links for web service endpoints
2018-09-12 16:31:59 -04:00
fearlessTobi b82bf1ccdb Change variable name to web_api_url 2018-09-12 19:07:06 +02:00
James Rowe 54c32647a1
Merge pull request #4204 from valentinvanelslande/language-fix
Repopulates fields in System Settings when retranslating the UI

Fixes #4203
2018-09-11 21:57:38 -06:00
Valentin Vanelslande 093987eaa7
Fix #4203 2018-09-11 22:45:12 -05:00
EverOddish 04dd91be82 Initial support for scripting (#4016)
* Add ZeroMQ external submodule

* ZeroMQ libzmq building on macOS

* Added RPC namespace, settings and logging

* Added request queue handling and new classes

* Add C++ interface to ZeroMQ

* Added start of ZeroMQ RPC Server implementation.

* Request construction and callback request handling

* Read and write memory implementation

* Add ID to request format and send reply

* Add RPC setting to macOS UI

* Fixed initialization order bug and added exception handling

* Working read-write through Python

* Update CMakeLists for libzmq to resolve target name conflict on Windows

* Platform-specific CMake definitions for Windows/non-Windows

* Add comments

* Revert "Add RPC setting to macOS UI"

* Always run RPC server instead of configurable

* Add Python scripting example. Updated .gitignore

* Rename member variables to remove trailing underscore

* Finally got libzmq external project building on macOS

* Add missing dependency during libzmq build

* Adding more missing dependencies [skip ci]

* Only build what is required from libzmq

* Extra length checks on client input

* Call InvalidateCacheRange after memory write

* Revert MinGW change. Fix clang-format. Improve error handling in request/reply. Allow any length of data read/write in Python.

* Re-organized RPC static global state into a proper class. [skip ci]

* Make sure libzmq always builds in Release mode

* Renamed Request to Packet since Request and Reply are the same thing

* Moved request fulfillment out of Packet and into RPCServer

* Change request thread from sleep to condition variable

* Remove non-blocking polling from ZMQ server code. Receive now blocks and terminates properly without sleeping. This change significantly improves script speed.

* Move scripting files to dist/ instead of src/

* C++ code review changes for jroweboy [skip ci]

* Python code review changes for jroweboy [skip ci]

* Add docstrings and tests to citra.py [skip ci]

* Add host OS check for libzmq build

* Revert "Add host OS check for libzmq build"

* Fixed a hang when emulation is stopped and restarted due to improper destruction order of ZMQ objects [skip ci]

* Add scripting directory to archive packaging [skip ci]

* Specify C/CXX compiler variables on MinGW build

* Only specify compiler on Linux mingw

* Use gcc and g++ on Windows mingw

* Specify generator for mingw

* Don't specify toolchain on windows mingw

* Changed citra.py to support Python 3 instead of Python 2

* Fix bug where RPC wouldn't restart after Stop/Start emulation

* Added copyright to headers and reorganized includes and forward declarations
2018-09-11 22:00:12 +02:00
Weiyi Wang abeee6859e
Merge pull request #4201 from FearlessTobi/backport-review-comments
SDLJoystick: Backport review comments from yuzu #1275
2018-09-11 10:13:01 -04:00
spycrab d63a63cff0 Qt/Configure: Use sidebar to divide tabs into smaller groups 2018-09-11 16:02:39 +02:00
B3n30 0238cf52b7 SDLJoystick: Addressed review comments 2018-09-11 14:50:41 +02:00
Weiyi Wang 9df1461cec
Merge pull request #4192 from valentinvanelslande/thread
svc: change unknown to thread in CreateThread
2018-09-09 18:41:51 -04:00
Ben 17978cf758
Joystick hotplug support (#4141)
* use SDL_PollEvent instead of SDL_JoystickUpdate

Register hot plugged controller by GUID if they were configured in a previous session

* Move SDL_PollEvent into its own thread

* Don't store SDLJoystick pointer in Input Device; Get pointer on each GetStatus call

* Fix that joystick_list gets cleared after SDL_Quit

* Add VirtualJoystick for InputDevices thats never nullptr

* fixup! Add VirtualJoystick for InputDevices thats never nullptr

* fixup! fixup! Add VirtualJoystick for InputDevices thats never nullptr

* Remove SDL_GameController, make SDL_Joystick* unique_ptr

* fixup! Remove SDL_GameController, make SDL_Joystick* unique_ptr

* Adressed feedback; fixed handling of same guid reconnects

* fixup! Adressed feedback; fixed handling of same guid reconnects

* merge the two joystick_lists into one

* make SDLJoystick a member of VirtualJoystick

* fixup! make SDLJoystick a member of VirtualJoystick

* fixup! make SDLJoystick a member of VirtualJoystick

* fixup! fixup! make SDLJoystick a member of VirtualJoystick
2018-09-08 19:01:30 +02:00
Valentin Vanelslande 5c4da2d218
svc: change unknown to thread in CreateThread 2018-09-08 07:40:24 -05:00
Pengfei Zhu f86c993e11
Merge pull request #4188 from tgsm/fix-sdl-logging
citra: fix SDL logging
2018-09-08 17:20:04 +08:00
tgsm 5d142e2114 citra: fix SDL logging 2018-09-08 02:51:33 -04:00
Pengfei Zhu 0d2c027a9d
Merge pull request #4191 from valentinvanelslande/minor-fix
room_member: RakNet -> ENet
2018-09-08 10:05:33 +08:00
Pengfei Zhu 5b8820ba29
Merge pull request #4190 from valentinvanelslande/typos-pt2
room_member: fix 3 typos
2018-09-08 10:04:20 +08:00
Valentin Vanelslande c29c66000e
room_member: RakNet -> ENet 2018-09-07 20:17:24 -05:00
Valentin Vanelslande fc876e727a
room_member: fix 3 typos 2018-09-07 20:12:52 -05:00
Weiyi Wang ca701e2610
Merge pull request #4182 from wwylele/std-size-t
Prefix all size_t with std::
2018-09-06 20:44:30 -04:00
Weiyi Wang 7d8f115185 Prefix all size_t with std::
done automatically by executing regex replace `([^:0-9a-zA-Z_])size_t([^0-9a-zA-Z_])` -> `$1std::size_t$2`
2018-09-06 16:03:28 -04:00
Merry eca98eeb3e
Merge pull request #4143 from zhaowenlan1779/shared-font-text-fix
core, citra_qt: unify status of system archives and shared fonts
2018-09-06 20:51:32 +01:00
Merry dd2a0f2387
Merge pull request #4147 from FearlessTobi/port-424
Port #424 from yuzu: "string_util: Remove StringFromFormat() and related functions"
2018-09-06 20:49:30 +01:00
fearlessTobi cf8b1726df Address review comments 2018-09-06 00:00:21 +02:00
fearlessTobi cb3ef488c7 Fixup! string_util: Remove StringFromFormat() and related functions 2018-09-06 00:00:21 +02:00
Lioncash 3284bef360 string_util: Remove StringFromFormat() and related functions
Given we utilize fmt, we don't need to provide our own functions for formatting anymore
2018-09-06 00:00:21 +02:00
Weiyi Wang 22e172946b
Merge pull request #4132 from FearlessTobi/port-966
Port #966 and #414 from yuzu (Cleanups in common and file_util) & Make bitfield assignment operator public
2018-09-05 18:03:36 +03:00
fearlessTobi d408f89a91 Rename announce-url, use variable for JWT retrieval url 2018-09-05 03:07:04 +02:00
fearlessTobi 73a38c6244 Fix compilation 2018-09-05 03:07:04 +02:00
fearlessTobi 0d6b1d161b web_service: Unify links for web service endpoints 2018-09-05 03:07:03 +02:00
fearlessTobi c7d8ffd14f Make bitfield assignment operator public
This change needs to be made to get the code compiling again. It was suggested after a conversation with Lioncash.

The conversation can be seen here: https://user-images.githubusercontent.com/20753089/45064197-b6107800-b0b2-11e8-9db8-f696299fb86a.PNG
2018-09-05 02:24:44 +02:00
fearlessTobi f3f4871275 Fix compilation errors 2018-09-05 02:19:55 +02:00
Weiyi Wang ae6007bf9d
Merge pull request #4069 from B3n30/wait_for_service_register
Service::SM: Wait till client is registered
2018-09-04 01:57:28 +03:00
Weiyi Wang fffa55b5d8
Merge pull request #4139 from tgsm/hid-update-table
Service/HID: update function table
2018-09-04 01:47:26 +03:00
Weiyi Wang 2396e58ee4
Merge pull request #4170 from FearlessTobi/port-stupid-fixes
citra_qt: Backport some review fixes of Lioncash
2018-09-04 01:47:03 +03:00
Weiyi Wang 12bba80d48
Merge pull request #4174 from wwylele/proctex-round-fix
gl_rasiterzer/proctex: revert back to round() for Nearest sampling
2018-09-04 01:36:16 +03:00