Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MAPI32]

Browse source 
* Create a main header and move some inclusions to it.
* Set the default debugging channel globally through the main header.
* Remove inclusions that already exist in the main resource file.
CORE-7716

svn path=/trunk/; revision=61391
This commit is contained in:
Amine Khaldi 2013-12-24 22:50:09 +00:00
parent 3ebada04e3
commit 7286365580
30 changed files with 41 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/dll/win32/mapi32/imalloc.c
View file

@ -18,28 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
//#include "winreg.h"
//#include "winuser.h"
//#include "winerror.h"
//#include "winternl.h"
//#include "objbase.h"
//#include "shlwapi.h"
#include <mapiutil.h>
#include "util.h"
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
#include "precomp.h"
static const IMallocVtbl MAPI_IMalloc_vt;

2
reactos/dll/win32/mapi32/lang/Cy.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_WELSH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/mapi32/lang/Da.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/mapi32/lang/De.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
STRINGTABLE

2
reactos/dll/win32/mapi32/lang/En.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/mapi32/lang/Es.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Fr.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Ga.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_GAELIC, SUBLANG_GAELIC
STRINGTABLE

2
reactos/dll/win32/mapi32/lang/He.rc
View file

@ -21,8 +21,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/mapi32/lang/Hu.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/It.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Ja.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Ko.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Lt.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Nl.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/No.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
#pragma code_page(65001)
LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL

2
reactos/dll/win32/mapi32/lang/Pl.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE

2
reactos/dll/win32/mapi32/lang/Pt.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
#pragma code_page(65001)
LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN

2
reactos/dll/win32/mapi32/lang/Ro.rc
View file

@ -18,8 +18,6 @@
*
*/
#include "res.h"
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Ru.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

2
reactos/dll/win32/mapi32/lang/Si.rc
View file

@ -19,8 +19,6 @@
*
*/
#include "res.h"
#pragma code_page(65001)
LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

2
reactos/dll/win32/mapi32/lang/Uk.rc
View file

@ -20,8 +20,6 @@
*
*/
#include "res.h"
/* UTF-8 */
#pragma code_page(65001)

17
reactos/dll/win32/mapi32/mapi32_main.c
View file

@ -18,24 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "precomp.h"
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
//#include "winerror.h"
//#include "objbase.h"
#include <initguid.h>
#include <mapix.h>
//#include "mapiform.h"
//#include "mapi.h"
#include <wine/debug.h>
#include "util.h"
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0;
DECLSPEC_HIDDEN HINSTANCE hInstMAPI32;

30
reactos/dll/win32/mapi32/precomp.h Normal file
View file

@ -0,0 +1,30 @@
#ifndef _MAPI32_PCH_
#define _MAPI32_PCH_
#include <config.h>
#include <stdarg.h>
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#include <winreg.h>
#include <initguid.h>
#include <mapival.h>
#include <mapiutil.h>
#include <wine/unicode.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
#include "util.h"
#endif /* _MAPI32_PCH_ */

18
reactos/dll/win32/mapi32/prop.c
View file

@ -18,26 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "precomp.h"
#include <stdarg.h>
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
//#include "winerror.h"
//#include "winternl.h"
//#include "objbase.h"
#include <shlwapi.h>
#include <wine/list.h>
#include <wine/debug.h>
#include <wine/unicode.h>
#include <mapival.h>
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
BOOL WINAPI FBadRglpszA(LPSTR*,ULONG);

2
reactos/dll/win32/mapi32/res.h
View file

@ -19,7 +19,7 @@
*
*/
//#include <windef.h>
#pragma once
/* Strings */
#define IDS_NO_MAPI_CLIENT 1

30
reactos/dll/win32/mapi32/sendmail.c
View file

@ -19,37 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "precomp.h"
#include <config.h>
//#include "wine/port.h"
//#include <stdio.h>
#include <stdarg.h>
#define COBJMACROS
#include <windef.h>
#include <winbase.h>
//#include "winerror.h"
#include <winuser.h>
//#include "objbase.h"
//#include "objidl.h"
//#include "mapi.h"
//#include "mapix.h"
#include <mapiutil.h>
//#include "mapidefs.h"
//#include "winreg.h"
//#include "shellapi.h"
//#include "shlwapi.h"
#include <wine/debug.h>
#include <wine/unicode.h>
#include "util.h"
#include "res.h"
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
#include "res.h"
#define READ_BUF_SIZE 4096

2
reactos/dll/win32/mapi32/stubs.c
View file

@ -1,10 +1,12 @@
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include <stdarg.h>
#include <windef.h>
#include <winbase.h>
#include <mapix.h>
#include <reactos/debug.h>
typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK;

20
reactos/dll/win32/mapi32/util.c
View file

@ -19,32 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define WIN32_NO_STATUS
#define _INC_WINDOWS
#define COM_NO_WINDOWS_H
#include "precomp.h"
//#include <stdarg.h>
#include <stdio.h>
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include <windef.h>
#include <winbase.h>
#include <winreg.h>
//#include "winuser.h"
//#include "winerror.h"
#include <winternl.h>
//#include "objbase.h"
#include <shlwapi.h>
#include <wine/debug.h>
#include <wine/unicode.h>
#include <mapival.h>
#include <xcmc.h>
#include <msi.h>
#include "util.h"
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
static const BYTE digitsToHex[] = {
0,1,2,3,4,5,6,7,8,9,0xff,0xff,0xff,0xff,0xff,0xff,0xff,10,11,12,13,14,15,

2
reactos/dll/win32/mapi32/version.rc
View file

@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "res.h"
#define WINE_FILEDESCRIPTION_STR "Wine Messaging API"
#define WINE_FILENAME_STR "mapi32.dll"
#define WINE_FILEVERSION 1,0,0,0