Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61471: [VBSCRIPT] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist i...
by akhaldi＠svn.reactos.org 01 Jan '14

01 Jan '14

Author: akhaldi Date: Wed Jan 1 18:29:51 2014 New Revision: 61471 URL: http://svn.reactos.org/svn/reactos?rev=61471&view=rev Log: [VBSCRIPT] * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716 Modified: trunk/reactos/dll/win32/vbscript/CMakeLists.txt trunk/reactos/dll/win32/vbscript/compile.c trunk/reactos/dll/win32/vbscript/error.c trunk/reactos/dll/win32/vbscript/global.c trunk/reactos/dll/win32/vbscript/interp.c trunk/reactos/dll/win32/vbscript/lex.c trunk/reactos/dll/win32/vbscript/parser.tab.c trunk/reactos/dll/win32/vbscript/regexp.c trunk/reactos/dll/win32/vbscript/vbdisp.c trunk/reactos/dll/win32/vbscript/vbregexp.c trunk/reactos/dll/win32/vbscript/vbscript.c trunk/reactos/dll/win32/vbscript/vbscript.h trunk/reactos/dll/win32/vbscript/vbscript_main.c Modified: trunk/reactos/dll/win32/vbscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/vbscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/CMakeLists.txt [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -31,7 +31,7 @@ add_typelib(vbsglobal.idl vbsregexp10.idl vbsregexp55.idl) add_library(vbscript SHARED ${SOURCE} vbscript.rc) set_module_type(vbscript win32dll) -target_link_libraries(vbscript wine) +target_link_libraries(vbscript uuid wine) add_importlibs(vbscript oleaut32 ole32 user32 msvcrt kernel32 ntdll) add_dependencies(vbscript vbscript_idlheader stdole2) add_cd_file(TARGET vbscript DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/vbscript/compile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/compile… ============================================================================== --- trunk/reactos/dll/win32/vbscript/compile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/compile.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,15 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "vbscript.h" -#include "parse.h" -//#include "parser.tab.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + WINE_DECLARE_DEBUG_CHANNEL(vbscript_disas); typedef struct _statement_ctx_t { Modified: trunk/reactos/dll/win32/vbscript/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/error.c… ============================================================================== --- trunk/reactos/dll/win32/vbscript/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/error.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -17,11 +17,6 @@ */ #include "vbscript.h" -#include "vbscript_defs.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static HRESULT Err_Description(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { Modified: trunk/reactos/dll/win32/vbscript/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/global.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/global.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,18 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> +#include "vbscript.h" + #include <math.h> - -#include "vbscript.h" -#include "vbscript_defs.h" - -#include <mshtmhst.h> -#include <objsafe.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5)) Modified: trunk/reactos/dll/win32/vbscript/interp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/interp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/interp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "vbscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static DISPID propput_dispid = DISPID_PROPERTYPUT; Modified: trunk/reactos/dll/win32/vbscript/lex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/lex.c?r… ============================================================================== --- trunk/reactos/dll/win32/vbscript/lex.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/lex.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,15 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <assert.h> - #include "vbscript.h" -#include "parse.h" #include "parser.tab.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static const WCHAR andW[] = {'a','n','d',0}; static const WCHAR byrefW[] = {'b','y','r','e','f',0}; Modified: trunk/reactos/dll/win32/vbscript/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/parser.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/parser.tab.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -76,13 +76,7 @@ /* Line 268 of yacc.c */ #line 19 "parser.y" - #include "vbscript.h" -#include "parse.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(parser_ctx_t *,const char*); Modified: trunk/reactos/dll/win32/vbscript/regexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/regexp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/regexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/regexp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -31,14 +31,7 @@ * the Initial Developer. All Rights Reserved. */ -#include <assert.h> - #include "vbscript.h" -#include "regexp.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); /* FIXME: Better error handling */ #define ReportRegExpError(a,b,c) Modified: trunk/reactos/dll/win32/vbscript/vbdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbdisp.… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbdisp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,13 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> - #include "vbscript.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); #define FDEX_VERSION_MASK 0xf0000000 Modified: trunk/reactos/dll/win32/vbscript/vbregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbregex… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbregexp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbregexp.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -17,12 +17,9 @@ */ #include "vbscript.h" -#include "regexp.h" -#include "vbsregexp55.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +#include <initguid.h> +#include <vbsregexp55.h> #define REGEXP_TID_LIST \ XDIID(RegExp2), \ Modified: trunk/reactos/dll/win32/vbscript/vbscript.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,15 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -//#include <assert.h> - #include "vbscript.h" -#include <objsafe.h> - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); + +#include <vbscript_classes.h> #ifdef _WIN64 Modified: trunk/reactos/dll/win32/vbscript/vbscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript.h [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #define WIN32_NO_STATUS @@ -27,13 +28,16 @@ #include <windef.h> #include <winbase.h> #include <ole2.h> +#include <objsafe.h> #include <dispex.h> #include <activscp.h> - -#include <vbscript_classes.h> +#include <mshtmhst.h> #include <wine/list.h> #include <wine/unicode.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(vbscript); typedef struct { void **blocks; @@ -410,3 +414,7 @@ return ret; } + +#include "parse.h" +#include "regexp.h" +#include "vbscript_defs.h" Modified: trunk/reactos/dll/win32/vbscript/vbscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] Wed Jan 1 18:29:51 2014 @@ -16,22 +16,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "vbscript.h" + +#include <rpcproxy.h> #include <initguid.h> - -#include <vbscript.h> -#include <objsafe.h> -#include <mshtmhst.h> -#include <rpcproxy.h> -//#include "vbscript_classes.h" -#include "vbsglobal.h" -#include "vbsregexp55.h" - -#include <wine/debug.h> - -WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#include <vbscript_classes.h> +#include <vbsglobal.h> + WINE_DECLARE_DEBUG_CHANNEL(heap); - -DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance;

1 0

[akhaldi] 61470: [RICHED20] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716
by akhaldi＠svn.reactos.org 01 Jan '14

01 Jan '14

Author: akhaldi Date: Wed Jan 1 18:22:31 2014 New Revision: 61470 URL: http://svn.reactos.org/svn/reactos?rev=61470&view=rev Log: [RICHED20] * Move some inclusions to the main header. * Remove inclusions and definitions that already exist in the main header. CORE-7716 Modified: trunk/reactos/dll/win32/riched20/caret.c trunk/reactos/dll/win32/riched20/editor.c trunk/reactos/dll/win32/riched20/editor.h trunk/reactos/dll/win32/riched20/editstr.h trunk/reactos/dll/win32/riched20/list.c trunk/reactos/dll/win32/riched20/msvc-thiscall.c trunk/reactos/dll/win32/riched20/reader.c trunk/reactos/dll/win32/riched20/res.h trunk/reactos/dll/win32/riched20/richole.c trunk/reactos/dll/win32/riched20/row.c trunk/reactos/dll/win32/riched20/rtf.h trunk/reactos/dll/win32/riched20/txthost.c trunk/reactos/dll/win32/riched20/txtsrv.c trunk/reactos/dll/win32/riched20/wrap.c trunk/reactos/dll/win32/riched20/writer.c Modified: trunk/reactos/dll/win32/riched20/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/caret.c… ============================================================================== --- trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/caret.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,7 +18,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 "editor.h" Modified: trunk/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -225,12 +225,10 @@ */ #include "editor.h" + #include <commdlg.h> -//#include "winreg.h" -#define NO_SHLWAPI_STREAM -//#include "shlwapi.h" + #include "rtf.h" -//#include "imm.h" #include "res.h" #define STACK_SIZE_DEFAULT 100 Modified: trunk/reactos/dll/win32/riched20/editor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editor.… ============================================================================== --- trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editor.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,8 +18,38 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <config.h> + +#include <assert.h> +#include <stdio.h> + +#ifndef _WIN32_IE +#define _WIN32_IE 0x0400 +#endif + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include <windef.h> +#include <winbase.h> +#include <wingdi.h> +#include <winuser.h> +#include <richedit.h> +#include <ole2.h> +#include <richole.h> +#include <imm.h> +#include <textserv.h> + +#include <wine/debug.h> +#include <wine/list.h> +#include <wine/unicode.h> + #include "editstr.h" -#include <wine/unicode.h> struct _RTF_Info; Modified: trunk/reactos/dll/win32/riched20/editstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/editstr… ============================================================================== --- trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/editstr.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -20,40 +20,6 @@ #ifndef __EDITSTR_H #define __EDITSTR_H - -#ifndef _WIN32_IE -#define _WIN32_IE 0x0400 -#endif - -#define WIN32_NO_STATUS -#define _INC_WINDOWS -#define COM_NO_WINDOWS_H - -#include <assert.h> -//#include <stdarg.h> -#include <stdio.h> -//#include <stdlib.h> -//#include <limits.h> - -#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - -#include <windef.h> -#include <winbase.h> -//#include <winnls.h> -//#include <winnt.h> -#include <wingdi.h> -#include <winuser.h> -#include <richedit.h> -//#include <commctrl.h> -#include <ole2.h> -#include <richole.h> -#include <imm.h> -#include <textserv.h> - -#include <wine/debug.h> -#include <wine/list.h> #ifdef __i386__ extern const struct ITextHostVtbl itextHostStdcallVtbl; Modified: trunk/reactos/dll/win32/riched20/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/list.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/list.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/list.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -17,7 +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 "editor.h" Modified: trunk/reactos/dll/win32/riched20/msvc-thiscall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/msvc-th… ============================================================================== --- trunk/reactos/dll/win32/riched20/msvc-thiscall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/msvc-thiscall.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -1,4 +1,3 @@ -#include "config.h" #include "editor.h" #define DEFINE_THISCALL_WRAPPER(func,args) \ Modified: trunk/reactos/dll/win32/riched20/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/reader.… ============================================================================== --- trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/reader.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -35,17 +35,6 @@ * This software may be redistributed without restriction and used for * any purpose whatsoever. */ - -//#include <stdio.h> -//#include <ctype.h> -//#include <string.h> -//#include <stdarg.h> -//#include <stdlib.h> -//#include <assert.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wine/debug.h" #include "editor.h" #include "rtf.h" Modified: trunk/reactos/dll/win32/riched20/res.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/res.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/res.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/res.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,4 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#pragma once + #define OCR_REVERSE 107 Modified: trunk/reactos/dll/win32/riched20/richole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/richole… ============================================================================== --- trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/richole.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -19,27 +19,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -//#include <stdarg.h> - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT -#define COBJMACROS - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "ole2.h" -//#include "richole.h" #include "editor.h" + #include <tom.h> -//#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); /* there is no way to be consistent across different sets of headers - mingw, Wine, Win32 SDK*/ -#include "initguid.h" +#include <initguid.h> DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); DEFINE_GUID(IID_ITextHost, 0x13e670f4,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); DEFINE_GUID(IID_ITextHost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xaa,0x00,0xb6,0x5e,0xa1); Modified: trunk/reactos/dll/win32/riched20/row.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/row.c?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/row.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/row.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -20,7 +20,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 "editor.h" Modified: trunk/reactos/dll/win32/riched20/rtf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/rtf.h?r… ============================================================================== --- trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/rtf.h [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -1,15 +1,5 @@ #ifndef _RTF #define _RTF - -//#include <stdarg.h> -//#include <stdio.h> - -//#include "windef.h" -//#include "winbase.h" -//#include "wingdi.h" -//#include "winuser.h" -//#include "richedit.h" - /* * rtf.h - RTF document processing stuff. Release 1.10. Modified: trunk/reactos/dll/win32/riched20/txthost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txthost… ============================================================================== --- trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txthost.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,20 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#define COBJMACROS - #include "editor.h" -//#include "ole2.h" -//#include "richole.h" -//#include "imm.h" -//#include "textserv.h" -//#include "wine/debug.h" -//#include "editstr.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); Modified: trunk/reactos/dll/win32/riched20/txtsrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/txtsrv.… ============================================================================== --- trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/txtsrv.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,21 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - -#define NONAMELESSSTRUCT -#define NONAMELESSUNION -#define COBJMACROS - #include "editor.h" -//#include "ole2.h" -//#include "oleauto.h" -//#include "richole.h" -//#include "imm.h" -//#include "textserv.h" -//#include "wine/debug.h" -//#include "editstr.h" #ifdef __i386__ /* thiscall functions are i386-specific */ Modified: trunk/reactos/dll/win32/riched20/wrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/wrap.c?… ============================================================================== --- trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/wrap.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); Modified: trunk/reactos/dll/win32/riched20/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/writer.… ============================================================================== --- trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/writer.c [iso-8859-1] Wed Jan 1 18:22:31 2014 @@ -18,14 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <config.h> -//#include "wine/port.h" - #include "editor.h" #include "rtf.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); - static BOOL ME_StreamOutRTFText(ME_OutStream *pStream, const WCHAR *text, LONG nChars);

1 0

[hbelusca] 61469: [REACTOS] ReactOS 1.0 patch. ~=~=~= --_'_-- \o/ !!!! Happy New Year 2014 !!!! \o/ --_'_-- =~=~=~ Update bootlogo, WinLogon image (see rev. 58144 for details) etc...
by hbelusca＠svn.reactos.org 31 Dec '13

31 Dec '13

Author: hbelusca Date: Tue Dec 31 23:00:54 2013 New Revision: 61469 URL: http://svn.reactos.org/svn/reactos?rev=61469&view=rev Log: [REACTOS] ReactOS 1.0 patch. ~=~=~= --_'_-- \o/ !!!! Happy New Year 2014 !!!! \o/ --_'_-- =~=~=~ Update bootlogo, WinLogon image (see rev. 58144 for details) etc... Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp trunk/reactos/dll/win32/msgina/resources/reactos.svg trunk/reactos/include/reactos/version.cmake trunk/reactos/ntoskrnl/inbv/logo/1.bmp Modified: trunk/reactos/dll/win32/msgina/resources/reactos.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/msgina/resources/reactos.svg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resources… ============================================================================== --- trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resources/reactos.svg [iso-8859-1] Tue Dec 31 23:00:54 2013 @@ -3110,5 +3110,5 @@ x="3.59375" y="83.363281" style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#1e2122;fill-opacity:1;font-family:Lucida Sans Unicode;-inkscape-font-specification:Lucida Sans Unicode" - id="tspan3618">Copyright Â© 1996-2013 ReactOS Team & Contributors</tspan></text> + id="tspan3618">Copyright Â© 1996-2014 ReactOS Team & Contributors</tspan></text> </svg> Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Tue Dec 31 23:00:54 2013 @@ -34,7 +34,7 @@ set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4") set(KERNEL_VERSION_PATCH_LEVEL "0") -set(COPYRIGHT_YEAR "2013") +set(COPYRIGHT_YEAR "2014") # KERNEL_VERSION_BUILD_TYPE is "SVN", "RC1", "RC2" or "" (for the release) set(KERNEL_VERSION_BUILD_TYPE "SVN") Modified: trunk/reactos/ntoskrnl/inbv/logo/1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/logo/1.bmp?r… ============================================================================== Binary files - no diff available.

1 0

[hbelusca] 61468: [NTOSKRNL] Fix user-mode access of pointers. From a patch by Sven Bjorn (private communication) and Aleksander Andrejevic. "[...]In the routine NtSetTimerResolution() the pointer ...
by hbelusca＠svn.reactos.org 31 Dec '13

31 Dec '13

Author: hbelusca Date: Tue Dec 31 20:47:05 2013 New Revision: 61468 URL: http://svn.reactos.org/svn/reactos?rev=61468&view=rev Log: [NTOSKRNL] Fix user-mode access of pointers. From a patch by Sven Bjorn (private communication) and Aleksander Andrejevic. "[...]In the routine NtSetTimerResolution() the pointer "CurrentResolution" is checked using ProbeForWriteUlong(), but it is then accessed outside of a try-block. This should be an error, since the user mode memory can become invalid at any point in time and thus potentially make the kernel crash on access. [...]" CORE-7387 #comment A fix by Sven Bjorn was committed in revision 61468, thanks :) Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=614… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/time.c [iso-8859-1] Tue Dec 31 20:47:05 2013 @@ -417,7 +417,6 @@ NtQuerySystemTime(OUT PLARGE_INTEGER SystemTime) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); /* Check if we were called from user-mode */ @@ -429,16 +428,16 @@ ProbeForWriteLargeInteger(SystemTime); /* - * It's safe to pass the pointer directly to KeQuerySystemTime as - * it's just a basic copy to this pointer. If it raises an + * It's safe to pass the pointer directly to KeQuerySystemTime + * as it's just a basic copy to this pointer. If it raises an * exception nothing dangerous can happen! */ KeQuerySystemTime(SystemTime); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; } @@ -448,8 +447,8 @@ KeQuerySystemTime(SystemTime); } - /* Return status to caller */ - return Status; + /* Return success */ + return STATUS_SUCCESS; } /* @@ -485,7 +484,7 @@ { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - /* Check if the call came from user mode */ + /* Check if the call came from user-mode */ if (PreviousMode != KernelMode) { _SEH2_TRY @@ -494,6 +493,17 @@ ProbeForWriteUlong(MinimumResolution); ProbeForWriteUlong(MaximumResolution); ProbeForWriteUlong(ActualResolution); + + /* + * Set the parameters to the actual values. + * + * NOTE: + * MinimumResolution corresponds to the biggest time increment and + * MaximumResolution corresponds to the smallest time increment. + */ + *MinimumResolution = KeMaximumIncrement; + *MaximumResolution = KeMinimumIncrement; + *ActualResolution = KeTimeIncrement; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -502,17 +512,13 @@ } _SEH2_END; } - - /* - * Set the parameters to the actual values. - * - * NOTE: - * MinimumResolution corresponds to the biggest time increment and - * MaximumResolution corresponds to the smallest time increment. - */ - *MinimumResolution = KeMaximumIncrement; - *MaximumResolution = KeMinimumIncrement; - *ActualResolution = KeTimeIncrement; + else + { + /* Set the parameters to the actual values */ + *MinimumResolution = KeMaximumIncrement; + *MaximumResolution = KeMinimumIncrement; + *ActualResolution = KeTimeIncrement; + } /* Return success */ return STATUS_SUCCESS; @@ -532,7 +538,7 @@ PEPROCESS Process = PsGetCurrentProcess(); ULONG NewResolution; - /* Check if the call came from user mode */ + /* Check if the call came from user-mode */ if (PreviousMode != KernelMode) { _SEH2_TRY @@ -550,7 +556,24 @@ /* Set and return the new resolution */ NewResolution = ExSetTimerResolution(DesiredResolution, SetResolution); - *CurrentResolution = NewResolution; + + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + *CurrentResolution = NewResolution; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + else + { + *CurrentResolution = NewResolution; + } if (SetResolution || Process->SetTimerResolution) {

1 0

[ekohl] 61467: [ADVAPI32] LogonUserW: Convert the logon type and pass it to LsaLogonUser.
by ekohl＠svn.reactos.org 31 Dec '13

31 Dec '13

Author: ekohl Date: Tue Dec 31 09:05:31 2013 New Revision: 61467 URL: http://svn.reactos.org/svn/reactos?rev=61467&view=rev Log: [ADVAPI32] LogonUserW: Convert the logon type and pass it to LsaLogonUser. Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c Modified: trunk/reactos/dll/win32/advapi32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/lo… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/logon.c [iso-8859-1] Tue Dec 31 09:05:31 2013 @@ -316,20 +316,45 @@ LUID LogonId = {0, 0}; HANDLE TokenHandle = NULL; QUOTA_LIMITS QuotaLimits; + SECURITY_LOGON_TYPE LogonType; NTSTATUS SubStatus = STATUS_SUCCESS; NTSTATUS Status; *phToken = NULL; + switch (dwLogonType) + { + case LOGON32_LOGON_INTERACTIVE: + LogonType = Interactive; + break; + + case LOGON32_LOGON_NETWORK: + LogonType = Network; + break; + + case LOGON32_LOGON_BATCH: + LogonType = Batch; + break; + + case LOGON32_LOGON_SERVICE: + LogonType = Service; + break; + + default: + ERR("Invalid logon type: %ul\n", dwLogonType); + Status = STATUS_INVALID_PARAMETER; + goto done; + } + if (LsaHandle == NULL) { Status = OpenLogonLsaHandle(); if (!NT_SUCCESS(Status)) - return Status; + goto done; } RtlInitAnsiString((PANSI_STRING)&OriginName, - "Testapp"); + "Advapi32 Logon"); RtlInitUnicodeString(&DomainName, lpszDomain); @@ -443,7 +468,7 @@ Status = LsaLogonUser(LsaHandle, &OriginName, - Interactive, + LogonType, AuthenticationPackage, (PVOID)AuthInfo, AuthInfoLength, @@ -457,7 +482,7 @@ &SubStatus); if (!NT_SUCCESS(Status)) { - TRACE("LsaLogonUser failed (Status 0x%08lx)\n", Status); + ERR("LsaLogonUser failed (Status 0x%08lx)\n", Status); goto done; }

1 0

[jgardou] 61466: [NTOSKRNL] - Fix compilation when not compiling in KDBG support.
by jgardou＠svn.reactos.org 30 Dec '13

30 Dec '13

Author: jgardou Date: Mon Dec 30 22:42:31 2013 New Revision: 61466 URL: http://svn.reactos.org/svn/reactos?rev=61466&view=rev Log: [NTOSKRNL] - Fix compilation when not compiling in KDBG support. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Dec 30 22:42:31 2013 @@ -394,12 +394,8 @@ kdbg/kdb_cli.c kdbg/kdb_expr.c kdbg/kdb_keyboard.c - kdbg/kdb_serial.c) - endif() - - if(DBG OR KDBG) - #list(APPEND SOURCE kdbg/kdb_symbols.cmake.c) - list(APPEND SOURCE kdbg/kdb_symbols.c) + kdbg/kdb_serial.c + kdbg/kdb_symbols.c) endif() list(APPEND SOURCE

1 0

[ekohl] 61465: [SYSSETUP] Run an interactive logon for the administrator instead of a network logon.
by ekohl＠svn.reactos.org 30 Dec '13

30 Dec '13

Author: ekohl Date: Mon Dec 30 22:38:14 2013 New Revision: 61465 URL: http://svn.reactos.org/svn/reactos?rev=61465&view=rev Log: [SYSSETUP] Run an interactive logon for the administrator instead of a network logon. Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Mon Dec 30 22:38:14 2013 @@ -933,7 +933,7 @@ HANDLE hToken; BOOL ret; - ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT, &hToken); + ret = LogonUserW(L"Administrator", L"", L"", LOGON32_LOGON_INTERACTIVE, LOGON32_PROVIDER_DEFAULT, &hToken); if (!ret) { FatalError("LogonUserW() failed!");

1 0

[jgardou] 61464: [SACDRV] - Fix unsigned vs 0 comparison
by jgardou＠svn.reactos.org 30 Dec '13

30 Dec '13

Author: jgardou Date: Mon Dec 30 22:00:49 2013 New Revision: 61464 URL: http://svn.reactos.org/svn/reactos?rev=61464&view=rev Log: [SACDRV] - Fix unsigned vs 0 comparison Modified: trunk/reactos/drivers/sac/driver/concmd.c Modified: trunk/reactos/drivers/sac/driver/concmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/concmd.… ============================================================================== --- trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/concmd.c [iso-8859-1] Mon Dec 30 22:00:49 2013 @@ -94,7 +94,7 @@ /* Make sure it's at least big enough to hold the static structure */ BufferLength = InputSize - sizeof(SAC_SYSTEM_INFORMATION); - if ((INT)InputSize - sizeof(SAC_SYSTEM_INFORMATION) < 0) + if (InputSize < sizeof(SAC_SYSTEM_INFORMATION)) { SAC_DBG(SAC_DBG_ENTRY_EXIT, "Exiting, no memory (2).\n"); return STATUS_NO_MEMORY;

1 0

[jgardou] 61463: [DESK.CPL] - remove unused variable
by jgardou＠svn.reactos.org 30 Dec '13

30 Dec '13

Author: jgardou Date: Mon Dec 30 19:30:35 2013 New Revision: 61463 URL: http://svn.reactos.org/svn/reactos?rev=61463&view=rev Log: [DESK.CPL] - remove unused variable Modified: trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Mon Dec 30 19:30:35 2013 @@ -97,7 +97,7 @@ AppearancePage_OnInit(HWND hwndDlg) { INT iListIndex; - HWND hwndColor, hwndTheme; + HWND hwndTheme; GLOBALS *g; RECT rcPreview; HDC hdcScreen; @@ -142,7 +142,6 @@ SelectObject(g->hdcThemePreview, g->hbmpThemePreview); ReleaseDC(NULL, hdcScreen); - hwndColor = GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME); hwndTheme = GetDlgItem(hwndDlg, IDC_APPEARANCE_VISUAL_STYLE); for (pTheme = g->pThemes; pTheme; pTheme = pTheme->NextTheme)

1 0

[hbelusca] 61462: [NTVDM] Rework the resource files, and add a nice old-ish IBM PC AT icon (C) myself :) (only 32x32 256 colors for now).
by hbelusca＠svn.reactos.org 29 Dec '13

29 Dec '13

Author: hbelusca Date: Sun Dec 29 22:38:10 2013 New Revision: 61462 URL: http://svn.reactos.org/svn/reactos?rev=61462&view=rev Log: [NTVDM] Rework the resource files, and add a nice old-ish IBM PC AT icon (C) myself :) (only 32x32 256 colors for now). Added: branches/ntvdm/subsystems/ntvdm/res/ (with props) branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico (with props) Removed: branches/ntvdm/subsystems/ntvdm/rsrc.rc Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc branches/ntvdm/subsystems/ntvdm/resource.h Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.rc… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.rc [iso-8859-1] Sun Dec 29 22:38:10 2013 @@ -1,5 +1,6 @@ #include <windef.h> #include <winuser.h> + #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -9,4 +10,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "ntvdm.exe" #include <reactos/version.rc> -#include "rsrc.rc" +IDI_APPICON ICON "res/ntvdm.ico" + +/* UTF-8 */ +#pragma code_page(65001) Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Dec 29 22:38:10 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ntvdm/subsystems/ntvdm/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/res/ntvd… ============================================================================== Binary file - no diff available. Propchange: branches/ntvdm/subsystems/ntvdm/res/ntvdm.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/ntvdm/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/resource… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/resource.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/resource.h [iso-8859-1] Sun Dec 29 22:38:10 2013 @@ -1,2 +1,5 @@ +#pragma once + +#define IDI_APPICON 1 /* EOF */ Removed: branches/ntvdm/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/rsrc.rc?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/rsrc.rc [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/rsrc.rc (removed) @@ -1,4 +0,0 @@ -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -// UTF-8 -#pragma code_page(65001)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs