3 Jul
2016
3 Jul
'16
11:18 a.m.
Author: akhaldi
Date: Sun Jul 3 11:18:44 2016
New Revision: 71776
URL: http://svn.reactos.org/svn/reactos?rev=71776&view=rev
Log:
[STDOLE32.TLB] Sync with Wine Staging 1.9.11. CORE-11368
Added:
trunk/reactos/sdk/include/psdk/stdole32.idl (with props)
Modified:
trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl
trunk/reactos/media/doc/README.WINE
trunk/reactos/sdk/cmake/widl-support.cmake
Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std…
==============================================================================
--- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Sun Jul 3 11:18:44
2016
@@ -20,121 +20,4 @@
#pragma makedep regtypelib
-[
- uuid(00020430-0000-0000-C000-000000000046),
- restricted,
- 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);
- }
-};
+#include "stdole32.idl"
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Jul 3 11:18:44 2016
@@ -183,7 +183,7 @@
reactos/dll/win32/softpub # Synced to WineStaging-1.9.4
reactos/dll/win32/spoolss # Synced to WineStaging-1.9.4
reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.4
-reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.4
+reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11
reactos/dll/win32/sti # Synced to WineStaging-1.9.4
reactos/dll/win32/sxs # Synced to WineStaging-1.9.4
reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11
Modified: trunk/reactos/sdk/cmake/widl-support.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/widl-support.cma…
==============================================================================
--- trunk/reactos/sdk/cmake/widl-support.cmake [iso-8859-1] (original)
+++ trunk/reactos/sdk/cmake/widl-support.cmake [iso-8859-1] Sun Jul 3 11:18:44 2016
@@ -12,6 +12,9 @@
get_includes(INCLUDES)
get_defines(DEFINES)
foreach(FILE ${ARGN})
+ if(${FILE} STREQUAL "std_ole_v1.idl")
+ set(IDL_FLAGS ${IDL_FLAGS} --oldtlb)
+ endif()
get_filename_component(NAME ${FILE} NAME_WE)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.tlb
Added: trunk/reactos/sdk/include/psdk/stdole32.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/stdole32.…
==============================================================================
--- trunk/reactos/sdk/include/psdk/stdole32.idl (added)
+++ trunk/reactos/sdk/include/psdk/stdole32.idl [iso-8859-1] Sun Jul 3 11:18:44 2016
@@ -0,0 +1,143 @@
+/*
+ * 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
+ *
+ */
+
+#if 0
+#pragma makedep install
+#pragma makedep typelib
+#endif
+
+[
+ uuid(00020430-0000-0000-C000-000000000046),
+ restricted,
+ 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/sdk/include/psdk/stdole32.idl
------------------------------------------------------------------------------
svn:eol-style = native