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

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index c8603c6..1fdf308 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -222,7 +222,7 @@ reactos/dll/win32/xmllite             # Synced to WineStaging-3.3
 
 reactos/dll/cpl/inetcpl               # Synced to WineStaging-3.3
 
-reactos/win32ss/printing/monitors/localmon/ui/  # Synced to WineStaging-2.9 (known there as /dll/win32/localui)
+reactos/win32ss/printing/monitors/localmon/ui/  # Synced to WineStaging-3.3 (known there as /dll/win32/localui)
 
 ReactOS shares the following programs with Winehq.
 

diff --git a/win32ss/printing/monitors/localmon/ui/localui.c b/win32ss/printing/monitors/localmon/ui/localui.c
index 3f16ddb..9fb975c 100644 (file)
--- a/win32ss/printing/monitors/localmon/ui/localui.c
+++ b/win32ss/printing/monitors/localmon/ui/localui.c
@@ -18,23 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
 #include <stdarg.h>
 
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winreg.h>
-#include <winuser.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winreg.h"
+#include "winuser.h"
 
-#include <winspool.h>
-#include <ddk/winsplp.h>
+#include "winspool.h"
+#include "ddk/winsplp.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "wine/debug.h"
+#include "wine/unicode.h"
 #include "localui.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(localui);

diff --git a/win32ss/printing/monitors/localmon/ui/localui.h b/win32ss/printing/monitors/localmon/ui/localui.h
index 7b59a26..25424da 100644 (file)
--- a/win32ss/printing/monitors/localmon/ui/localui.h
+++ b/win32ss/printing/monitors/localmon/ui/localui.h
@@ -21,8 +21,8 @@
 #ifndef __WINE_LOCALUI__
 #define __WINE_LOCALUI__
 
-//#include <windef.h>
-//#include <winuser.h>
+#include <windef.h>
+#include <winuser.h>
 
 /* ## Resource-ID ## */
 #define ADDPORT_DIALOG  100

diff --git a/win32ss/printing/monitors/localmon/ui/localui.rc b/win32ss/printing/monitors/localmon/ui/localui.rc
index e1da134..9fa42f6 100644 (file)
--- a/win32ss/printing/monitors/localmon/ui/localui.rc
+++ b/win32ss/printing/monitors/localmon/ui/localui.rc
@@ -19,9 +19,6 @@
  *
  */
 
-#include <windef.h>
-#include <winuser.h>
-
 #include "localui.h"
 
 #define WINE_FILENAME_STR "localui.dll"