[ros-diffs] [winesync] 26089: Autosyncing with Wine HEAD

Author: winesync
Date: Wed Mar 14 17:50:28 2007
New Revision: 26089

URL: http://svn.reactos.org/svn/reactos?rev=26089&view=rev
Log:
Autosyncing with Wine HEAD

Added:
    trunk/reactos/dll/win32/olepro32/olepro32_ros.diff   (with props)
    trunk/reactos/dll/win32/olepro32/version.rc   (with props)
Modified:
    trunk/reactos/dll/win32/olepro32/olepro32.rbuild
    trunk/reactos/dll/win32/olepro32/olepro32stubs.c

Modified: trunk/reactos/dll/win32/olepro32/olepro32.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro32...
==============================================================================
--- trunk/reactos/dll/win32/olepro32/olepro32.rbuild (original)
+++ trunk/reactos/dll/win32/olepro32/olepro32.rbuild Wed Mar 14 17:50:28 2007
@@ -14,5 +14,6 @@
    <library>kernel32</library>
    <library>ntdll</library>
    <file>olepro32stubs.c</file>
+	<file>version.rc</file>
    <file>olepro32.spec</file>
 </module>

Added: trunk/reactos/dll/win32/olepro32/olepro32_ros.diff
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro32...
==============================================================================
--- trunk/reactos/dll/win32/olepro32/olepro32_ros.diff (added)
+++ trunk/reactos/dll/win32/olepro32/olepro32_ros.diff Wed Mar 14 17:50:28 2007
@@ -1,0 +1,9 @@
+Index: olepro32.rbuild
+===================================================================
+--- olepro32.rbuild	(revision 23782)
++++ olepro32.rbuild	(working copy)
+@@ -1,3 +1,3 @@
++<module name="olepro32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true">
+-<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true">
+ 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
+ 	<importlibrary definition="olepro32.spec.def" />

Propchange: trunk/reactos/dll/win32/olepro32/olepro32_ros.diff
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/olepro32/olepro32stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro32...
==============================================================================
--- trunk/reactos/dll/win32/olepro32/olepro32stubs.c (original)
+++ trunk/reactos/dll/win32/olepro32/olepro32stubs.c Wed Mar 14 17:50:28 2007
@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#define COM_NO_WINDOWS_H
 #include <stdarg.h>

#include "wine/debug.h"
@@ -36,7 +35,7 @@
  */
 HRESULT WINAPI DllUnregisterServer()
 {
-	FIXME("not implemented (olepro32.dll)\n");
+	FIXME("stub\n");
    return S_OK;
 }

@@ -45,7 +44,7 @@
  */
 HRESULT WINAPI DllRegisterServer()
 {
-	FIXME("not implemented (olepro32.dll)\n");
+	FIXME("stub\n");
    return S_OK;
 }

@@ -54,7 +53,7 @@
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-	FIXME("not implemented (olepro32.dll)\n");
+	FIXME("stub\n");
    return S_OK;
 }

@@ -63,6 +62,6 @@
  */
 HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
 {
-	FIXME("not implemented (olepro32.dll)\n");
+	FIXME("stub\n");
    return S_OK;
 }

Added: trunk/reactos/dll/win32/olepro32/version.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/version....
==============================================================================
--- trunk/reactos/dll/win32/olepro32/version.rc (added)
+++ trunk/reactos/dll/win32/olepro32/version.rc Wed Mar 14 17:50:28 2007
@@ -1,0 +1,27 @@
+/*
+ * Copyright 2006 Louis Lenders
+ *
+ * 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
+ */
+
+#define WINE_OLESELFREGISTER
+#define WINE_FILEDESCRIPTION_STR "Wine olepro32.dll"
+#define WINE_FILENAME_STR "olepro32.dll"
+#define WINE_FILEVERSION 5,0,4522,0
+#define WINE_FILEVERSION_STR "5.0.4522"
+#define WINE_PRODUCTVERSION 2,40,4522,0
+#define WINE_PRODUCTVERSION_STR "2.40"
+
+#include "wine/wine_common_ver.rc"

Propchange: trunk/reactos/dll/win32/olepro32/version.rc
------------------------------------------------------------------------------
    svn:eol-style = native