Update DS2_ReplaceServerAddressHook.cpp #220
Conversation
fix for wine check in ds2, if you are running in wine(proton) ignore check for memory safety features that aren't supported
|
This is great, you are goated! Hopefully some more people can test it, I could not get it to build. |
.github/workflows/release.yml
Outdated
There was a problem hiding this comment.
Whats the reason for this change?
There was a problem hiding this comment.
my bad, it was only for running in my GitHub action to test the package, didn't mean to commit this, i will re-add the code
| { | ||
| continue; | ||
| //if i'm not running in wine do the check | ||
| if (winePrefix == nullptr) { |
There was a problem hiding this comment.
couple of coding style issues:
- braces go on next line
- comments start with a space and a capital letter
- variables are in PascalCase not camelCase
| continue; | ||
| //if i'm not running in wine do the check | ||
| if (winePrefix == nullptr) { | ||
| Log("you are using windows"); |
There was a problem hiding this comment.
Can you remove this please, it isn't needed.
| if (VirtualQuery((void*)key, &info, sizeof(info)) == 0 || | ||
| ((info.Protect & PAGE_READWRITE) == 0 && (info.Protect & PAGE_EXECUTE_READWRITE) == 0)) | ||
| // If the programm is running on wine | ||
| if(winePrefix != nullptr) |
There was a problem hiding this comment.
space after if please, also the comment doesn't really add anything, please remove it.
| { | ||
| continue; | ||
| Log("you are using wine"); |
| { | ||
| continue; | ||
| Log("you are using wine"); | ||
| if (VirtualQuery((void*)key, &info, sizeof(info)) == 0) //wine doesn't emulate memory seafe features of windows {il TroncoNinja e' stato qui} |
There was a problem hiding this comment.
Comment on previous line please - also please stick to english, even if its just a fun tag :)
| { | ||
| continue; | ||
| Log("you are using wine"); | ||
| if (VirtualQuery((void*)key, &info, sizeof(info)) == 0) //wine doesn't emulate memory seafe features of windows {il TroncoNinja e' stato qui} |
There was a problem hiding this comment.
I'm curious, what does wine actually return for the protection flags? I would expect it to return the same values as windows, as I can see a whole slew of compatibility issues if that wasn't the case.
There was a problem hiding this comment.
the Flags are all correct, as far as my testing goes, the problem is in the info struct, more specifically the changes made in the info.Protect (in windows info.Protect=64, in wine/proton info.Protect = 128). The memory seems to have the PAGE_EXECUTE_WRITECOPY flag instead of PAGE_EXECUTE_READWRITE. the flags for memory safety in linux are different, as far as my research goes, wine has problems(design) translating the flags/translating memory managment
|
Thanks for the PR! I left a handful of minor style comments, if you could fix those I'll happily merge this. |
|
Merged in the pull request, sorry for the delay! |
fix for wine check in ds2, if you are running in wine(proton) ignore check for memory safety features that aren't supported.
the injector file compiled in this version was also tested with the 41.0 version (currently working on linux for the official unofficial server only)