[PATCH v2 0/2] MR54: winecoreaudio: Enable compilation with long types.

List overview All Threads

newer

older

[PATCH] ntdll/tests: Fix thread...

[PATCH 0/2] MR54: winecoreaudio:...

Huw Davies (＠huw)

11 May 2022 11 May '22

5:01 p.m.

-- v2: winecoreaudio: Enable compilation with long types. winecoreaudio: Remove DWORDs from the midi syscall interface.

https://gitlab.winehq.org/wine/wine/-/merge_requests/54

Show replies by date

Huw Davies

11 May 11 May

5:01 p.m.

New subject: [PATCH v2 1/2] winecoreaudio: Remove DWORDs from the midi syscall interface.

From: Huw Davies huw@codeweavers.com

This makes it consistent with the other drivers.

Signed-off-by: Huw Davies huw@codeweavers.com --- dlls/winecoreaudio.drv/coremidi.c | 64 +++++++++++++++---------------- dlls/winecoreaudio.drv/midi.c | 6 +-- dlls/winecoreaudio.drv/unixlib.h | 28 +++++++------- 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 998b8f1bd46..bd5322cbc22 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -116,7 +116,7 @@ struct midi_src MIDIOPENDESC midiDesc; LPMIDIHDR lpQueueHdr; WORD wFlags; - DWORD startTime; + UINT startTime; };

static MIDIClientRef midi_client; @@ -143,7 +143,7 @@ static void midi_in_lock(BOOL lock) }

static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, - DWORD_PTR param_1, DWORD_PTR param_2) + UINT_PTR param_1, UINT_PTR param_2) { notify->send_notify = TRUE; notify->dev_id = dev_id; @@ -220,7 +220,7 @@ static uint64_t get_time_ms(void) static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) { unsigned int pos = 0, len = packet->length, copy_len; - DWORD current_time = get_time_ms() - src->startTime; + UINT current_time = get_time_ms() - src->startTime; struct notify_context notify;

src->state |= 2; @@ -244,7 +244,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet) src->lpQueueHdr = hdr->lpNext; hdr->dwFlags &= ~MHDR_INQUEUE; hdr->dwFlags |= MHDR_DONE; - set_in_notify(&notify, src, src->wDevID, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); + set_in_notify(&notify, src, src->wDevID, MIM_LONGDATA, (UINT_PTR)hdr, current_time); notify_post(&notify); src->state &= ~2; } @@ -255,7 +255,7 @@ static void process_sysex_packet(struct midi_src *src, MIDIPacket *packet)

static void process_small_packet(struct midi_src *src, MIDIPacket *packet) { - DWORD current_time = get_time_ms() - src->startTime, data; + UINT current_time = get_time_ms() - src->startTime, data; struct notify_context notify; unsigned int pos = 0;

@@ -547,7 +547,7 @@ static BOOL synth_unit_close(AUGraph graph) }

static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, - DWORD_PTR param_1, DWORD_PTR param_2) + UINT_PTR param_1, UINT_PTR param_2) { notify->send_notify = TRUE; notify->dev_id = dev_id; @@ -560,7 +560,7 @@ static void set_out_notify(struct notify_context *notify, struct midi_dest *dest notify->instance = dest->midiDesc.dwInstance; }

-static DWORD midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, struct notify_context *notify) +static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, struct notify_context *notify) { struct midi_dest *dest;

@@ -606,7 +606,7 @@ static DWORD midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, st return MMSYSERR_NOERROR; }

-static DWORD midi_out_close(WORD dev_id, struct notify_context *notify) +static UINT midi_out_close(WORD dev_id, struct notify_context *notify) { struct midi_dest *dest;

@@ -642,7 +642,7 @@ static void midi_send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, uns if (packet) MIDISend(port, dest, packet_list); }

-static DWORD midi_out_data(WORD dev_id, DWORD data) +static UINT midi_out_data(WORD dev_id, UINT data) { struct midi_dest *dest; UInt8 bytes[3]; @@ -678,7 +678,7 @@ static DWORD midi_out_data(WORD dev_id, DWORD data) return MMSYSERR_NOERROR; }

-static DWORD midi_out_long_data(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size, struct notify_context *notify) +static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct notify_context *notify) { struct midi_dest *dest; OSStatus sc; @@ -729,12 +729,12 @@ static DWORD midi_out_long_data(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size, struc hdr->dwFlags &= ~MHDR_INQUEUE; hdr->dwFlags |= MHDR_DONE;

- set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0); + set_out_notify(notify, dest, dev_id, MOM_DONE, (UINT_PTR)hdr, 0);

return MMSYSERR_NOERROR; }

-static DWORD midi_out_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size);

@@ -749,7 +749,7 @@ static DWORD midi_out_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; }

-static DWORD midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size);

@@ -764,7 +764,7 @@ static DWORD midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; }

-static DWORD midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, DWORD size) +static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) { TRACE("dev_id = %d caps = %p size = %d\n", dev_id, caps, size);

@@ -783,13 +783,13 @@ static DWORD midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, DWORD size) return MMSYSERR_NOERROR; }

-static DWORD midi_out_get_num_devs(void) +static UINT midi_out_get_num_devs(void) { TRACE("\n"); return num_dests; }

-static DWORD midi_out_get_volume(WORD dev_id, DWORD *volume) +static UINT midi_out_get_volume(WORD dev_id, UINT *volume) { TRACE("%d\n", dev_id);

@@ -818,7 +818,7 @@ static DWORD midi_out_get_volume(WORD dev_id, DWORD *volume) return MMSYSERR_NOTSUPPORTED; }

-static DWORD midi_out_set_volume(WORD dev_id, DWORD volume) +static UINT midi_out_set_volume(WORD dev_id, UINT volume) { TRACE("dev_id = %d vol = %08x\n", dev_id, volume);

@@ -843,7 +843,7 @@ static DWORD midi_out_set_volume(WORD dev_id, DWORD volume) return MMSYSERR_NOTSUPPORTED; }

-static DWORD midi_out_reset(WORD dev_id) +static UINT midi_out_reset(WORD dev_id) { unsigned chn;

@@ -870,7 +870,7 @@ static DWORD midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; }

-static DWORD midi_in_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, struct notify_context *notify) +static UINT midi_in_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, struct notify_context *notify) { struct midi_src *src;

@@ -915,7 +915,7 @@ static DWORD midi_in_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, str return MMSYSERR_NOERROR; }

-static DWORD midi_in_close(WORD dev_id, struct notify_context *notify) +static UINT midi_in_close(WORD dev_id, struct notify_context *notify) { struct midi_src *src;

@@ -941,7 +941,7 @@ static DWORD midi_in_close(WORD dev_id, struct notify_context *notify) return MMSYSERR_NOERROR; }

-static DWORD midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { MIDIHDR **next;

@@ -984,7 +984,7 @@ static DWORD midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; }

-static DWORD midi_in_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +static UINT midi_in_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { TRACE("dev_id = %d hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size);

@@ -999,7 +999,7 @@ static DWORD midi_in_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; }

-static DWORD midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +static UINT midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { TRACE("dev_id = %d hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size);

@@ -1014,7 +1014,7 @@ static DWORD midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; }

-static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) +static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) { TRACE("dev_id = %d caps = %p size = %d\n", dev_id, caps, size);

@@ -1033,13 +1033,13 @@ static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) return MMSYSERR_NOERROR; }

-static DWORD midi_in_get_num_devs(void) +static UINT midi_in_get_num_devs(void) { TRACE("\n"); return num_srcs; }

-static DWORD midi_in_start(WORD dev_id) +static UINT midi_in_start(WORD dev_id) { TRACE("%d\n", dev_id);

@@ -1053,7 +1053,7 @@ static DWORD midi_in_start(WORD dev_id) return MMSYSERR_NOERROR; }

-static DWORD midi_in_stop(WORD dev_id) +static UINT midi_in_stop(WORD dev_id) { TRACE("%d\n", dev_id);

@@ -1066,10 +1066,10 @@ static DWORD midi_in_stop(WORD dev_id) return MMSYSERR_NOERROR; }

-static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) +static UINT midi_in_reset(WORD dev_id, struct notify_context *notify) { - DWORD cur_time = get_time_ms(); - DWORD err = MMSYSERR_NOERROR; + UINT cur_time = get_time_ms(); + UINT err = MMSYSERR_NOERROR; struct midi_src *src; MIDIHDR *hdr;

@@ -1090,7 +1090,7 @@ static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) src->lpQueueHdr = hdr->lpNext; hdr->dwFlags &= ~MHDR_INQUEUE; hdr->dwFlags |= MHDR_DONE; - set_in_notify(notify, src, dev_id, MIM_LONGDATA, (DWORD_PTR)hdr, cur_time - src->startTime); + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (UINT_PTR)hdr, cur_time - src->startTime); if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ }

@@ -1138,7 +1138,7 @@ NTSTATUS midi_out_message(void *args) *params->err = midi_out_get_num_devs(); break; case MODM_GETVOLUME: - *params->err = midi_out_get_volume(params->dev_id, (DWORD *)params->param_1); + *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1); break; case MODM_SETVOLUME: *params->err = midi_out_set_volume(params->dev_id, params->param_1); diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6c6752c0c76..ea9ec40060a 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -70,7 +70,7 @@ static DWORD WINAPI notify_thread(void *p) static LONG CoreAudio_MIDIInit(void) { struct midi_init_params params; - DWORD err; + UINT err;

params.err = &err;

@@ -102,7 +102,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR { struct midi_out_message_params params; struct notify_context notify; - DWORD err; + UINT err;

TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);

@@ -128,7 +128,7 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR { struct midi_in_message_params params; struct notify_context notify; - DWORD err; + UINT err;

TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);

diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index d92dbb5e33f..1c7dcebb52d 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -185,7 +185,7 @@ struct set_volumes_params

struct midi_init_params { - DWORD *err; + UINT *err; };

struct notify_context @@ -193,22 +193,22 @@ struct notify_context BOOL send_notify; WORD dev_id; WORD msg; - DWORD_PTR param_1; - DWORD_PTR param_2; - DWORD_PTR callback; - DWORD flags; + UINT_PTR param_1; + UINT_PTR param_2; + UINT_PTR callback; + UINT flags; HANDLE device; - DWORD_PTR instance; + UINT_PTR instance; };

struct midi_out_message_params { UINT dev_id; UINT msg; - DWORD_PTR user; - DWORD_PTR param_1; - DWORD_PTR param_2; - DWORD *err; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; struct notify_context *notify; };

@@ -216,10 +216,10 @@ struct midi_in_message_params { UINT dev_id; UINT msg; - DWORD_PTR user; - DWORD_PTR param_1; - DWORD_PTR param_2; - DWORD *err; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; struct notify_context *notify; };

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/54

Eric Pouech

5:01 p.m.

New subject: [PATCH v2 2/2] winecoreaudio: Enable compilation with long types.

From: Eric Pouech eric.pouech@gmail.com

Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Huw Davies huw@codeweavers.com --- dlls/winecoreaudio.drv/Makefile.in | 1 - dlls/winecoreaudio.drv/coreaudio.c | 6 ++--- dlls/winecoreaudio.drv/midi.c | 10 ++++---- dlls/winecoreaudio.drv/mmdevdrv.c | 40 +++++++++++++++--------------- 4 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index e21cc07f62e..4be396c489c 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winecoreaudio.drv UNIXLIB = winecoreaudio.so IMPORTS = uuid ole32 user32 advapi32 diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 8fe568e52b5..2a9dcde0675 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -750,10 +750,10 @@ static NTSTATUS release_stream( void *args ) 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; - DWORD mask = 0; + UINT mask = 0;

for (i = 0; i < layout->mNumberChannelDescriptions; ++i) { switch (layout->mChannelDescriptions[i].mChannelLabel) { @@ -792,7 +792,7 @@ static DWORD ca_channel_layout_to_channel_mask(const AudioChannelLayout *layout) * would report for a given channel layout. */ 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);

diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index ea9ec40060a..4934923800c 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -43,7 +43,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi);

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, notify->instance, notify->param_1, notify->param_2); @@ -104,7 +104,7 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR struct notify_context notify; 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.msg = wMsg; @@ -130,7 +130,7 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR struct notify_context notify; 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.msg = wMsg; @@ -186,7 +186,7 @@ static LRESULT CoreAudio_drvOpen(LPSTR str) */ static DWORD CoreAudio_drvClose(DWORD dwDevID) { - TRACE("(%08x)\n", dwDevID); + TRACE("(%08lx)\n", dwDevID); return 1; }

@@ -196,7 +196,7 @@ static DWORD CoreAudio_drvClose(DWORD dwDevID) LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, 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" : wMsg == DRV_FREE ? "DRV_FREE" : wMsg == DRV_OPEN ? "DRV_OPEN" : diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index acdc0891a11..da6c05bdc1f 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -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, NULL, &drv_key, NULL); if(lr != ERROR_SUCCESS){ - ERR("RegCreateKeyEx(drv_key) failed: %u\n", lr); + ERR("RegCreateKeyEx(drv_key) failed: %lu\n", lr); return; } opened = TRUE; @@ -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, NULL, &key, NULL); 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; }

lr = RegSetValueExW(key, L"guid", 0, REG_BINARY, (BYTE*)guid, sizeof(GUID)); 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); exit: @@ -284,7 +284,7 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) RegCloseKey(key); 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); } RegCloseKey(dev_key); @@ -507,7 +507,7 @@ static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface) ACImpl *This = impl_from_IAudioClient3(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; }

@@ -518,7 +518,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ULONG ref;

ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref){ if(This->timer){ HANDLE event; @@ -567,15 +567,15 @@ static void dump_fmt(const WAVEFORMATEX *fmt) TRACE(")\n");

TRACE("nChannels: %u\n", fmt->nChannels); - TRACE("nSamplesPerSec: %u\n", fmt->nSamplesPerSec); - TRACE("nAvgBytesPerSec: %u\n", fmt->nAvgBytesPerSec); + TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec); + TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec); TRACE("nBlockAlign: %u\n", fmt->nBlockAlign); TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample); TRACE("cbSize: %u\n", fmt->cbSize);

if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; - TRACE("dwChannelMask: %08x\n", fmtex->dwChannelMask); + TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask); TRACE("Samples: %04x\n", fmtex->Samples.wReserved); TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat)); } @@ -671,7 +671,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, stream_handle stream; 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));

if(!fmt) @@ -692,7 +692,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED | AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY | AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){ - FIXME("Unknown flags: %08x\n", flags); + FIXME("Unknown flags: %08lx\n", flags); return E_INVALIDARG; }

@@ -947,7 +947,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) This->period_ms, WT_EXECUTEINTIMERTHREAD)){ This->timer = NULL; IAudioClient3_Stop(iface); - WARN("Unable to create timer: %u\n", GetLastError()); + WARN("Unable to create timer: %lu\n", GetLastError()); return E_OUTOFMEMORY; } } @@ -1183,7 +1183,7 @@ static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *ifa { 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; } @@ -1275,7 +1275,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( ACImpl *This = impl_from_IAudioRenderClient(iface); 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.frames = frames; @@ -1578,7 +1578,7 @@ static ULONG WINAPI AudioSessionControl_AddRef(IAudioSessionControl2 *iface) AudioSessionWrapper *This = impl_from_IAudioSessionControl2(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; }

@@ -1590,7 +1590,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) EnterCriticalSection(&g_sessions_lock);

ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref){ if(This->client){ This->client->session_wrapper = NULL; @@ -2272,7 +2272,7 @@ static ULONG WINAPI AudioSessionManager_AddRef(IAudioSessionManager2 *iface) SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); return ref; }

@@ -2281,7 +2281,7 @@ static ULONG WINAPI AudioSessionManager_Release(IAudioSessionManager2 *iface) SessionMgr *This = impl_from_IAudioSessionManager2(iface); ULONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) Refcount now %u\n", This, ref); + TRACE("(%p) Refcount now %lu\n", This, ref); if(!ref) HeapFree(GetProcessHeap(), 0, This); return ref; @@ -2296,7 +2296,7 @@ static HRESULT WINAPI AudioSessionManager_GetAudioSessionControl( AudioSessionWrapper *wrapper; 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);

hr = get_audio_session(session_guid, This->device, 0, &session); @@ -2323,7 +2323,7 @@ static HRESULT WINAPI AudioSessionManager_GetSimpleAudioVolume( AudioSessionWrapper *wrapper; 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);

hr = get_audio_session(session_guid, This->device, 0, &session);

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/54

Huw Davies (＠huw)

5:03 p.m.

On Wed May 11 17:01:44 2022 +0000, Huw Davies wrote:

...

changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/54/diffs?diff_id=672&start_sha=b43e3a885676d13e68742e3896b1354e6296a9eb#e23df20cc4ca0c034517569317dbd9fb0d9276db_1093_1093)

Argh, sorry about that, good catch. I've updated the commits.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/54#note_771

Andrew Eikum (＠aeikum)

5:25 p.m.

New subject: [PATCH v2 0/2] MR54: winecoreaudio: Enable compilation with long types. - approved

This merge request was approved by Andrew Eikum.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/54

957

Age (days ago)

957

Last active (days ago)

wine-devel@winehq.org

4 comments

4 participants

tags (0)

participants (4)

Andrew Eikum (＠aeikum)
Eric Pouech
Huw Davies
Huw Davies (＠huw)