fix(rage-device/five): Error out on cloud files #1234
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The issue: The application seems to get stuck in a loop when cloud files are accessed, this is caused by users installing their GTA on the cloud, causing the game to neither load, nor 'gracefully' exit. The solution: To correct this, we simply get the file attributes and check if the following flag is set: `FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS`. If it's set, we return an invalid handle, so it's passed down the stack. Once this errors, `FatalError` under `OpenArchiveWrap` will be triggered. I have modified the message so any affected clients are notified in the event this occurs.
jakub-cfx
requested changes
Nov 7, 2023
| @@ -40,6 +40,14 @@ static decltype(&CreateFileW) createFileW; | |||
|
|
|||
| static HANDLE WINAPI CreateFileWDummy(_In_ LPCWSTR lpFileName, _In_ DWORD dwDesiredAccess, _In_ DWORD dwShareMode, _In_opt_ LPSECURITY_ATTRIBUTES lpSecurityAttributes, _In_ DWORD dwCreationDisposition, _In_ DWORD dwFlagsAndAttributes, _In_opt_ HANDLE hTemplateFile) | |||
There was a problem hiding this comment.
I think CreateFileWDummy could use a rename to something that reflects its new purpose (e.g. CreateFileWNoRecallFlag) now that it's no longer just a simple/dummy forwarder of the call
| @@ -48,8 +56,6 @@ static void ResetPackfile(const char* archive) | |||
| // if this is update.rpf, maybe we should do something about that? | |||
| if (strcmp(archive, "update/update.rpf") == 0) | |||
| { | |||
| createFileW = hook::iat("kernel32.dll", CreateFileWDummy, "CreateFileW"); | |||
|
|
|||
| HANDLE hFile = createFileW(L"update/update.rpf", GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL); | |||
There was a problem hiding this comment.
Just to double check, is calling the original CreateFileW intended here or should that also be piped through the hook?
jakub-cfx
approved these changes
Jul 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The issue:
The application seems to get stuck in a loop when cloud files are
accessed, this is caused by users installing their GTA on the cloud,
causing the game to neither load, nor 'gracefully' exit.
The solution:
To correct this, we simply get the file attributes and check if
the following flag is set:
FILE_ATTRIBUTE_RECALL_ON_DATA_ACCESS. Ifit's set, we return an invalid handle, so it's passed down the stack.
Once this errors,
FatalErrorunderOpenArchiveWrapwill betriggered. I have modified the message so any affected clients are
notified in the event this occurs.