Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[mjmartin] 38494: - Implement SetupDiSetDeviceInstallParamsA.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Wed Dec 31 16:01:58 2008 New Revision: 38494 URL: http://svn.reactos.org/svn/reactos?rev=38494&view=rev Log: - Implement SetupDiSetDeviceInstallParamsA. Modified: trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Wed Dec 31 16:01:58 2008 @@ -4242,6 +4242,42 @@ return ret; } +BOOL WINAPI SetupDiSetDeviceInstallParamsA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +{ + SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; + int len = 0; + BOOL ret = FALSE; + + TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + if (DeviceInstallParams == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInstallParams->cbSize < sizeof(SP_DEVINSTALL_PARAMS_A)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + memcpy(&deviceInstallParamsW, DeviceInstallParams, FIELD_OFFSET(SP_DEVINSTALL_PARAMS_A, DriverPath)); + deviceInstallParamsW.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + len = MultiByteToWideChar(CP_ACP, 0, DeviceInstallParams->DriverPath, -1, NULL, 0); + if (!len) + { + ERR("DrivePath is NULL\n"); + ret = FALSE; + } + else + { + MultiByteToWideChar(CP_ACP, 0, DeviceInstallParams->DriverPath, -1, deviceInstallParamsW.DriverPath, len); + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &deviceInstallParamsW); + } + } + + TRACE("Returning %d\n", ret); + return ret; +} + static HKEY OpenHardwareProfileKey( IN HKEY HKLM, Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Wed Dec 31 16:01:58 2008 @@ -382,7 +382,7 @@ @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) -@ stub SetupDiSetDeviceInstallParamsA +@ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) @ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr long) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr long)

15 years, 11 months

[tkreuzer] 38493: add missing files

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 31 10:35:20 2008 New Revision: 38493 URL: http://svn.reactos.org/svn/reactos?rev=38493&view=rev Log: add missing files Added: branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h (with props) branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h (with props) branches/ros-amd64-bringup/reactos/include/crt/libgen.h (with props) branches/ros-amd64-bringup/reactos/include/crt/stdarg.h (with props) branches/ros-amd64-bringup/reactos/include/crt/stddef.h (with props) branches/ros-amd64-bringup/reactos/include/crt/vadefs.h (with props) Added: branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h (added) +++ branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h [iso-8859-1] Wed Dec 31 10:35:20 2008 @@ -1,0 +1,212 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ +#include <_mingw.h> + +#ifndef _INC_CRTDBG +#define _INC_CRTDBG + +#pragma pack(push,_CRT_PACKING) + +#ifndef NULL +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((void *)0) +#endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + + typedef void *_HFILE; + +#define _CRT_WARN 0 +#define _CRT_ERROR 1 +#define _CRT_ASSERT 2 +#define _CRT_ERRCNT 3 + +#define _CRTDBG_MODE_FILE 0x1 +#define _CRTDBG_MODE_DEBUG 0x2 +#define _CRTDBG_MODE_WNDW 0x4 +#define _CRTDBG_REPORT_MODE -1 + +#define _CRTDBG_INVALID_HFILE ((_HFILE)-1) +#define _CRTDBG_HFILE_ERROR ((_HFILE)-2) +#define _CRTDBG_FILE_STDOUT ((_HFILE)-4) +#define _CRTDBG_FILE_STDERR ((_HFILE)-5) +#define _CRTDBG_REPORT_FILE ((_HFILE)-6) + + typedef int (__cdecl *_CRT_REPORT_HOOK)(int,char *,int *); + typedef int (__cdecl *_CRT_REPORT_HOOKW)(int,wchar_t *,int *); + +#define _CRT_RPTHOOK_INSTALL 0 +#define _CRT_RPTHOOK_REMOVE 1 + +#define _HOOK_ALLOC 1 +#define _HOOK_REALLOC 2 +#define _HOOK_FREE 3 + + typedef int (__cdecl *_CRT_ALLOC_HOOK)(int,void *,size_t,int,long,const unsigned char *,int); + +#define _CRTDBG_ALLOC_MEM_DF 0x01 +#define _CRTDBG_DELAY_FREE_MEM_DF 0x02 +#define _CRTDBG_CHECK_ALWAYS_DF 0x04 +#define _CRTDBG_RESERVED_DF 0x08 +#define _CRTDBG_CHECK_CRT_DF 0x10 +#define _CRTDBG_LEAK_CHECK_DF 0x20 + +#define _CRTDBG_CHECK_EVERY_16_DF 0x00100000 +#define _CRTDBG_CHECK_EVERY_128_DF 0x00800000 +#define _CRTDBG_CHECK_EVERY_1024_DF 0x04000000 + +#define _CRTDBG_CHECK_DEFAULT_DF 0 + +#define _CRTDBG_REPORT_FLAG -1 + +#define _BLOCK_TYPE(block) (block & 0xFFFF) +#define _BLOCK_SUBTYPE(block) (block >> 16 & 0xFFFF) + +#define _FREE_BLOCK 0 +#define _NORMAL_BLOCK 1 +#define _CRT_BLOCK 2 +#define _IGNORE_BLOCK 3 +#define _CLIENT_BLOCK 4 +#define _MAX_BLOCKS 5 + + typedef void (__cdecl *_CRT_DUMP_CLIENT)(void *,size_t); + + struct _CrtMemBlockHeader; + + typedef struct _CrtMemState { + struct _CrtMemBlockHeader *pBlockHeader; + size_t lCounts[_MAX_BLOCKS]; + size_t lSizes[_MAX_BLOCKS]; + size_t lHighWaterCount; + size_t lTotalCount; + } _CrtMemState; + +#ifndef _STATIC_ASSERT +#define _STATIC_ASSERT(expr) typedef char __static_assert_t[(expr)?1:-1] +#endif + +#ifndef _ASSERT +#define _ASSERT(expr) ((void)0) +#endif + +#ifndef _ASSERTE +#define _ASSERTE(expr) ((void)0) +#endif + +#ifndef _ASSERT_EXPR +#define _ASSERT_EXPR(expr,expr_str) ((void)0) +#endif + +#ifndef _ASSERT_BASE +#define _ASSERT_BASE _ASSERT_EXPR +#endif + +#define _RPT0(rptno,msg) +#define _RPTW0(rptno,msg) + +#define _RPT1(rptno,msg,arg1) +#define _RPTW1(rptno,msg,arg1) +#define _RPT2(rptno,msg,arg1,arg2) +#define _RPTW2(rptno,msg,arg1,arg2) +#define _RPT3(rptno,msg,arg1,arg2,arg3) +#define _RPTW3(rptno,msg,arg1,arg2,arg3) +#define _RPT4(rptno,msg,arg1,arg2,arg3,arg4) +#define _RPTW4(rptno,msg,arg1,arg2,arg3,arg4) +#define _RPTF0(rptno,msg) +#define _RPTFW0(rptno,msg) +#define _RPTF1(rptno,msg,arg1) +#define _RPTFW1(rptno,msg,arg1) +#define _RPTF2(rptno,msg,arg1,arg2) +#define _RPTFW2(rptno,msg,arg1,arg2) +#define _RPTF3(rptno,msg,arg1,arg2,arg3) +#define _RPTFW3(rptno,msg,arg1,arg2,arg3) +#define _RPTF4(rptno,msg,arg1,arg2,arg3,arg4) +#define _RPTFW4(rptno,msg,arg1,arg2,arg3,arg4) + +#define _malloc_dbg(s,t,f,l) malloc(s) +#define _calloc_dbg(c,s,t,f,l) calloc(c,s) +#define _realloc_dbg(p,s,t,f,l) realloc(p,s) +#define _recalloc_dbg(p,c,s,t,f,l) _recalloc(p,c,s) +#define _expand_dbg(p,s,t,f,l) _expand(p,s) +#define _free_dbg(p,t) free(p) +#define _msize_dbg(p,t) _msize(p) + +#define _aligned_malloc_dbg(s,a,f,l) _aligned_malloc(s,a) +#define _aligned_realloc_dbg(p,s,a,f,l) _aligned_realloc(p,s,a) +#define _aligned_recalloc_dbg(p,c,s,a,f,l) _aligned_realloc(p,c,s,a) +#define _aligned_free_dbg(p) _aligned_free(p) +#define _aligned_offset_malloc_dbg(s,a,o,f,l) _aligned_offset_malloc(s,a,o) +#define _aligned_offset_realloc_dbg(p,s,a,o,f,l) _aligned_offset_realloc(p,s,a,o) +#define _aligned_offset_recalloc_dbg(p,c,s,a,o,f,l) _aligned_offset_recalloc(p,c,s,a,o) + +#define _malloca_dbg(s,t,f,l) _malloca(s) +#define _freea_dbg(p,t) _freea(p) + +#define _strdup_dbg(s,t,f,l) _strdup(s) +#define _wcsdup_dbg(s,t,f,l) _wcsdup(s) +#define _mbsdup_dbg(s,t,f,l) _mbsdup(s) +#define _tempnam_dbg(s1,s2,t,f,l) _tempnam(s1,s2) +#define _wtempnam_dbg(s1,s2,t,f,l) _wtempnam(s1,s2) +#define _fullpath_dbg(s1,s2,le,t,f,l) _fullpath(s1,s2,le) +#define _wfullpath_dbg(s1,s2,le,t,f,l) _wfullpath(s1,s2,le) +#define _getcwd_dbg(s,le,t,f,l) _getcwd(s,le) +#define _wgetcwd_dbg(s,le,t,f,l) _wgetcwd(s,le) +#define _getdcwd_dbg(d,s,le,t,f,l) _getdcwd(d,s,le) +#define _wgetdcwd_dbg(d,s,le,t,f,l) _wgetdcwd(d,s,le) +#define _getdcwd_lk_dbg(d,s,le,t,f,l) _getdcwd_nolock(d,s,le) +#define _wgetdcwd_lk_dbg(d,s,le,t,f,l) _wgetdcwd_nolock(d,s,le) + +#define _CrtSetReportHook(f) ((_CRT_REPORT_HOOK)0) +#define _CrtGetReportHook() ((_CRT_REPORT_HOOK)0) +#define _CrtSetReportHook2(t,f) ((int)0) +#define _CrtSetReportHookW2(t,f) ((int)0) +#define _CrtSetReportMode(t,f) ((int)0) +#define _CrtSetReportFile(t,f) ((_HFILE)0) + +#define _CrtDbgBreak() ((void)0) + +#define _CrtSetBreakAlloc(a) ((long)0) +#define _CrtSetAllocHook(f) ((_CRT_ALLOC_HOOK)0) +#define _CrtGetAllocHook() ((_CRT_ALLOC_HOOK)0) +#define _CrtCheckMemory() ((int)1) +#define _CrtSetDbgFlag(f) ((int)0) +#define _CrtDoForAllClientObjects(f,c) ((void)0) +#define _CrtIsValidPointer(p,n,r) ((int)1) +#define _CrtIsValidHeapPointer(p) ((int)1) +#define _CrtIsMemoryBlock(p,t,r,f,l) ((int)1) +#define _CrtReportBlockType(p) ((int)-1) +#define _CrtSetDumpClient(f) ((_CRT_DUMP_CLIENT)0) +#define _CrtGetDumpClient() ((_CRT_DUMP_CLIENT)0) +#define _CrtMemCheckpoint(s) ((void)0) +#define _CrtMemDifference(s1,s2,s3) ((int)0) +#define _CrtMemDumpAllObjectsSince(s) ((void)0) +#define _CrtMemDumpStatistics(s) ((void)0) +#define _CrtDumpMemoryLeaks() ((int)0) +#define _CrtSetDebugFillThreshold(t) ((size_t)0) +#define _CrtSetCheckCount(f) ((int)0) +#define _CrtGetCheckCount() ((int)0) + +#ifdef __cplusplus +} + + void *__cdecl operator new[](size_t _Size); + inline void *__cdecl operator new(size_t _Size,int,const char *,int) { return ::operator new(_Size); } + inline void *__cdecl operator new[](size_t _Size,int,const char *,int) { return ::operator new[](_Size); } + void __cdecl operator delete[](void *); + inline void __cdecl operator delete(void *_P,int,const char *,int) { ::operator delete(_P); } + inline void __cdecl operator delete[](void *_P,int,const char *,int) { ::operator delete[](_P); } +#endif + +#pragma pack(pop) + +#include <sec_api/crtdbg_s.h> + +#endif Propchange: branches/ros-amd64-bringup/reactos/include/crt/crtdbg.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h (added) +++ branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h [iso-8859-1] Wed Dec 31 10:35:20 2008 @@ -1,0 +1,6 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ +#include <_mingw.h> Propchange: branches/ros-amd64-bringup/reactos/include/crt/crtdefs.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/include/crt/libgen.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/libgen.h (added) +++ branches/ros-amd64-bringup/reactos/include/crt/libgen.h [iso-8859-1] Wed Dec 31 10:35:20 2008 @@ -1,0 +1,31 @@ +#ifndef _LIBGEN_H_ +/* + * libgen.h + * + * $Id: libgen.h,v 1.2 2007/06/23 07:34:15 dannysmith Exp $ + * + * This file has no copyright assigned and is placed in the Public Domain. + * This file is a part of the mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within the package. + * + * Functions for splitting pathnames into dirname and basename components. + * + */ +#define _LIBGEN_H_ + +/* All the headers include this file. */ +#include <_mingw.h> + +#ifdef __cplusplus +extern "C" { +#endif + +extern __cdecl __MINGW_NOTHROW char *basename (char *); +extern __cdecl __MINGW_NOTHROW char *dirname (char *); + +#ifdef __cplusplus +} +#endif + +#endif /* _LIBGEN_H_: end of file */ + Propchange: branches/ros-amd64-bringup/reactos/include/crt/libgen.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/include/crt/stdarg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/stdarg.h (added) +++ branches/ros-amd64-bringup/reactos/include/crt/stdarg.h [iso-8859-1] Wed Dec 31 10:35:20 2008 @@ -1,0 +1,153 @@ +/* Copyright (C) 1989, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + +/* As a special exception, if you include this header file into source + files compiled by GCC, this header file does not by itself cause + the resulting executable to be covered by the GNU General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU General + Public License. */ + +/* + * ISO C Standard: 7.15 Variable arguments <stdarg.h> + */ + +#ifndef _INC_STDARG +#define _INC_STDARG +#ifndef _WIN32 +#error Only Win32 target is supported! +#endif + +#ifndef _STDARG_H +#ifndef _ANSI_STDARG_H_ +#ifndef __need___va_list +#define _STDARG_H +#define _ANSI_STDARG_H_ +#endif /* not __need___va_list */ +#undef __need___va_list + +/* Define __gnuc_va_list. */ + +#ifndef __GNUC_VA_LIST +#define __GNUC_VA_LIST +typedef __builtin_va_list __gnuc_va_list; +#endif + +/* Define the standard macros for the user, + if this invocation was from the user program. */ +#ifdef _STDARG_H + +#define va_start(v,l) __builtin_va_start(v,l) +#define va_end(v) __builtin_va_end(v) +#define va_arg(v,l) __builtin_va_arg(v,l) +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L +#define va_copy(d,s) __builtin_va_copy(d,s) +#endif +#define __va_copy(d,s) __builtin_va_copy(d,s) + +/* Define va_list, if desired, from __gnuc_va_list. */ +/* We deliberately do not define va_list when called from + stdio.h, because ANSI C says that stdio.h is not supposed to define + va_list. stdio.h needs to have access to that data type, + but must not use that name. It should use the name __gnuc_va_list, + which is safe because it is reserved for the implementation. */ + +#ifdef _HIDDEN_VA_LIST /* On OSF1, this means varargs.h is "half-loaded". */ +#undef _VA_LIST +#endif + +#ifdef _BSD_VA_LIST +#undef _BSD_VA_LIST +#endif + +#if defined(__svr4__) || (defined(_SCO_DS) && !defined(__VA_LIST)) +/* SVR4.2 uses _VA_LIST for an internal alias for va_list, + so we must avoid testing it and setting it here. + SVR4 uses _VA_LIST as a flag in stdarg.h, but we should + have no conflict with that. */ +#ifndef _VA_LIST_ +#define _VA_LIST_ +#ifdef __i860__ +#ifndef _VA_LIST +#define _VA_LIST va_list +#endif +#endif /* __i860__ */ +typedef __gnuc_va_list va_list; +#ifdef _SCO_DS +#define __VA_LIST +#endif +#endif /* _VA_LIST_ */ +#else /* not __svr4__ || _SCO_DS */ + +/* The macro _VA_LIST_ is the same thing used by this file in Ultrix. + But on BSD NET2 we must not test or define or undef it. + (Note that the comments in NET 2's ansi.h + are incorrect for _VA_LIST_--see stdio.h!) */ +#if !defined (_VA_LIST_) || defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__) || defined(WINNT) +/* The macro _VA_LIST_DEFINED is used in Windows NT 3.5 */ +#ifndef _VA_LIST_DEFINED +/* The macro _VA_LIST is used in SCO Unix 3.2. */ +#ifndef _VA_LIST +/* The macro _VA_LIST_T_H is used in the Bull dpx2 */ +#ifndef _VA_LIST_T_H +/* The macro __va_list__ is used by BeOS. */ +#ifndef __va_list__ +typedef __gnuc_va_list va_list; +#endif /* not __va_list__ */ +#endif /* not _VA_LIST_T_H */ +#endif /* not _VA_LIST */ +#endif /* not _VA_LIST_DEFINED */ +#if !(defined (__BSD_NET2__) || defined (____386BSD____) || defined (__bsdi__) || defined (__sequent__) || defined (__FreeBSD__)) +#define _VA_LIST_ +#endif +#ifndef _VA_LIST +#define _VA_LIST +#endif +#ifndef _VA_LIST_DEFINED +#define _VA_LIST_DEFINED +#endif +#ifndef _VA_LIST_T_H +#define _VA_LIST_T_H +#endif +#ifndef __va_list__ +#define __va_list__ +#endif + +#endif /* not _VA_LIST_, except on certain systems */ + +#endif /* not __svr4__ */ + +#endif /* _STDARG_H */ + +#endif /* not _ANSI_STDARG_H_ */ +#endif /* not _STDARG_H */ + +#include <vadefs.h> + +#ifndef va_start +#define va_start _crt_va_start +#endif +#ifndef va_arg +#define va_arg _crt_va_arg +#endif +#ifndef va_end +#define va_end _crt_va_end +#endif + +#endif Propchange: branches/ros-amd64-bringup/reactos/include/crt/stdarg.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/stddef.h (added) +++ branches/ros-amd64-bringup/reactos/include/crt/stddef.h [iso-8859-1] Wed Dec 31 10:35:20 2008 @@ -1,0 +1,398 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#include <_mingw.h> + +#ifndef _INC_STDDEF +#define _INC_STDDEF + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _CRT_ERRNO_DEFINED +#define _CRT_ERRNO_DEFINED + _CRTIMP extern int *__cdecl _errno(void); +#define errno (*_errno()) + errno_t __cdecl _set_errno(int _Value); + errno_t __cdecl _get_errno(int *_Value); +#endif + + _CRTIMP extern unsigned long __cdecl __threadid(void); +#define _threadid (__threadid()) + _CRTIMP extern uintptr_t __cdecl __threadhandle(void); + +#ifdef __cplusplus +} +#endif + +#endif + +/* + * ISO C Standard: 7.17 Common definitions <stddef.h> + */ +#if (!defined(_STDDEF_H) && !defined(_STDDEF_H_) && !defined(_ANSI_STDDEF_H) \ + && !defined(__STDDEF_H__)) \ + || defined(__need_wchar_t) || defined(__need_size_t) \ + || defined(__need_ptrdiff_t) || defined(__need_NULL) \ + || defined(__need_wint_t) + +/* Any one of these symbols __need_* means that GNU libc + wants us just to define one data type. So don't define + the symbols that indicate this file's entire job has been done. */ +#if (!defined(__need_wchar_t) && !defined(__need_size_t) \ + && !defined(__need_ptrdiff_t) && !defined(__need_NULL) \ + && !defined(__need_wint_t)) +#define _STDDEF_H +#define _STDDEF_H_ +/* snaroff(a)next.com says the NeXT needs this. */ +#define _ANSI_STDDEF_H +/* Irix 5.1 needs this. */ +#define __STDDEF_H__ +#endif + +#ifndef __sys_stdtypes_h +/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are + defined if the corresponding type is *not* defined. + FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_ */ +#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) +#if !defined(_SIZE_T_) && !defined(_BSD_SIZE_T_) +#define _SIZE_T +#endif +#if !defined(_PTRDIFF_T_) && !defined(_BSD_PTRDIFF_T_) +#define _PTRDIFF_T +#endif +/* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_ + instead of _WCHAR_T_. */ +#if !defined(_WCHAR_T_) && !defined(_BSD_WCHAR_T_) +#ifndef _BSD_WCHAR_T_ +#define _WCHAR_T +#endif +#endif +/* Undef _FOO_T_ if we are supposed to define foo_t. */ +#if defined (__need_ptrdiff_t) || defined (_STDDEF_H_) +#undef _PTRDIFF_T_ +#undef _BSD_PTRDIFF_T_ +#endif +#if defined (__need_size_t) || defined (_STDDEF_H_) +#undef _SIZE_T_ +#undef _BSD_SIZE_T_ +#endif +#if defined (__need_wchar_t) || defined (_STDDEF_H_) +#undef _WCHAR_T_ +#undef _BSD_WCHAR_T_ +#endif +#endif /* defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) */ + +/* Sequent's header files use _PTRDIFF_T_ in some conflicting way. + Just ignore it. */ +#if defined (__sequent__) && defined (_PTRDIFF_T_) +#undef _PTRDIFF_T_ +#endif + +/* On VxWorks, <type/vxTypesBase.h> may have defined macros like + _TYPE_size_t which will typedef size_t. fixincludes patched the + vxTypesBase.h so that this macro is only defined if _GCC_SIZE_T is + not defined, and so that defining this macro defines _GCC_SIZE_T. + If we find that the macros are still defined at this point, we must + invoke them so that the type is defined as expected. */ +#if defined (_TYPE_ptrdiff_t) && (defined (__need_ptrdiff_t) || defined (_STDDEF_H_)) +_TYPE_ptrdiff_t; +#undef _TYPE_ptrdiff_t +#endif +#if defined (_TYPE_size_t) && (defined (__need_size_t) || defined (_STDDEF_H_)) +_TYPE_size_t; +#undef _TYPE_size_t +#endif +#if defined (_TYPE_wchar_t) && (defined (__need_wchar_t) || defined (_STDDEF_H_)) +_TYPE_wchar_t; +#undef _TYPE_wchar_t +#endif + +/* In case nobody has defined these types, but we aren't running under + GCC 2.00, make sure that __PTRDIFF_TYPE__, __SIZE_TYPE__, and + __WCHAR_TYPE__ have reasonable values. This can happen if the + parts of GCC is compiled by an older compiler, that actually + include gstddef.h, such as collect2. */ + +/* Signed type of difference of two pointers. */ + +/* Define this type if we are doing the whole job, + or if we want this type in particular. */ +#if defined (_STDDEF_H) || defined (__need_ptrdiff_t) +#ifndef _PTRDIFF_T /* in case <sys/types.h> has defined it. */ +#ifndef _T_PTRDIFF_ +#ifndef _T_PTRDIFF +#ifndef __PTRDIFF_T +#ifndef _PTRDIFF_T_ +#ifndef _BSD_PTRDIFF_T_ +#ifndef ___int_ptrdiff_t_h +#ifndef _GCC_PTRDIFF_T +#define _PTRDIFF_T +#define _T_PTRDIFF_ +#define _T_PTRDIFF +#define __PTRDIFF_T +#define _PTRDIFF_T_ +#define _BSD_PTRDIFF_T_ +#define ___int_ptrdiff_t_h +#define _GCC_PTRDIFF_T +#ifndef __PTRDIFF_TYPE__ +# ifdef _WIN64 + #define __PTRDIFF_TYPE__ long long int +# else +# #define __PTRDIFF_TYPE__ long int +# endif +#endif +#ifndef _PTRDIFF_T_DEFINED +#define _PTRDIFF_T_DEFINED +typedef __PTRDIFF_TYPE__ ptrdiff_t; +#endif +#endif /* _GCC_PTRDIFF_T */ +#endif /* ___int_ptrdiff_t_h */ +#endif /* _BSD_PTRDIFF_T_ */ +#endif /* _PTRDIFF_T_ */ +#endif /* __PTRDIFF_T */ +#endif /* _T_PTRDIFF */ +#endif /* _T_PTRDIFF_ */ +#endif /* _PTRDIFF_T */ + +/* If this symbol has done its job, get rid of it. */ +#undef __need_ptrdiff_t + +#endif /* _STDDEF_H or __need_ptrdiff_t. */ + +/* Unsigned type of `sizeof' something. */ + +/* Define this type if we are doing the whole job, + or if we want this type in particular. */ +#if defined (_STDDEF_H) || defined (__need_size_t) +#ifndef __size_t__ /* BeOS */ +#ifndef __SIZE_T__ /* Cray Unicos/Mk */ +#ifndef _SIZE_T /* in case <sys/types.h> has defined it. */ +#ifndef _SYS_SIZE_T_H +#ifndef _T_SIZE_ +#ifndef _T_SIZE +#ifndef __SIZE_T +#ifndef _SIZE_T_ +#ifndef _BSD_SIZE_T_ +#ifndef _SIZE_T_DEFINED_ +#ifndef _SIZE_T_DEFINED +#ifndef _BSD_SIZE_T_DEFINED_ /* Darwin */ +#ifndef _SIZE_T_DECLARED /* FreeBSD 5 */ +#ifndef ___int_size_t_h +#ifndef _GCC_SIZE_T +#ifndef _SIZET_ +#ifndef __size_t +#define __size_t__ /* BeOS */ +#define __SIZE_T__ /* Cray Unicos/Mk */ +#define _SIZE_T +#define _SYS_SIZE_T_H +#define _T_SIZE_ +#define _T_SIZE +#define __SIZE_T +#define _SIZE_T_ +#define _BSD_SIZE_T_ +#define _SIZE_T_DEFINED_ +#define _SIZE_T_DEFINED +#define _BSD_SIZE_T_DEFINED_ /* Darwin */ +#define _SIZE_T_DECLARED /* FreeBSD 5 */ +#define ___int_size_t_h +#define _GCC_SIZE_T +#define _SIZET_ +#if defined (__FreeBSD__) && (__FreeBSD__ >= 5) +/* __size_t is a typedef on FreeBSD 5!, must not trash it. */ +#else +#define __size_t +#endif +#ifndef __SIZE_TYPE__ +# ifdef _WIN64 +# define __SIZE_TYPE__ long long unsigned int +# else +# define __SIZE_TYPE__ long unsigned int +# endif +#endif +#if !(defined (__GNUG__) && defined (size_t)) +typedef __SIZE_TYPE__ size_t; +#ifdef __BEOS__ +typedef long ssize_t; +#endif /* __BEOS__ */ +#endif /* !(defined (__GNUG__) && defined (size_t)) */ +#endif /* __size_t */ +#endif /* _SIZET_ */ +#endif /* _GCC_SIZE_T */ +#endif /* ___int_size_t_h */ +#endif /* _SIZE_T_DECLARED */ +#endif /* _BSD_SIZE_T_DEFINED_ */ +#endif /* _SIZE_T_DEFINED */ +#endif /* _SIZE_T_DEFINED_ */ +#endif /* _BSD_SIZE_T_ */ +#endif /* _SIZE_T_ */ +#endif /* __SIZE_T */ +#endif /* _T_SIZE */ +#endif /* _T_SIZE_ */ +#endif /* _SYS_SIZE_T_H */ +#endif /* _SIZE_T */ +#endif /* __SIZE_T__ */ +#endif /* __size_t__ */ +#undef __need_size_t +#endif /* _STDDEF_H or __need_size_t. */ + + +/* Wide character type. + Locale-writers should change this as necessary to + be big enough to hold unique values not between 0 and 127, + and not (wchar_t) -1, for each defined multibyte character. */ + +/* Define this type if we are doing the whole job, + or if we want this type in particular. */ +#if defined (_STDDEF_H) || defined (__need_wchar_t) +#ifndef __wchar_t__ /* BeOS */ +#ifndef __WCHAR_T__ /* Cray Unicos/Mk */ +#ifndef _WCHAR_T +#ifndef _T_WCHAR_ +#ifndef _T_WCHAR +#ifndef __WCHAR_T +#ifndef _WCHAR_T_ +#ifndef _BSD_WCHAR_T_ +#ifndef _BSD_WCHAR_T_DEFINED_ /* Darwin */ +#ifndef _BSD_RUNE_T_DEFINED_ /* Darwin */ +#ifndef _WCHAR_T_DECLARED /* FreeBSD 5 */ +#ifndef _WCHAR_T_DEFINED_ +#ifndef _WCHAR_T_DEFINED +#ifndef _WCHAR_T_H +#ifndef ___int_wchar_t_h +#ifndef __INT_WCHAR_T_H +#ifndef _GCC_WCHAR_T +#define __wchar_t__ /* BeOS */ +#define __WCHAR_T__ /* Cray Unicos/Mk */ +#define _WCHAR_T +#define _T_WCHAR_ +#define _T_WCHAR +#define __WCHAR_T +#define _WCHAR_T_ +#define _BSD_WCHAR_T_ +#define _WCHAR_T_DEFINED_ +#define _WCHAR_T_DEFINED +#define _WCHAR_T_H +#define ___int_wchar_t_h +#define __INT_WCHAR_T_H +#define _GCC_WCHAR_T +#define _WCHAR_T_DECLARED + +/* On BSD/386 1.1, at least, machine/ansi.h defines _BSD_WCHAR_T_ + instead of _WCHAR_T_, and _BSD_RUNE_T_ (which, unlike the other + symbols in the _FOO_T_ family, stays defined even after its + corresponding type is defined). If we define wchar_t, then we + must undef _WCHAR_T_; for BSD/386 1.1 (and perhaps others), if + we undef _WCHAR_T_, then we must also define rune_t, since + headers like runetype.h assume that if machine/ansi.h is included, + and _BSD_WCHAR_T_ is not defined, then rune_t is available. + machine/ansi.h says, "Note that _WCHAR_T_ and _RUNE_T_ must be of + the same type." */ +#ifdef _BSD_WCHAR_T_ +#undef _BSD_WCHAR_T_ +#ifdef _BSD_RUNE_T_ +#if !defined (_ANSI_SOURCE) && !defined (_POSIX_SOURCE) +typedef _BSD_RUNE_T_ rune_t; +#define _BSD_WCHAR_T_DEFINED_ +#define _BSD_RUNE_T_DEFINED_ /* Darwin */ +#if defined (__FreeBSD__) && (__FreeBSD__ < 5) +/* Why is this file so hard to maintain properly? In contrast to + the comment above regarding BSD/386 1.1, on FreeBSD for as long + as the symbol has existed, _BSD_RUNE_T_ must not stay defined or + redundant typedefs will occur when stdlib.h is included after this file. */ +#undef _BSD_RUNE_T_ +#endif +#endif +#endif +#endif + +#ifndef __WCHAR_TYPE__ +#define __WCHAR_TYPE__ unsigned short +#endif +#ifndef __cplusplus +typedef __WCHAR_TYPE__ wchar_t; +#endif +#endif +#endif +#endif +#endif +#endif +#endif +#endif /* _WCHAR_T_DECLARED */ +#endif /* _BSD_RUNE_T_DEFINED_ */ +#endif +#endif +#endif +#endif +#endif +#endif +#endif +#endif /* __WCHAR_T__ */ +#endif /* __wchar_t__ */ +#undef __need_wchar_t +#endif /* _STDDEF_H or __need_wchar_t. */ + +/* In 4.3bsd-net2, leave these undefined to indicate that size_t, etc. + are already defined. */ +/* BSD/OS 3.1 and FreeBSD [23].x require the MACHINE_ANSI_H check here. */ +#if defined(_ANSI_H_) || defined(_MACHINE_ANSI_H_) +/* The references to _GCC_PTRDIFF_T_, _GCC_SIZE_T_, and _GCC_WCHAR_T_ + are probably typos and should be removed before 2.8 is released. */ +#ifdef _GCC_PTRDIFF_T_ +#undef _PTRDIFF_T_ +#undef _BSD_PTRDIFF_T_ +#endif +#ifdef _GCC_SIZE_T_ +#undef _SIZE_T_ +#undef _BSD_SIZE_T_ +#endif +#ifdef _GCC_WCHAR_T_ +#undef _WCHAR_T_ +#undef _BSD_WCHAR_T_ +#endif +/* The following ones are the real ones. */ +#ifdef _GCC_PTRDIFF_T +#undef _PTRDIFF_T_ +#undef _BSD_PTRDIFF_T_ +#endif +#ifdef _GCC_SIZE_T +#undef _SIZE_T_ +#undef _BSD_SIZE_T_ +#endif +#ifdef _GCC_WCHAR_T +#undef _WCHAR_T_ +#undef _BSD_WCHAR_T_ +#endif +#endif /* _ANSI_H_ || _MACHINE_ANSI_H_ */ + +#endif /* __sys_stdtypes_h */ + +/* A null pointer constant. */ + +#if defined (_STDDEF_H) || defined (__need_NULL) +#undef NULL /* in case <stdio.h> has defined it. */ +#ifdef __GNUG__ +#define NULL __null +#else /* G++ */ +#ifndef __cplusplus +#define NULL ((void *)0) +#else /* C++ */ +#define NULL 0 +#endif /* C++ */ +#endif /* G++ */ +#endif /* NULL not defined and <stddef.h> or need NULL. */ +#undef __need_NULL + +#ifndef offsetof + +/* Offset of member MEMBER in a struct of type TYPE. */ +#define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) + +#endif /* !offsetof */ + +#endif /* !_STDDEF_H && !_STDDEF_H_ && !_ANSI_STDDEF_H && !__STDDEF_H__ + || __need_XXX was not defined before */ Propchange: branches/ros-amd64-bringup/reactos/include/crt/stddef.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/crt/vadefs.h (added) +++ branches/ros-amd64-bringup/reactos/include/crt/vadefs.h [iso-8859-1] Wed Dec 31 10:35:20 2008 @@ -1,0 +1,85 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ +#ifndef _INC_VADEFS +#define _INC_VADEFS + +#ifndef _WIN32 +#error Only Win32 target is supported! +#endif + +#include <_mingw.h> + +#undef _CRT_PACKING +#define _CRT_PACKING 8 +#pragma pack(push,_CRT_PACKING) + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _UINTPTR_T_DEFINED +#define _UINTPTR_T_DEFINED +#ifndef __uintptr_t_defined +#define __uintptr_t_defined +#undef uintptr_t +#ifdef _WIN64 +#if defined(__GNUC__) && defined(__STRICT_ANSI__) + typedef unsigned int uintptr_t __attribute__ ((mode (DI))); +#else + typedef unsigned __int64 uintptr_t; +#endif +#else + typedef unsigned long uintptr_t; +#endif +#endif +#endif + +#ifndef __GNUC_VA_LIST +#define __GNUC_VA_LIST + typedef __builtin_va_list __gnuc_va_list; +#endif + +#ifndef _VA_LIST_DEFINED +#define _VA_LIST_DEFINED + typedef __gnuc_va_list va_list; +#endif + +#ifdef __cplusplus +#define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v)) +#else +#define _ADDRESSOF(v) (&(v)) +#endif + +#if defined(__ia64__) +#define _VA_ALIGN 8 +#define _SLOTSIZEOF(t) ((sizeof(t) + _VA_ALIGN - 1) & ~(_VA_ALIGN - 1)) + +#define _VA_STRUCT_ALIGN 16 + +#define _ALIGNOF(ap) ((((ap)+_VA_STRUCT_ALIGN - 1) & ~(_VA_STRUCT_ALIGN -1)) - (ap)) +#define _APALIGN(t,ap) (__alignof(t) > 8 ? _ALIGNOF((uintptr_t) ap) : 0) +#else +#define _SLOTSIZEOF(t) (sizeof(t)) +#define _APALIGN(t,ap) (__alignof(t)) +#endif + +#if !defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L +#define va_copy(d,s) __builtin_va_copy(d,s) +#endif +#define __va_copy(d,s) __builtin_va_copy(d,s) + +#define _INTSIZEOF(n) ((sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1)) + +#define _crt_va_start(v,l) __builtin_va_start(v,l) +#define _crt_va_arg(v,l) __builtin_va_arg(v,l) +#define _crt_va_end(v) __builtin_va_end(v) + +#ifdef __cplusplus +} +#endif + +#pragma pack(pop) +#endif Propchange: branches/ros-amd64-bringup/reactos/include/crt/vadefs.h ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 11 months

[martinf] 38492: update XMLStorage: preserve CDATA formating of processed XML documents

by martinf＠svn.reactos.org

Author: martinf Date: Wed Dec 31 09:59:36 2008 New Revision: 38492 URL: http://svn.reactos.org/svn/reactos?rev=38492&view=rev Log: update XMLStorage: preserve CDATA formating of processed XML documents Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/base/shell/explorer/utility/xs-native.cpp Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] Wed Dec 31 09:59:36 2008 @@ -471,9 +471,16 @@ } /// decode XML string literals -XS_String DecodeXMLString(const XS_String& str) -{ - LPCXSSTR s = str.c_str(); +XS_String DecodeXMLString(const std::string& str) +{ +#ifdef XS_STRING_UTF8 + const XS_String& str_utf8 = str; +#else + XS_String str_utf8; + assign_utf8(str_utf8, str.c_str(), str.length()); +#endif + + LPCXSSTR s = str_utf8.c_str(); LPXSSTR buffer = (LPXSSTR)alloca(sizeof(XS_CHAR)*XS_len(s)); LPXSSTR o = buffer; @@ -514,7 +521,7 @@ /// write node with children tree to output stream using original white space -void XMLNode::write_worker(std::ostream& out) const +void XMLNode::original_write_worker(std::ostream& out) const { out << _leading << '<' << EncodeXMLString(*this); @@ -522,10 +529,15 @@ out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; if (!_children.empty() || !_content.empty()) { - out << '>' << _content; + out << '>'; + + if (_cdata_content) + out << EncodeXMLString(DecodeXMLString(_content), true); + else + out << _content; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) - (*it)->write_worker(out); + (*it)->original_write_worker(out); out << _end_leading << "</" << EncodeXMLString(*this) << '>'; } else @@ -619,7 +631,9 @@ else { out << '>'; - if (!*content) + if (_cdata_content) + out << EncodeXMLString(DecodeXMLString(_content), true); + else if (!*content) out << format._endl; else out << content; @@ -886,11 +900,15 @@ if (!strncmp(s,"<![CDATA[",9) && !strncmp(e-3,"]]>",3)) { s += 9; p = (e-=3); + + _pos->_cdata_content = true; } else { // search for content end leaving only white space for _end_leading for(p=e; p>s; --p) if (!isspace((unsigned char)p[-1])) break; + + _pos->_cdata_content = false; } if (p != s) Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] Wed Dec 31 09:59:36 2008 @@ -484,7 +484,7 @@ #endif // XS_STRING_UTF8 extern std::string EncodeXMLString(const XS_String& str, bool cdata=false); -extern XS_String DecodeXMLString(const XS_String& str); +extern XS_String DecodeXMLString(const std::string& str); #ifdef __GNUC__ @@ -961,13 +961,15 @@ friend struct XPathElement; XMLNode(const XS_String& name) - : XS_String(name) + : XS_String(name), + _cdata_content(false) { } XMLNode(const XS_String& name, const std::string& leading) : XS_String(name), - _leading(leading) + _leading(leading), + _cdata_content(false) { } @@ -977,10 +979,11 @@ _leading(other._leading), _content(other._content), _end_leading(other._end_leading), - _trailing(other._trailing) + _trailing(other._trailing), #ifdef XMLNODE_LOCATION - , _location(other._location) -#endif + _location(other._location), +#endif + _cdata_content(false) { for(Children::const_iterator it=other._children.begin(); it!=other._children.end(); ++it) _children.push_back(new XMLNode(**it)); @@ -994,10 +997,11 @@ _leading(other._leading), _content(other._content), _end_leading(other._end_leading), - _trailing(other._trailing) + _trailing(other._trailing), #ifdef XMLNODE_LOCATION - , _location(other._location) -#endif + _location(other._location), +#endif + _cdata_content(false) { // assert(copy_no_children==COPY_NOCHILDREN); } @@ -1153,21 +1157,39 @@ return _attributes; } + /// read element node content XS_String get_content() const { -#ifdef XS_STRING_UTF8 - const XS_String& ret = _content; -#else - XS_String ret; - assign_utf8(ret, _content.c_str(), _content.length()); -#endif - - return DecodeXMLString(ret.c_str()); - } - + return DecodeXMLString(_content); + } + + /// read content of a subnode specified by an XPath expression + XS_String get_sub_content(const XPath& xpath) const + { + const XMLNode* node = find_relative(xpath); + + if (node) + return node->get_content(); + else + return XS_EMPTY_STR; + } + + /// set element node content void set_content(const XS_String& s, bool cdata=false) { _content.assign(EncodeXMLString(s.c_str(), cdata)); + } + + /// set content of a subnode specified by an XPath expression + bool set_sub_content(const XPath& xpath, const XS_String& s, bool cdata=false) + { + XMLNode* node = find_relative(xpath); + + if (node) { + node->set_content(s, cdata); + return true; + } else + return false; } #ifdef XMLNODE_LOCATION @@ -1187,10 +1209,10 @@ break; case FORMAT_ORIGINAL: - write_worker(out); + original_write_worker(out); break; - default: // FORMAT_SMART + default: // FORMAT_SMART smart_write_worker(out, format, indent); } @@ -1222,6 +1244,8 @@ XMLLocation _location; #endif + bool _cdata_content; + XMLNode* get_first_child() const { if (!_children.empty()) @@ -1242,7 +1266,7 @@ /// create a new node tree using the given XPath filter expression XMLNode* filter(XPath::const_iterator from, const XPath::const_iterator& to) const; - void write_worker(std::ostream& out) const; + void original_write_worker(std::ostream& out) const; void plain_write_worker(std::ostream& out) const; void pretty_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; void smart_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; Modified: trunk/reactos/base/shell/explorer/utility/xs-native.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xs-native.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xs-native.cpp [iso-8859-1] Wed Dec 31 09:59:36 2008 @@ -206,14 +206,12 @@ #ifdef XS_STRING_UTF8 XS_String name_str(attr_name, attr_len); - XS_String value_str(value, value_len); #else - XS_String name_str, value_str; + XS_String name_str; assign_utf8(name_str, attr_name, attr_len); - assign_utf8(value_str, value, value_len); -#endif - - attributes[name_str] = DecodeXMLString(value_str); +#endif + + attributes[name_str] = DecodeXMLString(std::string(value, value_len)); } }

15 years, 11 months

[gedmurphy] 38491: - Set a dummy revision number. This value should be dynamically set prior to running doxygen. - Inline the source in the docs. Although it makes the docs rather long, it's much more useful this way at the moment. - Use case sensitive names as this will run on a unix server.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Dec 31 09:38:28 2008 New Revision: 38491 URL: http://svn.reactos.org/svn/reactos?rev=38491&view=rev Log: - Set a dummy revision number. This value should be dynamically set prior to running doxygen. - Inline the source in the docs. Although it makes the docs rather long, it's much more useful this way at the moment. - Use case sensitive names as this will run on a unix server. Modified: trunk/reactos/Doxyfile Modified: trunk/reactos/Doxyfile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Doxyfile?rev=38491&r1=3849… ============================================================================== --- trunk/reactos/Doxyfile [iso-8859-1] (original) +++ trunk/reactos/Doxyfile [iso-8859-1] Wed Dec 31 09:38:28 2008 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "0.4-SVN 30-12-12" +PROJECT_NUMBER = "0.4-SVN r?????" # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. @@ -382,7 +382,7 @@ # in case and if your file system supports case sensitive file names. Windows # and Mac users are advised to set this option to NO. -CASE_SENSE_NAMES = NO +CASE_SENSE_NAMES = YES # If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen # will show members with their full class and namespace scopes in the @@ -698,7 +698,7 @@ # Setting the INLINE_SOURCES tag to YES will include the body # of functions and classes directly in the documentation. -INLINE_SOURCES = NO +INLINE_SOURCES = YES # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct # doxygen to hide any special comment blocks from generated source code

15 years, 11 months

[dchapyshev] 38490: - Fix attributes

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Dec 31 09:09:28 2008 New Revision: 38490 URL: http://svn.reactos.org/svn/reactos?rev=38490&view=rev Log: - Fix attributes Modified: trunk/reactos/dll/win32/kernel32/file/dir.c Modified: trunk/reactos/dll/win32/kernel32/file/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/di… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/dir.c [iso-8859-1] Wed Dec 31 09:09:28 2008 @@ -116,15 +116,14 @@ (lpSecurityAttributes ? lpSecurityAttributes->lpSecurityDescriptor : NULL)); Status = NtCreateFile (&DirectoryHandle, - FILE_LIST_DIRECTORY | SYNCHRONIZE | - FILE_OPEN_FOR_BACKUP_INTENT, + FILE_LIST_DIRECTORY | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0);

15 years, 11 months

[tkreuzer] 38489: Sync to trunk r38200

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 31 08:31:22 2008 New Revision: 38489 URL: http://svn.reactos.org/svn/reactos?rev=38489&view=rev Log: Sync to trunk r38200 Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/crtdbg.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/stdarg.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h branches/ros-amd64-bringup/reactos/include/crt/mingw32/vadefs.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/argv.c Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/resource.rc branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c branches/ros-amd64-bringup/reactos/base/applications/dxdiag/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c branches/ros-amd64-bringup/reactos/base/applications/notepad/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/sc/create.c branches/ros-amd64-bringup/reactos/base/applications/shutdown/rsrc.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/de-DE.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/en-US.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/fr-FR.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/ko-KR.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sl-SI.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sv-SE.rc branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c branches/ros-amd64-bringup/reactos/base/applications/wordpad/Da.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/De.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/En.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Fr.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Hu.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ko.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Nl.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/No.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pl.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pt.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ru.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Si.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Tr.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/Zh.rc branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c branches/ros-amd64-bringup/reactos/base/setup/reactos/lang/el-GR.rc branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/hy-AM.h branches/ros-amd64-bringup/reactos/base/setup/usetup/mui.c branches/ros-amd64-bringup/reactos/base/setup/usetup/muilanguages.h branches/ros-amd64-bringup/reactos/base/setup/usetup/settings.c branches/ros-amd64-bringup/reactos/base/shell/cmd/dir.c branches/ros-amd64-bringup/reactos/base/shell/explorer-new/explorer.rc branches/ros-amd64-bringup/reactos/base/system/services/database.c branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_arm.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_i386.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_arm.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_i386.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_arm.inf branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c branches/ros-amd64-bringup/reactos/dll/cpl/liccpa/rsrc.rc branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.c branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.h branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/utils.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/font.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.spec branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphicspath.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/pen.c branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/iocompl.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/lfile.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/move.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/locale_rc.rc branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/atom.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lang.c branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/mdi.c branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fat.c branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/allocators.c branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/ks.rbuild branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/worker.c branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/registry.c branches/ros-amd64-bringup/reactos/include/crt/_mingw.h branches/ros-amd64-bringup/reactos/include/crt/malloc.h branches/ros-amd64-bringup/reactos/include/crt/sys/utime.h branches/ros-amd64-bringup/reactos/include/ddk/portcls.h branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h branches/ros-amd64-bringup/reactos/include/psdk/accctrl.h branches/ros-amd64-bringup/reactos/include/psdk/devguid.h branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h branches/ros-amd64-bringup/reactos/include/psdk/guiddef.h branches/ros-amd64-bringup/reactos/include/psdk/vfw.h branches/ros-amd64-bringup/reactos/include/psdk/winuser.h branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/lib/pseh/framebased-gcchack.c branches/ros-amd64-bringup/reactos/lib/pseh/i386/framebased-gcchack.S branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbc.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismblead.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbtrl.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbbtype.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbccpy.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbclen.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbslen.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsncpy.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsnextc.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsninc.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbstrlen.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/sys_stat/systime.c branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/volume.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dibobj.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/font.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/freetype.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdidbg.c branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/sc/create.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/macro.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/lang/hy-AM.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivecls_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_device.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/d3d9/d3d9_swapchain.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/pen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdiplus/region.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/lfile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/atom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fat.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/ksfilter/ks/worker.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/crtdbg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stdarg.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/stddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/include/crt/mingw32/vadefs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/accctrl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/devguid.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/gdiplusflat.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/vfw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/argv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… Modified: branches/ros-amd64-bringup/reactos/lib/pseh/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/p… Modified: branches/ros-amd64-bringup/reactos/lib/pseh/i386/framebased-gcchack.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/p… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismblead.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/ismbtrl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbbtype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbccpy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbclen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbslen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsncpy.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsnextc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbsninc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/mbstring/mbstrlen.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/sys_stat/systime.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…

15 years, 11 months

[fireball] 38488: - Refactor MmFlushDataFileSection into a wrapper and an internal helper MiFlushDataFileSection. - Add a MiFlushPages routine which forces a flush of all data sections using internal helper MiFlushDataFileSection. - Now there is a forced flush of all data sections during Mm shutdown.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 31 06:57:26 2008 New Revision: 38488 URL: http://svn.reactos.org/svn/reactos?rev=38488&view=rev Log: - Refactor MmFlushDataFileSection into a wrapper and an internal helper MiFlushDataFileSection. - Add a MiFlushPages routine which forces a flush of all data sections using internal helper MiFlushDataFileSection. - Now there is a forced flush of all data sections during Mm shutdown. Modified: branches/cache_manager_rewrite/mm.patch Modified: branches/cache_manager_rewrite/mm.patch URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm.patch?… ============================================================================== --- branches/cache_manager_rewrite/mm.patch [iso-8859-1] (original) +++ branches/cache_manager_rewrite/mm.patch [iso-8859-1] Wed Dec 31 06:57:26 2008 @@ -1,6 +1,6 @@ Index: elf.inc.h =================================================================== ---- elf.inc.h (revision 38402) +--- elf.inc.h (revision 38484) +++ elf.inc.h (working copy) @@ -444,6 +444,7 @@ nReadStatus = ReadFileCb @@ -12,7 +12,7 @@ &pData, Index: freelist.c =================================================================== ---- freelist.c (revision 38402) +--- freelist.c (revision 38484) +++ freelist.c (working copy) @@ -632,6 +632,12 @@ } @@ -29,7 +29,7 @@ { Index: mm.c =================================================================== ---- mm.c (revision 38402) +--- mm.c (revision 38484) +++ mm.c (working copy) @@ -277,6 +277,7 @@ break; @@ -41,7 +41,7 @@ (PVOID)Address, Index: mminit.c =================================================================== ---- mminit.c (revision 38402) +--- mminit.c (revision 38484) +++ mminit.c (working copy) @@ -68,6 +68,9 @@ FALSE; @@ -53,7 +53,20 @@ /* PRIVATE FUNCTIONS *********************************************************/ VOID -@@ -506,6 +509,9 @@ +@@ -101,8 +104,11 @@ + /* Check if there are any dirty pages, and flush them. + There will be no other chance to do this later, since filesystems + are going to be shut down. */ +- CcRosFlushDirtyPages(128, &PagesWritten); ++ //CcRosFlushDirtyPages(128, &PagesWritten); + #endif ++ ++ /* Flush all dirty pages */ ++ MiFlushPages(); + } + + VOID +@@ -506,6 +512,9 @@ /* Initialize the balance set manager */ MmInitBsmThread(); @@ -65,7 +78,7 @@ Index: mpw.c =================================================================== ---- mpw.c (revision 38402) +--- mpw.c (revision 38484) +++ mpw.c (working copy) @@ -88,7 +88,7 @@ MmWriteDirtyPages(128, &PagesWritten); @@ -78,7 +91,7 @@ Index: pagefile.c =================================================================== ---- pagefile.c (revision 38402) +--- pagefile.c (revision 38484) +++ pagefile.c (working copy) @@ -1,5 +1,4 @@ /* @@ -88,7 +101,7 @@ * This program is free software; you can redistribute it and/or modify Index: pageop.c =================================================================== ---- pageop.c (revision 38402) +--- pageop.c (revision 38484) +++ pageop.c (working copy) @@ -81,14 +81,23 @@ /* @@ -197,7 +210,7 @@ - Index: pe.c =================================================================== ---- pe.c (revision 38402) +--- pe.c (revision 38484) +++ pe.c (working copy) @@ -240,7 +240,7 @@ lnOffset.QuadPart = pidhDosHeader->e_lfanew; @@ -219,7 +232,7 @@ DIE(("ReadFile failed with status %08X\n", nStatus)); Index: rmap.c =================================================================== ---- rmap.c (revision 38402) +--- rmap.c (revision 38484) +++ rmap.c (working copy) @@ -299,6 +299,17 @@ Status = MmPageOutVirtualMemory(AddressSpace, MemoryArea, @@ -241,7 +254,7 @@ KeBugCheck(MEMORY_MANAGEMENT); Index: section.c =================================================================== ---- section.c (revision 38402) +--- section.c (revision 38484) +++ section.c (working copy) @@ -62,6 +62,7 @@ PROS_SECTION_OBJECT Section; @@ -2756,7 +2769,7 @@ return(STATUS_SUCCESS); } -+VOID ++VOID +MmInitSectionImplementation2(VOID) +{ + LARGE_INTEGER DueTime; @@ -3698,7 +3711,7 @@ PROS_SECTION_OBJECT *SectionObject = (PROS_SECTION_OBJECT *)Section; /* -@@ -4965,37 +6135,558 @@ +@@ -4965,38 +6135,598 @@ return STATUS_INVALID_PAGE_PROTECTION; } @@ -3877,6 +3890,15 @@ + return STATUS_SUCCESS; } ++typedef struct _PAGE_IO_CONTEXT ++{ ++ PMM_SECTION_SEGMENT Segment; ++ ULONG Offset; ++ ULONG PageCount; ++ PMM_PAGEOP PageOp[16]; ++ WORK_QUEUE_ITEM WorkQueueItem; ++} PAGE_IO_CONTEXT, *PPAGE_IO_CONTEXT; ++ NTSTATUS +MmspWriteDataSectionPage(PMM_SECTION_SEGMENT Segment, + ULONG Offset, @@ -3917,7 +3939,7 @@ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Iosb.Status; + } -+ MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); ++ MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + if (!NT_SUCCESS(Status)) + { + MmSetPageEntrySectionSegment(Segment, Offset, Entry | 0x2); @@ -3926,15 +3948,6 @@ + MmspCompleteAndReleasePageOp(PageOp); + return Status; +} -+ -+typedef struct _PAGE_IO_CONTEXT -+{ -+ PMM_SECTION_SEGMENT Segment; -+ ULONG Offset; -+ ULONG PageCount; -+ PMM_PAGEOP PageOp[16]; -+ WORK_QUEUE_ITEM WorkQueueItem; -+} PAGE_IO_CONTEXT, *PPAGE_IO_CONTEXT; + +VOID NTAPI +MmspWriteDataSectionPages(PVOID Context) @@ -3949,7 +3962,7 @@ + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + -+ DPRINT("MmspWriteDataSectionPages\n"); ++ DPRINT("MmspWriteDataSectionPages, %p pages\n", ((PPAGE_IO_CONTEXT)Context)->PageCount); + + Mdl = alloca(MmSizeOfMdl(NULL, ((PPAGE_IO_CONTEXT)Context)->PageCount * PAGE_SIZE)); + Pfn = alloca(((PPAGE_IO_CONTEXT)Context)->PageCount * sizeof(PFN_TYPE)); @@ -4029,7 +4042,7 @@ + FALSE, + NULL); + -+ DPRINT("MmspWorkerThread\n"); ++ DPRINT1("MmspWorkerThread\n"); + + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); + @@ -4177,17 +4190,14 @@ +} + +NTSTATUS -+MmFlushDataFileSection(PROS_SECTION_OBJECT Section, PLARGE_INTEGER StartOffset, ULONG Length) ++MiFlushDataFileSection(PMM_SECTION_SEGMENT Segment, PLARGE_INTEGER StartOffset, ULONG Length) +{ -+ PMM_SECTION_SEGMENT Segment; + LARGE_INTEGER Offset; + PPAGE_IO_CONTEXT Context = NULL; + ULONG Entry, i; + PMM_PAGEOP PageOp; + PFN_TYPE Pfn; + -+ Segment = ((PROS_SECTION_OBJECT)Section)->Segment; -+ + if (StartOffset) + { + Offset.QuadPart = PAGE_ROUND_DOWN(StartOffset->QuadPart); @@ -4208,7 +4218,7 @@ + Pfn = PFN_FROM_SSE(Entry); + if (!IS_SWAP_FROM_SSE(Entry) && Pfn && !(Entry & 0x2) && MmGetRmapListHeadPage(Pfn) && MmIsDirtyPageRmap(Pfn)) + { -+ Entry|=0x2; ++ Entry |= 0x2; + MmSetPageEntrySectionSegment(Segment, i * PAGE_SIZE, Entry); + } + if (!IS_SWAP_FROM_SSE(Entry) && Pfn && (Entry & 0x2)) @@ -4275,12 +4285,55 @@ +} + +NTSTATUS ++MmFlushDataFileSection(PROS_SECTION_OBJECT Section, PLARGE_INTEGER StartOffset, ULONG Length) ++{ ++ PMM_SECTION_SEGMENT Segment; ++ ++ /* Get pointer to the segment */ ++ Segment = ((PROS_SECTION_OBJECT)Section)->Segment; ++ ++ /* Use internal helper */ ++ return MiFlushDataFileSection(Segment, StartOffset, Length); ++} ++ ++VOID NTAPI ++MiFlushPages(VOID) ++{ ++ PLIST_ENTRY entry; ++ PMM_SECTION_SEGMENT current; ++ ++ /* Grab the lock */ ++ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&DataSectionObjectLock); ++ ++ DPRINT1("MiFlushPages started\n"); ++ ++ /* Go through all data sections and flush them */ ++ entry = DataSectionObjectListHead.Flink; ++ while (entry != &DataSectionObjectListHead) ++ { ++ current = CONTAINING_RECORD(entry, MM_SECTION_SEGMENT, ListEntry); ++ ++ /* Flush it */ ++ MiFlushDataFileSection(current, NULL, 0); ++ ++ /* Advance to the next section */ ++ entry = entry->Flink; ++ } ++ ++ DPRINT1("MiFlushPages finished\n"); ++ ++ ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&DataSectionObjectLock); ++} ++ ++NTSTATUS ++NTAPI NtAllocateUserPhysicalPages(IN HANDLE ProcessHandle, IN OUT PULONG_PTR NumberOfPages, + IN OUT PULONG_PTR UserPfnArray) Index: virtual.c =================================================================== ---- virtual.c (revision 38402) +--- virtual.c (revision 38484) +++ virtual.c (working copy) @@ -581,7 +581,7 @@ NTSTATUS Status;

15 years, 11 months

[fireball] 38487: - Add a new API to Freeldr's memory manager, which allows to override type of an already allocated memory. - WINLDR: Fix page tables buffer memory allocation so that it doesn't rely on luck anymore and always allocates a contiguous area of memory. Fixes spontaneous case of booting problem (immediate black screen after loading drivers, reboot of real hardware, halt of cpu in a virtual machine). - WINLDR: Fix some debug print.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 31 06:21:36 2008 New Revision: 38487 URL: http://svn.reactos.org/svn/reactos?rev=38487&view=rev Log: - Add a new API to Freeldr's memory manager, which allows to override type of an already allocated memory. - WINLDR: Fix page tables buffer memory allocation so that it doesn't rely on luck anymore and always allocates a contiguous area of memory. Fixes spontaneous case of booting problem (immediate black screen after loading drivers, reboot of real hardware, halt of cpu in a virtual machine). - WINLDR: Fix some debug print. Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Wed Dec 31 06:21:36 2008 @@ -94,6 +94,7 @@ VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount); // Removes entries in the memory map that describe memory above 4G VOID MmUpdateLastFreePageHint(PVOID PageLookupTable, ULONG TotalPageCount); // Sets the LastFreePageHint to the last usable page of memory BOOLEAN MmAreMemoryPagesAvailable(PVOID PageLookupTable, ULONG TotalPageCount, PVOID PageAddress, ULONG PageCount); // Returns TRUE if the specified pages of memory are available, otherwise FALSE +VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType); // Use with EXTREME caution! ULONG GetSystemMemorySize(VOID); // Returns the amount of total memory in the system PPAGE_LOOKUP_TABLE_ITEM MmGetMemoryMap(ULONG *NoEntries); // Returns a pointer to the memory mapping table and a number of entries in it Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Wed Dec 31 06:21:36 2008 @@ -182,6 +182,22 @@ return MemPointer; } +VOID MmSetMemoryType(PVOID MemoryAddress, ULONG MemorySize, TYPE_OF_MEMORY NewType) +{ + ULONG PagesNeeded; + ULONG StartPageNumber; + + // Find out how many blocks it will take to + // satisfy this allocation + PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; + + // Get the starting page number + StartPageNumber = MmGetPageNumberFromAddress(MemoryAddress); + + // Set new type for these pages + MmAllocatePagesInLookupTable(PageLookupTableAddress, StartPageNumber, PagesNeeded, NewType); +} + PVOID MmAllocateHighestMemoryBelowAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType) { ULONG PagesNeeded; Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Wed Dec 31 06:21:36 2008 @@ -405,7 +405,7 @@ /* Size of data is less than the virtual size - fill up the remainder with zeroes */ if (SizeOfRawData < VirtualSize) { - DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d", SizeOfRawData, VirtualSize)); + DbgPrint((DPRINT_WINDOWS, "WinLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize)); RtlZeroMemory((PVOID)(SectionHeader->VirtualAddress + (ULONG)PhysicalBase + SizeOfRawData), VirtualSize - SizeOfRawData); } Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Wed Dec 31 06:21:36 2008 @@ -133,13 +133,15 @@ TotalSize = (1+1+NumPageTables*2)*MM_PAGE_SIZE; // PDE+HAL+KernelPTEs == MemoryData - Buffer = MmAllocateMemoryWithType( - TotalSize - NumPageTables*MM_PAGE_SIZE, LoaderMemoryData); + Buffer = MmAllocateMemoryWithType(TotalSize, LoaderMemoryData); // Physical PTEs = FirmwareTemporary - PhysicalPageTablesBuffer = MmAllocateMemoryWithType( - NumPageTables*MM_PAGE_SIZE, LoaderFirmwareTemporary); - + PhysicalPageTablesBuffer = (PUCHAR)Buffer + TotalSize - NumPageTables*MM_PAGE_SIZE; + MmSetMemoryType(PhysicalPageTablesBuffer, + NumPageTables*MM_PAGE_SIZE, + LoaderFirmwareTemporary); + + // This check is now redundant if (Buffer + (TotalSize - NumPageTables*MM_PAGE_SIZE) != PhysicalPageTablesBuffer) {

15 years, 11 months

[dchapyshev] 38486: - Fix ReadDirectoryChangesW - FindFirstChangeNotificationW +17 passed winetests

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Wed Dec 31 05:54:30 2008 New Revision: 38486 URL: http://svn.reactos.org/svn/reactos?rev=38486&view=rev Log: - Fix ReadDirectoryChangesW - FindFirstChangeNotificationW +17 passed winetests Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c Modified: trunk/reactos/dll/win32/kernel32/file/cnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/cnotify.c [iso-8859-1] Wed Dec 31 05:54:30 2008 @@ -92,12 +92,7 @@ &ObjectAttributes, &IoStatus, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, - FILE_DIRECTORY_FILE); - - /* - FIXME: I think we should use FILE_OPEN_FOR_BACKUP_INTENT. See M$ Q188321 - -Gunnar - */ + FILE_DIRECTORY_FILE | FILE_OPEN_FOR_BACKUP_INTENT); RtlFreeHeap(RtlGetProcessHeap(), 0, @@ -122,6 +117,7 @@ (BOOLEAN)bWatchSubtree); if (!NT_SUCCESS(Status)) { + NtClose(hDir); SetLastErrorByStatus(Status); return INVALID_HANDLE_VALUE; } @@ -185,24 +181,62 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine /* OPTIONAL???????? */ ) { + PVOID CompletionRoutine; NTSTATUS Status; IO_STATUS_BLOCK IoStatus; + HANDLE EventHandle; + PIO_APC_ROUTINE IoApcRoutine; if (lpOverlapped ) + { + if (lpCompletionRoutine) + { + CompletionRoutine = (PVOID) lpCompletionRoutine; + EventHandle = NULL; + IoApcRoutine = ApcRoutine; + } + else + { + if (((ULONG_PTR) lpOverlapped->hEvent & 1) == 0) + CompletionRoutine = (PVOID) lpOverlapped; + else + CompletionRoutine = NULL; + + EventHandle = lpOverlapped->hEvent; + IoApcRoutine = NULL; + } + lpOverlapped->Internal = STATUS_PENDING; + } + else + { + EventHandle = NULL; + IoApcRoutine = NULL; + CompletionRoutine = NULL; + } Status = NtNotifyChangeDirectoryFile( hDirectory, - lpOverlapped ? lpOverlapped->hEvent : NULL, - lpCompletionRoutine ? ApcRoutine : NULL, /* ApcRoutine OPTIONAL???? */ - lpCompletionRoutine, /* ApcContext */ - lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped : &IoStatus, + EventHandle, + IoApcRoutine, + CompletionRoutine, /* ApcContext */ + lpOverlapped ? (PIO_STATUS_BLOCK)lpOverlapped->Internal : &IoStatus, lpBuffer, nBufferLength, dwNotifyFilter, (BOOLEAN)bWatchSubtree ); + if ((Status == STATUS_PENDING) && (!lpOverlapped)) + { + Status = NtWaitForSingleObject(hDirectory, FALSE, NULL); + + if (NT_SUCCESS(Status)) + { + Status = IoStatus.Status; + } + } + if (!NT_SUCCESS(Status)) { SetLastErrorByStatus(Status);

15 years, 11 months

[cwittich] 38485: fix build

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Dec 31 05:53:35 2008 New Revision: 38485 URL: http://svn.reactos.org/svn/reactos?rev=38485&view=rev Log: fix build Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild trunk/reactos/include/reactos/wine/unicode.h Modified: trunk/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… ============================================================================== --- trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/cryptui.rbuild [iso-8859-1] Wed Dec 31 05:53:35 2008 @@ -10,7 +10,6 @@ <file>main.c</file> <file>cryptui.rc</file> <library>wine</library> - <library>unicode</library> <library>kernel32</library> <library>user32</library> <library>ole32</library> Modified: trunk/reactos/include/reactos/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/unico… ============================================================================== --- trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/unicode.h [iso-8859-1] Wed Dec 31 05:53:35 2008 @@ -42,6 +42,7 @@ #define vsprintfW vswprintf #define snprintfW _snwprintf #define vsnprintfW _vsnwprintf +#define isprintW iswprint #ifndef WINE_UNICODE_API #define WINE_UNICODE_API __attribute__((dllimport))

15 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008