Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61391: [MAPI32] * 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 ...
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 22:50:09 2013 New Revision: 61391 URL: http://svn.reactos.org/svn/reactos?rev=61391&view=rev Log: [MAPI32] * 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 Added: trunk/reactos/dll/win32/mapi32/precomp.h (with props) Modified: trunk/reactos/dll/win32/mapi32/imalloc.c trunk/reactos/dll/win32/mapi32/lang/Cy.rc trunk/reactos/dll/win32/mapi32/lang/Da.rc trunk/reactos/dll/win32/mapi32/lang/De.rc trunk/reactos/dll/win32/mapi32/lang/En.rc trunk/reactos/dll/win32/mapi32/lang/Es.rc trunk/reactos/dll/win32/mapi32/lang/Fr.rc trunk/reactos/dll/win32/mapi32/lang/Ga.rc trunk/reactos/dll/win32/mapi32/lang/He.rc trunk/reactos/dll/win32/mapi32/lang/Hu.rc trunk/reactos/dll/win32/mapi32/lang/It.rc trunk/reactos/dll/win32/mapi32/lang/Ja.rc trunk/reactos/dll/win32/mapi32/lang/Ko.rc trunk/reactos/dll/win32/mapi32/lang/Lt.rc trunk/reactos/dll/win32/mapi32/lang/Nl.rc trunk/reactos/dll/win32/mapi32/lang/No.rc trunk/reactos/dll/win32/mapi32/lang/Pl.rc trunk/reactos/dll/win32/mapi32/lang/Pt.rc trunk/reactos/dll/win32/mapi32/lang/Ro.rc trunk/reactos/dll/win32/mapi32/lang/Ru.rc trunk/reactos/dll/win32/mapi32/lang/Si.rc trunk/reactos/dll/win32/mapi32/lang/Uk.rc trunk/reactos/dll/win32/mapi32/mapi32_main.c trunk/reactos/dll/win32/mapi32/prop.c trunk/reactos/dll/win32/mapi32/res.h trunk/reactos/dll/win32/mapi32/sendmail.c trunk/reactos/dll/win32/mapi32/stubs.c trunk/reactos/dll/win32/mapi32/util.c trunk/reactos/dll/win32/mapi32/version.rc Modified: trunk/reactos/dll/win32/mapi32/imalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/imalloc.c… ============================================================================== --- trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/imalloc.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -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; Modified: trunk/reactos/dll/win32/mapi32/lang/Cy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Cy.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Cy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Cy.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - LANGUAGE LANG_WELSH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Da.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Da.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/De.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/De.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/En.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/En.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Es.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Es.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Fr.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Fr.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ga.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ga.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ga.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ga.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - LANGUAGE LANG_GAELIC, SUBLANG_GAELIC STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/He.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/He.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -21,8 +21,6 @@ * */ -#include "res.h" - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Hu.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Hu.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/It.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/It.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ja.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ja.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ko.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ko.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Lt.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Lt.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Nl.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Nl.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/No.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/No.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - #pragma code_page(65001) LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL Modified: trunk/reactos/dll/win32/mapi32/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Pl.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Pl.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/mapi32/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Pt.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Pt.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - #pragma code_page(65001) LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN Modified: trunk/reactos/dll/win32/mapi32/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ro.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ro.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -18,8 +18,6 @@ * */ -#include "res.h" - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Ru.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Ru.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Si.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Si.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,8 +19,6 @@ * */ -#include "res.h" - #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/mapi32/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/lang/Uk.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/lang/Uk.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -20,8 +20,6 @@ * */ -#include "res.h" - /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_ma… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32_main.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -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 <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "objbase.h" -#include <initguid.h> +#include "precomp.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; Added: trunk/reactos/dll/win32/mapi32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/mapi32/precomp.h (added) +++ trunk/reactos/dll/win32/mapi32/precomp.h [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -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_ */ Propchange: trunk/reactos/dll/win32/mapi32/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mapi32/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/prop.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/prop.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -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 <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 "precomp.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); Modified: trunk/reactos/dll/win32/mapi32/res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/res.h?rev… ============================================================================== --- trunk/reactos/dll/win32/mapi32/res.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/res.h [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -19,7 +19,7 @@ * */ -//#include <windef.h> +#pragma once /* Strings */ #define IDS_NO_MAPI_CLIENT 1 Modified: trunk/reactos/dll/win32/mapi32/sendmail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/sendmail.… ============================================================================== --- trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/sendmail.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -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 <config.h> -//#include "wine/port.h" - -//#include <stdio.h> -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" +#include "precomp.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); #define READ_BUF_SIZE 4096 Modified: trunk/reactos/dll/win32/mapi32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -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; Modified: trunk/reactos/dll/win32/mapi32/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/util.c?re… ============================================================================== --- trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/util.c [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -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 <stdarg.h> +#include "precomp.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, Modified: trunk/reactos/dll/win32/mapi32/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/version.r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/version.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/version.rc [iso-8859-1] Tue Dec 24 22:50:09 2013 @@ -15,6 +15,8 @@ * 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 "res.h" #define WINE_FILEDESCRIPTION_STR "Wine Messaging API" #define WINE_FILENAME_STR "mapi32.dll"

1 0

[hbelusca] 61390: [NTVDM] - BIOS: Fix setting video page parameters when setting mode, and effectively fix setting of video page (fix the involved CRTC registers !!). Now Advanced NetWars works wit...
by hbelusca＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: hbelusca Date: Tue Dec 24 22:40:15 2013 New Revision: 61390 URL: http://svn.reactos.org/svn/reactos?rev=61390&view=rev Log: [NTVDM] - BIOS: Fix setting video page parameters when setting mode, and effectively fix setting of video page (fix the involved CRTC registers !!). Now Advanced NetWars works without flickering. - VGA: Fix code presentation. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -254,7 +254,7 @@ }; /* See http://wiki.osdev.org/Drawing_In_Protected_Mode#Locating_Video_Memory */ -static PVGA_REGISTERS VideoModes[] = +static PVGA_REGISTERS VideoModes[BIOS_MAX_VIDEO_MODE + 1] = { &VideoMode_40x25_text, /* Mode 00h */ // 16 color (mono) &VideoMode_40x25_text, /* Mode 01h */ // 16 color @@ -272,10 +272,21 @@ &VideoMode_320x200_16color, /* Mode 0Dh */ // EGA 320*200 16 color &VideoMode_640x200_16color, /* Mode 0Eh */ // EGA 640*200 16 color NULL, /* Mode 0Fh */ // EGA 640*350 mono - &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 16 color + &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 HiRes 16 color &VideoMode_640x480_2color, /* Mode 11h */ // VGA 640*480 mono &VideoMode_640x480_16color, /* Mode 12h */ // VGA &VideoMode_320x200_256color, /* Mode 13h */ // VGA +}; + +// FIXME: Are they computable with the previous data ?? +// Values taken from DosBox +static WORD VideoModePageSize[BIOS_MAX_VIDEO_MODE + 1] = +{ + 0x0800, 0x0800, 0x1000, 0x1000, + 0x4000, 0x4000, 0x4000, 0x1000, + 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x2000, 0x4000, 0x8000, + 0x8000, 0xA000, 0xA000, 0x2000 }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -469,6 +480,8 @@ BOOLEAN BiosSetVideoMode(BYTE ModeNumber) { INT i; + BYTE Page; + COORD Resolution; PVGA_REGISTERS VgaMode = VideoModes[ModeNumber]; @@ -504,12 +517,20 @@ // Bda->CrtModeControl; // Bda->CrtColorPaletteMask; + // Bda->EGAFlags; + // Bda->VGAFlags; /* Update the values in the BDA */ - Bda->VideoMode = ModeNumber; - Bda->VideoPage = 0; - Bda->VideoPageSize = BIOS_PAGE_SIZE; - Bda->VideoPageOffset = 0; + Bda->VideoMode = ModeNumber; + Bda->VideoPageSize = VideoModePageSize[ModeNumber]; + Bda->VideoPage = 0; + Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; + + /* Set the start address in the CRTC */ + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); + VgaWritePort(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_HIGH_REG); + VgaWritePort(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); /* Get the character height */ VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_MAX_SCAN_LINE_REG); @@ -519,27 +540,39 @@ Bda->ScreenColumns = Resolution.X; Bda->ScreenRows = Resolution.Y - 1; + /* Set cursor position for each page */ + for (Page = 0; Page < BIOS_MAX_PAGES; ++Page) + BiosSetCursorPosition(0, 0, Page); + return TRUE; } BOOLEAN BiosSetVideoPage(BYTE PageNumber) { + BYTE Row, Column; + /* Check if the page exists */ if (PageNumber >= BIOS_MAX_PAGES) return FALSE; /* Check if this is the same page */ if (PageNumber == Bda->VideoPage) return TRUE; - /* Set the values in the BDA */ - Bda->VideoPage = PageNumber; - Bda->VideoPageSize = BIOS_PAGE_SIZE; - Bda->VideoPageOffset = PageNumber * BIOS_PAGE_SIZE; + /* Update the values in the BDA */ + Bda->VideoPage = PageNumber; + Bda->VideoPageOffset = Bda->VideoPage * Bda->VideoPageSize; /* Set the start address in the CRTC */ - VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_LOW_REG); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_LOW_REG); VgaWritePort(VGA_CRTC_DATA , LOBYTE(Bda->VideoPageOffset)); - VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_CURSOR_LOC_HIGH_REG); + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_START_ADDR_HIGH_REG); VgaWritePort(VGA_CRTC_DATA , HIBYTE(Bda->VideoPageOffset)); + + /* + * Get the cursor location (we don't update anything on the BIOS side + * but we update the cursor location on the VGA side). + */ + BiosGetCursorPosition(&Row, &Column, PageNumber); + BiosSetCursorPosition(Row, Column, PageNumber); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -38,7 +38,6 @@ #define BIOS_DEFAULT_VIDEO_MODE 0x03 #define BIOS_MAX_PAGES 8 -#define BIOS_PAGE_SIZE 0x1000 #define BIOS_MAX_VIDEO_MODE 0x13 #define DEFAULT_ATTRIBUTE 0x07 Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -645,8 +645,8 @@ INT i, j, k; COORD Resolution = VgaGetDisplayResolution(); INT AddressSize = VgaGetAddressSize(); - DWORD Address = (VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG] << 8) - + VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG]; + DWORD Address = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG], + VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG]); DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; /* Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Tue Dec 24 22:40:15 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: vga.h - * PURPOSE: VGA hardware emulation (header file) + * PURPOSE: VGA hardware emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */

1 0

[hbelusca] 61389: [NTVDM]: DOS: Add some description / fix a comment.
by hbelusca＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: hbelusca Date: Tue Dec 24 22:33:16 2013 New Revision: 61389 URL: http://svn.reactos.org/svn/reactos?rev=61389&view=rev Log: [NTVDM]: DOS: Add some description / fix a comment. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Dec 24 22:33:16 2013 @@ -1377,6 +1377,11 @@ { WORD InfoWord = 0; + /* + * See Ralf Brown: http://www.ctyme.com/intr/rb-2820.htm + * for a list of possible flags. + */ + if (Handle == DosSystemFileTable[0]) { /* Console input */ @@ -1388,7 +1393,7 @@ InfoWord |= 1 << 1; } - /* It is a character device */ + /* It is a device */ InfoWord |= 1 << 7; /* Return the device information word */

1 0

[akhaldi] 61388: [LSASRV] * Set the default debugging channel globally through the main header. CORE-7716
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 22:26:13 2013 New Revision: 61388 URL: http://svn.reactos.org/svn/reactos?rev=61388&view=rev Log: [LSASRV] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lookup.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/policy.c trunk/reactos/dll/win32/lsasrv/privileges.c trunk/reactos/dll/win32/lsasrv/registry.c trunk/reactos/dll/win32/lsasrv/security.c trunk/reactos/dll/win32/lsasrv/session.c trunk/reactos/dll/win32/lsasrv/utils.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -6,11 +6,7 @@ * COPYRIGHT: Copyright 2013 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); typedef enum _LSA_TOKEN_INFORMATION_TYPE { Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -6,13 +6,7 @@ * COPYRIGHT: Copyright 2009 Eric Kohl */ -/* INCLUDES ****************************************************************/ - - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - static LIST_ENTRY LsapLogonContextList; Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2011 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -7,12 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -7,12 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* GLOBALS *****************************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2006-2009 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -7,14 +7,17 @@ * PROGRAMMERS: Eric Kohl */ +#include <stdarg.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H -#include <stdarg.h> + #include <windef.h> #include <winbase.h> #include <winreg.h> #include <winuser.h> + #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/kefuncs.h> @@ -30,15 +33,13 @@ #include <ntsam.h> #include <ntlsa.h> -//#include <ntsecapi.h> #include <sddl.h> - -//#include <string.h> #include <lsass.h> #include <lsa_s.h> #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); #include "resources.h" Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2011 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -8,9 +8,6 @@ */ #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - typedef struct { Modified: trunk/reactos/dll/win32/lsasrv/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/registry.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/registry.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -7,11 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/security.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/security.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -6,12 +6,7 @@ * COPYRIGHT: Copyright 2012 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - /* FUNCTIONS ***************************************************************/ Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -6,11 +6,7 @@ * COPYRIGHT: Copyright 2013 Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); typedef struct _LSAP_LOGON_SESSION { Modified: trunk/reactos/dll/win32/lsasrv/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/utils.c?r… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/utils.c [iso-8859-1] Tue Dec 24 22:26:13 2013 @@ -7,15 +7,7 @@ * PROGRAMMERS: Eric Kohl */ -/* INCLUDES ****************************************************************/ - #include "lsasrv.h" - -WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); - - -/* GLOBALS *****************************************************************/ - /* FUNCTIONS ***************************************************************/

1 0

[akhaldi] 61387: * Forgot this file.
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 21:56:03 2013 New Revision: 61387 URL: http://svn.reactos.org/svn/reactos?rev=61387&view=rev Log: * Forgot this file. Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Tue Dec 24 21:56:03 2013 @@ -45,7 +45,7 @@ add_typelib(jsglobal.idl) add_dependencies(jscript jscript_idlheader stdole2) # jsglobal.tlb needs stdole2.tlb set_module_type(jscript win32dll) -target_link_libraries(jscript wine) +target_link_libraries(jscript uuid wine) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_pch(jscript jscript.h) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all)

1 0

[akhaldi] 61386: [JSCRIPT] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in...
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 21:47:58 2013 New Revision: 61386 URL: http://svn.reactos.org/svn/reactos?rev=61386&view=rev Log: [JSCRIPT] * Move some inclusions to the main header. * 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 Modified: trunk/reactos/dll/win32/jscript/activex.c trunk/reactos/dll/win32/jscript/array.c trunk/reactos/dll/win32/jscript/bool.c trunk/reactos/dll/win32/jscript/compile.c trunk/reactos/dll/win32/jscript/date.c trunk/reactos/dll/win32/jscript/decode.c trunk/reactos/dll/win32/jscript/dispex.c trunk/reactos/dll/win32/jscript/engine.c trunk/reactos/dll/win32/jscript/error.c trunk/reactos/dll/win32/jscript/function.c trunk/reactos/dll/win32/jscript/global.c trunk/reactos/dll/win32/jscript/jscript.c trunk/reactos/dll/win32/jscript/jscript.h trunk/reactos/dll/win32/jscript/jscript_main.c trunk/reactos/dll/win32/jscript/jsregexp.c trunk/reactos/dll/win32/jscript/jsstr.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc trunk/reactos/dll/win32/jscript/lang/jscript_De.rc trunk/reactos/dll/win32/jscript/lang/jscript_En.rc trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc trunk/reactos/dll/win32/jscript/lang/jscript_He.rc trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc trunk/reactos/dll/win32/jscript/lang/jscript_It.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc trunk/reactos/dll/win32/jscript/lang/jscript_No.rc trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc trunk/reactos/dll/win32/jscript/lex.c trunk/reactos/dll/win32/jscript/math.c trunk/reactos/dll/win32/jscript/number.c trunk/reactos/dll/win32/jscript/object.c trunk/reactos/dll/win32/jscript/parser.tab.c trunk/reactos/dll/win32/jscript/regexp.c trunk/reactos/dll/win32/jscript/resource.h trunk/reactos/dll/win32/jscript/rsrc.rc trunk/reactos/dll/win32/jscript/string.c trunk/reactos/dll/win32/jscript/vbarray.c Modified: trunk/reactos/dll/win32/jscript/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/activex.… ============================================================================== --- trunk/reactos/dll/win32/jscript/activex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/activex.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,16 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "jscript.h" + #include <objsafe.h> #include <mshtmhst.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* Defined as extern in urlmon.idl, but not exported by uuid.lib */ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = Modified: trunk/reactos/dll/win32/jscript/array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/array.c?… ============================================================================== --- trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/array.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,16 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <wine/config.h> -#include <wine/port.h> - -#include <math.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; Modified: trunk/reactos/dll/win32/jscript/bool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/bool.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/bool.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -19,10 +19,6 @@ #include "jscript.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); - typedef struct { jsdisp_t dispex; Modified: trunk/reactos/dll/win32/jscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/compile.… ============================================================================== --- trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/compile.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,15 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <math.h> -#include <assert.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); + WINE_DECLARE_DEBUG_CHANNEL(jscript_disas); typedef struct _statement_ctx_t { Modified: trunk/reactos/dll/win32/jscript/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/date.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/date.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,18 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <limits.h> -//#include <math.h> -#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* 1601 to 1970 is 369 years plus 89 leap days */ #define TIME_EPOCH ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000) Modified: trunk/reactos/dll/win32/jscript/decode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/decode.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/decode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/decode.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,10 +17,6 @@ */ #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* * This file implements algorithm for decoding scripts encoded by Modified: trunk/reactos/dll/win32/jscript/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/dispex.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/dispex.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,14 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "jscript.h" - -//#include "wine/unicode.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* * This IID is used to get jsdisp_t objecto from interface. Modified: trunk/reactos/dll/win32/jscript/engine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/engine.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/engine.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,18 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <assert.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; Modified: trunk/reactos/dll/win32/jscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/error.c?… ============================================================================== --- trunk/reactos/dll/win32/jscript/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/error.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,16 +15,8 @@ * 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 <config.h> -#include <wine/port.h> - -//#include <math.h> #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; Modified: trunk/reactos/dll/win32/jscript/function.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/function… ============================================================================== --- trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/function.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,14 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; Modified: trunk/reactos/dll/win32/jscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/global.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/global.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,18 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -//#include <limits.h> - #include "jscript.h" -#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff) Modified: trunk/reactos/dll/win32/jscript/jscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "jscript.h" -#include "engine.h" + #include <objsafe.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); #ifdef _WIN64 Modified: trunk/reactos/dll/win32/jscript/jscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript.h [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,12 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <wine/config.h> +#include <wine/port.h> + +#include <assert.h> +#include <math.h> +#include <stdarg.h> +#include <stdio.h> + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COM_NO_WINDOWS_H - -#include <stdarg.h> -#include <stdio.h> #define COBJMACROS @@ -32,10 +37,13 @@ #include <dispex.h> #include <activscp.h> -#include "resource.h" - #include <wine/unicode.h> #include <wine/list.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +#include "resource.h" typedef struct _jsval_t jsval_t; typedef struct _jsstr_t jsstr_t; @@ -545,3 +553,6 @@ { InterlockedDecrement(&module_ref); } + +#include "engine.h" +#include "regexp.h" Modified: trunk/reactos/dll/win32/jscript/jscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript_main.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,21 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <initguid.h> - #include "jscript.h" -#include <winreg.h> -#include <advpub.h> -#include <activaut.h> -#include <objsafe.h> -#include <mshtmhst.h> +#include <initguid.h> #include <rpcproxy.h> #include <jscript_classes.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); LONG module_ref = 0; Modified: trunk/reactos/dll/win32/jscript/jsregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsregexp… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsregexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsregexp.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,14 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <math.h> - #include "jscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; Modified: trunk/reactos/dll/win32/jscript/jsstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsstr.c?… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsstr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsstr.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,11 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h> /* * This is the length of a string that is considered to be long enough to be Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,18 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <assert.h> - #include "jscript.h" -//#include "engine.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); + WINE_DECLARE_DEBUG_CHANNEL(heap); const char *debugstr_variant(const VARIANT *v) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Da.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_De.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_En.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Es.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" /*UTF-8*/ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Fr.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_He.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Hu.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_It.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ja.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ko.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Lt.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Nl.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/jscript/lang/jscript_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_No.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Pl.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Pt.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ro.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,8 +17,6 @@ * 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 "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Ru.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Si.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,8 +15,6 @@ * 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 "resource.h" #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… ============================================================================== --- trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lang/jscript_Uk.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,8 +16,6 @@ * 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 "resource.h" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/jscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lex.c?re… ============================================================================== --- trunk/reactos/dll/win32/jscript/lex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/lex.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,22 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - -//#include <limits.h> - #include "jscript.h" -//#include "activscp.h" -//#include "objsafe.h" -#include "engine.h" #include "parser.tab.h" - -#include <wine/debug.h> -//#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff) Modified: trunk/reactos/dll/win32/jscript/math.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/math.c?r… ============================================================================== --- trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/math.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -17,18 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -//#include <limits.h> - #include "jscript.h" + #include <ntsecapi.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); static const WCHAR EW[] = {'E',0}; static const WCHAR LOG2EW[] = {'L','O','G','2','E',0}; Modified: trunk/reactos/dll/win32/jscript/number.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/number.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/number.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,17 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -#include <wine/port.h> - -//#include <math.h> -#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; Modified: trunk/reactos/dll/win32/jscript/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/object.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/object.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "jscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0}; Modified: trunk/reactos/dll/win32/jscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/parser.t… ============================================================================== --- trunk/reactos/dll/win32/jscript/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/parser.tab.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -76,13 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "parser.y" - #include "jscript.h" -#include "engine.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); static int parser_error(parser_ctx_t*,const char*); static void set_error(parser_ctx_t*,UINT); Modified: trunk/reactos/dll/win32/jscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/regexp.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/regexp.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -31,14 +31,7 @@ * the Initial Developer. All Rights Reserved. */ -#include <assert.h> - #include "jscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); /* FIXME: Better error handling */ #define ReportRegExpError(a,b,c) Modified: trunk/reactos/dll/win32/jscript/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/resource… ============================================================================== --- trunk/reactos/dll/win32/jscript/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/resource.h [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windef.h> +#pragma once #define JSCRIPT_MAJOR_VERSION 5 #define JSCRIPT_MINOR_VERSION 8 Modified: trunk/reactos/dll/win32/jscript/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/jscript/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/rsrc.rc [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -15,6 +15,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 "resource.h" /* @makedep: jscript.rgs */ 2 WINE_REGISTRY jscript.rgs Modified: trunk/reactos/dll/win32/jscript/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/string.c… ============================================================================== --- trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/string.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -16,15 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #include "jscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define UINT32_MAX 0xffffffff Modified: trunk/reactos/dll/win32/jscript/vbarray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/vbarray.… ============================================================================== --- trunk/reactos/dll/win32/jscript/vbarray.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/vbarray.c [iso-8859-1] Tue Dec 24 21:47:58 2013 @@ -18,10 +18,6 @@ #include "jscript.h" -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(jscript); - typedef struct { jsdisp_t dispex;

1 0

[akhaldi] 61385: [ITSS] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. CORE-7716
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 21:45:30 2013 New Revision: 61385 URL: http://svn.reactos.org/svn/reactos?rev=61385&view=rev Log: [ITSS] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. CORE-7716 Added: trunk/reactos/dll/win32/itss/precomp.h (with props) Modified: trunk/reactos/dll/win32/itss/chm_lib.c trunk/reactos/dll/win32/itss/itss.c trunk/reactos/dll/win32/itss/lzx.c trunk/reactos/dll/win32/itss/moniker.c trunk/reactos/dll/win32/itss/protocol.c trunk/reactos/dll/win32/itss/storage.c Modified: trunk/reactos/dll/win32/itss/chm_lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/chm_lib.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/chm_lib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/chm_lib.c [iso-8859-1] Tue Dec 24 21:45:30 2013 @@ -54,20 +54,7 @@ * * ***************************************************************************/ -#include <config.h> -#include <wine/port.h> - -//#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> - -//#include "windef.h" -//#include "winbase.h" -#include <wine/unicode.h> - -#include "chm_lib.h" -#include "lzx.h" +#include "precomp.h" #define CHM_ACQUIRE_LOCK(a) do { \ EnterCriticalSection(&(a)); \ Modified: trunk/reactos/dll/win32/itss/itss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/itss.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/itss/itss.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/itss.c [iso-8859-1] Tue Dec 24 21:45:30 2013 @@ -21,34 +21,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 <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -#include <ole2.h> +#include "precomp.h" + #include <rpcproxy.h> -//#include "advpub.h" - -//#include "wine/unicode.h" -#include <wine/debug.h> - -#include "itsstor.h" - -#include <initguid.h> -#include <wine/itss.h> - -WINE_DEFAULT_DEBUG_CHANNEL(itss); static HRESULT ITSS_create(IUnknown *pUnkOuter, LPVOID *ppObj); Modified: trunk/reactos/dll/win32/itss/lzx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/lzx.c?rev=6… ============================================================================== --- trunk/reactos/dll/win32/itss/lzx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/lzx.c [iso-8859-1] Tue Dec 24 21:45:30 2013 @@ -35,14 +35,7 @@ * ***************************************************************************/ -#include "lzx.h" -#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" /* sized types */ typedef unsigned char UBYTE; /* 8 bits exactly */ Modified: trunk/reactos/dll/win32/itss/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/moniker.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/moniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/moniker.c [iso-8859-1] Tue Dec 24 21:45:30 2013 @@ -20,29 +20,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 <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include <wine/itss.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -#include "itsstor.h" - -WINE_DEFAULT_DEBUG_CHANNEL(itss); +#include "precomp.h" /*****************************************************************************/ Added: trunk/reactos/dll/win32/itss/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/precomp.h?r… ============================================================================== --- trunk/reactos/dll/win32/itss/precomp.h (added) +++ trunk/reactos/dll/win32/itss/precomp.h [iso-8859-1] Tue Dec 24 21:45:30 2013 @@ -0,0 +1,30 @@ +#ifndef _ITSS_PCH_ +#define _ITSS_PCH_ + +#include <config.h> +#include <wine/port.h> + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <initguid.h> + +#include <wine/itss.h> +#include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(itss); + +#include "chm_lib.h" +#include "itsstor.h" +#include "lzx.h" + +#endif /* _ITSS_PCH_ */ Propchange: trunk/reactos/dll/win32/itss/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/itss/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/protocol.c?… ============================================================================== --- trunk/reactos/dll/win32/itss/protocol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/protocol.c [iso-8859-1] Tue Dec 24 21:45:30 2013 @@ -16,28 +16,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 <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" +#include "precomp.h" + #include <winreg.h> -#include <ole2.h> #include <urlmon.h> #include <shlwapi.h> -#include "itsstor.h" -#include "chm_lib.h" - -#include <wine/debug.h> -#include <wine/unicode.h> - -WINE_DEFAULT_DEBUG_CHANNEL(itss); typedef struct { IInternetProtocol IInternetProtocol_iface; Modified: trunk/reactos/dll/win32/itss/storage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/storage.c?r… ============================================================================== --- trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/storage.c [iso-8859-1] Tue Dec 24 21:45:30 2013 @@ -20,30 +20,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 <config.h> - -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> - -#include "chm_lib.h" -#include "itsstor.h" - -#include <wine/itss.h> -#include <wine/unicode.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(itss); +#include "precomp.h" /************************************************************************/

1 0

[akhaldi] 61384: [I8042PRT] * Define INITGUID in the main header. CORE-7716
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 21:16:17 2013 New Revision: 61384 URL: http://svn.reactos.org/svn/reactos?rev=61384&view=rev Log: [I8042PRT] * Define INITGUID in the main header. CORE-7716 Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c [iso-8859-1] Tue Dec 24 21:16:17 2013 @@ -11,7 +11,6 @@ /* INCLUDES ******************************************************************/ -#define INITGUID #include "i8042prt.h" /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h [iso-8859-1] Tue Dec 24 21:16:17 2013 @@ -1,3 +1,6 @@ + +#define INITGUID + #include <ntifs.h> #include <kbdmou.h> #include <ntdd8042.h>

1 0

[akhaldi] 61383: [INETCOMM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 21:14:27 2013 New Revision: 61383 URL: http://svn.reactos.org/svn/reactos?rev=61383&view=rev Log: [INETCOMM] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/inetcomm/imaptransport.c trunk/reactos/dll/win32/inetcomm/inetcomm_main.c trunk/reactos/dll/win32/inetcomm/inetcomm_private.h trunk/reactos/dll/win32/inetcomm/internettransport.c trunk/reactos/dll/win32/inetcomm/mimeintl.c trunk/reactos/dll/win32/inetcomm/mimeole.c trunk/reactos/dll/win32/inetcomm/pop3transport.c trunk/reactos/dll/win32/inetcomm/smtptransport.c Modified: trunk/reactos/dll/win32/inetcomm/imaptransport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/imaptra… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/imaptransport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/imaptransport.c [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -18,26 +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 - -#define COBJMACROS - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winnt.h" -//#include "winuser.h" -#include <objbase.h> -#include <mimeole.h> -#include <wine/debug.h> - #include "inetcomm_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct { Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_main.c [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -18,29 +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 - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winnt.h" -//#include "winuser.h" -#include <ole2.h> -//#include "ocidl.h" +#include "inetcomm_private.h" + #include <rpcproxy.h> -#include <initguid.h> -#include <mimeole.h> - -#include "inetcomm_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); static HINSTANCE instance; Modified: trunk/reactos/dll/win32/inetcomm/inetcomm_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/inetcom… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/inetcomm_private.h [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -18,10 +18,28 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <initguid.h> +#include <mimeole.h> #include <winsock2.h> -//#include "winuser.h" -//#include "objbase.h" #include <imnxport.h> + +#include <wine/list.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct InternetTransport InternetTransport; Modified: trunk/reactos/dll/win32/inetcomm/internettransport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/interne… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/internettransport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/internettransport.c [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -18,28 +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 - -#define COBJMACROS - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> +#include "inetcomm_private.h" + #include <ws2tcpip.h> -//#include "winnt.h" -#include <objbase.h> -//#include "ole2.h" -#include <mimeole.h> - -#include <stdio.h> - -#include <wine/debug.h> - -#include "inetcomm_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); static const WCHAR wszClassName[] = {'T','h','o','r','C','o','n','n','W','n','d','C','l','a','s','s',0}; Modified: trunk/reactos/dll/win32/inetcomm/mimeintl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeint… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeintl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeintl.c [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -18,32 +18,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 - -#define COBJMACROS -#define NONAMELESSUNION - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -//#include "objbase.h" -#include <ole2.h> -#include <mimeole.h> +#include "inetcomm_private.h" + #include <mlang.h> -#include <wine/list.h> #include <wine/unicode.h> -#include <wine/debug.h> - -#include "inetcomm_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct { Modified: trunk/reactos/dll/win32/inetcomm/mimeole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/mimeole… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/mimeole.c [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -19,29 +19,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 - -#define COBJMACROS -#define NONAMELESSUNION - -#include <stdarg.h> -//#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "objbase.h" -#include <ole2.h> -#include <mimeole.h> - -#include <wine/list.h> -#include <wine/debug.h> - #include "inetcomm_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct { Modified: trunk/reactos/dll/win32/inetcomm/pop3transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/pop3tra… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/pop3transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/pop3transport.c [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -18,27 +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 - -#define COBJMACROS -#define NONAMELESSUNION - -//#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winnt.h" -//#include "winuser.h" -#include <objbase.h> -#include <mimeole.h> -#include <wine/debug.h> - #include "inetcomm_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); enum parse_state { Modified: trunk/reactos/dll/win32/inetcomm/smtptransport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/smtptra… ============================================================================== --- trunk/reactos/dll/win32/inetcomm/smtptransport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetcomm/smtptransport.c [iso-8859-1] Tue Dec 24 21:14:27 2013 @@ -20,26 +20,7 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#define COBJMACROS - -//#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -//#include "winnt.h" -//#include "winuser.h" -#include <objbase.h> -#include <mimeole.h> -#include <wine/debug.h> - #include "inetcomm_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(inetcomm); typedef struct {

1 0

[akhaldi] 61382: [IMAGEHLP] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. CORE-7716
by akhaldi＠svn.reactos.org 24 Dec '13

24 Dec '13

Author: akhaldi Date: Tue Dec 24 21:02:32 2013 New Revision: 61382 URL: http://svn.reactos.org/svn/reactos?rev=61382&view=rev Log: [IMAGEHLP] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. CORE-7716 Added: trunk/reactos/dll/win32/imagehlp/precomp.h (with props) Modified: trunk/reactos/dll/win32/imagehlp/access.c trunk/reactos/dll/win32/imagehlp/imagehlp_main.c trunk/reactos/dll/win32/imagehlp/integrity.c trunk/reactos/dll/win32/imagehlp/modify.c Modified: trunk/reactos/dll/win32/imagehlp/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/access.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/access.c [iso-8859-1] Tue Dec 24 21:02:32 2013 @@ -18,19 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - -#include <stdarg.h> -//#include <string.h> -#include <windef.h> -#include <winbase.h> -//#include "winnt.h" -#include <winternl.h> -//#include "winerror.h" -#include <wine/debug.h> -#include <imagehlp.h> - -WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); +#include "precomp.h" /*********************************************************************** * Data Modified: trunk/reactos/dll/win32/imagehlp/imagehlp_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/imagehl… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/imagehlp_main.c [iso-8859-1] Tue Dec 24 21:02:32 2013 @@ -18,14 +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 "imagehlp.h" -//#include <wine/debug.h> +#include "precomp.h" /**********************************************************************/ DECLSPEC_HIDDEN HANDLE IMAGEHLP_hHeap = NULL; Modified: trunk/reactos/dll/win32/imagehlp/integrity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/integri… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/integrity.c [iso-8859-1] Tue Dec 24 21:02:32 2013 @@ -22,19 +22,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 "winerror.h" -//#include "winternl.h" -//#include "winnt.h" -#include <imagehlp.h> -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); +#include "precomp.h" /* * These functions are partially documented at: Modified: trunk/reactos/dll/win32/imagehlp/modify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/modify.… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/modify.c [iso-8859-1] Tue Dec 24 21:02:32 2013 @@ -18,18 +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 "winternl.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <imagehlp.h> - -WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); +#include "precomp.h" static WORD CalcCheckSum(DWORD StartValue, LPVOID BaseAddress, DWORD WordCount); Added: trunk/reactos/dll/win32/imagehlp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/precomp… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/precomp.h (added) +++ trunk/reactos/dll/win32/imagehlp/precomp.h [iso-8859-1] Tue Dec 24 21:02:32 2013 @@ -0,0 +1,16 @@ +#ifndef _IMAGEHLP_PCH_ +#define _IMAGEHLP_PCH_ + +#include <stdarg.h> + +#define WIN32_NO_STATUS + +#include <windef.h> +#include <winbase.h> +#include <winternl.h> +#include <imagehlp.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); + +#endif /* _IMAGEHLP_PCH_ */ Propchange: trunk/reactos/dll/win32/imagehlp/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs