* Create a main header and move some inclusions to it.
* 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=61398
This commit is contained in:
Amine Khaldi 2013-12-25 11:26:57 +00:00
parent 673d558994
commit 642f87027e
34 changed files with 30 additions and 129 deletions

View file

@ -18,17 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <winnetwk.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
#include "precomp.h"
/*****************************************************************
* WNetLogoffA [MPR.@]

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
/* Czech strings in CP1250 */

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
#pragma code_page(65001)
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
/* UTF-8 */
#pragma code_page(65001)

View file

@ -20,8 +20,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
STRINGTABLE

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
/* UTF-8 */
#pragma code_page(65001)

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
/* UTF-8 */
#pragma code_page(65001)

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
STRINGTABLE

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
STRINGTABLE

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
#pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

View file

@ -17,8 +17,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
/* UTF-8 */
#pragma code_page(65001)

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
STRINGTABLE

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -19,8 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
/* UTF-8 */
#pragma code_page(65001)

View file

@ -18,8 +18,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "mprres.h"
/* Chinese text is encoded in UTF-8 */
#pragma code_page(65001)

View file

@ -17,10 +17,10 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
//#include "windef.h"
//#include "winbase.h"
//#include "winuser.h"
//#include "mprres.h"
#include <winuser.h>
#include "mprres.h"
#include "version.rc"

View file

@ -18,19 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "objbase.h"
//#include "winnetwk.h"
#include <wine/debug.h>
#include "precomp.h"
#include "wnetpriv.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
/*
* FIXME: The following routines should use a private heap ...
*/

View file

@ -18,9 +18,6 @@
#ifndef __WINE_MPRRES_H__
#define __WINE_MPRRES_H__
//#include <windef.h>
#include <winuser.h>
#define IDS_ENTIRENETWORK 1
#define IDD_PROXYDLG 0x400

View file

@ -18,17 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <winnetwk.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
#include "precomp.h"
/*****************************************************************
* MultinetGetConnectionPerformanceA [MPR.@]

View file

@ -24,9 +24,6 @@
#ifndef _NETSPI_H_
#define _NETSPI_H_
//#include "windef.h"
#include <winnetwk.h>
/*
* Note: The Unicode variants of all these routines/structures
* apparently don't exist, at least not in Win95 ...

View file

@ -19,23 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#include <config.h>
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "winuser.h"
#include <netspi.h>
#include <wine/debug.h>
//#include "winerror.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
//#include "wine/unicode.h"
#include "precomp.h"
#include "netspi.h"
#include "mprres.h"
/***********************************************************************

View file

@ -0,0 +1,18 @@
#ifndef _MPR_PCH_
#define _MPR_PCH_
#include <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#include <windef.h>
#include <winbase.h>
#include <winuser.h>
#include <winreg.h>
#include <winnetwk.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
#endif /* _MPR_PCH_ */

View file

@ -19,19 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#include "precomp.h"
//#include <stdarg.h>
#include <stdio.h>
#include <windef.h>
#include <winbase.h>
#include <winnetwk.h>
#include <winreg.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
static const char mpr_key[] = "Software\\Wine\\Wine\\Mpr\\";
static inline BYTE hex( BYTE x )

View file

@ -20,25 +20,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#include "precomp.h"
//#include <stdarg.h>
#include <windef.h>
//#include "winbase.h"
//#include "winnls.h"
#include <winioctl.h>
#include <winnetwk.h>
#include <npapi.h>
#include <winreg.h>
//#include "winuser.h"
#define WINE_MOUNTMGR_EXTENSIONS
#include <ddk/mountmgr.h>
#include <wine/debug.h>
#include <wine/unicode.h>
#include "mprres.h"
//#include "wnetpriv.h"
WINE_DEFAULT_DEBUG_CHANNEL(mpr);
#include "mprres.h"
/* Data structures representing network service providers. Assumes only one
* thread creates them, and that they are constant for the life of the process