Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 19336: add library
by gedmurphy＠svn.reactos.com 18 Nov '05

18 Nov '05

add library Modified: trunk/reactos/subsys/system/sc/sc.xml _____ Modified: trunk/reactos/subsys/system/sc/sc.xml --- trunk/reactos/subsys/system/sc/sc.xml 2005-11-18 23:35:16 UTC (rev 19335) +++ trunk/reactos/subsys/system/sc/sc.xml 2005-11-18 23:38:38 UTC (rev 19336) @@ -4,6 +4,7 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <library>kernel32</library> + <library>advapi32</library> <file>sc.c</file> <file>start.c</file> <file>query.c</file>

1 0

[gedmurphy] 19335: update my todo list
by gedmurphy＠svn.reactos.com 18 Nov '05

18 Nov '05

update my todo list Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c --- trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-18 23:19:48 UTC (rev 19334) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-18 23:35:16 UTC (rev 19335) @@ -13,9 +13,8 @@ */ /* * TODO: - * - Start tcpsvcs as a service. - * - write debugging function and print all dbg info via that. - * - change 'temp' to something meaningfull + * - fix bug when terminating chargen server + * - log info in the event logger (when it's implemented) */

1 0

[weiden] 19334: - define STATUS_* codes correctly in winnt.h and ntstatus.h
by weiden＠svn.reactos.com 18 Nov '05

18 Nov '05

- define STATUS_* codes correctly in winnt.h and ntstatus.h - fix code that incorrectly includes headers for status codes (changes to files shared with wine will be submitted to winehq) - fix wine SEH macros and support code, these changes should enable us to port crypt32.dll (and maybe other libraries) without modifications Modified: trunk/reactos/include/wine/exception.h Modified: trunk/reactos/lib/crt/precomp.h Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/wine/cppexcept.c Modified: trunk/reactos/lib/crt/wine/scanf.c Modified: trunk/reactos/lib/dbghelp/dbghelp_private.h Modified: trunk/reactos/lib/dbghelp/stack.c Modified: trunk/reactos/lib/dbghelp/stackframe.h Modified: trunk/reactos/lib/dbghelp/thread.h Modified: trunk/reactos/lib/dplayx/dplayx_messages.c Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h Modified: trunk/reactos/lib/netapi32/wksta.c Modified: trunk/reactos/lib/rpcrt4/rpc_server.c Modified: trunk/reactos/lib/rpcrt4/rpcss_np_client.c Modified: trunk/reactos/lib/samsrv/samsrv.c Modified: trunk/reactos/lib/secur32/dllmain.c Modified: trunk/reactos/lib/secur32/lsa.c Modified: trunk/reactos/lib/secur32/precomp.h Modified: trunk/reactos/lib/secur32/secext.c Modified: trunk/reactos/lib/secur32/sspi.c Modified: trunk/reactos/lib/setupapi/install.c Modified: trunk/reactos/lib/setupapi/setupapi_private.h Modified: trunk/reactos/lib/user32/include/user32.h Modified: trunk/reactos/regtests/winetests/ntdll/atom.c Modified: trunk/reactos/services/dhcp/api.c Modified: trunk/reactos/services/dhcp/dhclient.c Modified: trunk/reactos/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/subsys/system/usetup/usetup.h Modified: trunk/reactos/w32api/include/ntdef.h Modified: trunk/reactos/w32api/include/ntstatus.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/include/wine/exception.h --- trunk/reactos/include/wine/exception.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/include/wine/exception.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -24,7 +24,6 @@ #include <setjmp.h> #include <windef.h> #include <excpt.h> -#include <wine/port.h> /* The following definitions allow using exceptions in Wine and Winelib code * @@ -65,8 +64,8 @@ typedef struct _EXCEPTION_REGISTRATION_RECORD { - struct _EXCEPTION_REGISTRATION_RECORD *prev; - PEXCEPTION_HANDLER handler; + struct _EXCEPTION_REGISTRATION_RECORD *Prev; + PEXCEPTION_HANDLER Handler; } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; /* Define this if you want to use your compiler built-in __try/__except support. @@ -101,7 +100,7 @@ __f.frame.Handler = __wine_exception_handler; \ __f.u.filter = (func); \ __wine_push_frame( &__f.frame ); \ - if (sigsetjmp( __f.jmp, 1 )) { \ + if (setjmp( __f.jmp )) { \ const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { @@ -130,8 +129,8 @@ typedef DWORD (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); -#define WINE_EXCEPTION_FILTER(func) DWORD WINAPI func( EXCEPTION_POINTERS *__eptr ) -#define WINE_FINALLY_FUNC(func) void WINAPI func( BOOL __normal ) +#define WINE_EXCEPTION_FILTER(func) DWORD CALLBACK func( PEXCEPTION_POINTERS __eptr ) +#define WINE_FINALLY_FUNC(func) void CALLBACK func( BOOL __normal ) #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) @@ -149,17 +148,12 @@ /* finally data */ __WINE_FINALLY finally_func; } u; - sigjmp_buf jmp; + jmp_buf jmp; /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode; const struct __tagWINE_FRAME *ExceptionRecord; } __WINE_FRAME; -extern DWORD __wine_exception_handler( PEXCEPTION_RECORD record, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ); -extern DWORD __wine_finally_handler( PEXCEPTION_RECORD record, EXCEPTION_REGISTRATION_RECORD *frame, - CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ); - #endif /* USE_COMPILER_EXCEPTIONS */ static inline EXCEPTION_REGISTRATION_RECORD *__wine_push_frame( EXCEPTION_REGISTRATION_RECORD *frame ) @@ -183,8 +177,8 @@ { #if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)" - : : "r" (frame->prev) : "memory" ); - return frame->prev; + : : "r" (frame->Prev) : "memory" ); + return frame->Prev; #else NT_TIB *teb = (NT_TIB *)NtCurrentTeb(); @@ -193,7 +187,60 @@ #endif } +#ifndef USE_COMPILER_EXCEPTIONS +extern VOID NTAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID); + +static __inline EXCEPTION_DISPOSITION +__wine_exception_handler( struct _EXCEPTION_RECORD *record, void *frame, + struct _CONTEXT *context, void *pdispatcher ) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + if (wine_frame->u.filter) + { + EXCEPTION_POINTERS ptrs; + ptrs.ExceptionRecord = record; + ptrs.ContextRecord = context; + switch(wine_frame->u.filter( &ptrs )) + { + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; + default: + break; + } + } + /* hack to make GetExceptionCode() work in handler */ + wine_frame->ExceptionCode = record->ExceptionCode; + wine_frame->ExceptionRecord = wine_frame; + + RtlUnwind( frame, 0, record, 0 ); + __wine_pop_frame( frame ); + longjmp( wine_frame->jmp, 1 ); +} + + +static __inline EXCEPTION_DISPOSITION +__wine_finally_handler( struct _EXCEPTION_RECORD *record, void *frame, + struct _CONTEXT *context, void *pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + wine_frame->u.finally_func( FALSE ); + } + return ExceptionContinueSearch; +} + +#endif /* USE_COMPILER_EXCEPTIONS */ + + /* Wine-specific exceptions codes */ #define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ _____ Modified: trunk/reactos/lib/crt/precomp.h --- trunk/reactos/lib/crt/precomp.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/crt/precomp.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -1,6 +1,9 @@ #define CRT_SECURE_NO_DEPRECATE +#define WIN32_NO_STATUS #include <windows.h> +#define NTOS_MODE_USER +#include <ndk/ntndk.h> #if !defined(_MSC_VER) #include <stdint.h> _____ Modified: trunk/reactos/lib/crt/stdlib/malloc.c --- trunk/reactos/lib/crt/stdlib/malloc.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/crt/stdlib/malloc.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -26,9 +26,6 @@ #include <malloc.h> -/* fixme: should have this in common header */ -#define ROUND_UP(a,b) ((a + (b-1)) & ~(b-1)) - /* round to 16 bytes + alloc at minimum 16 bytes */ #define ROUND_SIZE(size) (max(16, ROUND_UP(size, 16))) _____ Modified: trunk/reactos/lib/crt/wine/cppexcept.c --- trunk/reactos/lib/crt/wine/cppexcept.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/crt/wine/cppexcept.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -303,7 +303,7 @@ /* setup an exception block for nested exceptions */ //nested_frame.frame.Handler = catch_function_nested_handler; - nested_frame.frame.handler = (PEXCEPTION_HANDLER)catch_function_nested_handler; + nested_frame.frame.Handler = (PEXCEPTION_HANDLER)catch_function_nested_handler; nested_frame.prev_rec = thread_data->exc_record; nested_frame.cxx_frame = frame; nested_frame.descr = descr; _____ Modified: trunk/reactos/lib/crt/wine/scanf.c --- trunk/reactos/lib/crt/wine/scanf.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/crt/wine/scanf.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -35,8 +35,6 @@ */ #include "precomp.h" -#define WIN32_NO_STATUS - #include <stdarg.h> #include <wchar.h> #include <stdio.h> @@ -44,12 +42,6 @@ #include <ctype.h> #include <internal/file.h> -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/umtypes.h> -#include <ndk/extypes.h> -#include <ndk/rtlfuncs.h> - #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/lib/dbghelp/dbghelp_private.h --- trunk/reactos/lib/dbghelp/dbghelp_private.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/dbghelp/dbghelp_private.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -21,6 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_NO_STATUS #include <stdarg.h> #include "windef.h" #include "winbase.h" _____ Modified: trunk/reactos/lib/dbghelp/stack.c --- trunk/reactos/lib/dbghelp/stack.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/dbghelp/stack.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -29,7 +29,6 @@ #include "dbghelp_private.h" #include "winreg.h" -#include "ntstatus.h" #include "thread.h" /* FIXME: must be included before winternl.h */ #include "wine/debug.h" #include "stackframe.h" _____ Modified: trunk/reactos/lib/dbghelp/stackframe.h --- trunk/reactos/lib/dbghelp/stackframe.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/dbghelp/stackframe.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -22,7 +22,6 @@ #define __WINE_STACKFRAME_H #include <string.h> -#include <winnt.h> #define NTOS_MODE_USER #include <ndk/umtypes.h> #include <ndk/extypes.h> _____ Modified: trunk/reactos/lib/dbghelp/thread.h --- trunk/reactos/lib/dbghelp/thread.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/dbghelp/thread.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -22,6 +22,7 @@ #define __WINE_THREAD_H #include <stdarg.h> +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winreg.h> _____ Modified: trunk/reactos/lib/dplayx/dplayx_messages.c --- trunk/reactos/lib/dplayx/dplayx_messages.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/dplayx/dplayx_messages.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -27,7 +27,6 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" -#include "ntstatus.h" #include "dplayx_messages.h" #include "dplay_global.h" _____ Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h --- trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -21,6 +21,7 @@ #undef _WIN32_WINNT #define _WIN32_WINNT 0x500 +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/netapi32/wksta.c --- trunk/reactos/lib/netapi32/wksta.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/netapi32/wksta.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -23,6 +23,8 @@ #include <stdarg.h> #include <stdlib.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winsock2.h" @@ -33,9 +35,8 @@ #include "lmwksta.h" #include "iphlpapi.h" #include "winerror.h" -#include "ntstatus.h" +#include "ntsecapi.h" #include "winreg.h" -#include "ntsecapi.h" #include "netbios.h" #include "wine/debug.h" _____ Modified: trunk/reactos/lib/rpcrt4/rpc_server.c --- trunk/reactos/lib/rpcrt4/rpc_server.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/rpcrt4/rpc_server.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -34,7 +34,6 @@ #include "winbase.h" #include "winerror.h" #include "winreg.h" -#include "ntstatus.h" #include "rpc.h" #include "rpcndr.h" _____ Modified: trunk/reactos/lib/rpcrt4/rpcss_np_client.c --- trunk/reactos/lib/rpcrt4/rpcss_np_client.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/rpcrt4/rpcss_np_client.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -23,7 +23,6 @@ #include "windef.h" #include "winbase.h" -#include "ntstatus.h" #include "wine/rpcss_shared.h" #include "wine/debug.h" _____ Modified: trunk/reactos/lib/samsrv/samsrv.c --- trunk/reactos/lib/samsrv/samsrv.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/samsrv/samsrv.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -19,6 +19,7 @@ /* INCLUDES *****************************************************************/ +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/lib/secur32/dllmain.c --- trunk/reactos/lib/secur32/dllmain.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/secur32/dllmain.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -9,7 +9,7 @@ */ /* INCLUDES ******************************************************************/ -#include "precomp.h" +#include <precomp.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/secur32/lsa.c --- trunk/reactos/lib/secur32/lsa.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/secur32/lsa.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ -#include "precomp.h" +#include <precomp.h> /* GLOBALS *******************************************************************/ _____ Modified: trunk/reactos/lib/secur32/precomp.h --- trunk/reactos/lib/secur32/precomp.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/secur32/precomp.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -16,3 +16,6 @@ #include <lsass/lsass.h> #include <ntsecapi.h> +#include <secext.h> +#include <security.h> +#include <sspi.h> _____ Modified: trunk/reactos/lib/secur32/secext.c --- trunk/reactos/lib/secur32/secext.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/secur32/secext.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -1,15 +1,9 @@ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <lsass/lsass.h> +#include <precomp.h> #define NDEBUG #include <debug.h> -#include <ntsecapi.h> -#include <secext.h> - BOOLEAN WINAPI GetComputerObjectNameA ( _____ Modified: trunk/reactos/lib/secur32/sspi.c --- trunk/reactos/lib/secur32/sspi.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/secur32/sspi.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -1,17 +1,9 @@ -#include <windows.h> -#define NTOS_MODE_USER -#include <ndk/ntndk.h> -#include <lsass/lsass.h> +#include <precomp.h> #define NDEBUG #include <debug.h> -#include <ntsecapi.h> -#include <security.h> -#include <sspi.h> - - SECURITY_STATUS WINAPI EnumerateSecurityPackagesW ( _____ Modified: trunk/reactos/lib/setupapi/install.c --- trunk/reactos/lib/setupapi/install.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/setupapi/install.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -1041,6 +1041,10 @@ */ BOOL WINAPI SetupInstallServicesFromInfSectionExW( HINF hinf, PCWSTR sectionname, DWORD flags, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PVOID reserved1, PVOID reserved2 ) { + SC_HANDLE hSCManager = NULL; + SC_HANDLE hService = NULL; + LPDWORD GroupOrder = NULL; + LPQUERY_SERVICE_CONFIG ServiceConfig = NULL; struct DeviceInfoSet *list; BOOL ret = FALSE; @@ -1065,16 +1069,12 @@ } else { - SC_HANDLE hSCManager = NULL; - SC_HANDLE hService = NULL; HKEY hGroupOrderListKey = INVALID_HANDLE_VALUE; - LPQUERY_SERVICE_CONFIG ServiceConfig = NULL; LPWSTR ServiceBinary = NULL; LPWSTR LoadOrderGroup = NULL; LPWSTR DisplayName = NULL; LPWSTR Description = NULL; LPWSTR Dependencies = NULL; - LPDWORD GroupOrder = NULL; INT ServiceType, StartType, ErrorControl; DWORD dwRegType; DWORD tagId = (DWORD)-1; _____ Modified: trunk/reactos/lib/setupapi/setupapi_private.h --- trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/setupapi/setupapi_private.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -24,6 +24,7 @@ #include <fcntl.h> #include <share.h> +#define WIN32_NO_STATUS #include <windows.h> #include <cfgmgr32.h> #include <fdi.h> _____ Modified: trunk/reactos/lib/user32/include/user32.h --- trunk/reactos/lib/user32/include/user32.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/lib/user32/include/user32.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -16,6 +16,7 @@ #define _USER32_ #define OEMRESOURCE #define NTOS_MODE_USER +#define WIN32_NO_STATUS #include <windows.h> #include <windowsx.h> #include <winnls32.h> _____ Modified: trunk/reactos/regtests/winetests/ntdll/atom.c --- trunk/reactos/regtests/winetests/ntdll/atom.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/regtests/winetests/ntdll/atom.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -25,8 +25,9 @@ #include <stdio.h> #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windows.h" -#include "ntstatus.h" #include "wine/test.h" #include "wine/unicode.h" #include "winternl.h" _____ Modified: trunk/reactos/services/dhcp/api.c --- trunk/reactos/services/dhcp/api.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/services/dhcp/api.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -7,9 +7,9 @@ * PROGRAMMER: arty */ +#include "rosdhcp.h" #include <winsock2.h> #include <iphlpapi.h> -#include "rosdhcp.h" static CRITICAL_SECTION ApiCriticalSection; _____ Modified: trunk/reactos/services/dhcp/dhclient.c --- trunk/reactos/services/dhcp/dhclient.c 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/services/dhcp/dhclient.c 2005-11-18 23:19:48 UTC (rev 19334) @@ -53,8 +53,8 @@ * purpose. */ +#include "rosdhcp.h" #include <winsock2.h> -#include "rosdhcp.h" #include "dhcpd.h" #include "privsep.h" _____ Modified: trunk/reactos/services/dhcp/include/rosdhcp.h --- trunk/reactos/services/dhcp/include/rosdhcp.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/services/dhcp/include/rosdhcp.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -1,6 +1,7 @@ #ifndef ROSDHCP_H #define ROSDHCP_H +#define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> _____ Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -33,6 +33,7 @@ #include <stddef.h> /* PSDK/NDK */ +#define WIN32_NO_STATUS #include <windows.h> #include <fmifs/fmifs.h> #define NTOS_MODE_USER _____ Modified: trunk/reactos/w32api/include/ntdef.h --- trunk/reactos/w32api/include/ntdef.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/w32api/include/ntdef.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -34,7 +34,6 @@ } #ifndef NT_SUCCESS #define NT_SUCCESS(x) ((x)>=0) -#define STATUS_SUCCESS ((NTSTATUS)0) #endif #define NT_WARNING(x) ((ULONG)(x)>>30==2) #define NT_ERROR(x) ((ULONG)(x)>>30==3) _____ Modified: trunk/reactos/w32api/include/ntstatus.h --- trunk/reactos/w32api/include/ntstatus.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/w32api/include/ntstatus.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -18,17 +18,30 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __WINE_NTSTATUS_H -#define __WINE_NTSTATUS_H +#ifndef _NTSTATUS_ +#define _NTSTATUS_ #ifndef WIN32_NO_STATUS + /* * Debug codes */ -#define DBG_PRINTEXCEPTION_C ((NTSTATUS)0x40010006L) -#define DBG_CONTROL_C ((NTSTATUS)0x40010005L) -#define DBG_CONTROL_BREAK ((NTSTATUS)0x40010008L) +#define DBG_EXCEPTION_HANDLED ((NTSTATUS)0x00010001) +#define DBG_CONTINUE ((NTSTATUS)0x00010002) +#define DBG_REPLY_LATER ((NTSTATUS)0x40010001) +#define DBG_UNABLE_TO_PROVIDE_HANDLE ((NTSTATUS)0x40010002) +#define DBG_TERMINATE_THREAD ((NTSTATUS)0x40010003) +#define DBG_TERMINATE_PROCESS ((NTSTATUS)0x40010004) +#define DBG_CONTROL_C ((NTSTATUS)0x40010005) +#define DBG_PRINTEXCEPTION_C ((NTSTATUS)0x40010006) +#define DBG_RIPEXCEPTION ((NTSTATUS)0x40010007) +#define DBG_CONTROL_BREAK ((NTSTATUS)0x40010008) +#define DBG_COMMAND_EXCEPTION ((NTSTATUS)0x40010009) +#define DBG_EXCEPTION_NOT_HANDLED ((NTSTATUS)0x80010001) +#define DBG_NO_STATE_CHANGE ((NTSTATUS)0xC0010001) +#define DBG_APP_NOT_IDLE ((NTSTATUS)0xC0010002) + /* * Exception codes */ @@ -1108,4 +1121,4 @@ #endif /* WIN32_NO_STATUS */ -#endif /* __WINE_NTSTATUS_H */ +#endif /* _NTSTATUS_ */ _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2005-11-18 23:19:38 UTC (rev 19333) +++ trunk/reactos/w32api/include/winnt.h 2005-11-18 23:19:48 UTC (rev 19334) @@ -210,10 +210,55 @@ #define SPECIFIC_RIGHTS_ALL 0xFFFF #define ACCESS_SYSTEM_SECURITY 0x1000000 -#ifndef WIN32_NO_STATUS -#define DBG_CONTINUE ((DWORD)0x00010002L) -#endif +#ifndef WIN32_NO_STATUS +#define STATUS_WAIT_0 ((DWORD)0x00000000) +#define STATUS_ABANDONED_WAIT_0 ((DWORD)0x00000080) +#define STATUS_USER_APC ((DWORD)0x000000C0) +#define STATUS_TIMEOUT ((DWORD)0x00000102) +#define STATUS_PENDING ((DWORD)0x00000103) +#define STATUS_SEGMENT_NOTIFICATION ((DWORD)0x40000005) +#define STATUS_GUARD_PAGE_VIOLATION ((DWORD)0x80000001) +#define STATUS_DATATYPE_MISALIGNMENT ((DWORD)0x80000002) +#define STATUS_BREAKPOINT ((DWORD)0x80000003) +#define STATUS_SINGLE_STEP ((DWORD)0x80000004) +#define STATUS_ACCESS_VIOLATION ((DWORD)0xC0000005) +#define STATUS_IN_PAGE_ERROR ((DWORD)0xC0000006) +#define STATUS_INVALID_HANDLE ((DWORD)0xC0000008) +#define STATUS_NO_MEMORY ((DWORD)0xC0000017) +#define STATUS_ILLEGAL_INSTRUCTION ((DWORD)0xC000001D) +#define STATUS_NONCONTINUABLE_EXCEPTION ((DWORD)0xC0000025) +#define STATUS_INVALID_DISPOSITION ((DWORD)0xC0000026) +#define STATUS_ARRAY_BOUNDS_EXCEEDED ((DWORD)0xC000008C) +#define STATUS_FLOAT_DENORMAL_OPERAND ((DWORD)0xC000008D) +#define STATUS_FLOAT_DIVIDE_BY_ZERO ((DWORD)0xC000008E) +#define STATUS_FLOAT_INEXACT_RESULT ((DWORD)0xC000008F) +#define STATUS_FLOAT_INVALID_OPERATION ((DWORD)0xC0000090) +#define STATUS_FLOAT_OVERFLOW ((DWORD)0xC0000091) +#define STATUS_FLOAT_STACK_CHECK ((DWORD)0xC0000092) +#define STATUS_FLOAT_UNDERFLOW ((DWORD)0xC0000093) +#define STATUS_INTEGER_DIVIDE_BY_ZERO ((DWORD)0xC0000094) +#define STATUS_INTEGER_OVERFLOW ((DWORD)0xC0000095) +#define STATUS_PRIVILEGED_INSTRUCTION ((DWORD)0xC0000096) +#define STATUS_STACK_OVERFLOW ((DWORD)0xC00000FD) +#define STATUS_CONTROL_C_EXIT ((DWORD)0xC000013A) +#define STATUS_FLOAT_MULTIPLE_FAULTS ((DWORD)0xC00002B4) +#define STATUS_FLOAT_MULTIPLE_TRAPS ((DWORD)0xC00002B5) +#define STATUS_REG_NAT_CONSUMPTION ((DWORD)0xC00002C9) +#define STATUS_SXS_EARLY_DEACTIVATION ((DWORD)0xC015000F) +#define STATUS_SXS_INVALID_DEACTIVATION ((DWORD)0xC0150010) + +#define DBG_EXCEPTION_HANDLED ((DWORD)0x00010001) +#define DBG_CONTINUE ((DWORD)0x00010002) +#define DBG_TERMINATE_THREAD ((DWORD)0x40010003) +#define DBG_TERMINATE_PROCESS ((DWORD)0x40010004) +#define DBG_CONTROL_C ((DWORD)0x40010005) +#define DBG_CONTROL_BREAK ((DWORD)0x40010008) +#define DBG_COMMAND_EXCEPTION ((DWORD)0x40010009) +#define DBG_EXCEPTION_NOT_HANDLED ((DWORD)0x80010001) + +#endif /* WIN32_NO_STATUS */ + #define MAXIMUM_ALLOWED 0x2000000 #define GENERIC_READ 0x80000000 #define GENERIC_WRITE 0x40000000

1 0

[weiden] 19333: fixed uninitialized variable warnings
by weiden＠svn.reactos.com 18 Nov '05

18 Nov '05

fixed uninitialized variable warnings Modified: trunk/reactos/subsys/win32k/objects/dib.c _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2005-11-18 22:55:30 UTC (rev 19332) +++ trunk/reactos/subsys/win32k/objects/dib.c 2005-11-18 23:19:38 UTC (rev 19333) @@ -1149,6 +1149,7 @@ if (bits <= 8) { *paletteType = PAL_INDEXED; + RedMask = GreenMask = BlueMask = 0; } else if(bits < 24) {

1 0

[gedmurphy] 19332: - use InterlockedExchange for setting shutdown flag
by gedmurphy＠svn.reactos.com 18 Nov '05

18 Nov '05

- use InterlockedExchange for setting shutdown flag - fix bug in select() which was stopping the service from shutting down - add more event logs Modified: trunk/reactos/services/tcpsvcs/echo.c Modified: trunk/reactos/services/tcpsvcs/skelserver.c Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c _____ Modified: trunk/reactos/services/tcpsvcs/echo.c --- trunk/reactos/services/tcpsvcs/echo.c 2005-11-18 22:32:44 UTC (rev 19331) +++ trunk/reactos/services/tcpsvcs/echo.c 2005-11-18 22:55:30 UTC (rev 19332) @@ -88,5 +88,8 @@ if (! bShutDown) LogEvent(_T("Echo: Connection closed by peer.\n"), 0, FALSE); + if (bShutDown) + LogEvent(_T("Echo: thread recieved shutdown signal\n"), 0, FALSE); + return TRUE; } _____ Modified: trunk/reactos/services/tcpsvcs/skelserver.c --- trunk/reactos/services/tcpsvcs/skelserver.c 2005-11-18 22:32:44 UTC (rev 19331) +++ trunk/reactos/services/tcpsvcs/skelserver.c 2005-11-18 22:55:30 UTC (rev 19332) @@ -30,7 +30,7 @@ ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); if (ListeningSocket == INVALID_SOCKET) { - LogEvent("Socket error when setting up listener", 0, TRUE); + LogEvent("Socket error when setting up listener\n", 0, TRUE); return 3; } @@ -94,8 +94,6 @@ INT TimeOut = 2000; // 2 seconds //DebugBreak(); - /* monitor for incomming connections */ - FD_ZERO(&ReadFDS); /* set timeout values */ TimeVal.tv_sec = TimeOut / 1000; @@ -103,45 +101,52 @@ while (! bShutDown) // (i<MAX_CLIENTS && !bShutDown) { + INT SelRet = 0; + + FD_ZERO(&ReadFDS); FD_SET(ListeningSocket, &ReadFDS); - if (select(0, &ReadFDS, NULL, NULL, &TimeVal) == SOCKET_ERROR) + + SelRet = select(0, &ReadFDS, NULL, NULL, &TimeVal); + if (SelRet == SOCKET_ERROR) { LogEvent(_T("select failed\n"), 0, TRUE); return; } + else if (SelRet > 0) + { + /* don't call FD_ISSET if bShutDown flag is set */ + if ((! bShutDown) || (FD_ISSET(ListeningSocket, &ReadFDS))) + { + Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); + if (Sock != INVALID_SOCKET) + { + _stprintf(buf, _T("Accepted connection to %s server from %s:%d\n"), + Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); + LogEvent(buf, 0, FALSE); + _stprintf(buf, _T("Creating new thread for %s\n"), Name); + LogEvent(buf, 0, FALSE); - /* don't call FD_ISSET if bShutDown flag is set */ - if ((! bShutDown) || (FD_ISSET(ListeningSocket, &ReadFDS))) - { - Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); - if (Sock != INVALID_SOCKET) - { - _stprintf(buf, _T("Accepted connection to %s server from %s:%d\n"), - Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); - LogEvent(buf, 0, FALSE); - _stprintf(buf, _T("Creating new thread for %s\n"), Name); - LogEvent(buf, 0, FALSE); + hThread = CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); - hThread = CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); + /* Check the return value for success. */ + if (hThread == NULL) + { + _stprintf(buf, _T("Failed to start worker thread for " + "the %s server....\n"), Name); + LogEvent(buf, 0, TRUE); + } - /* Check the return value for success. */ - if (hThread == NULL) - { - _stprintf(buf, _T("Failed to start worker thread for " - "the %s server....\n"), Name); - LogEvent(buf, 0, TRUE); - } - - WaitForSingleObject(hThread, INFINITE); - - CloseHandle(hThread); - } - else - { - LogEvent(_T("accept failed\n"), 0, TRUE); - return; - } - } + WaitForSingleObject(hThread, INFINITE); + + CloseHandle(hThread); + } + else + { + LogEvent(_T("accept failed\n"), 0, TRUE); + return; + } + } + } } } _____ Modified: trunk/reactos/services/tcpsvcs/tcpsvcs.c --- trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-18 22:32:44 UTC (rev 19331) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-11-18 22:55:30 UTC (rev 19332) @@ -75,25 +75,26 @@ VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]) { - TCHAR LogFilePath[MAX_PATH]; + TCHAR LogFilePath[MAX_PATH]; if(! GetSystemDirectory(LogFilePath, MAX_PATH)) return; _tcscat(LogFilePath, LogFileName); - hLogFile = fopen(LogFilePath, _T("w")); + hLogFile = fopen(LogFilePath, _T("a+")); if (hLogFile == NULL) { TCHAR buf[50]; - _stprintf(buf, _T("Could not open log file: %s"), LogFilePath); + _stprintf(buf, _T("Could not open log file: %s\n"), LogFilePath); MessageBox(NULL, buf, NULL, MB_OK); return; } - LogEvent(_T("Entering ServiceMain"), 0, FALSE); + LogEvent(_T("Entering ServiceMain\n"), 0, FALSE); + hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; hServStatus.dwCurrentState = SERVICE_START_PENDING; hServStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | @@ -107,9 +108,9 @@ if (hSStat == 0) LogEvent(_T("Failed to register service\n"), -1, TRUE); - LogEvent(_T("Control handler registered successfully"), 0, FALSE); + LogEvent(_T("Control handler registered successfully\n"), 0, FALSE); SetServiceStatus (hSStat, &hServStatus); - LogEvent(_T("Service status set to SERVICE_START_PENDING"), 0, FALSE); + LogEvent(_T("Service status set to SERVICE_START_PENDING\n"), 0, FALSE); if (CreateServers() != 0) { @@ -119,13 +120,15 @@ return; } - LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status"), 0, FALSE); + LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status\n"), 0, FALSE); /* We will only return here when the ServiceSpecific function completes, indicating system shutdown. */ UpdateStatus (SERVICE_STOPPED, 0); - LogEvent(_T("Service status set to SERVICE_STOPPED"), 0, FALSE); - LogEvent(_T("Leaving ServiceMain"), 0, FALSE); - fclose(hLogFile); /* Clean up everything, in general */ + LogEvent(_T("Service status set to SERVICE_STOPPED\n"), 0, FALSE); + LogEvent(_T("Leaving ServiceMain\n"), 0, FALSE); + + fclose(hLogFile); + return; } @@ -133,18 +136,23 @@ VOID WINAPI ServerCtrlHandler(DWORD Control) { + TCHAR buf[256]; + switch (Control) { case SERVICE_CONTROL_SHUTDOWN: /* fall through */ case SERVICE_CONTROL_STOP: - bShutDown = TRUE; + LogEvent(_T("stopping service\n"), 0, FALSE); + InterlockedExchange((LONG *)&bShutDown, TRUE); UpdateStatus(SERVICE_STOP_PENDING, -1); break; - case SERVICE_CONTROL_PAUSE: - bPause = TRUE; + case SERVICE_CONTROL_PAUSE: /* not yet implemented */ + LogEvent(_T("pausing service\n"), 0, FALSE); + InterlockedExchange((LONG *)&bPause, TRUE); break; case SERVICE_CONTROL_CONTINUE: - bPause = FALSE; + LogEvent(_T("continuing service\n"), 0, FALSE); + InterlockedExchange((LONG *)&bPause, FALSE); break; case SERVICE_CONTROL_INTERROGATE: break; @@ -169,7 +177,7 @@ hServStatus.dwCurrentState = NewStatus; if (! SetServiceStatus (hSStat, &hServStatus)) - LogEvent(_T("Cannot set service status"), -1, TRUE); + LogEvent(_T("Cannot set service status\n"), -1, TRUE); return; } @@ -180,7 +188,7 @@ DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; WSADATA wsaData; - TCHAR buf[256]; // temp for holding LogEvent text + TCHAR buf[256]; INT i; DWORD RetVal; @@ -251,6 +259,8 @@ LPTSTR lpvSysMsg; TCHAR MessageBuffer[512]; + + if (PrintErrorMsg) { eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | @@ -258,13 +268,13 @@ ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpvSysMsg, 0, NULL); - _stprintf(MessageBuffer, _T("\n%s %s ErrNum = %lu. ExitCode = %lu."), + _stprintf(MessageBuffer, _T("%s %s ErrNum = %lu. ExitCode = %lu."), UserMessage, lpvSysMsg, ErrNum, ExitCode); HeapFree(GetProcessHeap (), 0, lpvSysMsg); } else { - _stprintf(MessageBuffer, _T("\n%s"), UserMessage); + _stprintf(MessageBuffer, _T("%s"), UserMessage); } fputs (MessageBuffer, hLogFile);

1 0

[fireball] 19331: Implement stubs for PCI_DEVICE_PRESENT_INTERFACE query-interface, plus fixes from hpoussin.
by fireball＠svn.reactos.com 18 Nov '05

18 Nov '05

Implement stubs for PCI_DEVICE_PRESENT_INTERFACE query-interface, plus fixes from hpoussin. Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-11-18 22:28:54 UTC (rev 19330) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-11-18 22:32:44 UTC (rev 19331) @@ -900,7 +900,7 @@ PPDO_DEVICE_EXTENSION DeviceExtension; ULONG Size; - DPRINT("InterfaceBusSetBusData()\n", + DPRINT("InterfaceBusSetBusData(%p 0x%lx %p 0x%lx 0x%lx)\n", Context, DataType, Buffer, Offset, Length); if (DataType != PCI_WHICHSPACE_CONFIG) @@ -933,7 +933,7 @@ PPDO_DEVICE_EXTENSION DeviceExtension; ULONG Size; - DPRINT("InterfaceBusGetBusData() called\n", + DPRINT("InterfaceBusGetBusData(%p 0x%lx %p 0x%lx 0x%lx) called\n", Context, DataType, Buffer, Offset, Length); if (DataType != PCI_WHICHSPACE_CONFIG) @@ -954,7 +954,44 @@ return Size; } +static BOOLEAN NTAPI +InterfacePciDevicePresent( + IN USHORT VendorID, + IN USHORT DeviceID, + IN UCHAR RevisionID, + IN USHORT SubVendorID, + IN USHORT SubSystemID, + IN ULONG Flags +) +{ + DPRINT1("Checking for PCI %04X:%04X not implemented\n", + VendorID, DeviceID); + return FALSE; +} + +static BOOLEAN NTAPI +InterfacePciDevicePresentEx( + IN PVOID Context, + IN PPCI_DEVICE_PRESENCE_PARAMETERS Parameters) +{ + PPDO_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("InterfacePciDevicePresentEx(%p %p) called\n", + Context, Parameters); + + if (!Parameters || Parameters->Size != sizeof(PCI_DEVICE_PRESENCE_PARAMETERS)) + return FALSE; + + DeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)Context)->DeviceExtension; + + DPRINT1("Checking for PCI %04X:%04X not implemented\n", + Parameters->VendorID, Parameters->DeviceID); + + return FALSE; +} + + static NTSTATUS PdoQueryInterface( IN PDEVICE_OBJECT DeviceObject, @@ -966,7 +1003,7 @@ if (RtlCompareMemory(IrpSp->Parameters.QueryInterface.InterfaceType, &GUID_BUS_INTERFACE_STANDARD, sizeof(GUID)) == sizeof(GUID)) { - /* BUS_INTERFACE STANDARD */ + /* BUS_INTERFACE_STANDARD */ if (IrpSp->Parameters.QueryInterface.Version < 1) Status = STATUS_NOT_SUPPORTED; else if (IrpSp->Parameters.QueryInterface.Size < sizeof(BUS_INTERFACE_STANDARD)) @@ -987,6 +1024,28 @@ Status = STATUS_SUCCESS; } } + else if (RtlCompareMemory(IrpSp->Parameters.QueryInterface.InterfaceType, + &GUID_PCI_DEVICE_PRESENT_INTERFACE, sizeof(GUID)) == sizeof(GUID)) + { + /* PCI_DEVICE_PRESENT_INTERFACE */ + if (IrpSp->Parameters.QueryInterface.Version < 1) + Status = STATUS_NOT_SUPPORTED; + else if (IrpSp->Parameters.QueryInterface.Size < sizeof(PCI_DEVICE_PRESENT_INTERFACE)) + Status = STATUS_BUFFER_TOO_SMALL; + else + { + PPCI_DEVICE_PRESENT_INTERFACE BusInterface; + BusInterface = (PPCI_DEVICE_PRESENT_INTERFACE)IrpSp->Parameters.QueryInterface.Interfac e; + BusInterface->Size = sizeof(PCI_DEVICE_PRESENT_INTERFACE); + BusInterface->Version = 1; + BusInterface->Context = DeviceObject; + BusInterface->InterfaceReference = InterfaceReference; + BusInterface->InterfaceDereference = InterfaceDereference; + BusInterface->IsDevicePresent = InterfacePciDevicePresent; + BusInterface->IsDevicePresentEx = InterfacePciDevicePresentEx; + Status = STATUS_SUCCESS; + } + } else { /* Not a supported interface */

1 0

[fireball] 19330: Added structs and other needed stuff for PCI_DEVICE_PRESENT_INTERFACE query.
by fireball＠svn.reactos.com 18 Nov '05

18 Nov '05

Added structs and other needed stuff for PCI_DEVICE_PRESENT_INTERFACE query. Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-18 22:04:17 UTC (rev 19329) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-18 22:28:54 UTC (rev 19330) @@ -705,6 +705,33 @@ IN ULONG Offset, IN ULONG Length); +typedef struct _PCI_DEVICE_PRESENCE_PARAMETERS { + ULONG Size; + ULONG Flags; + USHORT VendorID; + USHORT DeviceID; + UCHAR RevisionID; + USHORT SubVendorID; + USHORT SubSystemID; + UCHAR BaseClass; + UCHAR SubClass; + UCHAR ProgIf; +} PCI_DEVICE_PRESENCE_PARAMETERS, *PPCI_DEVICE_PRESENCE_PARAMETERS; + +typedef BOOLEAN +(DDKAPI *PPCI_IS_DEVICE_PRESENT)( + IN USHORT VendorID, + IN USHORT DeviceID, + IN UCHAR RevisionID, + IN USHORT SubVendorID, + IN USHORT SubSystemID, + IN ULONG Flags); + +typedef BOOLEAN +(DDKAPI *PPCI_IS_DEVICE_PRESENT_EX)( + IN PVOID Context, + IN PPCI_DEVICE_PRESENCE_PARAMETERS Parameters); + typedef union _POWER_STATE { SYSTEM_POWER_STATE SystemState; DEVICE_POWER_STATE DeviceState; @@ -727,6 +754,16 @@ PGET_SET_DEVICE_DATA GetBusData; } BUS_INTERFACE_STANDARD, *PBUS_INTERFACE_STANDARD; +typedef struct _PCI_DEVICE_PRESENT_INTERFACE { + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + PPCI_IS_DEVICE_PRESENT IsDevicePresent; + PPCI_IS_DEVICE_PRESENT_EX IsDevicePresentEx; +} PCI_DEVICE_PRESENT_INTERFACE, *PPCI_DEVICE_PRESENT_INTERFACE; + typedef struct _DEVICE_CAPABILITIES { USHORT Size; USHORT Version;

1 0

[hbirr] 19329: - Changed all registry functions to WCHAR.
by hbirr＠svn.reactos.com 18 Nov '05

18 Nov '05

- Changed all registry functions to WCHAR. - Implemented packed/unpacked names for keys and values. - Fixed the hash values for very short data. - Fixed the debug build. - Don't search for a serial mouse, if the port is used for debug prints. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml Modified: trunk/reactos/boot/freeldr/freeldr/include/comm.h Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/include/registry.h Modified: trunk/reactos/boot/freeldr/freeldr/include/version.h Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/registry.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-11-18 20:35:42 UTC (rev 19328) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-11-18 22:04:17 UTC (rev 19329) @@ -117,7 +117,7 @@ } __attribute__((packed)) CM_PNP_BIOS_INSTALLATION_CHECK, *PCM_PNP_BIOS_INSTALLATION_CHECK; -static char Hex[] = "0123456789ABCDEF"; +static WCHAR Hex[] = L"0123456789ABCDEF"; static unsigned int delay_count = 1; @@ -247,7 +247,7 @@ /* Set 'Component Information' value */ Error = RegSetValue(ComponentKey, - "Component Information", + L"Component Information", REG_BINARY, (PCHAR)&CompInfo, sizeof(CM_COMPONENT_INFORMATION)); @@ -264,7 +264,7 @@ PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PNP_BIOS_DEVICE_NODE DeviceNode; PCM_PNP_BIOS_INSTALLATION_CHECK InstData; - char Buffer[80]; + WCHAR Buffer[80]; FRLDRHKEY BusKey; ULONG x; ULONG NodeSize = 0; @@ -302,8 +302,8 @@ DbgPrint((DPRINT_HWDETECT, "Estimated buffer size %u\n", NodeSize * NodeCount)); /* Create new bus key */ - sprintf(Buffer, - "MultifunctionAdapter\\%u", *BusNumber); + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); Error = RegCreateKey(SystemKey, Buffer, &BusKey); @@ -324,10 +324,10 @@ /* Set 'Identifier' value */ Error = RegSetValue(BusKey, - "Identifier", + L"Identifier", REG_SZ, - "PNP BIOS", - 9); + (PCHAR)L"PNP BIOS", + 9 * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); @@ -402,7 +402,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(BusKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -484,7 +484,7 @@ DiskGeometry->BytesPerSector)); Error = RegSetValue(DiskKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -507,7 +507,7 @@ ULONG i; ULONG Checksum; ULONG Signature; - CHAR Identifier[20]; + WCHAR Identifier[20]; LONG Error; /* Read the MBR */ @@ -541,7 +541,7 @@ Identifier[5] = Hex[(Checksum >> 8) & 0x0F]; Identifier[6] = Hex[(Checksum >> 4) & 0x0F]; Identifier[7] = Hex[Checksum & 0x0F]; - Identifier[8] = '-'; + Identifier[8] = L'-'; Identifier[9] = Hex[(Signature >> 28) & 0x0F]; Identifier[10] = Hex[(Signature >> 24) & 0x0F]; Identifier[11] = Hex[(Signature >> 20) & 0x0F]; @@ -550,17 +550,17 @@ Identifier[14] = Hex[(Signature >> 8) & 0x0F]; Identifier[15] = Hex[(Signature >> 4) & 0x0F]; Identifier[16] = Hex[Signature & 0x0F]; - Identifier[17] = '-'; - Identifier[18] = 'A'; + Identifier[17] = L'-'; + Identifier[18] = L'A'; Identifier[19] = 0; - DbgPrint((DPRINT_HWDETECT, "Identifier: %x\n", Identifier)); + DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); /* Set identifier */ Error = RegSetValue(DiskKey, - "Identifier", + L"Identifier", REG_SZ, - Identifier, - 20); + (PCHAR)Identifier, + sizeof(Identifier)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -577,7 +577,7 @@ PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_INT13_DRIVE_PARAMETER Int13Drives; GEOMETRY Geometry; - CHAR Buffer[80]; + WCHAR Buffer[80]; FRLDRHKEY DiskKey; ULONG DiskCount; ULONG Size; @@ -662,7 +662,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(SystemKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -679,9 +679,9 @@ for (i = 0; i < DiskCount; i++) { /* Create disk key */ - sprintf (Buffer, - "DiskController\\0\\DiskPeripheral\\%u", - i); + swprintf (Buffer, + L"DiskController\\0\\DiskPeripheral\\%u", + i); Error = RegCreateKey(BusKey, Buffer, @@ -691,7 +691,7 @@ DbgPrint((DPRINT_HWDETECT, "Failed to create drive key\n")); continue; } - DbgPrint((DPRINT_HWDETECT, "Created key: %s\n", Buffer)); + DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", Buffer)); /* Set disk values */ SetHarddiskConfigurationData(DiskKey, 0x80 + i); @@ -745,8 +745,8 @@ PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_FLOPPY_DEVICE_DATA FloppyData; - char KeyName[32]; - char Identifier[20]; + WCHAR KeyName[32]; + WCHAR Identifier[20]; FRLDRHKEY PeripheralKey; ULONG Size; LONG Error; @@ -766,10 +766,10 @@ Ptr = GetInt1eTable(); - sprintf(KeyName, "FloppyDiskPeripheral\\%u", FloppyNumber); + swprintf(KeyName, L"FloppyDiskPeripheral\\%u", FloppyNumber); Error = RegCreateKey(ControllerKey, - "FloppyDiskPeripheral\\0", + KeyName, &PeripheralKey); if (Error != ERROR_SUCCESS) { @@ -777,7 +777,7 @@ return; } - DbgPrint((DPRINT_HWDETECT, "Created key: %s\n", KeyName)); + DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", KeyName)); /* Set 'ComponentInformation' value */ SetComponentInformation(PeripheralKey, @@ -818,7 +818,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(PeripheralKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -832,12 +832,12 @@ } /* Set 'Identifier' value */ - sprintf(Identifier, "FLOPPY%u", FloppyNumber + 1); + swprintf(Identifier, L"FLOPPY%u", FloppyNumber + 1); Error = RegSetValue(PeripheralKey, - "Identifier", + L"Identifier", REG_SZ, (PCHAR)Identifier, - strlen(Identifier) + 1); + (wcslen(Identifier) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -868,7 +868,7 @@ return; Error = RegCreateKey(BusKey, - "DiskController\\0", + L"DiskController\\0", &ControllerKey); if (Error != ERROR_SUCCESS) { @@ -928,7 +928,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(ControllerKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -1112,12 +1112,13 @@ { CM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; char Buffer[256]; - char Identifier[256]; + WCHAR Identifier[256]; FRLDRHKEY PeripheralKey; ULONG MouseType; ULONG Length; ULONG i; ULONG j; + ULONG k; LONG Error; DbgPrint((DPRINT_HWDETECT, @@ -1150,12 +1151,13 @@ Buffer)); /* Copy PnpId string */ - memcpy(&Identifier[0], - &Buffer[3], - 7); - memcpy(&Identifier[7], - " - ", - 4); + for (i = 0; i < 7; i++) + { + Identifier[i] = Buffer[3+i]; + } + memcpy(&Identifier[7], + L" - ", + 3 * sizeof(WCHAR)); /* Skip device serial number */ i = 10; @@ -1209,43 +1211,44 @@ i -= 3; if (i > j + 1) { - memcpy(&Identifier[10], - &Buffer[j], - i - j); + for (k = 0; k < i - j; k++) + { + Identifier[k + 10] = Buffer[k + j]; + } Identifier[10 + (i-j)] = 0; } } DbgPrint((DPRINT_HWDETECT, - "Identifier string: %s\n", + "Identifier string: %S\n", Identifier)); } - if (Length == 0 || strlen(Identifier) < 11) + if (Length == 0 || wcslen(Identifier) < 11) { switch (MouseType) { case MOUSE_TYPE_LOGITECH: - strcpy (Identifier, - "LOGITECH SERIAL MOUSE"); + wcscpy (Identifier, + L"LOGITECH SERIAL MOUSE"); break; case MOUSE_TYPE_WHEELZ: - strcpy (Identifier, - "MICROSOFT SERIAL MOUSE WITH WHEEL"); + wcscpy (Identifier, + L"MICROSOFT SERIAL MOUSE WITH WHEEL"); break; case MOUSE_TYPE_MICROSOFT: default: - strcpy (Identifier, - "MICROSOFT SERIAL MOUSE"); + wcscpy (Identifier, + L"MICROSOFT SERIAL MOUSE"); break; } } /* Create 'PointerPeripheral' key */ Error = RegCreateKey(ControllerKey, - "PointerPeripheral\\0", + L"PointerPeripheral\\0", &PeripheralKey); if (Error != ERROR_SUCCESS) { @@ -1269,7 +1272,7 @@ FullResourceDescriptor.PartialResourceList.Count = 0; Error = RegSetValue(PeripheralKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - @@ -1283,10 +1286,10 @@ /* Set 'Identifier' value */ Error = RegSetValue(PeripheralKey, - "Identifier", + L"Identifier", REG_SZ, - Identifier, - strlen(Identifier) + 1); + (PCHAR)Identifier, + (wcslen(Identifier) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -1305,7 +1308,7 @@ PCM_SERIAL_DEVICE_DATA SerialDeviceData; ULONG Irq[4] = {4, 3, 4, 3}; ULONG Base; - char Buffer[80]; + WCHAR Buffer[80]; PUSHORT BasePtr; ULONG ControllerNumber = 0; FRLDRHKEY ControllerKey; @@ -1329,8 +1332,8 @@ Base)); /* Create controller key */ - sprintf(Buffer, - "SerialController\\%u", + swprintf(Buffer, + L"SerialController\\%u", ControllerNumber); Error = RegCreateKey(BusKey, @@ -1341,7 +1344,7 @@ DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); continue; } - DbgPrint((DPRINT_HWDETECT, "Created key: %s\n", Buffer)); + DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", Buffer)); /* Set 'ComponentInformation' value */ SetComponentInformation(ControllerKey, @@ -1398,7 +1401,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(ControllerKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -1411,14 +1414,14 @@ } /* Set 'Identifier' value */ - sprintf(Buffer, - "COM%u", - i + 1); + swprintf(Buffer, + L"COM%u", + i + 1); Error = RegSetValue(ControllerKey, - "Identifier", + L"Identifier", REG_SZ, - Buffer, - strlen(Buffer) + 1); + (PCHAR)Buffer, + (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -1430,8 +1433,11 @@ "Created value: Identifier %s\n", Buffer)); - /* Detect serial mouse */ - DetectSerialPointerPeripheral(ControllerKey, Base); + if (!Rs232PortInUse(Base)) + { + /* Detect serial mouse */ + DetectSerialPointerPeripheral(ControllerKey, Base); + } ControllerNumber++; } @@ -1444,7 +1450,7 @@ PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; ULONG Irq[3] = {7, 5, (ULONG)-1}; - char Buffer[80]; + WCHAR Buffer[80]; FRLDRHKEY ControllerKey; PUSHORT BasePtr; ULONG Base; @@ -1469,9 +1475,9 @@ Base)); /* Create controller key */ - sprintf(Buffer, - "ParallelController\\%u", - ControllerNumber); + swprintf(Buffer, + L"ParallelController\\%u", + ControllerNumber); Error = RegCreateKey(BusKey, Buffer, @@ -1481,7 +1487,7 @@ DbgPrint((DPRINT_HWDETECT, "Failed to create controller key\n")); continue; } - DbgPrint((DPRINT_HWDETECT, "Created key: %s\n", Buffer)); + DbgPrint((DPRINT_HWDETECT, "Created key: %S\n", Buffer)); /* Set 'ComponentInformation' value */ SetComponentInformation(ControllerKey, @@ -1531,7 +1537,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(ControllerKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -1544,14 +1550,14 @@ } /* Set 'Identifier' value */ - sprintf(Buffer, - "PARALLEL%u", + swprintf(Buffer, + L"PARALLEL%u", i + 1); Error = RegSetValue(ControllerKey, - "Identifier", + L"Identifier", REG_SZ, - Buffer, - strlen(Buffer) + 1); + (PCHAR)Buffer, + (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -1637,7 +1643,6 @@ PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; PCM_KEYBOARD_DEVICE_DATA KeyboardData; FRLDRHKEY PeripheralKey; - char Buffer[80]; ULONG Size; LONG Error; @@ -1645,7 +1650,7 @@ { /* Create controller key */ Error = RegCreateKey(ControllerKey, - "KeyboardPeripheral\\0", + L"KeyboardPeripheral\\0", &PeripheralKey); if (Error != ERROR_SUCCESS) { @@ -1691,7 +1696,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(PeripheralKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR)FullResourceDescriptor, Size); @@ -1704,13 +1709,11 @@ } /* Set 'Identifier' value */ - strcpy(Buffer, - "PCAT_ENHANCED"); Error = RegSetValue(PeripheralKey, - "Identifier", + L"Identifier", REG_SZ, - Buffer, - strlen(Buffer) + 1); + (PCHAR)L"PCAT_ENHANCED", + 14 * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -1732,7 +1735,7 @@ /* Create controller key */ Error = RegCreateKey(BusKey, - "KeyboardController\\0", + L"KeyboardController\\0", &ControllerKey); if (Error != ERROR_SUCCESS) { @@ -1793,7 +1796,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(ControllerKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR)FullResourceDescriptor, Size); @@ -1929,7 +1932,7 @@ /* Create controller key */ Error = RegCreateKey(BusKey, - "PointerController\\0", + L"PointerController\\0", &ControllerKey); if (Error != ERROR_SUCCESS) { @@ -1961,7 +1964,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(ControllerKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR)); @@ -1980,7 +1983,7 @@ /* Create peripheral key */ Error = RegCreateKey(ControllerKey, - "PointerPeripheral\\0", + L"PointerPeripheral\\0", &PeripheralKey); if (Error != ERROR_SUCCESS) { @@ -2003,7 +2006,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(PeripheralKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR)&FullResourceDescriptor, sizeof(CM_FULL_RESOURCE_DESCRIPTOR) - @@ -2018,10 +2021,10 @@ /* Set 'Identifier' value */ Error = RegSetValue(PeripheralKey, - "Identifier", + L"Identifier", REG_SZ, - "MICROSOFT PS2 MOUSE", - 20); + (PCHAR)L"MICROSOFT PS2 MOUSE", + 20 * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -2037,13 +2040,13 @@ static VOID DetectDisplayController(FRLDRHKEY BusKey) { - CHAR Buffer[80]; + WCHAR Buffer[80]; FRLDRHKEY ControllerKey; USHORT VesaVersion; LONG Error; Error = RegCreateKey(BusKey, - "DisplayController\\0", + L"DisplayController\\0", &ControllerKey); if (Error != ERROR_SUCCESS) { @@ -2076,21 +2079,21 @@ if (VesaVersion >= 0x0200) { - strcpy(Buffer, - "VBE Display"); + wcscpy(Buffer, + L"VBE Display"); } else { - strcpy(Buffer, - "VGA Display"); + wcscpy(Buffer, + L"VGA Display"); } /* Set 'Identifier' value */ Error = RegSetValue(ControllerKey, - "Identifier", + L"Identifier", REG_SZ, - Buffer, - strlen(Buffer) + 1); + (PCHAR)Buffer, + (wcslen(Buffer) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, @@ -2107,14 +2110,14 @@ DetectIsaBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; - char Buffer[80]; + WCHAR Buffer[80]; FRLDRHKEY BusKey; ULONG Size; LONG Error; /* Create new bus key */ - sprintf(Buffer, - "MultifunctionAdapter\\%u", *BusNumber); + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); Error = RegCreateKey(SystemKey, Buffer, &BusKey); @@ -2135,10 +2138,10 @@ /* Set 'Identifier' value */ Error = RegSetValue(BusKey, - "Identifier", + L"Identifier", REG_SZ, - "ISA", - 4); + (PCHAR)L"ISA", + 4 * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); @@ -2164,7 +2167,7 @@ /* Set 'Configuration Data' value */ Error = RegSetValue(BusKey, - "Configuration Data", + L"Configuration Data", REG_FULL_RESOURCE_DESCRIPTOR, (PCHAR) FullResourceDescriptor, Size); @@ -2207,7 +2210,7 @@ /* Create the 'System' key */ Error = RegCreateKey(NULL, - "\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", &SystemKey); if (Error != ERROR_SUCCESS) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-11-18 20:35:42 UTC (rev 19328) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c 2005-11-18 22:04:17 UTC (rev 19329) @@ -53,7 +53,7 @@ VOID DetectAcpiBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { - char Buffer[80]; + WCHAR Buffer[80]; FRLDRHKEY BiosKey; LONG Error; @@ -61,8 +61,8 @@ { AcpiPresent = TRUE; /* Create new bus key */ - sprintf(Buffer, - "MultifunctionAdapter\\%u", *BusNumber); + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); Error = RegCreateKey(SystemKey, Buffer, &BiosKey); @@ -85,10 +85,10 @@ /* Set 'Identifier' value */ Error = RegSetValue(BiosKey, - "Identifier", + L"Identifier", REG_SZ, - "ACPI BIOS", - 10); + (PCHAR)L"ACPI BIOS", + 10 * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-11-18 20:35:42 UTC (rev 19328) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c 2005-11-18 22:04:17 UTC (rev 19329) @@ -56,15 +56,15 @@ VOID DetectApmBios(FRLDRHKEY SystemKey, ULONG *BusNumber) { - char Buffer[80]; + WCHAR Buffer[80]; FRLDRHKEY BiosKey; LONG Error; if (FindApmBios()) { /* Create new bus key */ - sprintf(Buffer, - "MultifunctionAdapter\\%u", *BusNumber); + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); Error = RegCreateKey(SystemKey, Buffer, &BiosKey); @@ -87,10 +87,10 @@ /* Set 'Identifier' value */ Error = RegSetValue(BiosKey, - "Identifier", + L"Identifier", REG_SZ, - "APM", - 4); + (PCHAR)L"APM", + 4 * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-11-18 20:35:42 UTC (rev 19328) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwcpu.c 2005-11-18 22:04:17 UTC (rev 19329) @@ -105,8 +105,9 @@ DetectCPU(FRLDRHKEY CpuKey, FRLDRHKEY FpuKey) { - CHAR VendorIdentifier[13]; - CHAR Identifier[64]; + WCHAR VendorIdentifier[13]; + CHAR tmpVendorIdentifier[13]; + WCHAR Identifier[64]; ULONG FeatureSet; FRLDRHKEY CpuInstKey; FRLDRHKEY FpuInstKey; @@ -122,7 +123,7 @@ /* Create the CPU instance key */ Error = RegCreateKey(CpuKey, - "0", + L"0", &CpuInstKey); if (Error != ERROR_SUCCESS) { @@ -132,7 +133,7 @@ /* Create the FPU instance key */ Error = RegCreateKey(FpuKey, - "0", + L"0", &FpuInstKey); if (Error != ERROR_SUCCESS) { @@ -147,21 +148,22 @@ /* Get vendor identifier */ GetCpuid(0, &eax, &ebx, &ecx, &edx); - VendorIdentifier[12] = 0; - Ptr = (ULONG*)&VendorIdentifier[0]; + tmpVendorIdentifier[12] = 0; + Ptr = (ULONG*)&tmpVendorIdentifier[0]; *Ptr = ebx; Ptr++; *Ptr = edx; Ptr++; *Ptr = ecx; + swprintf(VendorIdentifier, L"%s", tmpVendorIdentifier); /* Get Identifier */ GetCpuid(1, &eax, &ebx, &ecx, &edx); - sprintf(Identifier, - "x86 Family %u Model %u Stepping %u", - (unsigned int)((eax >> 8) & 0x0F), - (unsigned int)((eax >> 4) & 0x0F), - (unsigned int)(eax & 0x0F)); + swprintf(Identifier, + L"x86 Family %u Model %u Stepping %u", + (unsigned int)((eax >> 8) & 0x0F), + (unsigned int)((eax >> 4) & 0x0F), + (unsigned int)(eax & 0x0F)); FeatureSet = edx; if (((eax >> 8) & 0x0F) >= 5) SupportTSC = TRUE; @@ -170,9 +172,9 @@ { DbgPrint((DPRINT_HWDETECT, "CPUID not supported\n")); - strcpy(VendorIdentifier, "Unknown"); - sprintf(Identifier, - "x86 Family %u Model %u Stepping %u", + wcscpy(VendorIdentifier, L"Unknown"); + swprintf(Identifier, + L"x86 Family %u Model %u Stepping %u", (unsigned int)((eax >> 8) & 0x0F), (unsigned int)((eax >> 4) & 0x0F), (unsigned int)(eax & 0x0F)); @@ -187,7 +189,7 @@ DbgPrint((DPRINT_HWDETECT, "FeatureSet: %x\n", FeatureSet)); Error = RegSetValue(CpuInstKey, - "FeatureSet", + L"FeatureSet", REG_DWORD, (PCHAR)&FeatureSet, sizeof(ULONG)); @@ -197,36 +199,36 @@ } /* Set 'Identifier' value (CPU and FPU) */ - DbgPrint((DPRINT_HWDETECT, "Identifier: %s\n", Identifier)); + DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); Error = RegSetValue(CpuInstKey, - "Identifier", + L"Identifier", REG_SZ, - Identifier, - strlen(Identifier) + 1); + (PCHAR)Identifier, + (wcslen(Identifier) + 1)* sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); } Error = RegSetValue(FpuInstKey, - "Identifier", + L"Identifier", REG_SZ, - Identifier, - strlen(Identifier) + 1); + (PCHAR)Identifier, + (wcslen(Identifier) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); } /* Set 'VendorIdentifier' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %s\n", VendorIdentifier)); + DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %S\n", VendorIdentifier)); Error = RegSetValue(CpuInstKey, - "VendorIdentifier", + L"VendorIdentifier", REG_SZ, - VendorIdentifier, - strlen(VendorIdentifier) + 1); + (PCHAR)VendorIdentifier, + (wcslen(VendorIdentifier) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); @@ -242,7 +244,7 @@ CpuSpeed = GetCpuSpeed(); Error = RegSetValue(CpuInstKey, - "~MHz", + L"~MHz", REG_DWORD, (PCHAR)&CpuSpeed, sizeof(ULONG)); @@ -259,9 +261,10 @@ FRLDRHKEY FpuKey, PMP_PROCESSOR_ENTRY CpuEntry) { - char VendorIdentifier[13]; - char Identifier[64]; - char Buffer[8]; + WCHAR VendorIdentifier[13]; + CHAR tmpVendorIdentifier[13]; + WCHAR Identifier[64]; + WCHAR Buffer[8]; ULONG FeatureSet; FRLDRHKEY CpuInstKey; FRLDRHKEY FpuInstKey; @@ -274,7 +277,7 @@ ULONG CpuSpeed; /* Get processor instance number */ - sprintf(Buffer, "%u", CpuEntry->LocalApicId); + swprintf(Buffer, L"%u", CpuEntry->LocalApicId); /* Create the CPU instance key */ Error = RegCreateKey(CpuKey, @@ -298,17 +301,18 @@ /* Get 'VendorIdentifier' */ GetCpuid(0, &eax, &ebx, &ecx, &edx); - VendorIdentifier[12] = 0; - Ptr = (ULONG*)&VendorIdentifier[0]; + tmpVendorIdentifier[12] = 0; + Ptr = (ULONG*)&tmpVendorIdentifier[0]; *Ptr = ebx; Ptr++; *Ptr = edx; Ptr++; *Ptr = ecx; + swprintf(VendorIdentifier, L"%s", tmpVendorIdentifier); /* Get 'Identifier' */ - sprintf(Identifier, - "x86 Family %u Model %u Stepping %u", + swprintf(Identifier, + L"x86 Family %u Model %u Stepping %u", (ULONG)((CpuEntry->CpuSignature >> 8) & 0x0F), (ULONG)((CpuEntry->CpuSignature >> 4) & 0x0F), (ULONG)(CpuEntry->CpuSignature & 0x0F)); @@ -331,7 +335,7 @@ DbgPrint((DPRINT_HWDETECT, "FeatureSet: %x\n", FeatureSet)); Error = RegSetValue(CpuInstKey, - "FeatureSet", + L"FeatureSet", REG_DWORD, (PCHAR)&FeatureSet, sizeof(ULONG)); @@ -341,36 +345,36 @@ } /* Set 'Identifier' value (CPU and FPU) */ - DbgPrint((DPRINT_HWDETECT, "Identifier: %s\n", Identifier)); + DbgPrint((DPRINT_HWDETECT, "Identifier: %S\n", Identifier)); Error = RegSetValue(CpuInstKey, - "Identifier", + L"Identifier", REG_SZ, - Identifier, - strlen(Identifier) + 1); + (PCHAR)Identifier, + (wcslen(Identifier) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); } Error = RegSetValue(FpuInstKey, - "Identifier", + L"Identifier", REG_SZ, - Identifier, - strlen(Identifier) + 1); + (PCHAR)Identifier, + (wcslen(Identifier) + 1) * sizeof(WCHAR)); if (Error != ERROR_SUCCESS) { DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); } /* Set 'VendorIdentifier' value (CPU only) */ - DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %s\n", VendorIdentifier)); + DbgPrint((DPRINT_HWDETECT, "Vendor Identifier: %S\n", VendorIdentifier)); Error = RegSetValue(CpuInstKey, - "VendorIdentifier", + L"VendorIdentifier", REG_SZ, [truncated at 1000 lines; 1944 more skipped]

1 0

[hpoussin] 19328: Revert 19324 and part of 19325...
by hpoussin＠svn.reactos.com 18 Nov '05

18 Nov '05

Revert 19324 and part of 19325... Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c --- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-18 18:51:31 UTC (rev 19327) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-18 20:35:42 UTC (rev 19328) @@ -329,7 +329,7 @@ DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA)); - Fdo->Flags |= DO_POWER_PAGABLE; + Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; /* Add entry entry to HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP\[DeviceBaseName] */ @@ -385,7 +385,7 @@ /* A read request is waiting for input, so go straight to it */ /* FIXME: use SEH */ RtlCopyMemory( - Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer, + Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->AssociatedIrp.SystemBuffer, DataStart, sizeof(KEYBOARD_INPUT_DATA)); @@ -585,7 +585,7 @@ /* FIXME: use SEH */ RtlCopyMemory( - Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer, + Irp->AssociatedIrp.SystemBuffer, DeviceExtension->PortData - DeviceExtension->InputCount, sizeof(KEYBOARD_INPUT_DATA)); _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-18 18:51:31 UTC (rev 19327) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-11-18 20:35:42 UTC (rev 19328) @@ -2063,11 +2063,6 @@ } #endif - if (DeviceNode->ServiceName.Length == 0) - /* We have a NULL driver for this device. We can't really do - * something with it, so state it is started... */ - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) && !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) && !IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED))

1 0

[ion] 19327: Due to CcRos's abusive usage and dependency on our broken Fast Mutex implementation, Fast Mutex can't be fixed until the Cc Rewrite is complete. Since that seems to take longer and we've identified drivers which need the correct Fast Mutex implementation committed, I've isolated the old implementation as "CcBrokenMutex" and replaced the calls related to "ExFastMutex" inside CC, so that our fast mutex implementation can be fixed without affecting Cc.
by ion＠svn.reactos.com 18 Nov '05

18 Nov '05

Due to CcRos's abusive usage and dependency on our broken Fast Mutex implementation, Fast Mutex can't be fixed until the Cc Rewrite is complete. Since that seems to take longer and we've identified drivers which need the correct Fast Mutex implementation committed, I've isolated the old implementation as "CcBrokenMutex" and replaced the calls related to "ExFastMutex" inside CC, so that our fast mutex implementation can be fixed without affecting Cc. Added: trunk/reactos/ntoskrnl/cc/ccmutex.c Modified: trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Added: trunk/reactos/ntoskrnl/cc/ccmutex.c --- trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-18 18:48:14 UTC (rev 19326) +++ trunk/reactos/ntoskrnl/cc/ccmutex.c 2005-11-18 18:51:31 UTC (rev 19327) @@ -0,0 +1,89 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/cc/ccmutex.c + * PURPOSE: Implements the Broken Mutex Implementation for the broken Cc + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES *****************************************************************/ + +#include <ntoskrnl.h> +#include <internal/debug.h> + +/* FUNCTIONS *****************************************************************/ + +VOID +FASTCALL +CcAcquireBrokenMutexUnsafe(PFAST_MUTEX FastMutex) +{ + ASSERT(KeGetCurrentThread() == NULL || + FastMutex->Owner != KeGetCurrentThread()); + ASSERT(KeGetCurrentIrql() == APC_LEVEL || + KeGetCurrentThread() == NULL || + KeGetCurrentThread()->KernelApcDisable); + + InterlockedIncrementUL(&FastMutex->Contention); + while (InterlockedExchange(&FastMutex->Count, 0) == 0) + { + KeWaitForSingleObject(&FastMutex->Event, + Executive, + KernelMode, + FALSE, + NULL); + } + InterlockedDecrementUL(&FastMutex->Contention); + FastMutex->Owner = KeGetCurrentThread(); +} + +VOID +FASTCALL +CcReleaseBrokenMutexUnsafe(PFAST_MUTEX FastMutex) +{ + ASSERT(KeGetCurrentThread() == NULL || + FastMutex->Owner == KeGetCurrentThread()); + ASSERT(KeGetCurrentIrql() == APC_LEVEL || + KeGetCurrentThread() == NULL || + KeGetCurrentThread()->KernelApcDisable); + + FastMutex->Owner = NULL; + InterlockedExchange(&FastMutex->Count, 1); + if (FastMutex->Contention > 0) + { + KeSetEvent(&FastMutex->Event, 0, FALSE); + } +} + +VOID +FASTCALL +CcAcquireBrokenMutex(PFAST_MUTEX FastMutex) +{ + KeEnterCriticalRegion(); + CcAcquireBrokenMutexUnsafe(FastMutex); +} + + +VOID +FASTCALL +CcReleaseBrokenMutex(PFAST_MUTEX FastMutex) +{ + CcReleaseBrokenMutexUnsafe(FastMutex); + KeLeaveCriticalRegion(); +} + +BOOLEAN +FASTCALL +CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex) +{ + KeEnterCriticalRegion(); + if (InterlockedExchange(&FastMutex->Count, 0) == 1) + { + FastMutex->Owner = KeGetCurrentThread(); + return(TRUE); + } + else + { + KeLeaveCriticalRegion(); + return(FALSE); + } +} _____ Modified: trunk/reactos/ntoskrnl/cc/fs.c --- trunk/reactos/ntoskrnl/cc/fs.c 2005-11-18 18:48:14 UTC (rev 19326) +++ trunk/reactos/ntoskrnl/cc/fs.c 2005-11-18 18:51:31 UTC (rev 19327) @@ -153,7 +153,7 @@ if (FileSizes->AllocationSize.QuadPart < Bcb->AllocationSize.QuadPart) { InitializeListHead(&FreeListHead); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); current_entry = Bcb->BcbSegmentListHead.Flink; @@ -186,7 +186,7 @@ Bcb->AllocationSize = FileSizes->AllocationSize; Bcb->FileSize = FileSizes->FileSize; KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); current_entry = FreeListHead.Flink; while(current_entry != &FreeListHead) _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-11-18 18:48:14 UTC (rev 19326) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-11-18 18:51:31 UTC (rev 19327) @@ -236,7 +236,7 @@ IoStatus->Information = 0; if (WriteThrough) { - ExAcquireFastMutex(&iBcb->CacheSegment->Lock); + CcAcquireBrokenMutex(&iBcb->CacheSegment->Lock); if (iBcb->CacheSegment->Dirty) { IoStatus->Status = CcRosFlushCacheSegment(iBcb->CacheSegment); @@ -245,7 +245,7 @@ { IoStatus->Status = STATUS_SUCCESS; } - ExReleaseFastMutex(&iBcb->CacheSegment->Lock); + CcReleaseBrokenMutex(&iBcb->CacheSegment->Lock); } else { _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-11-18 18:48:14 UTC (rev 19326) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-11-18 18:51:31 UTC (rev 19327) @@ -132,7 +132,7 @@ { DPRINT1("Enabling Tracing for CacheMap 0x%p:\n", Bcb ); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); current_entry = Bcb->BcbSegmentListHead.Flink; @@ -145,7 +145,7 @@ current, current->ReferenceCount, current->Dirty, current->PageOut ); } KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } else { @@ -167,14 +167,14 @@ Status = WriteCacheSegment(CacheSegment); if (NT_SUCCESS(Status)) { - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); KeAcquireSpinLock(&CacheSegment->Bcb->BcbLock, &oldIrql); CacheSegment->Dirty = FALSE; RemoveEntryList(&CacheSegment->DirtySegmentListEntry); DirtyPageCount -= CacheSegment->Bcb->CacheSegmentSize / PAGE_SIZE; CcRosCacheSegmentDecRefCount ( CacheSegment ); KeReleaseSpinLock(&CacheSegment->Bcb->BcbLock, oldIrql); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } return(Status); } @@ -195,7 +195,7 @@ (*Count) = 0; - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); WriteCount[0] = WriteCount[1]; WriteCount[1] = WriteCount[2]; @@ -227,7 +227,7 @@ current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, DirtySegmentListEntry); current_entry = current_entry->Flink; - Locked = ExTryToAcquireFastMutex(&current->Lock); + Locked = CcTryToAcquireBrokenMutex(&current->Lock); if (!Locked) { continue; @@ -235,13 +235,13 @@ ASSERT(current->Dirty); if (current->ReferenceCount > 1) { - ExReleaseFastMutex(&current->Lock); + CcReleaseBrokenMutex(&current->Lock); continue; } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; Status = CcRosFlushCacheSegment(current); - ExReleaseFastMutex(&current->Lock); + CcReleaseBrokenMutex(&current->Lock); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { DPRINT1("CC: Failed to flush cache segment.\n"); @@ -251,14 +251,14 @@ (*Count) += PagesPerSegment; Target -= PagesPerSegment; } - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); current_entry = DirtySegmentListHead.Flink; } if (*Count < NewTarget) { WriteCount[1] += (NewTarget - *Count); } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); DPRINT("CcRosFlushDirtyPages() finished\n"); return(STATUS_SUCCESS); @@ -288,7 +288,7 @@ InitializeListHead(&FreeList); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); current_entry = CacheSegmentLRUListHead.Flink; while (current_entry != &CacheSegmentLRUListHead && Target > 0) { @@ -320,7 +320,7 @@ last = current; current->PageOut = TRUE; KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) { PFN_TYPE Page; @@ -331,7 +331,7 @@ break; } } - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); KeAcquireSpinLock(&current->Bcb->BcbLock, &oldIrql); CcRosCacheSegmentDecRefCount(current); current->PageOut = FALSE; @@ -342,7 +342,7 @@ KeReleaseSpinLock(&current->Bcb->BcbLock, oldIrql); } } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); while (!IsListEmpty(&FreeList)) { @@ -375,7 +375,7 @@ CacheSeg->Valid = Valid; CacheSeg->Dirty = CacheSeg->Dirty || Dirty; - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); if (!WasDirty && CacheSeg->Dirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); @@ -399,8 +399,8 @@ CcRosCacheSegmentIncRefCount(CacheSeg); } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - ExReleaseFastMutex(&ViewLock); - ExReleaseFastMutex(&CacheSeg->Lock); + CcReleaseBrokenMutex(&ViewLock); + CcReleaseBrokenMutex(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -428,7 +428,7 @@ { CcRosCacheSegmentIncRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - ExAcquireFastMutex(&current->Lock); + CcAcquireBrokenMutex(&current->Lock); return(current); } current_entry = current_entry->Flink; @@ -455,10 +455,10 @@ } if (!CacheSeg->Dirty) { - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } else { @@ -469,7 +469,7 @@ CacheSeg->Dirty = TRUE; - ExReleaseFastMutex(&CacheSeg->Lock); + CcReleaseBrokenMutex(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -500,10 +500,10 @@ if (!WasDirty && NowDirty) { - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); @@ -518,7 +518,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - ExReleaseFastMutex(&CacheSeg->Lock); + CcReleaseBrokenMutex(&CacheSeg->Lock); return(STATUS_SUCCESS); } @@ -568,8 +568,8 @@ current->DirtySegmentListEntry.Blink = NULL; current->ReferenceCount = 1; ExInitializeFastMutex(&current->Lock); - ExAcquireFastMutex(&current->Lock); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&current->Lock); + CcAcquireBrokenMutex(&ViewLock); *CacheSeg = current; /* There is window between the call to CcRosLookupCacheSegment @@ -598,11 +598,11 @@ current ); } #endif - ExReleaseFastMutex(&(*CacheSeg)->Lock); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&(*CacheSeg)->Lock); + CcReleaseBrokenMutex(&ViewLock); ExFreeToNPagedLookasideList(&CacheSegLookasideList, *CacheSeg); *CacheSeg = current; - ExAcquireFastMutex(&current->Lock); + CcAcquireBrokenMutex(&current->Lock); return STATUS_SUCCESS; } if (current->FileOffset < FileOffset) @@ -634,7 +634,7 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); InsertTailList(&CacheSegmentListHead, &current->CacheSegmentListEntry); InsertTailList(&CacheSegmentLRUListHead, &current->CacheSegmentLRUListEntry); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); #ifdef CACHE_BITMAP KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); @@ -907,7 +907,7 @@ DPRINT("CcRosFreeCacheSegment(Bcb 0x%p, CacheSeg 0x%p)\n", Bcb, CacheSeg); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); RemoveEntryList(&CacheSeg->BcbSegmentListEntry); RemoveEntryList(&CacheSeg->CacheSegmentListEntry); @@ -919,7 +919,7 @@ } KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); Status = CcRosInternalFreeCacheSegment(CacheSeg); return(Status); @@ -977,7 +977,7 @@ } } KeAcquireSpinLock(&Bcb->BcbLock, &oldIrql); - ExReleaseFastMutex(&current->Lock); + CcReleaseBrokenMutex(&current->Lock); CcRosCacheSegmentDecRefCount(current); KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); } @@ -1018,11 +1018,11 @@ ASSERT(Bcb); Bcb->RefCount++; - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); CcFlushCache(FileObject->SectionObjectPointer, NULL, 0, NULL); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); Bcb->RefCount--; if (Bcb->RefCount == 0) { @@ -1059,7 +1059,7 @@ #endif KeReleaseSpinLock(&Bcb->BcbLock, oldIrql); - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); ObDereferenceObject (Bcb->FileObject); while (!IsListEmpty(&FreeList)) @@ -1069,7 +1069,7 @@ Status = CcRosInternalFreeCacheSegment(current); } ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); } return(STATUS_SUCCESS); } @@ -1079,7 +1079,7 @@ CcRosReferenceCache(PFILE_OBJECT FileObject) { PBCB Bcb; - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); if (Bcb->RefCount == 0) @@ -1094,7 +1094,7 @@ ASSERT(Bcb->BcbRemoveListEntry.Flink == NULL); } Bcb->RefCount++; - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } VOID @@ -1103,7 +1103,7 @@ { PBCB Bcb; DPRINT("CcRosSetRemoveOnClose()\n"); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); Bcb = (PBCB)SectionObjectPointer->SharedCacheMap; if (Bcb) { @@ -1113,7 +1113,7 @@ CcRosDeleteFileCache(Bcb->FileObject, Bcb); } } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } @@ -1122,7 +1122,7 @@ CcRosDereferenceCache(PFILE_OBJECT FileObject) { PBCB Bcb; - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); Bcb = (PBCB)FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(Bcb); if (Bcb->RefCount > 0) @@ -1142,7 +1142,7 @@ } } } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } NTSTATUS STDCALL @@ -1154,7 +1154,7 @@ { PBCB Bcb; - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); if (FileObject->SectionObjectPointer->SharedCacheMap != NULL) { @@ -1181,7 +1181,7 @@ } } } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); return(STATUS_SUCCESS); } @@ -1192,7 +1192,7 @@ PBCB Bcb; NTSTATUS Status; - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); Bcb = FileObject->SectionObjectPointer->SharedCacheMap; if (Bcb == NULL) @@ -1213,7 +1213,7 @@ } Status = STATUS_SUCCESS; } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); return Status; } @@ -1232,13 +1232,13 @@ DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %d)\n", FileObject, Bcb, CacheSegmentSize); - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); if (Bcb == NULL) { Bcb = ExAllocateFromNPagedLookasideList(&BcbLookasideList); if (Bcb == NULL) { - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); return(STATUS_UNSUCCESSFUL); } memset(Bcb, 0, sizeof(BCB)); @@ -1269,7 +1269,7 @@ RemoveEntryList(&Bcb->BcbRemoveListEntry); Bcb->BcbRemoveListEntry.Flink = NULL; } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); return(STATUS_SUCCESS); } @@ -1324,7 +1324,7 @@ break; } - ExAcquireFastMutex(&ViewLock); + CcAcquireBrokenMutex(&ViewLock); CcTimeStamp++; if (CcTimeStamp >= 30) { @@ -1340,7 +1340,7 @@ CcRosDeleteFileCache(current->FileObject, current); } } - ExReleaseFastMutex(&ViewLock); + CcReleaseBrokenMutex(&ViewLock); } } _____ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h --- trunk/reactos/ntoskrnl/include/internal/cc.h 2005-11-18 18:48:14 UTC (rev 19326) +++ trunk/reactos/ntoskrnl/include/internal/cc.h 2005-11-18 18:51:31 UTC (rev 19327) @@ -1,6 +1,18 @@ #ifndef __INCLUDE_INTERNAL_CC_H #define __INCLUDE_INTERNAL_CC_H +VOID +FASTCALL +CcAcquireBrokenMutex(PFAST_MUTEX FastMutex); + +VOID +FASTCALL +CcReleaseBrokenMutex(PFAST_MUTEX FastMutex); + +BOOLEAN +FASTCALL +CcTryToAcquireBrokenMutex(PFAST_MUTEX FastMutex); + typedef struct _BCB { LIST_ENTRY BcbSegmentListHead; _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-11-18 18:48:14 UTC (rev 19326) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2005-11-18 18:51:31 UTC (rev 19327) @@ -73,6 +73,7 @@ </directory> <directory name="cc"> <file>cacheman.c</file> + <file>ccmutex.c</file> <file>copy.c</file> <file>fs.c</file> <file>mdl.c</file>

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