Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

f4sefix from @hdmap #7

Open
wants to merge 2 commits into
base: proton_3.7
Choose a base branch
from
Open

f4sefix from @hdmap #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e3edab
f4sefix from @hdmap
Aug 23, 2018
bcd6bb9
Patch of Exile partial fix
Aug 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dlls/ntdll/virtual.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,11 +1387,11 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, SIZE_T m
server_enter_uninterrupted_section( &csVirtual, &sigset );

if (base >= (char *)address_space_start) /* make sure the DOS area remains free */
status = map_view( &view, base, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE |
status = map_view( &view, base, total_size, mask, TRUE, SEC_IMAGE | SEC_FILE |
VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY );

if (status != STATUS_SUCCESS)
status = map_view( &view, NULL, total_size, mask, FALSE, SEC_IMAGE | SEC_FILE |
status = map_view( &view, NULL, total_size, mask, TRUE, SEC_IMAGE | SEC_FILE |
VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY );

if (status != STATUS_SUCCESS) goto error;
Expand Down Expand Up @@ -2750,7 +2750,7 @@ static int get_free_mem_state_callback( void *start, size_t size, void *arg )
MEMORY_BASIC_INFORMATION *info = arg;
void *end = (char *)start + size;

if ((char *)info->BaseAddress + info->RegionSize < (char *)start) return 0;
if ((char *)info->BaseAddress + info->RegionSize <= (char *)start) return 0;

if (info->BaseAddress >= end)
{
Expand Down
1 change: 1 addition & 0 deletions dlls/ole32/compobj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3237,6 +3237,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstance(
{
MULTI_QI multi_qi = { iid };
HRESULT hres;
CoInitialize(NULL);

TRACE("(rclsid=%s, pUnkOuter=%p, dwClsContext=%08x, riid=%s, ppv=%p)\n", debugstr_guid(rclsid),
pUnkOuter, dwClsContext, debugstr_guid(iid), ppv);
Expand Down