[COMCAT] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 11:51:19 +0000 (12:51 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 11:51:19 +0000 (12:51 +0100)
dll/win32/comcat/comcat_main.c
dll/win32/comcat/version.rc
media/doc/README.WINE

index 9417b0b..345cf67 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
+#include "windef.h"
+#include "winbase.h"
 
 /***********************************************************************
  *             DllCanUnloadNow (COMCAT.@)
index 1d5d15e..017fa45 100644 (file)
@@ -21,4 +21,4 @@
 #define WINE_FILENAME_STR "comcat.dll"
 #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
index 4a0befc..1386ed9 100644 (file)
@@ -53,7 +53,7 @@ reactos/dll/win32/bcrypt              # Synced to WineStaging-1.9.23
 reactos/dll/win32/browseui            # Out of sync
 reactos/dll/win32/cabinet             # Synced to WineStaging-3.3
 reactos/dll/win32/clusapi             # Synced to WineStaging-3.3
-reactos/dll/win32/comcat              # Synced to WineStaging-2.9
+reactos/dll/win32/comcat              # Synced to WineStaging-3.3
 reactos/dll/win32/comctl32            # Synced to Wine-3.0
 reactos/dll/win32/comdlg32            # Synced to Wine-3.0
 reactos/dll/win32/compstui            # Synced to WineStaging-2.9