[ros-diffs] [akhaldi] 60115: [COMCAT] * Sync with Wine 1.7.1.

Author: akhaldi
Date: Sat Sep 14 18:59:47 2013
New Revision: 60115

URL: http://svn.reactos.org/svn/reactos?rev=60115&view=rev
Log:
[COMCAT]
* Sync with Wine 1.7.1.

Modified:
    trunk/reactos/dll/win32/comcat/CMakeLists.txt
    trunk/reactos/dll/win32/comcat/comcat_main.c
    trunk/reactos/dll/win32/comcat/version.rc
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/comcat/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/comcat/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comcat/CMakeLists.txt	[iso-8859-1] Sat Sep 14 18:59:47 2013
@@ -1,25 +1,14 @@
 
 add_definitions(-D__WINESRC__)
-
-remove_definitions(-D_WIN32_WINNT=0x502)
-add_definitions(-D_WIN32_WINNT=0x600)
-
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(comcat.dll comcat.spec)
 
 list(APPEND SOURCE
     comcat_main.c
-    version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/comcat.def)
 
-add_library(comcat SHARED ${SOURCE})
-
+add_library(comcat SHARED ${SOURCE} version.rc)
 set_module_type(comcat win32dll)
-
-target_link_libraries(comcat uuid wine)
-
-add_importlibs(comcat msvcrt ole32 user32 advapi32 kernel32 ntdll)
-
-add_dependencies(comcat psdk)
+add_importlibs(comcat ole32 msvcrt kernel32)
 add_cd_file(TARGET comcat DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/dll/win32/comcat/comcat_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat_ma…
==============================================================================
--- trunk/reactos/dll/win32/comcat/comcat_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comcat/comcat_main.c	[iso-8859-1] Sat Sep 14 18:59:47 2013
@@ -22,14 +22,8 @@
 
 //#include <stdarg.h>
 
-#define COBJMACROS
-
 #include <windef.h>
 //#include "winbase.h"
-//#include "winuser.h"
-//#include "winreg.h"
-//#include "winerror.h"
-//#include "ole2.h"
 
 /***********************************************************************
  *		DllCanUnloadNow (COMCAT.@)

Modified: trunk/reactos/dll/win32/comcat/version.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/version.r…
==============================================================================
--- trunk/reactos/dll/win32/comcat/version.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comcat/version.rc	[iso-8859-1] Sat Sep 14 18:59:47 2013
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_OLESELFREGISTER
 #define WINE_FILENAME_STR "comcat.dll"
+#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] Sat Sep 14 18:59:47 2013
@@ -58,7 +58,7 @@
 reactos/dll/win32/browseui        # Out of sync
 reactos/dll/win32/cabinet         # Synced to Wine-1.5.26
 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/comdlg32        # Synced to Wine 1.3.37
 reactos/dll/win32/compstui        # Synced to Wine-1.5.19