Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 23603: Fixes: - missing "; " at eol - some compatibility issues with newer WDK's files
by fireball＠svn.reactos.org 18 Aug '06

18 Aug '06

Author: fireball Date: Sat Aug 19 01:00:43 2006 New Revision: 23603 URL: http://svn.reactos.org/svn/reactos?rev=23603&view=rev Log: Fixes: - missing ";" at eol - some compatibility issues with newer WDK's files Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c Sat Aug 19 01:00:43 2006 @@ -23,6 +23,10 @@ #include "debug.h" #include "usb.h" #include "umss.h" + +// ULONG_PTR defining hack, to use ntddsci.h from reactos +//FIXME: Move to a header file later +typedef unsigned long ULONG_PTR, *PULONG_PTR; #include <ntddscsi.h> #define OLYMPUS_CSW( pdev_EXT, staTUS ) \ Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c Sat Aug 19 01:00:43 2006 @@ -484,7 +484,7 @@ while( IsListEmpty( &ptd->ptde->vert_link ) == FALSE ) { - pthis = RemoveHeadList( &ptd->ptde->vert_link ) + pthis = RemoveHeadList( &ptd->ptde->vert_link ); ptofree = ( ( PTD_EXTENSION)pthis )->ptd; free_td( pool_list, ptofree ); } Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c Sat Aug 19 01:00:43 2006 @@ -26,9 +26,18 @@ #include "umss.h" #include "usb.h" #include "hub.h" -#include "storage\inc\srb.h" -#include "storage\inc\ntddscsi.h" -#include "storage\inc\scsi.h" + +// ULONG_PTR defining hack, to use ntddsci.h from reactos +// plus hack for __field_ecount for a new WDK +//FIXME: Move to a header file later +typedef unsigned long ULONG_PTR, *PULONG_PTR; +#ifndef __field_ecount +# define __field_ecount(x) +#endif + +#include <srb.h> +#include <ntddscsi.h> +#include <scsi.h> #define UMSS_EXIT_DISPATCH( dev_OBJ, staTUS, iRp ) \ {\

1 0

[fireball] 23602: Import "USB Driver stack project for Windows NT 4.0" by Zhiming/Woodhead (mypublic99@yahoo.com). It supports UHCI/EHCI controllers. Don't expect it to compile with ReactOS build environment. I intend to do some work on it, and use this place to keep my changes, before it's suitable for ReactOS. "I would like to see it useful for ReactOS" (c) woodhead
by fireball＠svn.reactos.org 18 Aug '06

18 Aug '06

Author: fireball Date: Sat Aug 19 00:37:55 2006 New Revision: 23602 URL: http://svn.reactos.org/svn/reactos?rev=23602&view=rev Log: Import "USB Driver stack project for Windows NT 4.0" by Zhiming/Woodhead (mypublic99(a)yahoo.com). It supports UHCI/EHCI controllers. Don't expect it to compile with ReactOS build environment. I intend to do some work on it, and use this place to keep my changes, before it's suitable for ReactOS. "I would like to see it useful for ReactOS" (c) woodhead Added: trunk/reactos/drivers/usb/nt4compat/ trunk/reactos/drivers/usb/nt4compat/directory.rbuild (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/ trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/debug.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.rc (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/hcd.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/uhciver.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild (with props) trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rc (with props) Modified: trunk/reactos/drivers/usb/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… Added: trunk/reactos/drivers/usb/nt4compat/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/dire… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/bulkonly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/cbi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/compdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/dmgrdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/etd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/gendrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/hcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/td.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhciver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/umss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… Added: trunk/reactos/drivers/usb/nt4compat/usbdriver/usbdriver.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd…

1 0

[greatlrd] 23601: fixed msvs build
by greatlrd＠svn.reactos.org 18 Aug '06

18 Aug '06

Author: greatlrd Date: Fri Aug 18 13:15:26 2006 New Revision: 23601 URL: http://svn.reactos.org/svn/reactos?rev=23601&view=rev Log: fixed msvs build Modified: trunk/reactos/dll/cpl/access/access.def Modified: trunk/reactos/dll/cpl/access/access.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/access.def?… ============================================================================== --- trunk/reactos/dll/cpl/access/access.def (original) +++ trunk/reactos/dll/cpl/access/access.def Fri Aug 18 13:15:26 2006 @@ -1,6 +1,6 @@ LIBRARY access.cpl EXPORTS -CPlApplet@16 +CPlApplet ; EOF

1 0

[greatlrd] 23600: fixed to error that was show in msvs when it compiles
by greatlrd＠svn.reactos.org 18 Aug '06

18 Aug '06

Author: greatlrd Date: Fri Aug 18 13:06:28 2006 New Revision: 23600 URL: http://svn.reactos.org/svn/reactos?rev=23600&view=rev Log: fixed to error that was show in msvs when it compiles Modified: trunk/reactos/regtests/winetests/msvcrt/cpp.c Modified: trunk/reactos/regtests/winetests/msvcrt/cpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/cpp.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/cpp.c Fri Aug 18 13:06:28 2006 @@ -126,7 +126,7 @@ /* Emulate a __thiscall */ #ifdef _MSC_VER -inline static void* do_call_func1(void *func, void *_this) +_inline static void* do_call_func1(void *func, void *_this) { volatile void* retval = 0; __asm @@ -140,7 +140,7 @@ return (void*)retval; } -inline static void* do_call_func2(void *func, void *_this, void* arg) +_inline static void* do_call_func2(void *func, void *_this, void* arg) { volatile void* retval = 0; __asm

1 0

[turner] 23599: minor grammatical / wording fixes. bug 1747
by turner＠svn.reactos.org 18 Aug '06

18 Aug '06

Author: turner Date: Fri Aug 18 05:51:44 2006 New Revision: 23599 URL: http://svn.reactos.org/svn/reactos?rev=23599&view=rev Log: minor grammatical / wording fixes. bug 1747 Modified: trunk/reactos/dll/win32/msgina/En.rc Modified: trunk/reactos/dll/win32/msgina/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/En.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/En.rc (original) +++ trunk/reactos/dll/win32/msgina/En.rc Fri Aug 18 05:51:44 2006 @@ -48,9 +48,9 @@ STRINGTABLE BEGIN IDS_LOGGEDOUTSAS "Welcome!" - IDS_LOCKEDSAS "The computer is currently locked" - IDS_PRESSCTRLALTDELETE "Press CONTROL+ALT+DELETE key combination" + IDS_LOCKEDSAS "The computer is currently locked." + IDS_PRESSCTRLALTDELETE "Press Control+Alt+Delete to Logon." IDS_ASKFORUSER "User name: " IDS_ASKFORPASSWORD "Password: " - IDS_FORCELOGOFF "This will close the the session of the current user, and loose all his unsaved work. Continue?" + IDS_FORCELOGOFF "This will log out the current user and lose all unsaved data. Continue?" END

1 0

[gedmurphy] 23598: don't read the 0000 key. stops the annoying 'Missing NetCfgInstanceId Entry' message box when running in Windows.
by gedmurphy＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: gedmurphy Date: Fri Aug 18 00:23:10 2006 New Revision: 23598 URL: http://svn.reactos.org/svn/reactos?rev=23598&view=rev Log: don't read the 0000 key. stops the annoying 'Missing NetCfgInstanceId Entry' message box when running in Windows. Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c Modified: trunk/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.c?rev=23… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/ncpa.c (original) +++ trunk/reactos/dll/cpl/ncpa/ncpa.c Fri Aug 18 00:23:10 2006 @@ -94,7 +94,7 @@ return; } - for(i=0;;i++) + for(i=1;;i++) { TCHAR pszNewPath[MAX_PATH]; ret = RegEnumKeyEx(hKey,i,tpszName,&dwNameLen,NULL,NULL,NULL,NULL);

1 0

[gedmurphy] 23597: match up taskmgr with current icon theme
by gedmurphy＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: gedmurphy Date: Thu Aug 17 23:11:17 2006 New Revision: 23597 URL: http://svn.reactos.org/svn/reactos?rev=23597&view=rev Log: match up taskmgr with current icon theme Modified: trunk/reactos/base/applications/taskmgr/res/taskmgr.ico Modified: trunk/reactos/base/applications/taskmgr/res/taskmgr.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== Binary files - no diff available.

1 0

[gedmurphy] 23596: Don't allow ws2_32 access to apps with bad setup data (commit correct version this time)
by gedmurphy＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: gedmurphy Date: Thu Aug 17 20:48:36 2006 New Revision: 23596 URL: http://svn.reactos.org/svn/reactos?rev=23596&view=rev Log: Don't allow ws2_32 access to apps with bad setup data (commit correct version this time) Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h (original) +++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h Thu Aug 17 20:48:36 2006 @@ -28,6 +28,7 @@ #define EXPORT STDCALL +extern HINSTANCE g_hInstDll; extern HANDLE GlobalHeap; extern BOOL WsaInitialized; /* TRUE if WSAStartup() has been successfully called */ extern WSPUPCALLTABLE UpcallTable; Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Thu Aug 17 20:48:36 2006 @@ -27,7 +27,7 @@ /* To make the linker happy */ VOID STDCALL KeBugCheck (ULONG BugCheckCode) {} - +HINSTANCE g_hInstDll; HANDLE GlobalHeap; BOOL WsaInitialized = FALSE; /* TRUE if WSAStartup() has been successfully called */ WSPUPCALLTABLE UpcallTable; @@ -86,8 +86,8 @@ if (lpWSAData == NULL) return WSAEFAULT; - Low = LOWBYTE(wVersionRequested); - High = HIGHBYTE(wVersionRequested); + Low = LOBYTE(wVersionRequested); + High = HIBYTE(wVersionRequested); if (Low < 1) { @@ -841,6 +841,8 @@ { GlobalHeap = GetProcessHeap(); + g_hInstDll = hInstDll; + CreateCatalog(); InitProviderHandleTable();

1 0

[gedmurphy] 23595: Don't allow ws2_32 access to apps with bad setup data
by gedmurphy＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: gedmurphy Date: Thu Aug 17 20:44:54 2006 New Revision: 23595 URL: http://svn.reactos.org/svn/reactos?rev=23595&view=rev Log: Don't allow ws2_32 access to apps with bad setup data Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Thu Aug 17 20:44:54 2006 @@ -76,15 +76,61 @@ WSAStartup(IN WORD wVersionRequested, OUT LPWSADATA lpWSAData) { + BYTE Low, High; + WS_DbgPrint(MAX_TRACE, ("WSAStartup of ws2_32.dll\n")); + if (!g_hInstDll) + return WSASYSNOTREADY; + + if (lpWSAData == NULL) + return WSAEFAULT; + + Low = LOWBYTE(wVersionRequested); + High = HIGHBYTE(wVersionRequested); + + if (Low < 1) + { + WS_DbgPrint(MAX_TRACE, ("Bad winsock version requested, %d,%d", Low, High)); + return WSAVERNOTSUPPORTED; + } + + if (Low == 1) + { + if (High == 0) + { + lpWSAData->wVersion = wVersionRequested; + } + else + { + lpWSAData->wVersion = MAKEWORD(1, 1); + } + } + else if (Low == 2) + { + if (High <= 2) + { + lpWSAData->wVersion = MAKEWORD(2, High); + } + else + { + lpWSAData->wVersion = MAKEWORD(2, 2); + } + } + else + { + lpWSAData->wVersion = MAKEWORD(2, 2); + } + lpWSAData->wVersion = wVersionRequested; - lpWSAData->wHighVersion = 2; - lstrcpyA(lpWSAData->szDescription, "WinSock 2.0"); + lpWSAData->wHighVersion = MAKEWORD(2,2); + lstrcpyA(lpWSAData->szDescription, "WinSock 2.2"); lstrcpyA(lpWSAData->szSystemStatus, "Running"); lpWSAData->iMaxSockets = 0; lpWSAData->iMaxUdpDg = 0; lpWSAData->lpVendorInfo = NULL; + + /*FIXME: increment internal counter */ WSASETINITIALIZED;

1 0

[ion] 23594: - Fix CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK and CMP_ASSERT_REGISTRY_LOCK - Create cmutil.c and add registry lock routines in it, as well as CmpAllocateDelayItem and CmpFreeDelayItem (move them out from cmkcbncb.c) - Implement CmpCompareCompressedName.
by ion＠svn.reactos.org 17 Aug '06

17 Aug '06

Author: ion Date: Thu Aug 17 05:54:33 2006 New Revision: 23594 URL: http://svn.reactos.org/svn/reactos?rev=23594&view=rev Log: - Fix CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK and CMP_ASSERT_REGISTRY_LOCK - Create cmutil.c and add registry lock routines in it, as well as CmpAllocateDelayItem and CmpFreeDelayItem (move them out from cmkcbncb.c) - Implement CmpCompareCompressedName. Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm.h Thu Aug 17 05:54:33 2006 @@ -569,12 +569,24 @@ ); // -// Registry Locking Functions +// Registry Utility Functions // BOOLEAN NTAPI CmpTestRegistryLockExclusive( VOID +); + +PVOID +NTAPI +CmpAllocateDelayItem( + VOID +); + +VOID +NTAPI +CmpFreeDelayItem( + PVOID Entry ); // @@ -588,8 +600,22 @@ ); // +// Name Functions +// +LONG +NTAPI +CmpCompareCompressedName( + IN PUNICODE_STRING SearchName, + IN PWCHAR CompressedName, + IN ULONG NameLength +); + +// // Global variables accessible from all of Cm // +extern BOOLEAN CmpSpecialBootCondition; +extern BOOLEAN CmpFlushOnLockRelease; + // // Inlined functions Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cm_x.h Thu Aug 17 05:54:33 2006 @@ -41,14 +41,14 @@ // // Makes sure that the registry is locked // -#define CMP_ASSERT_REGISTRY_LOCK \ +#define CMP_ASSERT_REGISTRY_LOCK() \ ASSERT((CmpSpecialBootCondition == TRUE) || \ (CmpTestRegistryLock() == TRUE)) // // Makes sure that the registry is exclusively locked // -#define CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK \ +#define CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK() \ ASSERT((CmpSpecialBootCondition == TRUE) || \ (CmpTestRegistryLockExclusive() == TRUE)) Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cminfo.txt Thu Aug 17 05:54:33 2006 @@ -107,6 +107,8 @@ paths. cmobject.c - Contains the implementation of the key object that is exported to the Object Manager. +cmutil.c - Contains utility functions such as the registry lock and delayed + item allocation and de-allocation routines. ntapi.c - Contains the Nt APIs exported to drivers and user-mode, which wrap around other internal APIs in this module (mostly cmapi.c). Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmkcbncb.c Thu Aug 17 05:54:33 2006 @@ -17,15 +17,14 @@ ULONG CmpHashTableSize; PCM_KEY_HASH_TABLE_ENTRY *CmpCacheTable; PCM_NAME_HASH_TABLE_ENTRY *CmpNameCacheTable; +LIST_ENTRY CmpFreeKCBListHead; BOOLEAN CmpAllocInited; -KGUARDED_MUTEX CmpAllocBucketLock, CmpDelayAllocBucketLock; -LIST_ENTRY CmpFreeKCBListHead; +KGUARDED_MUTEX CmpAllocBucketLock; ULONG CmpDelayedCloseSize; ULONG CmpDelayedCloseElements; KGUARDED_MUTEX CmpDelayedCloseTableLock; BOOLEAN CmpDelayCloseWorkItemActive; LIST_ENTRY CmpDelayedLRUListHead; -LIST_ENTRY CmpFreeDelayItemsListHead; ULONG CmpDelayCloseIntervalInSeconds = 5; KDPC CmpDelayCloseDpc; KTIMER CmpDelayCloseTimer; @@ -201,6 +200,9 @@ /* Go to the next hash */ HashEntry = HashEntry->NextHash; } + + /* Return the NCB found */ + return Ncb; } BOOLEAN @@ -320,46 +322,6 @@ /* Release the lock */ CmpReleaseNcbLock(Ncb); -} - -VOID -NTAPI -CmpFreeDelayItem(PVOID Entry) -{ - PCM_DELAYED_CLOSE_ENTRY AllocEntry = (PCM_DELAYED_CLOSE_ENTRY)Entry; - PCM_DELAYED_CLOSE_ENTRY *AllocTable; - PCM_ALLOC_PAGE AllocPage; - ULONG i; - PAGED_CODE(); - - /* Lock the table */ - KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - - /* Add the entry at the end */ - InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->DelayedLRUList); - - /* Get the alloc page */ - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - ASSERT(AllocPage->FreeCount != CM_DELAYS_PER_PAGE); - - /* Increase the number of free items */ - if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) - { - /* Page is totally free now, loop each entry */ - AllocTable = (PCM_DELAYED_CLOSE_ENTRY*)&AllocPage->AllocPage; - for (i = CM_DELAYS_PER_PAGE; i; i--) - { - /* Get the entry and unlink it */ - AllocEntry = AllocTable[i]; - RemoveEntryList(&AllocEntry->DelayedLRUList); - } - - /* Now free the page */ - ExFreePool(AllocPage); - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); } VOID @@ -487,58 +449,6 @@ /* Return success */ return TRUE; -} - -// FIXME: THIS FUNCTION IS PARTIALLY FUCKED -PVOID -NTAPI -CmpAllocateDelayItem(VOID) -{ - PCM_DELAYED_CLOSE_ENTRY Entry; - PCM_ALLOC_PAGE AllocPage; - ULONG i; - PLIST_ENTRY NextEntry; - PAGED_CODE(); - - /* Lock the allocation buckets */ - KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); - if (TRUE) - { - /* Allocate an allocation page */ - AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); - if (AllocPage) - { - /* Set default entries */ - AllocPage->FreeCount = CM_DELAYS_PER_PAGE; - - /* Loop each entry */ - for (i = 0; i < CM_DELAYS_PER_PAGE; i++) - { - /* Get this entry and link it */ - Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); - InsertHeadList(&Entry->DelayedLRUList, - &CmpFreeDelayItemsListHead); - } - } - - /* Get the entry and the alloc page */ - Entry = CONTAINING_RECORD(NextEntry, - CM_DELAYED_CLOSE_ENTRY, - DelayedLRUList); - AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); - - /* Decrease free entries */ - ASSERT(AllocPage->FreeCount != 0); - AllocPage->FreeCount--; - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; - } - - /* Release the lock */ - KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); - return Entry; } VOID Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c (original) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmname.c Thu Aug 17 05:54:33 2006 @@ -14,3 +14,37 @@ /* FUNCTIONS *****************************************************************/ +LONG +NTAPI +CmpCompareCompressedName(IN PUNICODE_STRING SearchName, + IN PWCHAR CompressedName, + IN ULONG NameLength) +{ + WCHAR *p, *pp; + WCHAR p1, p2; + USHORT SearchLength; + LONG Result; + + /* Set the pointers and length and then loop */ + p = SearchName->Buffer; + pp = CompressedName; + SearchLength = (SearchName->Length / sizeof(WCHAR)); + while (SearchLength && NameLength) + { + /* Get the characters */ + p1 = *p++; + p2 = *pp++; + + /* See if they match and return result if they don't */ + Result = (LONG)RtlUpcaseUnicodeChar(p1) - + (LONG)RtlUpcaseUnicodeChar(p2); + if (Result) return Result; + + /* Next chars */ + SearchLength--; + NameLength--; + } + + /* Return the difference directly */ + return SearchLength - NameLength; +} Added: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c URL: http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c (added) +++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmutil.c Thu Aug 17 05:54:33 2006 @@ -1,0 +1,167 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/cm/cmapi.c + * PURPOSE: Internal routines that implement Nt* API functionality + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +ERESOURCE CmpRegistryLock; +PVOID CmpRegistryLockCallerCaller, CmpRegistryLockCaller; +BOOLEAN CmpFlushStarveWriters; + +KGUARDED_MUTEX CmpDelayAllocBucketLock; +LIST_ENTRY CmpFreeDelayItemsListHead; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CmpLockRegistryExclusive(VOID) +{ + /* Enter a critical region and lock the registry */ + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + + /* Sanity check */ + ASSERT(CmpFlushStarveWriters == 0); + RtlGetCallersAddress(&CmpRegistryLockCaller, &CmpRegistryLockCallerCaller); +} + +BOOLEAN +NTAPI +CmpTestRegistryLock(VOID) +{ + /* Test the lock */ + return (BOOLEAN)ExIsResourceAcquiredSharedLite(&CmpRegistryLock); +} + +BOOLEAN +NTAPI +CmpTestRegistryLockExclusive(VOID) +{ + /* Test the lock */ + return ExIsResourceAcquiredExclusiveLite(&CmpRegistryLock); +} + +// FIXME: THIS FUNCTION IS PARTIALLY FUCKED +PVOID +NTAPI +CmpAllocateDelayItem(VOID) +{ + PCM_DELAYED_CLOSE_ENTRY Entry; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PLIST_ENTRY NextEntry; + PAGED_CODE(); + + /* Lock the allocation buckets */ + KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); + if (TRUE) + { + /* Allocate an allocation page */ + AllocPage = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, TAG_CM); + if (AllocPage) + { + /* Set default entries */ + AllocPage->FreeCount = CM_DELAYS_PER_PAGE; + + /* Loop each entry */ + for (i = 0; i < CM_DELAYS_PER_PAGE; i++) + { + /* Get this entry and link it */ + Entry = (PCM_DELAYED_CLOSE_ENTRY)(&AllocPage[i]); + InsertHeadList(&Entry->DelayedLRUList, + &CmpFreeDelayItemsListHead); + } + } + + /* Get the entry and the alloc page */ + Entry = CONTAINING_RECORD(NextEntry, + CM_DELAYED_CLOSE_ENTRY, + DelayedLRUList); + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + + /* Decrease free entries */ + ASSERT(AllocPage->FreeCount != 0); + AllocPage->FreeCount--; + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); + return Entry; +} + + +VOID +NTAPI +CmpFreeDelayItem(PVOID Entry) +{ + PCM_DELAYED_CLOSE_ENTRY AllocEntry = (PCM_DELAYED_CLOSE_ENTRY)Entry; + PCM_DELAYED_CLOSE_ENTRY *AllocTable; + PCM_ALLOC_PAGE AllocPage; + ULONG i; + PAGED_CODE(); + + /* Lock the table */ + KeAcquireGuardedMutex(&CmpDelayAllocBucketLock); + + /* Add the entry at the end */ + InsertTailList(&CmpFreeDelayItemsListHead, &AllocEntry->DelayedLRUList); + + /* Get the alloc page */ + AllocPage = (PCM_ALLOC_PAGE)((ULONG_PTR)Entry & 0xFFFFF000); + ASSERT(AllocPage->FreeCount != CM_DELAYS_PER_PAGE); + + /* Increase the number of free items */ + if (++AllocPage->FreeCount == CM_DELAYS_PER_PAGE) + { + /* Page is totally free now, loop each entry */ + AllocTable = (PCM_DELAYED_CLOSE_ENTRY*)&AllocPage->AllocPage; + for (i = CM_DELAYS_PER_PAGE; i; i--) + { + /* Get the entry and unlink it */ + AllocEntry = AllocTable[i]; + RemoveEntryList(&AllocEntry->DelayedLRUList); + } + + /* Now free the page */ + ExFreePool(AllocPage); + } + + /* Release the lock */ + KeReleaseGuardedMutex(&CmpDelayAllocBucketLock); +} + +VOID +NTAPI +CmpUnlockRegistry(VOID) +{ + /* Sanity check */ + CMP_ASSERT_REGISTRY_LOCK(); + + /* Check if we should flush the registry */ + if (CmpFlushOnLockRelease) + { + /* The registry should be exclusively locked for this */ + CMP_ASSERT_EXCLUSIVE_REGISTRY_LOCK(); + + /* Flush the registry */ + CmpFlushEntireRegistry(TRUE); + CmpFlushOnLockRelease = FALSE; + } + + /* Release the lock and leave the critical region */ + ExReleaseResourceLite(&CmpRegistryLock); + KeLeaveCriticalRegion(); +}

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