Module: wine Branch: master Commit: 537bcadbe8e8254b27a95641dd677d6d26841021 URL: https://gitlab.winehq.org/wine/wine/-/commit/537bcadbe8e8254b27a95641dd677d6...
Author: Alex Henrie alexhenrie24@gmail.com Date: Thu Sep 7 17:36:12 2023 -0600
wintab32: Use CRT allocation functions.
---
dlls/wintab32/context.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 58ba6b49074..b432e902a09 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -423,10 +423,10 @@ static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) else if (is_string_field(wCategory, nIndex) && !bUnicode) { int size = pWTInfoW(wCategory, nIndex, NULL); - WCHAR *buf = HeapAlloc(GetProcessHeap(), 0, size); + WCHAR *buf = malloc(size); pWTInfoW(wCategory, nIndex, buf); result = WideCharToMultiByte(CP_ACP, 0, buf, size/sizeof(WCHAR), lpOutput, lpOutput ? 2*size : 0, NULL, NULL); - HeapFree(GetProcessHeap(), 0, buf); + free(buf); } else result = pWTInfoW(wCategory, nIndex, lpOutput); @@ -464,13 +464,13 @@ HCTX WINAPI WTOpenW(HWND hWnd, LPLOGCONTEXTW lpLogCtx, BOOL fEnable) TRACE("hWnd=%p, lpLogCtx=%p, fEnable=%u\n", hWnd, lpLogCtx, fEnable); DUMPCONTEXT(*lpLogCtx);
- newcontext = HeapAlloc(GetProcessHeap(), 0 , sizeof(OPENCONTEXT)); + newcontext = malloc(sizeof(OPENCONTEXT)); newcontext->context = *lpLogCtx; newcontext->hwndOwner = hWnd; newcontext->ActiveCursor = -1; newcontext->QueueSize = 10; newcontext->PacketsQueued = 0; - newcontext->PacketQueue=HeapAlloc(GetProcessHeap(),0,sizeof(WTPACKET)*10); + newcontext->PacketQueue = malloc(sizeof(WTPACKET) * 10);
EnterCriticalSection(&csTablet); newcontext->handle = gTopContext++; @@ -547,8 +547,8 @@ BOOL WINAPI WTClose(HCTX hCtx) TABLET_PostTabletMessage(context, _WT_CTXCLOSE(context->context.lcMsgBase), (WPARAM)context->handle, context->context.lcStatus,TRUE);
- HeapFree(GetProcessHeap(),0,context->PacketQueue); - HeapFree(GetProcessHeap(),0,context); + free(context->PacketQueue); + free(context);
return TRUE; } @@ -1124,8 +1124,7 @@ BOOL WINAPI WTQueueSizeSet(HCTX hCtx, int nPkts) return FALSE; }
- context->PacketQueue = HeapReAlloc(GetProcessHeap(), 0, - context->PacketQueue, sizeof(WTPACKET)*nPkts); + context->PacketQueue = realloc(context->PacketQueue, sizeof(WTPACKET) * nPkts);
context->QueueSize = nPkts; LeaveCriticalSection(&csTablet);