April 2017 - Wine-commits - list.winehq.org

Austin English : user32: Add GetAutoRotationState/ GetDisplayAutoRotationPreferences stubs.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: d8db5e04bd6434f08859772e7c077e6da9d63249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8db5e04bd6434f08859772e7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 25 01:25:43 2017 -0500 user32: Add GetAutoRotationState/GetDisplayAutoRotationPreferences stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 20 ++++++++++++++++++++ dlls/user32/user32.spec | 2 ++ include/winuser.h | 22 ++++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 67b052e..ab3d717 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2913,3 +2913,23 @@ BOOL WINAPI IsProcessDPIAware(void) FIXME( "stub!\n"); return FALSE; } + +/********************************************************************** + * GetAutoRotationState [USER32.@] + */ +BOOL WINAPI GetAutoRotationState( AR_STATE *state ) +{ + FIXME("(%p): stub\n", state); + *state = AR_NOT_SUPPORTED; + return TRUE; +} + +/********************************************************************** + * GetDisplayAutoRotationPreferences [USER32.@] + */ +BOOL WINAPI GetDisplayAutoRotationPreferences( ORIENTATION_PREFERENCE *orientation ) +{ + FIXME("(%p): stub\n", orientation); + *orientation = ORIENTATION_PREFERENCE_NONE; + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 6f2703a..b79a6b0 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -251,6 +251,7 @@ @ stdcall GetAppCompatFlags(long) @ stdcall GetAppCompatFlags2(long) @ stdcall GetAsyncKeyState(long) +@ stdcall GetAutoRotationState(ptr) @ stdcall GetCapture() @ stdcall GetCaretBlinkTime() @ stdcall GetCaretPos(ptr) @@ -282,6 +283,7 @@ @ stdcall GetDCEx(long long long) @ stdcall GetDesktopWindow() @ stdcall GetDialogBaseUnits() +@ stdcall GetDisplayAutoRotationPreferences(ptr) @ stdcall GetDisplayConfigBufferSizes(long ptr ptr) @ stdcall GetDlgCtrlID(long) @ stdcall GetDlgItem(long long) diff --git a/include/winuser.h b/include/winuser.h index 25fc207..0d6c5d6 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3284,6 +3284,26 @@ typedef struct tagCHANGEFILTERSTRUCT #define USER_DEFAULT_SCREEN_DPI 96 +typedef enum tagAR_STATE { + AR_ENABLED = 0x0, + AR_DISABLED = 0x1, + AR_SUPPRESSED = 0x2, + AR_REMOTESESSION = 0x4, + AR_MULTIMON = 0x8, + AR_NOSENSOR = 0x10, + AR_NOT_SUPPORTED = 0x20, + AR_DOCKED = 0x40, + AR_LAPTOP = 0x80 +} AR_STATE, *PAR_STATE; + +typedef enum ORIENTATION_PREFERENCE { + ORIENTATION_PREFERENCE_NONE = 0x0, + ORIENTATION_PREFERENCE_LANDSCAPE = 0x1, + ORIENTATION_PREFERENCE_PORTRAIT = 0x2, + ORIENTATION_PREFERENCE_LANDSCAPE_FLIPPED = 0x4, + ORIENTATION_PREFERENCE_PORTRAIT_FLIPPED = 0x8 +} ORIENTATION_PREFERENCE; + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3563,6 +3583,7 @@ WINUSERAPI BOOL WINAPI GetAltTabInfoW(HWND,INT,PALTTABINFO,LPWSTR,UINT); WINUSERAPI HWND WINAPI GetAncestor(HWND,UINT); WINUSERAPI DWORD WINAPI GetAppCompatFlags(HTASK); WINUSERAPI SHORT WINAPI GetAsyncKeyState(INT); +WINUSERAPI BOOL WINAPI GetAutoRotationState(AR_STATE*); WINUSERAPI HWND WINAPI GetCapture(void); WINUSERAPI UINT WINAPI GetCaretBlinkTime(void); WINUSERAPI BOOL WINAPI GetCaretPos(LPPOINT); @@ -3605,6 +3626,7 @@ WINUSERAPI HDC WINAPI GetDC(HWND); WINUSERAPI HDC WINAPI GetDCEx(HWND,HRGN,DWORD); WINUSERAPI HWND WINAPI GetDesktopWindow(void); WINUSERAPI DWORD WINAPI GetDialogBaseUnits(void); +WINUSERAPI BOOL WINAPI GetDisplayAutoRotationPreferences(ORIENTATION_PREFERENCE*); WINUSERAPI INT WINAPI GetDlgCtrlID(HWND); WINUSERAPI HWND WINAPI GetDlgItem(HWND,INT); WINUSERAPI UINT WINAPI GetDlgItemInt(HWND,INT,BOOL*,BOOL);

1 0

Huw Davies : comdlg32: Don't ask for icon information since it's unused.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 6891b5a044211610bb6cac4fa70198983cea1405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6891b5a044211610bb6cac4fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 25 09:04:57 2017 +0100 comdlg32: Don't ask for icon information since it's unused. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 305ac62..da85260 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3389,8 +3389,7 @@ static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId) 0, &sfi, sizeof(sfi), - SHGFI_DISPLAYNAME | SHGFI_SYSICONINDEX - | SHGFI_PIDL | SHGFI_SMALLICON | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED); + SHGFI_DISPLAYNAME | SHGFI_PIDL | SHGFI_ATTRIBUTES | SHGFI_ATTR_SPECIFIED); TRACE("-- Add %s attr=%08x\n", debugstr_w(sfi.szDisplayName), sfi.dwAttributes);

1 0

Huw Davies : explorerframe: Release the returned imagelist.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: edb760097cdbc5fb866b79cbfb93daf2724f724f URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb760097cdbc5fb866b79cbf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 25 09:04:58 2017 +0100 explorerframe: Release the returned imagelist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index a2ab974..15d2f26 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -28,6 +28,8 @@ #include "winbase.h" #include "winuser.h" #include "shellapi.h" +#include "commctrl.h" +#include "commoncontrols.h" #include "wine/list.h" #include "wine/debug.h" @@ -318,7 +320,10 @@ static int get_icon(LPCITEMIDLIST lpi, UINT extra_flags) { SHFILEINFOW sfi; UINT flags = SHGFI_PIDL | SHGFI_SYSICONINDEX | SHGFI_SMALLICON; - SHGetFileInfoW((LPCWSTR)lpi, 0 ,&sfi, sizeof(SHFILEINFOW), flags | extra_flags); + IImageList *list; + + list = (IImageList *)SHGetFileInfoW((LPCWSTR)lpi, 0 ,&sfi, sizeof(SHFILEINFOW), flags | extra_flags); + if (list) IImageList_Release(list); return sfi.iIcon; }

1 0

Huw Davies : shell32: Release the returned imagelist.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 826871ba953c17193f3904d27d192d2ef6801894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826871ba953c17193f3904d27… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 25 09:04:59 2017 +0100 shell32: Release the returned imagelist. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 4040407..a473874 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "undocshell.h" +#include "commoncontrols.h" #include "pidl.h" #include "shell32_main.h" #include "shellapi.h" @@ -282,7 +283,10 @@ static void InitializeTreeView( browse_info *info ) static int GetIcon(LPCITEMIDLIST lpi, UINT uFlags) { SHFILEINFOW sfi; - SHGetFileInfoW((LPCWSTR)lpi, 0 ,&sfi, sizeof(SHFILEINFOW), uFlags); + IImageList *list; + + list = (IImageList *)SHGetFileInfoW((LPCWSTR)lpi, 0 ,&sfi, sizeof(SHFILEINFOW), uFlags); + if (list) IImageList_Release(list); return sfi.iIcon; }

1 0

Zebediah Figura : user32: Move internal message from EnableWindow to WIN_SetStyle().
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: fe95de98b5ff07d3ed6b68277c9237c0b0ec7fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe95de98b5ff07d3ed6b68277… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 7 14:17:08 2017 -0500 user32: Move internal message from EnableWindow to WIN_SetStyle(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 4 ++-- dlls/user32/spy.c | 2 +- dlls/user32/tests/msg.c | 4 ++-- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 9 +-------- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9bfb453..d13a9b0 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1867,9 +1867,9 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return (LRESULT)SetParent( hwnd, (HWND)wparam ); case WM_WINE_SETWINDOWLONG: return WIN_SetWindowLong( hwnd, (short)LOWORD(wparam), HIWORD(wparam), lparam, TRUE ); - case WM_WINE_ENABLEWINDOW: + case WM_WINE_SETSTYLE: if (is_desktop_window( hwnd )) return 0; - return EnableWindow( hwnd, wparam ); + return WIN_SetStyle(hwnd, wparam, lparam); case WM_WINE_SETACTIVEWINDOW: if (is_desktop_window( hwnd )) return 0; if (!wparam && GetForegroundWindow() == hwnd) return 0; diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 4f8e56f..ff80051 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1136,7 +1136,7 @@ static const char * const WINEMessageTypeNames[SPY_MAX_WINEMSGNUM + 1] = "WM_WINE_SHOWWINDOW", "WM_WINE_SETPARENT", "WM_WINE_SETWINDOWLONG", - "WM_WINE_ENABLEWINDOW", + "WM_WINE_SETSTYLE", "WM_WINE_SETACTIVEWINDOW", "WM_WINE_KEYBOARD_LL_HOOK", "WM_WINE_MOUSE_LL_HOOK", diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 760a9ea..6f4b7f4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16316,8 +16316,8 @@ static DWORD WINAPI SendMessage_thread_2(void *param) PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); /* this leads to sending an internal message under Wine */ - trace("thread: call EnableWindow\n"); - EnableWindow(wnd_event->hwnd, TRUE); + trace("thread: call SetParent\n"); + SetParent(wnd_event->hwnd, wnd_event->hwnd); trace("thread: call SendMessage\n"); SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0b5b2ac..b4a756c 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -48,7 +48,7 @@ enum wine_internal_message WM_WINE_SHOWWINDOW, WM_WINE_SETPARENT, WM_WINE_SETWINDOWLONG, - WM_WINE_ENABLEWINDOW, + WM_WINE_SETSTYLE, WM_WINE_SETACTIVEWINDOW, WM_WINE_KEYBOARD_LL_HOOK, WM_WINE_MOUSE_LL_HOOK, diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 560fbc5..cbf2237 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -768,8 +768,7 @@ ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) if (win == WND_OTHER_PROCESS) { if (IsWindow(hwnd)) - ERR( "cannot set style %x/%x on other process window %p\n", - set_bits, clear_bits, hwnd ); + return SendMessageW(hwnd, WM_WINE_SETSTYLE, set_bits, clear_bits); return 0; } style.styleOld = win->dwStyle; @@ -2137,7 +2136,6 @@ HWND WINAPI GetDesktopWindow(void) BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) { BOOL retvalue; - HWND full_handle; if (is_broadcast(hwnd)) { @@ -2145,11 +2143,6 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) return FALSE; } - if (!(full_handle = WIN_IsCurrentThread( hwnd ))) - return SendMessageW( hwnd, WM_WINE_ENABLEWINDOW, enable, 0 ); - - hwnd = full_handle; - TRACE("( %p, %d )\n", hwnd, enable); if (enable)

1 0

Hans Leidekker : webservices: Implement WsReadMessageStart.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: ccdd9cb1ce966f2183359f23aa9cfca415ef43ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdd9cb1ce966f2183359f23a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 25 11:31:26 2017 +0200 webservices: Implement WsReadMessageStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 32 ++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index d35da4e..523c247 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1046,6 +1046,38 @@ done: return hr; } +/************************************************************************** + * WsReadMessageStart [webservices.@] + */ +HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + 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; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + if ((hr = receive_message( channel )) == S_OK) + { + hr = WsReadEnvelopeStart( msg, channel->reader, NULL, NULL, NULL ); + } + + LeaveCriticalSection( &channel->cs ); + return hr; +} + HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) { struct channel *channel = (struct channel *)handle; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c55e304..7f23e73 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -114,7 +114,7 @@ @ stdcall WsReadEnvelopeEnd(ptr ptr) @ stdcall WsReadEnvelopeStart(ptr ptr ptr ptr ptr) @ stub WsReadMessageEnd -@ stub WsReadMessageStart +@ stdcall WsReadMessageStart(ptr ptr ptr ptr) @ stub WsReadMetadata @ stdcall WsReadNode(ptr ptr) @ stub WsReadQualifiedName

1 0

Hans Leidekker : webservices: Implement WsReadMessageEnd.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 84dcb316b97a9f956d5b7694b5089ec1c149807b URL: http://source.winehq.org/git/wine.git/?a=commit;h=84dcb316b97a9f956d5b7694b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 25 11:31:27 2017 +0200 webservices: Implement WsReadMessageEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 29 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 523c247..0d8f78a 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1078,6 +1078,35 @@ HRESULT WINAPI WsReadMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS return hr; } +/************************************************************************** + * WsReadMessageEnd [webservices.@] + */ +HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + 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; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + hr = WsReadEnvelopeEnd( msg, NULL ); + + LeaveCriticalSection( &channel->cs ); + return hr; +} + HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) { struct channel *channel = (struct channel *)handle; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 7f23e73..5c9beba 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -113,7 +113,7 @@ @ stub WsReadEndpointAddressExtension @ stdcall WsReadEnvelopeEnd(ptr ptr) @ stdcall WsReadEnvelopeStart(ptr ptr ptr ptr ptr) -@ stub WsReadMessageEnd +@ stdcall WsReadMessageEnd(ptr ptr ptr ptr) @ stdcall WsReadMessageStart(ptr ptr ptr ptr) @ stub WsReadMetadata @ stdcall WsReadNode(ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsWriteMessageStart.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 6d4f83162a40cdf385e64a17a1a1c3280351468b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4f83162a40cdf385e64a17a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 25 11:31:28 2017 +0200 webservices: Implement WsWriteMessageStart. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 32 ++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 0d8f78a..bff9a4b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1107,6 +1107,38 @@ HRESULT WINAPI WsReadMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_A return hr; } +/************************************************************************** + * WsWriteMessageStart [webservices.@] + */ +HRESULT WINAPI WsWriteMessageStart( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + 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; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + 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 ); + +done: + LeaveCriticalSection( &channel->cs ); + return hr; +} + HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) { struct channel *channel = (struct channel *)handle; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5c9beba..204e3f2 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -178,7 +178,7 @@ @ stdcall WsWriteEnvelopeEnd(ptr ptr) @ stdcall WsWriteEnvelopeStart(ptr ptr ptr ptr ptr) @ stub WsWriteMessageEnd -@ stub WsWriteMessageStart +@ stdcall WsWriteMessageStart(ptr ptr ptr ptr) @ stdcall WsWriteNode(ptr ptr ptr) @ stub WsWriteQualifiedName @ stdcall WsWriteStartAttribute(ptr ptr ptr ptr long ptr)

1 0

Hans Leidekker : webservices: Implement WsWriteMessageEnd.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: 804e9b606855b30fbfc4871d8d582a555727de92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804e9b606855b30fbfc4871d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 25 11:31:29 2017 +0200 webservices: Implement WsWriteMessageEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 29 +++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index bff9a4b..aa78d1e 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1139,6 +1139,35 @@ done: return hr; } +/************************************************************************** + * WsWriteMessageEnd [webservices.@] + */ +HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + 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; + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + if ((hr = WsWriteEnvelopeEnd( msg, NULL )) == S_OK) hr = send_message( channel, msg ); + + LeaveCriticalSection( &channel->cs ); + return hr; +} + HRESULT channel_accept_tcp( SOCKET socket, WS_CHANNEL *handle ) { struct channel *channel = (struct channel *)handle; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 204e3f2..aa9b58f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -177,7 +177,7 @@ @ stdcall WsWriteEndStartElement(ptr ptr) @ stdcall WsWriteEnvelopeEnd(ptr ptr) @ stdcall WsWriteEnvelopeStart(ptr ptr ptr ptr ptr) -@ stub WsWriteMessageEnd +@ stdcall WsWriteMessageEnd(ptr ptr ptr ptr) @ stdcall WsWriteMessageStart(ptr ptr ptr ptr) @ stdcall WsWriteNode(ptr ptr ptr) @ stub WsWriteQualifiedName

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 25 Apr '17

25 Apr '17

Module: wine Branch: master Commit: c305b21be38d572c3be3cf47f9559d1734bb761d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c305b21be38d572c3be3cf47f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 25 11:31:30 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 165 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 159 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index 74cef3b..16f3ccf 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -77,11 +77,9 @@ static void test_WsOpenChannel(void) hr = WsOpenChannel( channel, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = sizeof(url)/sizeof(url[0]); addr.url.chars = url; - addr.headers = NULL; - addr.extensions = NULL; - addr.identity = NULL; hr = WsOpenChannel( NULL, &addr, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -124,11 +122,9 @@ static void test_WsResetChannel(void) hr = WsSetChannelProperty( channel, WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT, &timeout, size, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + memset( &addr, 0, sizeof(addr) ); addr.url.length = sizeof(url)/sizeof(url[0]); addr.url.chars = url; - addr.headers = NULL; - addr.extensions = NULL; - addr.identity = NULL; hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -162,9 +158,166 @@ static void test_WsResetChannel(void) WsFreeChannel( channel ); } +struct listener_info +{ + int port; + HANDLE wait; +}; + +static DWORD CALLBACK listener_proc( void *arg ) +{ + static const WCHAR fmt[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + struct listener_info *info = arg; + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WCHAR buf[64]; + WS_STRING url; + HRESULT hr; + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX, WS_UDP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + url.length = wsprintfW( buf, fmt, info->port ); + url.chars = buf; + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + SetEvent( info->wait ); + + hr = WsAcceptChannel( listener, channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadMessageStart( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageStart( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageStart( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageStart( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadMessageEnd( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageEnd( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageEnd( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReadMessageEnd( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeMessage( msg ); + + SetEvent( info->wait ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeChannel( channel ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeListener( listener ); + + return 0; +} + +static void test_message_read_write( const struct listener_info *info ) +{ + static const WCHAR fmt[] = + {'s','o','a','p','.','u','d','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','u',0}; + WS_ENDPOINT_ADDRESS addr; + WCHAR buf[64]; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + HRESULT hr; + DWORD err; + + hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX, WS_UDP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &addr, 0, sizeof(addr) ); + addr.url.length = wsprintfW( buf, fmt, info->port ); + addr.url.chars = buf; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteMessageStart( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageStart( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageStart( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageStart( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( channel, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( NULL, msg, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteMessageEnd( channel, msg, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "wait failed %u\n", err ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); + WsFreeChannel( channel ); +} + +static HANDLE start_listener( struct listener_info *info ) +{ + DWORD err; + HANDLE thread = CreateThread( NULL, 0, listener_proc, info, 0, NULL ); + ok( thread != NULL, "failed to create listener thread %u\n", GetLastError() ); + + err = WaitForSingleObject( info->wait, 3000 ); + ok( err == WAIT_OBJECT_0, "failed to start listener %u\n", err ); + return thread; +} + START_TEST(channel) { + struct listener_info info; + HANDLE thread; + test_WsCreateChannel(); test_WsOpenChannel(); test_WsResetChannel(); + + info.port = 7533; + info.wait = CreateEventW( NULL, 0, 0, NULL ); + thread = start_listener( &info ); + + test_message_read_write( &info ); + + WaitForSingleObject( thread, 3000 ); }

1 0