April 2022 - Wine-Devel - list.winehq.org

[PATCH v2 2/3] webservices: Check for channel state in WsReceiveMessage.
by Hans Leidekker April 20, 2022

April 20, 2022

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 5 +++++ dlls/webservices/tests/channel.c | 28 +++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 1148744346c..cfb6566921d 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2415,6 +2415,11 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M LeaveCriticalSection( &channel->cs ); return E_INVALIDARG; } + if (channel->state != WS_CHANNEL_STATE_OPEN) + { + LeaveCriticalSection( &channel->cs ); + return WS_E_INVALID_OPERATION; + } if (!ctx) async_init( &async, &ctx_local ); hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index e3cadc7d344..f70eafaecc8 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -626,6 +626,7 @@ static void server_duplex_session( WS_CHANNEL *channel ) static void client_duplex_session( const struct listener_info *info ) { WS_XML_STRING action = {6, (BYTE *)"action"}, localname = {9, (BYTE *)"localname"}, ns = {2, (BYTE *)"ns"}; + const WS_MESSAGE_DESCRIPTION *descs[1]; WS_ELEMENT_DESCRIPTION desc_body; WS_MESSAGE_DESCRIPTION desc; WS_ENDPOINT_ADDRESS addr; @@ -645,6 +646,26 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsShutdownSessionChannel( channel, NULL, NULL ); ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); + desc_body.elementLocalName = &localname; + desc_body.elementNs = &ns; + desc_body.type = WS_INT32_TYPE; + desc_body.typeDescription = NULL; + desc.action = &action; + desc.bodyElementDescription = &desc_body; + descs[0] = &desc; + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsReceiveMessage( channel, msg, descs, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr); + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %#lx\n", hr ); + + WsFreeMessage( msg ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = wsprintfW( buf, L"net.tcp://localhost:%u", info->port ); addr.url.chars = buf; @@ -654,13 +675,6 @@ static void client_duplex_session( const struct listener_info *info ) hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); - desc_body.elementLocalName = &localname; - desc_body.elementNs = &ns; - desc_body.type = WS_INT32_TYPE; - desc_body.typeDescription = NULL; - desc.action = &action; - desc.bodyElementDescription = &desc_body; - hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); ok( hr == S_OK, "got %#lx\n", hr ); -- 2.30.2

1 0

[PATCH v2 1/3] webservices: Don't advance binary encoding reader if record type doesn't match.
by Hans Leidekker April 20, 2022

April 20, 2022

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 18 ++++++++++++------ dlls/webservices/tests/reader.c | 15 ++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 7da0c8335ea..b22bcbd51b1 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1486,8 +1486,9 @@ static HRESULT read_attribute_value_bin( struct reader *reader, WS_XML_ATTRIBUTE GUID guid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -1771,9 +1772,10 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret unsigned char type = 0; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) return WS_E_INVALID_FORMAT; if (!(attr = calloc( 1, sizeof(*attr) ))) return E_OUTOFMEMORY; + read_skip( reader, 1 ); if (type >= RECORD_PREFIX_ATTRIBUTE_A && type <= RECORD_PREFIX_ATTRIBUTE_Z) { @@ -2068,8 +2070,9 @@ static HRESULT read_element_bin( struct reader *reader ) unsigned char type; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_element_type( type )) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2480,8 +2483,9 @@ static HRESULT read_text_bin( struct reader *reader ) GUID uuid; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_text_type( type ) || !(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); switch (type) { @@ -2835,8 +2839,9 @@ static HRESULT read_endelement_bin( struct reader *reader ) if (!(reader->current->flags & NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT)) { - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_ENDELEMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); } if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2917,8 +2922,9 @@ static HRESULT read_comment_bin( struct reader *reader ) ULONG len; HRESULT hr; - if ((hr = read_byte( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type != RECORD_COMMENT) return WS_E_INVALID_FORMAT; + read_skip( reader, 1 ); if ((hr = read_int31( reader, &len )) != S_OK) return hr; if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1a2cd1fe420..f62697b9662 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5764,15 +5764,12 @@ static void test_binary_encoding(void) hr = WsReadType( reader, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, WS_READ_REQUIRED_POINTER, heap, &test_struct, sizeof(test_struct), NULL ); - todo_wine ok( hr == S_OK, "got %#lx\n", hr ); - if (SUCCEEDED(hr)) - { - ok( test_struct->a == 1, "got %d\n", test_struct->a ); - ok( !!test_struct->s, "s is not set\n" ); - ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); - ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); - ok( test_struct->b == 1, "got %d\n", test_struct->b ); - } + ok( hr == S_OK, "got %#lx\n", hr ); + ok( test_struct->a == 1, "got %d\n", test_struct->a ); + ok( !!test_struct->s, "s is not set\n" ); + ok( test_struct->s->s_a == 1, "got %d\n", test_struct->s->s_a ); + ok( test_struct->s->s_b == 0, "got %d\n", test_struct->s->s_b ); + ok( test_struct->b == 1, "got %d\n", test_struct->b ); WsFreeHeap( heap ); WsFreeReader( reader ); -- 2.30.2

1 0

[PATCH 1/5] d2d1/tests: Test output bounds for D2D1Grayscale.
by Ziqing Hui April 20, 2022

April 20, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 47 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ca80a8e946b..fd4b806278a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10413,11 +10413,21 @@ static void test_effect_grayscale(BOOL d3d11) ID2D1Factory3 *factory; ID2D1Bitmap1 *bitmap; ID2D1Effect *effect; + D2D1_RECT_F bounds; ID2D1Image *output; unsigned int i; HRESULT hr; const DWORD test_pixels[] = {0xffffffff, 0x12345678, 0x89abcdef, 0x77777777, 0xdeadbeef}; + const D2D_SIZE_U test_size[] = + { + {1, 1}, + {2, 4}, + {100, 100}, + {123, 456}, + {2000, 1000}, + {8888, 9999}, + }; if (!init_test_context(&ctx, d3d11)) return; @@ -10435,18 +10445,43 @@ static void test_effect_grayscale(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Grayscale, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + + /* Test output bounds */ + for (i = 0; i < ARRAY_SIZE(test_size); ++i) + { + input_size = test_size[i]; + winetest_push_context("Test %u", i); + + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + ID2D1Effect_GetOutput(effect, &output); + + ID2D1DeviceContext_GetImageLocalBounds(context, output, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, input_size.width, input_size.height, 0), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, + 0.0f, 0.0f, (float)input_size.width, (float)input_size.height); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + /* Test output pixel */ for (i = 0; i < ARRAY_SIZE(test_pixels); ++i) { DWORD pixel = test_pixels[i]; winetest_push_context("Test %u", i); set_size_u(&input_size, 1, 1); - bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; - bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; - bitmap_desc.dpiX = 96.0f; - bitmap_desc.dpiY = 96.0f; - bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; - bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmap(context, input_size, &pixel, sizeof(pixel), &bitmap_desc, &bitmap); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); -- 2.25.1

2 5

[PATCH 0/4] Some more console support
by Eric Pouech April 20, 2022

April 20, 2022

This serie first implements an evolution to programs/wineconsole in order to be able to run a given (CUI) program with a clear status on its console. It allows to pickup between: a newly created (graphical) console, a newly created window-less console (a real console object, but not displayed at all), or detached (no console at all). As a reminder, Wine also provides two other kinds of console: - running a CUI program, from a unix env, without redirecting all the 3 std streams (ie at least one of the three needs to be mapped to the unix console). This uses a bridge with the current Unix tty. (nick name: console-shell) - running a CUI program, from a unix env, with the 3 std streams not being tied to a console. (nick name: console-shell-no-window) Wineconsole doesn't provide those two consoles as they are already available directly from command line. Testing some of the Wine programs revealed some bugs in Wine programs/. Quite a few of them, when outputing, try first to write in Unicode to the console, and fall back (in case output stream has been redirected) to WriteFile, after converting the Unicode string with GetConsoleOutputCP(). This will lead to wrong results when: - program isn't attached to any console - program is attached a console-shell-no-window. Some others programs do the same, but forcing CP_ACP instead. I think it's time to evolve a bit... For the two use cases, I propose to always convert output to UTF8 in case of redirection (done with on example of each). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (4): programs/wineconsole: select console type and/or std handles for child process dlls/kernelbase: fix CreateProcess with CREATE_NO_WINDOW when no std handles are inherited programs/chcp.com: write redirected output in UTF8 programs/attrib: write redirected output in UTF8 dlls/kernelbase/process.c | 2 +- programs/attrib/attrib.c | 9 +- programs/chcp.com/main.c | 9 +- programs/wineconsole/wineconsole.c | 192 ++++++++++++++++++++---- programs/wineconsole/wineconsole.man.in | 40 ++++- programs/wineconsole/wineconsole.rc | 12 ++ programs/wineconsole/wineconsole_res.h | 2 + 7 files changed, 222 insertions(+), 44 deletions(-)

3 8

[PATCH v5] winex11: Prevent the call sequence change between xim preedit callback and event handlers.
by Byeongsik Jeon April 20, 2022

April 20, 2022

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v1: first implemetation. v2: rework. update merge_events(). v3: delete the incorrect description. v4: MERGE_FLUSH enumeration change. v5: update merge_events() more. fix GenericEvent processing. The current process_events() pseudecode for non-mergeable events may be simplified as follows: process_events() { prev_event.type = 0; while (XCheckIfEvent( &event )) { if (XFilterEvent( &event )) continue; if (prev_event.type) call_event_handler( &prev_event ); prev_event = event; } if (prev_event.type) call_event_handler( &prev_event ); } - "xim preedit callbacks" are called from within the XFilterEvent(). - Depending on the XCheckIfEvent(), XFilterEvent() return value, the call_event_handler() may be called after one or more loop steps. So, call_event_handler() may be delayed after the next "xim preedit callback" call. dlls/winex11.drv/event.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 900f24c4002..bee37f3368b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -263,6 +263,7 @@ enum event_merge_action { MERGE_DISCARD, /* discard the old event */ MERGE_HANDLE, /* handle the old event */ + MERGE_FLUSH, /* handle the old and new event */ MERGE_KEEP, /* keep the old event for future merging */ MERGE_IGNORE /* ignore the new event, keep the old one */ }; @@ -316,6 +317,22 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) { switch (prev->type) { + case 0: + switch (next->type) + { +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H + case GenericEvent: + if (next->xcookie.extension != xinput2_opcode) break; + if (next->xcookie.evtype != XI_RawMotion) break; + if (x11drv_thread_data()->warp_serial) break; + /* fall through */ +#endif + case ConfigureNotify: + case MotionNotify: + return MERGE_DISCARD; + } + return MERGE_KEEP; + case ConfigureNotify: switch (next->type) { @@ -325,7 +342,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate ConfigureNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; case Expose: case PropertyNotify: return MERGE_KEEP; @@ -340,7 +357,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) TRACE( "discarding duplicate MotionNotify for window %lx\n", prev->xany.window ); return MERGE_DISCARD; } - break; + return MERGE_HANDLE; #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H case GenericEvent: if (next->xcookie.extension != xinput2_opcode) break; @@ -350,8 +367,6 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) } break; case GenericEvent: - if (prev->xcookie.extension != xinput2_opcode) break; - if (prev->xcookie.evtype != XI_RawMotion) break; switch (next->type) { case GenericEvent: @@ -363,7 +378,7 @@ static enum event_merge_action merge_events( XEvent *prev, XEvent *next ) } break; } - return MERGE_HANDLE; + return MERGE_FLUSH; } @@ -409,7 +424,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X XEvent event, prev_event; int count = 0; BOOL queued = FALSE; - enum event_merge_action action = MERGE_DISCARD; + enum event_merge_action action; prev_event.type = 0; while (XCheckIfEvent( display, &event, filter, (char *)arg )) @@ -446,7 +461,7 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X continue; /* filtered, ignore it */ } get_event_data( &event ); - if (prev_event.type) action = merge_events( &prev_event, &event ); + action = merge_events( &prev_event, &event ); switch( action ) { case MERGE_HANDLE: /* handle prev, keep new */ @@ -456,6 +471,11 @@ static BOOL process_events( Display *display, Bool (*filter)(Display*, XEvent*,X free_event_data( &prev_event ); prev_event = event; break; + case MERGE_FLUSH: /* handle prev and new */ + queued |= call_event_handler( display, &prev_event ); + free_event_data( &prev_event ); + prev_event.type = 0; + /* fall through */ case MERGE_KEEP: /* handle new, keep prev for future merging */ queued |= call_event_handler( display, &event ); /* fall through */ -- 2.36.0

1 0

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

April 20, 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

1 0

[PATCH 4/5] apisetschema: Add api-ms-win-core-winrt-robuffer-l1-1-0.
by Zhiyi Zhang April 20, 2022

April 20, 2022

Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..b13d00f8844 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -147,6 +147,7 @@ apiset api-ms-win-core-winrt-error-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-errorprivate-l1-1-1 = combase.dll apiset api-ms-win-core-winrt-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-registration-l1-1-0 = combase.dll +apiset api-ms-win-core-winrt-robuffer-l1-1-0 = wintypes.dll apiset api-ms-win-core-winrt-roparameterizediid-l1-1-0 = combase.dll apiset api-ms-win-core-winrt-string-l1-1-1 = combase.dll apiset api-ms-win-core-wow64-l1-1-1 = kernelbase.dll -- 2.32.0

1 0

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

April 20, 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

1 0

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

April 20, 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

1 0

[PATCH 3/5] wineoss: Add a temporary midi_out_fm_patch syscall.
by Huw Davies April 20, 2022

April 20, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- It may be necessary to run "make depend" to pick up the change to midipatch.c dlls/wineoss.drv/midi.c | 34 +++++----------------------- dlls/wineoss.drv/midipatch.c | 4 ++++ dlls/wineoss.drv/oss.c | 1 + dlls/wineoss.drv/ossmidi.c | 43 ++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 ++++++++ 5 files changed, 63 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3fcebf2da67..6669f973845 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -723,40 +723,18 @@ typedef struct sFMextra { */ } sFMextra; -extern const unsigned char midiFMInstrumentPatches[16 * 128]; -extern const unsigned char midiFMDrumsPatches [16 * 128]; - /************************************************************************** * modFMLoad [internal] */ -static int modFMLoad(int dev, int fd) +static int modFMLoad(WORD dev, int fd) { - int i; - struct sbi_instrument sbi; - - sbi.device = dev; - sbi.key = FM_PATCH; - - memset(sbi.operators + 16, 0, 16); - for (i = 0; i < 128; i++) { - sbi.channel = i; - memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); + struct midi_out_fm_load_params params; - if (write(fd, &sbi, sizeof(sbi)) == -1) { - WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - return -1; - } - } - for (i = 0; i < 128; i++) { - sbi.channel = 128 + i; - memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); + params.dev_id = dev; + params.fd = fd; + OSS_CALL(midi_out_fm_load, &params); - if (write(fd, &sbi, sizeof(sbi)) == -1) { - WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); - return -1; - } - } - return 0; + return params.ret; } /************************************************************************** diff --git a/dlls/wineoss.drv/midipatch.c b/dlls/wineoss.drv/midipatch.c index 41d8e07b99a..4ff48623260 100644 --- a/dlls/wineoss.drv/midipatch.c +++ b/dlls/wineoss.drv/midipatch.c @@ -24,6 +24,10 @@ * Eric POUECH : MIDI FM patches for GM instruments */ +#if 0 +#pragma makedep unix +#endif + #define NOT_DEFINED 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, const unsigned char midiFMInstrumentPatches[128 * 16] = { diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index ac8847920b0..2fc6c81e560 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1408,4 +1408,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_init, midi_seq_open, + midi_out_fm_load, }; diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index a0a0b1caad2..ba5dbca7e4f 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -345,3 +345,46 @@ wrapup: return STATUS_SUCCESS; } + +extern const unsigned char midiFMInstrumentPatches[16 * 128]; +extern const unsigned char midiFMDrumsPatches[16 * 128]; + +NTSTATUS midi_out_fm_load(void *args) +{ + struct midi_out_fm_load_params *params = args; + WORD dev_id = params->dev_id; + int fd = params->fd; + struct sbi_instrument sbi; + int i; + + sbi.device = dev_id; + sbi.key = FM_PATCH; + + memset(sbi.operators + 16, 0, 16); + for (i = 0; i < 128; i++) + { + sbi.channel = i; + memcpy(sbi.operators, midiFMInstrumentPatches + i * 16, 16); + + if (write(fd, &sbi, sizeof(sbi)) == -1) + { + WARN("Couldn't write patch for instrument %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); + params->ret = -1; + return STATUS_SUCCESS; + } + } + for (i = 0; i < 128; i++) + { + sbi.channel = 128 + i; + memcpy(sbi.operators, midiFMDrumsPatches + i * 16, 16); + + if (write(fd, &sbi, sizeof(sbi)) == -1) + { + WARN("Couldn't write patch for drum %d, errno %d (%s)!\n", sbi.channel, errno, strerror(errno)); + params->ret = -1; + return STATUS_SUCCESS; + } + } + params->ret = 0; + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 68d41e41f74..4dab53f5148 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -252,6 +252,13 @@ struct midi_seq_open_params int fd; }; +struct midi_out_fm_load_params +{ + WORD dev_id; + int fd; + int ret; +}; + enum oss_funcs { oss_test_connect, @@ -280,10 +287,12 @@ enum oss_funcs oss_midi_init, oss_midi_seq_open, /* temporary */ + oss_midi_out_fm_load, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_fm_load(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t oss_handle; -- 2.25.1

2 2