Commit Graph
6575 Commits
Author SHA1 Message Date
Thierry Crozat fa5a5bf865 CLOUD: Move wwwroot archive to dists and script to devtools
Both the data used to generate the archive and the archive itself
were moved to dists/ instead of being in backends/.

The script was also improved to optionally take a path as a command
line argument to indicate where the wwwroot data are instead of
assuming they are in the working directory.

Finally a 'wwwroot' make target was also added to invoke the python script and generate the archive.
with the expected path to
2016-09-06 00:43:25 +01:00
Thierry Crozat 77357ff71a CLOUD: Fix looking for the wwwroot.zip archive
If the themepath was defined but the wwwroot.zip file was not in
that path, looking for it failed as it never reached the part of the
code using SearchMan to look for it.
2016-09-05 23:39:59 +01:00
Thierry Crozat d853240eee CLOUD: Do not error out when loading icon if OSD format is not 2 or 4 Bpp
Graphics::TransparentSurface::convertTo() errors out when the destination
format is not 2 or 4 Bpp. But in the case of the cloud icon we can recover
from it. So just print a warning and don't close the application.
2016-09-05 21:59:34 +01:00
Thierry Crozat a8cb3c8404 OPENGL: Implement getOSDFormat and copyRectToOSD 2016-09-05 21:40:45 +01:00
Thierry Crozat 65d3c15b01 OPENGL: Add missing USE_OSD defined checks around OSD code 2016-09-05 21:21:32 +01:00
Eugene Sandulenko 23e2a61d4e SDL: Move mouse in SDL2 only when window has focus. 2016-09-04 16:48:50 +02:00
Thierry Crozat 29535c0a55 SDL: Do not forbid time.h symbols when FORBIDDEN_SYMBOL_EXCEPTION_time_h is defined
This hopefully fixes a regression from 848c5c3.
2016-09-04 02:26:27 +01:00
Thierry Crozat 848c5c3f84 Merge pull request #810 from tsoliman/sdl2-macports
SDL: Fix build with MacPorts SDL2
2016-09-03 23:08:04 +01:00
Thierry Crozat a2a985368c BUILD: Tie the SDL_net version to the SDL version
This means that when using SDL 1.2 we use SDL_net 1.2, but when
using SDL 2 we now use SLD_net 2 as well. Both versions work
properly and there is not code change needed in ScummVM.

This change is because SDL_net depends on SDL, and using
SDL_net 1.2 with SDL 2 means we can end up needing to link with
both the SDL and SDL2 libraries.
2016-09-03 23:07:21 +01:00
Eugene Sandulenko 8e8199f6af LINUXMOTO: Fix OSD performance when OSD is not drawn 2016-09-03 21:30:55 +02:00
Eugene Sandulenko 57ae1cb89d GPH: Fix OSD performance when OSD is not drawn 2016-09-03 21:30:40 +02:00
Eugene Sandulenko c2f5c48068 DINGUX: Fix OSD performance when OSD is not drawn 2016-09-03 21:30:04 +02:00
Eugene Sandulenko b8ee5322f4 JANITORIAL: Remove trailing whitespaces 2016-09-03 21:20:16 +02:00
Eugene Sandulenko 7910123446 SDL: Optimize OSD drawing 2016-09-03 21:20:02 +02:00
Eugene Sandulenko fab199d37e JANITORIAL: Make GPL headers uniform 2016-09-03 12:46:38 +02:00
Eugene Sandulenko e93b52416f LINUXMOTO: Adapt to OSD changes 2016-09-03 10:18:47 +02:00
Eugene Sandulenko 58096d909f GPH: Fix formatting 2016-09-03 10:18:47 +02:00
Eugene Sandulenko 2fa97f20e8 DINGUX: Adapt to new OSD changes 2016-09-03 10:18:47 +02:00
Bastien Bouclet 25bf68c39a BACKENDS: Remove extra line returns in warnings 2016-09-03 07:14:16 +02:00
Eugene Sandulenko 2d39f75b7d GPH: Attempt to fix OSD 2016-09-02 23:57:13 +02:00
Alexander Tkachev 489489b127 PS2: Fix Ps2SaveFileManager
* updateSavefilesList() stub;
* openRawFile();
* Common::OutSaveFile in openForLoading().
2016-08-31 14:12:45 +06:00
Alexander Tkachev ac93dd99fe DC: Add RoninCDFileNode::create()
Returns false, as we don't create files/directories on CD.
2016-08-31 13:46:43 +06:00
Alexander Tkachev a6bcd207fc DC: Fix VMSaveManager
* updateSavefilesList() stub;
* openRawFile();
* Common::OutSaveFile in openForSaving();
* OutVMSave derived from WriteStream.
2016-08-31 13:39:09 +06:00
Alexander Tkachev 7f913c831d DS, N64: Fix openForSaving()
Fails to build because OutSaveFile's name should've been qualified.
2016-08-31 12:38:40 +06:00
Alexander Tkachev 9d6ae2a33f DS, N64: Fix SaveFileManagers
Added updateSavefilesList() and openRawFile() stubs. It should build
fine now, I guess.
2016-08-31 12:33:57 +06:00
Alexander Tkachev 153f06b324 N64: Fix OutSaveFile error
OutSaveFile was just a typedef of WriteStream once, but now it's not.
These Out*Save classes are then wrapped with OutSaveFile, so it should
be OK to derive them from WriteStream instead of OutSaveFile.
2016-08-31 12:07:53 +06:00
Thierry Crozat f490fb811a OSX: Implement clipboard support
There was already an implementation using SDL2 in the SDL backend,
but this way we have it available also when using the SDL 1.
2016-08-30 21:37:34 +01:00
Willem Jan Palenstijn fb592a0dbd BACKENDS: Rename variable shadowing function 2016-08-30 21:53:21 +02:00
Willem Jan Palenstijn d60879b535 SDL: Fix const cast 2016-08-30 21:52:27 +02:00
Eugene Sandulenko 6a081212f1 CLOUD: Fix Windows cross-compilation 2016-08-30 21:29:22 +02:00
Bastien Bouclet b00cb955d9 BACKENDS: Use open instead of creat to create files
creat is not defined on the PS3. Also close the file descriptor.
2016-08-30 21:19:59 +02:00
Alexander Tkachev 6b0766dc92 Merge branch 'master' of https://github.com/scummvm/scummvm 2016-08-30 21:08:06 +06:00
Alexander Tkachev f8fe150130 CLOUD: Fix Webserver's usage of DefaultSaveFileManager
concatWithSavesPath() is only defined when curl is used, but was used in
Webserver even when curl is unavailable.
2016-08-30 21:08:02 +06:00
Eugene Sandulenko 111dc18ef3 Merge pull request #433 from klusark/assets
ANDROID: Update the asset archive code to use AAssets
2016-08-30 15:14:12 +02:00
Eugene Sandulenko bfbfbd3e1a Merge pull request #788 from Tkachov/cloud
ALL: Add Cloud storage support
2016-08-30 13:54:12 +02:00
Eugene Sandulenko f9f55d1af3 ANDROIDSDL: Fix menu button 2016-08-29 19:37:25 +02:00
Alexander Tkachev 368f664c81 COMMON: Fix WriteStream::pos() once again
MemoryReadWriteStream now returns int32, not uint32. It actually doesn't
ever return -1 to indicate that an error occured, so uint32 was a better
choice, but that's what is used in WriteStream base class now.

That method is abstract, so that's also why OutSaveFile had to override
it.
2016-08-24 16:24:16 +06:00
Peter Bozsó 02a997e468 CLOUD: Remove unused includes 2016-08-24 16:07:55 +06:00
Alexander Tkachev 97cf2be7ef CLOUD: Update LocalWebserver
Reader now reads headers into stream, and some checks are added there
and in UploadFileClientHandler, so if headers are too long, they are
treated as bad request.
2016-08-24 16:07:55 +06:00
Alexander Tkachev dc02a789b6 CLOUD: Use forbidden combinations
I accidentally tried "folder../" instead "folder/../" and understood
that I made "folder../" forbidden too, though it's a valid folder name.
2016-08-24 16:07:55 +06:00
Alexander Tkachev 8a1cca896e CLOUD: Update handlers
Now if there is no "rootpath" specified, it's not even listed by
FilesPageHandler and ListAjaxHandler. And, of course, not available to
use anywhere else.
2016-08-24 16:07:55 +06:00
Alexander Tkachev acfa1d1f10 CLOUD: Handle paths in marked places
Paths containing '../' are forbidden to use in Files Manager. There is
also a special inner black list of paths which are not used and a check
that specified path is under "savepath" or "rootpath" (from "cloud"
domain).
2016-08-24 16:07:55 +06:00
Alexander Tkachev dd9e5a95dc CLOUD: Mark places where path handling is needed 2016-08-24 16:07:55 +06:00
Alexander Tkachev 126fe9c845 CLOUD: Add "minimal mode" in LocalWebserver
StorageWizardDialog now runs LocalWebserver in "minimal mode" for
security reasons. In this mode server uses only those handlers which
state to support it.

There are two handlers which support minimal mode: IndexPageHandler
(which handles `code` requests needed by StorageWizardDialog) and
ResourceHandler (which provides inner resources like `style.css` or
`logo.png` from `wwwroot.zip` archive).
2016-08-24 16:07:55 +06:00
Peter Bozsó a1de322c18 CLOUD: Use overriden handle() instead of ClientHandlerCallback in page handlers
Using a dedicated callback object for this was an unnecessary overhead.
2016-08-24 16:07:55 +06:00
Alexander Tkachev 712410496e CLOUD: Fix UploadFileClientHandler
It now redirects user on success not only when file was the last field
in the content, but also when it was uploaded already and Handler worked
further to search for more files.
2016-08-24 16:07:55 +06:00
Alexander Tkachev 4f0c071e53 CLOUD: Add custom User-Agent
Full version is used like in Eugene's Google Analytics stub. Plus, on
PS3 that string contains "PlayStation", and that would be cool to know
that ScummVM+libcurl+PS3 work together.
2016-08-24 16:07:55 +06:00
Eugene Sandulenko 0558ba423c CLOUD: Fix warnings 2016-08-24 16:07:55 +06:00
Peter Bozsó 64b361b335 CLOUD: Move determineMimeType to ResourceHandler 2016-08-24 16:07:55 +06:00
Peter Bozsó b68bd78b44 CLOUD: Remove unused removePathHandler(), make addPathHandler() private 2016-08-24 16:07:55 +06:00