Mike McCormack : avifil32: Fix some more gcc 4.
1 warnings caused by windowsx.h macros.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 6 12:54:58 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 8723936de63387a9871367848ebbb6487d7a4bf3
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8723936de63387a9871367848ebbb6487d7a4bf3
Author: Mike McCormack <mike at codeweavers.com>
Date: Mon Mar 6 20:33:13 2006 +0900
avifil32: Fix some more gcc 4.1 warnings caused by windowsx.h macros.
---
dlls/avifil32/editstream.c | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c
index eba563a..29f6a4d 100644
--- a/dlls/avifil32/editstream.c
+++ b/dlls/avifil32/editstream.c
@@ -26,7 +26,6 @@
#include "wingdi.h"
#include "winnls.h"
#include "winerror.h"
-#include "windowsx.h"
#include "mmsystem.h"
#include "vfw.h"
@@ -330,11 +329,11 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR
return FALSE;
/* sizes match, now get formats and compare them */
- fmt1 = GlobalAllocPtr(GHND, size1);
+ fmt1 = GlobalLock(GlobalAlloc(GHND, size1));
if (fmt1 == NULL)
return FALSE;
if (SUCCEEDED(AVIStreamReadFormat(avi1, start1, fmt1, &size1))) {
- fmt2 = GlobalAllocPtr(GHND, size1);
+ fmt2 = GlobalLock(GlobalAlloc(GHND, size1));
if (fmt2 != NULL) {
if (SUCCEEDED(AVIStreamReadFormat(avi2, start2, fmt2, &size1)))
status = (memcmp(fmt1, fmt2, size1) == 0);
@@ -342,8 +341,12 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR
}
if (fmt2 != NULL)
- GlobalFreePtr(fmt2);
- GlobalFreePtr(fmt1);
+ {
+ GlobalUnlock(GlobalHandle(fmt2));
+ GlobalFree(GlobalHandle(fmt2));
+ }
+ GlobalUnlock(GlobalHandle(fmt1));
+ GlobalFree(GlobalHandle(fmt1));
return status;
}
@@ -404,7 +407,8 @@ static ULONG WINAPI IAVIEditStream_fnR
if (This->pStreams[i].pStream != NULL)
IAVIStream_Release(This->pStreams[i].pStream);
}
- GlobalFreePtr(This->pStreams);
+ GlobalUnlock(GlobalHandle(This->pStreams));
+ GlobalFree(GlobalHandle(This->pStreams));
}
LocalFree((HLOCAL)This);
@@ -470,8 +474,8 @@ static HRESULT WINAPI IAVIEditStream_fnC
} else {
/* splitting */
if (This->nStreams + 1 >= This->nTableSize) {
- This->pStreams =
- GlobalReAllocPtr(This->pStreams, (This->nTableSize + 32) * sizeof(EditStreamTable), GMEM_SHARE|GHND);
+ GlobalUnlock(GlobalHandle(This->pStreams));
+ This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), (This->nTableSize + 32) * sizeof(EditStreamTable), GMEM_SHARE|GHND));
if (This->pStreams == NULL)
return AVIERR_MEMORY;
This->nTableSize += 32;
@@ -662,8 +666,8 @@ static HRESULT WINAPI IAVIEditStream_fnP
if (This->nStreams + nStreams + 1 > This->nTableSize) {
n = This->nStreams + nStreams + 33;
- This->pStreams =
- GlobalReAllocPtr(This->pStreams, n * sizeof(EditStreamTable), GMEM_SHARE|GHND);
+ GlobalUnlock(GlobalHandle(This->pStreams));
+ This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), n * sizeof(EditStreamTable), GMEM_SHARE|GHND));
if (This->pStreams == NULL)
return AVIERR_MEMORY;
This->nTableSize = n;
@@ -752,7 +756,8 @@ static HRESULT WINAPI IAVIEditStream_fnC
if (pEdit == NULL)
return AVIERR_MEMORY;
if (This->nStreams > pEdit->nTableSize) {
- pEdit->pStreams = GlobalReAllocPtr(pEdit->pStreams, This->nStreams * sizeof(EditStreamTable),GMEM_SHARE|GHND);
+ GlobalUnlock(GlobalHandle(pEdit->pStreams));
+ pEdit->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(pEdit->pStreams), This->nStreams * sizeof(EditStreamTable), GMEM_SHARE|GHND));
if (pEdit->pStreams == NULL)
return AVIERR_MEMORY;
pEdit->nTableSize = This->nStreams;
@@ -841,7 +846,7 @@ static HRESULT WINAPI IEditAVIStream_fnC
if (This->pStreams == NULL) {
This->pStreams =
- GlobalAllocPtr(GMEM_SHARE|GHND, 256 * sizeof(EditStreamTable));
+ GlobalLock(GlobalAlloc(GMEM_SHARE|GHND, 256 * sizeof(EditStreamTable)));
if (This->pStreams == NULL)
return AVIERR_MEMORY;
This->nTableSize = 256;
More information about the wine-cvs
mailing list