wine-commits July 2006

wine-commits@winehq.org

5 participants
857 discussions

Paul Millar : libwine: Add a configure check for setrlimit.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: df10b7d5800b5a4418a72d76fc99b6b533f36314 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df10b7d5800b5a4418a72d7… Author: Paul Millar <paul(a)astro.gla.ac.uk> Date: Sun Jul 16 15:06:28 2006 +0100 libwine: Add a configure check for setrlimit. --- configure | 2 ++ configure.ac | 1 + include/config.h.in | 3 +++ libs/wine/loader.c | 6 ++++++ 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f1e9b25..a03a85c 100755 --- a/configure +++ b/configure @@ -19379,6 +19379,7 @@ fi + for ac_func in \ _lwp_create \ _lwp_self \ @@ -19428,6 +19429,7 @@ for ac_func in \ sched_yield \ select \ sendmsg \ + setrlimit \ settimeofday \ sigaltstack \ sigprocmask \ diff --git a/configure.ac b/configure.ac index 0904a60..7894a57 100644 --- a/configure.ac +++ b/configure.ac @@ -1309,6 +1309,7 @@ AC_CHECK_FUNCS(\ sched_yield \ select \ sendmsg \ + setrlimit \ settimeofday \ sigaltstack \ sigprocmask \ diff --git a/include/config.h.in b/include/config.h.in index e1c5692..48c047d 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -587,6 +587,9 @@ #undef HAVE_SELECT /* Define to 1 if you have the `sendmsg' function. */ #undef HAVE_SENDMSG +/* Define to 1 if you have the `setrlimit' function. */ +#undef HAVE_SETRLIMIT + /* Define to 1 if you have the `settimeofday' function. */ #undef HAVE_SETTIMEOFDAY diff --git a/libs/wine/loader.c b/libs/wine/loader.c index adbadd5..4406a32 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -608,6 +608,7 @@ int wine_dll_get_owner( const char *name */ static void set_max_limit( int limit ) { +#ifdef HAVE_SETRLIMIT struct rlimit rlimit; if (!getrlimit( limit, &rlimit )) @@ -615,6 +616,7 @@ static void set_max_limit( int limit ) rlimit.rlim_cur = rlimit.rlim_max; setrlimit( limit, &rlimit ); } +#endif } @@ -631,8 +633,12 @@ void wine_init( int argc, char *argv[], void (*init_func)(void); /* force a few limits that are set too low on some platforms */ +#ifdef RLIMIT_NOFILE set_max_limit( RLIMIT_NOFILE ); +#endif +#ifdef RLIMIT_AS set_max_limit( RLIMIT_AS ); +#endif wine_init_argv0_path( argv[0] ); build_dll_path();

1 0

Alexandre Julliard : winegcc: Make sure the Wine library paths take precedence in Wine mode.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 5557c71f7f60adc0b21c905c8cb62a5a9da5ca63 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5557c71f7f60adc0b21c905… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 17 14:07:11 2006 +0200 winegcc: Make sure the Wine library paths take precedence in Wine mode. --- tools/winegcc/winegcc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e31d93d..ff38076 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -471,16 +471,18 @@ static void build(struct options* opts) else output_name = output_file; /* prepare the linking path */ - lib_dirs = strarray_dup(opts->lib_dirs); if (!opts->wine_objdir) { + lib_dirs = strarray_dup(opts->lib_dirs); for ( j = 0; j < sizeof(stdlibpath)/sizeof(stdlibpath[0]); j++ ) strarray_add(lib_dirs, stdlibpath[j]); } else { + lib_dirs = strarray_alloc(); strarray_add(lib_dirs, strmake("%s/dlls", opts->wine_objdir)); strarray_add(lib_dirs, strmake("%s/libs/wine", opts->wine_objdir)); + strarray_addall(lib_dirs, opts->lib_dirs); } /* mark the files with their appropriate type */

1 0

Hwang YunSong(=?UTF-8?Q?=ED=99=A9=EC=9C=A4=EC=84=B1?=) : clock: Updated Korean resource.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: ee1a5bd6a54d3834c4207a8f59ce2d15be232306 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee1a5bd6a54d3834c4207a8… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Jul 17 08:52:48 2006 +0900 clock: Updated Korean resource. --- programs/clock/Ko.rc | 48 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 36 insertions(+), 12 deletions(-) diff --git a/programs/clock/Ko.rc b/programs/clock/Ko.rc index 68560e3..cb24ebf 100644 --- a/programs/clock/Ko.rc +++ b/programs/clock/Ko.rc @@ -24,23 +24,23 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT MAIN_MENU MENU { - POPUP "�� &P" { - MENUITEM "�Ƴ��α� &L", IDM_ANALOG - MENUITEM "�� &T", IDM_DIGITAL + POPUP "�� (&P)" { + MENUITEM "�Ƴ��α�(&L)", IDM_ANALOG + MENUITEM "��(&T)", IDM_DIGITAL MENUITEM SEPARATOR - MENUITEM "�۲� &F...", IDM_FONT + MENUITEM "�۲�(&F)...", IDM_FONT MENUITEM SEPARATOR - MENUITEM "�� &W", IDM_NOTITLE + MENUITEM "�� ǥ�� (&W)", IDM_NOTITLE MENUITEM SEPARATOR - MENUITEM "�� &S", IDM_SECONDS - MENUITEM "��¥ &D", IDM_DATE + MENUITEM "��(&S)", IDM_SECONDS + MENUITEM "��¥(&D)", IDM_DATE MENUITEM SEPARATOR - MENUITEM "�׻� �� &A", IDM_ONTOP + MENUITEM "�׻� �տ� (&A)", IDM_ONTOP } - POPUP "�� &o" { - MENUITEM "�� &L...", IDM_LICENSE - MENUITEM "�� &N...", IDM_NOWARRANTY - MENUITEM "�ð迡 ��Ͽ� &A...", IDM_ABOUT + POPUP "��(&O)" { + MENUITEM "��̼��(&L)...", IDM_LICENSE + MENUITEM "�� (&N)...", IDM_NOWARRANTY + MENUITEM "�ð� ��(&A)...", IDM_ABOUT } } @@ -48,3 +48,27 @@ STRINGTABLE DISCARDABLE { IDS_CLOCK, "�ð�" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "��̼��" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "�� " +IDS_WARRANTY, +"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." +}

1 0

Paul Vriens : comctl32: Use struct member after check for NULL (Coverity).
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 412aa2a10df2a6e4922dab070de4a1e2d8607bf4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=412aa2a10df2a6e4922dab0… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sat Jul 15 20:27:24 2006 +0200 comctl32: Use struct member after check for NULL (Coverity). --- dlls/comctl32/listview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index fb4ecf6..4d3819d 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5618,10 +5618,12 @@ static BOOL LISTVIEW_GetSubItemRect(LIST { POINT Position; LVITEMW lvItem; - INT nColumn = lprc->top; + INT nColumn; if (!lprc) return FALSE; + nColumn = lprc->top; + TRACE("(nItem=%d, nSubItem=%ld)\n", nItem, lprc->top); /* On WinNT, a subitem of '0' calls LISTVIEW_GetItemRect */ if (lprc->top == 0)

1 0

Mike McCormack : shdocvw: Write the "Microsoft Browser Architecture" CLSID.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: c42415a5470c3d6a45dadcd69aeaaa5a51870a12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c42415a5470c3d6a45dadcd… Author: Mike McCormack <mike(a)codeweavers.com> Date: Sat Jul 15 13:55:27 2006 +0900 shdocvw: Write the "Microsoft Browser Architecture" CLSID. --- dlls/shdocvw/regsvr.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/regsvr.c b/dlls/shdocvw/regsvr.c index 294c8ad..a3d54e6 100644 --- a/dlls/shdocvw/regsvr.c +++ b/dlls/shdocvw/regsvr.c @@ -502,6 +502,10 @@ static LONG recursive_delete_keyW(HKEY b return res; } + +static const GUID CLSID_MicrosoftBrowserArchitecture = +{0xa5e46e3a, 0x8849, 0x11d1, {0x9d, 0x8c, 0x00, 0xc0, 0x4f, 0xc9, 0x9d, 0x61}}; + /*********************************************************************** * coclass list */ @@ -578,6 +582,15 @@ static struct regsvr_coclass const cocla "SearchAssistantOC.SearchAssistantOC.1", "SearchAssistantOC.SearchAssistantOC" }, + { + &CLSID_MicrosoftBrowserArchitecture, + "Microsoft Browser Architecture", + NULL, + "shdocvw.dll", + "Apartment", + NULL, + NULL + }, { NULL } /* list terminator */ };

1 0

Jacek Caban : urlmon: Register zone and security manager.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: aaef326017ed106c2e57f1704dc481e65fd292c2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aaef326017ed106c2e57f17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 22:29:48 2006 +0200 urlmon: Register zone and security manager. --- dlls/urlmon/regsvr.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 2b8cfd3..808d3d7 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -557,6 +557,18 @@ static struct regsvr_coclass const cocla "urlmon.dll", "Apartment" }, + { &CLSID_InternetSecurityManager, + "Security Manager", + NULL, + "urlmon.dll", + "Both" + }, + { &CLSID_InternetZoneManager, + "URL Zone Manager", + NULL, + "urlmon.dll", + "Both" + }, { NULL } /* list terminator */ };

1 0

Jacek Caban : urlmon: Added UrlMkGetSessionOption implementation.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: ec26cd2704f31704dc747064718249f0bbc5cdfd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec26cd2704f31704dc74706… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 21:40:33 2006 +0200 urlmon: Added UrlMkGetSessionOption implementation. --- dlls/urlmon/session.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/tests/misc.c | 41 ++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.c | 11 --------- 3 files changed, 96 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index af07afc..dd0cd27 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -323,3 +323,58 @@ HRESULT WINAPI CoInternetGetSession(DWOR *ppIInternetSession = &InternetSession; return S_OK; } + +/************************************************************************** + * UrlMkGetSessionOption (URLMON.@) + */ +static BOOL get_url_encoding(HKEY root, DWORD *encoding) +{ + DWORD size = sizeof(DWORD), res, type; + HKEY hkey; + + static const WCHAR wszKeyName[] = + {'S','O','F','T','W','A','R','E', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0}; + static const WCHAR wszUrlEncoding[] = {'U','r','l','E','n','c','o','d','i','n','g',0}; + + res = RegOpenKeyW(root, wszKeyName, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + res = RegQueryValueExW(hkey, wszUrlEncoding, NULL, &type, (LPBYTE)encoding, &size); + RegCloseKey(hkey); + + return res == ERROR_SUCCESS; +} + +HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, + DWORD* pdwBufferLength, DWORD dwReserved) +{ + TRACE("(%lx, %p, %ld, %p)\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength); + + if(dwReserved) + WARN("dwReserved = %ld\n", dwReserved); + + switch(dwOption) { + case URLMON_OPTION_URL_ENCODING: { + DWORD encoding = 0; + + if(!pBuffer || dwBufferLength < sizeof(DWORD) || !pdwBufferLength) + return E_INVALIDARG; + + if(!get_url_encoding(HKEY_CURRENT_USER, &encoding)) + get_url_encoding(HKEY_LOCAL_MACHINE, &encoding); + + *pdwBufferLength = sizeof(DWORD); + *(DWORD*)pBuffer = encoding ? URL_ENCODING_DISABLE_UTF8 : URL_ENCODING_ENABLE_UTF8; + return S_OK; + } + default: + FIXME("unsupported option %lx\n", dwOption); + } + + return E_INVALIDARG; +} diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 6e034c0..14b3fa4 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -953,6 +953,46 @@ static void test_ReleaseBindInfo(void) ok(bi.pUnk == &unk, "bi.pUnk=%p, expected %p\n", bi.pUnk, &unk); } +static void test_UrlMkGetSessionOption(void) +{ + DWORD encoding, size; + HRESULT hres; + + size = encoding = 0xdeadbeef; + hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, + sizeof(encoding), &size, 0); + ok(hres == S_OK, "UrlMkGetSessionOption failed: %08lx\n", hres); + ok(encoding != 0xdeadbeef, "encoding not changed\n"); + ok(size == sizeof(encoding), "size=%ld\n", size); + + size = encoding = 0xdeadbeef; + hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, + sizeof(encoding)+1, &size, 0); + ok(hres == S_OK, "UrlMkGetSessionOption failed: %08lx\n", hres); + ok(encoding != 0xdeadbeef, "encoding not changed\n"); + ok(size == sizeof(encoding), "size=%ld\n", size); + + size = encoding = 0xdeadbeef; + hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, + sizeof(encoding)-1, &size, 0); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08lx\n", hres); + ok(encoding == 0xdeadbeef, "encoding = %08lx, exepcted 0xdeadbeef\n", encoding); + ok(size == 0xdeadbeef, "size=%ld\n", size); + + size = encoding = 0xdeadbeef; + hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, NULL, + sizeof(encoding)-1, &size, 0); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08lx\n", hres); + ok(encoding == 0xdeadbeef, "encoding = %08lx, exepcted 0xdeadbeef\n", encoding); + ok(size == 0xdeadbeef, "size=%ld\n", size); + + encoding = 0xdeadbeef; + hres = UrlMkGetSessionOption(URLMON_OPTION_URL_ENCODING, &encoding, + sizeof(encoding)-1, NULL, 0); + ok(hres == E_INVALIDARG, "UrlMkGetSessionOption failed: %08lx\n", hres); + ok(encoding == 0xdeadbeef, "encoding = %08lx, exepcted 0xdeadbeef\n", encoding); +} + START_TEST(misc) { OleInitialize(NULL); @@ -967,6 +1007,7 @@ START_TEST(misc) test_ZoneManager(); test_NameSpace(); test_ReleaseBindInfo(); + test_UrlMkGetSessionOption(); OleUninitialize(); } diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index f35624a..f4c51d8 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -283,17 +283,6 @@ HRESULT WINAPI UrlMkSetSessionOption(DWO return S_OK; } -/************************************************************************** - * UrlMkGetSessionOption (URLMON.@) - */ -HRESULT WINAPI UrlMkGetSessionOption(DWORD dwOption, LPVOID pBuffer, DWORD dwBufferLength, - DWORD* pdwBufferLength, DWORD dwReserved) -{ - FIXME("(%#lx, %p, %#lx, %p): stub\n", dwOption, pBuffer, dwBufferLength, pdwBufferLength); - - return S_OK; -} - static const CHAR Agent[] = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"; /**************************************************************************

1 0

Jacek Caban : urlmon: Use URL_FILE_USE_PATHURL flag to combine urls.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 919871523adaa1729fb506b76d488f6376e51428 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=919871523adaa1729fb506b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 21:28:51 2006 +0200 urlmon: Use URL_FILE_USE_PATHURL flag to combine urls. --- dlls/urlmon/umon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index b1ca78e..c81b3a3 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -1074,8 +1074,8 @@ static HRESULT URLMonikerImpl_Construct( This->URLName = HeapAlloc(GetProcessHeap(), 0, sizeStr*sizeof(WCHAR)); if(lpszLeftURLName) { - hres = CoInternetCombineUrl(lpszLeftURLName, lpszURLName, 0, This->URLName, sizeStr, - &sizeStr, 0); + hres = CoInternetCombineUrl(lpszLeftURLName, lpszURLName, URL_FILE_USE_PATHURL, + This->URLName, sizeStr, &sizeStr, 0); if(FAILED(hres)) { HeapFree(GetProcessHeap(), 0, This->URLName); return hres;

1 0

Jacek Caban : urlmon.idl: Added some missing declarations.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 29763fd6056d50ad18c8c86d6397c184cee74078 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=29763fd6056d50ad18c8c86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 21:31:03 2006 +0200 urlmon.idl: Added some missing declarations. --- include/urlmon.idl | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index d96a6dc..dce872c 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -116,6 +116,13 @@ interface IBindStatusCallback : IUnknown BINDF_ENFORCERESTRICTED = 0x00800000 } BINDF; + typedef enum + { + URL_ENCODING_NONE = 0x00000000, + URL_ENCODING_ENABLE_UTF8 = 0x10000000, + URL_ENCODING_DISABLE_UTF8 = 0x20000000 + } URL_ENCODING; + typedef struct _tagBINDINFO { ULONG cbSize; @@ -1201,6 +1208,9 @@ cpp_quote("DEFINE_GUID(CLSID_HttpProtoco cpp_quote("DEFINE_GUID(CLSID_HttpSProtocol, 0x79EAC9E5, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);") cpp_quote("DEFINE_GUID(CLSID_MkProtocol, 0x79EAC9E6, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);") +cpp_quote("#define URLMON_OPTION_USERAGENT 0x10000001") +cpp_quote("#define URLMON_OPTION_USERAGENT_REFRESH 0x10000002") +cpp_quote("#define URLMON_OPTION_URL_ENCODING 0x10000004") cpp_quote("#define MK_S_ASYNCHRONOUS 0x000401E8") cpp_quote("#ifndef S_ASYNCHRONOUS")

1 0

Jacek Caban : mshtml: Added get_all implementation.
by Alexandre Julliard 17 Jul '06

17 Jul '06

Module: wine Branch: refs/heads/master Commit: 17e193e1883bf55334aff6ff6fc72cbedcd040a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17e193e1883bf55334aff6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 21:29:44 2006 +0200 mshtml: Added get_all implementation. --- dlls/mshtml/htmldoc.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 18f5cdd..2bf8522 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -209,8 +209,26 @@ static HRESULT WINAPI HTMLDocument_get_S static HRESULT WINAPI HTMLDocument_get_all(IHTMLDocument2 *iface, IHTMLElementCollection **p) { - FIXME("(%p)->(%p)\n", iface, p); - return E_NOTIMPL; + HTMLDocument *This = HTMLDOC_THIS(iface); + IHTMLElement *doc; + IDispatch *disp; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + hres = IHTMLDocument3_get_documentElement(HTMLDOC3(This), &doc); + if(FAILED(hres)) + return hres; + + hres = IHTMLElement_get_all(doc, &disp); + IHTMLElement_Release(doc); + if(FAILED(hres)) + return hres; + + hres = IDispatch_QueryInterface(disp, &IID_IHTMLElementCollection, (void**)p); + IDispatch_Release(disp); + + return hres; } static HRESULT WINAPI HTMLDocument_get_body(IHTMLDocument2 *iface, IHTMLElement **p)

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2006