Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 12:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[LOCALSPL]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2013-12-24 20:40:55 +00:00
parent b975b24103
commit de4d0588b6
28 changed files with 35 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/localspl/lang/spl_Cy.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Da.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_De.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_En.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Es.rc
View file

@ -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)

2
reactos/dll/win32/localspl/lang/spl_Fr.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_He.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Hu.rc
View file

@ -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)

2
reactos/dll/win32/localspl/lang/spl_It.rc
View file

@ -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)

2
reactos/dll/win32/localspl/lang/spl_Ja.rc
View file

@ -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)

2
reactos/dll/win32/localspl/lang/spl_Ko.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Lt.rc
View file

@ -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)

2
reactos/dll/win32/localspl/lang/spl_Nl.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_No.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Pl.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Pt.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Ro.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Ru.rc
View file

@ -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)

2
reactos/dll/win32/localspl/lang/spl_Si.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Sv.rc
View file

@ -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

2
reactos/dll/win32/localspl/lang/spl_Uk.rc
View file

@ -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)

2
reactos/dll/win32/localspl/lang/spl_Zh.rc
View file

@ -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)

22
reactos/dll/win32/localspl/localmon.c
View file

@ -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;

5
reactos/dll/win32/localspl/localspl.rc
View file

@ -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"

14
reactos/dll/win32/localspl/localspl_main.c
View file

@ -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;
/*****************************************************

33
reactos/dll/win32/localspl/localspl_private.h
View file

@ -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

21
reactos/dll/win32/localspl/provider.c
View file

@ -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>
/* ############################### */

9
reactos/dll/win32/localspl/resource.h Normal file
View file

@ -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