Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[akhaldi] 61429: [OLEAUT32] * Create a main header and move some inclusions to it. * Remove inclusions and definitions that already exist in the main header. CORE-7716
by akhaldi＠svn.reactos.org 26 Dec '13

26 Dec '13

Author: akhaldi Date: Thu Dec 26 18:50:10 2013 New Revision: 61429 URL: http://svn.reactos.org/svn/reactos?rev=61429&view=rev Log: [OLEAUT32] * Create a main header and move some inclusions to it. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Added: trunk/reactos/dll/win32/oleaut32/precomp.h (with props) Modified: trunk/reactos/dll/win32/oleaut32/connpt.c trunk/reactos/dll/win32/oleaut32/dispatch.c trunk/reactos/dll/win32/oleaut32/hash.c trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc trunk/reactos/dll/win32/oleaut32/oleaut.c trunk/reactos/dll/win32/oleaut32/oleaut32.rc trunk/reactos/dll/win32/oleaut32/olefont.c trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/olepropframe.c trunk/reactos/dll/win32/oleaut32/recinfo.c trunk/reactos/dll/win32/oleaut32/resource.h trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/typelib.h trunk/reactos/dll/win32/oleaut32/usrmarshal.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/dll/win32/oleaut32/variant.h trunk/reactos/dll/win32/oleaut32/vartype.c Modified: trunk/reactos/dll/win32/oleaut32/connpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/connpt.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/connpt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/connpt.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -22,25 +22,9 @@ * comments just above that function for information. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS +#include "precomp.h" #include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -#include <ole2.h> -#include <olectl.h> -//#include "connpt.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oleaut32/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/dispatc… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/dispatch.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -19,26 +19,7 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <stdlib.h> -//#include <string.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <ctype.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <oleauto.h> -//#include "winerror.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oleaut32/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/hash.c?… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/hash.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/hash.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,17 +18,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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <objbase.h> -//#include "oaidl.h" -#include <wine/debug.h> + +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Bg.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cy.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_WELSH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Cz.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Da.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_DANISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_De.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - #pragma code_page(65001) LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_El.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_En.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Es.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Fr.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_He.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -20,8 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Hu.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_It.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ko.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Lt.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * 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/oleaut32/lang/oleaut32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Nl.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_No.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pl.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Pt.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ro.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Ru.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * 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/oleaut32/lang/oleaut32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Si.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - #pragma code_page(65001) LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Sv.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Th.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_THAI, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "resource.h" - LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Uk.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -20,8 +20,6 @@ * 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/oleaut32/lang/oleaut32_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Zh.rc [iso-8859-1] Thu Dec 26 18:50:10 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" /* Chinese text is encoded in UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/win32/oleaut32/oleaut.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut.… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,30 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> -//#include <limits.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" - -#include <ole2.h> -#include <olectl.h> -//#include "oleauto.h" +#include "precomp.h" + #include <initguid.h> +#include <oleaut32_oaidl.h> + #include "typelib.h" -#include <oleaut32_oaidl.h> - -#include <wine/debug.h> -//#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(heap); Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.rc [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include "windef.h" -//#include "winbase.h" -//#include "resource.h" +#include <windef.h> + +#include "resource.h" #ifdef LANGUAGE_BG_BG #include "lang/oleaut32_Bg.rc" Modified: trunk/reactos/dll/win32/oleaut32/olefont.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olefont… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olefont.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olefont.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -21,31 +21,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 */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -//#include <stdarg.h> -#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -//#include "winuser.h" + +#include "precomp.h" + #include <wine/list.h> -#include <wine/unicode.h> -#include <objbase.h> -#include <oleauto.h> /* for SysAllocString(....) */ -//#include "ole2.h" -#include <olectl.h> -#include <wine/debug.h> -#include "connpt.h" /* for CreateConnectionPoint */ -//#include "oaidl.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -36,38 +36,15 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" +#include "precomp.h" #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -//#include <stdarg.h> -#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" + #include <ole2.h> -#include <olectl.h> -//#include "oleauto.h" -#include "connpt.h" -//#include "urlmon.h" #include <initguid.h> #include <wincodec.h> -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "wine/library.h" WINE_DEFAULT_DEBUG_CHANNEL(olepicture); Modified: trunk/reactos/dll/win32/oleaut32/olepropframe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleprop… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepropframe.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepropframe.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -19,22 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <ole2.h> -#include <olectl.h> +#include "precomp.h" + #include <oledlg.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Added: trunk/reactos/dll/win32/oleaut32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/precomp… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/precomp.h (added) +++ trunk/reactos/dll/win32/oleaut32/precomp.h [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -0,0 +1,30 @@ +#ifndef _OLEAUT32_PCH_ +#define _OLEAUT32_PCH_ + +#include <config.h> + +#include <stdarg.h> +#include <stdio.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winreg.h> +#include <objbase.h> +#include <olectl.h> +#include <oleauto.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#include "connpt.h" +#include "variant.h" + +#endif /* _OLEAUT32_PCH_ */ Propchange: trunk/reactos/dll/win32/oleaut32/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oleaut32/recinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/recinfo… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/recinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/recinfo.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -16,23 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -//#include "oaidl.h" -#include <oleauto.h> - -#include <wine/unicode.h> -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oleaut32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/resourc… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/resource.h [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -17,10 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ + #ifndef WINE_OLEAUT32_RESOURCE_H #define WINE_OLEAUT32_RESOURCE_H - -#include <windef.h> /* Localised boolean text */ #define IDS_TRUE 100 Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/safearray.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/safearray.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -31,22 +31,7 @@ * 0x10: SAFEARRAYBOUNDS[0...] */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <string.h> -#include <stdarg.h> -//#include <stdio.h> - -#define COBJMACROS - -#include <windef.h> -//#include "winerror.h" -#include <winbase.h> -#include <variant.h> -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -21,35 +21,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -#include <assert.h> -//#include <stdlib.h> -//#include <string.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <ctype.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <winreg.h> -//#include "winuser.h" +#include "precomp.h" #include <ole2.h> -//#include "propidl.h" /* for LPSAFEARRAY_User* functions */ + #include "typelib.h" -#include "variant.h" -#include <wine/debug.h> + #include <wine/exception.h> static const WCHAR IDispatchW[] = { 'I','D','i','s','p','a','t','c','h',0}; Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -47,36 +47,13 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -//#include <stdlib.h> -//#include <string.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <ctype.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <winerror.h> -#include <windef.h> -#include <winbase.h> -//#include "winnls.h" -#include <winreg.h> -#include <winuser.h> +#include "precomp.h" + #include <winternl.h> #include <lzexpand.h> -#include <wine/unicode.h> -#include <objbase.h> #include "typelib.h" -#include <wine/debug.h> -#include "variant.h" + #include <wine/list.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oleaut32/typelib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.h [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -20,12 +20,6 @@ */ #ifndef _WINE_TYPELIB_H #define _WINE_TYPELIB_H - -//#include <stdarg.h> - -//#include "windef.h" -//#include "winbase.h" -#include <oleauto.h> #define HELPDLLFLAG (0x0100) #define DO_NOT_SEEK (-1) Modified: trunk/reactos/dll/win32/oleaut32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/usrmars… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/usrmarshal.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -19,27 +19,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "wingdi.h" -//#include "winuser.h" -//#include "winerror.h" +#include "precomp.h" #include <ole2.h> -//#include "oleauto.h" -//#include "typelib.h" -#include <ocidl.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -25,24 +25,7 @@ * Please submit a test case if you find a difference. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <string.h> -//#include <stdlib.h> -//#include <stdarg.h> -//#include <stdio.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winbase.h" -#include <wine/unicode.h> -//#include "winerror.h" -#include "variant.h" -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -25,26 +25,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <string.h> -//#include <stdlib.h> -//#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "windef.h" -//#include "winbase.h" -#include <wine/unicode.h> -//#include "winerror.h" -#include "variant.h" +#include "precomp.h" + #include "resource.h" -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(variant); Modified: trunk/reactos/dll/win32/oleaut32/variant.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.h [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -17,12 +17,9 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -//#include "windef.h" -//#include "winerror.h" -#include <objbase.h> -#include <oleauto.h> + +#pragma once + #include <math.h> /* Get just the type from a variant pointer */ Modified: trunk/reactos/dll/win32/oleaut32/vartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/vartype… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/vartype.c [iso-8859-1] Thu Dec 26 18:50:10 2013 @@ -18,19 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <wine/debug.h> -#include <wine/unicode.h> -//#include "winbase.h" -#include <winuser.h> -//#include "winnt.h" -#include "variant.h" +#include "precomp.h" + #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(variant);

1 0

[tkreuzer] 61428: [FREELDR] Improve heap allocations by using tags and using the temp heap for all temporary allocations that will not be used by the kernel. This avoids heap fragmentation for the ...
by tkreuzer＠svn.reactos.org 26 Dec '13

26 Dec '13

Author: tkreuzer Date: Thu Dec 26 16:58:56 2013 New Revision: 61428 URL: http://svn.reactos.org/svn/reactos?rev=61428&view=rev Log: [FREELDR] Improve heap allocations by using tags and using the temp heap for all temporary allocations that will not be used by the kernel. This avoids heap fragmentation for the default heap. Increase the temp heap size to 32 MB and limit the size of the cache to the temp heap size minus 128 KB to avoid exhausting the heap with cache data. See CORE-4413. This commit is dedicated to Ronja, my beloved cat who passed away on 5th of December. Rest in peace, little Schnuppel. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/fs/fs.c trunk/reactos/boot/freeldr/freeldr/fs/iso.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/fs/pxe.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h trunk/reactos/boot/freeldr/freeldr/include/cache.h trunk/reactos/boot/freeldr/freeldr/include/inifile.h trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/include/registry.h trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/oslist.c trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/registry.c trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/video/fade.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fs… Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/is… Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/custom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/cache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/inifile.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/registry.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inffi… Modified: trunk/reactos/boot/freeldr/freeldr/inifile/ini_init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/oslis… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…

1 0

[akhaldi] 61427: [OLE32] * Create a main header and move some inclusions to it. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716
by akhaldi＠svn.reactos.org 26 Dec '13

26 Dec '13

Author: akhaldi Date: Thu Dec 26 16:07:35 2013 New Revision: 61427 URL: http://svn.reactos.org/svn/reactos?rev=61427&view=rev Log: [OLE32] * Create a main header and move some inclusions to it. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716 Added: trunk/reactos/dll/win32/ole32/guid.c (with props) trunk/reactos/dll/win32/ole32/precomp.h (with props) Removed: trunk/reactos/dll/win32/ole32/msvc.h Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/ole32/antimoniker.c trunk/reactos/dll/win32/ole32/bindctx.c trunk/reactos/dll/win32/ole32/classmoniker.c trunk/reactos/dll/win32/ole32/clipboard.c trunk/reactos/dll/win32/ole32/comcat.c trunk/reactos/dll/win32/ole32/compobj.c trunk/reactos/dll/win32/ole32/compobj_private.h trunk/reactos/dll/win32/ole32/compositemoniker.c trunk/reactos/dll/win32/ole32/datacache.c trunk/reactos/dll/win32/ole32/defaulthandler.c trunk/reactos/dll/win32/ole32/dictionary.c trunk/reactos/dll/win32/ole32/dictionary.h trunk/reactos/dll/win32/ole32/enumx.c trunk/reactos/dll/win32/ole32/errorinfo.c trunk/reactos/dll/win32/ole32/filelockbytes.c trunk/reactos/dll/win32/ole32/filemoniker.c trunk/reactos/dll/win32/ole32/ftmarshal.c trunk/reactos/dll/win32/ole32/git.c trunk/reactos/dll/win32/ole32/hglobalstream.c trunk/reactos/dll/win32/ole32/ifs.c trunk/reactos/dll/win32/ole32/itemmoniker.c trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/ole32/memlockbytes.c trunk/reactos/dll/win32/ole32/moniker.c trunk/reactos/dll/win32/ole32/ole2.c trunk/reactos/dll/win32/ole32/ole2impl.c trunk/reactos/dll/win32/ole32/ole2stubs.c trunk/reactos/dll/win32/ole32/ole32_main.c trunk/reactos/dll/win32/ole32/oleobj.c trunk/reactos/dll/win32/ole32/oleproxy.c trunk/reactos/dll/win32/ole32/pointermoniker.c trunk/reactos/dll/win32/ole32/rpc.c trunk/reactos/dll/win32/ole32/stg_prop.c trunk/reactos/dll/win32/ole32/stg_stream.c trunk/reactos/dll/win32/ole32/storage32.c trunk/reactos/dll/win32/ole32/storage32.h trunk/reactos/dll/win32/ole32/stubmanager.c trunk/reactos/dll/win32/ole32/usrmarshal.c Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -59,6 +59,7 @@ storage32.c stubmanager.c usrmarshal.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c ${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c ${CMAKE_CURRENT_BINARY_DIR}/irot_c.c @@ -69,11 +70,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c ${CMAKE_CURRENT_BINARY_DIR}/ole32.def) -if(MSVC) - if(ARCH STREQUAL "i386") - list(APPEND SOURCE msvc-thiscall.c) - endif() - set_source_files_properties(stg_prop.c PROPERTIES COMPILE_FLAGS "/FImsvc.h") +if(MSVC AND (ARCH STREQUAL "i386")) + list(APPEND SOURCE msvc-thiscall.c) endif() add_library(ole32 SHARED ${SOURCE} ole32res.rc) Modified: trunk/reactos/dll/win32/ole32/antimoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/antimonike… ============================================================================== --- trunk/reactos/dll/win32/ole32/antimoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/antimoniker.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <objbase.h> -#include <wine/debug.h> -#include "moniker.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/bindctx.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/bindctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/bindctx.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -#include <winnls.h> -#include <objbase.h> - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/classmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/classmonik… ============================================================================== --- trunk/reactos/dll/win32/ole32/classmoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/classmoniker.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -19,25 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wine/debug.h> -#include <ole2.h> -#include <wine/unicode.h> -#include "moniker.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/clipboard.… ============================================================================== --- trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/clipboard.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -58,31 +58,8 @@ * */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -//#include <stdarg.h> -//#include <string.h> -#include <stdio.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" -#include <winnls.h> -#include <ole2.h> -#include <wine/debug.h> -//#include "olestd.h" - +#include "precomp.h" #include "storage32.h" - -#include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/comcat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/comcat.c?r… ============================================================================== --- trunk/reactos/dll/win32/ole32/comcat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/comcat.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <string.h> -#include <stdarg.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winreg.h" -//#include "winerror.h" - -#include <ole2.h> -#include <comcat.h> -#include "compobj_private.h" - -#include <wine/unicode.h> -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/compobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -36,39 +36,10 @@ * */ -#include <config.h> - -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -#include <assert.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <ntstatus.h> -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "winreg.h" -//#include "winuser.h" -#define USE_COM_CONTEXT_DEF -//#include "objbase.h" -#include <ole2.h> -#include <ole2ver.h> +#include "precomp.h" + #include <ctxtcall.h> #include <dde.h> -#include <servprov.h> - -#include <initguid.h> -#include "compobj_private.h" -#include "moniker.h" - -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/compobj_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compobj_pr… ============================================================================== --- trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compobj_private.h [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -27,17 +27,6 @@ /* All private prototype functions used by OLE will be added to this header file */ -#include <stdarg.h> - -#include <wine/list.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include <dcom.h> -#include "winreg.h" -#include <winternl.h> - struct apartment; typedef struct apartment APARTMENT; typedef struct LocalServer LocalServer; Modified: trunk/reactos/dll/win32/ole32/compositemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/compositem… ============================================================================== --- trunk/reactos/dll/win32/ole32/compositemoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/compositemoniker.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,25 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <wine/unicode.h> -#include <ole2.h> -#include "moniker.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/datacache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/datacache.… ============================================================================== --- trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/datacache.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -43,25 +43,8 @@ * header. I was able to figure-out where the extent of the object * was stored and the aspect, but that's about it. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" -#include <wine/unicode.h> -#include <ole2.h> -#include <wine/list.h> -#include <wine/debug.h> + +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/defaulthandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/defaulthan… ============================================================================== --- trunk/reactos/dll/win32/ole32/defaulthandler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/defaulthandler.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -45,26 +45,9 @@ * - All the methods related to notification and advise sinks are * in place but no notifications are sent to the sinks yet. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winerror.h" -#include <ole2.h> - -#include "compobj_private.h" + +#include "precomp.h" #include "storage32.h" - -#include <wine/unicode.h> -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dictionary… ============================================================================== --- trunk/reactos/dll/win32/ole32/dictionary.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/dictionary.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -17,14 +17,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 */ -#define WIN32_NO_STATUS -#include <assert.h> -//#include <stdarg.h> -//#include "windef.h" -//#include "winbase.h" -#include "dictionary.h" -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); Modified: trunk/reactos/dll/win32/ole32/dictionary.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/dictionary… ============================================================================== --- trunk/reactos/dll/win32/ole32/dictionary.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/dictionary.h [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -21,10 +21,6 @@ */ #ifndef __DICTIONARY_H__ #define __DICTIONARY_H__ - -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> struct dictionary; Modified: trunk/reactos/dll/win32/ole32/enumx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/enumx.c?re… ============================================================================== --- trunk/reactos/dll/win32/ole32/enumx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/enumx.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> - -#include "enumx.h" - -#include <wine/list.h> -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/errorinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/errorinfo.… ============================================================================== --- trunk/reactos/dll/win32/ole32/errorinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/errorinfo.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -23,24 +23,7 @@ * TEB at offset 0xf80. */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> -#include <oleauto.h> -//#include "winerror.h" - -#include <wine/unicode.h> -#include "compobj_private.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/filelockbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filelockby… ============================================================================== --- trunk/reactos/dll/win32/ole32/filelockbytes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/filelockbytes.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -20,28 +20,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <assert.h> -//#include <stdlib.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -//#include <limits.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "windef.h" -//#include "winbase.h" -//#include "winuser.h" -//#include "winerror.h" -//#include "objbase.h" -//#include "ole2.h" - +#include "precomp.h" #include "storage32.h" - -#include <wine/debug.h> -#include <wine/unicode.h> WINE_DEFAULT_DEBUG_CHANNEL(storage); Modified: trunk/reactos/dll/win32/ole32/filemoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/filemonike… ============================================================================== --- trunk/reactos/dll/win32/ole32/filemoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/filemoniker.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -19,27 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "winnls.h" -#include <wine/unicode.h> -#include <wine/debug.h> -#include <objbase.h> -#include "moniker.h" - -//#include "compobj_private.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/ftmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ftmarshal.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ftmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ftmarshal.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> -//#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -#include <objbase.h> - -#include <wine/debug.h> - -#include "compobj_private.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/git.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/git.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/git.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/git.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -24,26 +24,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "objbase.h" -#include <ole2.h> -//#include "winerror.h" - -#include "compobj_private.h" - -//#include "wine/list.h" -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Added: trunk/reactos/dll/win32/ole32/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/guid.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ole32/guid.c (added) +++ trunk/reactos/dll/win32/ole32/guid.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -0,0 +1,14 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <initguid.h> + +DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); + +DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 ); +DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 ); +DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 ); +DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); +DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); +DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/dll/win32/ole32/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ole32/hglobalstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/hglobalstr… ============================================================================== --- trunk/reactos/dll/win32/ole32/hglobalstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/hglobalstream.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -21,30 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <assert.h> -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "objbase.h" -#include <ole2.h> -//#include "winerror.h" -//#include "winternl.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); Modified: trunk/reactos/dll/win32/ole32/ifs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <ctype.h> -#include <stdarg.h> -//#include <stdlib.h> -//#include <string.h> -//#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "winerror.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); Modified: trunk/reactos/dll/win32/ole32/itemmoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/itemmonike… ============================================================================== --- trunk/reactos/dll/win32/ole32/itemmoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/itemmoniker.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,26 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <wine/debug.h> -#include <ole2.h> -#include <wine/unicode.h> -#include "moniker.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -20,26 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> -#include <assert.h> - -#define COBJMACROS - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "objbase.h" -#include <ole2.h> -//#include "winerror.h" -//#include "wine/unicode.h" - -#include "compobj_private.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/memlockbytes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/memlockbyt… ============================================================================== --- trunk/reactos/dll/win32/ole32/memlockbytes.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/memlockbytes.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -19,27 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <assert.h> -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <objbase.h> -//#include "ole2.h" -//#include "winerror.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/moniker.c?… ============================================================================== --- trunk/reactos/dll/win32/ole32/moniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/moniker.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -21,31 +21,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS - -//#include "winerror.h" -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "wtypes.h" -#include <ole2.h> - -//#include "wine/list.h" -#include <wine/debug.h> -#include <wine/unicode.h> +#include "precomp.h" + #include <wine/exception.h> -#include "compobj_private.h" -#include "moniker.h" #include <irot.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Removed: trunk/reactos/dll/win32/ole32/msvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/msvc.h?rev… ============================================================================== --- trunk/reactos/dll/win32/ole32/msvc.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/msvc.h (removed) @@ -1,2 +0,0 @@ - -#define __ASM_STDCALL_FUNC(name,args,code) Modified: trunk/reactos/dll/win32/ole32/ole2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2.c?rev… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -23,36 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <assert.h> -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -//#include "winreg.h" -#include <ole2.h> -#include <ole2ver.h> - -#include <wine/unicode.h> -#include "compobj_private.h" -//#include "wine/list.h" - -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DECLARE_DEBUG_CHANNEL(accel); Modified: trunk/reactos/dll/win32/ole32/ole2impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2impl.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2impl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2impl.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,24 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -#include <wine/debug.h> -#include <ole2.h> -//#include "olestd.h" -#include "compobj_private.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/ole2stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole2stubs.… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole2stubs.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -19,19 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -//#include "objidl.h" -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/ole32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32_main… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32_main.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,23 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -//#include <stdarg.h> -#include <stdio.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winnls.h> -#include <objbase.h> -//#include "ole2.h" -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleobj.c?r… ============================================================================== --- trunk/reactos/dll/win32/ole32/oleobj.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/oleobj.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -19,24 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winerror.h" -#include <wine/debug.h> -#include <ole2.h> - -//#include "compobj_private.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/oleproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/oleproxy.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/oleproxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/oleproxy.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -19,30 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <stdlib.h> -#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <objbase.h> -//#include "ole2.h" -//#include "rpc.h" - -#include "compobj_private.h" -#include "moniker.h" -#include <comcat.h> +#include "precomp.h" /*********************************************************************** * DllGetClassObject [OLE32.@] Modified: trunk/reactos/dll/win32/ole32/pointermoniker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/pointermon… ============================================================================== --- trunk/reactos/dll/win32/ole32/pointermoniker.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/pointermoniker.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -19,24 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "winuser.h" -#include <objbase.h> -#include <oleidl.h> -#include <wine/debug.h> -#include "moniker.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); Added: trunk/reactos/dll/win32/ole32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/precomp.h?… ============================================================================== --- trunk/reactos/dll/win32/ole32/precomp.h (added) +++ trunk/reactos/dll/win32/ole32/precomp.h [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -0,0 +1,39 @@ +#ifndef _OLE32_PCH_ +#define _OLE32_PCH_ + +#include <config.h> + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <ntstatus.h> +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wingdi.h> +#define USE_COM_CONTEXT_DEF +#include <ole2.h> +#include <ole2ver.h> +#include <dcom.h> +#include <comcat.h> +#include <servprov.h> +#include <winternl.h> + +#include <wine/debug.h> +#include <wine/list.h> +#include <wine/unicode.h> + +#include "compobj_private.h" +#include "dictionary.h" +#include "enumx.h" +#include "moniker.h" + +#endif /* _OLE32_PCH_ */ Propchange: trunk/reactos/dll/win32/ole32/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/ole32/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/rpc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/rpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/rpc.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -20,34 +20,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> -//#include "wine/port.h" - -#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" +#include "precomp.h" + #include <winsvc.h> -//#include "objbase.h" -#include <ole2.h> -//#include "rpc.h" -//#include "winerror.h" -//#include "winreg.h" -#include <servprov.h> -#include <wine/unicode.h> - -#include "compobj_private.h" - -#include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(ole); Modified: trunk/reactos/dll/win32/ole32/stg_prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_prop.c… ============================================================================== --- trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/stg_prop.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -36,31 +36,14 @@ * PropertyStorage_ReadFromStream */ -#include <config.h> -//#include "wine/port.h" - -#include <assert.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" -//#include "winuser.h" -#include <wine/unicode.h> -#include <wine/debug.h> -#include "dictionary.h" +#include "precomp.h" #include "storage32.h" -#include "enumx.h" -#include <oleauto.h> WINE_DEFAULT_DEBUG_CHANNEL(storage); + +#ifdef _MSC_VER +#define __ASM_STDCALL_FUNC(name,args,code) +#endif static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface ) { Modified: trunk/reactos/dll/win32/ole32/stg_stream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stg_stream… ============================================================================== --- trunk/reactos/dll/win32/ole32/stg_stream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/stg_stream.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -23,22 +23,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> -//#include <stdlib.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "windef.h" -//#include "winbase.h" -//#include "winerror.h" -//#include "winternl.h" -#include <wine/debug.h> - +#include "precomp.h" #include "storage32.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); Modified: trunk/reactos/dll/win32/ole32/storage32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -30,29 +30,10 @@ * residing in a compound file object. */ -#include <assert.h> -//#include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -//#include "windef.h" -//#include "winbase.h" -//#include "winnls.h" -//#include "winuser.h" -#include <wine/unicode.h> -#include <wine/debug.h> - +#include "precomp.h" #include "storage32.h" -#include <ole2.h> /* For Write/ReadClassStm */ - -//#include "winreg.h" + #include <wine/wingdi16.h> -#include "compobj_private.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); Modified: trunk/reactos/dll/win32/ole32/storage32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/storage32.… ============================================================================== --- trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/storage32.h [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -29,19 +29,6 @@ */ #ifndef __STORAGE32_H__ #define __STORAGE32_H__ - -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -//#include "winnt.h" -#include <objbase.h> -#include <winreg.h> -#include "winternl.h" -#include <wine/list.h> /* * Definitions for the file format offsets. Modified: trunk/reactos/dll/win32/ole32/stubmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/stubmanage… ============================================================================== --- trunk/reactos/dll/win32/ole32/stubmanager.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/stubmanager.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -23,28 +23,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <assert.h> -#include <stdarg.h> -//#include <limits.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <objbase.h> -//#include "rpc.h" - -#include <wine/debug.h> -#include "compobj_private.h" +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); - /* generates an ipid in the following format (similar to native version): * Data1 = apartment-local ipid counter Modified: trunk/reactos/dll/win32/ole32/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/usrmarshal… ============================================================================== --- trunk/reactos/dll/win32/ole32/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/usrmarshal.c [iso-8859-1] Thu Dec 26 16:07:35 2013 @@ -18,29 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <stdio.h> -//#include <stdarg.h> -//#include <string.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winerror.h" - -#include <ole2.h> -//#include "oleauto.h" -//#include "rpcproxy.h" - -#include <wine/unicode.h> -#include <wine/debug.h> +#include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(ole);

1 0

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

26 Dec '13

Author: akhaldi Date: Thu Dec 26 13:30:44 2013 New Revision: 61426 URL: http://svn.reactos.org/svn/reactos?rev=61426&view=rev Log: [NEWDEV] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/newdev_private.h trunk/reactos/dll/win32/newdev/stubs.c trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev.c [iso-8859-1] Thu Dec 26 13:30:44 2013 @@ -22,8 +22,6 @@ #include "newdev_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(newdev); - /* Global variables */ HINSTANCE hDllInstance; Modified: trunk/reactos/dll/win32/newdev/newdev_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pr… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h [iso-8859-1] Thu Dec 26 13:30:44 2013 @@ -20,7 +20,9 @@ #include <regstr.h> #include <cfgmgr32.h> #include <shlobj.h> + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(newdev); #include <stdio.h> Modified: trunk/reactos/dll/win32/newdev/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/stubs.c [iso-8859-1] Thu Dec 26 13:30:44 2013 @@ -19,8 +19,6 @@ */ #include "newdev_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(newdev); /* * @unimplemented Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/wizard.c [iso-8859-1] Thu Dec 26 13:30:44 2013 @@ -19,8 +19,6 @@ */ #include "newdev_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(newdev); HANDLE hThread;

1 0

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

26 Dec '13

Author: akhaldi Date: Thu Dec 26 13:02:46 2013 New Revision: 61425 URL: http://svn.reactos.org/svn/reactos?rev=61425&view=rev Log: [NETSHELL] * Set the default debugging channel globally through the main header. CORE-7716 Modified: trunk/reactos/dll/win32/netshell/classfactory.cpp trunk/reactos/dll/win32/netshell/connectmanager.cpp trunk/reactos/dll/win32/netshell/enumlist.cpp trunk/reactos/dll/win32/netshell/lanconnectui.cpp trunk/reactos/dll/win32/netshell/lanstatusui.cpp trunk/reactos/dll/win32/netshell/netshell.cpp trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp Modified: trunk/reactos/dll/win32/netshell/classfactory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/classfa… ============================================================================== --- trunk/reactos/dll/win32/netshell/classfactory.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/classfactory.cpp [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -1,6 +1,4 @@ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL (shell); class CNetshellClassFactory : public IClassFactory Modified: trunk/reactos/dll/win32/netshell/connectmanager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… ============================================================================== --- trunk/reactos/dll/win32/netshell/connectmanager.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/connectmanager.cpp [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -1,6 +1,4 @@ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL (shell); typedef struct tagINetConnectionItem { Modified: trunk/reactos/dll/win32/netshell/enumlist.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… ============================================================================== --- trunk/reactos/dll/win32/netshell/enumlist.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/enumlist.cpp [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -1,6 +1,4 @@ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************** * AddToEnumList() Modified: trunk/reactos/dll/win32/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanconnectui.cpp [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -1,6 +1,4 @@ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL (shell); /// CLASSID /// {7007ACC5-3202-11D1-AAD2-00805FC1270E} Modified: trunk/reactos/dll/win32/netshell/lanstatusui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.cpp [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -1,6 +1,4 @@ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL (shell); /// CLSID /// HKEY_LOCAL_MACHINE\SOFTWARE\Classes\CLSID\{7007ACCF-3202-11D1-AAD2-00805FC1270E} Modified: trunk/reactos/dll/win32/netshell/netshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… ============================================================================== --- trunk/reactos/dll/win32/netshell/netshell.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/netshell.cpp [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -1,6 +1,4 @@ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL (shell); HINSTANCE netshell_hInstance; const GUID CLSID_LANConnectUI = {0x7007ACC5, 0x3202, 0x11D1, {0xAA, 0xD2, 0x00, 0x80, 0x5F, 0xC1, 0x27, 0x0E}}; Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… ============================================================================== --- trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/precomp.h [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -21,7 +21,9 @@ #include <netcon.h> #include <netcfgx.h> #include <netcfgn.h> + #include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(shell); #include "resource.h" Modified: trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… ============================================================================== --- trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp [iso-8859-1] Thu Dec 26 13:02:46 2013 @@ -19,8 +19,6 @@ */ #include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL (shell); #define MAX_PROPERTY_SHEET_PAGE (10)

1 0

[akhaldi] 61424: [MSXML3] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that alrea...
by akhaldi＠svn.reactos.org 26 Dec '13

26 Dec '13

Author: akhaldi Date: Thu Dec 26 12:57:01 2013 New Revision: 61424 URL: http://svn.reactos.org/svn/reactos?rev=61424&view=rev Log: [MSXML3] * Create a main header and move some inclusions to it. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Added: trunk/reactos/dll/win32/msxml3/precomp.h (with props) Modified: trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/bsc.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/dispex.c trunk/reactos/dll/win32/msxml3/docfrag.c trunk/reactos/dll/win32/msxml3/doctype.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/domimpl.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/entityref.c trunk/reactos/dll/win32/msxml3/factory.c trunk/reactos/dll/win32/msxml3/httprequest.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/msxml3/mxnamespace.c trunk/reactos/dll/win32/msxml3/mxwriter.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/nodelist.c trunk/reactos/dll/win32/msxml3/nodemap.c trunk/reactos/dll/win32/msxml3/parseerror.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/saxreader.c trunk/reactos/dll/win32/msxml3/schema.c trunk/reactos/dll/win32/msxml3/selection.c trunk/reactos/dll/win32/msxml3/stylesheet.c trunk/reactos/dll/win32/msxml3/text.c trunk/reactos/dll/win32/msxml3/uuid.c trunk/reactos/dll/win32/msxml3/xdr.c trunk/reactos/dll/win32/msxml3/xmldoc.c trunk/reactos/dll/win32/msxml3/xmlelem.c trunk/reactos/dll/win32/msxml3/xmlparser.c trunk/reactos/dll/win32/msxml3/xmlview.c Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… ============================================================================== --- trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/attribute.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/HTMLtree.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/bsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/bsc.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msxml3/bsc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/bsc.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -16,35 +16,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <wininet.h> -//#include "urlmon.h" #include <winreg.h> #include <shlwapi.h> - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); struct bsc_t { IBindStatusCallback IBindStatusCallback_iface; Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… ============================================================================== --- trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/cdata.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/comment.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/dispex.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/dispex.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -16,37 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> -//#include "wininet.h" -//#include "urlmon.h" -//#include "winreg.h" -//#include "shlwapi.h" - -#include <wine/debug.h> +#include "precomp.h" + #include <wine/list.h> -//#include "wine/unicode.h" - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); static CRITICAL_SECTION cs_dispex_static_data; static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg = Modified: trunk/reactos/dll/win32/msxml3/docfrag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/docfrag.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/docfrag.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/doctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/doctype.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/doctype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/doctype.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,44 +19,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> +#include "precomp.h" + #include <assert.h> + #ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> # include <libxml/xpathInternals.h> # include <libxml/xmlsave.h> # include <libxml/SAX2.h> # include <libxml/parserInternals.h> #endif -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> #include <olectl.h> -#include <msxml6.h> -//#include "wininet.h" -//#include "winreg.h" -//#include "shlwapi.h" -//#include "ocidl.h" #include <objsafe.h> -#include <wine/debug.h> #include <wine/list.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/domimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domimpl.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domimpl.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/element.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/entityref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/entityref… ============================================================================== --- trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/entityref.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/factory.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/factory.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,25 +19,22 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + +#ifdef HAVE_LIBXML2 +# include <libxml/parser.h> +#endif + #define WIN32_NO_STATUS #define _INC_WINDOWS #define COBJMACROS -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - #include <windef.h> #include <winbase.h> -//#include "winuser.h" #include <ole2.h> -//#include "msxml.h" #include <msxml2.h> + #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version Modified: trunk/reactos/dll/win32/msxml3/httprequest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/httpreque… ============================================================================== --- trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/httprequest.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,40 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/encoding.h> -#endif - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" + #include <wingdi.h> #include <wininet.h> -#include <winreg.h> -//#include "winuser.h" -#include <ole2.h> #include <mshtml.h> -#include <msxml6.h> #include <objsafe.h> #include <docobj.h> -#include <shlwapi.h> - -#include "msxml_private.h" - -#include <wine/debug.h> + #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,18 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> +#include "precomp.h" + #include <wine/port.h> -#define COBJMACROS - -//#include <stdarg.h> #ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> # ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H # include <libxslt/pattern.h> @@ -43,21 +36,9 @@ # endif #endif -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> #include <rpcproxy.h> -//#include "msxml.h" -#include <msxml6.h> - -//#include "wine/unicode.h" -#include <wine/debug.h> + #include <wine/library.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); HINSTANCE MSXML_hInstance = NULL; Modified: trunk/reactos/dll/win32/msxml3/mxnamespace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxnamespa… ============================================================================== --- trunk/reactos/dll/win32/msxml3/mxnamespace.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/mxnamespace.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,33 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#define NONAMELESSUNION - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/encoding.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> +#include "precomp.h" + #include <wine/list.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); struct ns { Modified: trunk/reactos/dll/win32/msxml3/mxwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/mxwriter.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/mxwriter.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,28 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -#endif - -#include <windef.h> -#include <winbase.h> -#include <ole2.h> - -#include <msxml6.h> - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" static const WCHAR emptyW[] = {0}; static const WCHAR spaceW[] = {' '}; Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,18 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#define COBJMACROS - -//#include <stdarg.h> +#include "precomp.h" #ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> # include <libxml/HTMLtree.h> # ifdef SONAME_LIBXSLT # ifdef HAVE_LIBXSLT_PATTERN_H @@ -42,19 +33,6 @@ # include <libxslt/xsltInternals.h> # endif #endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/nodelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodelist.… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodelist.c [iso-8859-1] Thu Dec 26 12:57:01 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 COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <msxml2did.h> - -#include "msxml_private.h" - -#include <wine/debug.h> /* This file implements the object returned by childNodes property. Note that this is * not the IXMLDOMNodeList returned by XPath queries - it's implemented in selection.c. @@ -50,8 +30,6 @@ * - note that an attribute node have a text child in DOM but not in the XPath data model * thus the child is inaccessible by an XPath query */ - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/nodemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/nodemap.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/nodemap.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,32 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -#define COBJMACROS - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <msxml2did.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/parseerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/parseerro… ============================================================================== --- trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/parseerror.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winerror.h" -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" typedef struct { Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/pi.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Added: trunk/reactos/dll/win32/msxml3/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/msxml3/precomp.h (added) +++ trunk/reactos/dll/win32/msxml3/precomp.h [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -0,0 +1,26 @@ +#ifndef _MSXML3_PCH_ +#define _MSXML3_PCH_ + +#include <config.h> + +#ifdef HAVE_LIBXML2 +# include <libxml/parser.h> +#endif + +#define WIN32_NO_STATUS +#define _INC_WINDOWS + +#define COBJMACROS +#define NONAMELESSUNION + +#include <windef.h> +#include <winbase.h> +#include <ole2.h> +#include <msxml6.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +#include "msxml_private.h" + +#endif /* _MSXML3_PCH_ */ Propchange: trunk/reactos/dll/win32/msxml3/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/saxreader… ============================================================================== --- trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/saxreader.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,38 +18,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> + +#include "precomp.h" + #ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/SAX2.h> # include <libxml/parserInternals.h> #endif -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -//#include "winnls.h" -#include <ole2.h> -#include <msxml6.h> -//#include "wininet.h" -//#include "urlmon.h" -//#include "winreg.h" -//#include "shlwapi.h" - -#include <wine/debug.h> #include <wine/list.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/schema.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/schema.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,39 +19,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> +#include "precomp.h" #include <assert.h> -//#include <stdarg.h> + #ifdef HAVE_LIBXML2 -//# include <libxml/xmlerror.h> -//# include <libxml/tree.h> # include <libxml/xmlschemas.h> # include <libxml/schemasInternals.h> -//# include <libxml/hash.h> -//# include <libxml/parser.h> # include <libxml/parserInternals.h> -//# include <libxml/xmlIO.h> -//# include <libxml/xmlversion.h> # include <libxml/xpath.h> #endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* We use a chained hashtable, which can hold any number of schemas * TODO: grow/shrink hashtable depending on load factor Modified: trunk/reactos/dll/win32/msxml3/selection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/selection… ============================================================================== --- trunk/reactos/dll/win32/msxml3/selection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/selection.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -20,31 +20,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> +#include "precomp.h" + #ifdef HAVE_LIBXML2 -//# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/xpath.h> # include <libxml/xpathInternals.h> #endif -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> #include <msxml2did.h> - -#include "msxml_private.h" - -#include <wine/debug.h> /* This file implements the object returned by a XPath query. Note that this is * not the IXMLDOMNodeList returned by childNodes - it's implemented in nodelist.c. @@ -54,8 +36,6 @@ * - supports IXMLDOMSelection * */ - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/stylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/styleshee… ============================================================================== --- trunk/reactos/dll/win32/msxml3/stylesheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/stylesheet.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,30 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" typedef struct { Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/text.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,31 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> +#include "precomp.h" + #ifdef HAVE_LIBXML2 -# include <libxml/parser.h> # include <libxml/parserInternals.h> -//# include <libxml/xmlerror.h> #endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/uuid.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/uuid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/uuid.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -31,14 +31,13 @@ #include <windef.h> #include <winbase.h> -//#include "winuser.h" -#include <ole2.h> +#include <objbase.h> /* * First include the version 2 headers so that we don't redefine their * uuids - they're already in libuuid */ -//#include "msxml.h" +#include <msxml.h> /* Now we can initialize the rest of the uuids */ #include <initguid.h> Modified: trunk/reactos/dll/win32/msxml3/xdr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xdr.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xdr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xdr.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -19,16 +19,13 @@ */ -#include <config.h> +#include "precomp.h" #include <assert.h> + #ifdef HAVE_LIBXML2 # include <libxml/tree.h> #endif - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); /* Both XDR and XSD are valid XML * We just convert the doc tree, no need for a parser. Modified: trunk/reactos/dll/win32/msxml3/xmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmldoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmldoc.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,34 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> +#include "precomp.h" + #include <wininet.h> #include <winreg.h> #include <shlwapi.h> -//#include "ocidl.h" - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/xmlelem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlelem.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlelem.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -18,31 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> -//#include "ocidl.h" - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); +#include "precomp.h" #ifdef HAVE_LIBXML2 Modified: trunk/reactos/dll/win32/msxml3/xmlparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlparser… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlparser.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlparser.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -17,34 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#define COBJMACROS - -#include <config.h> - -//#include <stdarg.h> -#ifdef HAVE_LIBXML2 -# include <libxml/parser.h> -//# include <libxml/xmlerror.h> -//# include <libxml/HTMLtree.h> -#endif - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <ole2.h> -#include <msxml6.h> - -#include "msxml_private.h" + +#include "precomp.h" #include <initguid.h> #include "xmlparser.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _xmlparser { Modified: trunk/reactos/dll/win32/msxml3/xmlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/xmlview.c… ============================================================================== --- trunk/reactos/dll/win32/msxml3/xmlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/xmlview.c [iso-8859-1] Thu Dec 26 12:57:01 2013 @@ -16,35 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS -#define _INC_WINDOWS - -#include <config.h> - -//#include <stdarg.h> - -#define COBJMACROS -#define NONAMELESSUNION - -#ifdef HAVE_LIBXML2 -#include <libxml/parser.h> -#endif - -#include <windef.h> -#include <winbase.h> +#include "precomp.h" + #include <wingdi.h> -#include <ole2.h> -#include <msxml6.h> #include <mshtml.h> #include <mshtmhst.h> #include <perhist.h> -//#include "docobj.h" - -#include <wine/debug.h> - -#include "msxml_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2

1 0

[ekohl] 61423: [INCLUDE] Fix the value of the INHERITED_ACE flag. It is either 16 or 0x10 but never 10.
by ekohl＠svn.reactos.org 26 Dec '13

26 Dec '13

Author: ekohl Date: Thu Dec 26 09:28:33 2013 New Revision: 61423 URL: http://svn.reactos.org/svn/reactos?rev=61423&view=rev Log: [INCLUDE] Fix the value of the INHERITED_ACE flag. It is either 16 or 0x10 but never 10. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Dec 26 09:28:33 2013 @@ -485,7 +485,7 @@ #define CONTAINER_INHERIT_ACE 2 #define NO_PROPAGATE_INHERIT_ACE 4 #define INHERIT_ONLY_ACE 8 -#define INHERITED_ACE 10 +#define INHERITED_ACE 16 #define VALID_INHERIT_FLAGS 0x1F #define SUCCESSFUL_ACCESS_ACE_FLAG 64 #define FAILED_ACCESS_ACE_FLAG 128

1 0

[jimtabor] 61422: - Synced to Wine-1.7.9.
by jimtabor＠svn.reactos.org 26 Dec '13

26 Dec '13

Author: jimtabor Date: Thu Dec 26 06:34:56 2013 New Revision: 61422 URL: http://svn.reactos.org/svn/reactos?rev=61422&view=rev Log: - Synced to Wine-1.7.9. Modified: trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Thu Dec 26 06:34:56 2013 @@ -1146,7 +1146,7 @@ { POINT pt; RECT rc; - int bHittest = FALSE; + int bHittest = 0; DWORD messagePos = GetMessagePos(); pt.x = (short)LOWORD(messagePos); pt.y = (short)HIWORD(messagePos); Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Thu Dec 26 06:34:56 2013 @@ -573,7 +573,7 @@ cf.lStructSize = sizeof(cf); cf.hwndOwner = hMainWnd; cf.lpLogFont = &lf; - cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS; + cf.Flags = CF_SCREENFONTS | CF_NOSCRIPTSEL | CF_INITTOLOGFONTSTRUCT | CF_EFFECTS | CF_NOVERTFONTS; ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt); @@ -615,6 +615,8 @@ DWORD FontType, LPARAM lParam) { HWND hListWnd = (HWND) lParam; + + if (lpelfe->lfFaceName[0] == '@') return 1; /* ignore vertical fonts */ if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) { @@ -1149,7 +1151,7 @@ static void HandleCommandLine(LPWSTR cmdline) { WCHAR delimiter; - int opt_print = 0; + BOOL opt_print = FALSE; /* skip white space */ while (*cmdline == ' ') cmdline++; @@ -1173,7 +1175,7 @@ { case 'P': case 'p': - opt_print = 1; + opt_print = TRUE; cmdline += 2; continue; } @@ -2011,7 +2013,7 @@ on_fontlist_modified(endEdit->szText); } else if (pHdr->hwndFrom == hwndSizeList) { - on_sizelist_modified(hwndFontList,endEdit->szText); + on_sizelist_modified(hwndSizeList,endEdit->szText); } } return 0; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Dec 26 06:34:56 2013 @@ -236,7 +236,7 @@ reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.5.26 -reactos/base/applications/wordpad # Synced to Wine-1.5.26 +reactos/base/applications/wordpad # Synced to Wine-1.7.9 reactos/base/services/rpcss # Synced to Wine-1.7.1 reactos/base/system/expand # Synced to Wine-1.7.1 reactos/base/system/msiexec # Synced to Wine-1.7.1

1 0

[pschweitzer] 61421: [MOUNTMGR] Implement MountMgrQueryDosVolumePath
by pschweitzer＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: pschweitzer Date: Wed Dec 25 22:47:30 2013 New Revision: 61421 URL: http://svn.reactos.org/svn/reactos?rev=61421&view=rev Log: [MOUNTMGR] Implement MountMgrQueryDosVolumePath Modified: trunk/reactos/drivers/filters/mountmgr/device.c trunk/reactos/drivers/filters/mountmgr/mountmgr.c Modified: trunk/reactos/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/d… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/device.c [iso-8859-1] Wed Dec 25 22:47:30 2013 @@ -27,6 +27,8 @@ #include "mntmgr.h" +#define MAX_DEVICES 0x3E8 /* Matches 1000 devices */ + #define NDEBUG #include <debug.h> @@ -833,9 +835,224 @@ MountMgrQueryDosVolumePath(IN PDEVICE_EXTENSION DeviceExtension, IN PIRP Irp) { - UNREFERENCED_PARAMETER(DeviceExtension); - UNREFERENCED_PARAMETER(Irp); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + ULONG DevicesFound; + PIO_STACK_LOCATION Stack; + PLIST_ENTRY SymlinksEntry; + UNICODE_STRING SymbolicName; + PMOUNTMGR_TARGET_NAME Target; + PWSTR DeviceString, OldBuffer; + USHORT DeviceLength, OldLength; + PDEVICE_INFORMATION DeviceInformation; + PSYMLINK_INFORMATION SymlinkInformation; + PASSOCIATED_DEVICE_ENTRY AssociatedDevice; + + Stack = IoGetNextIrpStackLocation(Irp); + + /* Validate input size */ + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(MOUNTMGR_TARGET_NAME)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Ensure we have received UNICODE_STRING */ + Target = (PMOUNTMGR_TARGET_NAME)Irp->AssociatedIrp.SystemBuffer; + if (Target->DeviceNameLength & 1) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validate the entry structure size */ + if (Target->DeviceNameLength + sizeof(UNICODE_NULL) > Stack->Parameters.DeviceIoControl.InputBufferLength) + { + return STATUS_INVALID_PARAMETER; + } + + /* Ensure we can at least return needed size */ + if (Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Construct string for query */ + SymbolicName.Length = Target->DeviceNameLength; + SymbolicName.MaximumLength = Target->DeviceNameLength + sizeof(UNICODE_NULL); + SymbolicName.Buffer = Target->DeviceName; + + /* Find device with our info */ + Status = FindDeviceInfo(DeviceExtension, &SymbolicName, FALSE, &DeviceInformation); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DeviceLength = 0; + DeviceString = NULL; + DevicesFound = 0; + + /* Try to find associated device info */ + while (TRUE) + { + for (SymlinksEntry = DeviceInformation->SymbolicLinksListHead.Flink; + SymlinksEntry != &(DeviceInformation->SymbolicLinksListHead); + SymlinksEntry = SymlinksEntry->Flink) + { + SymlinkInformation = CONTAINING_RECORD(SymlinksEntry, SYMLINK_INFORMATION, SymbolicLinksListEntry); + + /* Try to find with drive letter */ + if (MOUNTMGR_IS_DRIVE_LETTER(&SymlinkInformation->Name) && SymlinkInformation->Online) + { + break; + } + } + + /* We didn't find, break */ + if (SymlinksEntry == &(DeviceInformation->SymbolicLinksListHead)) + { + break; + } + + /* It doesn't have associated device, go to fallback method */ + if (IsListEmpty(&DeviceInformation->AssociatedDevicesHead)) + { + goto TryWithVolumeName; + } + + /* Create a string with the information about the device */ + AssociatedDevice = CONTAINING_RECORD(&(DeviceInformation->SymbolicLinksListHead), ASSOCIATED_DEVICE_ENTRY, AssociatedDevicesEntry); + OldLength = DeviceLength; + OldBuffer = DeviceString; + DeviceLength += AssociatedDevice->String.Length; + DeviceString = AllocatePool(DeviceLength); + if (!DeviceString) + { + if (OldBuffer) + { + FreePool(OldBuffer); + } + + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Store our info and previous if any */ + RtlCopyMemory(DeviceString, AssociatedDevice->String.Buffer, AssociatedDevice->String.Length); + if (OldBuffer) + { + RtlCopyMemory(&DeviceString[AssociatedDevice->String.Length / sizeof(WCHAR)], OldBuffer, OldLength); + FreePool(OldBuffer); + } + + /* Count and continue looking */ + ++DevicesFound; + DeviceInformation = AssociatedDevice->DeviceInformation; + + /* If too many devices, try another way */ + if (DevicesFound > MAX_DEVICES) /* 1000 */ + { + goto TryWithVolumeName; + } + } + + /* Reallocate our string, so that we can prepend disk letter */ + OldBuffer = DeviceString; + OldLength = DeviceLength; + DeviceLength += 2 * sizeof(WCHAR); + DeviceString = AllocatePool(DeviceLength); + if (!DeviceString) + { + if (OldBuffer) + { + FreePool(OldBuffer); + } + + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get the letter */ + DeviceString[0] = SymlinkInformation->Name.Buffer[12]; + DeviceString[1] = L':'; + + /* And copy the rest */ + if (OldBuffer) + { + RtlCopyMemory(&DeviceString[2], OldBuffer, OldLength); + FreePool(OldBuffer); + } + +TryWithVolumeName: + /* If we didn't find anything, try differently */ + if (DeviceLength < 2 * sizeof(WCHAR) || DeviceString[2] != L':') + { + if (DeviceString) + { + FreePool(DeviceString); + DeviceLength = 0; + } + + /* Try to find a volume name matching */ + for (SymlinksEntry = DeviceInformation->SymbolicLinksListHead.Flink; + SymlinksEntry != &(DeviceInformation->SymbolicLinksListHead); + SymlinksEntry = SymlinksEntry->Flink) + { + SymlinkInformation = CONTAINING_RECORD(SymlinksEntry, SYMLINK_INFORMATION, SymbolicLinksListEntry); + + if (MOUNTMGR_IS_VOLUME_NAME(&SymlinkInformation->Name)) + { + break; + } + } + + /* If found copy */ + if (SymlinksEntry != &(DeviceInformation->SymbolicLinksListHead)) + { + DeviceLength = SymlinkInformation->Name.Length; + DeviceString = AllocatePool(DeviceLength); + if (!DeviceString) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(DeviceString, SymlinkInformation->Name.Buffer, DeviceLength); + /* Ensure we are in the right namespace; [1] can be ? */ + DeviceString[1] = L'\\'; + } + } + + /* If we found something */ + if (DeviceString) + { + /* At least, we will return our length */ + ((PMOUNTMGR_VOLUME_PATHS)Irp->AssociatedIrp.SystemBuffer)->MultiSzLength = DeviceLength; + /* MOUNTMGR_VOLUME_PATHS is a string + a ULONG */ + Irp->IoStatus.Information = DeviceLength + sizeof(ULONG); + + /* If we have enough room for copying the string */ + if (sizeof(ULONG) + DeviceLength <= Stack->Parameters.DeviceIoControl.OutputBufferLength) + { + /* Copy it */ + if (DeviceLength) + { + RtlCopyMemory(((PMOUNTMGR_VOLUME_PATHS)Irp->AssociatedIrp.SystemBuffer)->MultiSz, DeviceString, DeviceLength); + } + + /* And double zero at its end - this is needed in case of multiple paths which are separated by a single 0 */ + FreePool(DeviceString); + ((PMOUNTMGR_VOLUME_PATHS)Irp->AssociatedIrp.SystemBuffer)->MultiSz[DeviceLength / sizeof(WCHAR)] = 0; + ((PMOUNTMGR_VOLUME_PATHS)Irp->AssociatedIrp.SystemBuffer)->MultiSz[DeviceLength / sizeof(WCHAR) + 1] = 0; + + return STATUS_SUCCESS; + } + else + { + /* Just return appropriate size and leave */ + FreePool(DeviceString); + Irp->IoStatus.Information = sizeof(ULONG); + return STATUS_BUFFER_OVERFLOW; + } + } + + /* Fail */ + return STATUS_NOT_FOUND; } NTSTATUS Modified: trunk/reactos/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/m… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/mountmgr.c [iso-8859-1] Wed Dec 25 22:47:30 2013 @@ -42,7 +42,6 @@ /* * TODO: - * - MountMgrQueryDosVolumePath * - MountMgrQueryDosVolumePaths * - MountMgrQueryVolumePaths * - MountMgrValidateBackPointer

1 0

[pschweitzer] 61420: [DDK] Remove stray '\'
by pschweitzer＠svn.reactos.org 25 Dec '13

25 Dec '13

Author: pschweitzer Date: Wed Dec 25 22:25:36 2013 New Revision: 61420 URL: http://svn.reactos.org/svn/reactos?rev=61420&view=rev Log: [DDK] Remove stray '\' Modified: trunk/reactos/include/ddk/mountmgr.h Modified: trunk/reactos/include/ddk/mountmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mountmgr.h?rev… ============================================================================== --- trunk/reactos/include/ddk/mountmgr.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/mountmgr.h [iso-8859-1] Wed Dec 25 22:25:36 2013 @@ -53,7 +53,7 @@ #define MOUNTMGR_IS_DRIVE_LETTER(s) \ ((s)->Length == 28 && (s)->Buffer[0] == '\\' && (s)->Buffer[1] == 'D' && \ (s)->Buffer[2] == 'o' && (s)->Buffer[3] == 's' && (s)->Buffer[4] == 'D' && \ - (s)->Buffer[5] == 'e' && \ (s)->Buffer[6] == 'v' && (s)->Buffer[7] == 'i' && \ + (s)->Buffer[5] == 'e' && (s)->Buffer[6] == 'v' && (s)->Buffer[7] == 'i' && \ (s)->Buffer[8] == 'c' && (s)->Buffer[9] == 'e' && (s)->Buffer[10] == 's' && \ (s)->Buffer[11] == '\\' && (s)->Buffer[12] >= 'A' && \ (s)->Buffer[12] <= 'Z' && (s)->Buffer[13] == ':')

1 0

← Newer
1
2
3
4
5
6
7
8
...
31
Older →

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 December 2013