* Sync keyboard text buffer from Flash before processing physical input The native keyboard scene maintained a separate C++ buffer (m_win64TextBuffer) for physical keyboard input, which was pushed to the Flash text field via setLabel(). However, when the user typed with the on-screen controller buttons, Flash updated its text field directly through ActionScript without updating the C++ buffer. This caused a desync: switching back to the physical keyboard would overwrite any text entered via controller, since m_win64TextBuffer still held the old value before the controller edits. Fix: read the current Flash text field into m_win64TextBuffer at the start of each tick(), before consuming new physical keyboard chars. This ensures both input methods always operate on the same state. * Use last active input device to decide keyboard mode instead of connection state The keyboard UI mode (on-screen virtual keyboard vs direct text input) was determined by Win64_IsControllerConnected(), which checks if any XInput controller is physically plugged in. This meant that even if the player was actively using mouse and keyboard, the virtual keyboard would still appear as long as a controller was connected. Replace the connection check with g_KBMInput.IsKBMActive(), which tracks the actual last-used input device based on per-frame input detection. Now the keyboard mode is determined by what the player is currently using, not what hardware happens to be plugged in. Affected scenes: CreateWorldMenu (world naming) and LoadOrJoinMenu (world renaming). * Fix TextInput caret behavior and add proper cursor editing for KBM direct edit The direct text editing mode introduced for KBM users had several issues with the TextInput control's caret (blinking cursor) and text manipulation: 1. Caret visible when not editing: When navigating to the world name field with keyboard/mouse, Flash's Iggy focus system would show the blinking caret even though the field wasn't active for editing yet (Enter not pressed). This was misleading since typing had no effect in that state. Fix: access the FJ_TextInput's internal m_mcCaret MovieClip and force its visibility based on editing state. This is enforced every tick because setLabel() and Flash focus transitions continuously reset the caret state. 2. No cursor movement during editing: The direct edit implementation treated the text as a simple buffer with push_back/pop_back — there was no concept of cursor position. Backspace only deleted from the end, and arrow keys did nothing. Fix: track cursor position (m_iCursorPos) in C++ and use wstring insert/erase at that position. Arrow keys (Left/Right), Home, End, and Delete now work as expected. The visual caret position is synced to Flash via the FJ_TextInput's SetCaretIndex method. 3. setLabel() resetting caret position: Every call to setLabel() (when text changes) caused Flash to reset the caret to the end of the string, making the cursor jump visually even though the C++ position was correct. Fix: enforce caret position via setCaretIndex every tick during editing, so any Flash-side resets are immediately corrected. New UIControl_TextInput API: - setCaretVisible(bool): toggles m_mcCaret.visible in Flash - setCaretIndex(int): calls FJ_TextInput.SetCaretIndex in Flash * Fix keyboard/arrow navigation not working when no UI element is focused On Windows64 with KBM, moving the mouse over empty space (outside any button) would clear the Iggy focus entirely. After that, pressing arrow keys did nothing because Flash had no starting element to navigate from. Two changes here: - Don't set focus to IGGY_FOCUS_NULL when the mouse hovers over empty space. The previous hover target stays focused, so switching back to arrows keeps working seamlessly. - When a navigation key is pressed and nothing is focused at all (e.g. mouse was already on empty space when the menu opened), grab the first focusable element instead of silently dropping the input. The keypress is consumed to avoid jumping two elements at once. This makes mixed mouse+keyboard navigation feel a lot more natural. You can point at a button, then continue with arrows, or just start pressing arrows right away without having to hover first. * Overhaul mouse support and generalize direct text editing to all UI scenes This is a large rework of the Windows64 KBM (keyboard+mouse) input layer. It touches the mouse hover system, the mouse click dispatch, and the direct text editing infrastructure, then applies all of it to every scene that has text input fields or non-standard clickable elements. MOUSE HOVER REWRITE (UIController.cpp tickInput) The old hover code had two structural problems: (a) Scene lookup was group-first: it iterated UI groups and checked all layers within each group. The Tooltips layer on eUIGroup_Fullscreen (which holds non-interactive overlays like button hints) would be found before in-game menus on eUIGroup_Player1. The tooltip scene focusable objects captured mouse input and prevented hover from reaching the actual menu. Fixed by switching to layer-first lookup across all groups, and skipping eUILayer_Tooltips entirely since those are never interactive. (b) On tabbed menus (LaunchMoreOptionsMenu Game vs World tabs), all controls from all tabs are registered in Flash at the same time. There was no filtering, so controls from inactive tabs had phantom hitboxes that overlapped the active tab controls, making certain buttons unhoverable. Fixed by introducing parent panel tracking: each UIControl now has a m_pParentPanel pointer, set automatically by the UI_MAP_ELEMENT macro during mapElementsAndNames(). The hover code checks the control parent panel against the scene GetMainPanel() and skips mismatches. This is the same technique the Vita touch code used, but applied to mouse hover. The coordinate conversion was also simplified. The old code had two separate scaling paths (window dimensions for hover, display dimensions for sliders). Now there is one conversion from window pixel coords to SWF coords using the scene own render dimensions. REUSING VITA TOUCH APIs FOR MOUSE (ButtonList, UIScene) Several APIs originally gated behind __PSVITA__ are now enabled for Win64: - UIControl_ButtonList::SetTouchFocus(x,y) and CanTouchTrigger(x,y): the Flash-side ActionScript methods were already registered on all platforms in setupControl(), only the C++ wrappers were ifdef-gated. Opening the ifdefs to include _WINDOWS64 lets the mouse hover code delegate to Flash for list item highlighting, which handles internal scrolling and item layout that would be impractical to replicate in C++. - UIScene::SetFocusToElement(id): programmatic focus-by-control-ID, used as a fallback when Iggy focusable objects do not match the C++ hit test. - UIScene_LaunchMoreOptionsMenu::GetMainPanel(): returns the active tab panel control, needed by the hover code to filter inactive tab controls. MOUSE CLICK DISPATCH (UIScene.cpp handleMouseClick) Left-clicking previously relied entirely on Iggy ACTION_MENU_OK dispatch, which routes to whatever Flash considers focused. This broke for custom- drawn elements that are not Flash buttons (crafting recipe slots), and for scenes where Iggy focus did not match what the user visually clicked. Added a virtual handleMouseClick(x, y) on UIScene with a default implementation that hit-tests C++ controls. When multiple controls report overlapping bounds (common in debug scenes where TextInputs report full Flash-width), it picks the one whose left edge X is closest to the click. Returns true to consume the click and suppress the normal ACTION_MENU_A dispatch via a m_mouseClickConsumedByScene flag on UIController. The default implementation handles buttons, text inputs, and checkboxes (toggling state and calling handleCheckboxToggled directly). CRAFTING MENU MOUSE CLICK (UIScene_CraftingMenu.cpp) The crafting menu recipe slots (H slots) are rendered through Iggy custom draw callback, not as Flash buttons. They have no focusable objects, so mouse clicking did nothing. The solution caches SWF-space positions during rendering: inside customDraw, when H slot 0 and H slot 1 are drawn, the code extracts SWF coordinates from the D3D11 transform matrix via gdraw_D3D11_CalculateCustomDraw_4J. The X difference between slot 0 and slot 1 gives the uniform slot spacing. handleMouseClick then uses these cached bounds to determine which recipe slot was clicked, resets the vertical slot indices (same pattern as the constructor), updates the highlight and vertical slots display, and re-shows the old slot icon. This mirrors the existing controller LEFT/RIGHT navigation in the base class handleKeyDown. DIRECT EDIT REFACTORING (UIControl_TextInput) The direct text editing feature (type directly into text fields instead of opening the virtual keyboard) was originally implemented inline in CreateWorldMenu with all the state, character consumption, cursor tracking, caret visibility, and cooldown logic hardcoded in one scene. Moved everything into UIControl_TextInput: - beginDirectEdit(charLimit): captures current label, inits cursor at end - tickDirectEdit(): consumes chars, handles Backspace/Enter/Escape, arrow keys (Left/Right/Home/End/Delete), enforces caret visibility every tick (because setLabel and Flash focus transitions continuously reset it), returns Confirmed/Cancelled/Continue - cancelDirectEdit() / confirmDirectEdit(): programmatic control - isDirectEditing() / getDirectEditCooldown() / getEditBuffer(): state query For SWFs that lack the m_mcCaret MovieClip child (like AnvilMenu), the existence check validates by reading a property from the resolved path, since IggyValuePathMakeNameRef always succeeds even for undefined refs. When no caret exists, the control inserts a _ character at the cursor position as a visual fallback. The caret check result is cached in m_bHasCaret/m_bCaretChecked to avoid repeated Iggy calls that could corrupt internal state. SCENES UPDATED WITH DIRECT EDIT + VIRTUAL KEYBOARD Every scene with text input now supports both input modes: direct editing when KBM is active, virtual keyboard (via NavigateToScene eUIScene_Keyboard) when using a controller. The mode is chosen at press time based on g_KBMInput.IsKBMActive(). - CreateWorldMenu: refactored to use the new UIControl_TextInput API, removing ~80 lines of inline editing code. - AnvilMenu: item renaming now supports direct edit. The keyboard callback uses Win64_GetKeyboardText instead of InputManager.GetText (which reads from a different buffer on Win64). The virtual keyboard is opened with eUILayer_Fullscreen + eUIGroup_Fullscreen so it does not hide the anvil container menu underneath. Added null guards on getMovie() in setCostLabel and showCross since the AnvilMenu SWF may not fully load on Win64. - SignEntryMenu: all 4 sign lines support direct edit. Clicking a different line while editing confirms the current one. Each line cooldown timer is checked independently to prevent Enter from re-opening the edit. - LaunchMoreOptionsMenu: seed field direct edit with proper input blocking. - DebugCreateSchematic: all 7 text inputs (name + start/end XYZ coords). handleMouseClick is overridden to always consume clicks during edit to prevent Iggy re-entry on empty space. - DebugSetCamera: all 5 inputs (camera XYZ + Y rotation + elevation). Clicking a different field while editing confirms the current value and opens the new one. Float display formatting changed from %f to %.2f. All keyboard completion callbacks on Win64 now use Win64_GetKeyboardText (two params: buffer + size) instead of InputManager.GetText, which reads from the correct g_Win64KeyboardResult global when using the in-game keyboard scene. SCROLL WHEEL Mouse wheel events (ACTION_MENU_OTHER_STICK_UP/DOWN) are now centrally remapped to ACTION_MENU_UP/DOWN in UIController::handleKeyPress when KBM is active. Previously each scene would need to handle OTHER_STICK actions separately, and most did not, so scroll wheel only worked in a few places. * Add mouse click support to CraftingMenu (tab switching, slot selection, craft) The crafting screen's horizontal recipe slots and category tabs are custom-drawn via Iggy callbacks rather than regular Flash buttons, so the standard mouse hover system can't interact with them. This adds handleMouseClick to derive clickable regions from the H slot positions cached during customDraw. Tab clicking: tab hitboxes are computed relative to the H slot row since the Vita TouchPanel overlays (full-screen invisible rectangles) aren't suitable for direct hit-testing on Win64. The Y bounds were tuned empirically to match the SWF tab icon positions. Clicking a tab runs the same switch logic as LB/RB: hide old highlight, update group index, reset slot indices, recalculate recipes, and refresh the display. H slot clicking: clicking a different recipe slot selects it (updating V slots, highlight, and re-showing the previous slot). Clicking the already-selected slot crafts the item by dispatching ACTION_MENU_A through handleKeyDown, reusing the existing crafting path. Empty slots (iCount == 0) are ignored. All mouse clicks on the scene are consumed (return true) to prevent misses from falling through as ACTION_MENU_A and accidentally triggering a craft. This only suppresses mouse-originated A presses via m_mouseClickConsumedByScene; keyboard and controller A remain fully functional. Also enables GetMainPanel for Win64 (was Vita-only) so the mouse hover system can filter controls by active panel, same as other tabbed menus. * Fix mouse hover selecting wrong buttons from the third onward The hover code was doing a redundant second hit-test against Iggy focusable object bounds after the C++ control bounds had already identified the correct control. Iggy focusable bounds are wider than the actual visible buttons and overlap vertically, so the "pick largest x0" heuristic would match focusables belonging to earlier buttons when hovering the right side of buttons 3+. Replaced the IggyPlayerGetFocusableObjects path with a direct SetFocusToElement call using the already-correct hitControlId from the C++ hit-test, same approach the click path uses in handleMouseClick. Also switched the overlap tiebreaker from "largest x0" to smallest area, consistent with how clicks resolve overlapping controls. TextInput is excluded from hover focus to avoid showing the caret on mere mouse-over (its Iggy focus is set on click). * Use smallest-area tiebreaker for mouse click hit-testing too Same overlap fix applied to handleMouseClick: when multiple controls contain the click point, prefer the one with the smallest bounding area instead of the one with the largest left-edge X. This is more robust for any layout (vertical menus, grids, overlapping panels) and matches the hover path logic. Those changes were initially made in order to fix the teleport ui for the mouse but broke every other well working ui. * Fix mouse cursor staying trapped in window on alt-tab When the inventory or other UI with a hidden cursor was open, alt-tabbing out would leave the cursor locked to the game window. SetWindowFocused(false) from WM_KILLFOCUS correctly released the clip and showed the cursor, but Tick() was unconditionally calling SetCursorPos every frame to re-center it, overriding the release. Added m_windowFocused to the Tick() condition so cursor manipulation only happens while the window actually has focus. * Map mouse right click to ACTION_MENU_X for inventory half-stack Right clicking an item stack in Java Edition picks up half of it. Console Edition already handles this via ACTION_MENU_X (the X button on controller), which sets buttonNum=1 in handleKeyDown. This maps mouse right click to that same action so KBM players get the same behavior across all container menus (inventory, chests, furnaces, hoppers, etc). * Fix mouse hover hitting removed controls (ghost hitboxes) When removeControl() removes a Flash element (e.g. the Reinstall button in Help & Options, or the Debug button when disabled), the C++ control object stays in the m_controls vector. On Vita this was handled by calling setHidden(true) and checking getHidden() in the touch hit-test, but on Windows64 none of that was happening. The result: removed buttons kept phantom bounds that the hover code would match against, stealing focus from the buttons that shifted into their visual position. In the Help & Options menu with debug enabled, the removed Reinstall button (Button6) had ghost bounds overlapping where the Debug button (Button7) moved to after the removal, making Debug un-hoverable and snapping focus to Button1. The fix has three parts: - removeControl() now calls setHidden(true) on all platforms, not just Vita. The m_bHidden member was already declared on all platforms, only the accessors were ifdef'd behind __PSVITA__. - Removed the __PSVITA__ ifdef from setHidden/getHidden in UIControl.h so they're available everywhere. - Added getHidden() checks in both the hover and click hit-test loops, matching what the Vita touch code already does. The check is a simple bool read (no Flash/Iggy call), placed before the getVisible() query which hits Flash and can return stale values for removed elements. * Add right-click to open save options in world selection menu On controller, RB (ACTION_MENU_RIGHT_SCROLL) opens the save options dialog (rename/delete) when a save is selected. Mouse right-click maps to ACTION_MENU_X, which had no Windows64 handler in this scene. Added save options handling under ACTION_MENU_X for _WINDOWS64 so right-clicking a save opens the same dialog. Also handles the mashup world hide action for right-click consistency. Console-only options (copy save, save transfer) are excluded since they don't apply here. * Fix Escape key not opening pause menu during tutorial hints The KBM pause check had a IsTutorialVisible guard that blocked Escape entirely while any tutorial popup was on screen. The controller path never had this restriction. Removed the check so Escape behaves the same as Start on controller. * Fix crash in WriteHeader when save buffer is too small for header table When a player enters a new region, RegionFile's constructor calls createFile which adds a FileEntry with length 0 to the file table. This increases the header table size (appended at the end of the save buffer) by sizeof(FileEntrySaveData) per entry, but since no actual data is written to the file, MoveDataBeyond is never called and the committed virtual memory pages are never grown to match. On the next autosave tick, saveLevelData writes level.dat first (before chunkSource->save which would have grown the buffer). If level.dat doesn't need to grow, finalizeWrite calls WriteHeader which tries to memcpy the now-larger header table past the end of committed memory, causing an access violation. This is especially likely in splitscreen where two players exploring at the same time can create multiple new RegionFile entries within a single tick, quickly exhausting the page-alignment slack in the buffer (yes i am working at splitscreen in the meanwhile :) ) The fix was deduced by tracing the crash callstack through the save system: FileHeader, ConsoleSaveFileOriginal, the stream chain, and the RegionFile/RegionFileCache layer. The root cause turned out to be a gap between createFile (which grows the header table) and MoveDataBeyond (the only place that grows the buffer), with finalizeWrite sitting right in between unprotected. The buffer growth check added here mirrors the exact same VirtualAlloc pattern already used in MoveDataBeyond (line 484-497) and in the constructor's decompression path (line 176-190), so it integrates naturally with the existing code. Same types, same page rounding, same error handling. The fast path (no new entries, buffer already big enough) is a single DWORD comparison that doesn't get taken, so there is zero overhead in the common case. This is the right place for the fix because finalizeWrite is the sole caller of WriteHeader, meaning every code path that writes the header (closeHandle, PrepareForWrite, deleteFile, Flush) is now protected by a single check point. * Fix TextInput bugs and refactor direct edit handling into UIScene base class The fake cursor character (_) used for SWFs without m_mcCaret was leaking into saved sign and anvil text. This happened because setLabel() with instant=false only updates the C++-side cache, deferring the Flash write to the next control tick. Any getLabel() call before that tick reads the old Flash value still containing the underscore. Fixed by passing instant=true in confirmDirectEdit, cancelDirectEdit, and the Enter key path inside tickDirectEdit, so the cleaned text hits Flash immediately. Mouse hover over TextInput controls (world name, anvil name, seed field) was not showing the yellow highlight border. The hover code used IggyPlayerSetFocusRS which sets Iggy's internal dispatch focus but does not trigger Flash's ChangeState callback, so no visual feedback appeared. Buttons worked fine because Iggy draws its own focus ring on them, but TextInput relies entirely on ChangeState(0) for the yellow border. Switched to SetFocusToElement which goes through the Flash-side SetFocus path, then immediately call setCaretVisible(false) to suppress the blinking caret that comes with focus. No visual flicker since rendering happens after both tickInput and scene tick complete. While direct editing, mouse hover was able to move focus away to other TextInputs on the same scene (most noticeably on the sign editor, where hovering a different line would steal focus from the line being typed). Added an isDirectEditBlocking() check in the hover path to skip focus changes when any input on the scene is actively being edited. The Done button in SignEntryMenu was unresponsive to mouse clicks during direct editing. The root cause is execution order: handleMouseClick runs before handleInput in the frame. The base handleMouseClick found the Done button and called handlePress, but handlePress bailed out because of the isDirectEditing guard. The click was marked consumed, so handleInput never saw it. Fixed by overriding handleMouseClick in SignEntryMenu to detect the Done button hit while editing and confirm + close directly. Added click-outside-to-deselect for anvil and world name text inputs. Both scenes previously required Enter to confirm the edit, which felt wrong. Now clicking anywhere outside the text field bounds confirms the current text, matching standard UI behavior. The anvil menu now updates the item name in real time while typing, like Java edition. Previously the name was only applied on Enter, so the repair cost display was stale until confirmation. The biggest change is structural: every scene that used direct editing (AnvilMenu, CreateWorldMenu, SignEntryMenu, LaunchMoreOptionsMenu, DebugCreateSchematic, DebugSetCamera) had its own copy of the same boilerplate -- tickDirectEdit loops in tick(), click-outside hit testing in handleMouseClick(), cooldown guard checks in handleInput/handlePress, and result dispatch with switch/if chains. This was around 200 lines of near-identical code scattered across 6 files, each with its own slight variations and its own bugs waiting to happen. Pulled all of it into UIScene with two virtual methods: getDirectEditInputs() where scenes register their text inputs, and onDirectEditFinished() where they handle confirmed/cancelled results. The base class tick() drives tickDirectEdit on all registered inputs, handleMouseClick() does the click-outside-to-deselect hit test generically using panel offsets, and isDirectEditBlocking() replaces all the inline cooldown checks. Scenes now just override those two methods and get everything for free. Also removed the m_activeDirectEditControl enum tracking from the debug scenes (DebugCreateSchematic, DebugSetCamera) since the base class handles lifecycle tracking through the controls themselves. * Remap scroll wheel to LEFT/RIGHT for horizontal controls The scroll wheel was always remapped to UP/DOWN, which is fine for vertical lists but useless on horizontal controls like sliders and the texture pack selector. Track whether the mouse is hovering a horizontal control during the hover hit-test (new bool m_bMouseHoverHorizontalList, set for eTexturePackList and eSlider). When the flag is set, handleKeyPress emits LEFT/RIGHT instead of UP/DOWN for wheel events. TexturePackList is also now part of the mouse hover system with proper hit-testing, relative-coord SetTouchFocus and GetRealHeight for accurate bounds. * Guard setCaretVisible and setCaretIndex against null movie tickDirectEdit calls into Iggy every tick without checking if the movie is still valid, which crashes inside iggy_w64.dll when the Flash movie gets unloaded or isn't ready yet. * Fix creative inventory scroll for both mouse wheel and controller The mouse scroll wheel was not working in the creative inventory at all. UIController remaps wheel input from OTHER_STICK to UP/DOWN for KBM users, but the base container menu handler consumed UP/DOWN for grid navigation before it could reach the creative menu's page scrolling logic in handleAdditionalKeyPress. Fixed by detecting scroll wheel input on UP/DOWN in the base handler and forwarding it as OTHER_STICK to handleAdditionalKeyPress instead. Also fixed the controller right stick scrolling way too fast: it was jumping TabSpec::rows (5) rows per tick at 100ms repeat rate, which blew through the entire item list almost instantly. Reduced to 1 row per tick so scrolling feels controlled on both input methods.
1088 lines
32 KiB
C++
1088 lines
32 KiB
C++
#include "stdafx.h"
|
|
#include "StringHelpers.h"
|
|
#include "ConsoleSaveFileOriginal.h"
|
|
#include "File.h"
|
|
#include <xuiapp.h>
|
|
#include "compression.h"
|
|
#include "..\Minecraft.Client\Minecraft.h"
|
|
#include "..\Minecraft.Client\MinecraftServer.h"
|
|
#include "..\Minecraft.Client\ServerLevel.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.level.h"
|
|
#include "..\Minecraft.World\LevelData.h"
|
|
#include "..\Minecraft.Client\Common\GameRules\LevelGenerationOptions.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
|
|
|
|
|
|
#ifdef _XBOX
|
|
#define RESERVE_ALLOCATION MEM_RESERVE | MEM_LARGE_PAGES
|
|
#define COMMIT_ALLOCATION MEM_COMMIT | MEM_LARGE_PAGES
|
|
#else
|
|
#define RESERVE_ALLOCATION MEM_RESERVE
|
|
#define COMMIT_ALLOCATION MEM_COMMIT
|
|
#endif
|
|
|
|
unsigned int ConsoleSaveFileOriginal::pagesCommitted = 0;
|
|
void *ConsoleSaveFileOriginal::pvHeap = NULL;
|
|
|
|
ConsoleSaveFileOriginal::ConsoleSaveFileOriginal(const wstring &fileName, LPVOID pvSaveData /*= NULL*/, DWORD dFileSize /*= 0*/, bool forceCleanSave /*= false*/, ESavePlatform plat /*= SAVE_FILE_PLATFORM_LOCAL*/)
|
|
{
|
|
InitializeCriticalSectionAndSpinCount(&m_lock,5120);
|
|
|
|
// One time initialise of static stuff required for our storage
|
|
if( pvHeap == NULL )
|
|
{
|
|
// Reserve a chunk of 64MB of virtual address space for our saves, using 64KB pages.
|
|
// We'll only be committing these as required to grow the storage we need, which will
|
|
// the storage to grow without having to use realloc.
|
|
|
|
// AP - The Vita doesn't have virtual memory so a pretend system has been implemented in PSVitaStubs.cpp.
|
|
// All access to the memory must be done via the access function as the pointer returned from VirtualAlloc
|
|
// can't be used directly.
|
|
pvHeap = VirtualAlloc(NULL, MAX_PAGE_COUNT * CSF_PAGE_SIZE, RESERVE_ALLOCATION, PAGE_READWRITE );
|
|
}
|
|
|
|
pvSaveMem = pvHeap;
|
|
m_fileName = fileName;
|
|
|
|
DWORD fileSize = dFileSize;
|
|
|
|
// Load a save from the game rules
|
|
bool bLevelGenBaseSave = false;
|
|
LevelGenerationOptions *levelGen = app.getLevelGenerationOptions();
|
|
if( pvSaveData == NULL && levelGen != NULL && levelGen->requiresBaseSave())
|
|
{
|
|
pvSaveData = levelGen->getBaseSaveData(fileSize);
|
|
if(pvSaveData && fileSize != 0) bLevelGenBaseSave = true;
|
|
}
|
|
|
|
if( pvSaveData == NULL || fileSize == 0)
|
|
fileSize = StorageManager.GetSaveSize();
|
|
|
|
if( forceCleanSave )
|
|
fileSize = 0;
|
|
|
|
DWORD heapSize = max( fileSize, (DWORD)(1024 * 1024 * 2)); // 4J Stu - Our files are going to be bigger than 2MB so allocate high to start with
|
|
|
|
// Initially committ enough room to store headSize bytes (using CSF_PAGE_SIZE pages, so rounding up here). We should only ever have one save file at a time,
|
|
// and the pages should be decommitted in the dtor, so pages committed should always be zero at this point.
|
|
if( pagesCommitted != 0 )
|
|
{
|
|
#ifndef _CONTENT_PACKAGE
|
|
__debugbreak();
|
|
#endif
|
|
}
|
|
|
|
unsigned int pagesRequired = ( heapSize + (CSF_PAGE_SIZE - 1 ) ) / CSF_PAGE_SIZE;
|
|
|
|
void *pvRet = VirtualAlloc(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE);
|
|
if( pvRet == NULL )
|
|
{
|
|
#ifndef _CONTENT_PACKAGE
|
|
// Out of physical memory
|
|
__debugbreak();
|
|
#endif
|
|
}
|
|
pagesCommitted = pagesRequired;
|
|
|
|
if( fileSize > 0)
|
|
{
|
|
bool AllocData = false;
|
|
if(pvSaveData != NULL)
|
|
{
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualCopyTo(pvSaveMem, pvSaveData, fileSize);
|
|
#else
|
|
memcpy(pvSaveMem, pvSaveData, fileSize);
|
|
if(bLevelGenBaseSave)
|
|
{
|
|
levelGen->deleteBaseSaveData();
|
|
}
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
unsigned int storageLength;
|
|
#ifdef __PSVITA__
|
|
// create a buffer to hold the compressed data
|
|
pvSaveData = malloc(fileSize);
|
|
AllocData = true;
|
|
StorageManager.GetSaveData( pvSaveData, &storageLength );
|
|
#else
|
|
StorageManager.GetSaveData( pvSaveMem, &storageLength );
|
|
#endif
|
|
#ifdef __PS3__
|
|
StorageManager.FreeSaveData();
|
|
#endif
|
|
app.DebugPrintf("Filesize - %d, Adjusted size - %d\n",fileSize,storageLength);
|
|
fileSize = storageLength;
|
|
}
|
|
|
|
#ifdef __PSVITA__
|
|
if(plat == SAVE_FILE_PLATFORM_PSVITA)
|
|
{
|
|
// AP - decompress via the access function. This uses a special RLE format
|
|
VirtualDecompress((unsigned char *)pvSaveData+8, fileSize-8 );
|
|
if( AllocData )
|
|
{
|
|
// free the compressed data buffer if required
|
|
free( pvSaveData );
|
|
}
|
|
else if(bLevelGenBaseSave)
|
|
{
|
|
levelGen->deleteBaseSaveData();
|
|
}
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
#ifdef __PSVITA__
|
|
void* pvSourceData = pvSaveData;
|
|
#else
|
|
void* pvSourceData = pvSaveMem;
|
|
#endif
|
|
int compressed = *(int*)pvSourceData;
|
|
if( compressed == 0 )
|
|
{
|
|
unsigned int decompSize = *( (int*)pvSourceData+1 );
|
|
if(isLocalEndianDifferent(plat)) System::ReverseULONG(&decompSize);
|
|
|
|
// An invalid save, so clear the memory and start from scratch
|
|
if(decompSize == 0)
|
|
{
|
|
// 4J Stu - Saves created between 2/12/2011 and 7/12/2011 will have this problem
|
|
app.DebugPrintf("Invalid save data format\n");
|
|
ZeroMemory( pvSourceData, fileSize );
|
|
// Clear the first 8 bytes that reference the header
|
|
header.WriteHeader( pvSourceData );
|
|
}
|
|
else
|
|
{
|
|
unsigned char *buf = new unsigned char[decompSize];
|
|
#ifndef _XBOX
|
|
if(plat == SAVE_FILE_PLATFORM_PSVITA)
|
|
{
|
|
Compression::VitaVirtualDecompress(buf, &decompSize, (unsigned char *)pvSourceData+8, fileSize-8 );
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
Compression::getCompression()->SetDecompressionType(plat); // if this save is from another platform, set the correct decompression type
|
|
Compression::getCompression()->Decompress(buf, &decompSize, (unsigned char *)pvSourceData+8, fileSize-8 );
|
|
Compression::getCompression()->SetDecompressionType(SAVE_FILE_PLATFORM_LOCAL); // and then set the decompression back to the local machine's standard type
|
|
}
|
|
|
|
// Only ReAlloc if we need to (we might already have enough) and align to 512 byte boundaries
|
|
DWORD currentHeapSize = pagesCommitted * CSF_PAGE_SIZE;
|
|
|
|
DWORD desiredSize = decompSize;
|
|
|
|
if( desiredSize > currentHeapSize )
|
|
{
|
|
unsigned int pagesRequired = ( desiredSize + (CSF_PAGE_SIZE - 1 ) ) / CSF_PAGE_SIZE;
|
|
void *pvRet = VirtualAlloc(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE);
|
|
if( pvRet == NULL )
|
|
{
|
|
// Out of physical memory
|
|
__debugbreak();
|
|
}
|
|
pagesCommitted = pagesRequired;
|
|
}
|
|
#ifdef __PSVITA__
|
|
VirtualCopyTo(pvSaveMem, buf, decompSize);
|
|
#else
|
|
memcpy(pvSaveMem, buf, decompSize);
|
|
#endif
|
|
delete[] buf;
|
|
}
|
|
}
|
|
}
|
|
|
|
header.ReadHeader( pvSaveMem, plat );
|
|
|
|
}
|
|
else
|
|
{
|
|
// Clear the first 8 bytes that reference the header
|
|
header.WriteHeader( pvSaveMem );
|
|
}
|
|
}
|
|
|
|
ConsoleSaveFileOriginal::~ConsoleSaveFileOriginal()
|
|
{
|
|
VirtualFree( pvHeap, MAX_PAGE_COUNT * CSF_PAGE_SIZE, MEM_DECOMMIT );
|
|
pagesCommitted = 0;
|
|
// Make sure we don't have any thumbnail data still waiting round - we can't need it now we've destroyed the save file anyway
|
|
#if defined _XBOX
|
|
app.GetSaveThumbnail(NULL,NULL);
|
|
#elif defined __PS3__
|
|
app.GetSaveThumbnail(NULL,NULL, NULL,NULL);
|
|
#endif
|
|
|
|
DeleteCriticalSection(&m_lock);
|
|
}
|
|
|
|
// Add the file to our table of internal files if not already there
|
|
// Open our actual save file ready for reading/writing, and the set the file pointer to the start of this file
|
|
FileEntry *ConsoleSaveFileOriginal::createFile( const ConsoleSavePath &fileName )
|
|
{
|
|
LockSaveAccess();
|
|
FileEntry *file = header.AddFile( fileName.getName() );
|
|
ReleaseSaveAccess();
|
|
|
|
return file;
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::deleteFile( FileEntry *file )
|
|
{
|
|
if( file == NULL ) return;
|
|
|
|
LockSaveAccess();
|
|
|
|
DWORD numberOfBytesRead = 0;
|
|
DWORD numberOfBytesWritten = 0;
|
|
|
|
const int bufferSize = 4096;
|
|
int amountToRead = bufferSize;
|
|
byte buffer[bufferSize];
|
|
DWORD bufferDataSize = 0;
|
|
|
|
|
|
char *readStartOffset = (char *)pvSaveMem + file->data.startOffset + file->getFileSize();
|
|
|
|
char *writeStartOffset = (char *)pvSaveMem + file->data.startOffset;
|
|
|
|
char *endOfDataOffset = (char *)pvSaveMem + header.GetStartOfNextData();
|
|
|
|
while(true)
|
|
{
|
|
// Fill buffer from file
|
|
if( readStartOffset + bufferSize > endOfDataOffset )
|
|
{
|
|
amountToRead = (int)(endOfDataOffset - readStartOffset);
|
|
}
|
|
else
|
|
{
|
|
amountToRead = bufferSize;
|
|
}
|
|
|
|
if( amountToRead == 0 )
|
|
break;
|
|
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualCopyFrom( buffer, readStartOffset, amountToRead );
|
|
#else
|
|
memcpy( buffer, readStartOffset, amountToRead );
|
|
#endif
|
|
numberOfBytesRead = amountToRead;
|
|
|
|
bufferDataSize = amountToRead;
|
|
readStartOffset += numberOfBytesRead;
|
|
|
|
// Write buffer to file
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualCopyTo( (void *)writeStartOffset, buffer, bufferDataSize );
|
|
#else
|
|
memcpy( (void *)writeStartOffset, buffer, bufferDataSize );
|
|
#endif
|
|
numberOfBytesWritten = bufferDataSize;
|
|
|
|
writeStartOffset += numberOfBytesWritten;
|
|
}
|
|
|
|
header.RemoveFile( file );
|
|
|
|
finalizeWrite();
|
|
|
|
ReleaseSaveAccess();
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod)
|
|
{
|
|
LockSaveAccess();
|
|
|
|
file->currentFilePointer = file->data.startOffset + lDistanceToMove;
|
|
|
|
if( dwMoveMethod == FILE_END)
|
|
{
|
|
file->currentFilePointer += file->getFileSize();
|
|
}
|
|
|
|
ReleaseSaveAccess();
|
|
}
|
|
|
|
// If this file needs to grow, move the data after along
|
|
void ConsoleSaveFileOriginal::PrepareForWrite( FileEntry *file, DWORD nNumberOfBytesToWrite )
|
|
{
|
|
int bytesToGrowBy = ( (file->currentFilePointer - file->data.startOffset) + nNumberOfBytesToWrite) - file->getFileSize();
|
|
if( bytesToGrowBy <= 0 )
|
|
return;
|
|
|
|
// 4J Stu - Not forcing a minimum size, it is up to the caller to write data in sensible amounts
|
|
// This lets us keep some of the smaller files small
|
|
//if( bytesToGrowBy < 1024 )
|
|
// bytesToGrowBy = 1024;
|
|
|
|
// Move all the data beyond us
|
|
MoveDataBeyond(file, bytesToGrowBy);
|
|
|
|
// Update our length
|
|
if( file->data.length < 0 )
|
|
file->data.length = 0;
|
|
file->data.length += bytesToGrowBy;
|
|
|
|
// Write the header with the updated data
|
|
finalizeWrite();
|
|
}
|
|
|
|
BOOL ConsoleSaveFileOriginal::writeFile(FileEntry *file,LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten)
|
|
{
|
|
assert( pvSaveMem != NULL );
|
|
if( pvSaveMem == NULL )
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
LockSaveAccess();
|
|
|
|
PrepareForWrite( file, nNumberOfBytesToWrite );
|
|
|
|
char *writeStartOffset = (char *)pvSaveMem + file->currentFilePointer;
|
|
//printf("Write: pvSaveMem = %0xd, currentFilePointer = %d, writeStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, writeStartOffset);
|
|
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualCopyTo((void *)writeStartOffset, (void*)lpBuffer, nNumberOfBytesToWrite);
|
|
#else
|
|
memcpy( (void *)writeStartOffset, lpBuffer, nNumberOfBytesToWrite );
|
|
#endif
|
|
*lpNumberOfBytesWritten = nNumberOfBytesToWrite;
|
|
|
|
if(file->data.length < 0)
|
|
file->data.length = 0;
|
|
|
|
file->currentFilePointer += *lpNumberOfBytesWritten;
|
|
|
|
//wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", *lpNumberOfBytesWritten, file->data.filename, file->currentFilePointer);
|
|
|
|
file->updateLastModifiedTime();
|
|
|
|
ReleaseSaveAccess();
|
|
|
|
return 1;
|
|
}
|
|
|
|
BOOL ConsoleSaveFileOriginal::zeroFile(FileEntry *file, DWORD nNumberOfBytesToWrite, LPDWORD lpNumberOfBytesWritten)
|
|
{
|
|
assert( pvSaveMem != NULL );
|
|
if( pvSaveMem == NULL )
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
LockSaveAccess();
|
|
|
|
PrepareForWrite( file, nNumberOfBytesToWrite );
|
|
|
|
char *writeStartOffset = (char *)pvSaveMem + file->currentFilePointer;
|
|
//printf("Write: pvSaveMem = %0xd, currentFilePointer = %d, writeStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, writeStartOffset);
|
|
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualMemset( (void *)writeStartOffset, 0, nNumberOfBytesToWrite );
|
|
#else
|
|
memset( (void *)writeStartOffset, 0, nNumberOfBytesToWrite );
|
|
#endif
|
|
*lpNumberOfBytesWritten = nNumberOfBytesToWrite;
|
|
|
|
if(file->data.length < 0)
|
|
file->data.length = 0;
|
|
|
|
file->currentFilePointer += *lpNumberOfBytesWritten;
|
|
|
|
//wprintf(L"Wrote %d bytes to %s, new file pointer is %I64d\n", *lpNumberOfBytesWritten, file->data.filename, file->currentFilePointer);
|
|
|
|
file->updateLastModifiedTime();
|
|
|
|
ReleaseSaveAccess();
|
|
|
|
return 1;
|
|
}
|
|
|
|
BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, LPVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead)
|
|
{
|
|
DWORD actualBytesToRead;
|
|
assert( pvSaveMem != NULL );
|
|
if( pvSaveMem == NULL )
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
LockSaveAccess();
|
|
|
|
char *readStartOffset = (char *)pvSaveMem + file->currentFilePointer;
|
|
//printf("Read: pvSaveMem = %0xd, currentFilePointer = %d, readStartOffset = %0xd\n", pvSaveMem, file->currentFilePointer, readStartOffset);
|
|
|
|
assert( nNumberOfBytesToRead <= file->getFileSize() );
|
|
|
|
actualBytesToRead = nNumberOfBytesToRead;
|
|
if( file->currentFilePointer + nNumberOfBytesToRead > file->data.startOffset + file->data.length )
|
|
{
|
|
actualBytesToRead = (file->data.startOffset + file->data.length) - file->currentFilePointer;
|
|
}
|
|
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualCopyFrom( lpBuffer, readStartOffset, actualBytesToRead );
|
|
#else
|
|
memcpy( lpBuffer, readStartOffset, actualBytesToRead );
|
|
#endif
|
|
|
|
*lpNumberOfBytesRead = actualBytesToRead;
|
|
|
|
file->currentFilePointer += *lpNumberOfBytesRead;
|
|
|
|
//wprintf(L"Read %d bytes from %s, new file pointer is %I64d\n", *lpNumberOfBytesRead, file->data.filename, file->currentFilePointer);
|
|
|
|
ReleaseSaveAccess();
|
|
|
|
return 1;
|
|
}
|
|
|
|
BOOL ConsoleSaveFileOriginal::closeHandle( FileEntry *file )
|
|
{
|
|
LockSaveAccess();
|
|
finalizeWrite();
|
|
ReleaseSaveAccess();
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::finalizeWrite()
|
|
{
|
|
LockSaveAccess();
|
|
|
|
// Ensure buffer is large enough for the full file including header table.
|
|
// New file entries (e.g. from RegionFile creation) increase GetFileSize()
|
|
// without triggering MoveDataBeyond, so the committed pages may be short.
|
|
DWORD currentHeapSize = pagesCommitted * CSF_PAGE_SIZE;
|
|
DWORD desiredSize = header.GetFileSize();
|
|
if( desiredSize > currentHeapSize )
|
|
{
|
|
unsigned int pagesRequired = ( desiredSize + (CSF_PAGE_SIZE - 1 ) ) / CSF_PAGE_SIZE;
|
|
void *pvRet = VirtualAlloc(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE);
|
|
if( pvRet == NULL )
|
|
{
|
|
__debugbreak();
|
|
}
|
|
pagesCommitted = pagesRequired;
|
|
}
|
|
|
|
header.WriteHeader( pvSaveMem );
|
|
ReleaseSaveAccess();
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::MoveDataBeyond(FileEntry *file, DWORD nNumberOfBytesToWrite)
|
|
{
|
|
DWORD numberOfBytesRead = 0;
|
|
DWORD numberOfBytesWritten = 0;
|
|
|
|
const DWORD bufferSize = 4096;
|
|
DWORD amountToRead = bufferSize;
|
|
//assert( nNumberOfBytesToWrite <= bufferSize );
|
|
static byte buffer1[bufferSize];
|
|
static byte buffer2[bufferSize];
|
|
DWORD buffer1Size = 0;
|
|
DWORD buffer2Size = 0;
|
|
|
|
// Only ReAlloc if we need to (we might already have enough) and align to 512 byte boundaries
|
|
DWORD currentHeapSize = pagesCommitted * CSF_PAGE_SIZE;
|
|
|
|
DWORD desiredSize = header.GetFileSize() + nNumberOfBytesToWrite;
|
|
|
|
if( desiredSize > currentHeapSize )
|
|
{
|
|
unsigned int pagesRequired = ( desiredSize + (CSF_PAGE_SIZE - 1 ) ) / CSF_PAGE_SIZE;
|
|
void *pvRet = VirtualAlloc(pvHeap, pagesRequired * CSF_PAGE_SIZE, COMMIT_ALLOCATION, PAGE_READWRITE);
|
|
if( pvRet == NULL )
|
|
{
|
|
// Out of physical memory
|
|
__debugbreak();
|
|
}
|
|
pagesCommitted = pagesRequired;
|
|
}
|
|
|
|
// This is the start of where we want the space to be, and the start of the data that we need to move
|
|
char *spaceStartOffset = (char *)pvSaveMem + file->data.startOffset + file->getFileSize();
|
|
|
|
// This is the end of where we want the space to be
|
|
char *spaceEndOffset = spaceStartOffset + nNumberOfBytesToWrite;
|
|
|
|
// This is the current end of the data that we want to move
|
|
char *beginEndOfDataOffset = (char *)pvSaveMem + header.GetStartOfNextData();
|
|
|
|
// This is where the end of the data is going to be
|
|
char *finishEndOfDataOffset = beginEndOfDataOffset + nNumberOfBytesToWrite;
|
|
|
|
// This is where we are going to read from (with the amount we want to read subtracted before we read)
|
|
char *readStartOffset = beginEndOfDataOffset;
|
|
|
|
// This is where we can safely write to (with the amount we want write subtracted before we write)
|
|
char *writeStartOffset = finishEndOfDataOffset;
|
|
|
|
//printf("\n******* MOVEDATABEYOND *******\n");
|
|
//printf("Space start: %d, space end: %d\n", spaceStartOffset - (char *)pvSaveMem, spaceEndOffset - (char *)pvSaveMem);
|
|
//printf("Current end of data: %d, new end of data: %d\n", beginEndOfDataOffset - (char *)pvSaveMem, finishEndOfDataOffset - (char *)pvSaveMem);
|
|
|
|
// Optimisation for things that are being moved in whole region file sector (4K chunks). We could generalise this a bit more but seems safest at the moment to identify this particular type
|
|
// of move and code explicitly for this situation
|
|
if( ( nNumberOfBytesToWrite & 4095 ) == 0 )
|
|
{
|
|
if( nNumberOfBytesToWrite > 0 )
|
|
{
|
|
// Get addresses for start & end of the region we are copying from as uintptr_t, for easier maths
|
|
uintptr_t uiFromStart = (uintptr_t)spaceStartOffset;
|
|
uintptr_t uiFromEnd = (uintptr_t)beginEndOfDataOffset;
|
|
|
|
// Round both of these values to get 4096 byte chunks that we will need to at least partially move
|
|
uintptr_t uiFromStartChunk = uiFromStart & ~((uintptr_t)4095);
|
|
uintptr_t uiFromEndChunk = (uiFromEnd - 1 ) & ~((uintptr_t)4095);
|
|
|
|
// Loop through all the affected source 4096 chunks, going backwards so we don't overwrite anything we'll need in the future
|
|
for( uintptr_t uiCurrentChunk = uiFromEndChunk; uiCurrentChunk >= uiFromStartChunk; uiCurrentChunk -= 4096 )
|
|
{
|
|
// Establish chunk we'll need to copy
|
|
uintptr_t uiCopyStart = uiCurrentChunk;
|
|
uintptr_t uiCopyEnd = uiCurrentChunk + 4096;
|
|
// Clamp chunk to the bounds of the full region we are trying to copy
|
|
if( uiCopyStart < uiFromStart )
|
|
{
|
|
// Needs to be clampged against the start of our region
|
|
uiCopyStart = uiFromStart;
|
|
}
|
|
if ( uiCopyEnd > uiFromEnd )
|
|
{
|
|
// Needs to be clamped to the end of our region
|
|
uiCopyEnd = uiFromEnd;
|
|
}
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualMove( (void *)(uiCopyStart + nNumberOfBytesToWrite), ( void *)uiCopyStart, uiCopyEnd - uiCopyStart);
|
|
#else
|
|
XMemCpy( (void *)(uiCopyStart + nNumberOfBytesToWrite), ( void *)uiCopyStart, uiCopyEnd - uiCopyStart );
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
while(true)
|
|
{
|
|
// Copy buffer 1 to buffer 2
|
|
memcpy( buffer2, buffer1, buffer1Size);
|
|
buffer2Size = buffer1Size;
|
|
|
|
// Fill buffer 1 from file
|
|
if( (readStartOffset - bufferSize) < spaceStartOffset )
|
|
{
|
|
amountToRead = (DWORD)(readStartOffset - spaceStartOffset);
|
|
}
|
|
else
|
|
{
|
|
amountToRead = bufferSize;
|
|
}
|
|
|
|
// Push the read point back by the amount of bytes that we are going to read
|
|
readStartOffset -= amountToRead;
|
|
|
|
//printf("About to read %u from %d\n", amountToRead, readStartOffset - (char *)pvSaveMem );
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualCopyFrom(buffer1, readStartOffset, amountToRead);
|
|
#else
|
|
memcpy( buffer1, readStartOffset, amountToRead );
|
|
#endif
|
|
numberOfBytesRead = amountToRead;
|
|
|
|
buffer1Size = amountToRead;
|
|
|
|
// Move back the write pointer by the amount of bytes we are going to write
|
|
writeStartOffset -= buffer2Size;
|
|
|
|
// Write buffer 2 to file
|
|
if( (writeStartOffset + buffer2Size) <= finishEndOfDataOffset)
|
|
{
|
|
//printf("About to write %u to %d\n", buffer2Size, writeStartOffset - (char *)pvSaveMem );
|
|
#ifdef __PSVITA__
|
|
// AP - use this to access the virtual memory
|
|
VirtualCopyTo((void *)writeStartOffset, buffer2, buffer2Size);
|
|
#else
|
|
memcpy( (void *)writeStartOffset, buffer2, buffer2Size );
|
|
#endif
|
|
numberOfBytesWritten = buffer2Size;
|
|
}
|
|
else
|
|
{
|
|
assert((writeStartOffset + buffer2Size) <= finishEndOfDataOffset);
|
|
numberOfBytesWritten = 0;
|
|
}
|
|
|
|
if( numberOfBytesRead == 0 )
|
|
{
|
|
//printf("\n************** MOVE COMPLETED *************** \n\n");
|
|
assert( writeStartOffset == spaceEndOffset );
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
header.AdjustStartOffsets( file, nNumberOfBytesToWrite );
|
|
}
|
|
|
|
bool ConsoleSaveFileOriginal::doesFileExist(ConsoleSavePath file)
|
|
{
|
|
LockSaveAccess();
|
|
bool exists = header.fileExists( file.getName() );
|
|
ReleaseSaveAccess();
|
|
|
|
return exists;
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::Flush(bool autosave, bool updateThumbnail )
|
|
{
|
|
LockSaveAccess();
|
|
|
|
#ifdef __PSVITA__
|
|
// On Vita we've had problems with saves being corrupted on rapid save/save-exiting so seems prudent to wait for idle
|
|
while( StorageManager.GetSaveState() != C4JStorage::ESaveGame_Idle )
|
|
{
|
|
app.DebugPrintf("Flush wait\n");
|
|
Sleep(10);
|
|
}
|
|
#endif
|
|
|
|
finalizeWrite();
|
|
|
|
// Get the frequency of the timer
|
|
LARGE_INTEGER qwTicksPerSec, qwTime, qwNewTime, qwDeltaTime;
|
|
float fElapsedTime = 0.0f;
|
|
QueryPerformanceFrequency( &qwTicksPerSec );
|
|
float fSecsPerTick = 1.0f / (float)qwTicksPerSec.QuadPart;
|
|
|
|
unsigned int fileSize = header.GetFileSize();
|
|
|
|
// Assume that the compression will make it smaller so initially attempt to allocate the current file size
|
|
// We add 4 bytes to the start so that we can signal compressed data
|
|
// And another 4 bytes to store the decompressed data size
|
|
unsigned int compLength = fileSize+8;
|
|
|
|
// 4J Stu - Added TU-1 interim
|
|
|
|
#ifdef __PS3__
|
|
// On PS3, don't compress the data as we can't really afford the extra memory this requires for the output buffer. Instead we'll be writing
|
|
// directly from the save data.
|
|
StorageManager.SetSaveData(pvSaveMem,fileSize);
|
|
byte *compData = (byte *)pvSaveMem;
|
|
#else
|
|
// Attempt to allocate the required memory
|
|
// We do not own this, it belongs to the StorageManager
|
|
byte *compData = (byte *)StorageManager.AllocateSaveData( compLength );
|
|
|
|
#ifdef __PSVITA__
|
|
// AP - make sure we always allocate just what is needed so it will only SAVE what is needed.
|
|
// If we don't do this the StorageManager will save a file of uncompressed size unnecessarily.
|
|
compData = NULL;
|
|
#endif
|
|
|
|
// If we failed to allocate then compData will be NULL
|
|
// Pre-calculate the compressed data size so that we can attempt to allocate a smaller buffer
|
|
if(compData == NULL)
|
|
{
|
|
// Length should be 0 here so that the compression call knows that we want to know the length back
|
|
compLength = 0;
|
|
|
|
// Pre-calculate the buffer size required for the compressed data
|
|
PIXBeginNamedEvent(0,"Pre-calc save compression");
|
|
// Save the start time
|
|
QueryPerformanceCounter( &qwTime );
|
|
#ifdef __PSVITA__
|
|
// AP - get the compressed size via the access function. This uses a special RLE format
|
|
VirtualCompress(NULL,&compLength,pvSaveMem,fileSize);
|
|
#else
|
|
Compression::getCompression()->Compress(NULL,&compLength,pvSaveMem,fileSize);
|
|
#endif
|
|
QueryPerformanceCounter( &qwNewTime );
|
|
|
|
qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
|
|
fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
|
|
|
|
app.DebugPrintf("Check buffer size: Elapsed time %f\n", fElapsedTime);
|
|
PIXEndNamedEvent();
|
|
|
|
// We add 4 bytes to the start so that we can signal compressed data
|
|
// And another 4 bytes to store the decompressed data size
|
|
compLength = compLength+8;
|
|
|
|
// Attempt to allocate the required memory
|
|
compData = (byte *)StorageManager.AllocateSaveData( compLength );
|
|
}
|
|
#endif
|
|
|
|
if(compData != NULL)
|
|
{
|
|
// No compression on PS3 - see comment above
|
|
#ifndef __PS3__
|
|
// Re-compress all save data before we save it to disk
|
|
PIXBeginNamedEvent(0,"Actual save compression");
|
|
// Save the start time
|
|
QueryPerformanceCounter( &qwTime );
|
|
#ifdef __PSVITA__
|
|
// AP - compress via the access function. This uses a special RLE format
|
|
VirtualCompress(compData+8,&compLength,pvSaveMem,fileSize);
|
|
#else
|
|
Compression::getCompression()->Compress(compData+8,&compLength,pvSaveMem,fileSize);
|
|
#endif
|
|
QueryPerformanceCounter( &qwNewTime );
|
|
|
|
qwDeltaTime.QuadPart = qwNewTime.QuadPart - qwTime.QuadPart;
|
|
fElapsedTime = fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart));
|
|
|
|
app.DebugPrintf("Compress: Elapsed time %f\n", fElapsedTime);
|
|
PIXEndNamedEvent();
|
|
|
|
ZeroMemory(compData,8);
|
|
int saveVer = 0;
|
|
memcpy( compData, &saveVer, sizeof(int) );
|
|
memcpy( compData+4, &fileSize, sizeof(int) );
|
|
|
|
app.DebugPrintf("Save data compressed from %d to %d\n", fileSize, compLength);
|
|
#endif
|
|
|
|
PBYTE pbThumbnailData=NULL;
|
|
DWORD dwThumbnailDataSize=0;
|
|
|
|
PBYTE pbDataSaveImage=NULL;
|
|
DWORD dwDataSizeSaveImage=0;
|
|
|
|
#if ( defined _XBOX || defined _DURANGO || defined _WINDOWS64 )
|
|
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize);
|
|
#elif ( defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ )
|
|
app.GetSaveThumbnail(&pbThumbnailData,&dwThumbnailDataSize,&pbDataSaveImage,&dwDataSizeSaveImage);
|
|
#endif
|
|
|
|
BYTE bTextMetadata[88];
|
|
ZeroMemory(bTextMetadata,88);
|
|
|
|
__int64 seed = 0;
|
|
bool hasSeed = false;
|
|
if(MinecraftServer::getInstance()!= NULL && MinecraftServer::getInstance()->levels[0]!=NULL)
|
|
{
|
|
seed = MinecraftServer::getInstance()->levels[0]->getLevelData()->getSeed();
|
|
hasSeed = true;
|
|
}
|
|
|
|
int iTextMetadataBytes = app.CreateImageTextData(bTextMetadata, seed, hasSeed, app.GetGameHostOption(eGameHostOption_All), Minecraft::GetInstance()->getCurrentTexturePackId());
|
|
|
|
INT saveOrCheckpointId = 0;
|
|
bool validSave = StorageManager.GetSaveUniqueNumber(&saveOrCheckpointId);
|
|
TelemetryManager->RecordLevelSaveOrCheckpoint(ProfileManager.GetPrimaryPad(), saveOrCheckpointId, compLength+8);
|
|
|
|
#ifdef _XBOX
|
|
StorageManager.SaveSaveData( compLength+8,pbThumbnailData,dwThumbnailDataSize,bTextMetadata,iTextMetadataBytes );
|
|
delete [] pbThumbnailData;
|
|
#ifndef _CONTENT_PACKAGE
|
|
if( app.DebugSettingsOn())
|
|
{
|
|
if(app.GetWriteSavesToFolderEnabled() )
|
|
{
|
|
DebugFlushToFile(compData, compLength+8);
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
else
|
|
{
|
|
// We have failed to allocate the memory required to save this file. Now what?
|
|
}
|
|
|
|
ReleaseSaveAccess();
|
|
#elif (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined _DURANGO || defined _WINDOWS64)
|
|
// set the icon and save image
|
|
StorageManager.SetSaveImages(pbThumbnailData,dwThumbnailDataSize,pbDataSaveImage,dwDataSizeSaveImage,bTextMetadata,iTextMetadataBytes);
|
|
app.DebugPrintf("Save thumbnail size %d\n",dwThumbnailDataSize);
|
|
|
|
// save the data
|
|
StorageManager.SaveSaveData( &ConsoleSaveFileOriginal::SaveSaveDataCallback, this );
|
|
#ifndef _CONTENT_PACKAGE
|
|
if( app.DebugSettingsOn())
|
|
{
|
|
if(app.GetWriteSavesToFolderEnabled() )
|
|
{
|
|
DebugFlushToFile(compData, compLength+8);
|
|
}
|
|
}
|
|
#endif
|
|
ReleaseSaveAccess();
|
|
}
|
|
#else
|
|
}
|
|
ReleaseSaveAccess();
|
|
#endif
|
|
}
|
|
|
|
#if (defined __PS3__ || defined __ORBIS__ || defined __PSVITA__ || defined _DURANGO || defined _WINDOWS64)
|
|
|
|
int ConsoleSaveFileOriginal::SaveSaveDataCallback(LPVOID lpParam,bool bRes)
|
|
{
|
|
ConsoleSaveFile *pClass=(ConsoleSaveFile *)lpParam;
|
|
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifndef _CONTENT_PACKAGE
|
|
void ConsoleSaveFileOriginal::DebugFlushToFile(void *compressedData /*= NULL*/, unsigned int compressedDataSize /*= 0*/)
|
|
{
|
|
LockSaveAccess();
|
|
|
|
finalizeWrite();
|
|
|
|
unsigned int fileSize = header.GetFileSize();
|
|
|
|
DWORD numberOfBytesWritten = 0;
|
|
#ifdef _XBOX
|
|
File targetFileDir(L"GAME:\\Saves");
|
|
#else
|
|
File targetFileDir(L"Saves");
|
|
#endif // _XBOX
|
|
|
|
if(!targetFileDir.exists())
|
|
targetFileDir.mkdir();
|
|
|
|
wchar_t *fileName = new wchar_t[XCONTENT_MAX_FILENAME_LENGTH+1];
|
|
|
|
SYSTEMTIME t;
|
|
GetSystemTime( &t );
|
|
|
|
//14 chars for the digits
|
|
//11 chars for the separators + suffix
|
|
//25 chars total
|
|
wstring cutFileName = m_fileName;
|
|
if(m_fileName.length() > XCONTENT_MAX_FILENAME_LENGTH - 25)
|
|
{
|
|
cutFileName = m_fileName.substr(0, XCONTENT_MAX_FILENAME_LENGTH - 25);
|
|
}
|
|
swprintf(fileName, XCONTENT_MAX_FILENAME_LENGTH+1, L"\\v%04d-%ls%02d.%02d.%02d.%02d.%02d.mcs",VER_PRODUCTBUILD,cutFileName.c_str(), t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond);
|
|
|
|
#ifdef _UNICODE
|
|
wstring wtemp = targetFileDir.getPath() + wstring(fileName);
|
|
LPCWSTR lpFileName = wtemp.c_str();
|
|
#else
|
|
LPCSTR lpFileName = wstringtofilename( targetFileDir.getPath() + wstring(fileName) );
|
|
#endif
|
|
#ifndef __PSVITA__
|
|
HANDLE hSaveFile = CreateFile( lpFileName, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_FLAG_RANDOM_ACCESS, NULL);
|
|
#endif
|
|
|
|
if(compressedData != NULL && compressedDataSize > 0)
|
|
{
|
|
#ifdef __PSVITA__
|
|
// AP - Use the access function to save
|
|
VirtualWriteFile( lpFileName, compressedData, compressedDataSize, &numberOfBytesWritten, NULL);
|
|
#else
|
|
WriteFile( hSaveFile,compressedData,compressedDataSize,&numberOfBytesWritten,NULL);
|
|
#endif
|
|
assert(numberOfBytesWritten == compressedDataSize);
|
|
}
|
|
else
|
|
{
|
|
#ifdef __PSVITA__
|
|
// AP - Use the access function to save
|
|
VirtualWriteFile( lpFileName, compressedData, compressedDataSize, &numberOfBytesWritten, NULL);
|
|
#else
|
|
WriteFile(hSaveFile,pvSaveMem,fileSize,&numberOfBytesWritten,NULL);
|
|
#endif
|
|
assert(numberOfBytesWritten == fileSize);
|
|
}
|
|
#ifndef __PSVITA__
|
|
CloseHandle( hSaveFile );
|
|
#endif
|
|
|
|
delete[] fileName;
|
|
|
|
ReleaseSaveAccess();
|
|
}
|
|
#endif
|
|
|
|
unsigned int ConsoleSaveFileOriginal::getSizeOnDisk()
|
|
{
|
|
return header.GetFileSize();
|
|
}
|
|
|
|
wstring ConsoleSaveFileOriginal::getFilename()
|
|
{
|
|
return m_fileName;
|
|
}
|
|
|
|
vector<FileEntry *> *ConsoleSaveFileOriginal::getFilesWithPrefix(const wstring &prefix)
|
|
{
|
|
return header.getFilesWithPrefix( prefix );
|
|
}
|
|
|
|
vector<FileEntry *> *ConsoleSaveFileOriginal::getRegionFilesByDimension(unsigned int dimensionIndex)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
#if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
|
|
wstring ConsoleSaveFileOriginal::getPlayerDataFilenameForLoad(const PlayerUID& pUID)
|
|
{
|
|
return header.getPlayerDataFilenameForLoad( pUID );
|
|
}
|
|
wstring ConsoleSaveFileOriginal::getPlayerDataFilenameForSave(const PlayerUID& pUID)
|
|
{
|
|
return header.getPlayerDataFilenameForSave( pUID );
|
|
}
|
|
vector<FileEntry *> *ConsoleSaveFileOriginal::getValidPlayerDatFiles()
|
|
{
|
|
return header.getValidPlayerDatFiles();
|
|
}
|
|
#endif
|
|
|
|
int ConsoleSaveFileOriginal::getSaveVersion()
|
|
{
|
|
return header.getSaveVersion();
|
|
}
|
|
|
|
int ConsoleSaveFileOriginal::getOriginalSaveVersion()
|
|
{
|
|
return header.getOriginalSaveVersion();
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::LockSaveAccess()
|
|
{
|
|
EnterCriticalSection(&m_lock);
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::ReleaseSaveAccess()
|
|
{
|
|
LeaveCriticalSection(&m_lock);
|
|
}
|
|
|
|
ESavePlatform ConsoleSaveFileOriginal::getSavePlatform()
|
|
{
|
|
return header.getSavePlatform();
|
|
}
|
|
|
|
bool ConsoleSaveFileOriginal::isSaveEndianDifferent()
|
|
{
|
|
return header.isSaveEndianDifferent();
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::setLocalPlatform()
|
|
{
|
|
header.setLocalPlatform();
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::setPlatform(ESavePlatform plat)
|
|
{
|
|
header.setPlatform(plat);
|
|
}
|
|
|
|
ByteOrder ConsoleSaveFileOriginal::getSaveEndian()
|
|
{
|
|
return header.getSaveEndian();
|
|
}
|
|
|
|
ByteOrder ConsoleSaveFileOriginal::getLocalEndian()
|
|
{
|
|
return header.getLocalEndian();
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::setEndian(ByteOrder endian)
|
|
{
|
|
header.setEndian(endian);
|
|
}
|
|
|
|
bool ConsoleSaveFileOriginal::isLocalEndianDifferent( ESavePlatform plat )
|
|
{
|
|
return getLocalEndian() != header.getEndian(plat);
|
|
}
|
|
|
|
|
|
void ConsoleSaveFileOriginal::ConvertRegionFile(File sourceFile)
|
|
{
|
|
DWORD numberOfBytesWritten = 0;
|
|
DWORD numberOfBytesRead = 0;
|
|
|
|
RegionFile sourceRegionFile(this, &sourceFile);
|
|
|
|
for(unsigned int x = 0; x < 32; ++x)
|
|
{
|
|
for(unsigned int z = 0; z < 32; ++z)
|
|
{
|
|
DataInputStream *dis = sourceRegionFile.getChunkDataInputStream(x,z);
|
|
|
|
if(dis)
|
|
{
|
|
byteArray inData(1024*1024);
|
|
int read = dis->read(inData);
|
|
dis->close();
|
|
dis->deleteChildStream();
|
|
delete dis;
|
|
|
|
DataOutputStream *dos = sourceRegionFile.getChunkDataOutputStream(x,z);
|
|
dos->write(inData, 0, read);
|
|
|
|
|
|
dos->close();
|
|
dos->deleteChildStream();
|
|
delete dos;
|
|
delete inData.data;
|
|
|
|
}
|
|
|
|
}
|
|
}
|
|
sourceRegionFile.writeAllOffsets(); // saves all the endian swapped offsets back out to the file (not all of these are written in the above processing).
|
|
|
|
}
|
|
|
|
void ConsoleSaveFileOriginal::ConvertToLocalPlatform()
|
|
{
|
|
if(getSavePlatform() == SAVE_FILE_PLATFORM_LOCAL)
|
|
{
|
|
// already in the correct format
|
|
return;
|
|
}
|
|
// convert each of the region files to the local platform
|
|
vector<FileEntry *> *allFilesInSave = getFilesWithPrefix(wstring(L""));
|
|
if ( allFilesInSave )
|
|
{
|
|
for (FileEntry* fe : *allFilesInSave)
|
|
{
|
|
wstring fName(fe->data.filename);
|
|
wstring suffix(L".mcr");
|
|
if (fName.compare(fName.length() - suffix.length(), suffix.length(), suffix) == 0)
|
|
{
|
|
app.DebugPrintf("Processing a region file: %ls\n", fName.c_str());
|
|
ConvertRegionFile(File(fe->data.filename));
|
|
}
|
|
else
|
|
{
|
|
app.DebugPrintf("%ls is not a region file, ignoring\n", fName.c_str());
|
|
}
|
|
}
|
|
}
|
|
|
|
setLocalPlatform(); // set the platform of this save to the local platform, now that it's been coverted
|
|
}
|
|
|
|
void *ConsoleSaveFileOriginal::getWritePointer(FileEntry *file)
|
|
{
|
|
return (char *)pvSaveMem + file->currentFilePointer;;
|
|
}
|