March 2006 - Wine-commits - list.winehq.org

Mike McCormack : avifil32: Use HeapAlloc instead of Global/LocalAlloc.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: dfb5aaf31a26f82200f19dd7ba97805d27f5eee7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfb5aaf31a26f82200f19dd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:42:50 2006 +0900 avifil32: Use HeapAlloc instead of Global/LocalAlloc. --- dlls/avifil32/editstream.c | 33 +++++++++++++-------------------- 1 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 29f6a4d..858ddb7 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -187,7 +187,7 @@ PAVIEDITSTREAM AVIFILE_CreateEditStream( { IAVIEditStreamImpl *pedit = NULL; - pedit = (IAVIEditStreamImpl*)LocalAlloc(LPTR,sizeof(IAVIEditStreamImpl)); + pedit = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIEditStreamImpl)); if (pedit == NULL) return NULL; @@ -329,11 +329,11 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR return FALSE; /* sizes match, now get formats and compare them */ - fmt1 = GlobalLock(GlobalAlloc(GHND, size1)); + fmt1 = HeapAlloc(GetProcessHeap(), 0, size1); if (fmt1 == NULL) return FALSE; if (SUCCEEDED(AVIStreamReadFormat(avi1, start1, fmt1, &size1))) { - fmt2 = GlobalLock(GlobalAlloc(GHND, size1)); + fmt2 = HeapAlloc(GetProcessHeap(), 0, size1); if (fmt2 != NULL) { if (SUCCEEDED(AVIStreamReadFormat(avi2, start2, fmt2, &size1))) status = (memcmp(fmt1, fmt2, size1) == 0); @@ -341,12 +341,8 @@ static BOOL AVIFILE_FormatsEqual(PAVISTR } if (fmt2 != NULL) - { - GlobalUnlock(GlobalHandle(fmt2)); - GlobalFree(GlobalHandle(fmt2)); - } - GlobalUnlock(GlobalHandle(fmt1)); - GlobalFree(GlobalHandle(fmt1)); + HeapFree(GetProcessHeap(), 0, fmt2); + HeapFree(GetProcessHeap(), 0, fmt1); return status; } @@ -407,11 +403,10 @@ static ULONG WINAPI IAVIEditStream_fnR if (This->pStreams[i].pStream != NULL) IAVIStream_Release(This->pStreams[i].pStream); } - GlobalUnlock(GlobalHandle(This->pStreams)); - GlobalFree(GlobalHandle(This->pStreams)); + HeapFree(GetProcessHeap(), 0, This->pStreams); } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); return 0; } return ref; @@ -474,8 +469,8 @@ static HRESULT WINAPI IAVIEditStream_fnC } else { /* splitting */ if (This->nStreams + 1 >= This->nTableSize) { - GlobalUnlock(GlobalHandle(This->pStreams)); - This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), (This->nTableSize + 32) * sizeof(EditStreamTable), GMEM_SHARE|GHND)); + This->pStreams = HeapReAlloc(GetProcessHeap(), 0, This->pStreams, + (This->nTableSize + 32) * sizeof(EditStreamTable)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize += 32; @@ -666,8 +661,7 @@ static HRESULT WINAPI IAVIEditStream_fnP if (This->nStreams + nStreams + 1 > This->nTableSize) { n = This->nStreams + nStreams + 33; - GlobalUnlock(GlobalHandle(This->pStreams)); - This->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(This->pStreams), n * sizeof(EditStreamTable), GMEM_SHARE|GHND)); + This->pStreams = HeapReAlloc(GetProcessHeap(), 0, This->pStreams, n * sizeof(EditStreamTable)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize = n; @@ -756,8 +750,8 @@ static HRESULT WINAPI IAVIEditStream_fnC if (pEdit == NULL) return AVIERR_MEMORY; if (This->nStreams > pEdit->nTableSize) { - GlobalUnlock(GlobalHandle(pEdit->pStreams)); - pEdit->pStreams = GlobalLock(GlobalReAlloc(GlobalHandle(pEdit->pStreams), This->nStreams * sizeof(EditStreamTable), GMEM_SHARE|GHND)); + pEdit->pStreams = HeapReAlloc(GetProcessHeap(), 0, pEdit->pStreams, + This->nStreams * sizeof(EditStreamTable)); if (pEdit->pStreams == NULL) return AVIERR_MEMORY; pEdit->nTableSize = This->nStreams; @@ -845,8 +839,7 @@ static HRESULT WINAPI IEditAVIStream_fnC return AVIERR_ERROR; if (This->pStreams == NULL) { - This->pStreams = - GlobalLock(GlobalAlloc(GMEM_SHARE|GHND, 256 * sizeof(EditStreamTable))); + This->pStreams = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(EditStreamTable)); if (This->pStreams == NULL) return AVIERR_MEMORY; This->nTableSize = 256;

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of LocalAlloc.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 9d5b2ea5a2d328a87350e46f9caeb039d5f6b84b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d5b2ea5a2d328a87350e46… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:43:06 2006 +0900 avifil32: Use HeapAlloc instead of LocalAlloc. --- dlls/avifil32/avifile.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index d407445..c6f4827 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -240,7 +240,7 @@ HRESULT AVIFILE_CreateAVIFile(REFIID rii *ppv = NULL; - pfile = (IAVIFileImpl*)LocalAlloc(LPTR, sizeof(IAVIFileImpl)); + pfile = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIFileImpl)); if (pfile == NULL) return AVIERR_MEMORY; @@ -251,7 +251,7 @@ HRESULT AVIFILE_CreateAVIFile(REFIID rii hr = IAVIFile_QueryInterface((IAVIFile*)pfile, riid, ppv); if (FAILED(hr)) - LocalFree((HLOCAL)pfile); + HeapFree(GetProcessHeap(), 0, pfile); return hr; } @@ -310,7 +310,7 @@ static ULONG WINAPI IAVIFile_fnRelease(I This->ppStreams[i]->ref, i, This->ppStreams[i]); } AVIFILE_DestructAVIStream(This->ppStreams[i]); - LocalFree((HLOCAL)This->ppStreams[i]); + HeapFree(GetProcessHeap(), 0, This->ppStreams[i]); This->ppStreams[i] = NULL; } } @@ -328,7 +328,7 @@ static ULONG WINAPI IAVIFile_fnRelease(I } if (This->szFileName != NULL) { - LocalFree((HLOCAL)This->szFileName); + HeapFree(GetProcessHeap(), 0, This->szFileName); This->szFileName = NULL; } if (This->hmmio != NULL) { @@ -336,7 +336,7 @@ static ULONG WINAPI IAVIFile_fnRelease(I This->hmmio = NULL; } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); } return ref; } @@ -422,7 +422,7 @@ static HRESULT WINAPI IAVIFile_fnCreateS /* now it seems to be save to add the stream */ assert(This->ppStreams[n] == NULL); - This->ppStreams[n] = (IAVIStreamImpl*)LocalAlloc(LPTR, + This->ppStreams[n] = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIStreamImpl)); if (This->ppStreams[n] == NULL) return AVIERR_MEMORY; @@ -539,7 +539,7 @@ static HRESULT WINAPI IAVIFile_fnDeleteS if (nStream < This->fInfo.dwStreams && This->ppStreams[nStream] != NULL) { /* ... so delete it now */ - LocalFree((HLOCAL)This->ppStreams[nStream]); + HeapFree(GetProcessHeap(), 0, This->ppStreams[nStream]); if (This->fInfo.dwStreams - nStream > 0) memcpy(This->ppStreams + nStream, This->ppStreams + nStream + 1, @@ -630,7 +630,7 @@ static HRESULT WINAPI IPersistFile_fnLoa This->paf->uMode = dwMode; len = lstrlenW(pszFileName) + 1; - This->paf->szFileName = (LPWSTR)LocalAlloc(LPTR, len * sizeof(WCHAR)); + This->paf->szFileName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (This->paf->szFileName == NULL) return AVIERR_MEMORY; lstrcpyW(This->paf->szFileName, pszFileName); @@ -644,7 +644,7 @@ static HRESULT WINAPI IPersistFile_fnLoa len = WideCharToMultiByte(CP_ACP, 0, This->paf->szFileName, -1, NULL, 0, NULL, NULL); - szFileName = LocalAlloc(LPTR, len * sizeof(CHAR)); + szFileName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(CHAR)); if (szFileName == NULL) return AVIERR_MEMORY; @@ -652,7 +652,7 @@ static HRESULT WINAPI IPersistFile_fnLoa len, NULL, NULL); This->paf->hmmio = mmioOpenA(szFileName, NULL, MMIO_ALLOCBUF | dwMode); - LocalFree((HLOCAL)szFileName); + HeapFree(GetProcessHeap(), 0, szFileName); if (This->paf->hmmio == NULL) return AVIERR_FILEOPEN; } @@ -1676,7 +1676,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFile if (ckLIST2.ckid == FOURCC_LIST && ckLIST2.fccType == listtypeSTREAMHEADER) { pStream = This->ppStreams[nStream] = - (IAVIStreamImpl*)LocalAlloc(LPTR, sizeof(IAVIStreamImpl)); + HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIStreamImpl)); if (pStream == NULL) return AVIERR_MEMORY; AVIFILE_ConstructAVIStream(This, nStream, NULL); @@ -1797,20 +1797,20 @@ static HRESULT AVIFILE_LoadFile(IAVIFile break; case ckidSTREAMNAME: { /* streamname will be saved as ASCII string */ - LPSTR str = (LPSTR)LocalAlloc(LMEM_FIXED, ck.cksize); + LPSTR str = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (str == NULL) return AVIERR_MEMORY; if (mmioRead(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEREAD; } MultiByteToWideChar(CP_ACP, 0, str, -1, pStream->sInfo.szName, sizeof(pStream->sInfo.szName)/sizeof(pStream->sInfo.szName[0])); - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); } break; case ckidAVIPADDING: @@ -2250,18 +2250,18 @@ static HRESULT AVIFILE_SaveFile(IAVIFile return AVIERR_FILEWRITE; /* the streamname must be saved in ASCII not Unicode */ - str = (LPSTR)LocalAlloc(LPTR, ck.cksize); + str = HeapAlloc(GetProcessHeap(), 0, ck.cksize); if (str == NULL) return AVIERR_MEMORY; WideCharToMultiByte(CP_ACP, 0, pStream->sInfo.szName, -1, str, ck.cksize, NULL, NULL); if (mmioWrite(This->hmmio, (HPSTR)str, ck.cksize) != ck.cksize) { - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); return AVIERR_FILEWRITE; } - LocalFree((HLOCAL)str); + HeapFree(GetProcessHeap(), 0, str); if (mmioAscend(This->hmmio, &ck, 0) != S_OK) return AVIERR_FILEWRITE; }

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of LocalAlloc. Make sure to free the memory.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 8ed1ca3e4b6e1eeaa4419992843ad7f481b1c0cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8ed1ca3e4b6e1eeaa441999… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:41:37 2006 +0900 avifil32: Use HeapAlloc instead of LocalAlloc. Make sure to free the memory. --- dlls/avifil32/factory.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index b1f95ab..c1fb3b3 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -75,7 +75,7 @@ static HRESULT AVIFILE_CreateClassFactor *ppv = NULL; - pClassFactory = (IClassFactoryImpl*)LocalAlloc(LPTR, sizeof(*pClassFactory)); + pClassFactory = HeapAlloc(GetProcessHeap(), 0, sizeof(*pClassFactory)); if (pClassFactory == NULL) return E_OUTOFMEMORY; @@ -85,7 +85,7 @@ static HRESULT AVIFILE_CreateClassFactor hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv); if (FAILED(hr)) { - LocalFree((HLOCAL)pClassFactory); + HeapFree(GetProcessHeap(), 0, pClassFactory); *ppv = NULL; } @@ -124,6 +124,8 @@ static ULONG WINAPI IClassFactory_fnRele if ((--(This->dwRef)) > 0) return This->dwRef; + HeapFree(GetProcessHeap(), 0, This); + return 0; }

1 0

Mike McCormack : avifil32: Use HeapAlloc/Free instead of LocalAlloc/Free.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: a4b816c7529a15b906f5d192120da67742a80a6c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a4b816c7529a15b906f5d19… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:41:16 2006 +0900 avifil32: Use HeapAlloc/Free instead of LocalAlloc/Free. --- dlls/avifil32/tmpfile.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 5968103..95f691f 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -26,7 +26,6 @@ #include "winuser.h" #include "winnls.h" #include "winerror.h" -#include "windowsx.h" #include "mmsystem.h" #include "vfw.h" @@ -77,7 +76,7 @@ PAVIFILE AVIFILE_CreateAVITempFile(int n ITmpFileImpl *tmpFile; int i; - tmpFile = LocalAlloc(LPTR, sizeof(ITmpFileImpl)); + tmpFile = HeapAlloc(GetProcessHeap(), 0, sizeof(ITmpFileImpl)); if (tmpFile == NULL) return NULL; @@ -86,9 +85,9 @@ PAVIFILE AVIFILE_CreateAVITempFile(int n memset(&tmpFile->fInfo, 0, sizeof(tmpFile->fInfo)); tmpFile->fInfo.dwStreams = nStreams; - tmpFile->ppStreams = LocalAlloc(LPTR, nStreams * sizeof(PAVISTREAM)); + tmpFile->ppStreams = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(PAVISTREAM)); if (tmpFile->ppStreams == NULL) { - LocalFree((HLOCAL)tmpFile); + HeapFree(GetProcessHeap(), 0, tmpFile); return NULL; } @@ -177,7 +176,7 @@ static ULONG WINAPI ITmpFile_fnRelease } } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); return 0; }

1 0

Mike McCormack : avifil32: Use HeapAlloc instead of GlobalAlloc/LocalAlloc.
by Alexandre Julliard 13 Mar '06

13 Mar '06

Module: wine Branch: refs/heads/master Commit: 4fa92f65e7ee498d687cacdb4ed06fb4c53dc53d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fa92f65e7ee498d687cacd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 14:42:14 2006 +0900 avifil32: Use HeapAlloc instead of GlobalAlloc/LocalAlloc. --- dlls/avifil32/acmstream.c | 48 ++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 31 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 6ffe416..96d49b0 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -115,7 +115,7 @@ HRESULT AVIFILE_CreateACMStream(REFIID r *ppv = NULL; - pstream = (IAVIStreamImpl*)LocalAlloc(LPTR, sizeof(IAVIStreamImpl)); + pstream = HeapAlloc(GetProcessHeap(), 0, sizeof(IAVIStreamImpl)); if (pstream == NULL) return AVIERR_MEMORY; @@ -123,7 +123,7 @@ HRESULT AVIFILE_CreateACMStream(REFIID r hr = IAVIStream_QueryInterface((IAVIStream*)pstream, riid, ppv); if (FAILED(hr)) - LocalFree((HLOCAL)pstream); + HeapFree(GetProcessHeap(), 0, pstream); return hr; } @@ -176,24 +176,20 @@ static ULONG WINAPI ACMStream_fnRelease( This->has = NULL; } if (This->acmStreamHdr.pbSrc != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc); This->acmStreamHdr.pbSrc = NULL; } if (This->acmStreamHdr.pbDst != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbDst); This->acmStreamHdr.pbDst = NULL; } if (This->lpInFormat != NULL) { - GlobalUnlock(GlobalHandle(This->lpInFormat)); - GlobalFree(GlobalHandle(This->lpInFormat)); + HeapFree(GetProcessHeap(), 0, This->lpInFormat); This->lpInFormat = NULL; This->cbInFormat = 0; } if (This->lpOutFormat != NULL) { - GlobalUnlock(GlobalHandle(This->lpOutFormat)); - GlobalFree(GlobalHandle(This->lpOutFormat)); + HeapFree(GetProcessHeap(), 0, This->lpOutFormat); This->lpOutFormat = NULL; This->cbOutFormat = 0; } @@ -201,7 +197,7 @@ static ULONG WINAPI ACMStream_fnRelease( IAVIStream_Release(This->pStream); This->pStream = NULL; } - LocalFree((HLOCAL)This); + HeapFree(GetProcessHeap(), 0, This); return 0; } @@ -253,7 +249,7 @@ static HRESULT WINAPI ACMStream_fnCreate else This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); + This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); if (This->lpOutFormat == NULL) return AVIERR_MEMORY; @@ -386,7 +382,7 @@ static HRESULT WINAPI ACMStream_fnSetFor if ((This->sInfo.dwCaps & AVIFILECAPS_CANWRITE) == 0) return AVIERR_READONLY; - This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, formatsize)); + This->lpInFormat = HeapAlloc(GetProcessHeap(), 0, formatsize); if (This->lpInFormat == NULL) return AVIERR_MEMORY; This->cbInFormat = formatsize; @@ -466,8 +462,7 @@ static HRESULT WINAPI ACMStream_fnRead(I /* Need to free destination buffer used for writing? */ if (This->acmStreamHdr.pbDst != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbDst)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbDst); This->acmStreamHdr.pbDst = NULL; This->acmStreamHdr.dwDstUser = 0; } @@ -476,13 +471,9 @@ static HRESULT WINAPI ACMStream_fnRead(I if (This->acmStreamHdr.pbSrc == NULL || This->acmStreamHdr.dwSrcUser < size) { if (This->acmStreamHdr.pbSrc == NULL) - This->acmStreamHdr.pbSrc = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); + This->acmStreamHdr.pbSrc = HeapAlloc(GetProcessHeap(), 0, size); else - { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); - This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbSrc), - size, GMEM_MOVEABLE); - } + This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc, size); if (This->acmStreamHdr.pbSrc == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwSrcUser = size; @@ -574,8 +565,7 @@ static HRESULT WINAPI ACMStream_fnWrite( /* Need to free source buffer used for reading? */ if (This->acmStreamHdr.pbSrc != NULL) { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbSrc)); - GlobalFree(GlobalHandle(This->acmStreamHdr.pbSrc)); + HeapFree(GetProcessHeap(), 0, This->acmStreamHdr.pbSrc); This->acmStreamHdr.pbSrc = NULL; This->acmStreamHdr.dwSrcUser = 0; } @@ -584,13 +574,9 @@ static HRESULT WINAPI ACMStream_fnWrite( if (This->acmStreamHdr.pbDst == NULL || This->acmStreamHdr.dwDstUser < size) { if (This->acmStreamHdr.pbDst == NULL) - This->acmStreamHdr.pbDst = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, size)); + This->acmStreamHdr.pbDst = HeapAlloc(GetProcessHeap(), 0, size); else - { - GlobalUnlock(GlobalHandle(This->acmStreamHdr.pbDst)); - This->acmStreamHdr.pbDst = GlobalReAlloc(GlobalHandle(This->acmStreamHdr.pbDst), - size, GMEM_MOVEABLE); - } + This->acmStreamHdr.pbDst = HeapReAlloc(GetProcessHeap(), 0, This->acmStreamHdr.pbDst, size); if (This->acmStreamHdr.pbDst == NULL) return AVIERR_MEMORY; This->acmStreamHdr.dwDstUser = size; @@ -714,7 +700,7 @@ static HRESULT AVIFILE_OpenCompressor(IA hr = AVIStreamFormatSize(This->pStream, This->sInfo.dwStart, &This->cbInFormat); if (FAILED(hr)) return hr; - This->lpInFormat = GlobalLock(GlobalAlloc(GMEM_MOVEABLE, This->cbInFormat)); + This->lpInFormat = HeapAlloc(GetProcessHeap(), 0, This->cbInFormat); if (This->lpInFormat == NULL) return AVIERR_MEMORY; @@ -726,7 +712,7 @@ static HRESULT AVIFILE_OpenCompressor(IA if (This->lpOutFormat == NULL) { /* we must decode to default format */ This->cbOutFormat = sizeof(PCMWAVEFORMAT); - This->lpOutFormat = GlobalLock(GlobalAlloc(GHND, This->cbOutFormat)); + This->lpOutFormat = HeapAlloc(GetProcessHeap(), 0, This->cbOutFormat); if (This->lpOutFormat == NULL) return AVIERR_MEMORY;

1 0

Alexandre Julliard : winefile: Refresh the drives and files upon WM_DEVICECHANGE.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 04dad6218f64776712653ecdc24126a4d61f0d59 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04dad6218f64776712653ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 21:43:25 2006 +0100 winefile: Refresh the drives and files upon WM_DEVICECHANGE. --- programs/winefile/winefile.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index afaba10..60deaf2 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2521,6 +2521,10 @@ static LRESULT CALLBACK FrameWndProc(HWN resize_frame(hwnd, LOWORD(lparam), HIWORD(lparam)); break; /* do not pass message to DefFrameProc */ + case WM_DEVICECHANGE: + SendMessage(hwnd, WM_COMMAND, MAKELONG(ID_REFRESH,0), 0); + break; + #ifndef _NO_EXTENSIONS case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam;

1 0

Stefan Dösinger : wined3d: Consistently use WINED3DRESOURCETYPE.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 913df5b143ce1d3815d30c5f54c84fe4b2c7c81e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=913df5b143ce1d3815d30c5… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 9 23:21:16 2006 +0100 wined3d: Consistently use WINED3DRESOURCETYPE. --- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/wined3d/basetexture.c | 2 +- dlls/wined3d/cubetexture.c | 2 +- dlls/wined3d/device.c | 40 +++++++++++++++++++------------------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/drawprim.c | 8 ++++---- dlls/wined3d/indexbuffer.c | 2 +- dlls/wined3d/query.c | 2 +- dlls/wined3d/resource.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 18 +++++++++-------- dlls/wined3d/vertexbuffer.c | 2 +- dlls/wined3d/volume.c | 6 +++--- dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- include/wine/wined3d_interface.h | 22 ++++++++++----------- include/wine/wined3d_types.h | 34 ++++++++++++++++---------------- 27 files changed, 88 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=913df5b143ce1d3815d…

1 0

Mike McCormack : avifil32: Use CoTaskMemAlloc when allocating memory to return through
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 29212d8afdac2c5d970b68e15de69a72046bf8da URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29212d8afdac2c5d970b68e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 00:21:30 2006 +0900 avifil32: Use CoTaskMemAlloc when allocating memory to return through an OLE interface. --- dlls/avifil32/avifile.c | 2 +- dlls/avifil32/wavfile.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index a045bf3..d407445 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -704,7 +704,7 @@ static HRESULT WINAPI IPersistFile_fnGet if (This->paf->szFileName != NULL) { int len = lstrlenW(This->paf->szFileName) + 1; - *ppszFileName = (LPOLESTR)GlobalAllocPtr(GHND, len * sizeof(WCHAR)); + *ppszFileName = CoTaskMemAlloc(len * sizeof(WCHAR)); if (*ppszFileName == NULL) return AVIERR_MEMORY; diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 4ed7e52..6ea7e44 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -662,7 +662,7 @@ static HRESULT WINAPI IPersistFile_fnGet if (This->paf->szFileName != NULL) { int len = lstrlenW(This->paf->szFileName) + 1; - *ppszFileName = GlobalAllocPtr(GHND, len * sizeof(WCHAR)); + *ppszFileName = CoTaskMemAlloc(len * sizeof(WCHAR)); if (*ppszFileName == NULL) return AVIERR_MEMORY;

1 0

Mike McCormack : comdlg32: Remove the property when destroy the dialog box.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: e1ca87732be8620ee9fce793d9b6743029e84b35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1ca87732be8620ee9fce79… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Mar 10 12:26:50 2006 +0900 comdlg32: Remove the property when destroy the dialog box. --- dlls/commdlg/colordlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 022e83f..ca00593 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -1220,7 +1220,7 @@ static INT_PTR CALLBACK ColorDlgProc( HW DeleteDC(lpp->hdcMem); DeleteObject(lpp->hbmMem); HeapFree(GetProcessHeap(), 0, lpp); - SetPropW( hDlg, szColourDialogProp, 0 ); + RemovePropW( hDlg, szColourDialogProp ); break; case WM_COMMAND: if (CC_WMCommand( hDlg, wParam, lParam, HIWORD(wParam), (HWND) lParam))

1 0

Mike McCormack : avifil32: Fix some gcc 4.1 warnings cause by windowsx. h macros.
by Alexandre Julliard 10 Mar '06

10 Mar '06

Module: wine Branch: refs/heads/master Commit: 610fc08e8d87d01306d58acad9f35dd11d6d5883 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=610fc08e8d87d01306d58ac… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Mar 11 00:21:42 2006 +0900 avifil32: Fix some gcc 4.1 warnings cause by windowsx.h macros. --- dlls/avifil32/api.c | 62 ++++++++++++++++++++++----------------------- dlls/avifil32/avifile.c | 54 ++++++++++++++++++--------------------- dlls/avifil32/getframe.c | 20 ++++++--------- dlls/avifil32/icmstream.c | 36 ++++++++++++-------------- dlls/avifil32/wavfile.c | 28 +++++++++----------- 5 files changed, 92 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=610fc08e8d87d01306d…

1 0