- Wine-Devel - list.winehq.org

[PATCH 3/6] winealsa: Return offsets rather than ptrs to the strings.
by Huw Davies April 22, 2022

April 22, 2022

This will make the Wow64 syscall rather simpler. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 26 +++++++++++++++----------- dlls/winealsa.drv/mmdevdrv.c | 9 ++++++--- dlls/winealsa.drv/unixlib.h | 4 ++-- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 9cf99f5b459..0e86185e441 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -291,10 +291,16 @@ static WCHAR *construct_device_id(EDataFlow flow, const WCHAR *chunk1, const WCH return ret; } +struct endpt +{ + WCHAR *name; + char *device; +}; + struct endpoints_info { unsigned int num, size; - struct endpoint *endpoints; + struct endpt *endpoints; }; static void endpoints_add(struct endpoints_info *endpoints, WCHAR *name, char *device) @@ -467,10 +473,9 @@ static NTSTATUS get_endpoint_ids(void *args) static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; struct get_endpoint_ids_params *params = args; struct endpoints_info endpoints_info; - unsigned int i, needed, name_len, device_len; + unsigned int i, needed, name_len, device_len, offset; struct endpoint *endpoint; int err, card; - char *ptr; card = -1; @@ -505,9 +510,8 @@ static NTSTATUS get_endpoint_ids(void *args) if(err != 0) WARN("Got a failure during card enumeration: %d (%s)\n", err, snd_strerror(err)); - needed = endpoints_info.num * sizeof(*params->endpoints); + offset = needed = endpoints_info.num * sizeof(*params->endpoints); endpoint = params->endpoints; - ptr = (char *)(endpoint + endpoints_info.num); for(i = 0; i < endpoints_info.num; i++){ name_len = wcslen(endpoints_info.endpoints[i].name) + 1; @@ -515,12 +519,12 @@ static NTSTATUS get_endpoint_ids(void *args) needed += name_len * sizeof(WCHAR) + ((device_len + 1) & ~1); if(needed <= params->size){ - endpoint->name = (WCHAR *)ptr; - memcpy(endpoint->name, endpoints_info.endpoints[i].name, name_len * sizeof(WCHAR)); - ptr += name_len * sizeof(WCHAR); - endpoint->device = ptr; - memcpy(endpoint->device, endpoints_info.endpoints[i].device, device_len); - ptr += (device_len + 1) & ~1; + endpoint->name = offset; + memcpy((char *)params->endpoints + offset, endpoints_info.endpoints[i].name, name_len * sizeof(WCHAR)); + offset += name_len * sizeof(WCHAR); + endpoint->device = offset; + memcpy((char *)params->endpoints + offset, endpoints_info.endpoints[i].device, device_len); + offset += (device_len + 1) & ~1; endpoint++; } free(endpoints_info.endpoints[i].name); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 24e778db931..1a99f0ac26c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -366,14 +366,17 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu } for(i = 0; i < params.num; i++){ - unsigned int size = (wcslen(params.endpoints[i].name) + 1) * sizeof(WCHAR); + WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name); + char *device = (char *)params.endpoints + params.endpoints[i].device; + unsigned int size = (wcslen(name) + 1) * sizeof(WCHAR); + ids[i] = HeapAlloc(GetProcessHeap(), 0, size); if(!ids[i]){ params.result = E_OUTOFMEMORY; goto end; } - memcpy(ids[i], params.endpoints[i].name, size); - get_device_guid(flow, params.endpoints[i].device, guids + i); + memcpy(ids[i], name, size); + get_device_guid(flow, device, guids + i); } *def_index = params.default_idx; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index ed769d81948..56507ef9f0a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -22,8 +22,8 @@ typedef UINT64 stream_handle; struct endpoint { - WCHAR *name; - char *device; + unsigned int name; + unsigned int device; }; struct get_endpoint_ids_params -- 2.25.1

2 1

[PATCH 2/6] winealsa: Use UINT64 handles to represent the stream.
by Huw Davies April 22, 2022

April 22, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 43 ++++++++++++++++++++---------------- dlls/winealsa.drv/mmdevdrv.c | 6 ++--- dlls/winealsa.drv/unixlib.h | 40 ++++++++++++++++----------------- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index e5f755b69ed..9cf99f5b459 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -215,6 +215,11 @@ static NTSTATUS alsa_unlock_result(struct alsa_stream *stream, return STATUS_SUCCESS; } +static struct alsa_stream *handle_get_stream(stream_handle h) +{ + return (struct alsa_stream *)(UINT_PTR)h; +} + static BOOL alsa_try_open(const char *devnode, EDataFlow flow) { snd_pcm_t *handle; @@ -985,7 +990,7 @@ exit: free(stream->vols); free(stream); }else{ - *params->stream = stream; + *params->stream = (stream_handle)(UINT_PTR)stream; } return STATUS_SUCCESS; @@ -994,7 +999,7 @@ exit: static NTSTATUS release_stream(void *args) { struct release_stream_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); SIZE_T size; if(params->timer_thread){ @@ -1490,7 +1495,7 @@ static int alsa_rewind_best_effort(struct alsa_stream *stream) static NTSTATUS start(void *args) { struct start_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -1536,7 +1541,7 @@ static NTSTATUS start(void *args) static NTSTATUS stop(void *args) { struct stop_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -1554,7 +1559,7 @@ static NTSTATUS stop(void *args) static NTSTATUS reset(void *args) { struct reset_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -1589,7 +1594,7 @@ static NTSTATUS reset(void *args) static NTSTATUS timer_loop(void *args) { struct timer_loop_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); LARGE_INTEGER delay, next; int adjust; @@ -1627,7 +1632,7 @@ static NTSTATUS timer_loop(void *args) static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); UINT32 write_pos, frames = params->frames; SIZE_T size; @@ -1691,7 +1696,7 @@ static void alsa_wrap_buffer(struct alsa_stream *stream, BYTE *buffer, UINT32 wr static NTSTATUS release_render_buffer(void *args) { struct release_render_buffer_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); UINT32 written_frames = params->written_frames; BYTE *buffer; @@ -1731,7 +1736,7 @@ static NTSTATUS release_render_buffer(void *args) static NTSTATUS get_capture_buffer(void *args) { struct get_capture_buffer_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); UINT32 *frames = params->frames; SIZE_T size; @@ -1792,7 +1797,7 @@ static NTSTATUS get_capture_buffer(void *args) static NTSTATUS release_capture_buffer(void *args) { struct release_capture_buffer_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); UINT32 done = params->done; alsa_lock(stream); @@ -2076,7 +2081,7 @@ exit: static NTSTATUS get_buffer_size(void *args) { struct get_buffer_size_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -2088,7 +2093,7 @@ static NTSTATUS get_buffer_size(void *args) static NTSTATUS get_latency(void *args) { struct get_latency_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -2109,7 +2114,7 @@ static NTSTATUS get_latency(void *args) static NTSTATUS get_current_padding(void *args) { struct get_current_padding_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -2122,7 +2127,7 @@ static NTSTATUS get_current_padding(void *args) static NTSTATUS get_next_packet_size(void *args) { struct get_next_packet_size_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -2134,7 +2139,7 @@ static NTSTATUS get_next_packet_size(void *args) static NTSTATUS get_frequency(void *args) { struct get_frequency_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); UINT64 *freq = params->freq; alsa_lock(stream); @@ -2150,7 +2155,7 @@ static NTSTATUS get_frequency(void *args) static NTSTATUS get_position(void *args) { struct get_position_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); UINT64 position; snd_pcm_state_t alsa_state; @@ -2202,7 +2207,7 @@ static NTSTATUS get_position(void *args) static NTSTATUS set_volumes(void *args) { struct set_volumes_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); unsigned int i; for(i = 0; i < stream->fmt->nChannels; i++) @@ -2214,7 +2219,7 @@ static NTSTATUS set_volumes(void *args) static NTSTATUS set_event_handle(void *args) { struct set_event_handle_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); @@ -2234,7 +2239,7 @@ static NTSTATUS set_event_handle(void *args) static NTSTATUS is_started(void *args) { struct is_started_params *params = args; - struct alsa_stream *stream = params->stream; + struct alsa_stream *stream = handle_get_stream(params->stream); alsa_lock(stream); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 81967f9ffe0..24e778db931 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -99,7 +99,7 @@ struct ACImpl { EDataFlow dataflow; float *vols; UINT32 channel_count; - struct alsa_stream *stream; + stream_handle stream; HANDLE timer_thread; @@ -229,7 +229,7 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } -static HRESULT alsa_stream_release(struct alsa_stream *stream, HANDLE timer_thread) +static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread) { struct release_stream_params params; @@ -680,7 +680,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, { ACImpl *This = impl_from_IAudioClient3(iface); struct create_stream_params params; - struct alsa_stream *stream; + stream_handle stream; unsigned int i; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 7d7be1e140d..ed769d81948 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -18,7 +18,7 @@ #include "audioclient.h" -struct alsa_stream; +typedef UINT64 stream_handle; struct endpoint { @@ -46,42 +46,42 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; - struct alsa_stream **stream; + stream_handle *stream; }; struct release_stream_params { - struct alsa_stream *stream; + stream_handle stream; HANDLE timer_thread; HRESULT result; }; struct start_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; }; struct stop_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; }; struct reset_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; }; struct timer_loop_params { - struct alsa_stream *stream; + stream_handle stream; }; struct get_render_buffer_params { - struct alsa_stream *stream; + stream_handle stream; UINT32 frames; HRESULT result; BYTE **data; @@ -89,7 +89,7 @@ struct get_render_buffer_params struct release_render_buffer_params { - struct alsa_stream *stream; + stream_handle stream; UINT32 written_frames; UINT flags; HRESULT result; @@ -97,7 +97,7 @@ struct release_render_buffer_params struct get_capture_buffer_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; BYTE **data; UINT32 *frames; @@ -108,7 +108,7 @@ struct get_capture_buffer_params struct release_capture_buffer_params { - struct alsa_stream *stream; + stream_handle stream; UINT32 done; HRESULT result; }; @@ -133,42 +133,42 @@ struct get_mix_format_params struct get_buffer_size_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; UINT32 *size; }; struct get_latency_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; REFERENCE_TIME *latency; }; struct get_current_padding_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; UINT32 *padding; }; struct get_next_packet_size_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; UINT32 *frames; }; struct get_frequency_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; UINT64 *freq; }; struct get_position_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; UINT64 *pos; UINT64 *qpctime; @@ -176,7 +176,7 @@ struct get_position_params struct set_volumes_params { - struct alsa_stream *stream; + stream_handle stream; float master_volume; const float *volumes; const float *session_volumes; @@ -184,14 +184,14 @@ struct set_volumes_params struct set_event_handle_params { - struct alsa_stream *stream; + stream_handle stream; HANDLE event; HRESULT result; }; struct is_started_params { - struct alsa_stream *stream; + stream_handle stream; HRESULT result; }; -- 2.25.1

2 1

[PATCH 1/6] winealsa: Pass a client ptr to the callback instead of a stream.
by Huw Davies April 22, 2022

April 22, 2022

This is to allow stream handles to be larger than sizeof(void *). Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7dc01940dc9..81967f9ffe0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -243,10 +243,10 @@ static HRESULT alsa_stream_release(struct alsa_stream *stream, HANDLE timer_thre static DWORD WINAPI alsa_timer_thread(void *user) { - struct alsa_stream *stream = user; struct timer_loop_params params; + struct ACImpl *This = user; - params.stream = stream; + params.stream = This->stream; ALSA_CALL(timer_loop, &params); @@ -954,7 +954,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) ALSA_CALL(start, &params); if(SUCCEEDED(params.result) && !This->timer_thread){ - This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This->stream, 0, NULL); + This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } -- 2.25.1

2 1

[PATCH 1/2] kernel32/tests: Mark activatableClass wrong xmlns test as broken on w1064v1909.
by Rémi Bernon April 22, 2022

April 22, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 71337c0f38e..bec04b7f066 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1108,7 +1108,7 @@ static void test_create_fail(void) trace("wrong_manifest10\n"); test_create_and_fail(wrong_manifest10, NULL, 0, TRUE /* WinXP */); trace("wrong_manifest11\n"); - test_create_and_fail(wrong_manifest11, NULL, 1, FALSE); + test_create_and_fail(wrong_manifest11, NULL, 1, TRUE /* w1064v1909 */); trace("UTF-16 manifest1 without BOM\n"); test_create_wide_and_fail(manifest1, FALSE ); trace("manifest2\n"); -- 2.35.1

2 2

[PATCH] conhost: Save default font's pitch and family on first run
by Hugh McMaster April 22, 2022

April 22, 2022

Wine currently saves the default pitch and family as FIXED_PITCH (0x1). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index fb02ef9fd94..c115e42a282 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -823,6 +823,7 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW load_config( fc->console->window->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; + config.font_pitch_family = fc->console->active->font.pitch_family; memcpy( config.face_name, fc->console->active->font.face_name, fc->console->active->font.face_len * sizeof(WCHAR) ); config.face_name[fc->console->active->font.face_len] = 0; -- 2.35.2

2 1

[PATCH 1/6] windows.gaming.input: Introduce Windows.Gaming.Input.RacingWheel activation factory.
by Rémi Bernon April 22, 2022

April 22, 2022

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/private.h | 2 + dlls/windows.gaming.input/racing_wheel.c | 117 +++++++++++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 dlls/windows.gaming.input/racing_wheel.c diff --git a/dlls/windows.gaming.input/Makefile.in b/dlls/windows.gaming.input/Makefile.in index 6c075c3d67c..1e0ce5c360c 100644 --- a/dlls/windows.gaming.input/Makefile.in +++ b/dlls/windows.gaming.input/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ main.c \ manager.c \ provider.c \ + racing_wheel.c \ vector.c IDL_SRCS = \ diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index 1ddd3a8fd23..2d8f6a340b0 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -180,6 +180,8 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); + if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RacingWheel )) + IActivationFactory_QueryInterface( racing_wheel_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index bb2fb68b8a8..73fab47a770 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -34,6 +34,7 @@ #define WIDL_using_Windows_Devices_Power #define WIDL_using_Windows_Gaming_Input #define WIDL_using_Windows_Gaming_Input_Custom +#define WIDL_using_Windows_Gaming_Input_ForceFeedback #include "windows.gaming.input.custom.h" #include "wine/list.h" @@ -41,6 +42,7 @@ extern HINSTANCE windows_gaming_input; extern ICustomGameControllerFactory *controller_factory; extern ICustomGameControllerFactory *gamepad_factory; +extern IActivationFactory *racing_wheel_factory; extern IGameControllerFactoryManagerStatics2 *manager_factory; struct vector_iids diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c new file mode 100644 index 00000000000..a8d20bc26ff --- /dev/null +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -0,0 +1,117 @@ +/* WinRT Windows.Gaming.Input implementation + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * 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 + */ + +#include "private.h" +#include "provider.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(input); + +struct racing_wheel_statics +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct racing_wheel_statics *impl_from_IActivationFactory( IActivationFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct racing_wheel_statics, IActivationFactory_iface ); +} + +static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IActivationFactory )) + { + IInspectable_AddRef( (*out = &impl->IActivationFactory_iface) ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI factory_AddRef( IActivationFactory *iface ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI factory_Release( IActivationFactory *iface ) +{ + struct racing_wheel_statics *impl = impl_from_IActivationFactory( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static HRESULT WINAPI factory_GetIids( IActivationFactory *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetRuntimeClassName( IActivationFactory *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) +{ + FIXME( "iface %p, instance %p stub!\n", iface, instance ); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl factory_vtbl = +{ + factory_QueryInterface, + factory_AddRef, + factory_Release, + /* IInspectable methods */ + factory_GetIids, + factory_GetRuntimeClassName, + factory_GetTrustLevel, + /* IActivationFactory methods */ + factory_ActivateInstance, +}; + +static struct racing_wheel_statics racing_wheel_statics = +{ + {&factory_vtbl}, + 1, +}; + +IActivationFactory *racing_wheel_factory = &racing_wheel_statics.IActivationFactory_iface; -- 2.35.1

2 6

[PATCH 1/6] windows.media.speech/tests: Fix some uses after release.
by Bernhard Kölbl April 22, 2022

April 22, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index ef75178f8c1..e4d65d3afd4 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -858,6 +858,8 @@ static void test_SpeechRecognizer(void) goto done; } + check_interface(factory, &IID_IAgileObject, TRUE); + hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechRecognizerFactory, (void **)&sr_factory); ok(hr == S_OK, "IActivationFactory_QueryInterface IID_ISpeechRecognizer failed, hr %#lx.\n", hr); @@ -901,7 +903,6 @@ static void test_SpeechRecognizer(void) if (hr == S_OK) { check_refcount(inspectable, 1); - check_interface(factory, &IID_IAgileObject, TRUE); hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechRecognizer, (void **)&recognizer); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -1068,8 +1069,6 @@ static void test_SpeechRecognizer(void) todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); todo_wine ok(async_status == Started || async_status == Completed, "Status was %#x.\n", async_status); - IAsyncInfo_Release(info); - hr = IAsyncOperation_SpeechRecognitionCompilationResult_put_Completed(operation, &compilation_handler2.IAsyncHandler_Compilation_iface); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -1081,6 +1080,9 @@ static void test_SpeechRecognizer(void) todo_wine ok(hr == S_OK, "IAsyncInfo_get_Status failed, hr %#lx.\n", hr); todo_wine ok(async_status == Completed, "Status was %#x.\n", async_status); + ref = IAsyncInfo_Release(info); + todo_wine ok(ref == 1, "Got unexpected ref %lu.\n", ref); + skip_operation: ref = IAsyncOperation_SpeechRecognitionCompilationResult_Release(operation); ok(!ref, "Got unexpected ref %lu.\n", ref); -- 2.35.1

3 15

[PATCH v2 5/5] windows.networking: Add stub dll.
by Zhiyi Zhang April 22, 2022

April 22, 2022

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 1 + dlls/windows.networking/Makefile.in | 1 + dlls/windows.networking/windows.networking.spec | 8 ++++++++ 3 files changed, 10 insertions(+) create mode 100644 dlls/windows.networking/Makefile.in create mode 100644 dlls/windows.networking/windows.networking.spec diff --git a/configure.ac b/configure.ac index 75292210bc4..74c80fd7fa8 100644 --- a/configure.ac +++ b/configure.ac @@ -3098,6 +3098,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.devices) WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech) WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests) +WINE_CONFIG_MAKEFILE(dlls/windows.networking) WINE_CONFIG_MAKEFILE(dlls/windowscodecs) WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests) WINE_CONFIG_MAKEFILE(dlls/windowscodecsext) diff --git a/dlls/windows.networking/Makefile.in b/dlls/windows.networking/Makefile.in new file mode 100644 index 00000000000..8773ecdad06 --- /dev/null +++ b/dlls/windows.networking/Makefile.in @@ -0,0 +1 @@ +MODULE = windows.networking.dll diff --git a/dlls/windows.networking/windows.networking.spec b/dlls/windows.networking/windows.networking.spec new file mode 100644 index 00000000000..1a0cf095fde --- /dev/null +++ b/dlls/windows.networking/windows.networking.spec @@ -0,0 +1,8 @@ +1 stub @ +2 stub DllCanUnloadNow +3 stub DllGetActivationFactory +4 stub DllGetClassObject +5 stub DllMain +6 stub DllRegisterServer +7 stub DllUnregisterServer +8 stub SetSocketMediaStreamingMode -- 2.32.0

2 2

[PATCH v2 3/5] wintypes: Implement IApiInformationStatics stubs.
by Zhiyi Zhang April 22, 2022

April 22, 2022

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wintypes/main.c | 172 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index d85a395d45c..ab48ce667b9 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -28,6 +28,9 @@ #include "activation.h" +#define WIDL_using_Windows_Foundation_Metadata +#include "windows.foundation.metadata.h" + WINE_DEFAULT_DEBUG_CHANNEL(wintypes); static const char *debugstr_hstring(HSTRING hstr) @@ -43,6 +46,7 @@ static const char *debugstr_hstring(HSTRING hstr) struct wintypes { IActivationFactory IActivationFactory_iface; + IApiInformationStatics IApiInformationStatics_iface; LONG ref; }; @@ -51,9 +55,16 @@ static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory * return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface); } +static inline struct wintypes *impl_from_IApiInformationStatics(IApiInformationStatics *iface) +{ + return CONTAINING_RECORD(iface, struct wintypes, IApiInformationStatics_iface); +} + static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid, void **out) { + struct wintypes *impl = impl_from_IActivationFactory(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) @@ -66,6 +77,13 @@ static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *ifa return S_OK; } + if (IsEqualGUID(iid, &IID_IApiInformationStatics)) + { + IUnknown_AddRef(iface); + *out = &impl->IApiInformationStatics_iface; + return S_OK; + } + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); *out = NULL; return E_NOINTERFACE; @@ -128,9 +146,163 @@ static const struct IActivationFactoryVtbl activation_factory_vtbl = wintypes_ActivateInstance, }; +static HRESULT STDMETHODCALLTYPE api_information_statics_QueryInterface( + IApiInformationStatics *iface, REFIID iid, void **out) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_QueryInterface(&impl->IActivationFactory_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_AddRef( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_AddRef(&impl->IActivationFactory_iface); +} + +static ULONG STDMETHODCALLTYPE api_information_statics_Release( + IApiInformationStatics *iface) +{ + struct wintypes *impl = impl_from_IApiInformationStatics(iface); + return wintypes_Release(&impl->IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetIids( + IApiInformationStatics *iface, ULONG *iid_count, IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetRuntimeClassName( + IApiInformationStatics *iface, HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_GetTrustLevel( + IApiInformationStatics *iface, TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsTypePresent( + IApiInformationStatics *iface, HSTRING type_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, value %p stub!\n", iface, debugstr_hstring(type_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(method_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsMethodPresentWithArity( + IApiInformationStatics *iface, HSTRING type_name, HSTRING method_name, + UINT32 parameter_count, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, method_name %s, parameter_count %u, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(method_name), parameter_count, value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEventPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING event_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, event_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(event_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsReadOnlyPropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, + BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsWriteablePropertyPresent( + IApiInformationStatics *iface, HSTRING type_name, HSTRING property_name, BOOLEAN *value) +{ + FIXME("iface %p, type_name %s, property_name %s, value %p stub!\n", iface, + debugstr_hstring(type_name), debugstr_hstring(property_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsEnumNamedValuePresent( + IApiInformationStatics *iface, HSTRING enum_type_name, HSTRING value_name, BOOLEAN *value) +{ + FIXME("iface %p, enum_type_name %s, value_name %s, value %p stub!\n", iface, + debugstr_hstring(enum_type_name), debugstr_hstring(value_name), value); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, value); + + if (value) + { + *value = FALSE; + return S_OK; + } + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajorAndMinor( + IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, + UINT16 minor_version, BOOLEAN *value) +{ + FIXME("iface %p, contract_name %s, major_version %u, minor_version %u, value %p stub!\n", iface, + debugstr_hstring(contract_name), major_version, minor_version, value); + return E_NOTIMPL; +} + +static const struct IApiInformationStaticsVtbl api_information_statics_vtbl = +{ + api_information_statics_QueryInterface, + api_information_statics_AddRef, + api_information_statics_Release, + /* IInspectable methods */ + api_information_statics_GetIids, + api_information_statics_GetRuntimeClassName, + api_information_statics_GetTrustLevel, + /* IApiInformationStatics methods */ + api_information_statics_IsTypePresent, + api_information_statics_IsMethodPresent, + api_information_statics_IsMethodPresentWithArity, + api_information_statics_IsEventPresent, + api_information_statics_IsPropertyPresent, + api_information_statics_IsReadOnlyPropertyPresent, + api_information_statics_IsWriteablePropertyPresent, + api_information_statics_IsEnumNamedValuePresent, + api_information_statics_IsApiContractPresentByMajor, + api_information_statics_IsApiContractPresentByMajorAndMinor +}; + static struct wintypes wintypes = { {&activation_factory_vtbl}, + {&api_information_statics_vtbl}, 1 }; -- 2.32.0

2 1

[PATCH v2 2/5] wintypes: Add stub dll.
by Zhiyi Zhang April 22, 2022

April 22, 2022

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 1 + dlls/wintypes/Makefile.in | 7 ++ dlls/wintypes/classes.idl | 23 ++++++ dlls/wintypes/main.c | 154 ++++++++++++++++++++++++++++++++++++ dlls/wintypes/wintypes.spec | 11 +++ 5 files changed, 196 insertions(+) create mode 100644 dlls/wintypes/Makefile.in create mode 100644 dlls/wintypes/classes.idl create mode 100644 dlls/wintypes/main.c create mode 100644 dlls/wintypes/wintypes.spec diff --git a/configure.ac b/configure.ac index 6cbc0a61be1..75292210bc4 100644 --- a/configure.ac +++ b/configure.ac @@ -3140,6 +3140,7 @@ WINE_CONFIG_MAKEFILE(dlls/wintab32) WINE_CONFIG_MAKEFILE(dlls/wintab32/tests) WINE_CONFIG_MAKEFILE(dlls/wintrust) WINE_CONFIG_MAKEFILE(dlls/wintrust/tests) +WINE_CONFIG_MAKEFILE(dlls/wintypes) WINE_CONFIG_MAKEFILE(dlls/winusb) WINE_CONFIG_MAKEFILE(dlls/wlanapi) WINE_CONFIG_MAKEFILE(dlls/wlanapi/tests) diff --git a/dlls/wintypes/Makefile.in b/dlls/wintypes/Makefile.in new file mode 100644 index 00000000000..aaa954322f7 --- /dev/null +++ b/dlls/wintypes/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wintypes.dll +IMPORTS = combase + +C_SRCS = \ + main.c + +IDL_SRCS = classes.idl diff --git a/dlls/wintypes/classes.idl b/dlls/wintypes/classes.idl new file mode 100644 index 00000000000..d8ab31e69be --- /dev/null +++ b/dlls/wintypes/classes.idl @@ -0,0 +1,23 @@ +/* + * Runtime Classes for wintypes.dll + * + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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 + */ + +#pragma makedep register + +#include "windows.foundation.metadata.idl" diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c new file mode 100644 index 00000000000..d85a395d45c --- /dev/null +++ b/dlls/wintypes/main.c @@ -0,0 +1,154 @@ +/* + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS +#include "initguid.h" +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "wine/debug.h" +#include "objbase.h" + +#include "activation.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wintypes); + +static const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) + return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +struct wintypes +{ + IActivationFactory IActivationFactory_iface; + LONG ref; +}; + +static inline struct wintypes *impl_from_IActivationFactory(IActivationFactory *iface) +{ + return CONTAINING_RECORD(iface, struct wintypes, IActivationFactory_iface); +} + +static HRESULT STDMETHODCALLTYPE wintypes_QueryInterface(IActivationFactory *iface, REFIID iid, + void **out) +{ + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IInspectable) + || IsEqualGUID(iid, &IID_IAgileObject) + || IsEqualGUID(iid, &IID_IActivationFactory)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + FIXME("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE wintypes_AddRef(IActivationFactory *iface) +{ + struct wintypes *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedIncrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static ULONG STDMETHODCALLTYPE wintypes_Release(IActivationFactory *iface) +{ + struct wintypes *impl = impl_from_IActivationFactory(iface); + ULONG ref = InterlockedDecrement(&impl->ref); + TRACE("iface %p, ref %lu.\n", iface, ref); + return ref; +} + +static HRESULT STDMETHODCALLTYPE wintypes_GetIids(IActivationFactory *iface, ULONG *iid_count, + IID **iids) +{ + FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_GetRuntimeClassName(IActivationFactory *iface, + HSTRING *class_name) +{ + FIXME("iface %p, class_name %p stub!\n", iface, class_name); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_GetTrustLevel(IActivationFactory *iface, + TrustLevel *trust_level) +{ + FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE wintypes_ActivateInstance(IActivationFactory *iface, + IInspectable **instance) +{ + FIXME("iface %p, instance %p stub!\n", iface, instance); + return E_NOTIMPL; +} + +static const struct IActivationFactoryVtbl activation_factory_vtbl = +{ + wintypes_QueryInterface, + wintypes_AddRef, + wintypes_Release, + /* IInspectable methods */ + wintypes_GetIids, + wintypes_GetRuntimeClassName, + wintypes_GetTrustLevel, + /* IActivationFactory methods */ + wintypes_ActivateInstance, +}; + +static struct wintypes wintypes = +{ + {&activation_factory_vtbl}, + 1 +}; + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, void **out) +{ + FIXME("clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllGetActivationFactory(HSTRING classid, IActivationFactory **factory) +{ + TRACE("classid %s, factory %p.\n", debugstr_hstring(classid), factory); + *factory = &wintypes.IActivationFactory_iface; + IUnknown_AddRef(*factory); + return S_OK; +} diff --git a/dlls/wintypes/wintypes.spec b/dlls/wintypes/wintypes.spec new file mode 100644 index 00000000000..605934c713b --- /dev/null +++ b/dlls/wintypes/wintypes.spec @@ -0,0 +1,11 @@ +1 stdcall -private DllCanUnloadNow() +2 stdcall -private DllGetActivationFactory(ptr ptr) +3 stdcall -private DllGetClassObject(ptr ptr ptr) +4 stub RoCreateNonAgilePropertySet +5 stub RoCreatePropertySetSerializer +6 stub RoGetBufferMarshaler +7 stub RoGetMetaDataFile +8 stub RoIsApiContractMajorVersionPresent +9 stub RoIsApiContractPresent +10 stub RoParseTypeName +11 stub RoResolveNamespace -- 2.32.0

2 1