August 2022 - Wine-Commits - list.winehq.org

Rémi Bernon : gitlab: Move build steps to the build-all script.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: f1a7a16b83e1296457ed509ae0607e1c8cb2fb71 URL: https://gitlab.winehq.org/wine/wine/-/commit/f1a7a16b83e1296457ed509ae0607e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 4 19:31:21 2022 +0200 gitlab: Move build steps to the build-all script. --- tools/gitlab/build-all | 22 ++++++++++++++++++++++ tools/gitlab/build.yml | 10 +--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/tools/gitlab/build-all b/tools/gitlab/build-all new file mode 100755 index 00000000000..351e100b4f8 --- /dev/null +++ b/tools/gitlab/build-all @@ -0,0 +1,22 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +set -Eeuxo pipefail + +./tools/make_requests +./tools/make_makefiles +autoreconf + +cd build64 +../configure -C --enable-win64 --enable-werror --with-mingw +make -s -j$(nproc) +cd .. + +cd build32 +../configure -C --enable-werror --with-mingw +make -s -j$(nproc) +cd .. + +git reset --hard diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 4f1ff0eddc5..1cb674d837a 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -30,15 +30,7 @@ build-all: - build64/config.log - build32/config.log script: - - ./tools/make_requests - - ./tools/make_makefiles - - autoreconf - - cd build64 - - ../configure -C --enable-win64 --enable-werror --with-mingw - - make -s -j$(nproc) - - cd ../build32 - - ../configure -C --enable-werror --with-mingw - - make -s -j$(nproc) + - ./tools/gitlab/build-all build-winetest: extends: .wine-build

1 0

Shaun Ren : webservices: Add support for reading WS_FAULT values.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: 42980ed28a06aff93237924425c6fb9d16c644ec URL: https://gitlab.winehq.org/wine/wine/-/commit/42980ed28a06aff93237924425c6fb… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 18:55:15 2022 -0400 webservices: Add support for reading WS_FAULT values. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/reader.c | 164 +++++++++++++++++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 106 +++++++++++++++++--------- 2 files changed, 235 insertions(+), 35 deletions(-)

1 0

Nikolay Sivov : d2d1/commandlist: Implement FillOpacityMask() command.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: 7cfe6d8f29ce5b69ae974e2eb53608fcd59df965 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cfe6d8f29ce5b69ae974e2eb53608… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 13:07:55 2022 +0300 d2d1/commandlist: Implement FillOpacityMask() command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/command_list.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/device.c | 6 ++++++ 3 files changed, 55 insertions(+) diff --git a/dlls/d2d1/command_list.c b/dlls/d2d1/command_list.c index 664b2f1a412..8e5654adac8 100644 --- a/dlls/d2d1/command_list.c +++ b/dlls/d2d1/command_list.c @@ -41,6 +41,7 @@ enum d2d_command_type D2D_COMMAND_DRAW_RECTANGLE, D2D_COMMAND_DRAW_BITMAP, D2D_COMMAND_FILL_MESH, + D2D_COMMAND_FILL_OPACITY_MASK, D2D_COMMAND_FILL_GEOMETRY, D2D_COMMAND_FILL_RECTANGLE, D2D_COMMAND_PUSH_CLIP, @@ -142,6 +143,15 @@ struct d2d_command_fill_mesh ID2D1Brush *brush; }; +struct d2d_command_fill_opacity_mask +{ + struct d2d_command c; + ID2D1Bitmap *bitmap; + ID2D1Brush *brush; + D2D1_RECT_F *dst_rect; + D2D1_RECT_F *src_rect; +}; + struct d2d_command_fill_geometry { struct d2d_command c; @@ -383,6 +393,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface hr = ID2D1CommandSink_FillMesh(sink, c->mesh, c->brush); break; } + case D2D_COMMAND_FILL_OPACITY_MASK: + { + const struct d2d_command_fill_opacity_mask *c = data; + hr = ID2D1CommandSink_FillOpacityMask(sink, c->bitmap, c->brush, c->dst_rect, c->src_rect); + break; + } case D2D_COMMAND_FILL_GEOMETRY: { const struct d2d_command_fill_geometry *c = data; @@ -960,3 +976,34 @@ void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const str command->mesh = mesh; command->brush = brush; } + +void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) +{ + struct d2d_command_fill_opacity_mask *command; + ID2D1Brush *brush; + size_t size; + BYTE *data; + + if (FAILED(d2d_command_list_create_brush(command_list, context, orig_brush, &brush))) + { + command_list->state = D2D_COMMAND_LIST_STATE_ERROR; + return; + } + + size = sizeof(*command); + if (dst_rect) size += sizeof(*dst_rect); + if (src_rect) size += sizeof(*src_rect); + + d2d_command_list_reference_object(command_list, bitmap); + + command = d2d_command_list_require_space(command_list, size); + command->c.op = D2D_COMMAND_FILL_OPACITY_MASK; + command->bitmap = bitmap; + command->brush = brush; + + data = (BYTE *)(command + 1); + + d2d_command_list_write_field(&data, &command->dst_rect, dst_rect, sizeof(*dst_rect)); + d2d_command_list_write_field(&data, &command->src_rect, src_rect, sizeof(*src_rect)); +} diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index eae8801fe4b..4cc77079e0f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -771,6 +771,8 @@ void d2d_command_list_draw_bitmap(struct d2d_command_list *command_list, ID2D1Bi const D2D1_RECT_F *src_rect, const D2D1_MATRIX_4X4_F *perspective_transform) DECLSPEC_HIDDEN; void d2d_command_list_fill_mesh(struct d2d_command_list *command_list, const struct d2d_device_context *context, ID2D1Mesh *mesh, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN; +void d2d_command_list_fill_opacity_mask(struct d2d_command_list *command_list, const struct d2d_device_context *context, + ID2D1Bitmap *bitmap, ID2D1Brush *orig_brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) DECLSPEC_HIDDEN; static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 7bed9245d75..796d837c3d9 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1115,6 +1115,9 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont d2d_device_context_set_error(context, E_INVALIDARG); return; } + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_fill_opacity_mask(context->target.command_list, context, mask, brush, dst_rect, src_rect); } static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, @@ -2614,6 +2617,9 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_FillOpacityM d2d_device_context_set_error(context, D2DERR_WRONG_STATE); return; } + + if (context->target.type == D2D_TARGET_COMMAND_LIST) + d2d_command_list_fill_opacity_mask(context->target.command_list, context, mask, brush, dst_rect, src_rect); } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateFilledGeometryRealization(ID2D1DeviceContext1 *iface,

1 0

Jacek Caban : user32: Use GetClientRect in EDIT_WM_ContextMenu.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: 98128a65e7e10d705d90ad05e2b5ff3ca517b6cb URL: https://gitlab.winehq.org/wine/wine/-/commit/98128a65e7e10d705d90ad05e2b5ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 19:36:20 2022 +0200 user32: Use GetClientRect in EDIT_WM_ContextMenu. --- dlls/user32/edit.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 80758dd60ef..81296f7deeb 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3328,11 +3328,16 @@ static void EDIT_WM_ContextMenu(EDITSTATE *es, INT x, INT y) if (x == -1 && y == -1) /* passed via VK_APPS press/release */ { + POINT pt; RECT rc; + /* Windows places the menu at the edit's center in this case */ - WIN_GetRectangles( es->hwndSelf, COORDS_SCREEN, NULL, &rc ); - x = rc.left + (rc.right - rc.left) / 2; - y = rc.top + (rc.bottom - rc.top) / 2; + GetClientRect( es->hwndSelf, &rc ); + pt.x = rc.right / 2; + pt.y = rc.bottom / 2; + ClientToScreen( es->hwndSelf, &pt ); + x = pt.x; + y = pt.y; } if (!(es->flags & EF_FOCUSED))

1 0

Shaun Ren : webservices: Detect when a message contains a fault in read_envelope_start.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: dfd6cb97682aaa981fb978271b3c01a2e3035d24 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfd6cb97682aaa981fb978271b3c01… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 19:16:35 2022 -0400 webservices: Detect when a message contains a fault in read_envelope_start. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/msg.c | 34 +++++++++++++++++++++++++++++++++- dlls/webservices/tests/msg.c | 21 ++++++++++++++++++++- include/webservices.h | 15 +++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 98d43660957..e4d4fce8ce4 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -42,6 +42,10 @@ static const struct prop_desc msg_props[] = { sizeof(WS_XML_READER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_READER */ { sizeof(WS_XML_WRITER *), TRUE }, /* WS_MESSAGE_PROPERTY_BODY_WRITER */ { sizeof(BOOL), TRUE }, /* WS_MESSAGE_PROPERTY_IS_ADDRESSED */ + { sizeof(WS_HEAP_PROPERTIES), TRUE }, /* WS_MESSAGE_PROPERTY_HEAP_PROPERTIES */ + { sizeof(WS_XML_READER_PROPERTIES), TRUE }, /* WS_MESSAGE_PROPERTY_XML_READER_PROPERTIES */ + { sizeof(WS_XML_WRITER_PROPERTIES), TRUE }, /* WS_MESSAGE_PROPERTY_XML_WRITER_PROPERTIES */ + { sizeof(BOOL), FALSE }, /* WS_MESSAGE_PROPERTY_IS_FAULT */ }; struct header @@ -122,6 +126,7 @@ static void free_header( struct header *header ) static void reset_msg( struct msg *msg ) { + BOOL isfault = FALSE; ULONG i; msg->state = WS_MESSAGE_STATE_EMPTY; @@ -150,6 +155,8 @@ static void reset_msg( struct msg *msg ) memset( &msg->ctx_send, 0, sizeof(msg->ctx_send) ); memset( &msg->ctx_receive, 0, sizeof(msg->ctx_receive) ); + + prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_IS_FAULT, &isfault, sizeof(isfault) ); } static void free_msg( struct msg *msg ) @@ -375,6 +382,13 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID else *(BOOL *)buf = msg->is_addressed; break; + case WS_MESSAGE_PROPERTY_HEAP_PROPERTIES: + case WS_MESSAGE_PROPERTY_XML_READER_PROPERTIES: + case WS_MESSAGE_PROPERTY_XML_WRITER_PROPERTIES: + FIXME( "property %u not supported\n", id ); + hr = E_NOTIMPL; + break; + default: hr = prop_get( msg->prop, msg->prop_count, id, buf, size ); } @@ -877,6 +891,18 @@ static BOOL match_current_element( WS_XML_READER *reader, const WS_XML_STRING *l return WsXmlStringEquals( elem->localName, localname, NULL ) == S_OK; } +static BOOL match_current_element_with_ns( WS_XML_READER *reader, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) +{ + const WS_XML_NODE *node; + const WS_XML_ELEMENT_NODE *elem; + + if (WsGetReaderNode( reader, &node, NULL ) != S_OK) return FALSE; + if (node->nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + elem = (const WS_XML_ELEMENT_NODE *)node; + return WsXmlStringEquals( elem->localName, localname, NULL ) == S_OK && + WsXmlStringEquals( elem->ns, ns, NULL ) == S_OK; +} + static HRESULT read_message_id( WS_XML_READER *reader, GUID *ret ) { const WS_XML_NODE *node; @@ -914,6 +940,9 @@ static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) { static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, body = {4, (BYTE *)"Body"}; static const WS_XML_STRING header = {6, (BYTE *)"Header"}, msgid = {9, (BYTE *)"MessageID"}; + static const WS_XML_STRING fault = {5, (BYTE *)"Fault"}; + const WS_XML_STRING *ns_env = get_env_namespace( msg->version_env ); + BOOL isfault; HRESULT hr; if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; @@ -930,7 +959,10 @@ static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) } } if (!match_current_element( reader, &body )) return WS_E_INVALID_FORMAT; - return WsReadNode( reader, NULL ); + if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; + + isfault = match_current_element_with_ns( reader, &fault, ns_env ); + return prop_set( msg->prop, msg->prop_count, WS_MESSAGE_PROPERTY_IS_FAULT, &isfault, sizeof(isfault) ); } /************************************************************************** diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 2af2dd334e7..feeedc940d5 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -1071,10 +1071,14 @@ static void test_WsReadEnvelopeStart(void) { static const char xml[] = "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body/></s:Envelope>"; - WS_MESSAGE *msg, *msg2; + static const char faultxml[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<s:Fault/></s:Body></s:Envelope>"; + WS_MESSAGE *msg, *msg2, *msg3; WS_XML_READER *reader; WS_MESSAGE_STATE state; const WS_XML_NODE *node; + BOOL isfault; HRESULT hr; hr = WsReadEnvelopeStart( NULL, NULL, NULL, NULL, NULL ); @@ -1127,8 +1131,23 @@ static void test_WsReadEnvelopeStart(void) ok( hr == S_OK, "got %#lx\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_0_9, NULL, 0, &msg3, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = set_input( reader, faultxml, strlen(faultxml) ); + ok( hr == S_OK, "got %#lx\n", hr ); + + hr = WsReadEnvelopeStart( msg3, reader, NULL, NULL, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + + isfault = FALSE; + hr = WsGetMessageProperty( msg3, WS_MESSAGE_PROPERTY_IS_FAULT, &isfault, sizeof(isfault), NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( isfault, "isfault == FALSE\n" ); + WsFreeMessage( msg ); WsFreeMessage( msg2 ); + WsFreeMessage( msg3 ); WsFreeReader( reader ); } diff --git a/include/webservices.h b/include/webservices.h index 6657ee84201..bda09e06bc8 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -113,6 +113,11 @@ typedef struct _WS_HEAP_PROPERTY { ULONG valueSize; } WS_HEAP_PROPERTY; +typedef struct _WS_HEAP_PROPERTIES { + WS_HEAP_PROPERTY *properties; + ULONG propertyCount; +} WS_HEAP_PROPERTIES; + typedef ULONG WS_XML_BUFFER_PROPERTY_ID; typedef struct _WS_XML_BUFFER_PROPERTY { @@ -145,6 +150,11 @@ typedef struct _WS_XML_READER_PROPERTY { ULONG valueSize; } WS_XML_READER_PROPERTY; +typedef struct _WS_XML_READER_PROPERTIES { + WS_XML_READER_PROPERTY *properties; + ULONG propertyCount; +} WS_XML_READER_PROPERTIES; + typedef enum { WS_XML_WRITER_PROPERTY_MAX_DEPTH, WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, @@ -173,6 +183,11 @@ typedef struct _WS_XML_WRITER_PROPERTY { ULONG valueSize; } WS_XML_WRITER_PROPERTY; +typedef struct _WS_XML_WRITER_PROPERTIES { + WS_XML_WRITER_PROPERTY *properties; + ULONG propertyCount; +} WS_XML_WRITER_PROPERTIES; + typedef struct _WS_BYTES { ULONG length; BYTE *bytes;

1 0

Jacek Caban : win32u: Introduce NtUserGetChildRect.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: 421fb1c80493df8e9ce0b8e5dabe6e78bf624a52 URL: https://gitlab.winehq.org/wine/wine/-/commit/421fb1c80493df8e9ce0b8e5dabe6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 19:44:39 2022 +0200 win32u: Introduce NtUserGetChildRect. And use it in CalcChildScroll. --- dlls/user32/class.c | 38 ----------- dlls/user32/controls.h | 2 - dlls/user32/mdi.c | 2 +- dlls/user32/user_private.h | 3 - dlls/user32/win.c | 160 --------------------------------------------- dlls/user32/win.h | 4 -- dlls/win32u/sysparams.c | 3 - dlls/win32u/window.c | 3 + include/ntuser.h | 7 +- 9 files changed, 10 insertions(+), 212 deletions(-)

1 0

Shaun Ren : webservices: Fill in type description for WS_FAULT_TYPE if necessary in WsReadBody.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: d8f230f219c7dcff3e873b7188377b73dc6b52b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8f230f219c7dcff3e873b7188377b… Author: Shaun Ren <sren(a)codeweavers.com> Date: Wed Aug 3 19:19:53 2022 -0400 webservices: Fill in type description for WS_FAULT_TYPE if necessary in WsReadBody. Signed-off-by: Shaun Ren <sren(a)codeweavers.com> --- dlls/webservices/msg.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e4d4fce8ce4..36dbe564b85 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -1042,6 +1042,8 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des WS_HEAP *heap, void *value, ULONG size, WS_ERROR *error ) { struct msg *msg = (struct msg *)handle; + WS_ELEMENT_DESCRIPTION tmp; + WS_FAULT_DESCRIPTION fault_desc; HRESULT hr; TRACE( "%p %p %u %p %p %lu %p\n", handle, desc, option, heap, value, size, error ); @@ -1058,7 +1060,23 @@ HRESULT WINAPI WsReadBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *des } if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION; - else hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); + else + { + if (!desc->typeDescription) + { + if (desc->type == WS_FAULT_TYPE) + { + memcpy( &tmp, desc, sizeof(*desc) ); + fault_desc.envelopeVersion = msg->version_env; + tmp.typeDescription = &fault_desc; + desc = &tmp; + } + else if (desc->type == WS_ENDPOINT_ADDRESS_TYPE) + FIXME( "!desc->typeDescription with WS_ENDPOINT_ADDRESS_TYPE\n" ); + } + + hr = WsReadElement( msg->reader_body, desc, option, heap, value, size, NULL ); + } LeaveCriticalSection( &msg->cs ); TRACE( "returning %#lx\n", hr );

1 0

Alistair Leslie-Hughes : include: Add coclass SpMMAudioEnum.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: 6a09b45a01ff971c30b7118ea7f62032a9567990 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a09b45a01ff971c30b7118ea7f620… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 5 18:00:46 2022 +1000 include: Add coclass SpMMAudioEnum. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/sapi.idl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/sapi.idl b/include/sapi.idl index ba577d4de04..cd5d6044bdf 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -1295,6 +1295,16 @@ library SpeechLib [default] interface ISpeechFileStream; }; + [ + uuid(ab1890a0-e91f-11d2-bb91-00c04f8ee6c0), + restricted, + hidden + ] + coclass SpMMAudioEnum + { + interface IEnumSpObjectTokens; + }; + [ uuid(cf3d2e50-53f2-11d2-960c-00c04f8ee628) ]

1 0

Jacek Caban : user32: Store MDI client info on client heap.
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: 1bd73c6c3e2b8737b7377dd7be3dc7e7a13c2edf URL: https://gitlab.winehq.org/wine/wine/-/commit/1bd73c6c3e2b8737b7377dd7be3dc7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 21:12:23 2022 +0200 user32: Store MDI client info on client heap. --- dlls/user32/mdi.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index cb278525f13..d8d26a3b2f1 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -127,7 +127,6 @@ typedef struct * states it must keep coherency with USER32 on its own. This is true for * Windows as well. */ - LONG reserved; UINT nActiveChildren; HWND hwndChildMaximized; HWND hwndActiveChild; @@ -187,7 +186,7 @@ const struct builtin_class_descr MDICLIENT_builtin_class = L"MDIClient", /* name */ 0, /* style */ WINPROC_MDICLIENT, /* proc */ - sizeof(MDICLIENTINFO), /* extra */ + 2 * sizeof(void *), /* extra */ IDC_ARROW, /* cursor */ (HBRUSH)(COLOR_APPWORKSPACE+1) /* brush */ }; @@ -205,7 +204,7 @@ static MDICLIENTINFO *get_client_info( HWND client ) return NULL; } if (win->flags & WIN_ISMDICLIENT) - ret = (MDICLIENTINFO *)win->wExtra; + ret = ((MDICLIENTINFO **)win->wExtra)[1]; else WARN( "%p is not an MDI client\n", client ); WIN_ReleasePtr( win ); @@ -1036,7 +1035,12 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM if (!(ci = get_client_info( hwnd ))) { - if (message == WM_NCCREATE) win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); + if (message == WM_NCCREATE) + { + if (!(ci = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ci) ))) return 0; + SetWindowLongPtrW( hwnd, sizeof(void *), (ULONG_PTR)ci ); + win_set_flags( hwnd, WIN_ISMDICLIENT, 0 ); + } return unicode ? DefWindowProcW( hwnd, message, wParam, lParam ) : DefWindowProcA( hwnd, message, wParam, lParam ); } @@ -1077,7 +1081,7 @@ LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM HeapFree( GetProcessHeap(), 0, ci->child ); HeapFree( GetProcessHeap(), 0, ci->frameTitle ); - + HeapFree( GetProcessHeap(), 0, ci ); return 0; }

1 0

Nikolay Sivov : d2d1: Add parameter validation to FillOpacityMask().
by Alexandre Julliard Aug. 5, 2022

Aug. 5, 2022

Module: wine Branch: master Commit: 4f1dfdad1d529e004043f16c1fff1dc8e9895094 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f1dfdad1d529e004043f16c1fff1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 5 00:54:07 2022 +0300 d2d1: Add parameter validation to FillOpacityMask(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index c502c5dc4e4..7bed9245d75 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1096,8 +1096,25 @@ static void STDMETHODCALLTYPE d2d_device_context_FillOpacityMask(ID2D1DeviceCont ID2D1Bitmap *mask, ID2D1Brush *brush, D2D1_OPACITY_MASK_CONTENT content, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, mask %p, brush %p, content %#x, dst_rect %s, src_rect %s stub!\n", iface, mask, brush, content, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); + + if (FAILED(context->error.code)) + return; + + if (context->drawing_state.antialiasMode != D2D1_ANTIALIAS_MODE_ALIASED) + { + d2d_device_context_set_error(context, D2DERR_WRONG_STATE); + return; + } + + if ((unsigned int)content > D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE) + { + d2d_device_context_set_error(context, E_INVALIDARG); + return; + } } static void d2d_device_context_draw_bitmap(struct d2d_device_context *context, ID2D1Bitmap *bitmap, @@ -2584,8 +2601,19 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_GetEffectRequiredInputRectan static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_FillOpacityMask(ID2D1DeviceContext1 *iface, ID2D1Bitmap *mask, ID2D1Brush *brush, const D2D1_RECT_F *dst_rect, const D2D1_RECT_F *src_rect) { + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + FIXME("iface %p, mask %p, brush %p, dst_rect %s, src_rect %s stub!\n", iface, mask, brush, debug_d2d_rect_f(dst_rect), debug_d2d_rect_f(src_rect)); + + if (FAILED(context->error.code)) + return; + + if (context->drawing_state.antialiasMode != D2D1_ANTIALIAS_MODE_ALIASED) + { + d2d_device_context_set_error(context, D2DERR_WRONG_STATE); + return; + } } static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateFilledGeometryRealization(ID2D1DeviceContext1 *iface,

1 0