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

Nikolay Sivov : oledb32: Support textual representation of Mode property values.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: ffd3e8543cadc98b167d016eb2c1ca9c0a413e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd3e8543cadc98b167d016eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 13:05:32 2017 +0300 oledb32: Support textual representation of Mode property values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 58 +++++++++++++++++++++++++++++++++++++++++-- dlls/oledb32/tests/database.c | 26 +++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 7ed4099..650c220 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -289,8 +289,56 @@ struct dbproperty { DBPROPID id; DBPROPOPTIONS options; VARTYPE type; + HRESULT (*convert_dbproperty)(const WCHAR *src, VARIANT *dest); }; +struct mode_propval +{ + const WCHAR *name; + DWORD value; +}; + +static int dbmodeprop_compare(const void *a, const void *b) +{ + const WCHAR *src = a; + const struct mode_propval *propval = b; + return strcmpiW(src, propval->name); +} + +static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) +{ + static const WCHAR readW[] = {'R','e','a','d',0}; + static const WCHAR readwriteW[] = {'R','e','a','d','W','r','i','t','e',0}; + static const WCHAR sharedenynoneW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','N','o','n','e',0}; + static const WCHAR sharedenyreadW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','R','e','a','d',0}; + static const WCHAR sharedenywriteW[] = {'S','h','a','r','e',' ','D','e','n','y',' ','W','r','i','t','e',0}; + static const WCHAR shareexclusiveW[] = {'S','h','a','r','e',' ','E','x','c','l','u','s','i','v','e',0}; + static const WCHAR writeW[] = {'W','r','i','t','e',0}; + + struct mode_propval mode_propvals[] = + { + { readW, DB_MODE_READ }, + { readwriteW, DB_MODE_READWRITE }, + { sharedenynoneW, DB_MODE_SHARE_DENY_NONE }, + { sharedenyreadW, DB_MODE_SHARE_DENY_READ }, + { sharedenywriteW, DB_MODE_SHARE_DENY_WRITE }, + { shareexclusiveW, DB_MODE_SHARE_EXCLUSIVE }, + { writeW, DB_MODE_WRITE }, + }; + struct mode_propval *prop; + + if ((prop = bsearch(src, mode_propvals, sizeof(mode_propvals) / sizeof(*mode_propvals), + sizeof(struct mode_propval), dbmodeprop_compare))) + { + V_VT(dest) = VT_I4; + V_I4(dest) = prop->value; + TRACE("%s = %#x\n", debugstr_w(src), prop->value); + return S_OK; + } + + return E_FAIL; +} + static const WCHAR asyncW[] = {'A','s','y','n','c','h','r','o','n','o','u','s',' ','P','r','o','c','e','s','s','i','n','g',0}; static const WCHAR bindW[] = {'B','i','n','d',' ','F','l','a','g','s',0}; static const WCHAR cacheW[] = {'C','a','c','h','e',' ','A','u','t','h','e','n','i','c','a','t','i','o','n',0}; @@ -332,7 +380,7 @@ static const struct dbproperty dbproperties[] = { { locationW, DBPROP_INIT_LOCATION, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { lockownerW, DBPROP_INIT_LOCKOWNER, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { maskpassW, DBPROP_AUTH_MASK_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, - { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4 }, + { modeW, DBPROP_INIT_MODE, DBPROPOPTIONS_OPTIONAL, VT_I4, convert_dbproperty_mode }, { oledbservW, DBPROP_INIT_OLEDBSERVICES, DBPROPOPTIONS_OPTIONAL, VT_I4 }, { passwordW, DBPROP_AUTH_PASSWORD, DBPROPOPTIONS_OPTIONAL, VT_BSTR }, { persistEncW, DBPROP_AUTH_PERSIST_ENCRYPTED, DBPROPOPTIONS_OPTIONAL, VT_BOOL }, @@ -418,7 +466,10 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) else delim = strchrW(eq, ';'); - value = SysAllocStringLen(eq, delim ? delim - eq : -1); + if (delim) + value = SysAllocStringLen(eq, delim - eq); + else + value = SysAllocString(eq); /* skip semicolon if present */ if (delim) @@ -534,6 +585,9 @@ static HRESULT get_dbpropset_from_proplist(struct dbprops *props, DBPROPSET **pr VariantInit(&dest); hr = VariantChangeType(&dest, &src, 0, descr->type); + if (FAILED(hr) && descr->convert_dbproperty) + hr = descr->convert_dbproperty(pair->value, &dest); + if (FAILED(hr)) { ERR("failed to init property %s value as type %d\n", debugstr_w(pair->name), descr->type); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index f39c2f5..b8c0e61 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -500,6 +500,15 @@ static void test_initializationstring(void) 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + static const WCHAR initstring_mode[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'M','o','d','e','=','i','n','v','a','l','i','d',0}; + static const WCHAR initstring_mode2[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'M','o','d','e','=','W','r','i','t','e','R','e','a','d',0}; + static const WCHAR initstring_mode3[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', + 'M','o','d','e','=','R','e','a','d','W','R','I','T','E',0}; IDataInitialize *datainit = NULL; IDBInitialize *dbinit; HRESULT hr; @@ -537,6 +546,23 @@ static void test_initializationstring(void) &IID_IDBInitialize, (IUnknown**)&dbinit); ok(hr == S_OK, "got 0x%08x\n", hr); IDBInitialize_Release(dbinit); + + /* Invalid Mode value */ + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR *)initstring_mode, + &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(FAILED(hr), "got 0x%08x\n", hr); + + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR *)initstring_mode2, + &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(FAILED(hr), "got 0x%08x\n", hr); + + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR *)initstring_mode3, + &IID_IDBInitialize, (IUnknown **)&dbinit); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBInitialize_Release(dbinit); } else ok(dbinit == NULL, "got %p\n", dbinit);

1 0

Nikolay Sivov : user32: Partially protect WM_SETTEXT handlers from invalid input.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 3c7fee39d3567cd3815083a060f46ecee526afad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7fee39d3567cd3815083a06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 20 13:49:20 2017 +0300 user32: Partially protect WM_SETTEXT handlers from invalid input. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 40 ++++++++++++++++++++++++++-------------- dlls/user32/tests/msg.c | 18 ++++++++++++++++++ 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 6fbaf1e..235c139 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -83,16 +83,21 @@ static void DEFWND_HandleWindowPosChanged( HWND hwnd, const WINDOWPOS *winpos ) * * Set the window text. */ -static void DEFWND_SetTextA( HWND hwnd, LPCSTR text ) +static LRESULT DEFWND_SetTextA( HWND hwnd, LPCSTR text ) { int count; WCHAR *textW; WND *wndPtr; + /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) + * may have child window IDs instead of window name */ + if (text && IS_INTRESOURCE(text)) + return 0; + if (!text) text = ""; count = MultiByteToWideChar( CP_ACP, 0, text, -1, NULL, 0 ); - if (!(wndPtr = WIN_GetPtr( hwnd ))) return; + if (!(wndPtr = WIN_GetPtr( hwnd ))) return 0; if ((textW = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)))) { HeapFree(GetProcessHeap(), 0, wndPtr->text); @@ -111,6 +116,8 @@ static void DEFWND_SetTextA( HWND hwnd, LPCSTR text ) WIN_ReleasePtr( wndPtr ); USER_Driver->pSetWindowText( hwnd, textW ); + + return 1; } /*********************************************************************** @@ -118,16 +125,21 @@ static void DEFWND_SetTextA( HWND hwnd, LPCSTR text ) * * Set the window text. */ -static void DEFWND_SetTextW( HWND hwnd, LPCWSTR text ) +static LRESULT DEFWND_SetTextW( HWND hwnd, LPCWSTR text ) { static const WCHAR empty_string[] = {0}; WND *wndPtr; int count; + /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) + * may have child window IDs instead of window name */ + if (text && IS_INTRESOURCE(text)) + return 0; + if (!text) text = empty_string; count = strlenW(text) + 1; - if (!(wndPtr = WIN_GetPtr( hwnd ))) return; + if (!(wndPtr = WIN_GetPtr( hwnd ))) return 0; HeapFree(GetProcessHeap(), 0, wndPtr->text); if ((wndPtr->text = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR)))) { @@ -146,6 +158,8 @@ static void DEFWND_SetTextW( HWND hwnd, LPCWSTR text ) WIN_ReleasePtr( wndPtr ); USER_Driver->pSetWindowText( hwnd, text ); + + return 1; } /*********************************************************************** @@ -783,10 +797,8 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam if (lParam) { CREATESTRUCTA *cs = (CREATESTRUCTA *)lParam; - /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) - * may have child window IDs instead of window name */ - if (!IS_INTRESOURCE(cs->lpszName)) - DEFWND_SetTextA( hwnd, cs->lpszName ); + + DEFWND_SetTextA( hwnd, cs->lpszName ); result = 1; if(cs->style & (WS_HSCROLL | WS_VSCROLL)) @@ -822,7 +834,8 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam break; case WM_SETTEXT: - DEFWND_SetTextA( hwnd, (LPCSTR)lParam ); + if (!DEFWND_SetTextA( hwnd, (LPCSTR)lParam )) + break; if( (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION ) NC_HandleNCPaint( hwnd , (HRGN)1 ); /* Repaint caption */ result = 1; /* success. FIXME: check text length */ @@ -933,10 +946,8 @@ LRESULT WINAPI DefWindowProcW( if (lParam) { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - /* check for string, as static icons, bitmaps (SS_ICON, SS_BITMAP) - * may have child window IDs instead of window name */ - if (!IS_INTRESOURCE(cs->lpszName)) - DEFWND_SetTextW( hwnd, cs->lpszName ); + + DEFWND_SetTextW( hwnd, cs->lpszName ); result = 1; if(cs->style & (WS_HSCROLL | WS_VSCROLL)) @@ -969,7 +980,8 @@ LRESULT WINAPI DefWindowProcW( break; case WM_SETTEXT: - DEFWND_SetTextW( hwnd, (LPCWSTR)lParam ); + if (!DEFWND_SetTextW( hwnd, (LPCWSTR)lParam )) + break; if( (GetWindowLongW( hwnd, GWL_STYLE ) & WS_CAPTION) == WS_CAPTION ) NC_HandleNCPaint( hwnd , (HRGN)1 ); /* Repaint caption */ result = 1; /* success. FIXME: check text length */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fbadf7d..760a9ea 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14438,6 +14438,7 @@ static void test_defwinproc(void) INT x, y; LRESULT res; struct rbuttonup_thread_data data; + char buffA[64]; HANDLE thread; hwnd = CreateWindowExA(0, "TestWindowClass", "test_defwndproc", @@ -14445,6 +14446,23 @@ static void test_defwinproc(void) assert(hwnd); flush_events(); + buffA[0] = 0; + GetWindowTextA(hwnd, buffA, sizeof(buffA)/sizeof(*buffA)); + ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + + /* Zero high word of the lParam */ + res = DefWindowProcA(hwnd, WM_SETTEXT, 0, 0x1234); + ok(res == 0, "WM_SETTEXT was expected to fail, %ld\n", res); + + GetWindowTextA(hwnd, buffA, sizeof(buffA)/sizeof(*buffA)); + ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + + res = DefWindowProcW(hwnd, WM_SETTEXT, 0, 0x1234); + ok(res == 0, "WM_SETTEXT was expected to fail, %ld\n", res); + + GetWindowTextA(hwnd, buffA, sizeof(buffA)/sizeof(*buffA)); + ok(!strcmp(buffA, "test_defwndproc"), "unexpected window text, %s\n", buffA); + GetCursorPos(&pos); GetWindowRect(hwnd, &rect); x = (rect.left+rect.right) / 2;

1 0

Jacek Caban : mshtml.idl: Added HTMLTitleElement coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: c80bd90ab0f40e7117907d691f7cd2b8878f6e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c80bd90ab0f40e7117907d691… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:08:28 2017 +0200 mshtml.idl: Added HTMLTitleElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlhead.c | 4 ++-- include/mshtml.idl | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index e391396..f9f3dbe 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -32,11 +32,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTitleElement { HTMLElement element; IHTMLTitleElement IHTMLTitleElement_iface; -} HTMLTitleElement; +}; static inline HTMLTitleElement *impl_from_IHTMLTitleElement(IHTMLTitleElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index e3bf2e7..e646d77 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11728,6 +11728,22 @@ methods: } /***************************************************************************** + * HTMLTitleElement coclass + */ +[ + noncreatable, + uuid(3050f284-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTitleElement +{ + [default] dispinterface DispHTMLTitleElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLTitleElement; +} + +/***************************************************************************** * DispHTMLMetaElement dispinterface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLMetaElement coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 6785ccfce52d04ace8ba038421de164383c0c030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6785ccfce52d04ace8ba03842… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:08:39 2017 +0200 mshtml.idl: Added HTMLMetaElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlmeta.c | 4 ++-- include/mshtml.idl | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlmeta.c b/dlls/mshtml/htmlmeta.c index 07490e3..b3312f8 100644 --- a/dlls/mshtml/htmlmeta.c +++ b/dlls/mshtml/htmlmeta.c @@ -31,11 +31,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLMetaElement { HTMLElement element; IHTMLMetaElement IHTMLMetaElement_iface; -} HTMLMetaElement; +}; static inline HTMLMetaElement *impl_from_IHTMLMetaElement(IHTMLMetaElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index e646d77..ebaac7b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11800,6 +11800,24 @@ methods: } /***************************************************************************** + * HTMLMetaElement coclass + */ +[ + noncreatable, + uuid(3050f275-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLMetaElement +{ + [default] dispinterface DispHTMLMetaElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLMetaElement; + interface IHTMLMetaElement2; + interface IHTMLMetaElement3; +} + +/***************************************************************************** * DispHTMLUnknownElement dispinterface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLWindow2 coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 68952c4c75ba7a39014c6ec28fd5f5d9fa645edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=68952c4c75ba7a39014c6ec28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:08:50 2017 +0200 mshtml.idl: Added HTMLWindow2 coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index ebaac7b..505fb29 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -11832,6 +11832,22 @@ methods: } /***************************************************************************** + * HTMLUnknownElement coclass + */ +[ + noncreatable, + uuid(3050f268-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLUnknownElement +{ + [default] dispinterface DispHTMLUnknownElement; + [source, default] dispinterface HTMLElementEvents; + [source] dispinterface HTMLElementEvents2; + WINE_HTMLELEMENT_INTERFACES; + /* interface IHTMLUnknownElement; */ +} + +/***************************************************************************** * IOmHistory interface */ [ @@ -13594,6 +13610,30 @@ methods: } /***************************************************************************** + * HTMLWindow2 coclass + */ +[ + noncreatable, + uuid(d48a6ec6-6a4a-11cf-94a7-444553540000) +] +coclass HTMLWindow2 +{ + [default] dispinterface DispHTMLWindow2; + [source, default] dispinterface HTMLWindowEvents; + [source] dispinterface HTMLWindowEvents2; + /* [source] dispinterface HTMLWindowEvents3; */ + interface IHTMLWindow2; + interface IHTMLWindow3; + interface IHTMLWindow4; + interface IHTMLWindow5; + interface IHTMLWindow6; + /* interface IHTMLWindow7; */ + /* interface IHTMLWindow8; */ + interface IHTMLDOMConstructor; + interface IEventTarget; +} + +/***************************************************************************** * DispHTMLWindowProxy dispinterface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLEmbed coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: e4a436ee5efbd1b54d6c010b045ca4ca844d79ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a436ee5efbd1b54d6c010b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:09:04 2017 +0200 mshtml.idl: Added HTMLEmbed coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlembed.c | 60 ++++++++++++++++++++++++------------------------- include/mshtml.idl | 19 ++++++++++++++++ 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/mshtml/htmlembed.c b/dlls/mshtml/htmlembed.c index 1b98f1b..d74f1b8 100644 --- a/dlls/mshtml/htmlembed.c +++ b/dlls/mshtml/htmlembed.c @@ -32,49 +32,49 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLEmbed { HTMLElement element; IHTMLEmbedElement IHTMLEmbedElement_iface; -} HTMLEmbedElement; +}; -static inline HTMLEmbedElement *impl_from_IHTMLEmbedElement(IHTMLEmbedElement *iface) +static inline HTMLEmbed *impl_from_IHTMLEmbedElement(IHTMLEmbedElement *iface) { - return CONTAINING_RECORD(iface, HTMLEmbedElement, IHTMLEmbedElement_iface); + return CONTAINING_RECORD(iface, HTMLEmbed, IHTMLEmbedElement_iface); } static HRESULT WINAPI HTMLEmbedElement_QueryInterface(IHTMLEmbedElement *iface, REFIID riid, void **ppv) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); } static ULONG WINAPI HTMLEmbedElement_AddRef(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); } static ULONG WINAPI HTMLEmbedElement_Release(IHTMLEmbedElement *iface) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfoCount(IHTMLEmbedElement *iface, UINT *pctinfo) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); } @@ -82,7 +82,7 @@ static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UIN static HRESULT WINAPI HTMLEmbedElement_GetIDsOfNames(IHTMLEmbedElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); } @@ -91,105 +91,105 @@ static HRESULT WINAPI HTMLEmbedElement_Invoke(IHTMLEmbedElement *iface, DISPID d REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLEmbedElement_put_hidden(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_hidden(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_palette(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_pluginspage(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_src(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_src(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_units(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_units(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_name(IHTMLEmbedElement *iface, BSTR v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_name(IHTMLEmbedElement *iface, BSTR *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_width(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_width(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_put_height(IHTMLEmbedElement *iface, VARIANT v) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLEmbedElement_get_height(IHTMLEmbedElement *iface, VARIANT *p) { - HTMLEmbedElement *This = impl_from_IHTMLEmbedElement(iface); + HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -218,14 +218,14 @@ static const IHTMLEmbedElementVtbl HTMLEmbedElementVtbl = { HTMLEmbedElement_get_height }; -static inline HTMLEmbedElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface) +static inline HTMLEmbed *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { - return CONTAINING_RECORD(iface, HTMLEmbedElement, element.node); + return CONTAINING_RECORD(iface, HTMLEmbed, element.node); } static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { - HTMLEmbedElement *This = impl_from_HTMLDOMNode(iface); + HTMLEmbed *This = impl_from_HTMLDOMNode(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); @@ -245,7 +245,7 @@ static HRESULT HTMLEmbedElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static void HTMLEmbedElement_destructor(HTMLDOMNode *iface) { - HTMLEmbedElement *This = impl_from_HTMLDOMNode(iface); + HTMLEmbed *This = impl_from_HTMLDOMNode(iface); HTMLElement_destructor(&This->element.node); } @@ -273,7 +273,7 @@ static dispex_static_data_t HTMLEmbedElement_dispex = { HRESULT HTMLEmbedElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { - HTMLEmbedElement *ret; + HTMLEmbed *ret; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) diff --git a/include/mshtml.idl b/include/mshtml.idl index 505fb29..4c7e095 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -16676,6 +16676,25 @@ methods: } /***************************************************************************** + * HTMLEmbed coclass + */ +[ + noncreatable, + uuid(3050f25d-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLEmbed +{ + [default] dispinterface DispHTMLEmbed; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLEmbedElement; + /* interface IHTMLEmbedElement2; */ + /* interface IGetSVGDocument; */ +} + +/***************************************************************************** * IHTMLCommentElement interface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLTableRow coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: c84111de12369cb1eaa64706b95de1122946e6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84111de12369cb1eaa64706b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:09:14 2017 +0200 mshtml.idl: Added HTMLTableRow coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltablerow.c | 4 ++-- include/mshtml.idl | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 1604dcf..82f7115 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -32,13 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTableRow { HTMLElement element; IHTMLTableRow IHTMLTableRow_iface; nsIDOMHTMLTableRowElement *nsrow; -} HTMLTableRow; +}; static inline HTMLTableRow *impl_from_IHTMLTableRow(IHTMLTableRow *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 4c7e095..a1edef2 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -18315,6 +18315,26 @@ methods: } /***************************************************************************** + * HTMLTableRow coclass + */ +[ + noncreatable, + uuid(3050f26d-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTableRow +{ + [default] dispinterface DispHTMLTableRow; + /* [source, default] dispinterface HTMLControlElementEvents; */ + /* [source] dispinterface HTMLControlElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLTableRow; + /* interface IHTMLTableRowMetrics; */ + /* interface IHTMLTableRow2; */ + /* interface IHTMLTableRow3; */ + /* interface IHTMLTableRow4; */ +} + +/***************************************************************************** * DispHTMLTableCell dispinterface */ [

1 0

Jacek Caban : mshtml.idl: Added HTMLTableCell coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 16189147c6d0fa84ee8790bbbbc5e1ed2727d05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=16189147c6d0fa84ee8790bbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:09:21 2017 +0200 mshtml.idl: Added HTMLTableCell coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltablecell.c | 4 ++-- include/mshtml.idl | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 12895a2..ef903dd 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -32,13 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLTableCell { HTMLElement element; IHTMLTableCell IHTMLTableCell_iface; nsIDOMHTMLTableCellElement *nscell; -} HTMLTableCell; +}; static inline HTMLTableCell *impl_from_IHTMLTableCell(IHTMLTableCell *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index a1edef2..4e5503e 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -18472,6 +18472,26 @@ methods: } /***************************************************************************** + * HTMLTableCell coclass + */ +[ + noncreatable, + uuid(3050f246-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLTableCell +{ + [default] dispinterface DispHTMLTableCell; + [source, default] dispinterface HTMLTextContainerEvents; + [source] dispinterface HTMLTextContainerEvents2; + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLControlElement; + interface IHTMLTextContainer; + interface IHTMLTableCell; + /* interface IHTMLTableCell2; */ + /* interface IHTMLTableCell3; */ +} + +/***************************************************************************** * IHTMLScriptElement interface */ [

1 0

Hans Leidekker : webservices: Implement WsCreateChannelForListener.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 9cacff8e077e01cbf2d325abf54bc8bda9f1a13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cacff8e077e01cbf2d325abf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:45 2017 +0200 webservices: Implement WsCreateChannelForListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 39 ++++++++++++++++++++++++++++++++------- dlls/webservices/tests/listener.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 89070f6..e777e8c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -213,8 +213,35 @@ HRESULT WINAPI WsCreateChannel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding return E_NOTIMPL; } - if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) - return hr; + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; + + *handle = (WS_CHANNEL *)channel; + return S_OK; +} + +/************************************************************************** + * WsCreateChannelForListener [webservices.@] + */ +HRESULT WINAPI WsCreateChannelForListener( WS_LISTENER *listener_handle, const WS_CHANNEL_PROPERTY *properties, + ULONG count, WS_CHANNEL **handle, WS_ERROR *error ) +{ + struct channel *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_BINDING binding; + HRESULT hr; + + TRACE( "%p %p %u %p %p\n", listener_handle, properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener_handle || !handle) return E_INVALIDARG; + + if ((hr = WsGetListenerProperty( listener_handle, WS_LISTENER_PROPERTY_CHANNEL_TYPE, &type, + sizeof(type), NULL )) != S_OK) return hr; + + if ((hr = WsGetListenerProperty( listener_handle, WS_LISTENER_PROPERTY_CHANNEL_BINDING, &binding, + sizeof(binding), NULL )) != S_OK) return hr; + + if ((hr = create_channel( type, binding, properties, count, &channel )) != S_OK) return hr; *handle = (WS_CHANNEL *)channel; return S_OK; @@ -393,11 +420,10 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return hr; } -static HRESULT close_channel( struct channel *channel ) +static void close_channel( struct channel *channel ) { reset_channel( channel ); channel->state = WS_CHANNEL_STATE_CLOSED; - return S_OK; } /************************************************************************** @@ -406,7 +432,6 @@ static HRESULT close_channel( struct channel *channel ) HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -422,10 +447,10 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, return E_INVALIDARG; } - hr = close_channel( channel ); + close_channel( channel ); LeaveCriticalSection( &channel->cs ); - return hr; + return S_OK; } static HRESULT parse_url( const WCHAR *url, ULONG len, URL_COMPONENTS *uc ) diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index ab2fba9..c4a2747 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -154,8 +154,45 @@ static void test_WsOpenListener(void) WsFreeListener( listener ); } +static void test_WsCreateChannelForListener(void) +{ + WS_LISTENER *listener; + WS_CHANNEL *channel; + WS_CHANNEL_TYPE type; + WS_CHANNEL_STATE state; + HRESULT hr; + + hr = WsCreateChannelForListener( NULL, NULL, 0, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateChannelForListener( NULL, NULL, 0, &channel, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + channel = NULL; + hr = WsCreateChannelForListener( listener, NULL, 0, &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( channel != NULL, "channel not set\n" ); + + type = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_CHANNEL_TYPE, &type, sizeof(type), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( type == WS_CHANNEL_TYPE_DUPLEX_SESSION, "got %u\n", type ); + + state = 0xdeadbeef; + hr = WsGetChannelProperty( channel, WS_CHANNEL_PROPERTY_STATE, &state, sizeof(state), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_CHANNEL_STATE_CREATED, "got %u\n", state ); + + WsFreeChannel( channel ); + WsFreeListener( listener ); +} + START_TEST(listener) { test_WsCreateListener(); test_WsOpenListener(); + test_WsCreateChannelForListener(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index ff35777..522cc56 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -21,7 +21,7 @@ @ stub WsCopyError @ stdcall WsCopyNode(ptr ptr ptr) @ stdcall WsCreateChannel(long long ptr long ptr ptr ptr) -@ stub WsCreateChannelForListener +@ stdcall WsCreateChannelForListener(ptr ptr long ptr ptr) @ stdcall WsCreateError(ptr long ptr) @ stub WsCreateFaultFromError @ stdcall WsCreateHeap(long long ptr long ptr ptr)

1 0

Hans Leidekker : webservices: Implement WsResetListener.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: a3999d77efd41faf995c29bb138ff9a7f98bb5aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3999d77efd41faf995c29bb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 20 10:45:46 2017 +0200 webservices: Implement WsResetListener. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/listener.c | 32 ++++++++++++++++++++++++ dlls/webservices/tests/listener.c | 51 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index a236ab9..99402ff 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -361,6 +361,38 @@ HRESULT WINAPI WsCloseListener( WS_LISTENER *handle, const WS_ASYNC_CONTEXT *ctx } /************************************************************************** + * WsResetListener [webservices.@] + */ +HRESULT WINAPI WsResetListener( WS_LISTENER *handle, WS_ERROR *error ) +{ + struct listener *listener = (struct listener *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!listener) return E_INVALIDARG; + + EnterCriticalSection( &listener->cs ); + + if (listener->magic != LISTENER_MAGIC) + { + LeaveCriticalSection( &listener->cs ); + return E_INVALIDARG; + } + + if (listener->state != WS_LISTENER_STATE_CREATED && listener->state != WS_LISTENER_STATE_CLOSED) + { + LeaveCriticalSection( &listener->cs ); + return WS_E_INVALID_OPERATION; + } + + reset_listener( listener ); + + LeaveCriticalSection( &listener->cs ); + return S_OK; +} + +/************************************************************************** * WsGetListenerProperty [webservices.@] */ HRESULT WINAPI WsGetListenerProperty( WS_LISTENER *handle, WS_LISTENER_PROPERTY_ID id, void *buf, diff --git a/dlls/webservices/tests/listener.c b/dlls/webservices/tests/listener.c index c4a2747..9aaf330 100644 --- a/dlls/webservices/tests/listener.c +++ b/dlls/webservices/tests/listener.c @@ -190,9 +190,60 @@ static void test_WsCreateChannelForListener(void) WsFreeListener( listener ); } +static void test_WsResetListener(void) +{ + WCHAR str[] = + {'n','e','t','.','t','c','p',':','/','/','+',':','2','0','1','7','/','p','a','t','h'}; + WS_STRING url = { sizeof(str)/sizeof(str[0]), str }; + WS_LISTENER *listener; + WS_LISTENER_STATE state; + WS_LISTENER_PROPERTY prop; + ULONG size, timeout = 1000; + HRESULT hr; + + hr = WsResetListener( NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + prop.id = WS_LISTENER_PROPERTY_CONNECT_TIMEOUT; + prop.value = &timeout; + prop.valueSize = sizeof(timeout); + hr = WsCreateListener( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, &prop, 1, NULL, &listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsOpenListener( listener, &url, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCloseListener( listener, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsResetListener( listener, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + state = 0xdeadbeef; + size = sizeof(state); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_STATE, &state, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( state == WS_LISTENER_STATE_CREATED, "got %u\n", state ); + + timeout = 0xdeadbeef; + size = sizeof(timeout); + hr = WsGetListenerProperty( listener, WS_LISTENER_PROPERTY_CONNECT_TIMEOUT, &timeout, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( timeout == 1000, "got %u\n", timeout ); + + WsFreeListener( listener ); +} + START_TEST(listener) { test_WsCreateListener(); test_WsOpenListener(); test_WsCreateChannelForListener(); + test_WsResetListener(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 522cc56..f55bef8 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -136,7 +136,7 @@ @ stdcall WsResetChannel(ptr ptr) @ stdcall WsResetError(ptr) @ stdcall WsResetHeap(ptr ptr) -@ stub WsResetListener +@ stdcall WsResetListener(ptr ptr) @ stdcall WsResetMessage(ptr ptr) @ stub WsResetMetadata @ stub WsResetServiceHost

1 0