From e8ffab62e822b6d86b353aa65373e7053644543a Mon Sep 17 00:00:00 2001 From: Peter Hunnisett Date: Sun, 24 Oct 1999 17:27:12 +0000 Subject: [PATCH] Added macro definitions for memory allocation. --- include/windowsx.h | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/include/windowsx.h b/include/windowsx.h index 7e28af68ebe..41389648e83 100644 --- a/include/windowsx.h +++ b/include/windowsx.h @@ -1,14 +1,12 @@ /* Copyright (C) 1999 Corel Corporation (Paul Quinn) */ -#ifndef __WINE_WINDOWSX_H -#define __WINE_WINDOWSX_H - +#ifndef _INC_WINDOWSX +#define _INC_WINDOWSX + #ifdef __cplusplus extern "C" { #endif -#define _INC_WINDOWSX - #define GET_WM_VSCROLL_CODE(wp, lp) LOWORD(wp) #define GET_WM_VSCROLL_POS(wp, lp) HIWORD(wp) #define GET_WM_VSCROLL_HWND(wp, lp) (HWND)(lp) @@ -33,6 +31,17 @@ extern "C" { #define GET_WM_VKEYTOITEM_HWND(wp, lp) (HWND)(lp) #define GET_WM_VKEYTOITEM_MPS(code, item, hwnd) (WPARAM)MAKELONG(item, code), (LONG)(hwnd) +/****** KERNEL Macro APIs ******************************************************/ + +#define GetInstanceModule(hInst) (GetModuleHandle((LPCSTR)MAKELP(0, hInst))) +#define GlobalPtrHandle(lp) ((HGLOBAL)LOWORD(GlobalHandle(SELECTOROF(lp)))) +#define GlobalLockPtr(lp) ((BOOL)SELECTOROF(GlobalLock(GlobalPtrHandle(lp)))) +#define GlobalUnlockPtr(lp) (GlobalUnlock(GlobalPtrHandle(lp))) +#define GlobalAllocPtr(flags,cb) (GlobalLock(GlobalAlloc((flags), (cb)))) +#define GlobalReAllocPtr(lp, cbNew, flags) (GlobalUnlockPtr(lp), \ + GlobalLock(GlobalReAlloc(GlobalPtrHandle(lp) , (cbNew), (flags)))) +#define GlobalFreePtr(lp) (GlobalUnlockPtr(lp), (BOOL)GlobalFree(GlobalPtrHandle(lp))) + /****** USER Macro APIs ******************************************************/ #define GetWindowInstance(hwnd) ((HMODULE)GetWindowLong(hwnd, GWL_HINSTANCE))