mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-06 08:54:05 +00:00
comctl32/updown: Use CRT allocation functions.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
parent
a79b761cdd
commit
fca468beb4
|
@ -33,7 +33,6 @@
|
|||
#include "comctl32.h"
|
||||
#include "uxtheme.h"
|
||||
#include "vssym32.h"
|
||||
#include "wine/heap.h"
|
||||
#include "wine/debug.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(updown);
|
||||
|
@ -902,7 +901,7 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
|
|||
{
|
||||
CREATESTRUCTW *pcs = (CREATESTRUCTW*)lParam;
|
||||
|
||||
infoPtr = heap_alloc_zero(sizeof(*infoPtr));
|
||||
infoPtr = calloc(1, sizeof(*infoPtr));
|
||||
SetWindowLongPtrW (hwnd, 0, (DWORD_PTR)infoPtr);
|
||||
|
||||
/* initialize the info struct */
|
||||
|
@ -935,9 +934,9 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
|
|||
break;
|
||||
|
||||
case WM_DESTROY:
|
||||
heap_free (infoPtr->AccelVect);
|
||||
free (infoPtr->AccelVect);
|
||||
UPDOWN_ResetSubclass (infoPtr);
|
||||
heap_free (infoPtr);
|
||||
free (infoPtr);
|
||||
SetWindowLongPtrW (hwnd, 0, 0);
|
||||
theme = GetWindowTheme (hwnd);
|
||||
CloseThemeData (theme);
|
||||
|
@ -1060,12 +1059,12 @@ static LRESULT WINAPI UpDownWindowProc(HWND hwnd, UINT message, WPARAM wParam, L
|
|||
TRACE("UDM_SETACCEL\n");
|
||||
|
||||
if(infoPtr->AccelVect) {
|
||||
heap_free (infoPtr->AccelVect);
|
||||
free (infoPtr->AccelVect);
|
||||
infoPtr->AccelCount = 0;
|
||||
infoPtr->AccelVect = 0;
|
||||
}
|
||||
if(wParam==0) return TRUE;
|
||||
infoPtr->AccelVect = heap_alloc(wParam*sizeof(UDACCEL));
|
||||
infoPtr->AccelVect = malloc(wParam*sizeof(UDACCEL));
|
||||
if(!infoPtr->AccelVect) return FALSE;
|
||||
memcpy(infoPtr->AccelVect, (void*)lParam, wParam*sizeof(UDACCEL));
|
||||
infoPtr->AccelCount = wParam;
|
||||
|
|
Loading…
Reference in a new issue