May 2017 - Wine-commits - list.winehq.org

Tag wine-2.8 : Alexandre Julliard : Release 2.8
by Alexandre Julliard 12 May '17

12 May '17

Module: wine Branch: refs/tags/wine-2.8 Tag: ca9ba8b667f3ec22d99473e3f390dc2ada1a6498 URL: http://source.winehq.org/git/wine.git/?a=tag;h=ca9ba8b667f3ec22d99473e3f390… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 12 18:45:16 2017 +0200 Release 2.8

1 0

Józef Kucia : mscoree: Fix compilation on systems that don't support nameless unions.
by Alexandre Julliard 12 May '17

12 May '17

Module: wine Branch: master Commit: c1d4d82e15a5f28ef7f9457c7a4b9fcd528b091e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d4d82e15a5f28ef7f9457c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 10 16:25:52 2017 +0200 mscoree: Fix compilation on systems that don't support nameless unions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/assembly.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index 4af6f28..b653556 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include <stdarg.h> #include <stdio.h> @@ -319,7 +321,7 @@ HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc { if (assembly->corhdr->Flags & COMIMAGE_FLAGS_NATIVE_ENTRYPOINT) { - *func = assembly_rva_to_va(assembly, assembly->corhdr->EntryPointRVA); + *func = assembly_rva_to_va(assembly, assembly->corhdr->u.EntryPointRVA); return S_OK; } else

1 0

Dmitry Timoshkov : include: Fix the GUID_WICPixelFormat32bppCMYK definition.
by Alexandre Julliard 12 May '17

12 May '17

Module: wine Branch: master Commit: c78c84596f573b2a516382baeb7d8f078eac30e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c78c84596f573b2a516382bae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 10 18:20:00 2017 +0200 include: Fix the GUID_WICPixelFormat32bppCMYK definition. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincodec.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 406fe6b..962a6fd 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -213,7 +213,7 @@ cpp_quote("DEFINE_GUID(GUID_WICPixelFormat48bppRGB, 0x6fddc324,0x4e03,0x4bfe,0xb cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x16);") cpp_quote("DEFINE_GUID(GUID_WICPixelFormat64bppPRGBA, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x17);") -cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4fbe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") +cpp_quote("DEFINE_GUID(GUID_WICPixelFormat32bppCMYK, 0x6fddc324,0x4e03,0x4bfe,0xb1,0x85,0x3d,0x77,0x76,0x8d,0xc9,0x1c);") typedef struct WICRect { INT X;

1 0

Michael Stefaniuc : dmime: Simplify the check if the performance was initialized.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: a2685a8bc05475503f8f9660e28e25cebbd1c489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2685a8bc05475503f8f9660e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:45 2017 +0200 dmime: Simplify the check if the performance was initialized. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a0f70b0..2c94123 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -25,8 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; - /* IDirectMusicPerformanceImpl fields */ - IDirectMusic8 *pDirectMusic; + IDirectMusic8 *dmusic; IDirectSound *pDirectSound; IDirectMusicGraph *pToolGraph; DMUS_AUDIOPARAMS pParams; @@ -254,7 +253,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); FIXME("(iface = %p, dmusic = %p, dsound = %p, hwnd = %p)\n", This, ppDirectMusic, pDirectSound, hWnd); - if (This->pDirectMusic || This->pDirectSound) + if (This->dmusic) return DMUS_E_ALREADY_INITED; if (NULL != pDirectSound) { @@ -271,16 +270,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { /* app creates its own dmusic object and gives it to performance */ - This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic; - IDirectMusic8_AddRef(This->pDirectMusic); + This->dmusic = (IDirectMusic8 *)*ppDirectMusic; + IDirectMusic8_AddRef(This->dmusic); } else { HRESULT hr; /* App enables the performance to initialize itself and needs a pointer to object */ - hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void **)&This->dmusic); if (FAILED(hr)) return hr; if (ppDirectMusic) { - *ppDirectMusic = (LPDIRECTMUSIC)This->pDirectMusic; + *ppDirectMusic = (IDirectMusic *)This->dmusic; IDirectMusic8_AddRef((LPDIRECTMUSIC8)*ppDirectMusic); } } @@ -601,20 +600,21 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman HRESULT hr = E_FAIL; FIXME("(%p, %p): stub\n", This, pPort); - if (!This->pDirectMusic || !This->pDirectSound) return DMUS_E_NOT_INIT; + if (!This->dmusic) + return DMUS_E_NOT_INIT; if (NULL == pPort) { GUID port_guid; IDirectMusicPort* pDefaultPort = NULL; DMUS_PORTPARAMS params; int i, j; - hr = IDirectMusic8_GetDefaultPort(This->pDirectMusic, &port_guid); + hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); if (FAILED(hr)) return hr; ZeroMemory(&params, sizeof(params)); params.dwSize = sizeof(params); params.dwValidParams = DMUS_PORTPARAMS_CHANNELGROUPS | DMUS_PORTPARAMS_SHARE; params.dwChannelGroups = 1; params.fShare = TRUE; - hr = IDirectMusic8_CreatePort(This->pDirectMusic, &port_guid, &params, &pDefaultPort, NULL); + hr = IDirectMusic8_CreatePort(This->dmusic, &port_guid, &params, &pDefaultPort, NULL); if (FAILED(hr)) return hr; hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } @@ -698,8 +698,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerf port_params.dwSize = sizeof(DMUS_PORTPARAMS8); port_params.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->pDirectMusic, &default_port); - IDirectMusic8_CreatePort(This->pDirectMusic, &default_port, &port_params, port, NULL); + IDirectMusic8_GetDefaultPort(This->dmusic, &default_port); + IDirectMusic8_CreatePort(This->dmusic, &default_port, &port_params, port, NULL); return S_OK; } @@ -832,11 +832,11 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerform IDirectSound_Release(This->pDirectSound); This->pDirectSound = NULL; } - if (NULL != This->pDirectMusic) { - IDirectMusic8_Release(This->pDirectMusic); - This->pDirectMusic = NULL; - } - return S_OK; + if (This->dmusic) { + IDirectMusic8_Release(This->dmusic); + This->dmusic = NULL; + } + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_GetResolvedTime(IDirectMusicPerformance8 *iface, @@ -900,7 +900,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform FIXME("(%p, %p, %p, %p, %x, %u, %x, %p): to check\n", This, ppDirectMusic, ppDirectSound, hWnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); - if (This->pDirectMusic || This->pDirectSound) + if (This->dmusic) return DMUS_E_ALREADY_INITED; if (NULL != ppDirectSound && NULL != *ppDirectSound) { @@ -1203,7 +1203,6 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) } obj->IDirectMusicPerformance8_iface.lpVtbl = &DirectMusicPerformance8_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ - obj->pDirectMusic = NULL; obj->pDirectSound = NULL; obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe);

1 0

Michael Stefaniuc : dmime: Avoid a temporary variable in IDirectMusicPerformance8Impl_InitAudio().
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 9572b5f6d34d82c0abe179f45a1cd4e5f4278dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9572b5f6d34d82c0abe179f45… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:46 2017 +0200 dmime: Avoid a temporary variable in IDirectMusicPerformance8Impl_InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 70 ++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2c94123..57ee670 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -26,7 +26,7 @@ typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; IDirectMusic8 *dmusic; - IDirectSound *pDirectSound; + IDirectSound *dsound; IDirectMusicGraph *pToolGraph; DMUS_AUDIOPARAMS pParams; /* global parameters */ @@ -257,15 +257,15 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 return DMUS_E_ALREADY_INITED; if (NULL != pDirectSound) { - This->pDirectSound = pDirectSound; - IDirectSound_AddRef(This->pDirectSound); + This->dsound = pDirectSound; + IDirectSound_AddRef(This->dsound); } else { - DirectSoundCreate8(NULL, (LPDIRECTSOUND8*) &This->pDirectSound, NULL); - if (!This->pDirectSound) return DSERR_NODRIVER; + DirectSoundCreate8(NULL, (IDirectSound8 **) &This->dsound, NULL); + if (!This->dsound) return DSERR_NODRIVER; if (!hWnd) hWnd = GetForegroundWindow(); - IDirectSound_SetCooperativeLevel(This->pDirectSound, hWnd, DSSCL_PRIORITY); + IDirectSound_SetCooperativeLevel(This->dsound, hWnd, DSSCL_PRIORITY); } if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { @@ -828,10 +828,10 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerform This->procThreadTicStarted = FALSE; CloseHandle(This->procThread); } - if (NULL != This->pDirectSound) { - IDirectSound_Release(This->pDirectSound); - This->pDirectSound = NULL; - } + if (This->dsound) { + IDirectSound_Release(This->dsound); + This->dsound = NULL; + } if (This->dmusic) { IDirectMusic8_Release(This->dmusic); This->dmusic = NULL; @@ -891,38 +891,33 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RhythmToTime(IDirectMusicPerf /* IDirectMusicPerformance8 Interface part follow: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerformance8 *iface, - IDirectMusic **ppDirectMusic, IDirectSound **ppDirectSound, HWND hWnd, + IDirectMusic **ppDirectMusic, IDirectSound **dsound, HWND hwnd, DWORD dwDefaultPathType, DWORD dwPChannelCount, DWORD dwFlags, DMUS_AUDIOPARAMS* pParams) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - IDirectSound* dsound = NULL; - HRESULT hr = S_OK; + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + HRESULT hr = S_OK; - FIXME("(%p, %p, %p, %p, %x, %u, %x, %p): to check\n", This, ppDirectMusic, ppDirectSound, hWnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); + TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, ppDirectMusic, dsound, hwnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); - if (This->dmusic) - return DMUS_E_ALREADY_INITED; + if (This->dmusic) + return DMUS_E_ALREADY_INITED; - if (NULL != ppDirectSound && NULL != *ppDirectSound) { - dsound = *ppDirectSound; - } else { - hr = DirectSoundCreate8 (NULL, (LPDIRECTSOUND8*) &dsound, NULL); - FIXME("return dsound(%p,%d)\n", dsound, hr); - if (FAILED(hr) || !dsound) - return DSERR_NODRIVER; - if (!hWnd) - hWnd = GetForegroundWindow(); - IDirectSound_SetCooperativeLevel(dsound, hWnd, DSSCL_PRIORITY); - if (ppDirectSound) - *ppDirectSound = dsound; - } + if (!dsound || !*dsound) { + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); + if (FAILED(hr)) + return hr; + IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), + DSSCL_PRIORITY); + if (dsound) + *dsound = This->dsound; + } else + This->dsound = *dsound; - IDirectMusicPerformance8_Init(iface, ppDirectMusic, dsound, hWnd); + IDirectMusicPerformance8_Init(iface, ppDirectMusic, This->dsound, hwnd); - /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ - if (NULL == ppDirectSound) { - IDirectSound_Release(This->pDirectSound); - } + /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ + if (!dsound) + IDirectSound_Release(This->dsound); /* as seen in msdn we need params init before audio path creation */ if (NULL != pParams) { @@ -1059,7 +1054,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire } /* FIXME: Should we create one secondary buffer for each PChannel? */ - hr = IDirectSound8_CreateSoundBuffer ((LPDIRECTSOUND8) This->pDirectSound, &desc, &buffer, NULL); + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &buffer, NULL); if (FAILED(hr)) return DSERR_BUFFERLOST; @@ -1068,7 +1063,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire desc.dwBufferBytes = 0; desc.lpwfxFormat = NULL; - hr = IDirectSound8_CreateSoundBuffer ((LPDIRECTSOUND8) This->pDirectSound, &desc, &primary_buffer, NULL); + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &primary_buffer, NULL); if (FAILED(hr)) { IDirectSoundBuffer_Release(buffer); return DSERR_BUFFERLOST; @@ -1203,7 +1198,6 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) } obj->IDirectMusicPerformance8_iface.lpVtbl = &DirectMusicPerformance8_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ - obj->pDirectSound = NULL; obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe");

1 0

Michael Stefaniuc : dmime: Finish the reindentation in CloseDown().
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 3a145ac92b0e0f2226a6d20999bc8b2117969f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a145ac92b0e0f2226a6d2099… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:47 2017 +0200 dmime: Finish the reindentation in CloseDown(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 57ee670..292ae80 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -820,14 +820,15 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AdjustTime(IDirectMusicPerfor static HRESULT WINAPI IDirectMusicPerformance8Impl_CloseDown(IDirectMusicPerformance8 *iface) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p): stub\n", This); - if (PostMessageToProcessMsgThread(This, PROCESSMSG_EXIT)) { - WaitForSingleObject(This->procThread, INFINITE); - This->procThreadTicStarted = FALSE; - CloseHandle(This->procThread); - } + FIXME("(%p): semi-stub\n", This); + + if (PostMessageToProcessMsgThread(This, PROCESSMSG_EXIT)) { + WaitForSingleObject(This->procThread, INFINITE); + This->procThreadTicStarted = FALSE; + CloseHandle(This->procThread); + } if (This->dsound) { IDirectSound_Release(This->dsound); This->dsound = NULL;

1 0

Michael Stefaniuc : dmime: Do not use Init() from InitAudio().
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 26011d2d3e3c0d616ef8c738c7941bffcb919396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26011d2d3e3c0d616ef8c738c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:48 2017 +0200 dmime: Do not use Init() from InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 292ae80..2bd34d5 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -892,17 +892,30 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RhythmToTime(IDirectMusicPerf /* IDirectMusicPerformance8 Interface part follow: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerformance8 *iface, - IDirectMusic **ppDirectMusic, IDirectSound **dsound, HWND hwnd, + IDirectMusic **dmusic, IDirectSound **dsound, HWND hwnd, DWORD dwDefaultPathType, DWORD dwPChannelCount, DWORD dwFlags, DMUS_AUDIOPARAMS* pParams) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK; - TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, ppDirectMusic, dsound, hwnd, dwDefaultPathType, dwPChannelCount, dwFlags, pParams); + TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, dwDefaultPathType, + dwPChannelCount, dwFlags, pParams); if (This->dmusic) return DMUS_E_ALREADY_INITED; + if (!dmusic || !*dmusic) { + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void **)&This->dmusic); + if (FAILED(hr)) + return hr; + if (dmusic) + *dmusic = (IDirectMusic *)This->dmusic; + } else + This->dmusic = (IDirectMusic8 *)*dmusic; + if (dmusic) + IDirectMusic8_AddRef(This->dmusic); + if (!dsound || !*dsound) { hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&This->dsound, NULL); if (FAILED(hr)) @@ -913,12 +926,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform *dsound = This->dsound; } else This->dsound = *dsound; - - IDirectMusicPerformance8_Init(iface, ppDirectMusic, This->dsound, hwnd); - - /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ - if (!dsound) - IDirectSound_Release(This->dsound); + if (dsound) + IDirectSound_AddRef(This->dsound); /* as seen in msdn we need params init before audio path creation */ if (NULL != pParams) {

1 0

Michael Stefaniuc : dmime: Finish the cleanup of InitAudio().
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 3236e4ccab754eac8a14ff94efc19db8fae898e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3236e4ccab754eac8a14ff94e… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:49 2017 +0200 dmime: Finish the cleanup of InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2bd34d5..bbfc04f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -28,8 +28,7 @@ typedef struct IDirectMusicPerformance8Impl { IDirectMusic8 *dmusic; IDirectSound *dsound; IDirectMusicGraph *pToolGraph; - DMUS_AUDIOPARAMS pParams; - /* global parameters */ + DMUS_AUDIOPARAMS params; BOOL fAutoDownload; char cMasterGrooveLevel; float fMasterTempo; @@ -892,14 +891,14 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RhythmToTime(IDirectMusicPerf /* IDirectMusicPerformance8 Interface part follow: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerformance8 *iface, - IDirectMusic **dmusic, IDirectSound **dsound, HWND hwnd, - DWORD dwDefaultPathType, DWORD dwPChannelCount, DWORD dwFlags, DMUS_AUDIOPARAMS* pParams) + IDirectMusic **dmusic, IDirectSound **dsound, HWND hwnd, DWORD default_path_type, + DWORD num_channels, DWORD flags, DMUS_AUDIOPARAMS *params) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK; - TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, dwDefaultPathType, - dwPChannelCount, dwFlags, pParams); + TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, default_path_type, + num_channels, flags, params); if (This->dmusic) return DMUS_E_ALREADY_INITED; @@ -929,26 +928,25 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform if (dsound) IDirectSound_AddRef(This->dsound); - /* as seen in msdn we need params init before audio path creation */ - if (NULL != pParams) { - This->pParams = *pParams; - } else { - /* TODO, how can i fill the struct as seen on msdn */ - memset(&This->pParams, 0, sizeof(DMUS_AUDIOPARAMS)); - This->pParams.dwSize = sizeof(DMUS_AUDIOPARAMS); - This->pParams.fInitNow = FALSE; - This->pParams.dwValidData = DMUS_AUDIOPARAMS_FEATURES | DMUS_AUDIOPARAMS_VOICES | DMUS_AUDIOPARAMS_SAMPLERATE | DMUS_AUDIOPARAMS_DEFAULTSYNTH; - This->pParams.dwVoices = 64; - This->pParams.dwSampleRate = (DWORD) 22.050; - This->pParams.dwFeatures = dwFlags; - This->pParams.clsidDefaultSynth = CLSID_DirectMusicSynthSink; - } - if(dwDefaultPathType != 0) - hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, dwDefaultPathType, dwPChannelCount, FALSE, &This->pDefaultPath); + if (!params) { + This->params.dwSize = sizeof(DMUS_AUDIOPARAMS); + This->params.fInitNow = FALSE; + This->params.dwValidData = DMUS_AUDIOPARAMS_FEATURES | DMUS_AUDIOPARAMS_VOICES | + DMUS_AUDIOPARAMS_SAMPLERATE | DMUS_AUDIOPARAMS_DEFAULTSYNTH; + This->params.dwVoices = 64; + This->params.dwSampleRate = 22050; + This->params.dwFeatures = flags; + This->params.clsidDefaultSynth = CLSID_DirectMusicSynthSink; + } else + This->params = *params; + + if (default_path_type) + hr = IDirectMusicPerformance8_CreateStandardAudioPath(iface, default_path_type, + num_channels, FALSE, &This->pDefaultPath); - PostMessageToProcessMsgThread(This, PROCESSMSG_START); + PostMessageToProcessMsgThread(This, PROCESSMSG_START); - return hr; + return hr; } static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPerformance8 *iface,

1 0

Michael Stefaniuc : dmime: Forward Init() to InitAudio().
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 01c6b4fe640b475da96bcf2517d30f2c287bd9db URL: http://source.winehq.org/git/wine.git/?a=commit;h=01c6b4fe640b475da96bcf251… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:50 2017 +0200 dmime: Forward Init() to InitAudio(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index bbfc04f..2b9c984 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -247,43 +247,12 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance /* IDirectMusicPerformanceImpl IDirectMusicPerformance Interface part: */ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init(IDirectMusicPerformance8 *iface, - IDirectMusic **ppDirectMusic, IDirectSound *pDirectSound, HWND hWnd) + IDirectMusic **dmusic, IDirectSound *dsound, HWND hwnd) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - - FIXME("(iface = %p, dmusic = %p, dsound = %p, hwnd = %p)\n", This, ppDirectMusic, pDirectSound, hWnd); - if (This->dmusic) - return DMUS_E_ALREADY_INITED; - - if (NULL != pDirectSound) { - This->dsound = pDirectSound; - IDirectSound_AddRef(This->dsound); - } else { - DirectSoundCreate8(NULL, (IDirectSound8 **) &This->dsound, NULL); - if (!This->dsound) return DSERR_NODRIVER; + TRACE("(%p, %p, %p, %p)\n", iface, dmusic, dsound, hwnd); - if (!hWnd) - hWnd = GetForegroundWindow(); - IDirectSound_SetCooperativeLevel(This->dsound, hWnd, DSSCL_PRIORITY); - } - - if (NULL != ppDirectMusic && NULL != *ppDirectMusic) { - /* app creates its own dmusic object and gives it to performance */ - This->dmusic = (IDirectMusic8 *)*ppDirectMusic; - IDirectMusic8_AddRef(This->dmusic); - } else { - HRESULT hr; - /* App enables the performance to initialize itself and needs a pointer to object */ - hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void **)&This->dmusic); - if (FAILED(hr)) - return hr; - if (ppDirectMusic) { - *ppDirectMusic = (IDirectMusic *)This->dmusic; - IDirectMusic8_AddRef((LPDIRECTMUSIC8)*ppDirectMusic); - } - } - - return S_OK; + return IDirectMusicPerformance8_InitAudio(iface, dmusic, dsound ? &dsound : NULL, hwnd, 0, 0, + 0, NULL); } static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment(IDirectMusicPerformance8 *iface,

1 0

Michael Stefaniuc : dmusic: Set the dsound pointer to NULL on an error path.
by Alexandre Julliard 11 May '17

11 May '17

Module: wine Branch: master Commit: 3b4909fd9424e299f8ad11fe1deec11579ed9a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4909fd9424e299f8ad11fe1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu May 11 11:05:51 2017 +0200 dmusic: Set the dsound pointer to NULL on an error path. Spotted by Sebastian Lackner. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index d5d061c..105e6f7 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -298,8 +298,10 @@ static HRESULT WINAPI IDirectMusic8Impl_SetDirectSound(IDirectMusic8 *iface, IDi return hr; hr = IDirectSound_SetCooperativeLevel(This->dsound, hwnd ? hwnd : GetForegroundWindow(), DSSCL_PRIORITY); - if (FAILED(hr)) + if (FAILED(hr)) { IDirectSound_Release(This->dsound); + This->dsound = NULL; + } return hr; }

1 0