Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-19 20:19:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[OLEPRO32]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60359
This commit is contained in:
Amine Khaldi 2013-09-26 14:03:23 +00:00
parent ffd9907a95
commit f233ce7bef
5 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/dll/win32/olepro32/CMakeLists.txt
View file

@ -1,24 +1,14 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(olepro32.dll olepro32.spec) spec2def(olepro32.dll olepro32.spec)
list(APPEND SOURCE list(APPEND SOURCE
olepro32stubs.c olepro32stubs.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/olepro32.def) ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def)
add_library(olepro32 SHARED ${SOURCE}) add_library(olepro32 SHARED ${SOURCE} version.rc)
set_module_type(olepro32 win32dll) set_module_type(olepro32 win32dll)
target_link_libraries(olepro32 wine) target_link_libraries(olepro32 wine)
add_importlibs(olepro32 oleaut32 msvcrt kernel32 ntdll)
add_importlibs(olepro32
msvcrt
oleaut32
kernel32
ntdll)
add_cd_file(TARGET olepro32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET olepro32 DESTINATION reactos/system32 FOR all)

9
reactos/dll/win32/olepro32/README
View file

@ -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.

2
reactos/dll/win32/olepro32/olepro32stubs.c
View file

@ -53,7 +53,7 @@ HRESULT WINAPI DllRegisterServer(void)
*/ */
HRESULT WINAPI DllCanUnloadNow(void) HRESULT WINAPI DllCanUnloadNow(void)
{ {
return S_OK; return S_FALSE;
} }
/*********************************************************************** /***********************************************************************

2
reactos/dll/win32/olepro32/version.rc
View file

@ -16,12 +16,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#define WINE_OLESELFREGISTER
#define WINE_FILEDESCRIPTION_STR "Wine olepro32.dll" #define WINE_FILEDESCRIPTION_STR "Wine olepro32.dll"
#define WINE_FILENAME_STR "olepro32.dll" #define WINE_FILENAME_STR "olepro32.dll"
#define WINE_FILEVERSION 5,0,4522,0 #define WINE_FILEVERSION 5,0,4522,0
#define WINE_FILEVERSION_STR "5.0.4522" #define WINE_FILEVERSION_STR "5.0.4522"
#define WINE_PRODUCTVERSION 2,40,4522,0 #define WINE_PRODUCTVERSION 2,40,4522,0
#define WINE_PRODUCTVERSION_STR "2.40" #define WINE_PRODUCTVERSION_STR "2.40"
#define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
#include <wine/wine_common_ver.rc> #include <wine/wine_common_ver.rc>

2
reactos/media/doc/README.WINE
View file

@ -147,7 +147,7 @@ reactos/dll/win32/oleacc # Autosync
reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1 reactos/dll/win32/oleaut32 # Synced to Wine-1.7.1
reactos/dll/win32/olecli32 # Synced to Wine-1.5.19 reactos/dll/win32/olecli32 # Synced to Wine-1.5.19
reactos/dll/win32/oledlg # Synced to Wine-1.7.1 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/olesvr32 # Synced to Wine-1.5.19
reactos/dll/win32/olethk32 # Synced to Wine-1.5.19 reactos/dll/win32/olethk32 # Synced to Wine-1.5.19
reactos/dll/win32/pdh # Autosync reactos/dll/win32/pdh # Autosync