[LOCALSPL]

* Move some inclusions to the main header.
* Extract the resource related definitions into resource.h and include it in both the main header and the resource file.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header/resource file.
CORE-7716

svn path=/trunk/; revision=61376

diff --git a/reactos/dll/win32/localspl/lang/spl_Cy.rc b/reactos/dll/win32/localspl/lang/spl_Cy.rc
index cbbe944..ecae600 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Cy.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Cy.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Da.rc b/reactos/dll/win32/localspl/lang/spl_Da.rc
index b28fa08..74b43ce 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Da.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Da.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_De.rc b/reactos/dll/win32/localspl/lang/spl_De.rc
index b0328f3..4ad1148 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_De.rc
+++ b/reactos/dll/win32/localspl/lang/spl_De.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/localspl/lang/spl_En.rc b/reactos/dll/win32/localspl/lang/spl_En.rc
index 13b8bf0..4052cb7 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_En.rc
+++ b/reactos/dll/win32/localspl/lang/spl_En.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Es.rc b/reactos/dll/win32/localspl/lang/spl_Es.rc
index 18d93b6..3ae4b22 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Es.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Es.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/lang/spl_Fr.rc b/reactos/dll/win32/localspl/lang/spl_Fr.rc
index efc5ed1..5aee221 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Fr.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Fr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_He.rc b/reactos/dll/win32/localspl/lang/spl_He.rc
index f119fbe..a93e293 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_He.rc
+++ b/reactos/dll/win32/localspl/lang/spl_He.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Hu.rc b/reactos/dll/win32/localspl/lang/spl_Hu.rc
index 5dcf04c..5bb4422 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Hu.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Hu.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/lang/spl_It.rc b/reactos/dll/win32/localspl/lang/spl_It.rc
index 6422126..80fad14 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_It.rc
+++ b/reactos/dll/win32/localspl/lang/spl_It.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/lang/spl_Ja.rc b/reactos/dll/win32/localspl/lang/spl_Ja.rc
index 660d03a..2e4ecf7 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Ja.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ja.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/lang/spl_Ko.rc b/reactos/dll/win32/localspl/lang/spl_Ko.rc
index 89c46c3..c7303ae 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Ko.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ko.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Lt.rc b/reactos/dll/win32/localspl/lang/spl_Lt.rc
index 692e47b..2b242cd 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Lt.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Lt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/lang/spl_Nl.rc b/reactos/dll/win32/localspl/lang/spl_Nl.rc
index ac1cdf0..ae46424 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Nl.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_No.rc b/reactos/dll/win32/localspl/lang/spl_No.rc
index aefb423..40660a6 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_No.rc
+++ b/reactos/dll/win32/localspl/lang/spl_No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Pl.rc b/reactos/dll/win32/localspl/lang/spl_Pl.rc
index 243d2c0..bd7908c 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Pl.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Pl.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Pt.rc b/reactos/dll/win32/localspl/lang/spl_Pt.rc
index 0bf08a3..2675843 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Pt.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Pt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Ro.rc b/reactos/dll/win32/localspl/lang/spl_Ro.rc
index 364f028..3109871 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Ro.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ro.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/localspl/lang/spl_Ru.rc b/reactos/dll/win32/localspl/lang/spl_Ru.rc
index bd97f11..50b3d7b 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Ru.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/lang/spl_Si.rc b/reactos/dll/win32/localspl/lang/spl_Si.rc
index 5c0d25d..32d7aff 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Si.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Si.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/localspl/lang/spl_Sv.rc b/reactos/dll/win32/localspl/lang/spl_Sv.rc
index bb32b6c..7c60d30 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Sv.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Sv.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/localspl/lang/spl_Uk.rc b/reactos/dll/win32/localspl/lang/spl_Uk.rc
index c1ea3cf..4b0ea3f 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Uk.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Uk.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/lang/spl_Zh.rc b/reactos/dll/win32/localspl/lang/spl_Zh.rc
index faaa454..2e2f54f 100644 (file)
--- a/reactos/dll/win32/localspl/lang/spl_Zh.rc
+++ b/reactos/dll/win32/localspl/lang/spl_Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "localspl_private.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/localspl/localmon.c b/reactos/dll/win32/localspl/localmon.c
index ae43c6b..3e243bf 100644 (file)
--- a/reactos/dll/win32/localspl/localmon.c
+++ b/reactos/dll/win32/localspl/localmon.c
@@ -18,30 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winreg.h>
-
-#include <winspool.h>
-#include <ddk/winsplp.h>
 #include "localspl_private.h"
 
-#include <wine/debug.h>
-#include <wine/list.h>
-#include <wine/unicode.h>
-
-
-WINE_DEFAULT_DEBUG_CHANNEL(localspl);
-
 /*****************************************************/
 
 static CRITICAL_SECTION port_handles_cs;

diff --git a/reactos/dll/win32/localspl/localspl.rc b/reactos/dll/win32/localspl/localspl.rc
index 47901f3..c51e86c 100644 (file)
--- a/reactos/dll/win32/localspl/localspl.rc
+++ b/reactos/dll/win32/localspl/localspl.rc
@@ -19,10 +19,7 @@
  *
  */
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winver.h"
-//#include "localspl_private.h"
+#include "resource.h"
 
 #define WINE_FILENAME_STR "localspl.dll"
 #define WINE_FILEDESCRIPTION_STR "Wine Printer spooler component"

diff --git a/reactos/dll/win32/localspl/localspl_main.c b/reactos/dll/win32/localspl/localspl_main.c
index a555f43..6e594c7 100644 (file)
--- a/reactos/dll/win32/localspl/localspl_main.c
+++ b/reactos/dll/win32/localspl/localspl_main.c
@@ -18,22 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-
-#include <wine/debug.h>
 #include "localspl_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(localspl);
-
-
 HINSTANCE LOCALSPL_hInstance = NULL;
 
 /*****************************************************

diff --git a/reactos/dll/win32/localspl/localspl_private.h b/reactos/dll/win32/localspl/localspl_private.h
index 4f79f3d..0fd85d3 100644 (file)
--- a/reactos/dll/win32/localspl/localspl_private.h
+++ b/reactos/dll/win32/localspl/localspl_private.h
@@ -21,20 +21,35 @@
 #ifndef __WINE_LOCALSPL_PRIVATE__
 #define __WINE_LOCALSPL_PRIVATE__
 
-//#include <windef.h>
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winreg.h>
+#include <winspool.h>
+
+#include <wine/list.h>
+#include <wine/unicode.h>
+#include <ddk/winsplp.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(localspl);
+
+#include "resource.h"
 
 /* ## DLL-wide Globals ## */
 extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN;
 void setup_provider(void) DECLSPEC_HIDDEN;
 
-/* ## Resource-ID ## */
-#define IDS_LOCALPORT       500
-#define IDS_LOCALMONITOR    507
-
-/* ## Reserved memorysize for the strings (in WCHAR) ## */
-#define IDS_LOCALMONITOR_MAXLEN 64
-#define IDS_LOCALPORT_MAXLEN 32
-
 /* ## Type of Ports ## */
 /* windows types */
 #define PORT_IS_UNKNOWN  0

diff --git a/reactos/dll/win32/localspl/provider.c b/reactos/dll/win32/localspl/provider.c
index 864d434..06ac03f 100644 (file)
--- a/reactos/dll/win32/localspl/provider.c
+++ b/reactos/dll/win32/localspl/provider.c
@@ -18,28 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winreg.h>
-#include <winspool.h>
-#include <winuser.h>
-#include <ddk/winddiui.h>
-#include <ddk/winsplp.h>
-
-#include <wine/list.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
 #include "localspl_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(localspl);
+#include <ddk/winddiui.h>
 
 /* ############################### */
 

diff --git a/reactos/dll/win32/localspl/resource.h b/reactos/dll/win32/localspl/resource.h
new file mode 100644 (file)
index 0000000..6a961f9
--- /dev/null
+++ b/reactos/dll/win32/localspl/resource.h
@@ -0,0 +1,9 @@
+#pragma once
+
+/* ## Resource-ID ## */
+#define IDS_LOCALPORT       500
+#define IDS_LOCALMONITOR    507
+
+/* ## Reserved memorysize for the strings (in WCHAR) ## */
+#define IDS_LOCALMONITOR_MAXLEN 64
+#define IDS_LOCALPORT_MAXLEN 32