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

Rico Schüller : d3dx9: Don' t zero memory when it will be overridden.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 41e34d77c51734b54ef6240f133a7b9a9c9382dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=41e34d77c51734b54ef6240f1… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:08 2011 +0200 d3dx9: Don't zero memory when it will be overridden. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d06c9ac..3f89eb8 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2684,7 +2684,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); + srcfileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectFromFileExW(device, srcfileW, defines, include, skipconstants, flags, pool, effect, compilationerrors); @@ -2821,7 +2821,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); - srcfileW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(*srcfileW)); + srcfileW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(*srcfileW)); MultiByteToWideChar(CP_ACP, 0, srcfile, -1, srcfileW, len); ret = D3DXCreateEffectCompilerFromFileW(srcfileW, defines, include, flags, effectcompiler, parseerrors);

1 0

Rico Schüller : d3dx9: Use variable instead of type in HeapAlloc.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 98001ca8c84e880cbbb788ba3a2ba0ce0e663722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98001ca8c84e880cbbb788ba3… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:37 2011 +0200 d3dx9: Use variable instead of type in HeapAlloc. --- dlls/d3dx9_36/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 6990fbd..c1e9641 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -110,7 +110,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { ID3DXBufferImpl *object; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXBufferImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (object == NULL) { *ppBuffer = NULL;

1 0

Rico Schüller : d3dx9: Remove typedef from ID3DXBufferImpl.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 62c1fb0941a723b399f6f31e91d4a3cd10eb5574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c1fb0941a723b399f6f31e9… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:40 2011 +0200 d3dx9: Remove typedef from ID3DXBufferImpl. --- dlls/d3dx9_36/core.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index c1e9641..26eec9b 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -30,23 +30,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -typedef struct ID3DXBufferImpl +struct ID3DXBufferImpl { ID3DXBuffer ID3DXBuffer_iface; LONG ref; DWORD *buffer; DWORD bufferSize; -} ID3DXBufferImpl; +}; -static inline ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) +static inline struct ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) { - return CONTAINING_RECORD(iface, ID3DXBufferImpl, ID3DXBuffer_iface); + return CONTAINING_RECORD(iface, struct ID3DXBufferImpl, ID3DXBuffer_iface); } static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID riid, void **ppobj) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer)) @@ -62,7 +62,7 @@ static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); @@ -72,7 +72,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref); @@ -87,13 +87,13 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->buffer; } static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); + struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->bufferSize; } @@ -108,7 +108,7 @@ const ID3DXBufferVtbl D3DXBuffer_Vtbl = HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) { - ID3DXBufferImpl *object; + struct ID3DXBufferImpl *object; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (object == NULL)

1 0

Rico Schüller : d3dx9: Rename some variables.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 404de72fe097d325eeed30625e99721242cab3bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=404de72fe097d325eeed30625… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Mar 30 12:51:43 2011 +0200 d3dx9: Rename some variables. --- dlls/d3dx9_36/core.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 26eec9b..22a5ccf 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -35,8 +35,8 @@ struct ID3DXBufferImpl ID3DXBuffer ID3DXBuffer_iface; LONG ref; - DWORD *buffer; - DWORD bufferSize; + void *buffer; + DWORD size; }; static inline struct ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) @@ -94,39 +94,41 @@ static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) { struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); - return This->bufferSize; + return This->size; } -const ID3DXBufferVtbl D3DXBuffer_Vtbl = +static const struct ID3DXBufferVtbl ID3DXBufferImpl_Vtbl = { + /* IUnknown methods */ ID3DXBufferImpl_QueryInterface, ID3DXBufferImpl_AddRef, ID3DXBufferImpl_Release, + /* ID3DXBuffer methods */ ID3DXBufferImpl_GetBufferPointer, ID3DXBufferImpl_GetBufferSize }; -HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) +HRESULT WINAPI D3DXCreateBuffer(DWORD size, LPD3DXBUFFER *buffer) { struct ID3DXBufferImpl *object; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (object == NULL) { - *ppBuffer = NULL; + *buffer = NULL; return E_OUTOFMEMORY; } - object->ID3DXBuffer_iface.lpVtbl = &D3DXBuffer_Vtbl; + object->ID3DXBuffer_iface.lpVtbl = &ID3DXBufferImpl_Vtbl; object->ref = 1; - object->bufferSize = NumBytes; - object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); + object->size = size; + object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); if (object->buffer == NULL) { HeapFree(GetProcessHeap(), 0, object); - *ppBuffer = NULL; + *buffer = NULL; return E_OUTOFMEMORY; } - *ppBuffer = &object->ID3DXBuffer_iface; + *buffer = &object->ID3DXBuffer_iface; return D3D_OK; }

1 0

Hans Leidekker : msi/tests: Get rid of workarounds for win9x test failures.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: c505c0fe985e769e3eb5a410480ec331b0d43c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c505c0fe985e769e3eb5a4104… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:30:17 2011 +0200 msi/tests: Get rid of workarounds for win9x test failures. --- dlls/msi/tests/automation.c | 28 +++------ dlls/msi/tests/db.c | 16 +---- dlls/msi/tests/install.c | 130 +++++++------------------------------------ dlls/msi/tests/msi.c | 4 +- dlls/msi/tests/package.c | 31 ++--------- 5 files changed, 40 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c505c0fe985e769e3eb5a…

1 0

Hans Leidekker : msi/tests: Allocate the user token dynamically and unify implementations.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 419496d0c8156e1cbf864c0d64a36301bbde653a URL: http://source.winehq.org/git/wine.git/?a=commit;h=419496d0c8156e1cbf864c0d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:30:35 2011 +0200 msi/tests: Allocate the user token dynamically and unify implementations. --- dlls/msi/tests/action.c | 34 +++++++++++++++++----------------- dlls/msi/tests/msi.c | 44 ++++++++++++++++++++++---------------------- dlls/msi/tests/package.c | 26 +++++++++++++------------- dlls/msi/tests/source.c | 45 ++++++++++++++++++++++++--------------------- 4 files changed, 76 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=419496d0c8156e1cbf864…

1 0

Hans Leidekker : msi: Allocate the user token dynamically.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: 6ad992c40722cd385e378e18835156e0799029d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad992c40722cd385e378e188… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:30:49 2011 +0200 msi: Allocate the user token dynamically. --- dlls/msi/registry.c | 156 +++++++++++++++++++++----------------------------- 1 files changed, 66 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad992c40722cd385e378…

1 0

Hans Leidekker : msi: Explicitly pass product code and platform to MSIREG_OpenUninstallKey and MSIREG_DeleteUninstallKey .
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: e4d19fc47b37ad6c375171811a18a4eae082884d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d19fc47b37ad6c375171811… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 12:31:04 2011 +0200 msi: Explicitly pass product code and platform to MSIREG_OpenUninstallKey and MSIREG_DeleteUninstallKey. --- dlls/msi/action.c | 4 ++-- dlls/msi/msipriv.h | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/registry.c | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a21f234..abee14c 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5286,7 +5286,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) if (!msi_check_publish(package)) return ERROR_SUCCESS; - rc = MSIREG_OpenUninstallKey(package, &hkey, TRUE); + rc = MSIREG_OpenUninstallKey(package->ProductCode, package->platform, &hkey, TRUE); if (rc != ERROR_SUCCESS) return rc; @@ -5366,7 +5366,7 @@ static UINT msi_unpublish_product(MSIPACKAGE *package, WCHAR *remove) MSIREG_DeleteProductKey(package->ProductCode); MSIREG_DeleteUserDataProductKey(package->ProductCode); - MSIREG_DeleteUninstallKey(package); + MSIREG_DeleteUninstallKey(package->ProductCode, package->platform); MSIREG_DeleteLocalClassesProductKey(package->ProductCode); MSIREG_DeleteLocalClassesFeaturesKey(package->ProductCode); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7af99a6..19e9be8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -829,8 +829,8 @@ extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out); extern BOOL squash_guid(LPCWSTR in, LPWSTR out); extern BOOL encode_base85_guid(GUID *,LPWSTR); extern BOOL decode_base85_guid(LPCWSTR,GUID*); -extern UINT MSIREG_OpenUninstallKey(MSIPACKAGE *package, HKEY *key, BOOL create); -extern UINT MSIREG_DeleteUninstallKey(MSIPACKAGE *package); +extern UINT MSIREG_OpenUninstallKey(const WCHAR *, enum platform, HKEY *, BOOL); +extern UINT MSIREG_DeleteUninstallKey(const WCHAR *, enum platform); extern UINT MSIREG_OpenProductKey(LPCWSTR szProduct, LPCWSTR szUserSid, MSIINSTALLCONTEXT context, HKEY* key, BOOL create); extern UINT MSIREG_OpenFeaturesKey(LPCWSTR szProduct, MSIINSTALLCONTEXT context, diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 00ed9f8..88cf34d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -449,7 +449,7 @@ static UINT set_installed_prop( MSIPACKAGE *package ) HKEY hkey = 0; UINT r; - r = MSIREG_OpenUninstallKey( package, &hkey, FALSE ); + r = MSIREG_OpenUninstallKey( package->ProductCode, package->platform, &hkey, FALSE ); if (r == ERROR_SUCCESS) { RegCloseKey( hkey ); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index e146d82..60deeb9 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -525,17 +525,17 @@ static WCHAR *get_user_sid(void) return ret; } -UINT MSIREG_OpenUninstallKey(MSIPACKAGE *package, HKEY *key, BOOL create) +UINT MSIREG_OpenUninstallKey(const WCHAR *product, enum platform platform, HKEY *key, BOOL create) { UINT rc; WCHAR keypath[0x200]; - TRACE("%s\n", debugstr_w(package->ProductCode)); + TRACE("%s\n", debugstr_w(product)); - if (is_64bit && package->platform == PLATFORM_INTEL) - sprintfW(keypath, szUninstall_32node_fmt, package->ProductCode); + if (is_64bit && platform == PLATFORM_INTEL) + sprintfW(keypath, szUninstall_32node_fmt, product); else - sprintfW(keypath, szUninstall_fmt, package->ProductCode); + sprintfW(keypath, szUninstall_fmt, product); if (create) rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, keypath, 0, NULL, 0, KEY_ALL_ACCESS, NULL, key, NULL); @@ -545,16 +545,16 @@ UINT MSIREG_OpenUninstallKey(MSIPACKAGE *package, HKEY *key, BOOL create) return rc; } -UINT MSIREG_DeleteUninstallKey(MSIPACKAGE *package) +UINT MSIREG_DeleteUninstallKey(const WCHAR *product, enum platform platform) { WCHAR keypath[0x200]; - TRACE("%s\n", debugstr_w(package->ProductCode)); + TRACE("%s\n", debugstr_w(product)); - if (is_64bit && package->platform == PLATFORM_INTEL) - sprintfW(keypath, szUninstall_32node_fmt, package->ProductCode); + if (is_64bit && platform == PLATFORM_INTEL) + sprintfW(keypath, szUninstall_32node_fmt, product); else - sprintfW(keypath, szUninstall_fmt, package->ProductCode); + sprintfW(keypath, szUninstall_fmt, product); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); }

1 0

Jörg Höhle : winmm: Get rid of psStopEvent which was never used like an event.
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: a0dbd846c6cf111d20718170e9de2f7681d8fadf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0dbd846c6cf111d20718170e… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Mar 26 12:36:49 2011 +0100 winmm: Get rid of psStopEvent which was never used like an event. --- dlls/winmm/playsound.c | 7 ++++--- dlls/winmm/winmm.c | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index a6a3c87..3624124 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -49,6 +49,7 @@ typedef struct tagWINE_PLAYSOUND } WINE_PLAYSOUND; static WINE_PLAYSOUND *PlaySoundList; +static BOOL bPlaySoundStop; static HMMIO get_mmioFromFile(LPCWSTR lpszName) { @@ -426,7 +427,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) mmioSeek(hmmio, mmckInfo.dwDataOffset, SEEK_SET); while (left) { - if (WaitForSingleObject(psStopEvent, 0) == WAIT_OBJECT_0) + if (bPlaySoundStop) { waveOutReset(hWave); wps->bLoop = FALSE; @@ -495,13 +496,13 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo ResetEvent(psLastEvent); /* FIXME: doc says we have to stop all instances of pszSound if it's non * NULL... as of today, we stop all playing instances */ - SetEvent(psStopEvent); + bPlaySoundStop = TRUE; LeaveCriticalSection(&WINMM_cs); WaitForSingleObject(psLastEvent, INFINITE); EnterCriticalSection(&WINMM_cs); - ResetEvent(psStopEvent); + bPlaySoundStop = FALSE; } if (wps) wps->lpNext = PlaySoundList; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 029a1c9..6d5950b 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -63,7 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); HINSTANCE hWinMM32Instance; HANDLE psLastEvent; -HANDLE psStopEvent; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -79,7 +78,6 @@ CRITICAL_SECTION WINMM_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL WINMM_CreateIData(HINSTANCE hInstDLL) { hWinMM32Instance = hInstDLL; - psStopEvent = CreateEventW(NULL, TRUE, FALSE, NULL); psLastEvent = CreateEventW(NULL, TRUE, FALSE, NULL); return TRUE; } @@ -93,7 +91,6 @@ static void WINMM_DeleteIData(void) /* FIXME: should also free content and resources allocated * inside WINMM_IData */ - CloseHandle(psStopEvent); CloseHandle(psLastEvent); DeleteCriticalSection(&WINMM_cs); }

1 0

Jörg Höhle : winmm: PlaySound concurrency cleanup .
by Alexandre Julliard 30 Mar '11

30 Mar '11

Module: wine Branch: master Commit: e0dcc2cd7d4495b7056a47ada1af74cc7c318ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0dcc2cd7d4495b7056a47ada… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 28 22:34:02 2011 +0200 winmm: PlaySound concurrency cleanup. --- dlls/winmm/playsound.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 3624124..02e24e8 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -44,7 +44,6 @@ typedef struct tagWINE_PLAYSOUND LPCWSTR pszSound; HMODULE hMod; DWORD fdwSound; - HANDLE hThread; struct tagWINE_PLAYSOUND* lpNext; } WINE_PLAYSOUND; @@ -215,7 +214,6 @@ static void PlaySound_Free(WINE_PLAYSOUND* wps) if (PlaySoundList == NULL) SetEvent(psLastEvent); LeaveCriticalSection(&WINMM_cs); if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); - if (wps->hThread) CloseHandle(wps->hThread); HeapFree(GetProcessHeap(), 0, wps); } @@ -258,7 +256,8 @@ static WINE_PLAYSOUND* PlaySound_Alloc(const void* pszSound, HMODULE hmod, return wps; oom_error: - PlaySound_Free(wps); + if (wps->bAlloc) HeapFree(GetProcessHeap(), 0, (void*)wps->pszSound); + HeapFree(GetProcessHeap(), 0, wps); return NULL; } @@ -377,6 +376,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); + if (!lpWaveFormat) + goto errCleanUp; if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) goto errCleanUp; @@ -398,6 +399,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!s.hEvent) + goto errCleanUp; if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) @@ -407,6 +410,8 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) bufsize = (((lpWaveFormat->nAvgBytesPerSec / 3) - 1) / lpWaveFormat->nBlockAlign + 1) * lpWaveFormat->nBlockAlign; waveHdr = HeapAlloc(GetProcessHeap(), 0, 2 * sizeof(WAVEHDR) + 2 * bufsize); + if (!waveHdr) + goto errCleanUp; waveHdr[0].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR); waveHdr[1].lpData = (char*)waveHdr + 2 * sizeof(WAVEHDR) + bufsize; waveHdr[0].dwUser = waveHdr[1].dwUser = 0L; @@ -458,10 +463,10 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) errCleanUp: TRACE("Done playing=%s => %s!\n", debugstr_w(wps->pszSound), bRet ? "ok" : "ko"); - CloseHandle(s.hEvent); - HeapFree(GetProcessHeap(), 0, waveHdr); HeapFree(GetProcessHeap(), 0, lpWaveFormat); if (hWave) while (waveOutClose(hWave) == WAVERR_STILLPLAYING) Sleep(100); + CloseHandle(s.hEvent); + HeapFree(GetProcessHeap(), 0, waveHdr); if (hmmio) mmioClose(hmmio, 0); PlaySound_Free(wps); @@ -509,16 +514,15 @@ static BOOL MULTIMEDIA_PlaySound(const void* pszSound, HMODULE hmod, DWORD fdwSo PlaySoundList = wps; LeaveCriticalSection(&WINMM_cs); - if (!pszSound || (fdwSound & SND_PURGE)) return TRUE; + if (!wps) return TRUE; if (fdwSound & SND_ASYNC) { - DWORD id; HANDLE handle; wps->bLoop = (fdwSound & SND_LOOP) ? TRUE : FALSE; - if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, &id)) != 0) { - wps->hThread = handle; + if ((handle = CreateThread(NULL, 0, proc_PlaySound, wps, 0, NULL)) != 0) { SetThreadPriority(handle, THREAD_PRIORITY_TIME_CRITICAL); + CloseHandle(handle); return TRUE; } }

1 0