From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 21 Mar 2018 12:07:10 +0000 (+0100)
Subject: [PRINTUI] Sync with Wine Staging 3.3. CORE-14434
X-Git-Tag: 0.4.9-RC~473
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=28a3cf7b47254d9ff1a87700d1c1d3bf7807b861

[PRINTUI] Sync with Wine Staging 3.3. CORE-14434
---

diff --git a/dll/win32/printui/printui.c b/dll/win32/printui/printui.c
index f47e8f67db5..32e7b52e3d1 100644
--- a/dll/win32/printui/printui.c
+++ b/dll/win32/printui/printui.c
@@ -18,26 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 
 #define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-//#include "wingdi.h"
-//#include "winuser.h"
-//#include "winreg.h"
-//#include "winver.h"
-//#include "winnls.h"
-#include <shellapi.h>
-
-#include <wine/unicode.h>
-#include <wine/debug.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "winver.h"
+#include "winnls.h"
+#include "shellapi.h"
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
 #include "printui_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(printui);
diff --git a/dll/win32/printui/printui.rc b/dll/win32/printui/printui.rc
index 1deadb19e8e..bfbae9820a7 100644
--- a/dll/win32/printui/printui.rc
+++ b/dll/win32/printui/printui.rc
@@ -19,7 +19,7 @@
  *
  */
 
-//#include "winver.h"
+#include "winver.h"
 
 #define WINE_FILENAME_STR "printui.dll"
 #define WINE_FILEDESCRIPTION_STR "User Interface for Printing"
@@ -31,4 +31,4 @@
 #define WINE_PRODUCTVERSION      5,1,2600,2180
 #define WINE_PRODUCTVERSION_STR "5.1.2600.2180"
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 9b77c6c519c..a6afb21f401 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -150,7 +150,7 @@ reactos/dll/win32/olethk32            # Synced to WineStaging-3.3
 reactos/dll/win32/pdh                 # Synced to WineStaging-3.3
 reactos/dll/win32/pidgen              # Synced to WineStaging-3.3
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
-reactos/dll/win32/printui             # Synced to WineStaging-2.9
+reactos/dll/win32/printui             # Synced to WineStaging-3.3
 reactos/dll/win32/propsys             # Synced to Wine-3.0
 reactos/dll/win32/pstorec             # Synced to WineStaging-2.2
 reactos/dll/win32/qmgr                # Synced to WineStaging-2.9