[PATCH v2 1/3] mshtml: Move assert.h include to mshtml_private.h.
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/dispex.c | 1 - dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlarea.c | 1 - dlls/mshtml/htmlattr.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmlcurstyle.c | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 1 - dlls/mshtml/htmlelemcol.c | 1 - dlls/mshtml/htmlevent.c | 1 - dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 1 - dlls/mshtml/htmlimg.c | 1 - dlls/mshtml/htmlinput.c | 1 - dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlnode.c | 1 - dlls/mshtml/htmlobject.c | 1 - dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 1 - dlls/mshtml/htmlstyle.c | 1 - dlls/mshtml/htmlstyleelem.c | 1 - dlls/mshtml/htmlstylesheet.c | 1 - dlls/mshtml/htmltable.c | 1 - dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/htmltextnode.c | 1 - dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 1 - dlls/mshtml/navigate.c | 1 - dlls/mshtml/nsembed.c | 1 - dlls/mshtml/nsevents.c | 1 - dlls/mshtml/nsio.c | 1 - dlls/mshtml/oleobj.c | 1 - dlls/mshtml/omnavigator.c | 1 - dlls/mshtml/pluginhost.c | 1 - dlls/mshtml/range.c | 1 - dlls/mshtml/script.c | 1 - dlls/mshtml/secmgr.c | 1 - dlls/mshtml/svg.c | 1 - dlls/mshtml/task.c | 1 - dlls/mshtml/xmlhttprequest.c | 1 - 41 files changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 39630590228..6d248691d6b 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #define NONAMELESSUNION diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a0e96af822e..da48601fe87 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index a5ebfe757ae..a0708c4b062 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 14b79812eb0..dc8c45e488a 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -18,7 +18,6 @@ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 9955a8e6498..32c49fe1214 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 85ac99aef92..2abe5df30ec 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 79241fc34cc..9faf987d7b9 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8187cbf867e..b9677ec867a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index f4722d96729..e72f21ffaa5 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b3b95083f80..17f5fb35b71 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5906202f1c7..5d0928e4a9c 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 972ddc80a50..7118ea86b57 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 2dfd53eb0b9..f89e8e5ae84 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 2ba5833f3c0..1a0a739d5d5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <limits.h> #define COBJMACROS diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 22342027cbc..ddf67ca0f73 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index a2692b1a230..b5ff02bcee2 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index b71b0e7db6f..67025489751 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 4d7997e31a6..9b7f95e3bb0 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 301d9fa5dc3..ad801f8433b 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c4bd3a84867..4ee81ba7e99 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 538e79f0b5e..d2a4a75fe90 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 243aea2e618..4519b06155e 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index ad74ad30966..178e9e52304 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index fb8c3830862..57f33732a01 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index c2e7f375ada..56a0572459a 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -18,7 +18,6 @@ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 0ca4cd6397e..4196d1f45ad 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7bc645e549f..e3486aa3314 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,6 +40,8 @@ #include "nsiface.h" +#include <assert.h> + #define NS_ERROR_GENERATE_FAILURE(module,code) \ ((nsresult) (((UINT32)(1u<<31)) | ((UINT32)(module+0x45)<<16) | ((UINT32)(code)))) #define NS_ERROR_GENERATE_SUCCESS(module,code) \ diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 247a3277927..abe403ea976 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 233f58c89fd..8cbe0ec9304 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS #define NONAMELESSUNION diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d4fe7e96fc2..ae94f224fac 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b060ae521c5..21908b09563 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ea8eae2007d..abf05aaa41b 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index fb3ff8a8b73..c7ce641a949 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 43067b813a1..a8f829b6a57 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index d880cc89a9d..ad67db5548c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 8c802ee9ede..89f68046a33 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 8f7f502e121..28e07a50c8e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 019327caa47..a72099f33b9 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index e1de57fc4b1..75036cb39d6 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #include <math.h> #define COBJMACROS diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 28cb88ab5f1..67b7633a5b4 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -18,7 +18,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #define COBJMACROS diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 814162acbbc..d7d8ce51593 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -17,7 +17,6 @@ */ #include <stdarg.h> -#include <assert.h> #define COBJMACROS -- 2.31.1
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- configure.ac | 1 + dlls/mshtml/main.c | 5 +-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml_private.tlb/Makefile.in | 3 ++ .../mshtml_private.tlb.spec | 1 + .../mshtml_private.tlb/mshtml_private_tlb.idl | 21 ++++++++++++ include/Makefile.in | 1 + include/wine/mshtml_private_iface.idl | 32 +++++++++++++++++++ 8 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 dlls/mshtml_private.tlb/Makefile.in create mode 100644 dlls/mshtml_private.tlb/mshtml_private.tlb.spec create mode 100644 dlls/mshtml_private.tlb/mshtml_private_tlb.idl create mode 100644 include/wine/mshtml_private_iface.idl diff --git a/configure.ac b/configure.ac index f0a42cf3b0a..81d08f1f427 100644 --- a/configure.ac +++ b/configure.ac @@ -3405,6 +3405,7 @@ WINE_CONFIG_MAKEFILE(dlls/msgsm32.acm) WINE_CONFIG_MAKEFILE(dlls/mshtml.tlb) WINE_CONFIG_MAKEFILE(dlls/mshtml) WINE_CONFIG_MAKEFILE(dlls/mshtml/tests) +WINE_CONFIG_MAKEFILE(dlls/mshtml_private.tlb) WINE_CONFIG_MAKEFILE(dlls/msi) WINE_CONFIG_MAKEFILE(dlls/msi/tests) WINE_CONFIG_MAKEFILE(dlls/msident) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 959d2d66214..859e03396ec 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -583,8 +583,8 @@ static HRESULT register_server(BOOL do_register) HMODULE hAdvpack; HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; - STRENTRYA pse[35]; - static CLSID const *clsids[35]; + STRENTRYA pse[36]; + static CLSID const *clsids[36]; unsigned int i = 0; TRACE("(%x)\n", do_register); @@ -624,6 +624,7 @@ static HRESULT register_server(BOOL do_register) INF_SET_CLSID(SysimageProtocol); INF_SET_CLSID(TridentAPI); INF_SET_ID(LIBID_MSHTML); + INF_SET_ID(LIBID_MSHTML_private); for(i=0; i < ARRAY_SIZE(pse); i++) { pse[i].pszValue = heap_alloc(39); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e3486aa3314..682685338d0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -40,6 +40,8 @@ #include "nsiface.h" +#include "wine/mshtml_private_iface.h" + #include <assert.h> #define NS_ERROR_GENERATE_FAILURE(module,code) \ diff --git a/dlls/mshtml_private.tlb/Makefile.in b/dlls/mshtml_private.tlb/Makefile.in new file mode 100644 index 00000000000..6e512ca6394 --- /dev/null +++ b/dlls/mshtml_private.tlb/Makefile.in @@ -0,0 +1,3 @@ +MODULE = mshtml_private.tlb + +IDL_SRCS = mshtml_private_tlb.idl diff --git a/dlls/mshtml_private.tlb/mshtml_private.tlb.spec b/dlls/mshtml_private.tlb/mshtml_private.tlb.spec new file mode 100644 index 00000000000..b427b2913c6 --- /dev/null +++ b/dlls/mshtml_private.tlb/mshtml_private.tlb.spec @@ -0,0 +1 @@ +# no exported entry points diff --git a/dlls/mshtml_private.tlb/mshtml_private_tlb.idl b/dlls/mshtml_private.tlb/mshtml_private_tlb.idl new file mode 100644 index 00000000000..11ee7509f74 --- /dev/null +++ b/dlls/mshtml_private.tlb/mshtml_private_tlb.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * 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 + */ + +#pragma makedep regtypelib + +#include "wine/mshtml_private_iface.idl" diff --git a/include/Makefile.in b/include/Makefile.in index 61a74a210c9..d1333a458db 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -773,6 +773,7 @@ SOURCES = \ wine/exception.h \ wine/fil_data.idl \ wine/itss.idl \ + wine/mshtml_private_iface.idl \ wine/orpc.idl \ wine/svcctl.idl \ wine/winedxgi.idl \ diff --git a/include/wine/mshtml_private_iface.idl b/include/wine/mshtml_private_iface.idl new file mode 100644 index 00000000000..dddcda7b1d4 --- /dev/null +++ b/include/wine/mshtml_private_iface.idl @@ -0,0 +1,32 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * 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 + */ + +#pragma makedep header + +import "ocidl.idl"; +import "dimm.idl"; +import "shtypes.idl"; +import "dispex.idl"; + +[ + version(1.0), + uuid(90de541e-380b-4530-94a9-97367fe49d8d) +] +library MSHTML_private +{ +} /* library MSHTML_private */ -- 2.31.1
Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/console.c | 294 ++++++++++++++++++++++++++ dlls/mshtml/dispex.c | 21 +- dlls/mshtml/htmlwindow.c | 36 +++- dlls/mshtml/mshtml_private.h | 9 + dlls/mshtml/tests/es5.js | 64 ++++++ include/wine/mshtml_private_iface.idl | 89 ++++++++ 7 files changed, 506 insertions(+), 8 deletions(-) create mode 100644 dlls/mshtml/console.c diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 469667081e3..e0b539c92d4 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin C_SRCS = \ conpoint.c \ + console.c \ dispex.c \ editor.c \ htmlanchor.c \ diff --git a/dlls/mshtml/console.c b/dlls/mshtml/console.c new file mode 100644 index 00000000000..58df32896cc --- /dev/null +++ b/dlls/mshtml/console.c @@ -0,0 +1,294 @@ +/* + * Copyright 2021 Paul Gofman for CodeWeavers + * + * 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 + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "mshtmdid.h" +#include "shlguid.h" +#include "shobjidl.h" +#include "exdispid.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +struct console { + DispatchEx dispex; + IWineMSHTMLConsole IWineMSHTMLConsole_iface; + LONG ref; +}; + +static inline struct console *impl_from_IWineMSHTMLConsole(IWineMSHTMLConsole *iface) +{ + return CONTAINING_RECORD(iface, struct console, IWineMSHTMLConsole_iface); +} + +static HRESULT WINAPI console_QueryInterface(IWineMSHTMLConsole *iface, REFIID riid, void **ppv) +{ + struct console *console = impl_from_IWineMSHTMLConsole(iface); + + TRACE("(%p)->(%s %p)\n", console, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &console->IWineMSHTMLConsole_iface; + }else if(IsEqualGUID(&IID_IWineMSHTMLConsole, riid)) { + *ppv = &console->IWineMSHTMLConsole_iface; + }else if(dispex_query_interface(&console->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("(%p)->(%s %p)\n", console, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI console_AddRef(IWineMSHTMLConsole *iface) +{ + struct console *console = impl_from_IWineMSHTMLConsole(iface); + LONG ref = InterlockedIncrement(&console->ref); + + TRACE("(%p) ref=%d\n", console, ref); + + return ref; +} + +static ULONG WINAPI console_Release(IWineMSHTMLConsole *iface) +{ + struct console *console = impl_from_IWineMSHTMLConsole(iface); + LONG ref = InterlockedDecrement(&console->ref); + + TRACE("(%p) ref=%d\n", console, ref); + + if(!ref) { + release_dispex(&console->dispex); + heap_free(console); + } + + return ref; +} + +static HRESULT WINAPI console_GetTypeInfoCount(IWineMSHTMLConsole *iface, UINT *pctinfo) +{ + struct console *console = impl_from_IWineMSHTMLConsole(iface); + FIXME("(%p)->(%p)\n", console, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI console_GetTypeInfo(IWineMSHTMLConsole *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct console *console = impl_from_IWineMSHTMLConsole(iface); + + return IDispatchEx_GetTypeInfo(&console->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI console_GetIDsOfNames(IWineMSHTMLConsole *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct console *console = impl_from_IWineMSHTMLConsole(iface); + + return IDispatchEx_GetIDsOfNames(&console->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI console_Invoke(IWineMSHTMLConsole *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct console *console = impl_from_IWineMSHTMLConsole(iface); + + return IDispatchEx_Invoke(&console->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI console_assert(IWineMSHTMLConsole *iface, VARIANT_BOOL *assertion, VARIANT *vararg_start) +{ + FIXME("iface %p, assertion %p, vararg_start %p stub.\n", iface, assertion, vararg_start); + + return S_OK; +} + +static HRESULT WINAPI console_clear(IWineMSHTMLConsole *iface) +{ + FIXME("iface %p stub.\n", iface); + + return S_OK; +} + +static HRESULT WINAPI console_count(IWineMSHTMLConsole *iface, VARIANT *label) +{ + FIXME("iface %p, label %p stub.\n", iface, label); + + return S_OK; +} + +static HRESULT WINAPI console_debug(IWineMSHTMLConsole *iface, VARIANT *vararg_start) +{ + FIXME("iface %p, vararg_start %p stub.\n", iface, vararg_start); + + return S_OK; +} + +static HRESULT WINAPI console_dir(IWineMSHTMLConsole *iface, VARIANT *object) +{ + FIXME("iface %p, object %p stub.\n", iface, object); + + return S_OK; +} + +static HRESULT WINAPI console_dirxml(IWineMSHTMLConsole *iface, VARIANT *object) +{ + FIXME("iface %p, object %p stub.\n", iface, object); + + return S_OK; +} + +static HRESULT WINAPI console_error(IWineMSHTMLConsole *iface, VARIANT *vararg_start) +{ + FIXME("iface %p, vararg_start %p stub.\n", iface, vararg_start); + + return S_OK; +} + +static HRESULT WINAPI console_group(IWineMSHTMLConsole *iface, VARIANT *label) +{ + FIXME("iface %p, label %p stub.\n", iface, label); + + return S_OK; +} + +static HRESULT WINAPI console_group_collapsed(IWineMSHTMLConsole *iface, VARIANT *label) +{ + FIXME("iface %p, label %p stub.\n", iface, label); + + return S_OK; +} + +static HRESULT WINAPI console_group_end(IWineMSHTMLConsole *iface) +{ + FIXME("iface %p, stub.\n", iface); + + return S_OK; +} + +static HRESULT WINAPI console_info(IWineMSHTMLConsole *iface, VARIANT *vararg_start) +{ + FIXME("iface %p, vararg_start %p stub.\n", iface, vararg_start); + + return S_OK; +} + +static HRESULT WINAPI console_log(IWineMSHTMLConsole *iface, VARIANT *vararg_start) +{ + FIXME("iface %p, vararg_start %p stub.\n", iface, vararg_start); + + return S_OK; +} + +static HRESULT WINAPI console_time(IWineMSHTMLConsole *iface, VARIANT *label) +{ + FIXME("iface %p, label %p stub.\n", iface, label); + + return S_OK; +} + +static HRESULT WINAPI console_time_end(IWineMSHTMLConsole *iface, VARIANT *label) +{ + FIXME("iface %p, label %p stub.\n", iface, label); + + return S_OK; +} + +static HRESULT WINAPI console_trace(IWineMSHTMLConsole *iface, VARIANT *vararg_start) +{ + FIXME("iface %p, vararg_start %p stub.\n", iface, vararg_start); + + return S_OK; +} + +static HRESULT WINAPI console_warn(IWineMSHTMLConsole *iface, VARIANT *vararg_start) +{ + FIXME("iface %p, vararg_start %p stub.\n", iface, vararg_start); + + return S_OK; +} + +static const IWineMSHTMLConsoleVtbl WineMSHTMLConsoleVtbl = { + console_QueryInterface, + console_AddRef, + console_Release, + console_GetTypeInfoCount, + console_GetTypeInfo, + console_GetIDsOfNames, + console_Invoke, + console_assert, + console_clear, + console_count, + console_debug, + console_dir, + console_dirxml, + console_error, + console_group, + console_group_collapsed, + console_group_end, + console_info, + console_log, + console_time, + console_time_end, + console_trace, + console_warn, +}; + +static const tid_t console_iface_tids[] = { + IWineMSHTMLConsole_tid, + 0 +}; +static dispex_static_data_t console_dispex = { + NULL, + IWineMSHTMLConsole_tid, + console_iface_tids +}; + +void create_console(IWineMSHTMLConsole **ret) +{ + struct console *obj; + + obj = heap_alloc_zero(sizeof(*obj)); + if(!obj) + { + ERR("No memory.\n"); + return; + } + + obj->IWineMSHTMLConsole_iface.lpVtbl = &WineMSHTMLConsoleVtbl; + obj->ref = 1; + init_dispatch(&obj->dispex, (IUnknown*)&obj->IWineMSHTMLConsole_iface, &console_dispex, COMPAT_MODE_NONE); + + *ret = &obj->IWineMSHTMLConsole_iface; +} diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 6d248691d6b..9c517fec2c2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -111,7 +111,7 @@ struct dispex_dynamic_data_t { #define FDEX_VERSION_MASK 0xf0000000 -static ITypeLib *typelib; +static ITypeLib *typelib, *typelib_private; static ITypeInfo *typeinfos[LAST_tid]; static struct list dispex_data_list = LIST_INIT(dispex_data_list); @@ -119,6 +119,8 @@ static REFIID tid_ids[] = { #define XIID(iface) &IID_ ## iface, #define XDIID(iface) &DIID_ ## iface, TID_LIST + NULL, +PRIVATE_TID_LIST #undef XIID #undef XDIID }; @@ -136,7 +138,17 @@ static HRESULT load_typelib(void) if(InterlockedCompareExchangePointer((void**)&typelib, tl, NULL)) ITypeLib_Release(tl); - return hres; + + hres = LoadRegTypeLib(&LIBID_MSHTML_private, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed for private typelib: %08x\n", hres); + return hres; + } + + if(InterlockedCompareExchangePointer((void**)&typelib_private, tl, NULL)) + ITypeLib_Release(tl); + + return S_OK; } static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) @@ -151,7 +163,7 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) if(!typeinfos[tid]) { ITypeInfo *ti; - hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); + hres = ITypeLib_GetTypeInfoOfGuid(tid > LAST_public_tid ? typelib_private : typelib, tid_ids[tid], &ti); if(FAILED(hres)) { ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_mshtml_guid(tid_ids[tid]), hres); return hres; @@ -197,6 +209,7 @@ void release_typelib(void) ITypeInfo_Release(typeinfos[i]); ITypeLib_Release(typelib); + ITypeLib_Release(typelib_private); DeleteCriticalSection(&cs_dispex_static_data); } @@ -210,6 +223,8 @@ HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) return hres; hres = ITypeLib_GetTypeInfoOfGuid(typelib, clsid, typeinfo); + if (FAILED(hres)) + hres = ITypeLib_GetTypeInfoOfGuid(typelib_private, clsid, typeinfo); if(FAILED(hres)) ERR("GetTypeInfoOfGuid failed: %08x\n", hres); return hres; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4196d1f45ad..3cec8d3a3c5 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -314,6 +314,9 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if (This->console) + IWineMSHTMLConsole_Release(This->console); + if(is_outer_window(This)) release_outer_window(This->outer_window); else @@ -3178,6 +3181,8 @@ HRESULT search_window_props(HTMLInnerWindow *This, BSTR bstrName, DWORD grfdex, /* DISPIDs not exposed by interfaces */ #define DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME 1300 +#define DISPID_IHTMLWINDOW_IE10_CONSOLE 1301 + static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { @@ -3195,11 +3200,18 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - if(dispex_compat_mode(&window->event_target.dispex) >= COMPAT_MODE_IE10 && - !wcscmp(bstrName, L"requestAnimationFrame")) { - TRACE("requestAnimationFrame\n"); - *pid = DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME; - return S_OK; + if(dispex_compat_mode(&window->event_target.dispex) >= COMPAT_MODE_IE10) + { + if (!wcscmp(bstrName, L"requestAnimationFrame")) { + TRACE("requestAnimationFrame\n"); + *pid = DISPID_IHTMLWINDOW_IE10_REQUESTANIMATIONFRAME; + return S_OK; + } + if (!wcscmp(bstrName, L"console")) { + TRACE("console\n"); + *pid = DISPID_IHTMLWINDOW_IE10_CONSOLE; + return S_OK; + } } if(This->outer_window) { @@ -3307,6 +3319,18 @@ static HRESULT WINAPI WindowDispEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID return hres; } + case DISPID_IHTMLWINDOW_IE10_CONSOLE: { + if(!(wFlags & DISPATCH_PROPERTYGET)) { + FIXME("unsupported wFlags %#x\n", wFlags); + return E_INVALIDARG; + } + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch *)window->base.console; + IWineMSHTMLConsole_AddRef(window->base.console); + return S_OK; + } + } return IDispatchEx_InvokeEx(&window->event_target.dispex.IDispatchEx_iface, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); @@ -3629,6 +3653,8 @@ static void *alloc_window(size_t size) window->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; window->ref = 1; + create_console(&window->console); + return window; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 682685338d0..13b49696fb4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -272,10 +272,16 @@ typedef struct EventTarget EventTarget; XIID(ISVGTSpanElement) \ XIID(ISVGTextContentElement) +#define PRIVATE_TID_LIST \ + XDIID(DispWineMSHTMLConsole) \ + XIID(IWineMSHTMLConsole) + typedef enum { #define XIID(iface) iface ## _tid, #define XDIID(iface) iface ## _tid, TID_LIST + LAST_public_tid, +PRIVATE_TID_LIST #undef XIID #undef XDIID LAST_tid @@ -486,6 +492,8 @@ struct HTMLWindow { IObjectIdentity IObjectIdentity_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; + IWineMSHTMLConsole *console; + LONG ref; HTMLInnerWindow *inner_window; @@ -1401,3 +1409,4 @@ void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN; IInternetSecurityManager *get_security_manager(void) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; +void create_console(IWineMSHTMLConsole **ret) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index a520253569c..e57aed5ca35 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1448,3 +1448,67 @@ sync_test("functions scope", function() { ok(val == 8, "val != 8"); ok(w == 9, "w != 9"); }); + +sync_test("console", function() { + var except + + window.console.log('1', '2'); + console.info('1', '2', '3'); + console.info(); + console.log(); + console.trace(); + console.warn(); + console.debug(); + console.error(); + + console.assert(false, '1'); + console.assert(true, '1'); + console.assert('1'); + + console.clear(); + console.count('1'); + console.count(1); + + + except = false; + try + { + console.countReset('1'); + } + catch(e) + { + except = true; + } + ok(except, "console.countReset: expected exception"); + console.dir(document); + console.dir(); + console.dirxml(document); + console.group('1'); + console.groupCollapsed('1'); + console.groupEnd(); + + except = false; + try + { + console.table(['1', '2']); + } + catch(e) + { + except = true; + } + ok(except, "console.table: expected exception"); + + console.time('1'); + console.timeEnd('1'); + + except = false; + try + { + console.timeLog('1'); + } + catch(e) + { + except = true; + } + ok(except, "console.timeLog: expected exception"); +}); diff --git a/include/wine/mshtml_private_iface.idl b/include/wine/mshtml_private_iface.idl index dddcda7b1d4..b6aabc3a3cc 100644 --- a/include/wine/mshtml_private_iface.idl +++ b/include/wine/mshtml_private_iface.idl @@ -29,4 +29,93 @@ import "dispex.idl"; ] library MSHTML_private { + +importlib("stdole2.tlb"); + +[ + odl, + oleautomation, + dual, + uuid(fd55b4b6-2813-4fb4-829d-380099474ab1) +] +interface IWineMSHTMLConsole : IDispatch +{ + [id(1)] + HRESULT assert([in] VARIANT_BOOL *assertion, + [in, optional] VARIANT *varargStart); + [id(2)] + HRESULT clear(); + [id(3)] + HRESULT count([in, optional] VARIANT *label); + [id(4)] + HRESULT debug([in, optional] VARIANT *varargStart); + [id(5)] + HRESULT dir([in, optional] VARIANT *object); + [id(6)] + HRESULT dirxml([in, optional] VARIANT *object); + [id(7)] + HRESULT error([in, optional] VARIANT *varargStart); + [id(8)] + HRESULT group([in, optional] VARIANT *label); + [id(9)] + HRESULT groupCollapsed([in, optional] VARIANT *label); + [id(10)] + HRESULT groupEnd(); + [id(11)] + HRESULT info([in, optional] VARIANT *varargStart); + [id(12)] + HRESULT log([in, optional] VARIANT *varargStart); + [id(13)] + HRESULT time([in, optional] VARIANT *label); + [id(14)] + HRESULT timeEnd([in, optional] VARIANT *label); + [id(15)] + HRESULT trace([in, optional] VARIANT *varargStart); + [id(16)] + HRESULT warn([in, optional] VARIANT *varargStart); +} + +[ + hidden, + uuid(fd55b4b6-2813-4fb4-829d-380099474ab1) +] +dispinterface DispWineMSHTMLConsole +{ +properties: +methods: + [id(1)] + void assert([in] VARIANT_BOOL *assertion, + [in, optional] VARIANT *varargStart); + [id(2)] + void clear(); + [id(3)] + void count([in, optional] VARIANT *label); + [id(4)] + void debug([in, optional] VARIANT *varargStart); + [id(5)] + void dir([in, optional] VARIANT *object); + [id(6)] + void dirxml([in, optional] VARIANT *object); + [id(7)] + void error([in, optional] VARIANT *varargStart); + [id(8)] + void group([in, optional] VARIANT *label); + [id(9)] + void groupCollapsed([in, optional] VARIANT *label); + [id(10)] + void groupEnd(); + [id(11)] + void info([in, optional] VARIANT *varargStart); + [id(12)] + void log([in, optional] VARIANT *varargStart); + [id(13)] + void time([in, optional] VARIANT *label); + [id(14)] + void timeEnd([in, optional] VARIANT *label); + [id(15)] + void trace([in, optional] VARIANT *varargStart); + [id(16)] + void warn([in, optional] VARIANT *varargStart); +} + } /* library MSHTML_private */ -- 2.31.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93741 Your paranoid android. === w8adm (32 bit report) === mshtml: htmldoc.c:3084: Test failed: Incorrect error code: -2146697211 htmldoc.c:3089: Test failed: Page address: L"http://test.winehq.org/tests/winehq_snapshot/" htmldoc.c:5861: Test failed: expected OnChanged_1012 htmldoc.c:5862: Test failed: expected Exec_HTTPEQUIV htmldoc.c:5864: Test failed: expected Exec_SETTITLE htmldoc.c:5905: Test failed: expected FireNavigateComplete2 === w1064_tsign (64 bit report) === mshtml: htmldoc.c:2541: Test failed: unexpected call UpdateUI htmldoc.c:2853: Test failed: unexpected call Exec_UPDATECOMMANDS === w7u_2qxl (32 bit report) === mshtml: script.c:624: Test failed: L"/index.html?es5.js:date_now: unexpected Date.now() result 1625577420991 expected 1625577421070"
participants (2)
-
Marvin -
Paul Gofman