[ros-diffs] [akhaldi] 60359: [OLEPRO32] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Thu Sep 26 14:03:23 2013
New Revision: 60359

URL: http://svn.reactos.org/svn/reactos?rev=60359&view=rev
Log:
[OLEPRO32]
* Sync with Wine 1.7.1.
CORE-7469

Removed:
    trunk/reactos/dll/win32/olepro32/README
Modified:
    trunk/reactos/dll/win32/olepro32/CMakeLists.txt
    trunk/reactos/dll/win32/olepro32/olepro32stubs.c
    trunk/reactos/dll/win32/olepro32/version.rc
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/olepro32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/olepro32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/olepro32/CMakeLists.txt	[iso-8859-1] Thu Sep 26 14:03:23 2013
@@ -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)

Removed: trunk/reactos/dll/win32/olepro32/README
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/README?…
==============================================================================
--- trunk/reactos/dll/win32/olepro32/README	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/olepro32/README	(removed)
@@ -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.

Modified: trunk/reactos/dll/win32/olepro32/olepro32stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3…
==============================================================================
--- trunk/reactos/dll/win32/olepro32/olepro32stubs.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/olepro32/olepro32stubs.c	[iso-8859-1] Thu Sep 26 14:03:23
2013
@@ -53,7 +53,7 @@
  */
 HRESULT WINAPI DllCanUnloadNow(void)
 {
-	return S_OK;
+	return S_FALSE;
 }
 
 /***********************************************************************

Modified: 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	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/olepro32/version.rc	[iso-8859-1] Thu Sep 26 14:03:23 2013
@@ -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>

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] Thu Sep 26 14:03:23 2013
@@ -147,7 +147,7 @@
 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