stdole32
Huw D M Davies
h.davies1 at physics.ox.ac.uk
Thu Jan 27 11:22:36 CST 2005
Here's a version of stdole32. The snag is that it won't work with
native oleaut32 because native LoadTypeLib manually parses the PE file
rather than calling LoadLibrary as our implementation does. If we
want to fix this, we'll have to generate the PE header ourselves.
autoconf + make_dlls need running.
Huw Davies <huw at codeweavers.com>
Add stdole32.tlb
--
Huw Davies
huw at codeweavers.com
Index: configure.ac
===================================================================
RCS file: /home/wine/wine/configure.ac,v
retrieving revision 1.336
diff -u -p -r1.336 configure.ac
--- configure.ac 24 Jan 2005 19:42:02 -0000 1.336
+++ configure.ac 27 Jan 2005 17:10:25 -0000
@@ -1649,6 +1649,7 @@ dlls/shfolder/Makefile
dlls/shlwapi/Makefile
dlls/shlwapi/tests/Makefile
dlls/snmpapi/Makefile
+dlls/stdole32/Makefile
dlls/sti/Makefile
dlls/strmiids/Makefile
dlls/tapi32/Makefile
Index: Make.rules.in
===================================================================
RCS file: /home/wine/wine/Make.rules.in,v
retrieving revision 1.179
diff -u -p -r1.179 Make.rules.in
--- Make.rules.in 7 Oct 2004 03:12:44 -0000 1.179
+++ Make.rules.in 27 Jan 2005 17:10:25 -0000
@@ -104,7 +104,8 @@ prog_manext = 1
api_manext = 3w
conf_manext = 5
CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
- *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT at .c core
+ *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT at .c core \
+ *.tlb
OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS)
@@ -113,7 +114,7 @@ LINTS = $(C_SRCS:.c=.ln)
# Implicit rules
-.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .idl .h .ok .sfd .ttf
+.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .idl .tlb .h .ok .sfd .ttf
.c.o:
$(CC) -c $(ALLCFLAGS) -o $@ $<
@@ -139,6 +140,9 @@ LINTS = $(C_SRCS:.c=.ln)
.idl.h:
$(WIDL) $(IDLFLAGS) -h -H $@ $<
+.idl.tlb:
+ $(WIDL) $(IDLFLAGS) -t -T $@ $<
+
.c.ln:
$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
@@ -162,7 +166,7 @@ filter:
$(RC_BINARIES): $(BIN2RES) $(RC_BINSRC)
$(BIN2RES) -f -o $@ $(SRCDIR)/$(RC_BINSRC)
-$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES)
+$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(RC_BINARIES) $(RC_TLB)
# Rule for main module debug channels
--- /dev/null 2004-02-23 21:02:56.000000000 +0000
+++ dlls/stdole32/Makefile.in 2005-01-27 00:43:39.000000000 +0000
@@ -0,0 +1,14 @@
+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR = @srcdir@
+VPATH = @srcdir@
+MODULE = stdole32.tlb
+IMPORTS =
+
+RC_SRCS = rsrc.rc
+RC_TLB = std_ole_v1.tlb
+
+
+ at MAKE_DLL_RULES@
+
+### Dependencies:
--- /dev/null 2004-02-23 21:02:56.000000000 +0000
+++ dlls/stdole32/.cvsignore 2005-01-27 17:06:15.263159325 +0000
@@ -0,0 +1,3 @@
+Makefile
+rsrc.res
+std_ole_v1.tlb
--- /dev/null 2004-02-23 21:02:56.000000000 +0000
+++ dlls/stdole32/rsrc.rc 2005-01-27 17:10:04.614045458 +0000
@@ -0,0 +1,30 @@
+/*
+ * Resource file for stdole32
+ *
+ * Copyright 2005 Huw Davies
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#include "wine/wine_common_ver.rc"
+
+1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb
--- /dev/null 2004-02-23 21:02:56.000000000 +0000
+++ dlls/stdole32/std_ole_v1.idl 2005-01-27 16:58:28.492361372 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2003 Robert Shearman
+ * 2005 Huw Davies
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+[
+ uuid(00020430-0000-0000-C000-000000000046),
+ version(1.0),
+ helpstring("OLE Automation")
+]
+library stdole
+{
+ /* typedefs aren't stored in the type library.
+ These type names are known by the type compiler so it
+ doesn't really matter what we define them as. */
+
+ typedef void *VARIANT;
+ typedef wchar_t *BSTR;
+ typedef unsigned long SCODE;
+ typedef unsigned long HRESULT;
+
+ typedef struct GUID {
+ unsigned long Data1;
+ unsigned short Data2;
+ unsigned short Data3;
+ unsigned char Data4[ 8 ];
+ } GUID;
+
+ typedef struct DISPPARAMS {
+ VARIANT *rgvarg;
+ long *rgdispidNamedArgs;
+ unsigned int cArgs;
+ unsigned int cNamedArgs;
+ } DISPPARAMS;
+
+ typedef struct EXCEPINFO {
+ unsigned short wCode;
+ unsigned short wReserved;
+ BSTR bstrSource;
+ BSTR bstrDescription;
+ BSTR bstrHelpFile;
+ unsigned long dwHelpContext;
+ void *pvReserved;
+ void *pfnDeferredFillIn;
+ SCODE scode;
+ } EXCEPINFO;
+
+ [
+ odl,
+ uuid(00000000-0000-0000-C000-000000000046)
+ ]
+ interface IUnknown
+ {
+ [restricted]
+ HRESULT QueryInterface(
+ [in] GUID *riid,
+ [out] void **ppvObj);
+
+ [restricted]
+ unsigned long AddRef();
+
+ [restricted]
+ unsigned long Release();
+ }
+
+ [
+ odl,
+ uuid(00020400-0000-0000-C000-000000000046)
+ ]
+ interface IDispatch : IUnknown
+ {
+ [restricted]
+ HRESULT GetTypeInfoCount(
+ [out] unsigned int *pctinfo);
+
+ [restricted]
+ HRESULT GetTypeInfo(
+ [in] unsigned int itinfo,
+ [in] unsigned long lcid,
+ [out] void **pptinfo);
+
+ [restricted]
+ HRESULT GetIDsOfNames(
+ [in] GUID *riid,
+ [in] char **rgszNames,
+ [in] unsigned int cNames,
+ [in] unsigned long lcid,
+ [out] long *rgdispid);
+
+ [restricted]
+ HRESULT Invoke(
+ [in] long dispidMember,
+ [in] GUID *riid,
+ [in] unsigned long lcid,
+ [in] unsigned short wFlags,
+ [in] DISPPARAMS *pdispparams,
+ [out] VARIANT *pvarResult,
+ [out] EXCEPINFO *pexcepinfo,
+ [out] unsigned int *puArgErr);
+
+ }
+
+ [
+ odl,
+ uuid(00020404-0000-0000-C000-000000000046)
+ ]
+ interface IEnumVARIANT : IUnknown
+ {
+ HRESULT Next(
+ [in] unsigned long celt,
+ [in] VARIANT *rgvar,
+ [out] unsigned long *pceltFetched);
+
+ HRESULT Skip(
+ [in] unsigned long celt);
+
+ HRESULT Reset();
+
+ HRESULT Clone(
+ [out] IEnumVARIANT **ppenum);
+ }
+};
+
More information about the wine-patches
mailing list