October 2010 - Wine-Commits

Jacek Caban : jscript: Don't use to_object for nullDisp in Object function.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 93e6ca87479ed9688c88d67614637be60250842a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e6ca87479ed9688c88d6761… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 13:54:42 2010 +0200 jscript: Don't use to_object for nullDisp in Object function. --- dlls/jscript/object.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 05eb509..bbb0372 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -186,7 +186,7 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(arg_cnt(dp)) { VARIANT *arg = get_arg(dp,0); - if(V_VT(arg) != VT_EMPTY && V_VT(arg) != VT_NULL) { + if(V_VT(arg) != VT_EMPTY && V_VT(arg) != VT_NULL && (V_VT(arg) != VT_DISPATCH || V_DISPATCH(arg))) { IDispatch *disp; hres = to_object(ctx, arg, &disp);

1 0

Vitaly Perov : shdocvw: Silence more invalid QueryInterface FIXMEs.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: a15301a0bcbaa6c654f0fa7e23b3ef121e428513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15301a0bcbaa6c654f0fa7e2… Author: Vitaly Perov <vitperov(a)etersoft.ru> Date: Fri Oct 1 13:09:40 2010 +0400 shdocvw: Silence more invalid QueryInterface FIXMEs. --- dlls/shdocvw/tests/webbrowser.c | 10 ++++++++++ dlls/shdocvw/webbrowser.c | 6 ++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 04a0b8e..babfe11 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -2437,6 +2437,8 @@ static void test_QueryInterface(IUnknown *unk) IObjectWithSite *site = (void*)0xdeadbeef; IViewObjectEx *viewex = (void*)0xdeadbeef; IOleLink *link = (void*)0xdeadbeef; + IMarshal *marshal = (void*)0xdeadbeef; + IStdMarshalInfo *marshalinfo = (void*)0xdeadbeef; HRESULT hres; hres = IUnknown_QueryInterface(unk, &IID_IQuickActivate, (void**)&qa); @@ -2471,6 +2473,14 @@ static void test_QueryInterface(IUnknown *unk) ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); ok(link == NULL, "link=%p, expected NULL\n", link); + hres = IUnknown_QueryInterface(unk, &IID_IMarshal, (void**)&marshal); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(marshal == NULL, "marshal=%p, expected NULL\n", marshal); + + hres = IUnknown_QueryInterface(unk, &IID_IStdMarshalInfo, (void**)&marshalinfo); + ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); + ok(marshalinfo == NULL, "marshalinfo=%p, expected NULL\n", marshalinfo); + } static void test_WebBrowser(BOOL do_download) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 0c1bb12..ef46236 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -130,6 +130,12 @@ static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid }else if(IsEqualGUID(&IID_IOleLink, riid)) { TRACE("(%p)->(IID_IOleLink %p) returning NULL\n", This, ppv); return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IMarshal, riid)) { + TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_IStdMarshalInfo, riid)) { + TRACE("(%p)->(IID_IStdMarshalInfo %p) returning NULL\n", This, ppv); + return E_NOINTERFACE; }else if(HlinkFrame_QI(&This->hlink_frame, riid, ppv)) { return S_OK; }

1 0

Detlef Riekenberg : inetcpl: Implement LaunchInternetControlPanel.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: ca042b2922e4c7dcfcb0235e5b4aea9fe745718c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca042b2922e4c7dcfcb0235e5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 1 13:16:56 2010 +0200 inetcpl: Implement LaunchInternetControlPanel. --- dlls/inetcpl.cpl/inetcpl.c | 21 +++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.cpl.spec | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 03b6282..49cd892 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -162,3 +162,24 @@ LONG CALLBACK CPlApplet(HWND hWnd, UINT command, LPARAM lParam1, LPARAM lParam2) return FALSE; } + +/********************************************************************* + * LaunchInternetControlPanel (inetcpl.@) + * + * Launch the Internet Control Panel dialog + * + * PARAMS + * parent [I] Handle for the parent window + * + * RETURNS + * Success: TRUE + * + * NOTES + * rundll32 callable function: rundll32 inetcpl.cpl,LaunchInternetControlPanel + * + */ +BOOL WINAPI LaunchInternetControlPanel(HWND parent) +{ + display_cpl_sheets(parent); + return TRUE; +} diff --git a/dlls/inetcpl.cpl/inetcpl.cpl.spec b/dlls/inetcpl.cpl/inetcpl.cpl.spec index 21cb34b..eaf5e4d 100644 --- a/dlls/inetcpl.cpl/inetcpl.cpl.spec +++ b/dlls/inetcpl.cpl/inetcpl.cpl.spec @@ -8,7 +8,7 @@ @ stub ImportExportPFX @ stub LaunchAddSitesDialog @ stub LaunchConnectionDialog -@ stub LaunchInternetControlPanel +@ stdcall LaunchInternetControlPanel(long) @ stub LaunchPerSitePrivacyActionDialog @ stub LaunchPopupWindowManagementDialog @ stub LaunchPrivacyDialog

1 0

Detlef Riekenberg : inetcpl: Add general propsheet and allow to set the homepage.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: e859230ee40c60b45cade3934757cbc0363a3416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e859230ee40c60b45cade3934… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 1 13:19:03 2010 +0200 inetcpl: Add general propsheet and allow to set the homepage. --- dlls/inetcpl.cpl/Makefile.in | 3 +- dlls/inetcpl.cpl/cpl_En.rc | 17 ++++ dlls/inetcpl.cpl/general.c | 212 ++++++++++++++++++++++++++++++++++++++++++ dlls/inetcpl.cpl/inetcpl.c | 7 +- dlls/inetcpl.cpl/inetcpl.h | 12 +++ 5 files changed, 249 insertions(+), 2 deletions(-) diff --git a/dlls/inetcpl.cpl/Makefile.in b/dlls/inetcpl.cpl/Makefile.in index 12eb694..565e54e 100644 --- a/dlls/inetcpl.cpl/Makefile.in +++ b/dlls/inetcpl.cpl/Makefile.in @@ -1,9 +1,10 @@ MODULE = inetcpl.cpl -IMPORTS = comctl32 user32 +IMPORTS = comctl32 shlwapi user32 advapi32 DELAYIMPORTS = cryptui C_SRCS = \ content.c \ + general.c \ inetcpl.c RC_SRCS = \ diff --git a/dlls/inetcpl.cpl/cpl_En.rc b/dlls/inetcpl.cpl/cpl_En.rc index f463df7..769ec60 100644 --- a/dlls/inetcpl.cpl/cpl_En.rc +++ b/dlls/inetcpl.cpl/cpl_En.rc @@ -29,6 +29,23 @@ BEGIN IDS_CPL_INFO "Configure Wine Internet Browser and related settings" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "General" +BEGIN + + GROUPBOX " Home page ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "You can choose the address that will be used as your home page.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Current page", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Default page", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "&Blank page", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c new file mode 100644 index 0000000..0825897 --- /dev/null +++ b/dlls/inetcpl.cpl/general.c @@ -0,0 +1,212 @@ +/* + * Internet control panel applet: general propsheet + * + * Copyright 2010 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#define NONAMELESSUNION + +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> +#include <wininet.h> +#include <winreg.h> +#include <shlwapi.h> +#include <prsht.h> + +#include "inetcpl.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(inetcpl); + +static const WCHAR about_blank[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +static const WCHAR start_page[] = {'S','t','a','r','t',' ','P','a','g','e',0}; +static const WCHAR reg_ie_main[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r','\\', + 'M','a','i','n',0}; + +/* list of unimplemented buttons */ +static DWORD disable_me[] = {IDC_HOME_CURRENT, + IDC_HOME_DEFAULT, 0}; + +/********************************************************************* + * parse_url_from_outside [internal] + * + * Filter an URL, add a usable scheme, when needed + * + */ +static DWORD parse_url_from_outside(LPCWSTR url, LPWSTR out, DWORD maxlen) +{ + HMODULE hdll; + DWORD (WINAPI *pParseURLFromOutsideSourceW)(LPCWSTR, LPWSTR, LPDWORD, LPDWORD); + DWORD res; + + hdll = LoadLibraryA("shdocvw.dll"); + pParseURLFromOutsideSourceW = (void *) GetProcAddress(hdll, (LPSTR) 170); + + if (pParseURLFromOutsideSourceW) + { + res = pParseURLFromOutsideSourceW(url, out, &maxlen, NULL); + FreeLibrary(hdll); + return res; + } + + ERR("failed to get ordinal 170: %d\n", GetLastError()); + FreeLibrary(hdll); + return 0; +} + +/********************************************************************* + * general_on_command [internal] + * + * handle WM_COMMAND + * + */ +static INT_PTR general_on_command(HWND hwnd, WPARAM wparam) +{ + + switch (wparam) + { + case MAKEWPARAM(IDC_HOME_EDIT, EN_CHANGE): + /* enable apply button */ + SendMessageW(GetParent(hwnd), PSM_CHANGED, (WPARAM)hwnd, 0); + break; + + case MAKEWPARAM(IDC_HOME_BLANK, BN_CLICKED): + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, about_blank); + break; + + default: + TRACE("not implemented for command: %d/%d\n", HIWORD(wparam), LOWORD(wparam)); + return FALSE; + } + return TRUE; +} + +/********************************************************************* + * general_on_initdialog [internal] + * + * handle WM_INITDIALOG + * + */ +static VOID general_on_initdialog(HWND hwnd) +{ + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + DWORD len; + DWORD type; + LONG res; + DWORD *ptr = disable_me; + + /* disable unimplemented buttons */ + while (*ptr) + { + EnableWindow(GetDlgItem(hwnd, *ptr), FALSE); + ptr++; + } + + /* read current homepage from the registry. Try HCU first, then HKLM */ + *buffer = 0; + len = sizeof(buffer); + type = REG_SZ; + res = SHRegGetUSValueW(reg_ie_main, start_page, &type, buffer, &len, FALSE, (LPBYTE) about_blank, sizeof(about_blank)); + + if (!res && (type == REG_SZ)) + { + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer); + } +} + +/********************************************************************* + * general_on_notify [internal] + * + * handle WM_NOTIFY + * + */ +static INT_PTR general_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) +{ + PSHNOTIFY *psn; + WCHAR buffer[INTERNET_MAX_URL_LENGTH]; + WCHAR parsed[INTERNET_MAX_URL_LENGTH]; + LONG res; + + psn = (PSHNOTIFY *) lparam; + TRACE("WM_NOTIFY (%p, 0x%lx, 0x%lx) from %p with code: %d\n", hwnd, wparam, lparam, + psn->hdr.hwndFrom, psn->hdr.code); + + if (psn->hdr.code == PSN_APPLY) + { + *buffer = 0; + GetDlgItemTextW(hwnd, IDC_HOME_EDIT, buffer, sizeof(buffer)/sizeof(WCHAR)); + TRACE("EDITTEXT has %s\n", debugstr_w(buffer)); + + res = parse_url_from_outside(buffer, parsed, sizeof(parsed)/sizeof(WCHAR)); + TRACE("got %d with %s\n", res, debugstr_w(parsed)); + + if (res) + { + HKEY hkey; + + /* update the dialog, when needed */ + if (lstrcmpW(buffer, parsed)) + SetDlgItemTextW(hwnd, IDC_HOME_EDIT, parsed); + + /* update the registry */ + res = RegOpenKeyW(HKEY_CURRENT_USER, reg_ie_main, &hkey); + if (!res) + { + res = RegSetValueExW(hkey, start_page, 0, REG_SZ, (const BYTE *)parsed, + (lstrlenW(parsed) + 1) * sizeof(WCHAR)); + RegCloseKey(hkey); + return !res; + } + } + } + return FALSE; +} + +/********************************************************************* + * general_dlgproc [internal] + * + */ +INT_PTR CALLBACK general_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + + switch (msg) + { + case WM_INITDIALOG: + general_on_initdialog(hwnd); + return TRUE; + + case WM_COMMAND: + return general_on_command(hwnd, wparam); + + case WM_NOTIFY: + return general_on_notify(hwnd, wparam, lparam); + + default: + /* do not flood the log */ + if ((msg == WM_SETCURSOR) || (msg == WM_NCHITTEST) || (msg == WM_MOUSEMOVE)) + return FALSE; + + TRACE("(%p, 0x%08x/%d, 0x%lx, 0x%lx)\n", hwnd, msg, msg, wparam, lparam); + + } + return FALSE; +} diff --git a/dlls/inetcpl.cpl/inetcpl.c b/dlls/inetcpl.cpl/inetcpl.c index 80decfb..03b6282 100644 --- a/dlls/inetcpl.cpl/inetcpl.c +++ b/dlls/inetcpl.cpl/inetcpl.c @@ -27,7 +27,6 @@ #include <wingdi.h> #include <winuser.h> #include <commctrl.h> -#include <commdlg.h> #include <cpl.h> #include "wine/debug.h" @@ -93,6 +92,12 @@ static void display_cpl_sheets(HWND parent) /* Fill out all PROPSHEETPAGE */ psp[id].dwSize = sizeof (PROPSHEETPAGEW); psp[id].hInstance = hcpl; + psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL); + psp[id].pfnDlgProc = general_dlgproc; + id++; + + psp[id].dwSize = sizeof (PROPSHEETPAGEW); + psp[id].hInstance = hcpl; psp[id].u.pszTemplate = MAKEINTRESOURCEW(IDD_CONTENT); psp[id].pfnDlgProc = content_dlgproc; id++; diff --git a/dlls/inetcpl.cpl/inetcpl.h b/dlls/inetcpl.cpl/inetcpl.h index e1477ff..cee9d4f 100644 --- a/dlls/inetcpl.cpl/inetcpl.h +++ b/dlls/inetcpl.cpl/inetcpl.h @@ -19,12 +19,16 @@ * */ +#ifndef __WINE_INETCPL__ +#define __WINE_INETCPL__ + #include <windef.h> #include <winuser.h> extern HMODULE hcpl; INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; +INT_PTR CALLBACK general_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; #define NUM_PROPERTY_PAGES 8 @@ -38,6 +42,14 @@ INT_PTR CALLBACK content_dlgproc(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; /* dialogs */ #define IDC_STATIC -1 +#define IDD_GENERAL 1000 +#define IDC_HOME_EDIT 1000 +#define IDC_HOME_CURRENT 1001 +#define IDC_HOME_DEFAULT 1002 +#define IDC_HOME_BLANK 1003 + #define IDD_CONTENT 4000 #define IDC_CERT 4100 #define IDC_CERT_PUBLISHER 4101 + +#endif

1 0

Juan Lang : wininet: Secure flag is set in the request, not in the session.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 80545ef966a39b4164d61d72ced4b962dd797d53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80545ef966a39b4164d61d72c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 17:11:56 2010 -0700 wininet: Secure flag is set in the request, not in the session. --- dlls/wininet/http.c | 3 +-- dlls/wininet/tests/http.c | 2 -- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 98765d9..76cf41c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1690,7 +1690,6 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_SECURITY_FLAGS: { - http_session_t *lpwhs = req->lpHttpSession; DWORD flags; int bits; @@ -1699,7 +1698,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *size = sizeof(DWORD); flags = 0; - if (lpwhs->hdr.dwFlags & INTERNET_FLAG_SECURE) + if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) flags |= SECURITY_FLAG_SECURE; flags |= req->netConnection.security_flags; bits = NETCON_GetCipherStrength(&req->netConnection); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 1236d30..d942ca4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2598,7 +2598,6 @@ static void test_secure_connection(void) size = sizeof(flags); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - todo_wine ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, @@ -2679,7 +2678,6 @@ static void test_secure_connection(void) size = sizeof(flags); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - todo_wine ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT,

1 0

Detlef Riekenberg : inetcpl: Update German translation.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 6d9e5162d6f1ddf8e6d22fbb02afa6a330649064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d9e5162d6f1ddf8e6d22fbb0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 1 13:16:39 2010 +0200 inetcpl: Update German translation. --- dlls/inetcpl.cpl/cpl_De.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_De.rc b/dlls/inetcpl.cpl/cpl_De.rc index ecc2761..549776f 100644 --- a/dlls/inetcpl.cpl/cpl_De.rc +++ b/dlls/inetcpl.cpl/cpl_De.rc @@ -31,6 +31,24 @@ BEGIN IDS_CPL_INFO "Wine Internet Browser und zugehörige Einstellungen anpassen." END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Allgemein" +BEGIN + + GROUPBOX " Startseite ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Sie können eine Addresse wählen, die als Startseite verwendet wird.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "A&ktuelle Seite", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Standardseite", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "&Leere Seite", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

Juan Lang : wininet: Set cipher strength bits when querying INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 948173b7f4604a831a44fe2e8c760e98c4b1595c URL: http://source.winehq.org/git/wine.git/?a=commit;h=948173b7f4604a831a44fe2e8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 13:33:47 2010 -0700 wininet: Set cipher strength bits when querying INTERNET_OPTION_SECURITY_FLAGS. --- dlls/wininet/http.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a15977a..98765d9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1690,19 +1690,26 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe case INTERNET_OPTION_SECURITY_FLAGS: { - http_session_t *lpwhs; - lpwhs = req->lpHttpSession; + http_session_t *lpwhs = req->lpHttpSession; + DWORD flags; + int bits; if (*size < sizeof(ULONG)) return ERROR_INSUFFICIENT_BUFFER; *size = sizeof(DWORD); + flags = 0; if (lpwhs->hdr.dwFlags & INTERNET_FLAG_SECURE) - *(DWORD*)buffer = SECURITY_FLAG_SECURE; + flags |= SECURITY_FLAG_SECURE; + flags |= req->netConnection.security_flags; + bits = NETCON_GetCipherStrength(&req->netConnection); + if (bits >= 128) + flags |= SECURITY_FLAG_STRENGTH_STRONG; + else if (bits >= 56) + flags |= SECURITY_FLAG_STRENGTH_MEDIUM; else - *(DWORD*)buffer = 0; - *(DWORD *)buffer |= req->netConnection.security_flags; - /* FIXME: set connection cipher strength (SECURITY_FLAG_STRENGTH_*) */ + flags |= SECURITY_FLAG_STRENGTH_WEAK; + *(DWORD *)buffer = flags; return ERROR_SUCCESS; }

1 0

Juan Lang : wininet: Support querying the cipher strength of an SSL connection.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 887aeb6a097b73165658e00313eeec8728022d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=887aeb6a097b73165658e0031… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 30 13:18:07 2010 -0700 wininet: Support querying the cipher strength of an SSL connection. --- dlls/wininet/http.c | 1 + dlls/wininet/internet.h | 1 + dlls/wininet/netconnection.c | 22 ++++++++++++++++++++++ dlls/wininet/tests/http.c | 4 ---- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 992a827..a15977a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1847,6 +1847,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe CertNameToStrA(context->dwCertEncodingType, &context->pCertInfo->Issuer, CERT_SIMPLE_NAME_STR, info->lpszIssuerInfo, len); + info->dwKeySize = NETCON_GetCipherStrength(&req->netConnection); CertFreeCertificateContext(context); return ERROR_SUCCESS; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 109179f..86b16bd 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -460,6 +460,7 @@ DWORD NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int int *recvd /* out */); BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *available); LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection); +int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection); DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value); int sock_get_error(int); diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 004b213..a1c3090 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -150,6 +150,8 @@ MAKE_FUNCPTR(SSL_CTX_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); MAKE_FUNCPTR(SSL_CTX_set_verify); +MAKE_FUNCPTR(SSL_get_current_cipher); +MAKE_FUNCPTR(SSL_CIPHER_get_bits); MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ @@ -427,6 +429,8 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_CTX_set_timeout); DYNSSL(SSL_CTX_set_default_verify_paths); DYNSSL(SSL_CTX_set_verify); + DYNSSL(SSL_get_current_cipher); + DYNSSL(SSL_CIPHER_get_bits); DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL @@ -868,6 +872,24 @@ LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) #endif } +int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) +{ +#ifdef SONAME_LIBSSL + SSL_CIPHER *cipher; + int bits = 0; + + if (!connection->useSSL) + return 0; + cipher = pSSL_get_current_cipher(connection->ssl_s); + if (!cipher) + return 0; + pSSL_CIPHER_get_bits(cipher, &bits); + return bits; +#else + return 0; +#endif +} + DWORD NETCON_set_timeout(WININET_NETCONNECTION *connection, BOOL send, int value) { int result; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d06cdf2..1236d30 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2622,7 +2622,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structA); @@ -2653,7 +2652,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structW); @@ -2705,7 +2703,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structA); @@ -2736,7 +2733,6 @@ static void test_secure_connection(void) "unexpected encryption algorithm name\n"); ok(!certificate_structA->lpszProtocolName, "unexpected protocol name\n"); - todo_wine ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); } HeapFree(GetProcessHeap(), 0, certificate_structW);

1 0

Alexandre Julliard : shell32/tests: Fix some test failures on Vista.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 15c1670a5cdfa6660ff284f3a875e44c75d74881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c1670a5cdfa6660ff284f3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 15:16:47 2010 +0200 shell32/tests: Fix some test failures on Vista. --- dlls/shell32/tests/shlview.c | 49 ++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 0992252..bfb6870 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -471,7 +471,7 @@ static const struct message folderview_getselectionmarked_seq[] = { }; static const struct message folderview_getfocused_seq[] = { - { LVM_GETNEXTITEM, sent|wparam|lparam, -1, LVNI_FOCUSED }, + { LVM_GETNEXTITEM, sent|wparam|lparam|optional, -1, LVNI_FOCUSED }, { 0 } }; @@ -535,7 +535,7 @@ static void test_IFolderView(void) HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; - INT ret; + INT ret, count; POINT pt; LONG ref1, ref2; RECT r; @@ -618,6 +618,19 @@ if (0) ok(pt.x == LOWORD(ret) && pt.y == HIWORD(ret), "got (%d, %d)\n", LOWORD(ret), HIWORD(ret)); } + /* IFolderView::ItemCount */ +if (0) +{ + /* crashes on XP */ + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); +} + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, count ? folderview_itemcount_seq : empty_seq, + "IFolderView::ItemCount", FALSE); + /* IFolderView::GetSelectionMarkedItem */ if (0) { @@ -627,16 +640,22 @@ if (0) flush_sequences(sequences, NUM_MSG_SEQUENCES); hr = IFolderView_GetSelectionMarkedItem(fv, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); + if (count) + ok(hr == S_OK, "got (0x%08x)\n", hr); + else + ok(hr == S_FALSE, "got (0x%08x)\n", hr); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getselectionmarked_seq, - "IFolderView::GetSelectionMarkedItem", FALSE); + "IFolderView::GetSelectionMarkedItem", FALSE); /* IFolderView::GetFocusedItem */ flush_sequences(sequences, NUM_MSG_SEQUENCES); hr = IFolderView_GetFocusedItem(fv, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); + if (count) + ok(hr == S_OK, "got (0x%08x)\n", hr); + else + ok(hr == S_FALSE, "got (0x%08x)\n", hr); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getfocused_seq, - "IFolderView::GetFocusedItem", FALSE); + "IFolderView::GetFocusedItem", FALSE); /* IFolderView::GetFolder, just return pointer */ if (0) @@ -655,22 +674,10 @@ if (0) ok(hr == S_OK, "got (0x%08x)\n", hr); ref2 = IShellFolder_AddRef(desktop); IShellFolder_Release(desktop); - ok(ref1 == ref2, "expected same refcount, got %d\n", ref2); + ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ + "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); - /* IFolderView::ItemCount */ -if (0) -{ - /* crashes on XP */ - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); -} - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_itemcount_seq, - "IFolderView::ItemCount", FALSE); - IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view); @@ -821,7 +828,7 @@ static const struct message folderview_setcurrentviewmode3_prevista[] = { static const struct message folderview_setcurrentviewmode4_prevista[] = { { LVM_GETHEADER, sent}, - { LVM_GETITEMCOUNT, sent}, + { LVM_GETITEMCOUNT, sent|optional }, { LVM_SETSELECTEDCOLUMN, sent}, { WM_NOTIFY, sent }, { WM_NOTIFY, sent },

1 0

Adam Martinson : msxml3: Implement preserveWhiteSpace property.
by Alexandre Julliard Oct. 1, 2010

Oct. 1, 2010

Module: wine Branch: master Commit: 49fa9de580814028e3224e9d9eb6472bf11092be URL: http://source.winehq.org/git/wine.git/?a=commit;h=49fa9de580814028e3224e9d9… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Sep 30 09:49:10 2010 -0500 msxml3: Implement preserveWhiteSpace property. --- dlls/msxml3/domdoc.c | 36 ++++++++++++- dlls/msxml3/tests/domdoc.c | 129 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 156 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ad1a858..1eed582 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -288,6 +288,38 @@ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) return node; } +static inline BOOL strn_isspace(xmlChar const* str, int len) +{ + for (; str && len > 0 && *str; ++str, --len) + if (!isspace(*str)) + break; + + return len == 0; +} + +static void sax_characters(void *ctx, const xmlChar *ch, int len) +{ + xmlParserCtxtPtr pctx; + domdoc const* This; + + pctx = (xmlParserCtxtPtr) ctx; + This = (domdoc const*) pctx->_private; + + if (!This->preserving) + { + xmlChar* ws = xmlGetNsProp(pctx->node, BAD_CAST "space", XML_XML_NAMESPACE); + if ((!ws || xmlStrcmp(ws, BAD_CAST "preserve") != 0) && + strn_isspace(ch, len)) + { + xmlFree(ws); + return; + } + xmlFree(ws); + } + + xmlSAX2Characters(ctx, ch, len); +} + static xmlDocPtr doparse(domdoc* This, char *ptr, int len) { xmlDocPtr doc; @@ -309,8 +341,8 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len) xmlSAX2StartElement, /* startElement */ xmlSAX2EndElement, /* endElement */ xmlSAX2Reference, /* reference */ - xmlSAX2Characters, /* characters */ - NULL, /* TODO: ignorableWhitespace */ + sax_characters, /* characters */ + sax_characters, /* ignorableWhitespace */ xmlSAX2ProcessingInstruction, /* processingInstruction */ xmlSAX2Comment, /* comment */ NULL, /* TODO: warning */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 012b6aa..8d7399e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -112,6 +112,9 @@ static const CHAR szExampleXML[] = " <html xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description. <bar:x/>\n" " </html>\n" +" <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" +" This is a description with preserved whitespace. <bar:x/>\n" +" </html>\n" " </description>\n" " </elem>\n" "\n" @@ -377,6 +380,9 @@ static void get_str_for_type(DOMNodeType type, char *buf) case NODE_DOCUMENT: strcpy(buf, "D"); break; + case NODE_TEXT: + strcpy(buf, "T"); + break; default: wsprintfA(buf, "[%d]", type); } @@ -3064,6 +3070,120 @@ static void test_IXMLDOMDocument2(void) free_bstrs(); } +static inline void check_ws_ignored(IXMLDOMDocument2* doc) +{ + IXMLDOMNode *node1, *node2; + IXMLDOMNodeList *list; + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); + ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); + ole_check(IXMLDOMNodeList_reset(list)); + expect_list_and_release(list, "E1.E4.E1.E2.D1 E2.E4.E1.E2.D1"); + + ole_check(IXMLDOMNode_get_childNodes(node1, &list)); + expect_list_and_release(list, "T1.E1.E4.E1.E2.D1 E2.E1.E4.E1.E2.D1 E3.E1.E4.E1.E2.D1 T4.E1.E4.E1.E2.D1 E5.E1.E4.E1.E2.D1"); + IXMLDOMNode_Release(node1); + ole_check(IXMLDOMNode_get_childNodes(node2, &list)); + expect_list_and_release(list, "T1.E2.E4.E1.E2.D1 E2.E2.E4.E1.E2.D1 T3.E2.E4.E1.E2.D1 E4.E2.E4.E1.E2.D1 T5.E2.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1 T7.E2.E4.E1.E2.D1"); + IXMLDOMNode_Release(node2); +} + +static inline void check_ws_preserved(IXMLDOMDocument2* doc) +{ + IXMLDOMNode *node1, *node2; + IXMLDOMNodeList *list; + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); + ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); + ole_check(IXMLDOMNodeList_reset(list)); + expect_list_and_release(list, "E2.E8.E2.E2.D1 E4.E8.E2.E2.D1"); + + ole_check(IXMLDOMNode_get_childNodes(node1, &list)); + expect_list_and_release(list, "T1.E2.E8.E2.E2.D1 E2.E2.E8.E2.E2.D1 T3.E2.E8.E2.E2.D1 E4.E2.E8.E2.E2.D1 T5.E2.E8.E2.E2.D1 E6.E2.E8.E2.E2.D1 T7.E2.E8.E2.E2.D1"); + IXMLDOMNode_Release(node1); + ole_check(IXMLDOMNode_get_childNodes(node2, &list)); + expect_list_and_release(list, "T1.E4.E8.E2.E2.D1 E2.E4.E8.E2.E2.D1 T3.E4.E8.E2.E2.D1 E4.E4.E8.E2.E2.D1 T5.E4.E8.E2.E2.D1 E6.E4.E8.E2.E2.D1 T7.E4.E8.E2.E2.D1"); + IXMLDOMNode_Release(node2); +} + +static void test_whitespace(void) +{ + VARIANT_BOOL b; + IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + + doc1 = create_document(&IID_IXMLDOMDocument2); + doc2 = create_document(&IID_IXMLDOMDocument2); + if (!doc1 || !doc2) return; + + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* switch to XPath */ + ole_check(IXMLDOMDocument2_setProperty(doc1, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + + check_ws_ignored(doc1); + check_ws_preserved(doc2); + + /* new instances copy the property */ + ole_check(IXMLDOMDocument2_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**) &doc3)); + ole_check(IXMLDOMDocument2_QueryInterface(doc2, &IID_IXMLDOMDocument2, (void**) &doc4)); + + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + check_ws_ignored(doc3); + check_ws_preserved(doc4); + + /* setting after loading xml does nothing */ + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); + + check_ws_ignored(doc1); + check_ws_preserved(doc2); + + /* it takes effect on reload */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + check_ws_preserved(doc1); + check_ws_ignored(doc2); + + /* other instances follow suit */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + check_ws_preserved(doc3); + check_ws_ignored(doc4); + + IXMLDOMDocument_Release(doc1); + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc3); + IXMLDOMDocument_Release(doc4); + free_bstrs(); +} + static void test_XPath(void) { VARIANT var; @@ -3159,13 +3279,7 @@ static void test_XPath(void) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - { - char *str = list_to_string(list); - /* it's the correct node, just the wrong index due to whitespace-only nodes */ - todo_wine ok(strcmp(str, "E5.E1.E4.E1.E2.D1")==0, "Invalid node list: %s, expected %s\n", str, "E5.E1.E4.E1.E2.D1"); - if (list) - IXMLDOMNodeList_Release(list); - } + expect_list_and_release(list, "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -6178,6 +6292,7 @@ START_TEST(domdoc) test_replaceChild(); test_removeNamedItem(); test_IXMLDOMDocument2(); + test_whitespace(); test_XPath(); test_XSLPattern(); test_cloneNode();

1 0