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

[COMCAT]

Browse source 
* Sync with Wine 1.7.1.

svn path=/trunk/; revision=60115
This commit is contained in:
Amine Khaldi 2013-09-14 18:59:47 +00:00
parent 3505f4b788
commit 127325ea0d
4 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/comcat/CMakeLists.txt
View file

@ -1,25 +1,14 @@
add_definitions(-D__WINESRC__) add_definitions(-D__WINESRC__)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(comcat.dll comcat.spec) spec2def(comcat.dll comcat.spec)
list(APPEND SOURCE list(APPEND SOURCE
comcat_main.c comcat_main.c
version.rc
${CMAKE_CURRENT_BINARY_DIR}/comcat.def) ${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
add_library(comcat SHARED ${SOURCE}) add_library(comcat SHARED ${SOURCE} version.rc)
set_module_type(comcat win32dll) set_module_type(comcat win32dll)
add_importlibs(comcat ole32 msvcrt kernel32)
target_link_libraries(comcat uuid wine)
add_importlibs(comcat msvcrt ole32 user32 advapi32 kernel32 ntdll)
add_dependencies(comcat psdk)
add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all) add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all)

6
reactos/dll/win32/comcat/comcat_main.c
View file

@ -22,14 +22,8 @@
//#include <stdarg.h> //#include <stdarg.h>
#define COBJMACROS
#include <windef.h> #include <windef.h>
//#include "winbase.h" //#include "winbase.h"
//#include "winuser.h"
//#include "winreg.h"
//#include "winerror.h"
//#include "ole2.h"
/*********************************************************************** /***********************************************************************
* DllCanUnloadNow (COMCAT.@) * DllCanUnloadNow (COMCAT.@)

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

@ -18,7 +18,7 @@
* 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_FILENAME_STR "comcat.dll" #define WINE_FILENAME_STR "comcat.dll"
#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

@ -58,7 +58,7 @@ reactos/dll/win32/bcrypt # Synced to Wine-1.5.26
reactos/dll/win32/browseui # Out of sync reactos/dll/win32/browseui # Out of sync
reactos/dll/win32/cabinet # Synced to Wine-1.5.26 reactos/dll/win32/cabinet # Synced to Wine-1.5.26
reactos/dll/win32/clusapi # Synced to Wine-1.7.1 reactos/dll/win32/clusapi # Synced to Wine-1.7.1
reactos/dll/win32/comcat # Synced to Wine-1.5.4 reactos/dll/win32/comcat # Synced to Wine-1.7.1
reactos/dll/win32/comctl32 # Synced to Wine 1.5.26 reactos/dll/win32/comctl32 # Synced to Wine 1.5.26
reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37 reactos/dll/win32/comdlg32 # Synced to Wine 1.3.37
reactos/dll/win32/compstui # Synced to Wine-1.5.19 reactos/dll/win32/compstui # Synced to Wine-1.5.19