[ros-diffs] 01/01: [WINSCARD] Sync with Wine Staging 3.3. CORE-14434

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba5ae4df7d2a3adc30ea3…

commit ba5ae4df7d2a3adc30ea341d5d5cdd4eab51a424
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Mar 24 13:18:09 2018 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Sat Mar 24 13:18:09 2018 +0100

    [WINSCARD] Sync with Wine Staging 3.3. CORE-14434
---
 dll/win32/winscard/precomp.h  |  4 ++--
 dll/win32/winscard/stubs.c    |  4 +++-
 dll/win32/winscard/winscard.c | 12 +++++++++---
 media/doc/README.WINE         |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dll/win32/winscard/precomp.h b/dll/win32/winscard/precomp.h
index 0cbff0095f..6cce6bbc34 100644
--- a/dll/win32/winscard/precomp.h
+++ b/dll/win32/winscard/precomp.h
@@ -1,3 +1,4 @@
+
 #ifndef _WINSCARD_PCH_
 #define _WINSCARD_PCH_
 
@@ -14,6 +15,5 @@
 #include <winscard.h>
 
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(winscard);
 
-#endif /* _WINSCARD_PCH_ */
+#endif /* !_WINSCARD_PCH_ */
diff --git a/dll/win32/winscard/stubs.c b/dll/win32/winscard/stubs.c
index 19d34e8bdb..3c502cf1f0 100644
--- a/dll/win32/winscard/stubs.c
+++ b/dll/win32/winscard/stubs.c
@@ -8,7 +8,9 @@
  *      11/07/2004  Created
  */
 
-#include <precomp.h>
+#include "precomp.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(winscard);
 
 /*
  * @unimplemented
diff --git a/dll/win32/winscard/winscard.c b/dll/win32/winscard/winscard.c
index 4ad47fcb06..a8a1735c2b 100644
--- a/dll/win32/winscard/winscard.c
+++ b/dll/win32/winscard/winscard.c
@@ -16,9 +16,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <precomp.h>
-
-#include <winternl.h>
+#include "config.h"
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wine/debug.h"
+#include "winscard.h"
+#include "winternl.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(winscard);
 
 static HANDLE g_startedEvent = NULL;
 
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 8864a5e8c0..9013bb9d4e 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -205,7 +205,7 @@ reactos/dll/win32/wininet             # Synced to WineStaging-3.3
 reactos/dll/win32/winmm               # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap       # Forked at Wine-20050628
 reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
-reactos/dll/win32/winscard            # Synced to WineStaging-2.9
+reactos/dll/win32/winscard            # Synced to WineStaging-3.3
 reactos/dll/win32/wintrust            # Synced to WineStaging-2.16
 reactos/dll/win32/wldap32             # Synced to Wine-3.0
 reactos/dll/win32/wmi                 # Synced to WineStaging-2.9