From f233ce7befb32b76e5d1a669f7f293b095fbe84f Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 26 Sep 2013 14:03:23 +0000
Subject: [PATCH] [OLEPRO32] * Sync with Wine 1.7.1. CORE-7469

svn path=/trunk/; revision=60359
---
 reactos/dll/win32/olepro32/CMakeLists.txt  | 14 ++------------
 reactos/dll/win32/olepro32/README          |  9 ---------
 reactos/dll/win32/olepro32/olepro32stubs.c |  2 +-
 reactos/dll/win32/olepro32/version.rc      |  2 +-
 reactos/media/doc/README.WINE              |  2 +-
 5 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 reactos/dll/win32/olepro32/README

diff --git a/reactos/dll/win32/olepro32/CMakeLists.txt b/reactos/dll/win32/olepro32/CMakeLists.txt
index e29383e01b1..2376319134c 100644
--- a/reactos/dll/win32/olepro32/CMakeLists.txt
+++ b/reactos/dll/win32/olepro32/CMakeLists.txt
@@ -1,24 +1,14 @@
 
 add_definitions(-D__WINESRC__)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-
 spec2def(olepro32.dll olepro32.spec)
 
 list(APPEND SOURCE
     olepro32stubs.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def)
 
-add_library(olepro32 SHARED ${SOURCE})
-
+add_library(olepro32 SHARED ${SOURCE} version.rc)
 set_module_type(olepro32 win32dll)
-
 target_link_libraries(olepro32 wine)
-
-add_importlibs(olepro32
-    msvcrt
-    oleaut32
-    kernel32
-    ntdll)
-
+add_importlibs(olepro32 oleaut32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET olepro32 DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/win32/olepro32/README b/reactos/dll/win32/olepro32/README
deleted file mode 100644
index 1c505f2781e..00000000000
--- a/reactos/dll/win32/olepro32/README
+++ /dev/null
@@ -1,9 +0,0 @@
-29Nov99
-Sean Langley 
-
-This library (OLEPRO32.DLL) is basically a sub-set of what is in OLEAUT32.DLL.
-The main difference under Win32 is that OLEPRO32.DLL can be used
-as a type library.  There are two functions in this DLL which are already 
-implemented in Wine.  They are OleCreateFontIndirect, and OleTranslateColor.
-The spec file for both of these functions points to the functions in the
-OLEAUT32.DLL.
diff --git a/reactos/dll/win32/olepro32/olepro32stubs.c b/reactos/dll/win32/olepro32/olepro32stubs.c
index c24c268c7f0..037b68f1685 100644
--- a/reactos/dll/win32/olepro32/olepro32stubs.c
+++ b/reactos/dll/win32/olepro32/olepro32stubs.c
@@ -53,7 +53,7 @@ HRESULT WINAPI DllRegisterServer(void)
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-	return S_OK;
+	return S_FALSE;
 }
 
 /***********************************************************************
diff --git a/reactos/dll/win32/olepro32/version.rc b/reactos/dll/win32/olepro32/version.rc
index 9d26238402b..5b27bf3e3a3 100644
--- a/reactos/dll/win32/olepro32/version.rc
+++ b/reactos/dll/win32/olepro32/version.rc
@@ -16,12 +16,12 @@
  * 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"
+#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include <wine/wine_common_ver.rc>
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 255fa6b9846..9923bcb86cf 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -147,7 +147,7 @@ reactos/dll/win32/oleacc          # Autosync
 reactos/dll/win32/oleaut32        # Synced to Wine-1.7.1
 reactos/dll/win32/olecli32        # Synced to Wine-1.5.19
 reactos/dll/win32/oledlg          # Synced to Wine-1.7.1
-reactos/dll/win32/olepro32        # Autosync
+reactos/dll/win32/olepro32        # Synced to Wine-1.7.1
 reactos/dll/win32/olesvr32        # Synced to Wine-1.5.19
 reactos/dll/win32/olethk32        # Synced to Wine-1.5.19
 reactos/dll/win32/pdh             # Autosync