Skip to content

W
wine-cw
Commit ae39289c authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

winecoreaudio: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ca1e298f
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 29 deletions
dlls/winecoreaudio.drv/Makefile.in
View file @ ae39289c
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = winecoreaudio.drv MODULE = winecoreaudio.drv
UNIXLIB = winecoreaudio.so UNIXLIB = winecoreaudio.so
IMPORTS = uuid ole32 user32 advapi32 IMPORTS = uuid ole32 user32 advapi32
......
dlls/winecoreaudio.drv/coreaudio.c
View file @ ae39289c
...@@ -750,10 +750,10 @@ static NTSTATUS release_stream( void *args ) ...@@ -750,10 +750,10 @@ static NTSTATUS release_stream( void *args )
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) static UINT ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout)
{ {
int i; int i;
DWORD mask = 0; UINT mask = 0;
for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { for (i = 0; i < layout->mNumberChannelDescriptions; ++i) {
switch (layout->mChannelDescriptions[i].mChannelLabel) { switch (layout->mChannelDescriptions[i].mChannelLabel) {
...@@ -792,7 +792,7 @@ static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) ...@@ -792,7 +792,7 @@ static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout)
* would report for a given channel layout. */ * would report for a given channel layout. */
static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt) static void convert_channel_layout(const AudioChannelLayout *ca_layout, WAVEFORMATEXTENSIBLE *fmt)
{ {
DWORD ca_mask = ca_channel_layout_to_channel_mask(ca_layout); UINT ca_mask = ca_channel_layout_to_channel_mask(ca_layout);
TRACE("Got channel mask for CA: 0x%x\n", ca_mask); TRACE("Got channel mask for CA: 0x%x\n", ca_mask);
......
dlls/winecoreaudio.drv/midi.c
View file @ ae39289c
...@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); ...@@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi);
static void notify_client(struct notify_context *notify) static void notify_client(struct notify_context *notify)
{ {
TRACE("dev_id=%d msg=%d param1=%04lX param2=%04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); TRACE("dev_id=%d msg=%d param1=%04IX param2=%04IX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2);
DriverCallback(notify->callback, notify->flags, notify->device, notify->msg, DriverCallback(notify->callback, notify->flags, notify->device, notify->msg,
notify->instance, notify->param_1, notify->param_2); notify->instance, notify->param_1, notify->param_2);
...@@ -104,7 +104,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR ...@@ -104,7 +104,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR
struct notify_context notify; struct notify_context notify;
UINT err; UINT err;
TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); TRACE("%d %08x %08Ix %08Ix %08Ix\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
params.dev_id = wDevID; params.dev_id = wDevID;
params.msg = wMsg; params.msg = wMsg;
...@@ -130,7 +130,7 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR ...@@ -130,7 +130,7 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR
struct notify_context notify; struct notify_context notify;
UINT err; UINT err;
TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); TRACE("%d %08x %08Ix %08Ix %08Ix\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
params.dev_id = wDevID; params.dev_id = wDevID;
params.msg = wMsg; params.msg = wMsg;
...@@ -186,7 +186,7 @@ static LRESULT CoreAudio_drvOpen(LPSTR str) ...@@ -186,7 +186,7 @@ static LRESULT CoreAudio_drvOpen(LPSTR str)
*/ */
static DWORD CoreAudio_drvClose(DWORD dwDevID) static DWORD CoreAudio_drvClose(DWORD dwDevID)
{ {
TRACE("(%08x)\n", dwDevID); TRACE("(%08lx)\n", dwDevID);
return 1; return 1;
} }
...@@ -196,7 +196,7 @@ static DWORD CoreAudio_drvClose(DWORD dwDevID) ...@@ -196,7 +196,7 @@ static DWORD CoreAudio_drvClose(DWORD dwDevID)
LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
LPARAM dwParam1, LPARAM dwParam2) LPARAM dwParam1, LPARAM dwParam2)
{ {
TRACE("(%08lX, %p, %s (%08X), %08lX, %08lX)\n", TRACE("(%08IX, %p, %s (%08X), %08IX, %08IX)\n",
dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" : dwDevID, hDriv, wMsg == DRV_LOAD ? "DRV_LOAD" :
wMsg == DRV_FREE ? "DRV_FREE" : wMsg == DRV_FREE ? "DRV_FREE" :
wMsg == DRV_OPEN ? "DRV_OPEN" : wMsg == DRV_OPEN ? "DRV_OPEN" :
......
dlls/winecoreaudio.drv/mmdevdrv.c
View file @ ae39289c
...@@ -237,7 +237,7 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, ...@@ -237,7 +237,7 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name,
lr = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, KEY_WRITE, lr = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, KEY_WRITE,
NULL, &drv_key, NULL); NULL, &drv_key, NULL);
if(lr != ERROR_SUCCESS){ if(lr != ERROR_SUCCESS){
ERR("RegCreateKeyEx(drv_key) failed: %u\n", lr); ERR("RegCreateKeyEx(drv_key) failed: %lu\n", lr);
return; return;
} }
opened = TRUE; opened = TRUE;
...@@ -246,14 +246,14 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, ...@@ -246,14 +246,14 @@ static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name,
lr = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_WRITE, lr = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_WRITE,
NULL, &key, NULL); NULL, &key, NULL);
if(lr != ERROR_SUCCESS){ if(lr != ERROR_SUCCESS){
ERR("RegCreateKeyEx(%s) failed: %u\n", wine_dbgstr_w(key_name), lr); ERR("RegCreateKeyEx(%s) failed: %lu\n", wine_dbgstr_w(key_name), lr);
goto exit; goto exit;
} }
lr = RegSetValueExW(key, L"guid", 0, REG_BINARY, (BYTE*)guid, lr = RegSetValueExW(key, L"guid", 0, REG_BINARY, (BYTE*)guid,
sizeof(GUID)); sizeof(GUID));
if(lr != ERROR_SUCCESS) if(lr != ERROR_SUCCESS)
ERR("RegSetValueEx(%s\\guid) failed: %u\n", wine_dbgstr_w(key_name), lr); ERR("RegSetValueEx(%s\\guid) failed: %lu\n", wine_dbgstr_w(key_name), lr);
RegCloseKey(key); RegCloseKey(key);
exit: exit:
...@@ -284,7 +284,7 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) ...@@ -284,7 +284,7 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid)
RegCloseKey(key); RegCloseKey(key);
return; return;
} }
ERR("Invalid type for device %s GUID: %u; ignoring and overwriting\n", ERR("Invalid type for device %s GUID: %lu; ignoring and overwriting\n",
wine_dbgstr_w(key_name), type); wine_dbgstr_w(key_name), type);
} }
RegCloseKey(dev_key); RegCloseKey(dev_key);
...@@ -507,7 +507,7 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) ...@@ -507,7 +507,7 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface)
ACImpl *This = impl_from_IAudioClient3(iface); ACImpl *This = impl_from_IAudioClient3(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %lu\n", This, ref);
return ref; return ref;
} }
...@@ -518,7 +518,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ...@@ -518,7 +518,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
ULONG ref; ULONG ref;
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %lu\n", This, ref);
if(!ref){ if(!ref){
if(This->timer){ if(This->timer){
HANDLE event; HANDLE event;
...@@ -567,15 +567,15 @@ static void dump_fmt(const WAVEFORMATEX *fmt) ...@@ -567,15 +567,15 @@ static void dump_fmt(const WAVEFORMATEX *fmt)
TRACE(")\n"); TRACE(")\n");
TRACE("nChannels: %u\n", fmt->nChannels); TRACE("nChannels: %u\n", fmt->nChannels);
TRACE("nSamplesPerSec: %u\n", fmt->nSamplesPerSec); TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec);
TRACE("nAvgBytesPerSec: %u\n", fmt->nAvgBytesPerSec); TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec);
TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); TRACE("nBlockAlign: %u\n", fmt->nBlockAlign);
TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample);
TRACE("cbSize: %u\n", fmt->cbSize); TRACE("cbSize: %u\n", fmt->cbSize);
if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt;
TRACE("dwChannelMask: %08x\n", fmtex->dwChannelMask); TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask);
TRACE("Samples: %04x\n", fmtex->Samples.wReserved); TRACE("Samples: %04x\n", fmtex->Samples.wReserved);
TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat));
} }
...@@ -671,7 +671,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ...@@ -671,7 +671,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
stream_handle stream; stream_handle stream;
UINT32 i; UINT32 i;
TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags,
wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid));
if(!fmt) if(!fmt)
...@@ -692,7 +692,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ...@@ -692,7 +692,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED |
AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY |
AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){
FIXME("Unknown flags: %08x\n", flags); FIXME("Unknown flags: %08lx\n", flags);
return E_INVALIDARG; return E_INVALIDARG;
} }
...@@ -947,7 +947,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) ...@@ -947,7 +947,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
This->period_ms, WT_EXECUTEINTIMERTHREAD)){ This->period_ms, WT_EXECUTEINTIMERTHREAD)){
This->timer = NULL; This->timer = NULL;
IAudioClient3_Stop(iface); IAudioClient3_Stop(iface);
WARN("Unable to create timer: %u\n", GetLastError()); WARN("Unable to create timer: %lu\n", GetLastError());
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
} }
...@@ -1183,7 +1183,7 @@ static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *ifa ...@@ -1183,7 +1183,7 @@ static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *ifa
{ {
ACImpl *This = impl_from_IAudioClient3(iface); ACImpl *This = impl_from_IAudioClient3(iface);
FIXME("(%p)->(0x%x, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid));
return E_NOTIMPL; return E_NOTIMPL;
} }
...@@ -1275,7 +1275,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( ...@@ -1275,7 +1275,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer(
ACImpl *This = impl_from_IAudioRenderClient(iface); ACImpl *This = impl_from_IAudioRenderClient(iface);
struct release_render_buffer_params params; struct release_render_buffer_params params;
TRACE("(%p)->(%u, %x)\n", This, frames, flags); TRACE("(%p)->(%u, %lx)\n", This, frames, flags);
params.stream = This->stream; params.stream = This->stream;
params.frames = frames; params.frames = frames;
...@@ -1578,7 +1578,7 @@ static ULONG WINAPI AudioSessionControl_AddRef(IAudioSessionControl2 *iface) ...@@ -1578,7 +1578,7 @@ static ULONG WINAPI AudioSessionControl_AddRef(IAudioSessionControl2 *iface)
AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %lu\n", This, ref);
return ref; return ref;
} }
...@@ -1590,7 +1590,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) ...@@ -1590,7 +1590,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface)
EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&g_sessions_lock);
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %lu\n", This, ref);
if(!ref){ if(!ref){
if(This->client){ if(This->client){
This->client->session_wrapper = NULL; This->client->session_wrapper = NULL;
...@@ -2272,7 +2272,7 @@ static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) ...@@ -2272,7 +2272,7 @@ static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface)
SessionMgr *This = impl_from_IAudioSessionManager2(iface); SessionMgr *This = impl_from_IAudioSessionManager2(iface);
ULONG ref; ULONG ref;
ref = InterlockedIncrement(&This->ref); ref = InterlockedIncrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %lu\n", This, ref);
return ref; return ref;
} }
...@@ -2281,7 +2281,7 @@ static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) ...@@ -2281,7 +2281,7 @@ static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface)
SessionMgr *This = impl_from_IAudioSessionManager2(iface); SessionMgr *This = impl_from_IAudioSessionManager2(iface);
ULONG ref; ULONG ref;
ref = InterlockedDecrement(&This->ref); ref = InterlockedDecrement(&This->ref);
TRACE("(%p) Refcount now %u\n", This, ref); TRACE("(%p) Refcount now %lu\n", This, ref);
if(!ref) if(!ref)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return ref; return ref;
...@@ -2296,7 +2296,7 @@ static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( ...@@ -2296,7 +2296,7 @@ static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl(
AudioSessionWrapper *wrapper; AudioSessionWrapper *wrapper;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), TRACE("(%p)->(%s, %lx, %p)\n", This, debugstr_guid(session_guid),
flags, out); flags, out);
hr = get_audio_session(session_guid, This->device, 0, &session); hr = get_audio_session(session_guid, This->device, 0, &session);
...@@ -2323,7 +2323,7 @@ static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( ...@@ -2323,7 +2323,7 @@ static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume(
AudioSessionWrapper *wrapper; AudioSessionWrapper *wrapper;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%s, %x, %p)\n", This, debugstr_guid(session_guid), TRACE("(%p)->(%s, %lx, %p)\n", This, debugstr_guid(session_guid),
flags, out); flags, out);
hr = get_audio_session(session_guid, This->device, 0, &session); hr = get_audio_session(session_guid, This->device, 0, &session);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment