Skip to content

W
wine-winehq
Commit 1d0598b0 authored by Ge van Geldorp's avatar Ge van Geldorp Committed by Alexandre Julliard
Browse files
Options

Swap arguments of LocalAlloc and only update Malloc32 block on

successful allocation.
parent 8d96cd31
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
dlls/ole32/ifs.c
View file @ 1d0598b0
...@@ -73,10 +73,16 @@ static CRITICAL_SECTION IMalloc32_SpyCS = { &critsect_debug, -1, 0, 0, 0, 0 }; ...@@ -73,10 +73,16 @@ static CRITICAL_SECTION IMalloc32_SpyCS = { &critsect_debug, -1, 0, 0, 0, 0 };
/* resize the old table */ /* resize the old table */
static int SetSpyedBlockTableLength ( int NewLength ) static int SetSpyedBlockTableLength ( int NewLength )
{ {
if (!Malloc32.SpyedBlocks) Malloc32.SpyedBlocks = (LPVOID*)LocalAlloc(NewLength, GMEM_ZEROINIT); LPVOID *NewSpyedBlocks;
else Malloc32.SpyedBlocks = (LPVOID*)LocalReAlloc((HLOCAL)Malloc32.SpyedBlocks, NewLength, GMEM_ZEROINIT);
if (!Malloc32.SpyedBlocks) NewSpyedBlocks = LocalAlloc(GMEM_ZEROINIT, NewLength);
else NewSpyedBlocks = LocalReAlloc(Malloc32.SpyedBlocks, NewLength, GMEM_ZEROINIT);
if (NewSpyedBlocks) {
Malloc32.SpyedBlocks = NewSpyedBlocks;
Malloc32.SpyedBlockTableLength = NewLength; Malloc32.SpyedBlockTableLength = NewLength;
return Malloc32.SpyedBlocks ? 1 : 0; }
return NewSpyedBlocks != NULL;
} }
/* add a location to the table */ /* add a location to the table */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment