Added stdole32.tlb.

Make.rules.in

@@ -103,7 +103,7 @@ dlldir          = @libdir@/wine
 prog_manext     = 1
 api_manext      = 3w
 conf_manext     = 5
-CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
+CLEAN_FILES     = *.o *.a *.so *.tlb *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
                   *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core
 
 OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS)
@@ -113,7 +113,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 +139,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 +165,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
 

configure.ac

@@ -1650,6 +1650,7 @@ dlls/shfolder/Makefile
 dlls/shlwapi/Makefile
 dlls/shlwapi/tests/Makefile
 dlls/snmpapi/Makefile
+dlls/stdole32.tlb/Makefile
 dlls/sti/Makefile
 dlls/strmiids/Makefile
 dlls/tapi32/Makefile

dlls/Makefile.in

@@ -121,6 +121,7 @@ BASEDIRS = \
 	shfolder \
 	shlwapi \
 	snmpapi \
+	stdole32.tlb \
 	sti \
 	tapi32 \
 	ttydrv \
@@ -363,6 +364,7 @@ SYMLINKS_SO = \
 	shfolder.dll.so \
 	shlwapi.dll.so \
 	snmpapi.dll.so \
+	stdole32.tlb.so \
 	sti.dll.so \
 	tapi32.dll.so \
 	ttydrv.dll.so \
@@ -824,6 +826,9 @@ shlwapi.dll.so: shlwapi/shlwapi.dll.so
 snmpapi.dll.so: snmpapi/snmpapi.dll.so
 	$(RM) $@ && $(LN_S) snmpapi/snmpapi.dll.so $@
 
+stdole32.tlb.so: stdole32.tlb/stdole32.tlb.so
+	$(RM) $@ && $(LN_S) stdole32.tlb/stdole32.tlb.so $@
+
 sti.dll.so: sti/sti.dll.so
 	$(RM) $@ && $(LN_S) sti/sti.dll.so $@
 
@@ -2040,6 +2045,7 @@ shell32/shell32.dll.so: shell32
 shfolder/shfolder.dll.so: shfolder
 shlwapi/shlwapi.dll.so: shlwapi
 snmpapi/snmpapi.dll.so: snmpapi
+stdole32.tlb/stdole32.tlb.so: stdole32.tlb
 sti/sti.dll.so: sti
 tapi32/tapi32.dll.so: tapi32
 ttydrv/ttydrv.dll.so: ttydrv

dlls/stdole32.tlb/.cvsignore

+Makefile
+rsrc.res
+std_ole_v1.tlb
+stdole32.tlb.dbg.c

dlls/stdole32.tlb/Makefile.in

+TOPSRCDIR = @top_srcdir@
+TOPOBJDIR = ../..
+SRCDIR    = @srcdir@
+VPATH     = @srcdir@
+MODULE    = stdole32.tlb
+
+RC_SRCS = rsrc.rc
+RC_TLB = std_ole_v1.tlb
+
+@MAKE_DLL_RULES@
+
+### Dependencies:

dlls/stdole32.tlb/rsrc.rc

+/*
+ * 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

dlls/stdole32.tlb/std_ole_v1.idl

+/*
+ * 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);
+    }
+};

dlls/stdole32.tlb/stdole32.tlb.spec

+# no exported entry points