Mike McCormack : msrle32: Fix some gcc 4.
1 warnings caused by casts in windowsx.h macros.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 3 08:47:23 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 29c3a54339f2041169cf3831b6829b3dad4bd3da
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29c3a54339f2041169cf3831b6829b3dad4bd3da
Author: Mike McCormack <mike at codeweavers.com>
Date: Fri Mar 3 12:26:36 2006 +0900
msrle32: Fix some gcc 4.1 warnings caused by casts in windowsx.h macros.
---
dlls/msrle32/msrle32.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c
index 3fb6c62..6f44048 100644
--- a/dlls/msrle32/msrle32.c
+++ b/dlls/msrle32/msrle32.c
@@ -27,7 +27,6 @@
#include "winnls.h"
#include "winuser.h"
-#include "windowsx.h"
#include "wine/debug.h"
@@ -1387,10 +1386,10 @@ static LRESULT CompressBegin(CodecInfo *
CompressEnd(pi);
size = WIDTHBYTES(lpbiOut->biWidth * 16) / 2 * lpbiOut->biHeight;
- pi->pPrevFrame = (LPWORD)GlobalAllocPtr(GPTR, size * sizeof(WORD));
+ pi->pPrevFrame = GlobalLock(GlobalAlloc(GPTR, size * sizeof(WORD)));
if (pi->pPrevFrame == NULL)
return ICERR_MEMORY;
- pi->pCurFrame = (LPWORD)GlobalAllocPtr(GPTR, size * sizeof(WORD));
+ pi->pCurFrame = GlobalLock(GlobalAlloc(GPTR, size * sizeof(WORD)));
if (pi->pCurFrame == NULL) {
CompressEnd(pi);
return ICERR_MEMORY;
@@ -1534,9 +1533,15 @@ static LRESULT CompressEnd(CodecInfo *pi
if (pi != NULL) {
if (pi->pPrevFrame != NULL)
- GlobalFreePtr(pi->pPrevFrame);
+ {
+ GlobalUnlock(GlobalHandle(pi->pPrevFrame));
+ GlobalFree(GlobalHandle(pi->pPrevFrame));
+ }
if (pi->pCurFrame != NULL)
- GlobalFreePtr(pi->pCurFrame);
+ {
+ GlobalUnlock(GlobalHandle(pi->pCurFrame));
+ GlobalFree(GlobalHandle(pi->pCurFrame));
+ }
pi->pPrevFrame = NULL;
pi->pCurFrame = NULL;
pi->nPrevFrame = -1;
More information about the wine-cvs
mailing list