[PRINTUI] Sync with Wine Staging 3.3. CORE-14434
authorAmine Khaldi <amine.khaldi@reactos.org>
Wed, 21 Mar 2018 12:07:10 +0000 (13:07 +0100)
committerAmine Khaldi <amine.khaldi@reactos.org>
Wed, 21 Mar 2018 12:07:10 +0000 (13:07 +0100)
dll/win32/printui/printui.c
dll/win32/printui/printui.rc
media/doc/README.WINE

index f47e8f6..32e7b52 100644 (file)
  * 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);
index 1deadb1..bfbae98 100644 (file)
@@ -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"
index 9b77c6c..a6afb21 100644 (file)
@@ -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