wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

[PATCH 3/4] winex11: Remove unused cf_xdnd from XDNDDATA.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xdnd.c | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-)

2 1

[PATCH 2/4] win32u: Move clipboard data management from user32.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/clipboard.c | 292 ++++++----------------------------- dlls/user32/edit.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 16 ++ dlls/user32/user_private.h | 2 + dlls/win32u/clipboard.c | 302 +++++++++++++++++++++++++++++++++++-- dlls/win32u/sysparams.c | 4 - include/ntuser.h | 25 ++- 8 files changed, 383 insertions(+), 262 deletions(-)

2 1

[PATCH 1/4] win32u: Add more clipboard stubs.
by Jacek Caban 25 Apr '22

25 Apr '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/clipboard.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 4 ++++ dlls/win32u/win32u.spec | 8 ++++---- dlls/win32u/win32u_private.h | 5 +++++ dlls/win32u/wrappers.c | 24 ++++++++++++++++++++++++ include/ntuser.h | 14 ++++++++++++++ 6 files changed, 87 insertions(+), 4 deletions(-)

2 1

[PATCH 6/6] winecoreaudio: Implement Wow64 midi entry points in the Unix libraray.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 8 +- dlls/winecoreaudio.drv/coremidi.c | 367 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 7 + 3 files changed, 378 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index fb36298ba57..8fe568e52b5 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1966,11 +1966,11 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_get_frequency, is_started, wow64_set_volumes, - midi_init, + wow64_midi_init, midi_release, - midi_out_message, - midi_in_message, - midi_notify_wait, + wow64_midi_out_message, + wow64_midi_in_message, + wow64_midi_notify_wait, }; #endif /* _WIN64 */ diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ba3b7096b7f..998b8f1bd46 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -1222,3 +1222,370 @@ NTSTATUS midi_notify_wait(void *args) return STATUS_SUCCESS; } + +#ifdef _WIN64 + +typedef UINT PTR32; + +NTSTATUS wow64_midi_init(void *args) +{ + struct + { + PTR32 err; + } *params32 = args; + struct midi_init_params params = + { + .err = ULongToPtr(params32->err) + }; + return midi_init(&params); +} + +struct notify_context32 +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + UINT param_1; + UINT param_2; + UINT callback; + UINT flags; + PTR32 device; + UINT instance; +}; + +static void notify_to_notify32(struct notify_context32 *notify32, + const struct notify_context *notify) +{ + notify32->send_notify = notify->send_notify; + notify32->dev_id = notify->dev_id; + notify32->msg = notify->msg; + notify32->param_1 = notify->param_1; + notify32->param_2 = notify->param_2; + notify32->callback = notify->callback; + notify32->flags = notify->flags; + notify32->device = PtrToUlong(notify->device); + notify32->instance = notify->instance; +} + +struct midi_open_desc32 +{ + PTR32 hMidi; + UINT dwCallback; + UINT dwInstance; + UINT dnDevNode; + UINT cIds; + MIDIOPENSTRMID rgIds; +}; + +struct midi_hdr32 +{ + PTR32 lpData; + UINT dwBufferLength; + UINT dwBytesRecorded; + UINT dwUser; + UINT dwFlags; + PTR32 lpNext; + UINT reserved; + UINT dwOffset; + UINT dwReserved[8]; +}; + +static UINT wow64_midi_out_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static UINT wow64_midi_out_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + +NTSTATUS wow64_midi_out_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_open_desc32 *desc32; + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIOPENDESC open_desc; + MIDIHDR hdr; + struct midi_out_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + .notify = &notify + }; + notify32->send_notify = FALSE; + + switch (params32->msg) + { + case MODM_OPEN: + desc32 = ULongToPtr(params32->param_1); + + open_desc.hMidi = ULongToPtr(desc32->hMidi); + open_desc.dwCallback = desc32->dwCallback; + open_desc.dwInstance = desc32->dwInstance; + open_desc.dnDevNode = desc32->dnDevNode; + open_desc.cIds = desc32->cIds; + open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID; + open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID; + + params.param_1 = (UINT_PTR)&open_desc; + break; + + case MODM_LONGDATA: + hdr32 = ULongToPtr(params32->param_1); + + memset(&hdr, 0, sizeof(hdr)); + hdr.lpData = ULongToPtr(hdr32->lpData); + hdr.dwBufferLength = hdr32->dwBufferLength; + hdr.dwFlags = hdr32->dwFlags; + + params.param_1 = (UINT_PTR)&hdr; + params.param_2 = sizeof(hdr); + break; + + case MODM_PREPARE: /* prepare and unprepare are easier to handle explicitly */ + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_out_prepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + + case MODM_UNPREPARE: + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_out_unprepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + } + + midi_out_message(&params); + + switch (params32->msg) + { + case MODM_LONGDATA: + hdr32 = ULongToPtr(params32->param_1); + + hdr32->dwFlags = hdr.dwFlags; + break; + } + + if (notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MOM_DONE) + notify32->param_1 = params32->param_1; /* restore the 32-bit hdr */ + } + return STATUS_SUCCESS; +} + +static UINT wow64_midi_in_prepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + + return MMSYSERR_NOERROR; +} + +static UINT wow64_midi_in_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(struct midi_hdr32, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + + return MMSYSERR_NOERROR; +} + +NTSTATUS wow64_midi_in_message(void *args) +{ + struct + { + UINT dev_id; + UINT msg; + UINT user; + UINT param_1; + UINT param_2; + PTR32 err; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_open_desc32 *desc32; + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIOPENDESC open_desc; + MIDIHDR *hdr = NULL; + struct midi_in_message_params params = + { + .dev_id = params32->dev_id, + .msg = params32->msg, + .user = params32->user, + .param_1 = params32->param_1, + .param_2 = params32->param_2, + .err = ULongToPtr(params32->err), + .notify = &notify + }; + notify32->send_notify = FALSE; + + switch (params32->msg) + { + case MIDM_OPEN: + desc32 = ULongToPtr(params32->param_1); + + open_desc.hMidi = ULongToPtr(desc32->hMidi); + open_desc.dwCallback = desc32->dwCallback; + open_desc.dwInstance = desc32->dwInstance; + open_desc.dnDevNode = desc32->dnDevNode; + open_desc.cIds = desc32->cIds; + open_desc.rgIds.dwStreamID = desc32->rgIds.dwStreamID; + open_desc.rgIds.wDeviceID = desc32->rgIds.wDeviceID; + + params.param_1 = (UINT_PTR)&open_desc; + break; + + case MIDM_ADDBUFFER: + hdr32 = ULongToPtr(params32->param_1); + + hdr = calloc(1, sizeof(*hdr)); + hdr->lpData = ULongToPtr(hdr32->lpData); + hdr->dwBufferLength = hdr32->dwBufferLength; + hdr->dwFlags = hdr32->dwFlags; + hdr->dwReserved[7] = params32->param_1; /* keep hdr32 for MIM_LONGDATA notification */ + + params.param_1 = (UINT_PTR)hdr; + params.param_2 = sizeof(*hdr); + break; + + case MIDM_PREPARE: /* prepare and unprepare are easier to handle explicitly */ + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_in_prepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + + case MIDM_UNPREPARE: + hdr32 = ULongToPtr(params32->param_1); + + *params.err = wow64_midi_in_unprepare(params32->dev_id, hdr32, params32->param_2); + return STATUS_SUCCESS; + } + + midi_in_message(&params); + + switch (params32->msg) + { + case MIDM_ADDBUFFER: + hdr32 = ULongToPtr(params32->param_1); + + if (!*params.err) + { + hdr32->dwFlags = hdr->dwFlags; + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->lpNext = 0; + } + else + free(hdr); + break; + } + + if (notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MIM_LONGDATA) + { + hdr = (MIDIHDR *)notify.param_1; + notify32->param_1 = hdr->dwReserved[7]; + hdr32 = ULongToPtr(notify32->param_1); + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->dwFlags = hdr->dwFlags; + free(hdr); + } + } + return STATUS_SUCCESS; +} + +NTSTATUS wow64_midi_notify_wait(void *args) +{ + struct + { + PTR32 quit; + PTR32 notify; + } *params32 = args; + struct notify_context32 *notify32 = ULongToPtr(params32->notify); + struct midi_hdr32 *hdr32; + struct notify_context notify; + MIDIHDR *hdr; + struct midi_notify_wait_params params = + { + .quit = ULongToPtr(params32->quit), + .notify = &notify + }; + notify32->send_notify = FALSE; + + midi_notify_wait(&params); + + if (!*params.quit && notify.send_notify) + { + notify_to_notify32(notify32, &notify); + + if (notify.msg == MIM_LONGDATA) + { + hdr = (MIDIHDR *)notify.param_1; + notify32->param_1 = hdr->dwReserved[7]; + hdr32 = ULongToPtr(notify32->param_1); + hdr32->dwBytesRecorded = hdr->dwBytesRecorded; + hdr32->dwFlags = hdr->dwFlags; + free(hdr); + } + } + return STATUS_SUCCESS; +} + +#endif /* _WIN64 */ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 56b75a55b4c..d92dbb5e33f 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -264,6 +264,13 @@ NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait( void * ) DECLSPEC_HIDDEN; +#ifdef _WIN64 +NTSTATUS wow64_midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_out_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_in_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN; +#endif + extern unixlib_handle_t coreaudio_handle; #define UNIX_CALL( func, params ) __wine_unix_call( coreaudio_handle, unix_ ## func, params ) -- 2.23.0

2 1

[PATCH 5/6] winecoreaudio: Implement Wow64 mmdevapi entry points in the Unix libraray.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 313 +++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 463a330eeda..fb36298ba57 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1661,3 +1661,316 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_in_message, midi_notify_wait, }; + +#ifdef _WIN64 + +typedef UINT PTR32; + +static NTSTATUS wow64_get_endpoint_ids(void *args) +{ + struct + { + EDataFlow flow; + PTR32 endpoints; + unsigned int size; + HRESULT result; + unsigned int num; + unsigned int default_idx; + } *params32 = args; + struct get_endpoint_ids_params params = + { + .flow = params32->flow, + .endpoints = ULongToPtr(params32->endpoints), + .size = params32->size + }; + get_endpoint_ids(&params); + params32->size = params.size; + params32->result = params.result; + params32->num = params.num; + params32->default_idx = params.default_idx; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_create_stream(void *args) +{ + struct + { + DWORD dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + REFERENCE_TIME duration; + REFERENCE_TIME period; + PTR32 fmt; + HRESULT result; + PTR32 stream; + } *params32 = args; + struct create_stream_params params = + { + .dev_id = params32->dev_id, + .flow = params32->flow, + .share = params32->share, + .duration = params32->duration, + .period = params32->period, + .fmt = ULongToPtr(params32->fmt), + .stream = ULongToPtr(params32->stream) + }; + create_stream(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_render_buffer(void *args) +{ + struct + { + stream_handle stream; + UINT32 frames; + HRESULT result; + PTR32 data; + } *params32 = args; + BYTE *data = NULL; + struct get_render_buffer_params params = + { + .stream = params32->stream, + .frames = params32->frames, + .data = &data + }; + get_render_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_capture_buffer(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 data; + PTR32 frames; + PTR32 flags; + PTR32 devpos; + PTR32 qpcpos; + } *params32 = args; + BYTE *data = NULL; + struct get_capture_buffer_params params = + { + .stream = params32->stream, + .data = &data, + .frames = ULongToPtr(params32->frames), + .flags = ULongToPtr(params32->flags), + .devpos = ULongToPtr(params32->devpos), + .qpcpos = ULongToPtr(params32->qpcpos) + }; + get_capture_buffer(&params); + params32->result = params.result; + *(unsigned int *)ULongToPtr(params32->data) = PtrToUlong(data); + return STATUS_SUCCESS; +}; + +static NTSTATUS wow64_is_format_supported(void *args) +{ + struct + { + EDataFlow flow; + DWORD dev_id; + AUDCLNT_SHAREMODE share; + PTR32 fmt_in; + PTR32 fmt_out; + HRESULT result; + } *params32 = args; + struct is_format_supported_params params = + { + .flow = params32->flow, + .dev_id = params32->dev_id, + .share = params32->share, + .fmt_in = ULongToPtr(params32->fmt_in), + .fmt_out = ULongToPtr(params32->fmt_out) + }; + is_format_supported(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_mix_format(void *args) +{ + struct + { + EDataFlow flow; + DWORD dev_id; + PTR32 fmt; + HRESULT result; + } *params32 = args; + struct get_mix_format_params params = + { + .flow = params32->flow, + .dev_id = params32->dev_id, + .fmt = ULongToPtr(params32->fmt) + }; + get_mix_format(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_buffer_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_buffer_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + get_buffer_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_latency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 latency; + } *params32 = args; + struct get_latency_params params = + { + .stream = params32->stream, + .latency = ULongToPtr(params32->latency) + }; + get_latency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_current_padding(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 padding; + } *params32 = args; + struct get_current_padding_params params = + { + .stream = params32->stream, + .padding = ULongToPtr(params32->padding) + }; + get_current_padding(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_next_packet_size(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 frames; + } *params32 = args; + struct get_next_packet_size_params params = + { + .stream = params32->stream, + .frames = ULongToPtr(params32->frames) + }; + get_next_packet_size(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_position(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 pos; + PTR32 qpctime; + } *params32 = args; + struct get_position_params params = + { + .stream = params32->stream, + .pos = ULongToPtr(params32->pos), + .qpctime = ULongToPtr(params32->qpctime) + }; + get_position(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_get_frequency(void *args) +{ + struct + { + stream_handle stream; + HRESULT result; + PTR32 freq; + } *params32 = args; + struct get_frequency_params params = + { + .stream = params32->stream, + .freq = ULongToPtr(params32->freq) + }; + get_frequency(&params); + params32->result = params.result; + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_set_volumes(void *args) +{ + struct + { + stream_handle stream; + float master_volume; + PTR32 volumes; + PTR32 session_volumes; + int channel; + } *params32 = args; + struct set_volumes_params params = + { + .stream = params32->stream, + .master_volume = params32->master_volume, + .volumes = ULongToPtr(params32->volumes), + .session_volumes = ULongToPtr(params32->session_volumes), + .channel = params32->channel + }; + return set_volumes(&params); +} + +unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_get_endpoint_ids, + wow64_create_stream, + release_stream, + start, + stop, + reset, + wow64_get_render_buffer, + release_render_buffer, + wow64_get_capture_buffer, + release_capture_buffer, + wow64_get_mix_format, + wow64_is_format_supported, + wow64_get_buffer_size, + wow64_get_latency, + wow64_get_current_padding, + wow64_get_next_packet_size, + wow64_get_position, + wow64_get_frequency, + is_started, + wow64_set_volumes, + midi_init, + midi_release, + midi_out_message, + midi_in_message, + midi_notify_wait, +}; + +#endif /* _WIN64 */ -- 2.23.0

2 1

[PATCH 4/6] winecoreaudio: Limit Wow64 buffer allocations to 32-bit addresses.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 955b7d2afaf..463a330eeda 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -615,6 +615,15 @@ static HRESULT ca_setup_audiounit(EDataFlow dataflow, AudioComponentInstance uni return S_OK; } +static ULONG_PTR zero_bits(void) +{ +#ifdef _WIN64 + return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; +#else + return 0; +#endif +} + static NTSTATUS create_stream(void *args) { struct create_stream_params *params = args; @@ -685,8 +694,8 @@ static NTSTATUS create_stream(void *args) } size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, - MEM_COMMIT, PAGE_READWRITE)){ + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; } @@ -1371,7 +1380,7 @@ static NTSTATUS get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = params->frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; @@ -1469,7 +1478,7 @@ static NTSTATUS get_capture_buffer(void *args) chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ size = stream->period_frames * stream->fmt->nBlockAlign; - NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, + NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; -- 2.23.0

2 1

[PATCH 3/6] winecoreaudio: Return offsets rather than ptrs to the strings.
by Huw Davies 25 Apr '22

25 Apr '22

This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 14 +++++++------- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++++-- dlls/winecoreaudio.drv/unixlib.h | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 901c58e5276..955b7d2afaf 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -185,7 +185,7 @@ static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) static NTSTATUS get_endpoint_ids(void *args) { struct get_endpoint_ids_params *params = args; - unsigned int num_devices, i, needed; + unsigned int num_devices, i, needed, offset; AudioDeviceID *devices, default_id; AudioObjectPropertyAddress addr; struct endpoint *endpoint; @@ -196,7 +196,7 @@ static NTSTATUS get_endpoint_ids(void *args) AudioDeviceID id; } *info; OSStatus sc; - WCHAR *ptr; + UniChar *ptr; params->num = 0; params->default_idx = 0; @@ -262,21 +262,21 @@ static NTSTATUS get_endpoint_ids(void *args) } free(devices); - needed = sizeof(*endpoint) * params->num; + offset = needed = sizeof(*endpoint) * params->num; endpoint = params->endpoints; - ptr = (WCHAR *)(endpoint + params->num); for(i = 0; i < params->num; i++){ SIZE_T len = CFStringGetLength(info[i].name); needed += (len + 1) * sizeof(WCHAR); if(needed <= params->size){ - endpoint->name = ptr; - CFStringGetCharacters(info[i].name, CFRangeMake(0, len), (UniChar*)endpoint->name); + endpoint->name = offset; + ptr = (UniChar *)((char *)params->endpoints + offset); + CFStringGetCharacters(info[i].name, CFRangeMake(0, len), ptr); ptr[len] = 0; endpoint->id = info[i].id; endpoint++; - ptr += len + 1; + offset += (len + 1) * sizeof(WCHAR); } CFRelease(info[i].name); if(info[i].id == default_id) params->default_idx = i; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index cc7b2e5bf49..acdc0891a11 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -341,13 +341,15 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, } for(i = 0; i < params.num; i++){ - int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + int size = (wcslen(name) + 1) * sizeof(WCHAR); + ids[i] = heap_alloc(size); if(!ids[i]){ params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], params.endpoints[i].name, size); + memcpy(ids[i], name, size); get_device_guid(flow, params.endpoints[i].id, guids + i); } *def_index = params.default_idx; diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 19b14c7f968..56b75a55b4c 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -23,7 +23,7 @@ typedef UINT64 stream_handle; struct endpoint { - WCHAR *name; + unsigned int name; DWORD id; }; -- 2.23.0

2 1

[PATCH 2/6] winecoreaudio: Use UINT64 handles to represent the stream.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 39 +++++++++++++++++------------- dlls/winecoreaudio.drv/mmdevdrv.c | 4 +-- dlls/winecoreaudio.drv/unixlib.h | 36 +++++++++++++-------------- 3 files changed, 42 insertions(+), 37 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5892a0e44f4..901c58e5276 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -107,6 +107,11 @@ static HRESULT osstatus_to_hresult(OSStatus sc) return E_FAIL; } +static struct coreaudio_stream *handle_get_stream(stream_handle h) +{ + return (struct coreaudio_stream *)(UINT_PTR)h; +} + /* copied from kernelbase */ static int muldiv( int a, int b, int c ) { @@ -700,7 +705,7 @@ end: free(stream->fmt); free(stream); } else - *params->stream = stream; + *params->stream = (stream_handle)(UINT_PTR)stream; return STATUS_SUCCESS; } @@ -708,7 +713,7 @@ end: static NTSTATUS release_stream( void *args ) { struct release_stream_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); SIZE_T size; if(stream->unit){ @@ -1148,7 +1153,7 @@ static void capture_resample(struct coreaudio_stream *stream) static NTSTATUS get_buffer_size(void *args) { struct get_buffer_size_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); *params->frames = stream->bufsize_frames; @@ -1212,7 +1217,7 @@ static HRESULT ca_get_max_stream_latency(struct coreaudio_stream *stream, UInt32 static NTSTATUS get_latency(void *args) { struct get_latency_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); UInt32 latency, stream_latency, size; AudioObjectPropertyAddress addr; OSStatus sc; @@ -1258,7 +1263,7 @@ static UINT32 get_current_padding_nolock(struct coreaudio_stream *stream) static NTSTATUS get_current_padding(void *args) { struct get_current_padding_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); *params->padding = get_current_padding_nolock(stream); @@ -1270,7 +1275,7 @@ static NTSTATUS get_current_padding(void *args) static NTSTATUS start(void *args) { struct start_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1289,7 +1294,7 @@ static NTSTATUS start(void *args) static NTSTATUS stop(void *args) { struct stop_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1308,7 +1313,7 @@ static NTSTATUS stop(void *args) static NTSTATUS reset(void *args) { struct reset_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1336,7 +1341,7 @@ static NTSTATUS reset(void *args) static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); SIZE_T size; UINT32 pad; @@ -1393,7 +1398,7 @@ end: static NTSTATUS release_render_buffer(void *args) { struct release_render_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); BYTE *buffer; OSSpinLockLock(&stream->lock); @@ -1437,7 +1442,7 @@ static NTSTATUS release_render_buffer(void *args) static NTSTATUS get_capture_buffer(void *args) { struct get_capture_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); UINT32 chunk_bytes, chunk_frames; LARGE_INTEGER stamp, freq; SIZE_T size; @@ -1493,7 +1498,7 @@ end: static NTSTATUS release_capture_buffer(void *args) { struct release_capture_buffer_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1521,7 +1526,7 @@ static NTSTATUS release_capture_buffer(void *args) static NTSTATUS get_next_packet_size(void *args) { struct get_next_packet_size_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); OSSpinLockLock(&stream->lock); @@ -1541,7 +1546,7 @@ static NTSTATUS get_next_packet_size(void *args) static NTSTATUS get_position(void *args) { struct get_position_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); LARGE_INTEGER stamp, freq; OSSpinLockLock(&stream->lock); @@ -1565,7 +1570,7 @@ static NTSTATUS get_position(void *args) static NTSTATUS get_frequency(void *args) { struct get_frequency_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); if(stream->share == AUDCLNT_SHAREMODE_SHARED) *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; @@ -1579,7 +1584,7 @@ static NTSTATUS get_frequency(void *args) static NTSTATUS is_started(void *args) { struct is_started_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); if(stream->playing) params->result = S_OK; @@ -1592,7 +1597,7 @@ static NTSTATUS is_started(void *args) static NTSTATUS set_volumes(void *args) { struct set_volumes_params *params = args; - struct coreaudio_stream *stream = params->stream; + struct coreaudio_stream *stream = handle_get_stream(params->stream); Float32 level = 1.0, tmp; OSStatus sc; UINT32 i; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2ba4e7ee028..cc7b2e5bf49 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -103,7 +103,7 @@ struct ACImpl { AudioSession *session; AudioSessionWrapper *session_wrapper; - struct coreaudio_stream *stream; + stream_handle stream; struct list entry; }; @@ -666,7 +666,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, ACImpl *This = impl_from_IAudioClient3(iface); struct release_stream_params release_params; struct create_stream_params params; - struct coreaudio_stream *stream; + stream_handle stream; UINT32 i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e48670ab2f0..19b14c7f968 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -19,7 +19,7 @@ */ #include "mmddk.h" -struct coreaudio_stream; +typedef UINT64 stream_handle; struct endpoint { @@ -46,36 +46,36 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; - struct coreaudio_stream **stream; + stream_handle *stream; }; struct release_stream_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct start_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct stop_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct reset_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct get_render_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; UINT32 frames; HRESULT result; BYTE **data; @@ -83,7 +83,7 @@ struct get_render_buffer_params struct release_render_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; UINT32 frames; DWORD flags; HRESULT result; @@ -91,7 +91,7 @@ struct release_render_buffer_params struct get_capture_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; BYTE **data; UINT32 *frames; @@ -102,7 +102,7 @@ struct get_capture_buffer_params struct release_capture_buffer_params { - struct coreaudio_stream *stream; + stream_handle stream; UINT32 done; HRESULT result; }; @@ -127,35 +127,35 @@ struct is_format_supported_params struct get_buffer_size_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_latency_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; REFERENCE_TIME *latency; }; struct get_current_padding_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT32 *padding; }; struct get_next_packet_size_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_position_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT64 *pos; UINT64 *qpctime; @@ -163,20 +163,20 @@ struct get_position_params struct get_frequency_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; UINT64 *freq; }; struct is_started_params { - struct coreaudio_stream *stream; + stream_handle stream; HRESULT result; }; struct set_volumes_params { - struct coreaudio_stream *stream; + stream_handle stream; float master_volume; const float *volumes; const float *session_volumes; -- 2.23.0

2 1

[PATCH 4/4] wineoss: Move MODM_RESET to the unixlib.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 47 -------------------------------------- dlls/wineoss.drv/ossmidi.c | 43 +++++++++++++++++++++++++++++++--- dlls/wineoss.drv/unixlib.h | 14 ------------ 3 files changed, 40 insertions(+), 64 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 8c3a2405b0f..470e8e4403d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -64,13 +64,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static WINE_MIDIIN *MidiInDev; -static WINE_MIDIOUT *MidiOutDev; - -/* this is the total number of MIDI out devices found (synth and port) */ -static int MODM_NumDevs = 0; -/* this is the number of FM synthesizers (index from 0 to NUMFMSYNTHDEVS - 1) */ -static int MODM_NumFMSynthDevs = 0; -/* the Midi ports have index from NUMFMSYNTHDEVS to NumDevs - 1 */ /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; @@ -119,9 +112,6 @@ static LRESULT OSS_MidiInit(void) if (!err) { MidiInDev = params.srcs; - MidiOutDev = params.dests; - MODM_NumDevs = params.num_dests; - MODM_NumFMSynthDevs = params.num_synths; MIDM_NumDevs = params.num_srcs; } return err; @@ -140,10 +130,6 @@ static LRESULT OSS_MidiExit(void) return 1; MidiInDev = NULL; - MidiOutDev = NULL; - - MODM_NumDevs = 0; - MODM_NumFMSynthDevs = 0; MIDM_NumDevs = 0; return 0; @@ -646,37 +632,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/*-----------------------------------------------------------------------*/ - -DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - -/************************************************************************** - * modReset [internal] - */ -static DWORD modReset(WORD wDevID) -{ - unsigned chn; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ - for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - OSS_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CTL_CHANGE | chn, 0); - /* remove sustain on all channels */ - OSS_modMessage(wDevID, MODM_DATA, 0, (CTL_SUSTAIN << 8) | MIDI_CTL_CHANGE | chn, 0); - } - /* FIXME: the LongData buffers must also be returned to the app */ - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -742,8 +697,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_RESET: - return modReset(wDevID); } params.dev_id = wDevID; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 4b419c2716c..ba3017a5ad7 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -48,6 +48,17 @@ #include "unixlib.h" +struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ + MIDIOUTCAPSW caps; + int fd; +}; + static unsigned int num_dests, num_srcs, num_synths, seq_refs; static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; @@ -381,10 +392,7 @@ wrapup: *params->err = 0; params->num_srcs = num_srcs; - params->num_dests = num_dests; - params->num_synths = num_synths; params->srcs = srcs; - params->dests = dests; return STATUS_SUCCESS; } @@ -1065,6 +1073,32 @@ static UINT midi_out_get_volume(WORD dev_id, UINT *volume) return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; } +static UINT midi_out_reset(WORD dev_id) +{ + struct midi_dest *dest; + unsigned chn; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + /* stop all notes */ + /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that + * it's channel dependent... + */ + for (chn = 0; chn < 16; chn++) + { + /* turn off every note */ + midi_out_data(dev_id, 0x7800 | MIDI_CTL_CHANGE | chn); + /* remove sustain on all channels */ + midi_out_data(dev_id, (CTL_SUSTAIN << 8) | MIDI_CTL_CHANGE | chn); + } + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1108,6 +1142,9 @@ NTSTATUS midi_out_message(void *args) case MODM_SETVOLUME: *params->err = 0; break; + case MODM_RESET: + *params->err = midi_out_reset(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index d56e11b8d23..183f5017d04 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -225,24 +225,10 @@ typedef struct midi_src int fd; } WINE_MIDIIN; -typedef struct midi_dest -{ - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIHDR *lpQueueHdr; - void *lpExtra; /* according to port type (MIDI, FM...), extra data when needed */ - MIDIOUTCAPSW caps; - int fd; -} WINE_MIDIOUT; - struct midi_init_params { UINT *err; - unsigned int num_dests; unsigned int num_srcs; - unsigned int num_synths; - struct midi_dest *dests; struct midi_src *srcs; }; -- 2.25.1

2 1

[PATCH 3/4] wineoss: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 15 --------------- dlls/wineoss.drv/ossmidi.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index cc8fc54568c..8c3a2405b0f 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -648,17 +648,6 @@ static DWORD midStop(WORD wDevID) /*-----------------------------------------------------------------------*/ -/************************************************************************** - * modGetVolume [internal] - */ -static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) -{ - if (!lpdwVolume) return MMSYSERR_INVALPARAM; - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - *lpdwVolume = 0xFFFFFFFF; - return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; -} - DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); @@ -753,10 +742,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_GETVOLUME: - return modGetVolume(wDevID, (DWORD*)dwParam1); - case MODM_SETVOLUME: - return 0; case MODM_RESET: return modReset(wDevID); } diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index f307a54b81f..4b419c2716c 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1056,6 +1056,14 @@ static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_volume(WORD dev_id, UINT *volume) +{ + if (!volume) return MMSYSERR_INVALPARAM; + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + + *volume = 0xFFFFFFFF; + return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} NTSTATUS midi_out_message(void *args) { @@ -1094,6 +1102,12 @@ NTSTATUS midi_out_message(void *args) case MODM_GETNUMDEVS: *params->err = num_dests; break; + case MODM_GETVOLUME: + *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1); + break; + case MODM_SETVOLUME: + *params->err = 0; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

[PATCH 2/4] wineoss: Move MODM_GETNUMDEVS to the unixlib.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 2 -- dlls/wineoss.drv/ossmidi.c | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index cda733b9ca3..cc8fc54568c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -753,8 +753,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_GETNUMDEVS: - return MODM_NumDevs; case MODM_GETVOLUME: return modGetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index d9b2bbe7c92..f307a54b81f 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1091,6 +1091,9 @@ NTSTATUS midi_out_message(void *args) case MODM_GETDEVCAPS: *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); break; + case MODM_GETNUMDEVS: + *params->err = num_dests; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

[PATCH 1/4] wineoss: Move MODM_GETDEVCAPS to the unixlib.
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 17 ----------------- dlls/wineoss.drv/ossmidi.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 9615c9892b9..cda733b9ca3 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -648,21 +648,6 @@ static DWORD midStop(WORD wDevID) /*-----------------------------------------------------------------------*/ -/************************************************************************** - * modGetDevCaps [internal] - */ -static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) -{ - TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - - memcpy(lpCaps, &MidiOutDev[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -768,8 +753,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_GETDEVCAPS: - return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: return MODM_NumDevs; case MODM_GETVOLUME: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index b97c5159e89..d9b2bbe7c92 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1044,6 +1044,19 @@ static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) +{ + TRACE("(%04X, %p, %08X);\n", dev_id, caps, size); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + if (!caps) return MMSYSERR_INVALPARAM; + + memcpy(caps, &dests[dev_id].caps, min(size, sizeof(*caps))); + + return MMSYSERR_NOERROR; +} + + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1075,6 +1088,9 @@ NTSTATUS midi_out_message(void *args) case MODM_UNPREPARE: *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MODM_GETDEVCAPS: + *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; -- 2.25.1

2 1

[PATCH] shell32: Remove obsolete -D_SHELL32_ from Makefile.in
by Drew Ronneberg 25 Apr '22

25 Apr '22

1 0

[PATCH v2] winemac: Use ULongToPtr() to cast format ids to void ptrs.
by Huw Davies 25 Apr '22

25 Apr '22

This avoids compiler warnings on 64-bit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 70b087846e9..63c8bc76e75 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1514,7 +1514,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT if (!format->synthesized) { TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, ULongToPtr(format->format_id)); formats[pos++] = format; } else if (format->natural_format && @@ -1523,7 +1523,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT TRACE("for type %s deferring synthesized formats because type %s is also present\n", debugstr_cf(type), debugstr_cf(format->natural_format->type)); } - else if (CFSetContainsValue(seen_formats, (void*)format->format_id)) + else if (CFSetContainsValue(seen_formats, ULongToPtr(format->format_id))) { TRACE("for type %s got duplicate synthesized format %p/%s; skipping\n", debugstr_cf(type), format, debugstr_format(format->format_id)); @@ -1531,7 +1531,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT else { TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, ULongToPtr(format->format_id)); formats[pos++] = format; } } @@ -1546,10 +1546,10 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT if (!format->synthesized) continue; /* Don't duplicate a real value with a synthesized value. */ - if (CFSetContainsValue(seen_formats, (void*)format->format_id)) continue; + if (CFSetContainsValue(seen_formats, ULongToPtr(format->format_id))) continue; TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, ULongToPtr(format->format_id)); formats[pos++] = format; } -- 2.23.0

1 0

[PATCH v2] dinput/tests: Remove unreliable IAsyncOperation_boolean checks.
by Rémi Bernon 25 Apr '22

25 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Remove now unused ref variable, I'm not resending the other patches as they should still apply on top. Supersedes: 233686 dlls/dinput/tests/force_feedback.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index a4588f7022d..068f5bf1a7e 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5193,7 +5193,6 @@ static void test_windows_gaming_input(void) UINT32 size; HRESULT hr; DWORD ret; - ULONG ref; if (!load_combase_functions()) return; @@ -5395,8 +5394,7 @@ static void test_windows_gaming_input(void) check_bool_async( bool_async, 1, 4, S_OK, FALSE ); IAsyncInfo_Release( async_info ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, &expect_enable_fail, sizeof(expect_enable_fail) ); @@ -5423,8 +5421,7 @@ static void test_windows_gaming_input(void) check_bool_async( bool_async, 1, 4, 0x8685400d, FALSE ); IAsyncInfo_Release( async_info ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); /* canceling the async op is just ignored */ @@ -5468,8 +5465,7 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Completed returned %#lx\n", hr ); ok( tmp_handler == NULL, "got handler %p\n", tmp_handler ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); /* canceling then closing it calls the handler with closed state */ @@ -5514,8 +5510,7 @@ static void test_windows_gaming_input(void) hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); ok( hr == E_ILLEGAL_METHOD_CALL, "get_Completed returned %#lx\n", hr ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, &expect_enable, sizeof(expect_enable) ); @@ -5523,9 +5518,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == S_OK, "TryEnableAsync returned %#lx\n", hr ); wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, expect_reset, sizeof(expect_reset) ); @@ -5533,9 +5526,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == S_OK, "TryResetAsync returned %#lx\n", hr ); wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); IForceFeedbackMotor_Release( motor ); -- 2.35.1

1 0

[PATCH] winemac: Cast format ids to UINT_PTR before casting to a void ptr.
by Huw Davies 25 Apr '22

25 Apr '22

This avoids compiler warnings on 64-bit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 70b087846e9..dc117db6b38 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1514,7 +1514,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT if (!format->synthesized) { TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, (void*)(UINT_PTR)format->format_id); formats[pos++] = format; } else if (format->natural_format && @@ -1523,7 +1523,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT TRACE("for type %s deferring synthesized formats because type %s is also present\n", debugstr_cf(type), debugstr_cf(format->natural_format->type)); } - else if (CFSetContainsValue(seen_formats, (void*)format->format_id)) + else if (CFSetContainsValue(seen_formats, (void*)(UINT_PTR)format->format_id)) { TRACE("for type %s got duplicate synthesized format %p/%s; skipping\n", debugstr_cf(type), format, debugstr_format(format->format_id)); @@ -1531,7 +1531,7 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT else { TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, (void*)(UINT_PTR)format->format_id); formats[pos++] = format; } } @@ -1546,10 +1546,10 @@ static WINE_CLIPFORMAT** get_formats_for_pasteboard_types(CFArrayRef types, UINT if (!format->synthesized) continue; /* Don't duplicate a real value with a synthesized value. */ - if (CFSetContainsValue(seen_formats, (void*)format->format_id)) continue; + if (CFSetContainsValue(seen_formats, (void*)(UINT_PTR)format->format_id)) continue; TRACE("for type %s got synthesized format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); - CFSetAddValue(seen_formats, (void*)format->format_id); + CFSetAddValue(seen_formats, (void*)(UINT_PTR)format->format_id); formats[pos++] = format; } -- 2.23.0

2 1

[PATCH 1/6] dinput/tests: Remove unreliable IAsyncOperation_boolean checks.
by Rémi Bernon 25 Apr '22

25 Apr '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/force_feedback.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index a4588f7022d..42f3bdc84c7 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5395,8 +5395,7 @@ static void test_windows_gaming_input(void) check_bool_async( bool_async, 1, 4, S_OK, FALSE ); IAsyncInfo_Release( async_info ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, &expect_enable_fail, sizeof(expect_enable_fail) ); @@ -5423,8 +5422,7 @@ static void test_windows_gaming_input(void) check_bool_async( bool_async, 1, 4, 0x8685400d, FALSE ); IAsyncInfo_Release( async_info ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); /* canceling the async op is just ignored */ @@ -5468,8 +5466,7 @@ static void test_windows_gaming_input(void) ok( hr == S_OK, "get_Completed returned %#lx\n", hr ); ok( tmp_handler == NULL, "got handler %p\n", tmp_handler ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); /* canceling then closing it calls the handler with closed state */ @@ -5514,8 +5511,7 @@ static void test_windows_gaming_input(void) hr = IAsyncOperation_boolean_get_Completed( bool_async, &tmp_handler ); ok( hr == E_ILLEGAL_METHOD_CALL, "get_Completed returned %#lx\n", hr ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, &expect_enable, sizeof(expect_enable) ); @@ -5523,9 +5519,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == S_OK, "TryEnableAsync returned %#lx\n", hr ); wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); set_hid_expect( file, expect_reset, sizeof(expect_reset) ); @@ -5533,9 +5527,7 @@ static void test_windows_gaming_input(void) todo_wine ok( hr == S_OK, "TryResetAsync returned %#lx\n", hr ); wait_hid_expect_( __FILE__, __LINE__, file, 100, TRUE ); - check_bool_async( bool_async, 1, Completed, S_OK, TRUE ); - ref = IAsyncOperation_boolean_Release( bool_async ); - ok( ref == 0, "Release returned %lu\n", ref ); + IAsyncOperation_boolean_Release( bool_async ); IForceFeedbackMotor_Release( motor ); -- 2.35.1

1 5

[PATCH vkd3d] vkd3d: Prevent a null pointer dereference when a descriptor is not a UAV.
by Conor McCarthy 25 Apr '22

25 Apr '22

Fixes crashes in Shadow of the Tomb Raider, GRID 2019 and probably others. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0b643727..1522065f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3653,7 +3653,7 @@ static void d3d12_desc_buffered_copy_atomic(struct d3d12_desc *dst, const struct vkd3d_mutex_unlock(mutex); infos[set].uav_counter |= (location->src.magic == VKD3D_DESCRIPTOR_MAGIC_UAV) - & !!location->src.u.view_info.view->vk_counter_view; + && !!location->src.u.view_info.view->vk_counter_view; location->dst = dst; if (infos[set].count == ARRAY_SIZE(locations[0])) -- 2.35.1

2 1

[PATCH v2 vkd3d 1/3] demos: Load libvulkan dynamically.
by Zebediah Figura 25 Apr '22

25 Apr '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 +- demos/demo_xcb.h | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e760a66b8..3e113dc7c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -322,7 +322,7 @@ endif EXTRA_DIST += $(vkd3d_shader_tests) if BUILD_DEMOS -DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@ +DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DL_LIBS@ @DEMO_LIBS@ DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@ bin_PROGRAMS += $(vkd3d_demos) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index d8be00f03..bb43d8a48 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -17,18 +17,65 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VK_NO_PROTOTYPES #define VK_USE_PLATFORM_XCB_KHR #define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3 +#include "config.h" #include <vkd3d.h> #include <vkd3d_utils.h> #include <xcb/xcb_event.h> #include <xcb/xcb_icccm.h> #include <xcb/xcb_keysyms.h> #include <sys/stat.h> +#include <dlfcn.h> #include <limits.h> #include <unistd.h> #include <fcntl.h> #include <stdbool.h> +#include <stdio.h> + +#define DECLARE_VK_PFN(name) PFN_##name name; +DECLARE_VK_PFN(vkAcquireNextImageKHR) +DECLARE_VK_PFN(vkCreateFence) +DECLARE_VK_PFN(vkCreateSwapchainKHR) +DECLARE_VK_PFN(vkCreateXcbSurfaceKHR) +DECLARE_VK_PFN(vkDestroyFence) +DECLARE_VK_PFN(vkDestroySurfaceKHR) +DECLARE_VK_PFN(vkDestroySwapchainKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) +DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) +DECLARE_VK_PFN(vkGetSwapchainImagesKHR) +DECLARE_VK_PFN(vkQueuePresentKHR) +DECLARE_VK_PFN(vkResetFences) +DECLARE_VK_PFN(vkWaitForFences) + +static void load_vulkan_procs(void) +{ + void *libvulkan; + + if (!(libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW))) + { + fprintf(stderr, "Failed to load %s: %s.\n", SONAME_LIBVULKAN, dlerror()); + exit(1); + } + +#define LOAD_VK_PFN(name) name = (void *)dlsym(libvulkan, #name); + LOAD_VK_PFN(vkAcquireNextImageKHR) + LOAD_VK_PFN(vkCreateFence) + LOAD_VK_PFN(vkCreateSwapchainKHR) + LOAD_VK_PFN(vkCreateXcbSurfaceKHR) + LOAD_VK_PFN(vkDestroyFence) + LOAD_VK_PFN(vkDestroySurfaceKHR) + LOAD_VK_PFN(vkDestroySwapchainKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_VK_PFN(vkGetSwapchainImagesKHR) + LOAD_VK_PFN(vkQueuePresentKHR) + LOAD_VK_PFN(vkResetFences) + LOAD_VK_PFN(vkWaitForFences) +} struct demo { @@ -330,6 +377,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c VkImage *vk_images; VkFormat format; + load_vulkan_procs(); + if ((format = vkd3d_get_vk_format(desc->format)) == VK_FORMAT_UNDEFINED) return NULL; -- 2.35.1

2 5

[PATCH vkd3d v3 01/11] vkd3d-shader/hlsl: Do not generate infinities in SM1.
by Giovanni Mascellani 25 Apr '22

25 Apr '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++++++++- tests/arithmetic-float.shader_test | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 06b957ba..a1551ba1 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "hlsl.h" static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src) @@ -270,12 +272,17 @@ static bool fold_div(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, { case HLSL_TYPE_FLOAT: case HLSL_TYPE_HALF: - if (src2->value[k].f == 0) + if (ctx->profile->major_version >= 4 && src2->value[k].f == 0) { hlsl_warning(ctx, &dst->node.loc, VKD3D_SHADER_WARNING_HLSL_DIVISION_BY_ZERO, "Floating point division by zero"); } dst->value[k].f = src1->value[k].f / src2->value[k].f; + if (ctx->profile->major_version < 4 && isinf(dst->value[k].f)) + { + hlsl_error(ctx, &dst->node.loc, VKD3D_SHADER_ERROR_HLSL_DIVISION_BY_ZERO, + "Infinities are not allowed by the shader model."); + } break; case HLSL_TYPE_DOUBLE: diff --git a/tests/arithmetic-float.shader_test b/tests/arithmetic-float.shader_test index f99b9728..6824c3f1 100644 --- a/tests/arithmetic-float.shader_test +++ b/tests/arithmetic-float.shader_test @@ -25,6 +25,7 @@ todo draw quad probe all rgba (5.0, 5.0, -5.0, 3.0) [require] +% Infinities are not allowed in SM1 shader model >= 4.0 [pixel shader] -- 2.35.2

4 42

[PATCH 1/9] dwrite/tests: Add a test for unset axis for references created with IDWriteFactory3.
by Nikolay Sivov 25 Apr '22

25 Apr '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 38eb1aeeb7d..af88c716ad8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7982,9 +7982,10 @@ static void test_CreateFontFaceReference(void) IDWriteFontFace3 *fontface, *fontface1; DWRITE_FONT_AXIS_VALUE axis_values[16]; IDWriteFontCollection1 *collection; + UINT32 axis_count, index, count, i; + IDWriteFontFaceReference1 *ref2; IDWriteFontFile *file, *file1; IDWriteFactory3 *factory; - UINT32 index, count, i; IDWriteFont3 *font3; ULONG refcount; WCHAR *path; @@ -8091,6 +8092,13 @@ static void test_CreateFontFaceReference(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(file != file1, "got %p, previous file %p\n", file1, file); + if (SUCCEEDED(IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) + { + axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + ok(!axis_count, "Unexpected axis value count.\n"); + IDWriteFontFaceReference1_Release(ref2); + } + IDWriteFontFaceReference_Release(ref); IDWriteFontFile_Release(file); IDWriteFontFile_Release(file1); @@ -8112,8 +8120,6 @@ static void test_CreateFontFaceReference(void) for (j = 0; j < font_count; j++) { - IDWriteFontFaceReference1 *ref2; - hr = IDWriteFontFamily1_GetFont(family, j, &font3); ok(hr == S_OK, "Failed to get font, hr %#lx.\n", hr); @@ -8132,7 +8138,7 @@ static void test_CreateFontFaceReference(void) if (SUCCEEDED(hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref2))) { - UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); + axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); todo_wine ok(axis_count >= 4, "Unexpected axis value count.\n"); -- 2.35.1

1 8

[PATCH] winedbg: Accept "continue".
by Huw Davies 25 Apr '22

25 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/winedbg/debug.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 280013799c9..23073dd4c65 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -182,7 +182,7 @@ STRING \"(\\[^\n]|[^\\"\n])*\" <INITIAL,NOPROCESS>backtrace|backtrac|backtra|backt|back|bac|ba|bt { BEGIN(NOCMD); return tBACKTRACE; } <INITIAL,NOPROCESS>where|wher|whe { BEGIN(NOCMD); return tBACKTRACE; } -<INITIAL>cont|con|co|c { BEGIN(NOCMD); return tCONT; } +<INITIAL>continue|continu|contin|conti|cont|con|co|c { BEGIN(NOCMD); return tCONT; } <INITIAL>pass|pas|pa { BEGIN(NOCMD); return tPASS; } <INITIAL>condition|conditio|conditi|condit|condi|cond { BEGIN(NOCMD); return tCOND; } <INITIAL>step|ste|st|s { BEGIN(NOCMD); return tSTEP; } -- 2.23.0

1 0

[PATCH] wbemprox: Add Win32_PageFileUsage class.
by Louis Lenders 25 Apr '22

25 Apr '22

https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/wbemprox/builtin.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 07a5873208f..69d74d756f8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -260,6 +260,10 @@ static const struct column col_operatingsystem[] = { L"TotalVisibleMemorySize", CIM_UINT64 }, { L"Version", CIM_STRING|COL_FLAG_DYNAMIC }, }; +static const struct column col_pagefileusage[] = +{ + { L"Name", CIM_STRING }, +}; static const struct column col_param[] = { { L"Class", CIM_STRING }, @@ -687,6 +691,10 @@ struct record_operatingsystem UINT64 totalvisiblememorysize; const WCHAR *version; }; +struct record_pagefileusage +{ + const WCHAR *name; +}; struct record_param { const WCHAR *class; @@ -911,6 +919,10 @@ static const struct record_associator data_associator[] = { L"Win32_DiskDriveToDiskPartition", L"Win32_DiskPartition", L"Win32_DiskDrive" }, { L"Win32_LogicalDiskToPartition", L"Win32_LogicalDisk", L"Win32_DiskPartition" }, }; +static const struct record_pagefileusage data_pagefileusage[] = +{ + { L"c:\\pagefile.sys", }, +}; static const struct record_param data_param[] = { { L"__SystemSecurity", L"GetSD", -1, L"ReturnValue", CIM_UINT32 }, @@ -4148,6 +4160,7 @@ static struct table cimv2_builtin_classes[] = { L"Win32_NetworkAdapter", C(col_networkadapter), 0, 0, NULL, fill_networkadapter }, { L"Win32_NetworkAdapterConfiguration", C(col_networkadapterconfig), 0, 0, NULL, fill_networkadapterconfig }, { L"Win32_OperatingSystem", C(col_operatingsystem), 0, 0, NULL, fill_operatingsystem }, + { L"Win32_PageFileUsage", C(col_pagefileusage), D(data_pagefileusage) }, { L"Win32_PhysicalMedia", C(col_physicalmedia), D(data_physicalmedia) }, { L"Win32_PhysicalMemory", C(col_physicalmemory), 0, 0, NULL, fill_physicalmemory }, { L"Win32_PnPEntity", C(col_pnpentity), 0, 0, NULL, fill_pnpentity }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 0a8c97ad166..e0fe78b7fd1 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1475,6 +1475,31 @@ static void test_Win32_ComputerSystemProduct( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_PageFileUsage( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PageFileUsage" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK , "got %#lx\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_PhysicalMemory( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_PhysicalMemory" ); @@ -2226,6 +2251,7 @@ START_TEST(query) test_Win32_NetworkAdapter( services ); test_Win32_NetworkAdapterConfiguration( services ); test_Win32_OperatingSystem( services ); + test_Win32_PageFileUsage( services ); test_Win32_PhysicalMemory( services ); test_Win32_PnPEntity( services ); test_Win32_Printer( services ); -- 2.36.0

2 1

[PATCH v2 1/2] include: Use nested namespace declaration in windows.foundation.idl.
by Rémi Bernon 25 Apr '22

25 Apr '22

From: Biswapriyo Nath <nathbappai(a)gmail.com> And move generic instantiations forward. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Use nested namespaces at the same time as reorganizing the file. include/windows.foundation.idl | 293 ++++++++++++++++----------------- 1 file changed, 145 insertions(+), 148 deletions(-) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index c5f4c04a334..08a6af4ea7b 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -27,153 +27,150 @@ import "windowscontracts.idl"; /* import "ivectorchangedeventargs.idl"; */ import "windows.foundation.collections.idl"; -namespace Windows { - namespace Foundation { - interface IAsyncAction; - } -} - -namespace Windows { - namespace Foundation { - typedef enum PropertyType PropertyType; - typedef struct Point Point; - typedef struct Size Size; - typedef struct Rect Rect; - typedef struct DateTime DateTime; - typedef struct TimeSpan TimeSpan; - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7) - ] - delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status); - - [contract(Windows.Foundation.FoundationContract, 1.0)] - enum PropertyType { - Empty = 0, - UInt8 = 1, - Int16 = 2, - UInt16 = 3, - Int32 = 4, - UInt32 = 5, - Int64 = 6, - UInt64 = 7, - Single = 8, - Double = 9, - Char16 = 10, - Boolean = 11, - String = 12, - Inspectable = 13, - DateTime = 14, - TimeSpan = 15, - Guid = 16, - Point = 17, - Size = 18, - Rect = 19, - OtherType = 20, - UInt8Array = 1025, - Int16Array = 1026, - UInt16Array = 1027, - Int32Array = 1028, - UInt32Array = 1029, - Int64Array = 1030, - UInt64Array = 1031, - SingleArray = 1032, - DoubleArray = 1033, - Char16Array = 1034, - BooleanArray = 1035, - StringArray = 1036, - InspectableArray = 1037, - DateTimeArray = 1038, - TimeSpanArray = 1039, - GuidArray = 1040, - PointArray = 1041, - SizeArray = 1042, - RectArray = 1043, - OtherTypeArray = 1044 - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct Point { - FLOAT X; - FLOAT Y; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct Size { - FLOAT Width; - FLOAT Height; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct Rect { - FLOAT X; - FLOAT Y; - FLOAT Width; - FLOAT Height; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct DateTime { - INT64 UniversalTime; - }; - - [contract(Windows.Foundation.FoundationContract, 1.0)] - struct TimeSpan { - INT64 Duration; - }; - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) - ] - interface IStringable : IInspectable - { - HRESULT ToString([out, retval] HSTRING *value); - } - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) - ] - interface IClosable : IInspectable - { - HRESULT Close(); - } - - [ - contract(Windows.Foundation.FoundationContract, 1.0), - uuid(5a648006-843a-4da9-865b-9d26e5dfad7b) - ] - interface IAsyncAction : IInspectable - requires IAsyncInfo - { - [propput] HRESULT Completed([in] Windows.Foundation.AsyncActionCompletedHandler *handler); - [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler); - HRESULT GetResults(); - } - } -} - -namespace Windows { - namespace Foundation { - declare { - interface Windows.Foundation.Collections.IIterable<HSTRING>; - interface Windows.Foundation.Collections.IIterable<IInspectable *>; - interface Windows.Foundation.Collections.IIterator<HSTRING>; - interface Windows.Foundation.Collections.IIterator<IInspectable *>; - interface Windows.Foundation.Collections.IVectorView<HSTRING>; - interface Windows.Foundation.Collections.IVectorView<IInspectable *>; - interface Windows.Foundation.Collections.IVector<HSTRING>; - interface Windows.Foundation.Collections.IVector<IInspectable *>; - interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>; - interface Windows.Foundation.EventHandler<IInspectable *>; - interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>; - interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; - interface Windows.Foundation.IAsyncOperation<IInspectable *>; - interface Windows.Foundation.IAsyncOperation<boolean>; - interface Windows.Foundation.IReference<INT32>; - interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>; - } +namespace Windows.Foundation { + typedef enum PropertyType PropertyType; + typedef struct Point Point; + typedef struct Size Size; + typedef struct Rect Rect; + typedef struct DateTime DateTime; + typedef struct TimeSpan TimeSpan; + interface IAsyncAction; + interface IClosable; + interface IStringable; + + declare { + interface Windows.Foundation.Collections.IIterable<HSTRING>; + interface Windows.Foundation.Collections.IIterable<IInspectable *>; + interface Windows.Foundation.Collections.IIterator<HSTRING>; + interface Windows.Foundation.Collections.IIterator<IInspectable *>; + interface Windows.Foundation.Collections.IVectorView<HSTRING>; + interface Windows.Foundation.Collections.IVectorView<IInspectable *>; + interface Windows.Foundation.Collections.IVector<HSTRING>; + interface Windows.Foundation.Collections.IVector<IInspectable *>; + interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING> *>; + interface Windows.Foundation.EventHandler<IInspectable *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>; + interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; + interface Windows.Foundation.IAsyncOperation<IInspectable *>; + interface Windows.Foundation.IAsyncOperation<boolean>; + interface Windows.Foundation.IReference<INT32>; + interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>; + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7) + ] + delegate HRESULT AsyncActionCompletedHandler([in] Windows.Foundation.IAsyncAction *action, [in] AsyncStatus status); + + [contract(Windows.Foundation.FoundationContract, 1.0)] + enum PropertyType + { + Empty = 0, + UInt8 = 1, + Int16 = 2, + UInt16 = 3, + Int32 = 4, + UInt32 = 5, + Int64 = 6, + UInt64 = 7, + Single = 8, + Double = 9, + Char16 = 10, + Boolean = 11, + String = 12, + Inspectable = 13, + DateTime = 14, + TimeSpan = 15, + Guid = 16, + Point = 17, + Size = 18, + Rect = 19, + OtherType = 20, + UInt8Array = 1025, + Int16Array = 1026, + UInt16Array = 1027, + Int32Array = 1028, + UInt32Array = 1029, + Int64Array = 1030, + UInt64Array = 1031, + SingleArray = 1032, + DoubleArray = 1033, + Char16Array = 1034, + BooleanArray = 1035, + StringArray = 1036, + InspectableArray = 1037, + DateTimeArray = 1038, + TimeSpanArray = 1039, + GuidArray = 1040, + PointArray = 1041, + SizeArray = 1042, + RectArray = 1043, + OtherTypeArray = 1044, + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct Point + { + FLOAT X; + FLOAT Y; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct Size + { + FLOAT Width; + FLOAT Height; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct Rect + { + FLOAT X; + FLOAT Y; + FLOAT Width; + FLOAT Height; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct DateTime + { + INT64 UniversalTime; + }; + + [contract(Windows.Foundation.FoundationContract, 1.0)] + struct TimeSpan + { + INT64 Duration; + }; + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(96369f54-8eb6-48f0-abce-c1b211e627c3) + ] + interface IStringable : IInspectable + { + HRESULT ToString([out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(30d5a829-7fa4-4026-83bb-d75bae4ea99e) + ] + interface IClosable : IInspectable + { + HRESULT Close(); + } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(5a648006-843a-4da9-865b-9d26e5dfad7b) + ] + interface IAsyncAction : IInspectable + requires IAsyncInfo + { + [propput] HRESULT Completed([in] Windows.Foundation.AsyncActionCompletedHandler *handler); + [propget] HRESULT Completed([out, retval] Windows.Foundation.AsyncActionCompletedHandler **handler); + HRESULT GetResults(); } } -- 2.35.1

1 1

[PATCH v2 1/2] include: Add windows.ui.idl file.
by Mohamad Al-Jaf 25 Apr '22

25 Apr '22

Needed by windows.media.closedcaptioning.idl. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Use right aligned pointer. - Use value instead of returnValue. Wine doesn't seem to use return_value anywhere so this change makes it more consistent with the Wine code style. --- include/Makefile.in | 1 + include/windows.ui.idl | 323 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 324 insertions(+) create mode 100644 include/windows.ui.idl diff --git a/include/Makefile.in b/include/Makefile.in index b0a1d0e4880..837c6077fd9 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -800,6 +800,7 @@ SOURCES = \ windows.system.idl \ windows.system.power.idl \ windows.system.userprofile.idl \ + windows.ui.idl \ windowscontracts.idl \ windowsx.h \ wine/debug.h \ diff --git a/include/windows.ui.idl b/include/windows.ui.idl new file mode 100644 index 00000000000..5045d0b9ed2 --- /dev/null +++ b/include/windows.ui.idl @@ -0,0 +1,323 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.UI { + typedef struct Color Color; + typedef struct WindowId WindowId; + + interface IColorHelper; + interface IColorHelperStatics; + interface IColorHelperStatics2; + interface IColors; + interface IColorsStatics; + interface IUIContentRoot; + interface IUIContext; + + runtimeclass ColorHelper; + runtimeclass Colors; + runtimeclass UIContentRoot; + runtimeclass UIContext; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.UI.Color>; + interface Windows.Foundation.Collections.IIterable<Windows.UI.WindowId>; + interface Windows.Foundation.Collections.IIterator<Windows.UI.Color>; + interface Windows.Foundation.Collections.IIterator<Windows.UI.WindowId>; + interface Windows.Foundation.Collections.IVectorView<Windows.UI.WindowId>; + interface Windows.Foundation.IReference<Windows.UI.Color>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + struct Color + { + BYTE A; + BYTE R; + BYTE G; + BYTE B; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 12.0) + ] + struct WindowId + { + UINT64 Value; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(193cfbe7-65c7-4540-ad08-6283ba76879a) + ] + interface IColorHelper : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(8504dbea-fb6a-4144-a6c2-33499c9284f5) + ] + interface IColorHelperStatics : IInspectable + { + HRESULT FromArgb([in] BYTE a, [in] BYTE r, [in] BYTE g, [in] BYTE b, [out, retval] Windows.UI.Color *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.UI.ColorHelper), + uuid(24d9af02-6eb0-4b94-855c-fcf0818d9a16) + ] + interface IColorHelperStatics2 : IInspectable + { + HRESULT ToDisplayName([in] Windows.UI.Color color, [out, retval] HSTRING *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Colors), + uuid(9b8c9326-4ca6-4ce5-8994-9eff65cabdcc) + ] + interface IColors : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.UI.Colors), + uuid(cff52e04-cca6-4614-a17e-754910c84a99) + ] + interface IColorsStatics : IInspectable + { + [propget] HRESULT AliceBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT AntiqueWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT Aqua([out, retval] Windows.UI.Color *value); + [propget] HRESULT Aquamarine([out, retval] Windows.UI.Color *value); + [propget] HRESULT Azure([out, retval] Windows.UI.Color *value); + [propget] HRESULT Beige([out, retval] Windows.UI.Color *value); + [propget] HRESULT Bisque([out, retval] Windows.UI.Color *value); + [propget] HRESULT Black([out, retval] Windows.UI.Color *value); + [propget] HRESULT BlanchedAlmond([out, retval] Windows.UI.Color *value); + [propget] HRESULT Blue([out, retval] Windows.UI.Color *value); + [propget] HRESULT BlueViolet([out, retval] Windows.UI.Color *value); + [propget] HRESULT Brown([out, retval] Windows.UI.Color *value); + [propget] HRESULT BurlyWood([out, retval] Windows.UI.Color *value); + [propget] HRESULT CadetBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Chartreuse([out, retval] Windows.UI.Color *value); + [propget] HRESULT Chocolate([out, retval] Windows.UI.Color *value); + [propget] HRESULT Coral([out, retval] Windows.UI.Color *value); + [propget] HRESULT CornflowerBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Cornsilk([out, retval] Windows.UI.Color *value); + [propget] HRESULT Crimson([out, retval] Windows.UI.Color *value); + [propget] HRESULT Cyan([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkCyan([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkGoldenrod([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkKhaki([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkMagenta([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkOliveGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkOrange([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkOrchid([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSalmon([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSlateBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkSlateGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkTurquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT DarkViolet([out, retval] Windows.UI.Color *value); + [propget] HRESULT DeepPink([out, retval] Windows.UI.Color *value); + [propget] HRESULT DeepSkyBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT DimGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT DodgerBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Firebrick([out, retval] Windows.UI.Color *value); + [propget] HRESULT FloralWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT ForestGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT Fuchsia([out, retval] Windows.UI.Color *value); + [propget] HRESULT Gainsboro([out, retval] Windows.UI.Color *value); + [propget] HRESULT GhostWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT Gold([out, retval] Windows.UI.Color *value); + [propget] HRESULT Goldenrod([out, retval] Windows.UI.Color *value); + [propget] HRESULT Gray([out, retval] Windows.UI.Color *value); + [propget] HRESULT Green([out, retval] Windows.UI.Color *value); + [propget] HRESULT GreenYellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT Honeydew([out, retval] Windows.UI.Color *value); + [propget] HRESULT HotPink([out, retval] Windows.UI.Color *value); + [propget] HRESULT IndianRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT Indigo([out, retval] Windows.UI.Color *value); + [propget] HRESULT Ivory([out, retval] Windows.UI.Color *value); + [propget] HRESULT Khaki([out, retval] Windows.UI.Color *value); + [propget] HRESULT Lavender([out, retval] Windows.UI.Color *value); + [propget] HRESULT LavenderBlush([out, retval] Windows.UI.Color *value); + [propget] HRESULT LawnGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT LemonChiffon([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightCoral([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightCyan([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightGoldenrodYellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightPink([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSalmon([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSkyBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSlateGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightSteelBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT LightYellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT Lime([out, retval] Windows.UI.Color *value); + [propget] HRESULT LimeGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT Linen([out, retval] Windows.UI.Color *value); + [propget] HRESULT Magenta([out, retval] Windows.UI.Color *value); + [propget] HRESULT Maroon([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumAquamarine([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumOrchid([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumPurple([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumSeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumSlateBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumSpringGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumTurquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT MediumVioletRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT MidnightBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT MintCream([out, retval] Windows.UI.Color *value); + [propget] HRESULT MistyRose([out, retval] Windows.UI.Color *value); + [propget] HRESULT Moccasin([out, retval] Windows.UI.Color *value); + [propget] HRESULT NavajoWhite([out, retval] Windows.UI.Color *value); + [propget] HRESULT Navy([out, retval] Windows.UI.Color *value); + [propget] HRESULT OldLace([out, retval] Windows.UI.Color *value); + [propget] HRESULT Olive([out, retval] Windows.UI.Color *value); + [propget] HRESULT OliveDrab([out, retval] Windows.UI.Color *value); + [propget] HRESULT Orange([out, retval] Windows.UI.Color *value); + [propget] HRESULT OrangeRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT Orchid([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleGoldenrod([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleTurquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT PaleVioletRed([out, retval] Windows.UI.Color *value); + [propget] HRESULT PapayaWhip([out, retval] Windows.UI.Color *value); + [propget] HRESULT PeachPuff([out, retval] Windows.UI.Color *value); + [propget] HRESULT Peru([out, retval] Windows.UI.Color *value); + [propget] HRESULT Pink([out, retval] Windows.UI.Color *value); + [propget] HRESULT Plum([out, retval] Windows.UI.Color *value); + [propget] HRESULT PowderBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Purple([out, retval] Windows.UI.Color *value); + [propget] HRESULT Red([out, retval] Windows.UI.Color *value); + [propget] HRESULT RosyBrown([out, retval] Windows.UI.Color *value); + [propget] HRESULT RoyalBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT SaddleBrown([out, retval] Windows.UI.Color *value); + [propget] HRESULT Salmon([out, retval] Windows.UI.Color *value); + [propget] HRESULT SandyBrown([out, retval] Windows.UI.Color *value); + [propget] HRESULT SeaGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT SeaShell([out, retval] Windows.UI.Color *value); + [propget] HRESULT Sienna([out, retval] Windows.UI.Color *value); + [propget] HRESULT Silver([out, retval] Windows.UI.Color *value); + [propget] HRESULT SkyBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT SlateBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT SlateGray([out, retval] Windows.UI.Color *value); + [propget] HRESULT Snow([out, retval] Windows.UI.Color *value); + [propget] HRESULT SpringGreen([out, retval] Windows.UI.Color *value); + [propget] HRESULT SteelBlue([out, retval] Windows.UI.Color *value); + [propget] HRESULT Tan([out, retval] Windows.UI.Color *value); + [propget] HRESULT Teal([out, retval] Windows.UI.Color *value); + [propget] HRESULT Thistle([out, retval] Windows.UI.Color *value); + [propget] HRESULT Tomato([out, retval] Windows.UI.Color *value); + [propget] HRESULT Transparent([out, retval] Windows.UI.Color *value); + [propget] HRESULT Turquoise([out, retval] Windows.UI.Color *value); + [propget] HRESULT Violet([out, retval] Windows.UI.Color *value); + [propget] HRESULT Wheat([out, retval] Windows.UI.Color *value); + [propget] HRESULT White([out, retval] Windows.UI.Color *value); + [propget] HRESULT WhiteSmoke([out, retval] Windows.UI.Color *value); + [propget] HRESULT Yellow([out, retval] Windows.UI.Color *value); + [propget] HRESULT YellowGreen([out, retval] Windows.UI.Color *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.UI.UIContentRoot), + uuid(1dfcbac6-b36b-5cb9-9bc5-2b7a0eddc378) + ] + interface IUIContentRoot : IInspectable + { + [propget] HRESULT UIContext([out, retval] Windows.UI.UIContext **value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + exclusiveto(Windows.UI.UIContext), + uuid(bb5cfacd-5bd8-59d0-a59e-1c17a4d6d243) + ] + interface IUIContext : IInspectable + { + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.IColorHelperStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.UI.IColorHelperStatics2, Windows.Foundation.UniversalApiContract, 4.0), + threading(both) + ] + runtimeclass ColorHelper + { + [default] interface Windows.UI.IColorHelper; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.UI.IColorsStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass Colors + { + [default] interface Windows.UI.IColors; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass UIContentRoot + { + [default] interface Windows.UI.IUIContentRoot; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 8.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass UIContext + { + [default] interface Windows.UI.IUIContext; + } +} -- 2.36.0

2 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel