Author: akhaldi Date: Tue Dec 24 20:40:55 2013 New Revision: 61376
URL: http://svn.reactos.org/svn/reactos?rev=61376&view=rev Log: [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
Added: trunk/reactos/dll/win32/localspl/resource.h (with props) Modified: trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc trunk/reactos/dll/win32/localspl/lang/spl_Da.rc trunk/reactos/dll/win32/localspl/lang/spl_De.rc trunk/reactos/dll/win32/localspl/lang/spl_En.rc trunk/reactos/dll/win32/localspl/lang/spl_Es.rc trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc trunk/reactos/dll/win32/localspl/lang/spl_He.rc trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc trunk/reactos/dll/win32/localspl/lang/spl_It.rc trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc trunk/reactos/dll/win32/localspl/lang/spl_No.rc trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc trunk/reactos/dll/win32/localspl/lang/spl_Si.rc trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc trunk/reactos/dll/win32/localspl/localmon.c trunk/reactos/dll/win32/localspl/localspl.rc trunk/reactos/dll/win32/localspl/localspl_main.c trunk/reactos/dll/win32/localspl/localspl_private.h trunk/reactos/dll/win32/localspl/provider.c
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Cy.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Da.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_De.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_En.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Es.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Fr.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_He.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Hu.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/lang/spl_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_It.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ja.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ko.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Lt.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Nl.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_No.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Pl.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Pt.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ro.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Ru.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Si.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Sv.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Uk.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/lang/spl... ============================================================================== --- trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/lang/spl_Zh.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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)
Modified: trunk/reactos/dll/win32/localspl/localmon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localmon... ============================================================================== --- trunk/reactos/dll/win32/localspl/localmon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localmon.c [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,29 +18,7 @@ * 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);
/*****************************************************/
Modified: trunk/reactos/dll/win32/localspl/localspl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localspl... ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl.rc [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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"
Modified: trunk/reactos/dll/win32/localspl/localspl_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localspl... ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl_main.c [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -18,21 +18,7 @@ * 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;
Modified: trunk/reactos/dll/win32/localspl/localspl_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/localspl... ============================================================================== --- trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/localspl_private.h [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -21,19 +21,34 @@ #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 */
Modified: trunk/reactos/dll/win32/localspl/provider.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/provider... ============================================================================== --- trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/localspl/provider.c [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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 "localspl_private.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);
/* ############################### */
Added: trunk/reactos/dll/win32/localspl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/resource... ============================================================================== --- trunk/reactos/dll/win32/localspl/resource.h (added) +++ trunk/reactos/dll/win32/localspl/resource.h [iso-8859-1] Tue Dec 24 20:40:55 2013 @@ -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
Propchange: trunk/reactos/dll/win32/localspl/resource.h ------------------------------------------------------------------------------ svn:eol-style = native