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

Huw Davies : localspl: Implement GetForm().
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 649821071caf13846cfd9283fe9ea18a183d2e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=649821071caf13846cfd9283… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 19 14:43:10 2021 +0100 localspl: Implement GetForm(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 69f70cdf541..c17983e3037 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2714,8 +2714,44 @@ static BOOL WINAPI fpDeleteForm( HANDLE printer, WCHAR *name ) static BOOL WINAPI fpGetForm( HANDLE printer, WCHAR *name, DWORD level, BYTE *form, DWORD size, DWORD *needed ) { - FIXME( "(%p, %s, %d, %p, %d, %p): stub\n", printer, debugstr_w( name ), level, form, size, needed ); - return FALSE; + size_t struct_size = form_struct_size( level ); + const struct builtin_form *builtin = NULL; + WCHAR *strings = NULL; + BYTE *base = form; + DWORD i; + + TRACE( "(%p, %s, %d, %p, %d, %p)\n", printer, debugstr_w( name ), level, form, size, needed ); + + *needed = 0; + + if (!struct_size) return FALSE; + + for (i = 0; i < ARRAY_SIZE(builtin_forms); i++) + { + if (!wcscmp( name, builtin_forms[i].name )) + { + builtin = builtin_forms + i; + break; + } + } + + if (!builtin) + { + SetLastError( ERROR_INVALID_FORM_NAME ); + return FALSE; + } + + *needed = struct_size; + if (*needed < size) strings = (WCHAR *)(form + *needed); + + fill_builtin_form_info( &base, &strings, builtin, level, size, needed ); + + if (*needed > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + return TRUE; } static BOOL WINAPI fpSetForm( HANDLE printer, WCHAR *name, DWORD level, BYTE *form )

1 0

Huw Davies : winspool: Forward the unicode forms functions to localspl.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 7d4a7f855760a1d6d27a80cfdb39ec14821e219b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d4a7f855760a1d6d27a80cf… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 19 14:43:08 2021 +0100 winspool: Forward the unicode forms functions to localspl. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/provider.c | 41 ++++++++++++++++++++--- dlls/winspool.drv/info.c | 87 +++++++++++++++++++++++++++++++++++++----------- 2 files changed, 103 insertions(+), 25 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 7dde72d323d..51e0cedadb1 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -2506,6 +2506,37 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, return TRUE; } +static BOOL WINAPI fpAddForm( HANDLE printer, DWORD level, BYTE *form ) +{ + FIXME( "(%p, %d, %p): stub\n", printer, level, form ); + return TRUE; +} + +static BOOL WINAPI fpDeleteForm( HANDLE printer, WCHAR *name ) +{ + FIXME( "(%p, %s): stub\n", printer, debugstr_w( name ) ); + return TRUE; +} + +static BOOL WINAPI fpGetForm( HANDLE printer, WCHAR *name, DWORD level, BYTE *form, DWORD size, DWORD *needed ) +{ + FIXME( "(%p, %s, %d, %p, %d, %p): stub\n", printer, debugstr_w( name ), level, form, size, needed ); + return FALSE; +} + +static BOOL WINAPI fpSetForm( HANDLE printer, WCHAR *name, DWORD level, BYTE *form ) +{ + FIXME( "(%p, %s, %d, %p): stub\n", printer, debugstr_w( name ), level, form ); + return FALSE; +} + +static BOOL WINAPI fpEnumForms( HANDLE printer, DWORD level, BYTE *form, DWORD size, DWORD *needed, DWORD *count ) +{ + FIXME( "(%p, %d, %p, %d, %p, %p): stub\n", printer, level, form, size, needed, count ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + static const PRINTPROVIDOR backend = { fpOpenPrinter, NULL, /* fpSetJob */ @@ -2539,11 +2570,11 @@ static const PRINTPROVIDOR backend = { NULL, /* fpSetPrinterData */ NULL, /* fpWaitForPrinterChange */ fpClosePrinter, - NULL, /* fpAddForm */ - NULL, /* fpDeleteForm */ - NULL, /* fpGetForm */ - NULL, /* fpSetForm */ - NULL, /* fpEnumForms */ + fpAddForm, + fpDeleteForm, + fpGetForm, + fpSetForm, + fpEnumForms, fpEnumMonitors, fpEnumPorts, fpAddPort, diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 4d0542d20e3..368584c2382 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -526,6 +526,13 @@ static LPCWSTR get_opened_printer_name(HANDLE hprn) return printer->name; } +static HANDLE get_backend_handle( HANDLE hprn ) +{ + opened_printer_t *printer = get_opened_printer( hprn ); + if (!printer) return NULL; + return printer->backend_printer; +} + static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) { HKEY printers; @@ -2904,10 +2911,19 @@ BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm) /***************************************************************************** * AddFormW [WINSPOOL.@] */ -BOOL WINAPI AddFormW(HANDLE hPrinter, DWORD Level, LPBYTE pForm) +BOOL WINAPI AddFormW( HANDLE printer, DWORD level, BYTE *form ) { - FIXME("(%p,%d,%p): stub\n", hPrinter, Level, pForm); - return TRUE; + HANDLE handle = get_backend_handle( printer ); + + TRACE( "(%p, %d, %p)\n", printer, level, form ); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpAddForm( handle, level, form ); } /***************************************************************************** @@ -3406,10 +3422,19 @@ BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName) /***************************************************************************** * DeleteFormW [WINSPOOL.@] */ -BOOL WINAPI DeleteFormW(HANDLE hPrinter, LPWSTR pFormName) +BOOL WINAPI DeleteFormW( HANDLE printer, WCHAR *name ) { - FIXME("(%p,%s): stub\n", hPrinter, debugstr_w(pFormName)); - return TRUE; + HANDLE handle = get_backend_handle( printer ); + + TRACE( "(%p, %s)\n", printer, debugstr_w( name ) ); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpDeleteForm( handle, name ); } /***************************************************************************** @@ -3880,12 +3905,19 @@ BOOL WINAPI GetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level, /***************************************************************************** * GetFormW [WINSPOOL.@] */ -BOOL WINAPI GetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, - LPBYTE pForm, DWORD cbBuf, LPDWORD pcbNeeded) +BOOL WINAPI GetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form, DWORD size, DWORD *needed ) { - FIXME("(%p,%s,%d,%p,%d,%p): stub\n",hPrinter, - debugstr_w(pFormName),Level,pForm,cbBuf,pcbNeeded); - return FALSE; + HANDLE handle = get_backend_handle( printer ); + + TRACE( "(%p, %s, %d, %p, %d, %p)\n", printer, debugstr_w( name ), level, form, size, needed ); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpGetForm( handle, name, level, form, size, needed ); } /***************************************************************************** @@ -3901,11 +3933,19 @@ BOOL WINAPI SetFormA(HANDLE hPrinter, LPSTR pFormName, DWORD Level, /***************************************************************************** * SetFormW [WINSPOOL.@] */ -BOOL WINAPI SetFormW(HANDLE hPrinter, LPWSTR pFormName, DWORD Level, - LPBYTE pForm) +BOOL WINAPI SetFormW( HANDLE printer, WCHAR *name, DWORD level, BYTE *form ) { - FIXME("(%p,%p,%d,%p): stub\n",hPrinter,pFormName,Level,pForm); - return FALSE; + HANDLE handle = get_backend_handle( printer ); + + TRACE( "(%p, %s, %d, %p)\n", printer, debugstr_w( name ), level, form ); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpSetForm( handle, name, level, form ); } /***************************************************************************** @@ -7363,12 +7403,19 @@ BOOL WINAPI EnumFormsA( HANDLE hPrinter, DWORD Level, LPBYTE pForm, /****************************************************************************** * EnumFormsW (WINSPOOL.@) */ -BOOL WINAPI EnumFormsW( HANDLE hPrinter, DWORD Level, LPBYTE pForm, - DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned ) +BOOL WINAPI EnumFormsW( HANDLE printer, DWORD level, BYTE *form, DWORD size, DWORD *needed, DWORD *count ) { - FIXME("%p %x %p %x %p %p\n", hPrinter, Level, pForm, cbBuf, pcbNeeded, pcReturned); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + HANDLE handle = get_backend_handle( printer ); + + TRACE( "(%p, %d, %p, %d, %p, %p)\n", printer, level, form, size, needed, count ); + + if (!handle) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } + + return backend->fpEnumForms( handle, level, form, size, needed, count ); } /*****************************************************************************

1 0

Huw Davies : localspl: Implement EnumForms().
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: bb51415904cb4cf4e45b3c7130b9ab9722b71ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb51415904cb4cf4e45b3c71… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 19 14:43:09 2021 +0100 localspl: Implement EnumForms(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/localmon.c | 8 +- dlls/localspl/localspl.rc | 120 +++++++++ dlls/localspl/localspl_private.h | 119 +++++++++ dlls/localspl/provider.c | 222 ++++++++++++++- dlls/winspool.drv/info.c | 12 + po/ar.po | 553 ++++++++++++++++++++++++++++++++++++++ po/ast.po | 505 ++++++++++++++++++++++++++++++++++ po/bg.po | 485 +++++++++++++++++++++++++++++++++ po/ca.po | 565 +++++++++++++++++++++++++++++++++++++++ po/cs.po | 553 ++++++++++++++++++++++++++++++++++++++ po/da.po | 553 ++++++++++++++++++++++++++++++++++++++ po/de.po | 565 +++++++++++++++++++++++++++++++++++++++ po/el.po | 466 ++++++++++++++++++++++++++++++++ po/en.po | 464 ++++++++++++++++++++++++++++++++ po/en_US.po | 464 ++++++++++++++++++++++++++++++++ po/eo.po | 490 +++++++++++++++++++++++++++++++++ po/es.po | 565 +++++++++++++++++++++++++++++++++++++++ po/fa.po | 466 ++++++++++++++++++++++++++++++++ po/fi.po | 565 +++++++++++++++++++++++++++++++++++++++ po/fr.po | 553 ++++++++++++++++++++++++++++++++++++++ po/he.po | 499 ++++++++++++++++++++++++++++++++++ po/hi.po | 479 +++++++++++++++++++++++++++++++++ po/hr.po | 553 ++++++++++++++++++++++++++++++++++++++ po/hu.po | 553 ++++++++++++++++++++++++++++++++++++++ po/it.po | 553 ++++++++++++++++++++++++++++++++++++++ po/ja.po | 565 +++++++++++++++++++++++++++++++++++++++ po/ko.po | 565 +++++++++++++++++++++++++++++++++++++++ po/lt.po | 565 +++++++++++++++++++++++++++++++++++++++ po/ml.po | 464 ++++++++++++++++++++++++++++++++ po/nb_NO.po | 565 +++++++++++++++++++++++++++++++++++++++ po/nl.po | 565 +++++++++++++++++++++++++++++++++++++++ po/or.po | 464 ++++++++++++++++++++++++++++++++ po/pa.po | 464 ++++++++++++++++++++++++++++++++ po/pl.po | 565 +++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 565 +++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 563 ++++++++++++++++++++++++++++++++++++++ po/rm.po | 464 ++++++++++++++++++++++++++++++++ po/ro.po | 565 +++++++++++++++++++++++++++++++++++++++ po/ru.po | 565 +++++++++++++++++++++++++++++++++++++++ po/si.po | 553 ++++++++++++++++++++++++++++++++++++++ po/sk.po | 505 ++++++++++++++++++++++++++++++++++ po/sl.po | 553 ++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 471 ++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 477 +++++++++++++++++++++++++++++++++ po/sv.po | 521 ++++++++++++++++++++++++++++++++++++ po/ta.po | 464 ++++++++++++++++++++++++++++++++ po/te.po | 464 ++++++++++++++++++++++++++++++++ po/th.po | 468 ++++++++++++++++++++++++++++++++ po/tr.po | 565 +++++++++++++++++++++++++++++++++++++++ po/uk.po | 553 ++++++++++++++++++++++++++++++++++++++ po/wa.po | 466 ++++++++++++++++++++++++++++++++ po/wine.pot | 464 ++++++++++++++++++++++++++++++++ po/zh_CN.po | 565 +++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 553 ++++++++++++++++++++++++++++++++++++++ 54 files changed, 26069 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb51415904cb4cf4e45b…

1 0

Huw Davies : include: Add winspool form string type defines.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: abb7d45129df865ff24208df6f29ad6904c0068c URL: https://source.winehq.org/git/wine.git/?a=commit;h=abb7d45129df865ff24208df… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed May 19 14:43:07 2021 +0100 include: Add winspool form string type defines. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winspool.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winspool.h b/include/winspool.h index 4c170b861ef..68619741f38 100644 --- a/include/winspool.h +++ b/include/winspool.h @@ -135,6 +135,10 @@ extern "C" { #define FORM_BUILTIN 1 #define FORM_PRINTER 2 +#define STRING_NONE 1 +#define STRING_MUIDLL 2 +#define STRING_LANGPAIR 4 + #define PORT_TYPE_WRITE 1 #define PORT_TYPE_READ 2 #define PORT_TYPE_REDIRECTED 4

1 0

Paul Gofman : server: Support nested jobs.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 21f5597de417575d476a00b567d972a89903b4b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21f5597de417575d476a00b5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 18 14:36:33 2021 +0300 server: Support nested jobs. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 180 +++++++++++++++++++++++++++++++++++++++++- server/process.c | 139 +++++++++++++++++++++++--------- 2 files changed, 280 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21f5597de417575d476a…

1 0

Dmitry Timoshkov : msxml3/tests: Execute ProcessingInstruction tests before other tests to avoid crashes under 64-bit Windows.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: d7ce5bddf9ba7b5f617ad352e362f278e03d8ee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7ce5bddf9ba7b5f617ad352… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 17 14:09:18 2021 +0300 msxml3/tests: Execute ProcessingInstruction tests before other tests to avoid crashes under 64-bit Windows. It seems that the ProcessingInstruction tests somehow trigger internal inconsistency in 64-bit msxml under Windows, and I haven't found other ways to stop crashes on exit. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 59a8a243c87..3dcfdb8fd39 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13610,6 +13610,7 @@ START_TEST(domdoc) return; } + test_createProcessingInstruction(); test_load_with_site(); test_domdoc(); test_persiststream(); @@ -13651,7 +13652,6 @@ START_TEST(domdoc) test_default_properties(); test_selectSingleNode(); test_events(); - test_createProcessingInstruction(); test_put_nodeTypedValue(); test_get_xml(); test_insertBefore();

1 0

Hans Leidekker : webservices: Add async support in WsWriteMessageEnd.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: bfefd0d2a309aa93c321dc60def164be5e2c4eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfefd0d2a309aa93c321dc60… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 19 09:32:13 2021 +0200 webservices: Add async support in WsWriteMessageEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 53 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9957592f9f7..b920f972de3 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2733,18 +2733,57 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W return hr; } +static HRESULT write_message_end( struct channel *channel, WS_MESSAGE *msg ) +{ + HRESULT hr; + if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message_bytes( channel, msg ); + return hr; +} + +struct write_message_end +{ + struct task task; + struct channel *channel; + WS_MESSAGE *msg; + WS_ASYNC_CONTEXT ctx; +}; + +static void write_message_end_proc( struct task *task ) +{ + struct write_message_end *w = (struct write_message_end *)task; + HRESULT hr; + + hr = write_message_end( w->channel, w->msg ); + + TRACE( "calling %p(%08x)\n", w->ctx.callback, hr ); + w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState ); + TRACE( "%p returned\n", w->ctx.callback ); +} + +static HRESULT queue_write_message_end( struct channel *channel, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx ) +{ + struct write_message_start *w; + + if (!(w = heap_alloc( sizeof(*w) ))) return E_OUTOFMEMORY; + w->task.proc = write_message_end_proc; + w->channel = channel; + w->msg = msg; + w->ctx = *ctx; + return queue_task( &channel->send_q, &w->task ); +} + /************************************************************************** * WsWriteMessageEnd [webservices.@] */ -HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, - WS_ERROR *error ) +HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, 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, msg, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !msg) return E_INVALIDARG; @@ -2761,7 +2800,13 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ return WS_E_INVALID_OPERATION; } - if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message_bytes( channel, msg ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_write_message_end( channel, msg, 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 );

1 0

Hans Leidekker : webservices: Add async support in WsWriteMessageStart.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: d7f1e5a0c2fb79ff3aba20880aacdc1a1c091c7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7f1e5a0c2fb79ff3aba2088… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 19 09:32:12 2021 +0200 webservices: Add async support in WsWriteMessageStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 57 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index c97a0d49a66..9957592f9f7 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2652,18 +2652,58 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A return hr; } +static HRESULT write_message_start( struct channel *channel, WS_MESSAGE *msg ) +{ + HRESULT hr; + if ((hr = init_writer( channel )) != S_OK) return hr; + if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) return hr; + return WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL ); +} + +struct write_message_start +{ + struct task task; + struct channel *channel; + WS_MESSAGE *msg; + WS_ASYNC_CONTEXT ctx; +}; + +static void write_message_start_proc( struct task *task ) +{ + struct write_message_start *w = (struct write_message_start *)task; + HRESULT hr; + + hr = write_message_start( w->channel, w->msg ); + + TRACE( "calling %p(%08x)\n", w->ctx.callback, hr ); + w->ctx.callback( hr, WS_LONG_CALLBACK, w->ctx.callbackState ); + TRACE( "%p returned\n", w->ctx.callback ); +} + +static HRESULT queue_write_message_start( struct channel *channel, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx ) +{ + struct write_message_start *w; + + if (!(w = heap_alloc( sizeof(*w) ))) return E_OUTOFMEMORY; + w->task.proc = write_message_start_proc; + w->channel = channel; + w->msg = msg; + w->ctx = *ctx; + return queue_task( &channel->send_q, &w->task ); +} + /************************************************************************** * WsWriteMessageStart [webservices.@] */ -HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, - WS_ERROR *error ) +HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, 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, msg, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !msg) return E_INVALIDARG; @@ -2680,11 +2720,14 @@ HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const W return WS_E_INVALID_OPERATION; } - if ((hr = init_writer( channel )) != S_OK) goto done; - if ((hr = WsAddressMessage( msg, &channel->addr, NULL )) != S_OK) goto done; - hr = WsWriteEnvelopeStart( msg, channel->writer, NULL, NULL, NULL ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_write_message_start( channel, msg, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } -done: LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); return hr;

1 0

Hans Leidekker : webservices: Add async support in WsReadMessageStart.
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 48f2cabb6cfbd23f26956b6398a2ee1253d636b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48f2cabb6cfbd23f26956b63… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 19 09:32:10 2021 +0200 webservices: Add async support in WsReadMessageStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 54 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 430453443d0..4df761cd5ea 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2500,18 +2500,58 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS return hr; } +static HRESULT read_message_start( struct channel *channel, WS_MESSAGE *msg ) +{ + HRESULT hr; + if ((hr = receive_message_bytes( channel, msg )) == S_OK && (hr = init_reader( channel )) == S_OK) + hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); + return hr; +} + +struct read_message_start +{ + struct task task; + struct channel *channel; + WS_MESSAGE *msg; + WS_ASYNC_CONTEXT ctx; +}; + +static void read_message_start_proc( struct task *task ) +{ + struct read_message_start *r = (struct read_message_start *)task; + HRESULT hr; + + hr = read_message_start( r->channel, r->msg ); + + TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); + TRACE( "%p returned\n", r->ctx.callback ); +} + +static HRESULT queue_read_message_start( struct channel *channel, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx ) +{ + struct read_message_start *r; + + if (!(r = heap_alloc( sizeof(*r) ))) return E_OUTOFMEMORY; + r->task.proc = read_message_start_proc; + r->channel = channel; + r->msg = msg; + r->ctx = *ctx; + return queue_task( &channel->recv_q, &r->task ); +} + /************************************************************************** * WsReadMessageStart [webservices.@] */ -HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, - WS_ERROR *error ) +HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, 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, msg, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !msg) return E_INVALIDARG; @@ -2528,10 +2568,12 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return WS_E_INVALID_OPERATION; } - if ((hr = receive_message_bytes( channel, msg )) == S_OK) + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_read_message_start( channel, msg, ctx ? ctx : &ctx_local ); + if (!ctx) { - if ((hr = init_reader( channel )) == S_OK) - hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); } LeaveCriticalSection( &channel->cs );

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_SHUTDOWN in WS_shutdown().
by Alexandre Julliard May 19, 2021

May 19, 2021

Module: wine Branch: master Commit: 53dc1b0a58d6f30029a1f517bc9efce048bde229 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53dc1b0a58d6f30029a1f517… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 18 22:35:51 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_SHUTDOWN in WS_shutdown(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 130 ++++------------------------------------------- dlls/ws2_32/tests/sock.c | 20 ++++---- 2 files changed, 21 insertions(+), 129 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0110d53ab48..3632397ef3d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2272,64 +2272,6 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS stat return status; } -/*********************************************************************** - * WS2_async_shutdown (INTERNAL) - * - * Handler for shutdown() operations on overlapped sockets. - */ -static NTSTATUS WS2_async_shutdown( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status ) -{ - struct ws2_async_shutdown *wsa = user; - int fd, err = 1; - - switch (status) - { - case STATUS_ALERTED: - if ((status = wine_server_handle_to_fd( wsa->hSocket, 0, &fd, NULL ) )) - break; - - switch ( wsa->type ) - { - case ASYNC_TYPE_READ: break; - case ASYNC_TYPE_WRITE: err = shutdown( fd, 1 ); break; - } - status = err ? wsaErrStatus() : STATUS_SUCCESS; - close( fd ); - break; - } - iosb->u.Status = status; - iosb->Information = 0; - release_async_io( &wsa->io ); - return status; -} - -/*********************************************************************** - * WS2_register_async_shutdown (INTERNAL) - * - * Helper function for WS_shutdown() on overlapped sockets. - */ -static int WS2_register_async_shutdown( SOCKET s, int type ) -{ - struct ws2_async_shutdown *wsa; - NTSTATUS status; - - TRACE("socket %04lx type %d\n", s, type); - - wsa = (struct ws2_async_shutdown *)alloc_async_io( sizeof(*wsa), WS2_async_shutdown ); - if ( !wsa ) - return WSAEFAULT; - - wsa->hSocket = SOCKET2HANDLE(s); - wsa->type = type; - - status = register_async( type, wsa->hSocket, &wsa->io, 0, NULL, NULL, &wsa->iosb ); - if (status != STATUS_PENDING) - { - HeapFree( GetProcessHeap(), 0, wsa ); - return NtStatusToWSAError( status ); - } - return 0; -} /*********************************************************************** * accept (WS2_32.1) @@ -5512,74 +5454,24 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return SOCKET_ERROR; } + /*********************************************************************** - * shutdown (WS2_32.22) + * shutdown (ws2_32.22) */ -int WINAPI WS_shutdown(SOCKET s, int how) +int WINAPI WS_shutdown( SOCKET s, int how ) { - int fd, err = WSAENOTSOCK; - unsigned int options = 0, clear_flags = 0; - - fd = get_sock_fd( s, 0, &options ); - TRACE("socket %04lx, how 0x%x, options 0x%x\n", s, how, options ); - - if (fd == -1) - return SOCKET_ERROR; - - switch( how ) - { - case SD_RECEIVE: /* drop receives */ - clear_flags |= FD_READ; - break; - case SD_SEND: /* drop sends */ - clear_flags |= FD_WRITE; - break; - case SD_BOTH: /* drop all */ - clear_flags |= FD_READ|FD_WRITE; - /*fall through */ - default: - clear_flags |= FD_WINE_LISTENING; - } - - if (!(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT))) - { - switch ( how ) - { - case SD_RECEIVE: - err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); - break; - case SD_SEND: - err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); - break; - case SD_BOTH: - default: - err = WS2_register_async_shutdown( s, ASYNC_TYPE_READ ); - if (!err) err = WS2_register_async_shutdown( s, ASYNC_TYPE_WRITE ); - break; - } - if (err) goto error; - } - else /* non-overlapped mode */ - { - if (how != SD_RECEIVE && shutdown( fd, SHUT_WR )) - { - err = wsaErrno(); - goto error; - } - } + IO_STATUS_BLOCK io; + NTSTATUS status; - release_sock_fd( s, fd ); - _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); - if ( how > 1) WSAAsyncSelect( s, 0, 0, 0 ); - return 0; + TRACE( "socket %#lx, how %u\n", s, how ); -error: - release_sock_fd( s, fd ); - _enable_event( SOCKET2HANDLE(s), 0, 0, clear_flags ); - SetLastError( err ); - return SOCKET_ERROR; + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, + IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; } + /*********************************************************************** * socket (WS2_32.23) */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2c1f0e6142a..8bec781ac6f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6405,12 +6405,12 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_SEND); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_RECEIVE); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); ret = connect(client, (struct sockaddr *)&server_addr, sizeof(server_addr)); ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); @@ -6425,8 +6425,8 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_SEND); - todo_wine ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = send(client, "test", 5, 0); @@ -6501,7 +6501,7 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, 0xdeadbeef); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); closesocket(client); closesocket(server); @@ -6628,12 +6628,12 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(listener, SD_SEND); ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = shutdown(listener, SD_RECEIVE); - todo_wine ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOTCONN, "got error %u\n", WSAGetLastError()); closesocket(listener); @@ -6671,8 +6671,8 @@ static void test_shutdown(void) WSASetLastError(0xdeadbeef); ret = shutdown(client, SD_SEND); - todo_wine ok(!ret, "expected success\n"); - todo_wine ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + ok(!ret, "expected success\n"); + ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); ret = sendto(client, "test", 5, 0, (struct sockaddr *)&server_addr, sizeof(server_addr));

1 0