September 2009 - Wine-commits

Ge van Geldorp : shdocvw/tests: Fix test on Win7.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 5789e6634e86e5e7e4069c82f6e7f3f2003c46b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5789e6634e86e5e7e4069c82f… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Fri Sep 11 12:23:01 2009 +0200 shdocvw/tests: Fix test on Win7. --- dlls/shdocvw/tests/webbrowser.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index b3e6e66..745ac15 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -285,6 +285,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID }else if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { switch(nCmdID) { case 105: /* TODO */ + case 140: /* TODO (Win7) */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Ge van Geldorp : shlwapi/tests: Fix tests on Win7.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 87cf6b36e5f73077990815ba144c4f12af84f778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cf6b36e5f73077990815ba1… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Fri Sep 11 12:22:15 2009 +0200 shlwapi/tests: Fix tests on Win7. --- dlls/shlwapi/tests/ordinal.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 3a50219..c22313a 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -133,6 +133,12 @@ static void test_GetAcceptLanguagesA(void) ok(buffersize2 == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), buffersize2); break; + case __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER): /* Win7 */ + ok(buffersize == 0, + "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); + break; default: ok( 0, "retval %08x, size %08x, buffer (%s), last error %u\n", retval, buffersize, buffer, GetLastError()); @@ -163,6 +169,12 @@ static void test_GetAcceptLanguagesA(void) ok(buffersize2 == strlen(buffer), "buffer content (length) wrong: got %08x, expected %08x\n", lstrlenA(buffer), buffersize2); break; + case __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER): /* Win 7 */ + ok(buffersize == 0, + "buffersize wrong: got %08x, expected 0 (2nd parameter;Win2k)\n", buffersize); + ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), + "last error wrong: got %u; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); + break; default: ok( 0, "retval %08x, size %08x, buffer (%s), last error %u\n", retval, buffersize, buffer, GetLastError());

1 0

Aric Stewart : msctf/tests: Add wine_todo processing to sink_check_ok.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: ecd17659df771f389cd77f07768f4e479dcb1ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd17659df771f389cd77f077… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 10 19:28:26 2009 -0500 msctf/tests: Add wine_todo processing to sink_check_ok. --- dlls/msctf/tests/inputprocessor.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 6267f4a..ffbdbad 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -121,6 +121,7 @@ static inline void _sink_fire_ok(INT *sink, const CHAR* name) static inline void _sink_check_ok(INT *sink, const CHAR* name) { int action = *sink & SINK_ACTION_MASK; + int todo = *sink & SINK_OPTION_TODO; switch (action) { @@ -132,7 +133,10 @@ static inline void _sink_check_ok(INT *sink, const CHAR* name) case SINK_IGNORE: return; default: - winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); + if (todo) + todo_wine winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); + else + winetest_ok(0, "%s not fired as expected, in state %x\n",name,*sink); } *sink = SINK_UNEXPECTED; }

1 0

Alexandre Julliard : ole32: Don' t register interfaces that belong to actxprxy.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: f5ed7868ee769e7f0aba0125889f2419beb87158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ed7868ee769e7f0aba01258… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:44:15 2009 +0200 ole32: Don't register interfaces that belong to actxprxy. --- dlls/ole32/regsvr.c | 64 +++++++++++++++++++++----------------------------- 1 files changed, 27 insertions(+), 37 deletions(-) diff --git a/dlls/ole32/regsvr.c b/dlls/ole32/regsvr.c index 17e78ef..b124a16 100644 --- a/dlls/ole32/regsvr.c +++ b/dlls/ole32/regsvr.c @@ -408,9 +408,6 @@ static GUID const CLSID_StdOleLink = { static GUID const CLSID_PackagerMoniker = { 0x00000308, 0x0000, 0x0000, {0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46} }; -static GUID const CLSID_PSFactoryBuffer_actxprxy = { - 0xB8DA6310, 0xE19B, 0x11D0, {0x93,0x3C,0x00,0xA0,0xC9,0x0D,0xCA,0xA9} }; - extern GUID const CLSID_Picture_Metafile; extern GUID const CLSID_Picture_Dib; @@ -510,42 +507,35 @@ static struct regsvr_coclass const coclass_list[] = { * interface list */ -#define INTERFACE_ENTRY(interface, base, clsid32) { &IID_##interface, #interface, base, sizeof(interface##Vtbl)/sizeof(void*), NULL, clsid32 } -#define BAS_INTERFACE_ENTRY(interface, base) INTERFACE_ENTRY(interface, &IID_##base, NULL) -#define ACTX_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, &CLSID_PSFactoryBuffer_actxprxy) -#define LCL_INTERFACE_ENTRY(interface) INTERFACE_ENTRY(interface, NULL, NULL) +#define INTERFACE_ENTRY(interface, base) { &IID_##interface, #interface, base, sizeof(interface##Vtbl)/sizeof(void*), NULL, NULL } static const struct regsvr_interface interface_list[] = { - LCL_INTERFACE_ENTRY(IUnknown), - LCL_INTERFACE_ENTRY(IMalloc), - LCL_INTERFACE_ENTRY(IMarshal), - BAS_INTERFACE_ENTRY(IMoniker, IPersistStream), - LCL_INTERFACE_ENTRY(IMessageFilter), - LCL_INTERFACE_ENTRY(IStdMarshalInfo), - LCL_INTERFACE_ENTRY(IExternalConnection), - LCL_INTERFACE_ENTRY(IMallocSpy), - LCL_INTERFACE_ENTRY(IMultiQI), - BAS_INTERFACE_ENTRY(IPersistStream, IPersist), - BAS_INTERFACE_ENTRY(IPersistStorage, IPersist), - BAS_INTERFACE_ENTRY(IPersistFile, IPersist), - LCL_INTERFACE_ENTRY(IDataAdviseHolder), - LCL_INTERFACE_ENTRY(IOleAdviseHolder), - BAS_INTERFACE_ENTRY(IOleInPlaceObject, IOleWindow), - BAS_INTERFACE_ENTRY(IOleInPlaceUIWindow, IOleWindow), - BAS_INTERFACE_ENTRY(IOleInPlaceActiveObject, IOleWindow), - BAS_INTERFACE_ENTRY(IOleInPlaceSite, IOleWindow), - BAS_INTERFACE_ENTRY(IOleContainer, IParseDisplayName), - BAS_INTERFACE_ENTRY(IOleItemContainer, IOleContainer), - LCL_INTERFACE_ENTRY(IDropSource), - BAS_INTERFACE_ENTRY(IAdviseSink2, IAdviseSink), - BAS_INTERFACE_ENTRY(IViewObject2, IViewObject), - BAS_INTERFACE_ENTRY(IOleCache2, IOleCache), - LCL_INTERFACE_ENTRY(IClientSecurity), - LCL_INTERFACE_ENTRY(IServerSecurity), - ACTX_INTERFACE_ENTRY(IEnumGUID), - ACTX_INTERFACE_ENTRY(IEnumCATEGORYINFO), - ACTX_INTERFACE_ENTRY(ICatRegister), - ACTX_INTERFACE_ENTRY(ICatInformation), + INTERFACE_ENTRY( IUnknown, NULL ), + INTERFACE_ENTRY( IMalloc, NULL ), + INTERFACE_ENTRY( IMarshal, NULL ), + INTERFACE_ENTRY( IMoniker, &IID_IPersistStream ), + INTERFACE_ENTRY( IMessageFilter, NULL ), + INTERFACE_ENTRY( IStdMarshalInfo, NULL ), + INTERFACE_ENTRY( IExternalConnection, NULL ), + INTERFACE_ENTRY( IMallocSpy, NULL ), + INTERFACE_ENTRY( IMultiQI, NULL ), + INTERFACE_ENTRY( IPersistStream, &IID_IPersist ), + INTERFACE_ENTRY( IPersistStorage, &IID_IPersist ), + INTERFACE_ENTRY( IPersistFile, &IID_IPersist ), + INTERFACE_ENTRY( IDataAdviseHolder, NULL ), + INTERFACE_ENTRY( IOleAdviseHolder, NULL ), + INTERFACE_ENTRY( IOleInPlaceObject, &IID_IOleWindow ), + INTERFACE_ENTRY( IOleInPlaceUIWindow, &IID_IOleWindow ), + INTERFACE_ENTRY( IOleInPlaceActiveObject, &IID_IOleWindow ), + INTERFACE_ENTRY( IOleInPlaceSite, &IID_IOleWindow ), + INTERFACE_ENTRY( IOleContainer, &IID_IParseDisplayName ), + INTERFACE_ENTRY( IOleItemContainer, &IID_IOleContainer ), + INTERFACE_ENTRY( IDropSource, NULL ), + INTERFACE_ENTRY( IAdviseSink2, &IID_IAdviseSink ), + INTERFACE_ENTRY( IViewObject2, &IID_IViewObject ), + INTERFACE_ENTRY( IOleCache2, &IID_IOleCache ), + INTERFACE_ENTRY( IClientSecurity, NULL ), + INTERFACE_ENTRY( IServerSecurity, NULL ), { NULL } /* list terminator */ };

1 0

Alexandre Julliard : actxprxy: Add proxies for urlhist.idl.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: b76b5b74100d9a0ad40d5a74ed88e3f779354411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76b5b74100d9a0ad40d5a74e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:41:13 2009 +0200 actxprxy: Add proxies for urlhist.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 3 ++- dlls/actxprxy/actxprxy_urlhist.idl | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index be1db6c..7473244 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,8 @@ dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c dlls/actxprxy/actxprxy_shobjidl.h dlls/actxprxy/actxprxy_shobjidl_p.c +dlls/actxprxy/actxprxy_urlhist.h +dlls/actxprxy/actxprxy_urlhist_p.c dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 4e451ef..f9e14ff 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -20,7 +20,8 @@ IDL_P_SRCS = \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ actxprxy_servprov.idl \ - actxprxy_shobjidl.idl + actxprxy_shobjidl.idl \ + actxprxy_urlhist.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_urlhist.idl b/dlls/actxprxy/actxprxy_urlhist.idl new file mode 100644 index 0000000..18861b3 --- /dev/null +++ b/dlls/actxprxy/actxprxy_urlhist.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for urlhist.idl */ + +#include "urlhist.idl"

1 0

Alexandre Julliard : actxprxy: Add proxies for shobjidl.idl.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 9d817f14714b3fef4f6bf72b49ec6e314bb208f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d817f14714b3fef4f6bf72b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:39:37 2009 +0200 actxprxy: Add proxies for shobjidl.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 3 ++- dlls/actxprxy/actxprxy_shobjidl.idl | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 9d52882..be1db6c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,8 @@ dlls/actxprxy/actxprxy_ocmm.h dlls/actxprxy/actxprxy_ocmm_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c +dlls/actxprxy/actxprxy_shobjidl.h +dlls/actxprxy/actxprxy_shobjidl_p.c dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c dlls/atl/atliface.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 81d115a..4e451ef 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -19,7 +19,8 @@ IDL_P_SRCS = \ actxprxy_htiframe.idl \ actxprxy_objsafe.idl \ actxprxy_ocmm.idl \ - actxprxy_servprov.idl + actxprxy_servprov.idl \ + actxprxy_shobjidl.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_shobjidl.idl b/dlls/actxprxy/actxprxy_shobjidl.idl new file mode 100644 index 0000000..71912fd --- /dev/null +++ b/dlls/actxprxy/actxprxy_shobjidl.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for shobjidl.idl */ + +#include "shobjidl.idl"

1 0

Alexandre Julliard : actxprxy: Add proxies for ocmm.idl.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: a78df37d899028ca3c884d3b3a96a2d7c6474eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a78df37d899028ca3c884d3b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:36:53 2009 +0200 actxprxy: Add proxies for ocmm.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 1 + dlls/actxprxy/actxprxy_ocmm.idl | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 540cfb1..9d52882 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,8 @@ dlls/actxprxy/actxprxy_htiframe.h dlls/actxprxy/actxprxy_htiframe_p.c dlls/actxprxy/actxprxy_objsafe.h dlls/actxprxy/actxprxy_objsafe_p.c +dlls/actxprxy/actxprxy_ocmm.h +dlls/actxprxy/actxprxy_ocmm_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c dlls/advapi32/svcctl.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 393fc07..81d115a 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -18,6 +18,7 @@ IDL_P_SRCS = \ actxprxy_hlink.idl \ actxprxy_htiframe.idl \ actxprxy_objsafe.idl \ + actxprxy_ocmm.idl \ actxprxy_servprov.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_ocmm.idl b/dlls/actxprxy/actxprxy_ocmm.idl new file mode 100644 index 0000000..2df49ce --- /dev/null +++ b/dlls/actxprxy/actxprxy_ocmm.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for ocmm.idl */ + +#include "ocmm.idl"

1 0

Alexandre Julliard : actxprxy: Add proxies for objsafe.idl.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 65c64080f2994c5f254ab047008019303169114d URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c64080f2994c5f254ab0470… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:35:48 2009 +0200 actxprxy: Add proxies for objsafe.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 1 + dlls/actxprxy/actxprxy_objsafe.idl | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 06f0ebc..540cfb1 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,8 @@ dlls/actxprxy/actxprxy_hlink.h dlls/actxprxy/actxprxy_hlink_p.c dlls/actxprxy/actxprxy_htiframe.h dlls/actxprxy/actxprxy_htiframe_p.c +dlls/actxprxy/actxprxy_objsafe.h +dlls/actxprxy/actxprxy_objsafe_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c dlls/advapi32/svcctl.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index e58d069..393fc07 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -17,6 +17,7 @@ IDL_P_SRCS = \ actxprxy_docobj.idl \ actxprxy_hlink.idl \ actxprxy_htiframe.idl \ + actxprxy_objsafe.idl \ actxprxy_servprov.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_objsafe.idl b/dlls/actxprxy/actxprxy_objsafe.idl new file mode 100644 index 0000000..67e878b --- /dev/null +++ b/dlls/actxprxy/actxprxy_objsafe.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for objsafe.idl */ + +#include "objsafe.idl"

1 0

Alexandre Julliard : actxprxy: Add proxies for htiframe.idl.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 55d3a48cf1c78616d1fd40d0b97a5bed3fcec8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d3a48cf1c78616d1fd40d0b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:34:47 2009 +0200 actxprxy: Add proxies for htiframe.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 1 + dlls/actxprxy/actxprxy_htiframe.idl | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 68eefae..06f0ebc 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ dlls/actxprxy/actxprxy_docobj.h dlls/actxprxy/actxprxy_docobj_p.c dlls/actxprxy/actxprxy_hlink.h dlls/actxprxy/actxprxy_hlink_p.c +dlls/actxprxy/actxprxy_htiframe.h +dlls/actxprxy/actxprxy_htiframe_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c dlls/advapi32/svcctl.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 92b0c48..e58d069 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -16,6 +16,7 @@ IDL_P_SRCS = \ actxprxy_comcat.idl \ actxprxy_docobj.idl \ actxprxy_hlink.idl \ + actxprxy_htiframe.idl \ actxprxy_servprov.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_htiframe.idl b/dlls/actxprxy/actxprxy_htiframe.idl new file mode 100644 index 0000000..146b0a2 --- /dev/null +++ b/dlls/actxprxy/actxprxy_htiframe.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for htiframe.idl */ + +#include "htiframe.idl"

1 0

Alexandre Julliard : actxprxy: Add proxies for hlink.idl.
by Alexandre Julliard 11 Sep '09

11 Sep '09

Module: wine Branch: master Commit: 12c172a947b8e182ca77e0747f09e6ff5c839ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c172a947b8e182ca77e0747… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:33:50 2009 +0200 actxprxy: Add proxies for hlink.idl. --- .gitignore | 2 ++ dlls/actxprxy/Makefile.in | 1 + dlls/actxprxy/actxprxy_hlink.idl | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b0018da..68eefae 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,8 @@ dlls/actxprxy/actxprxy_comcat.h dlls/actxprxy/actxprxy_comcat_p.c dlls/actxprxy/actxprxy_docobj.h dlls/actxprxy/actxprxy_docobj_p.c +dlls/actxprxy/actxprxy_hlink.h +dlls/actxprxy/actxprxy_hlink_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c dlls/advapi32/svcctl.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 6aab94f..92b0c48 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -15,6 +15,7 @@ IDL_P_SRCS = \ actxprxy_activscp.idl \ actxprxy_comcat.idl \ actxprxy_docobj.idl \ + actxprxy_hlink.idl \ actxprxy_servprov.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_hlink.idl b/dlls/actxprxy/actxprxy_hlink.idl new file mode 100644 index 0000000..820967d --- /dev/null +++ b/dlls/actxprxy/actxprxy_hlink.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for hlink.idl */ + +#include "hlink.idl"

1 0