May 2021 - Wine-devel - list.winehq.org

[PATCH] gdiplus : implements GdipEnumerateMetafileSrcRectDestRectI
by Dongwan Kim 18 May '21

18 May '21

Rect(Integer members) version for GdipEnumerateMetafileSrcRectDestRect Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/metafile.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index bda8bd56a3f..15d9b5d81e8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -201,7 +201,7 @@ 201 stdcall GdipEnumerateMetafileSrcRectDestPoints(ptr ptr ptr long ptr long ptr ptr ptr) 202 stub GdipEnumerateMetafileSrcRectDestPointsI 203 stdcall GdipEnumerateMetafileSrcRectDestRect(ptr ptr ptr ptr long ptr ptr ptr) -204 stub GdipEnumerateMetafileSrcRectDestRectI +204 stdcall GdipEnumerateMetafileSrcRectDestRectI(ptr ptr ptr ptr long ptr ptr ptr) 205 stdcall GdipFillClosedCurve2(ptr ptr ptr long float long) 206 stdcall GdipFillClosedCurve2I(ptr ptr ptr long float long) 207 stdcall GdipFillClosedCurve(ptr ptr ptr long) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f4824d4257b..d79c939218c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -3666,6 +3666,25 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRect( GpGraphics *graphics, return GdipEnumerateMetafileSrcRectDestPoints(graphics, metafile, points, 3, src, srcUnit, callback, cb_data, attrs); } +GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestRectI( GpGraphics * graphics, + GDIPCONST GpMetafile *metafile, GDIPCONST Rect *destRect, + GDIPCONST Rect *srcRect, Unit srcUnit, EnumerateMetafileProc callback, + VOID *cb_data, GDIPCONST GpImageAttributes *attrs ) +{ + GpRectF destRectF, srcRectF; + + destRectF.X = destRect->X; + destRectF.Y = destRect->Y; + destRectF.Width = destRect->Width; + destRectF.Height = destRect->Height; + + srcRectF.X = srcRect->X; + srcRectF.Y = srcRect->Y; + srcRectF.Width = srcRect->Width; + srcRectF.Height = srcRect->Height; + + return GdipEnumerateMetafileSrcRectDestRect( graphics, metafile, &destRectF, &srcRectF, srcUnit, callback, cb_data, attrs); +} GpStatus WINGDIPAPI GdipEnumerateMetafileDestRect(GpGraphics *graphics, GDIPCONST GpMetafile *metafile, GDIPCONST GpRectF *dest, -- 2.30.2

3 7

[PATCH 6/6] msvcrt: Import remquof implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 81 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 -------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 78 insertions(+), 19 deletions(-)

1 0

[PATCH 5/6] msvcrt: Import remquo implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 82 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 14 -------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 79 insertions(+), 19 deletions(-)

1 0

[PATCH 4/6] msvcrt: Import modff implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-)

1 0

[PATCH 3/6] msvcrt: Import modf implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 32 +++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 31 insertions(+), 11 deletions(-)

1 0

[PATCH 2/6] msvcrt: Import fmodf implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 70 +++++++++++++++++++++++++++++++++++++++---- dlls/msvcrt/unixlib.c | 9 ------ dlls/msvcrt/unixlib.h | 1 - 3 files changed, 64 insertions(+), 16 deletions(-)

1 0

[PATCH 1/6] msvcrt: Import fmod implementation from musl.
by Piotr Caban 18 May '21

18 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 64 +++++++++++++++++++++++++++++++++++++++++-- dlls/msvcrt/unixlib.c | 9 ------ dlls/msvcrt/unixlib.h | 1 - 3 files changed, 61 insertions(+), 13 deletions(-)

1 0

[PATCH 5/5] webservices: Add async support in WsOpenChannel.
by Hans Leidekker 18 May '21

18 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 48 ++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 458815ea7cc..bc65f0943bf 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1177,18 +1177,52 @@ static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS return hr; } +struct open_channel +{ + struct task task; + struct channel *channel; + const WS_ENDPOINT_ADDRESS *endpoint; + WS_ASYNC_CONTEXT ctx; +}; + +static void open_channel_proc( struct task *task ) +{ + struct open_channel *o = (struct open_channel *)task; + HRESULT hr; + + hr = open_channel( o->channel, o->endpoint ); + + TRACE( "calling %p(%08x)\n", o->ctx.callback, hr ); + o->ctx.callback( hr, WS_LONG_CALLBACK, o->ctx.callbackState ); + TRACE( "%p returned\n", o->ctx.callback ); +} + +static HRESULT queue_open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint, + const WS_ASYNC_CONTEXT *ctx ) +{ + struct open_channel *o; + + if (!(o = heap_alloc( sizeof(*o) ))) return E_OUTOFMEMORY; + o->task.proc = open_channel_proc; + o->channel = channel; + o->endpoint = endpoint; + o->ctx = *ctx; + return queue_task( &channel->send_q, &o->task ); +} + /************************************************************************** * WsOpenChannel [webservices.@] */ -HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, - const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !endpoint) return E_INVALIDARG; @@ -1205,7 +1239,13 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return WS_E_INVALID_OPERATION; } - hr = open_channel( channel, endpoint ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_open_channel( channel, endpoint, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); -- 2.30.2

1 0

[PATCH 4/5] webservices: Add async support in WsCloseChannel.
by Hans Leidekker 18 May '21

18 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 42 +++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 539a7813605..458815ea7cc 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -894,17 +894,47 @@ static void close_channel( struct channel *channel ) channel->state = WS_CHANNEL_STATE_CLOSED; } +struct close_channel +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void close_channel_proc( struct task *task ) +{ + struct close_channel *c = (struct close_channel *)task; + + close_channel( c->channel ); + + TRACE( "calling %p(S_OK)\n", c->ctx.callback ); + c->ctx.callback( S_OK, WS_LONG_CALLBACK, c->ctx.callbackState ); + TRACE( "%p returned\n", c->ctx.callback ); +} + +static HRESULT queue_close_channel( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct close_channel *c; + + if (!(c = heap_alloc( sizeof(*c) ))) return E_OUTOFMEMORY; + c->task.proc = close_channel_proc; + c->channel = channel; + c->ctx = *ctx; + return queue_task( &channel->send_q, &c->task ); +} + /************************************************************************** * WsCloseChannel [webservices.@] */ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr = S_OK; + WS_ASYNC_CONTEXT ctx_local; + struct async async; + HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -916,7 +946,13 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, return E_INVALIDARG; } - close_channel( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_close_channel( channel, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); -- 2.30.2

1 0

[PATCH 3/5] webservices: Add async support in WsShutdownSessionChannel.
by Hans Leidekker 18 May '21

18 May '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 41 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 76b0c1a96e2..539a7813605 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -820,14 +820,45 @@ static HRESULT shutdown_session( struct channel *channel ) } } +struct shutdown_session +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void shutdown_session_proc( struct task *task ) +{ + struct shutdown_session *s = (struct shutdown_session *)task; + HRESULT hr; + + hr = shutdown_session( s->channel ); + + TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); + s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); + TRACE( "%p returned\n", s->ctx.callback ); +} + +static HRESULT queue_shutdown_session( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct shutdown_session *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return E_OUTOFMEMORY; + s->task.proc = shutdown_session_proc; + s->channel = channel; + s->ctx = *ctx; + return queue_task( &channel->send_q, &s->task ); +} + HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -844,7 +875,13 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT return WS_E_INVALID_OPERATION; } - hr = shutdown_session( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_shutdown_session( channel, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); -- 2.30.2

1 0