01/01: [DCIMAN32] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d651230a4b1f06400f53c...

commit 2d651230a4b1f06400f53cfe0ff8fd629cbffc89
Author:     Amine Khaldi [e-mail]
AuthorDate: Fri Mar 9 13:05:29 2018 +0100
Commit:     Amine Khaldi [e-mail]
CommitDate: Fri Mar 9 13:05:29 2018 +0100

[DCIMAN32] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/dciman32/dciman_main.c | 15 ++++++++-------
 media/doc/README.WINE            |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dll/win32/dciman32/dciman_main.c b/dll/win32/dciman32/dciman_main.c
index 6446f28aa2..7e2e5730f8 100644
--- a/dll/win32/dciman32/dciman_main.c
+++ b/dll/win32/dciman32/dciman_main.c
@@ -19,16 +19,17 @@
  * 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);

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 38f498ab7d..4fde5a92a4 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -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