[DCIMAN32] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 12:05:29 +0000 (13:05 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Fri, 9 Mar 2018 12:05:29 +0000 (13:05 +0100)
dll/win32/dciman32/dciman_main.c
media/doc/README.WINE

index 6446f28..7e2e573 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
 #include <stdarg.h>
-//#include <stdio.h> 
+#include <stdio.h> 
 
-#include <windef.h>
-#include <winbase.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#ifdef __REACTOS__
 #include <wingdi.h>
-#include <dciman.h>
-#include <wine/debug.h>
+#endif
+#include "dciman.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dciman);
 
index 38f498a..4fde5a9 100644 (file)
@@ -64,7 +64,7 @@ reactos/dll/win32/cryptdll            # Synced to WineStaging-3.3
 reactos/dll/win32/cryptnet            # Synced to WineStaging-3.3
 reactos/dll/win32/cryptui             # Synced to WineStaging-3.3
 reactos/dll/win32/dbghelp             # Synced to WineStaging-3.3
-reactos/dll/win32/dciman32            # Synced to WineStaging-2.9
+reactos/dll/win32/dciman32            # Synced to WineStaging-3.3
 reactos/dll/win32/faultrep            # Synced to WineStaging-2.9
 reactos/dll/win32/fontsub             # Synced to WineStaging-2.9
 reactos/dll/win32/fusion              # Synced to Wine-3.0