[ros-diffs] [cwittich] 36400: the time has COM import stdole32.tlb from wine

cwittich at svn.reactos.org cwittich at svn.reactos.org
Mon Sep 22 13:38:52 CEST 2008


Author: cwittich
Date: Mon Sep 22 06:38:51 2008
New Revision: 36400

URL: http://svn.reactos.org/svn/reactos?rev=36400&view=rev
Log:
the time has COM
import stdole32.tlb from wine

Added:
    trunk/reactos/dll/win32/stdole32.tlb/   (with props)
    trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc   (with props)
    trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl   (with props)
    trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild   (with props)
    trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec   (with props)
Modified:
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/dll/win32/win32.rbuild

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reactos.dff?rev=36400&r1=36399&r2=36400&view=diff
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Sep 22 06:38:51 2008
@@ -338,6 +338,7 @@
 dll\win32\smdll\smdll.dll                           1
 dll\win32\snmpapi\snmpapi.dll                       1
 dll\win32\stdole2.tlb\stdole2.tlb                   1
+dll\win32\stdole32.tlb\stdole32.tlb                 1
 dll\win32\sxs\sxs.dll                               1
 dll\win32\syssetup\syssetup.dll                     1
 dll\win32\tapi32\tapi32.dll                         1

Propchange: trunk/reactos/dll/win32/stdole32.tlb/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Mon Sep 22 06:38:51 2008
@@ -1,0 +1,2 @@
+([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))?
+(\d+)

Propchange: trunk/reactos/dll/win32/stdole32.tlb/
------------------------------------------------------------------------------
    bugtraq:message = See issue #%BUGID% for more details.

Propchange: trunk/reactos/dll/win32/stdole32.tlb/
------------------------------------------------------------------------------
    bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: trunk/reactos/dll/win32/stdole32.tlb/
------------------------------------------------------------------------------
    tsvn:logminsize = 10

Added: trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc?rev=36400&view=auto
==============================================================================
--- trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc (added)
+++ trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc [iso-8859-1] Mon Sep 22 06:38:51 2008
@@ -1,0 +1,31 @@
+/*
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#include "wine/wine_common_ver.rc"
+
+/* @makedep: std_ole_v1.tlb */
+1 TYPELIB LOADONCALL DISCARDABLE std_ole_v1.tlb

Propchange: trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl?rev=36400&view=auto
==============================================================================
--- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl (added)
+++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Mon Sep 22 06:38:51 2008
@@ -1,0 +1,137 @@
+/*
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 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);
+    }
+};

Propchange: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild?rev=36400&view=auto
==============================================================================
--- trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild (added)
+++ trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild [iso-8859-1] Mon Sep 22 06:38:51 2008
@@ -1,0 +1,25 @@
+<group>
+<module name="std_ole_v1" type="embeddedtypelib">
+	<include base="std_ole_v1">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<define name="__WINESRC__" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<file>std_ole_v1.idl</file>
+</module>
+<module name="stdole32.tlb" type="win32dll" extension=".tlb" installbase="system32" installname="stdole32.tlb" entrypoint="0">
+	<importlibrary definition="stdole32.tlb.spec.def" />
+	<include base="stdole32.tlb">.</include>
+	<include base="stdole32.tlb" root="intermediate">.</include>
+	<include base="ReactOS">include/reactos/wine</include>
+	<dependency>std_ole_v1</dependency>
+	<define name="__WINESRC__" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<define name="WINVER">0x501</define>
+	<library>kernel32</library>
+	<file>stdole32.tlb.spec</file>
+	<file>rsrc.rc</file>
+</module>
+</group>

Propchange: trunk/reactos/dll/win32/stdole32.tlb/stdole32.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec?rev=36400&view=auto
==============================================================================
--- trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec (added)
+++ trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec [iso-8859-1] Mon Sep 22 06:38:51 2008
@@ -1,0 +1,1 @@
+# no exported entry points

Propchange: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.spec
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/win32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev=36400&r1=36399&r2=36400&view=diff
==============================================================================
--- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Mon Sep 22 06:38:51 2008
@@ -346,6 +346,9 @@
 <directory name="stdole2.tlb">
 	<xi:include href="stdole2.tlb/stdole2.rbuild" />
 </directory>
+<directory name="stdole32.tlb">
+	<xi:include href="stdole32.tlb/stdole32.rbuild" />
+</directory>
 <directory name="sxs">
 	<xi:include href="sxs/sxs.rbuild" />
 </directory>



More information about the Ros-diffs mailing list