Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 22688: * auto select items which are started automatically * read disabled autostart items
by janderwald＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: janderwald Date: Thu Jun 29 17:33:59 2006 New Revision: 22688 URL: http://svn.reactos.org/svn/reactos?rev=22688&view=rev Log: * auto select items which are started automatically * read disabled autostart items Modified: trunk/reactos/base/applications/msconfig/precomp.h trunk/reactos/base/applications/msconfig/startuppage.c Modified: trunk/reactos/base/applications/msconfig/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/precomp.h (original) +++ trunk/reactos/base/applications/msconfig/precomp.h Thu Jun 29 17:33:59 2006 @@ -3,6 +3,7 @@ #include <commctrl.h> #include <winuser.h> #include <tchar.h> +#include <stdio.h> #include "resource.h" #include "msconfig.h" Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c Thu Jun 29 17:33:59 2006 @@ -14,6 +14,7 @@ HWND hStartupDialog; void GetAutostartEntriesFromRegistry ( HKEY hRootKey, TCHAR* KeyName ); +void GetDisabledAutostartEntriesFromRegistry (); INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) @@ -59,6 +60,9 @@ GetAutostartEntriesFromRegistry(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); GetAutostartEntriesFromRegistry(HKEY_CURRENT_USER, _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run")); + GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupreg")); + GetDisabledAutostartEntriesFromRegistry (_T("SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\startupfolder")); + //FIXME: What about HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\Userinit //FIXME: Common Startup (startmenu) @@ -66,6 +70,83 @@ } return 0; +} + + + void +GetDisabledAutostartEntriesFromRegistry (TCHAR * szBasePath) +{ + HKEY hKey, hSubKey; + DWORD Index, SubIndex, dwValues, dwSubValues, retVal; + DWORD dwValueLength, dwDataLength = MAX_VALUE_NAME; + LV_ITEM item; + TCHAR* Data; + TCHAR szValueName[MAX_KEY_LENGTH]; + TCHAR szSubValueName[MAX_KEY_LENGTH]; + TCHAR szSubPath[MAX_KEY_LENGTH]; + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, szBasePath, 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &hKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hKey, NULL, NULL, NULL, &dwValues, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + for (Index = 0, retVal = ERROR_SUCCESS; Index < dwValues; Index++) + { + dwValueLength = MAX_KEY_LENGTH; + dwDataLength = MAX_VALUE_NAME; + Data = (TCHAR*) HeapAlloc(GetProcessHeap(), 0, MAX_VALUE_NAME * sizeof(TCHAR)); + if (Data == NULL) + break; + + retVal = RegEnumKeyEx(hKey, Index, szValueName, &dwValueLength, NULL, NULL, NULL, NULL); + _stprintf(szSubPath, _T("%s\\%s"), szBasePath, szValueName); + memset(&item, 0, sizeof(LV_ITEM)); + item.mask = LVIF_TEXT; + item.iImage = 0; + item.pszText = szValueName; + item.iItem = ListView_GetItemCount(hStartupListCtrl); + item.lParam = 0; + (void)ListView_InsertItem(hStartupListCtrl, &item); + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, szSubPath, 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &hSubKey) == ERROR_SUCCESS) + { + if (RegQueryInfoKey(hSubKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwSubValues, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + for(SubIndex = 0; SubIndex < dwSubValues; SubIndex++) + { + dwValueLength = MAX_KEY_LENGTH; + dwDataLength = MAX_VALUE_NAME; + if(RegEnumValue(hSubKey, SubIndex, szSubValueName, &dwValueLength, NULL, NULL, (LPBYTE)Data, &dwDataLength) == ERROR_SUCCESS) + { + if (!_tcscmp(szSubValueName, _T("command"))) + { + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); + item.pszText = Data; + item.iSubItem = 1; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (!_tcscmp(szSubValueName, _T("key")) || !_tcscmp(szSubValueName, _T("location"))) + { + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); + item.pszText = Data; + item.iSubItem = 2; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (!_tcscmp(szSubValueName, _T("item"))) + { + GetLongPathName(Data, Data, (DWORD) _tcsclen(Data)); + item.pszText = Data; + item.iSubItem = 0; + SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + } + } + } + } + RegCloseKey(hSubKey); + HeapFree(GetProcessHeap(), 0, Data); + } + } + RegCloseKey(hKey); + } } void @@ -100,6 +181,7 @@ item.iItem = ListView_GetItemCount(hStartupListCtrl); item.lParam = 0; (void)ListView_InsertItem(hStartupListCtrl, &item); + ListView_SetCheckState(hStartupListCtrl, item.iItem, TRUE); if (dwType == REG_SZ) {

1 0

[arty] 22687: Added method call interface, mmu translation methods.
by arty＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: arty Date: Thu Jun 29 15:07:46 2006 New Revision: 22687 URL: http://svn.reactos.org/svn/reactos?rev=22687&view=rev Log: Added method call interface, mmu translation methods. Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Modified: branches/powerpc/reactos/tools/ofw_interface/calls.ofw URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/calls.ofw (original) +++ branches/powerpc/reactos/tools/ofw_interface/calls.ofw Thu Jun 29 15:07:46 2006 @@ -14,12 +14,12 @@ claim 3 1 int int int int # release (virt size --) release 2 0 int int -# map (plo phi virt size mode --) -map 5 0 int int int int int -unmap 2 0 int int -modify 3 0 int int int -translate 4 1 int int int int int +# Declare the call-method BE function ++call-method 0 0 # Convenience functions that interact closely with OFW (written in BE asm) -dumpregs 0 0 -print_string 1 0 char* -print_number 1 0 int +# MMU Methods +@phys2virt!translate 4 1 int int int int&0 int +@virt2phys!translate 2 1 int int&1 int Modified: branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ofw_inter… ============================================================================== --- branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp (original) +++ branches/powerpc/reactos/tools/ofw_interface/ofw_interface.cpp Thu Jun 29 15:07:46 2006 @@ -7,7 +7,7 @@ class ofw_wrappers { public: - int base, ctindex; + int base, ctindex, method_ctindex; std::string functions; std::string names; std::string calltable; @@ -15,6 +15,49 @@ std::string of_call; }; +class vartype { +public: + vartype( const std::string &typestr ) { + size_t amp = typestr.find('&'); + size_t col = typestr.find(':'); + if( amp != std::string::npos ) { + if( col > amp && col != std::string::npos ) + lit_value = typestr.substr(amp+1,col-amp+1); + else lit_value = typestr.substr(amp+1); + } + if( col != std::string::npos ) { + if( amp > col && amp != std::string::npos ) + len = typestr.substr(col+1,amp-col+1); + else len = typestr.substr(col+1); + } + + if( amp != std::string::npos && amp < col ) col = amp; + if( col == std::string::npos ) col = typestr.size(); + c_type = typestr.substr(0,col); + } + + vartype( const vartype &other ) + : c_type(other.c_type), + len(other.len), + lit_value(other.lit_value) { + } + + vartype &operator = ( const vartype &other ) { + c_type = other.c_type; + len = other.len; + lit_value = other.lit_value; + return *this; + } + + bool need_swap() const { + return c_type.find('*') != std::string::npos; + } + + std::string c_type; + std::string len; + std::string lit_value; +}; + std::string uppercase( const std::string &toucase ) { std::vector<char> ucase_work(toucase.size()); for( size_t i = 0; i < toucase.size(); i++ ) { @@ -37,45 +80,57 @@ return (x + (factor - 1)) & ~(factor - 1); } -std::string c_type( const std::string &intype ) { - size_t colon = intype.find(':'); - if( colon != std::string::npos ) return intype.substr(0,colon); - else if( intype.size() ) return intype; - else return "void"; -} - -std::string have_len( const std::string &intype ) { - size_t colon = intype.find(':'); - if( colon != std::string::npos ) return intype.substr(colon+1); - else return ""; -} - -bool need_swap( const std::string &intype ) { - return intype.find('*') != std::string::npos; -} - void populate_definition( ofw_wrappers &wrapper, const std::string &line ) { std::istringstream iss(line); - bool make_function = true; - std::string name, argtype, rettype, c_rettype; - std::vector<std::string> argtypes; - int args, rets, i, local_offset, total_stack; + bool make_function = true, method_call = false, make_stub = true, comma; + std::string name, nametext, argtype, rettype; + std::vector<vartype> argtypes; + int args, rets, i, local_offset, total_stack, userarg_start = 0; + size_t f; std::ostringstream function, ct_csource, le_stub, of_call; iss >> name >> args >> rets; if( !name.size() ) return; + + if( (f = name.find('!')) != std::string::npos ) { + nametext = name.substr(f+1); + name = name.substr(0,f); + } if( name[0] == '-' ) { name = name.substr(1); make_function = false; } + if( name[0] == '+' ) { + name = name.substr(1); + make_stub = false; + } + if( name[0] == '@' ) { + name = name.substr(1); + method_call = true; + make_function = false; + } + + if( !nametext.size() ) nametext = name; + + for( i = 1; i < (int)name.size(); i++ ) + if( name[i] == '-' ) name[i] = '_'; + + if( nametext == "call-method" ) + wrapper.method_ctindex = wrapper.ctindex; for( i = 0; i < args; i++ ) { iss >> argtype; - argtypes.push_back(argtype); + argtypes.push_back(vartype(argtype)); + } + + if( method_call ) { + userarg_start = 1; + args += 2; } iss >> rettype; + if( !rettype.size() ) rettype = "void"; local_offset = (3 + rets + args) * 4; total_stack = round_up(12 + local_offset, 16); @@ -118,25 +173,42 @@ << "\taddi %r1,%r1," << total_stack << "\n" << "\tblr\n"; - c_rettype = c_type(rettype); - - le_stub << c_rettype << " ofw_" << name << "("; - for( i = 0; i < args; i++ ) { - if( i ) le_stub << ","; - le_stub << c_type(argtypes[i]) << " arg" << i; + if( method_call ) { + argtypes.insert(argtypes.begin(),vartype("int")); + argtypes.insert(argtypes.begin(),vartype("char*")); + } + + le_stub << rettype << " ofw_" << name << "("; + + comma = false; + for( i = userarg_start; i < args; i++ ) { + if( !argtypes[i].lit_value.size() ) { + if( !comma ) comma = true; else le_stub << ","; + le_stub << argtypes[i].c_type << " arg" << i; + } } le_stub << ")"; of_call << le_stub.str() << ";\n"; le_stub << " {\n"; - if( c_rettype != "void" ) - le_stub << "\t" << c_rettype << " ret;\n"; + if( rettype != "void" ) + le_stub << "\t" << rettype << " ret;\n"; + + if( method_call ) { + le_stub << "\tchar arg0[" + << round_up(nametext.size()+1,8) + << "] = \"" << nametext << "\";\n"; + } for( i = 0; i < args; i++ ) { - if( need_swap(argtypes[i]) ) { + if( argtypes[i].lit_value.size() ) { + le_stub << "\t" << argtypes[i].c_type << " arg" << i << " = " + << argtypes[i].lit_value << ";\n"; + } + if( argtypes[i].need_swap() ) { le_stub << "\tint len" << i << " = "; - if( have_len(argtypes[i]).size() ) - le_stub << have_len(argtypes[i]) << ";\n"; + if( argtypes[i].len.size() ) + le_stub << argtypes[i].len << ";\n"; else { le_stub << "strlen(arg" << i << ");\n"; } @@ -148,11 +220,12 @@ } le_stub << "\t"; - if( c_rettype != "void" ) le_stub << "ret = (" << c_rettype << ")"; - - le_stub << "ofproxy(" << (wrapper.ctindex * 4); + if( rettype != "void" ) le_stub << "ret = (" << rettype << ")"; + + le_stub << "ofproxy(" << + (method_call ? (wrapper.method_ctindex * 4) : (wrapper.ctindex * 4)); - for( i = 0; i < 5; i++ ) { + for( i = 0; i < 6; i++ ) { if( i < args ) le_stub << ",(void *)arg" << i; else le_stub << ",NULL"; } @@ -160,7 +233,7 @@ le_stub << ");\n"; for( i = args-1; i >= 0; i-- ) { - if( need_swap(argtypes[i]) ) { + if( argtypes[i].need_swap() ) { le_stub << "\tle_swap(" << "arg" << i << "," << "arg" << i << "+len" << i << "," @@ -168,17 +241,21 @@ } } - if( c_rettype != "void" ) + if( rettype != "void" ) le_stub << "\treturn ret;\n"; le_stub << "}\n"; if( make_function ) wrapper.functions += function.str(); - wrapper.le_stubs += le_stub.str(); - wrapper.of_call += of_call.str(); - wrapper.names += name + "_ofw_name:\n\t.asciz \"" + name + "\"\n"; - wrapper.calltable += std::string("\t.long ofw_") + name + "\n"; - wrapper.ctindex++; + if( make_stub ) { + wrapper.le_stubs += le_stub.str(); + wrapper.of_call += of_call.str(); + } + if( !method_call ) { + wrapper.names += name + "_ofw_name:\n\t.asciz \"" + nametext + "\"\n"; + wrapper.calltable += std::string("\t.long ofw_") + name + "\n"; + wrapper.ctindex++; + } } int main( int argc, char **argv ) { @@ -239,7 +316,7 @@ << "\t.long 0\n" << "\n/* Function Wrappers */\n\n" << wrappers.functions - << "\t/* Function Names */\n\n" + << "\n/* Function Names */\n\n" << wrappers.names << "\n/* Function Call Table for Freeldr */\n\n" << "ofw_functions:\n"

1 0

[ion] 22686: - Cleanup the checks for mishbeaving objects a bit, and now quit the Dereference routine instead of doing the dereference. This has the advantage making console applications work again (note: this is NOT a fix. I'm just making the situation less bad until I fix ObDuplicateObject since that seems to be messing Events up, and until Cm gets fixed).
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Thu Jun 29 09:20:16 2006 New Revision: 22686 URL: http://svn.reactos.org/svn/reactos?rev=22686&view=rev Log: - Cleanup the checks for mishbeaving objects a bit, and now quit the Dereference routine instead of doing the dereference. This has the advantage making console applications work again (note: this is NOT a fix. I'm just making the situation less bad until I fix ObDuplicateObject since that seems to be messing Events up, and until Cm gets fixed). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 09:20:16 2006 @@ -242,7 +242,7 @@ // // WE DONT CLOSE REGISTRY HANDLES BECAUSE CM IS BRAINDEAD // - DPRINT("NOT CLOSING THE KEY\n"); + DPRINT1("NOT CLOSING THE KEY\n"); } else { Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jun 29 09:20:16 2006 @@ -90,27 +90,18 @@ if (Header->PointerCount <= Header->HandleCount) { - if (!wcscmp(Header->Type->Name.Buffer, L"Event")) - { - //KEBUGCHECK(0); - } DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); + return; } /* Check whether the object can now be deleted. */ if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ - if (wcscmp(Header->Type->Name.Buffer, L"Key")) - { - if(Header->HandleCount) - { - DPRINT1("Unexpected misbehaving object: %wZ\n", &Header->Type->Name); - } - } - else - { - DPRINT1("Cm needs fixing!\n"); + if(Header->HandleCount) + { + DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); + return; } /* Check if we're at PASSIVE */

1 0

[ion] 22685: - This patch finally enables closing handles for real, when NtClose is called. This means that File handles, processes, and all other NT Objects finally die (no more "file in use" and unkillable processes). On the other hand, this makes the registry code unhappy and unravelled a bug in ObDuplicateObject. - Booting/installing still works, but the system will possibly be unstable. However I'm choosing to commit this because it shows correct Ob behavior and will allow Art to fix Cm's r
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Thu Jun 29 09:05:27 2006 New Revision: 22685 URL: http://svn.reactos.org/svn/reactos?rev=22685&view=rev Log: - This patch finally enables closing handles for real, when NtClose is called. This means that File handles, processes, and all other NT Objects finally die (no more "file in use" and unkillable processes). On the other hand, this makes the registry code unhappy and unravelled a bug in ObDuplicateObject. - Booting/installing still works, but the system will possibly be unstable. However I'm choosing to commit this because it shows correct Ob behavior and will allow Art to fix Cm's referencing properly. - Implement ObCheckObjectAccess and call it to perform access verification checks. - Properly create devices, processes and controllers with an extra reference count, so that when the code closes their handle they don't die. - Check for invalid uses of ObfDereferenceObject for our current debugging purposes. - Add SEH to NtQueryObject. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/controller.c trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu Jun 29 09:05:27 2006 @@ -214,7 +214,7 @@ ); // -// Security descriptor cache functions +// Security functions // NTSTATUS NTAPI @@ -245,6 +245,16 @@ NTAPI ObpDereferenceCachedSecurityDescriptor( IN PSECURITY_DESCRIPTOR SecurityDescriptor +); + +BOOLEAN +NTAPI +ObCheckObjectAccess( + IN PVOID Object, + IN OUT PACCESS_STATE AccessState, + IN BOOLEAN Unknown, + IN KPROCESSOR_MODE AccessMode, + OUT PNTSTATUS ReturnedStatus ); // Modified: trunk/reactos/ntoskrnl/io/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/controller.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/controller.c (original) +++ trunk/reactos/ntoskrnl/io/controller.c Thu Jun 29 09:05:27 2006 @@ -100,8 +100,8 @@ Status = ObInsertObject(Controller, NULL, FILE_READ_DATA | FILE_WRITE_DATA, - 0, - NULL, + 1, + (PVOID*)&Controller, &Handle); if (!NT_SUCCESS(Status)) return NULL; Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Thu Jun 29 09:05:27 2006 @@ -566,8 +566,8 @@ Status = ObInsertObject(CreatedDeviceObject, NULL, FILE_READ_DATA | FILE_WRITE_DATA, - 0, - NULL, + 1, + (PVOID*)&CreatedDeviceObject, &TempHandle); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Thu Jun 29 09:05:27 2006 @@ -455,7 +455,7 @@ PreviousMode, (PVOID*)&Directory, NULL); - if(NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { /* FIXME: TODO. UNIMPLEMENTED */ Status = STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 29 09:05:27 2006 @@ -237,7 +237,17 @@ ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); /* Dereference the object as well */ - //ObDereferenceObject(Body); // FIXME: Needs sync changes in other code + if (!wcscmp(ObjectHeader->Type->Name.Buffer, L"Key")) + { + // + // WE DONT CLOSE REGISTRY HANDLES BECAUSE CM IS BRAINDEAD + // + DPRINT("NOT CLOSING THE KEY\n"); + } + else + { + ObDereferenceObject(Body); + } /* Return to caller */ OBTRACE(OB_HANDLE_DEBUG, @@ -310,20 +320,16 @@ /* Check if we're opening an existing handle */ if (OpenReason == ObOpenHandle) { - /* - * FIXME: Do validation as described in Chapter 8 - * of Windows Internals 4th. - */ -#if 0 + /* Validate the caller's access to this object */ if (!ObCheckObjectAccess(Object, AccessState, TRUE, AccessMode, &Status)) { + /* Access was denied, so fail */ return Status; } -#endif } else if (OpenReason == ObCreateHandle) { @@ -982,7 +988,14 @@ /* Check if making the handle inheritable */ if (SetHandleInfo->Information.Inherit) { - /* Set the flag. FIXME: Need to check if this is allowed */ + /* Check if inheriting is not supported for this object */ + if (ObjectHeader->Type->TypeInfo.InvalidAttributes & OBJ_INHERIT) + { + /* Fail without changing anything */ + return FALSE; + } + + /* Set the flag */ HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; } else @@ -1757,7 +1770,7 @@ Header->ObjectCreateInfo = NULL; /* Remove the extra keep-alive reference */ - if (Handle) ObDereferenceObject(Object); // FIXME: Needs sync changes + if (Handle) ObDereferenceObject(Object); /* Return */ OBTRACE(OB_HANDLE_DEBUG, Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Jun 29 09:05:27 2006 @@ -946,10 +946,32 @@ POBJECT_BASIC_INFORMATION BasicInfo; ULONG InfoLength; PVOID Object = NULL; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PAGED_CODE(); - /* FIXME: Needs SEH */ + /* Check if the caller is from user mode */ + if (PreviousMode != KernelMode) + { + /* Protect validation with SEH */ + _SEH_TRY + { + /* Probe the input structure */ + ProbeForWrite(ObjectInformation, Length, sizeof(UCHAR)); + + /* If we have a result length, probe it too */ + if (ResultLength) ProbeForWriteUlong(ResultLength); + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Fail if we raised an exception */ + if (!NT_SUCCESS(Status)) return Status; + } /* * Make sure this isn't a generic type query, since the caller doesn't @@ -1082,16 +1104,33 @@ /* Anything else */ default: + /* Fail it */ Status = STATUS_INVALID_INFO_CLASS; break; } - /* Derefernece the object if we had referenced it */ + /* Dereference the object if we had referenced it */ if (Object) ObDereferenceObject (Object); - /* Return the length and status */ - if (ResultLength) *ResultLength = InfoLength; + /* Check if the caller wanted the return length */ + if (ResultLength) + { + /* Protect the write to user mode */ + _SEH_TRY + { + /* Write the length */ + *ResultLength = Length; + } + _SEH_HANDLE + { + /* Otherwise, get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + /* Return status */ return Status; } Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jun 29 09:05:27 2006 @@ -88,11 +88,30 @@ /* Extract the object header */ Header = OBJECT_TO_OBJECT_HEADER(Object); + if (Header->PointerCount <= Header->HandleCount) + { + if (!wcscmp(Header->Type->Name.Buffer, L"Event")) + { + //KEBUGCHECK(0); + } + DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); + } + /* Check whether the object can now be deleted. */ if (!(InterlockedDecrement(&Header->PointerCount))) { /* Sanity check */ - ASSERT(!Header->HandleCount); + if (wcscmp(Header->Type->Name.Buffer, L"Key")) + { + if(Header->HandleCount) + { + DPRINT1("Unexpected misbehaving object: %wZ\n", &Header->Type->Name); + } + } + else + { + DPRINT1("Cm needs fixing!\n"); + } /* Check if we're at PASSIVE */ if (KeGetCurrentIrql() == PASSIVE_LEVEL) Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c Thu Jun 29 09:05:27 2006 @@ -15,7 +15,107 @@ #define TAG_SEC_QUERY TAG('O', 'b', 'S', 'q') -/* FUNCTIONS ***************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ + +/*++ +* @name ObCheckObjectAccess +* +* The ObAssignSecurity routine <FILLMEIN> +* +* @param Object +* <FILLMEIN> +* +* @param AccessState +* <FILLMEIN> +* +* @param Unknown +* <FILLMEIN> +* +* @param AccessMode +* <FILLMEIN> +* +* @param ReturnedStatus +* <FILLMEIN> +* +* @return TRUE if access was granted, FALSE otherwise. +* +* @remarks None. +* +*--*/ +BOOLEAN +NTAPI +ObCheckObjectAccess(IN PVOID Object, + IN OUT PACCESS_STATE AccessState, + IN BOOLEAN Unknown, + IN KPROCESSOR_MODE AccessMode, + OUT PNTSTATUS ReturnedStatus) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + BOOLEAN SdAllocated; + NTSTATUS Status; + BOOLEAN Result; + ACCESS_MASK GrantedAccess; + PPRIVILEGE_SET Privileges = NULL; + PAGED_CODE(); + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; + + /* Get security information */ + Status = ObGetObjectSecurity(Object, &SecurityDescriptor, &SdAllocated); + if (!NT_SUCCESS(Status)) + { + /* Return failure */ + *ReturnedStatus = Status; + return FALSE; + } + else if (!SecurityDescriptor) + { + /* Otherwise, if we don't actually have an SD, return success */ + *ReturnedStatus = Status; + return TRUE; + } + + /* Lock the security context */ + SeLockSubjectContext(&AccessState->SubjectSecurityContext); + + /* Now do the entire access check */ + Result = SeAccessCheck(SecurityDescriptor, + &AccessState->SubjectSecurityContext, + TRUE, + AccessState->RemainingDesiredAccess, + AccessState->PreviouslyGrantedAccess, + &Privileges, + &ObjectType->TypeInfo.GenericMapping, + AccessMode, + &GrantedAccess, + ReturnedStatus); + if (Privileges) + { + /* We got privileges, append them to teh access state and free them */ + Status = SeAppendPrivileges(AccessState, Privileges); + SeFreePrivileges(Privileges); + } + + /* Check if access was granted */ + if (Result) + { + /* Update the access state */ + AccessState->RemainingDesiredAccess &= ~(GrantedAccess | + MAXIMUM_ALLOWED); + AccessState->PreviouslyGrantedAccess |= GrantedAccess; + } + + /* We're done, unlock the context and release security */ + SeUnlockSubjectContext(&AccessState->SubjectSecurityContext); + ObReleaseObjectSecurity(SecurityDescriptor, SdAllocated); + return Result; +} + +/* PUBLIC FUNCTIONS **********************************************************/ /*++ * @name ObAssignSecurity Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jun 29 09:05:27 2006 @@ -423,8 +423,8 @@ Status = ObInsertObject(Process, NULL, DesiredAccess, - 0, - NULL, + 1, + (PVOID*)&Process, &hProcess); if (NT_SUCCESS(Status)) {

1 0

[arty] 22684: Fixed reference counting in CmiConnectHive and CmiDisconnectHive. No longer need hacks to check reference counts. Deleted a ton of wierd code. Fixed bug where we allocated uninitialized memory for child nodes we never populated. Now reference counting mirrors pointers exactly: - Hold one reference for the parent key pointer - Hold one reference for the list entry in the connected hive list
by arty＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: arty Date: Thu Jun 29 07:48:43 2006 New Revision: 22684 URL: http://svn.reactos.org/svn/reactos?rev=22684&view=rev Log: Fixed reference counting in CmiConnectHive and CmiDisconnectHive. No longer need hacks to check reference counts. Deleted a ton of wierd code. Fixed bug where we allocated uninitialized memory for child nodes we never populated. Now reference counting mirrors pointers exactly: - Hold one reference for the parent key pointer - Hold one reference for the list entry in the connected hive list Modified: trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/import.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=22684… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Thu Jun 29 07:48:43 2006 @@ -358,6 +358,9 @@ /* Time stamp for the last access by the parse routine */ ULONG TimeStamp; + + /* List entry for connected hives */ + LIST_ENTRY HiveList; } KEY_OBJECT, *PKEY_OBJECT; /* Bits 31-22 (top 10 bits) of the cell index is the directory index */ Modified: trunk/reactos/ntoskrnl/cm/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/import.c (original) +++ trunk/reactos/ntoskrnl/cm/import.c Thu Jun 29 07:48:43 2006 @@ -142,6 +142,8 @@ /* Acquire hive list lock exclusively */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); + + DPRINT1("Adding new hive\n"); /* Add the new hive to the hive list */ InsertTailList(&CmiHiveListHead, &Hive->HiveList); @@ -195,7 +197,6 @@ if (!NT_SUCCESS(Status)) { DPRINT1 ("CmiConnectHive(%wZ) failed (Status %lx)\n", &KeyName, Status); -// CmiRemoveRegistryHive(RegistryHive); return FALSE; } Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Thu Jun 29 07:48:43 2006 @@ -36,6 +36,7 @@ KTIMER CmiWorkerTimer; LIST_ENTRY CmiKeyObjectListHead; +LIST_ENTRY CmiConnectedHiveList; ULONG CmiTimer = 0; volatile BOOLEAN CmiHiveSyncEnabled = FALSE; @@ -385,6 +386,7 @@ /* Initialize the key object list */ InitializeListHead(&CmiKeyObjectListHead); + InitializeListHead(&CmiConnectedHiveList); /* Initialize the worker timer */ KeInitializeTimerEx(&CmiWorkerTimer, SynchronizationTimer); @@ -694,92 +696,94 @@ return Status; } - NTSTATUS CmiConnectHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, IN PREGISTRY_HIVE RegistryHive) { - UNICODE_STRING RemainingPath; - PKEY_OBJECT ParentKey; - PKEY_OBJECT NewKey; - NTSTATUS Status; - PWSTR SubName; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; - - DPRINT("CmiConnectHive(%p, %p) called.\n", - KeyObjectAttributes, RegistryHive); - - /* Capture all the info */ - DPRINT("Capturing Create Info\n"); - Status = ObpCaptureObjectAttributes(KeyObjectAttributes, - KernelMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) - { + UNICODE_STRING RemainingPath; + PKEY_OBJECT ParentKey; + PKEY_OBJECT NewKey; + NTSTATUS Status; + PWSTR SubName; + UNICODE_STRING ObjectName; + OBJECT_CREATE_INFORMATION ObjectCreateInfo; + + DPRINT("CmiConnectHive(%p, %p) called.\n", + KeyObjectAttributes, RegistryHive); + + /* Capture all the info */ + DPRINT("Capturing Create Info\n"); + Status = ObpCaptureObjectAttributes(KeyObjectAttributes, + KernelMode, + FALSE, + &ObjectCreateInfo, + &ObjectName); + + if (!NT_SUCCESS(Status)) + { DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); return Status; - } - - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&ParentKey, - &RemainingPath, - CmiKeyType, - NULL, - NULL); - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); - if (!NT_SUCCESS(Status)) - { - return Status; - } - - DPRINT ("RemainingPath %wZ\n", &RemainingPath); - - if ((RemainingPath.Buffer == NULL) || (RemainingPath.Buffer[0] == 0)) - { - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_COLLISION; - } - - /* Ignore leading backslash */ - SubName = RemainingPath.Buffer; - if (*SubName == L'\\') - SubName++; - - /* If RemainingPath contains \ we must return error - because CmiConnectHive() can not create trees */ - if (wcschr (SubName, L'\\') != NULL) - { - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - DPRINT("RemainingPath %wZ ParentKey %p\n", - &RemainingPath, ParentKey); - - Status = ObCreateObject(KernelMode, + } + + Status = CmFindObject(&ObjectCreateInfo, + &ObjectName, + (PVOID*)&ParentKey, + &RemainingPath, CmiKeyType, NULL, - KernelMode, - NULL, - sizeof(KEY_OBJECT), - 0, - 0, - (PVOID*)&NewKey); - - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ObCreateObject() failed (Status %lx)\n", Status); - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return Status; - } + NULL); + /* Yields a new reference */ + ObpReleaseCapturedAttributes(&ObjectCreateInfo); + + if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DPRINT ("RemainingPath %wZ\n", &RemainingPath); + + if ((RemainingPath.Buffer == NULL) || (RemainingPath.Buffer[0] == 0)) + { + ObDereferenceObject (ParentKey); + RtlFreeUnicodeString(&RemainingPath); + return STATUS_OBJECT_NAME_COLLISION; + } + + /* Ignore leading backslash */ + SubName = RemainingPath.Buffer; + if (*SubName == L'\\') + SubName++; + + /* If RemainingPath contains \ we must return error + because CmiConnectHive() can not create trees */ + if (wcschr (SubName, L'\\') != NULL) + { + ObDereferenceObject (ParentKey); + RtlFreeUnicodeString(&RemainingPath); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + DPRINT("RemainingPath %wZ ParentKey %p\n", + &RemainingPath, ParentKey); + + Status = ObCreateObject(KernelMode, + CmiKeyType, + NULL, + KernelMode, + NULL, + sizeof(KEY_OBJECT), + 0, + 0, + (PVOID*)&NewKey); + + if (!NT_SUCCESS(Status)) + { + DPRINT1 ("ObCreateObject() failed (Status %lx)\n", Status); + ObDereferenceObject (ParentKey); + RtlFreeUnicodeString(&RemainingPath); + return Status; + } DPRINT("Inserting Key into Object Tree\n"); Status = ObInsertObject((PVOID)NewKey, NULL, @@ -787,56 +791,42 @@ 0, NULL, NULL); -DPRINT("Status %x\n", Status); - NewKey->RegistryHive = RegistryHive; - NewKey->KeyCellOffset = RegistryHive->HiveHeader->RootKeyOffset; - NewKey->KeyCell = CmiGetCell (RegistryHive, NewKey->KeyCellOffset, NULL); - NewKey->Flags = 0; - NewKey->NumberOfSubKeys = 0; - InsertTailList(&CmiKeyObjectListHead, &NewKey->ListEntry); - if (NewKey->KeyCell->NumberOfSubKeys != 0) - { - NewKey->SubKeys = ExAllocatePool(NonPagedPool, - NewKey->KeyCell->NumberOfSubKeys * sizeof(ULONG)); - if (NewKey->SubKeys == NULL) - { - DPRINT("ExAllocatePool() failed\n"); - ObDereferenceObject (NewKey); - ObDereferenceObject (ParentKey); - RtlFreeUnicodeString(&RemainingPath); - return STATUS_INSUFFICIENT_RESOURCES; - } - } - else - { - NewKey->SubKeys = NULL; - } - - DPRINT ("SubName %S\n", SubName); - - Status = RtlpCreateUnicodeString(&NewKey->Name, - SubName, NonPagedPool); - RtlFreeUnicodeString(&RemainingPath); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); - if (NewKey->SubKeys != NULL) - { - ExFreePool (NewKey->SubKeys); - } - ObDereferenceObject (NewKey); - ObDereferenceObject (ParentKey); - return STATUS_INSUFFICIENT_RESOURCES; - } - - CmiAddKeyToList (ParentKey, NewKey); - ObDereferenceObject (ParentKey); - - VERIFY_KEY_OBJECT(NewKey); - - /* Note: Do not dereference NewKey here! */ - - return STATUS_SUCCESS; + DPRINT("Status %x\n", Status); + NewKey->RegistryHive = RegistryHive; + NewKey->KeyCellOffset = RegistryHive->HiveHeader->RootKeyOffset; + NewKey->KeyCell = CmiGetCell (RegistryHive, NewKey->KeyCellOffset, NULL); + NewKey->Flags = 0; + NewKey->NumberOfSubKeys = 0; + NewKey->SubKeys = NULL; + InsertTailList(&CmiKeyObjectListHead, &NewKey->ListEntry); + InsertTailList(&CmiConnectedHiveList, &NewKey->HiveList); + + DPRINT ("SubName %S\n", SubName); + + Status = RtlpCreateUnicodeString(&NewKey->Name, + SubName, NonPagedPool); + RtlFreeUnicodeString(&RemainingPath); + if (!NT_SUCCESS(Status)) + { + DPRINT1("RtlpCreateUnicodeString() failed (Status %lx)\n", Status); + if (NewKey->SubKeys != NULL) + { + ExFreePool (NewKey->SubKeys); + } + ObDereferenceObject (NewKey); + ObDereferenceObject (ParentKey); + return STATUS_INSUFFICIENT_RESOURCES; + } + + CmiAddKeyToList (ParentKey, NewKey); + + VERIFY_KEY_OBJECT(NewKey); + + /* We're holding a pointer to the parent key .. We must keep it + * referenced */ + /* Note: Do not dereference NewKey here! */ + + return STATUS_SUCCESS; } @@ -845,9 +835,8 @@ OUT PREGISTRY_HIVE *RegistryHive) { PKEY_OBJECT KeyObject; - PREGISTRY_HIVE Hive; HANDLE KeyHandle; - NTSTATUS Status; + NTSTATUS Status = STATUS_OBJECT_NAME_NOT_FOUND; PLIST_ENTRY CurrentEntry; PKEY_OBJECT CurrentKey; @@ -875,68 +864,47 @@ (PVOID*)&KeyObject, NULL); ZwClose (KeyHandle); + if (!NT_SUCCESS(Status)) { DPRINT1 ("ObReferenceObjectByName() failed (Status %lx)\n", Status); return Status; } DPRINT ("KeyObject %p Hive %p\n", KeyObject, KeyObject->RegistryHive); - - if (!(KeyObject->KeyCell->Flags & REG_KEY_ROOT_CELL)) - { - DPRINT1 ("Key is not the Hive-Root-Key\n"); - ObDereferenceObject (KeyObject); - return STATUS_INVALID_PARAMETER; - } /* Acquire registry lock exclusively */ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - CurrentEntry = CmiKeyObjectListHead.Flink; - while (CurrentEntry != &CmiKeyObjectListHead) - { - CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, ListEntry); - if (1 == ObGetObjectPointerCount(CurrentKey) && - !(CurrentKey->Flags & KO_MARKED_FOR_DELETE)) - { - ObDereferenceObject(CurrentKey); - CurrentEntry = CmiKeyObjectListHead.Flink; - } - else - { - CurrentEntry = CurrentEntry->Flink; - } + /* Find out if we represent a connected hive. */ + for( CurrentEntry = CmiConnectedHiveList.Flink; + CurrentEntry != &CmiConnectedHiveList; + CurrentEntry = CurrentEntry->Flink ) { + CurrentKey = CONTAINING_RECORD(CurrentEntry, KEY_OBJECT, HiveList); + if( CurrentKey == KeyObject ) { + /* Remove the connected hive from the connected hive list */ + RemoveEntryList(CurrentEntry); + /* found ourselves in the connected hive list */ + *RegistryHive = KeyObject->RegistryHive; + Status = STATUS_SUCCESS; + + /* Release references captured in CmiConnectHive */ + ObDereferenceObject (KeyObject->ParentKey); + ObDereferenceObject (KeyObject); + break; + } } - - if (ObGetObjectHandleCount (KeyObject) != 0 || - ObGetObjectPointerCount (KeyObject) != 2) - { - DPRINT1 ("Hive is still in use (hc %d, rc %d)\n", ObGetObjectHandleCount (KeyObject), ObGetObjectPointerCount (KeyObject)); - ObDereferenceObject (KeyObject); - - /* Release registry lock */ - ExReleaseResourceLite (&CmiRegistryLock); - KeLeaveCriticalRegion(); - - return STATUS_UNSUCCESSFUL; - } - - Hive = KeyObject->RegistryHive; - - /* Dereference KeyObject twice to delete it */ - ObDereferenceObject (KeyObject); - ObDereferenceObject (KeyObject); - - *RegistryHive = Hive; - + /* Release registry lock */ ExReleaseResourceLite (&CmiRegistryLock); KeLeaveCriticalRegion(); + /* Release reference above */ + ObDereferenceObject (KeyObject); + DPRINT ("CmiDisconnectHive() done\n"); - return STATUS_SUCCESS; + return Status; } Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu Jun 29 07:48:43 2006 @@ -462,7 +462,7 @@ ExReleaseResourceLite(&CmiRegistryLock); KeLeaveCriticalRegion(); - DPRINT("CmiObjectParse: %s\n", FoundObject->Name); + //DPRINT("CmiObjectParse: %s\n", FoundObject->Name); *Path = EndPtr; @@ -492,9 +492,9 @@ KeEnterCriticalRegion(); ExAcquireResourceExclusiveLite(&CmiRegistryLock, TRUE); - //if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) - { - // DPRINT1("Key not found in parent list ???\n"); + if (!NT_SUCCESS(CmiRemoveKeyFromList(KeyObject))) + { + DPRINT1("Key not found in parent list ???\n"); } RemoveEntryList(&KeyObject->ListEntry); @@ -526,7 +526,7 @@ if (KeyObject->NumberOfSubKeys) { - //KEBUGCHECK(REGISTRY_ERROR); + KEBUGCHECK(REGISTRY_ERROR); } if (KeyObject->SizeOfSubKeys)

1 0

[turner] 22683: expand %* to batch file params. bug: #1629
by turner＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: turner Date: Thu Jun 29 06:48:52 2006 New Revision: 22683 URL: http://svn.reactos.org/svn/reactos?rev=22683&view=rev Log: expand %* to batch file params. bug: #1629 Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jun 29 06:48:52 2006 @@ -272,6 +272,11 @@ bc->forvar = _T('\0'); bc->forproto = NULL; bc->params = BatchParams (firstword, param); + // + // Allocate enough memory to hold the params and copy them over without modifications + // + bc->raw_params = malloc(_tcslen(param)); + _tcscpy(bc->raw_params,param); #ifdef _DEBUG DebugPrintf (_T("Batch: returns TRUE\n")); Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h (original) +++ trunk/reactos/base/shell/cmd/batch.h Thu Jun 29 06:48:52 2006 @@ -15,6 +15,7 @@ HANDLE hBatchFile; LPTSTR forproto; LPTSTR params; + LPTSTR raw_params; /* Holds the raw params given by the input */ INT shiftlevel; BOOL bEcho; /* Preserve echo flag across batch calls */ HANDLE hFind; /* Preserve find handle when doing a for */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Jun 29 06:48:52 2006 @@ -1274,6 +1274,32 @@ if ( varNameLen ) *varNameLen = 2; return ret; + + case _T('*'): + if(bc == NULL) + { + // + // No batch file to see here, move along + // + if ( !GrowIfNecessary ( 3, &ret, &retlen ) ) + return NULL; + ret[0] = _T('%'); + ret[1] = _T('*'); + ret[2] = 0; + if ( varNameLen ) + *varNameLen = 2; + return ret; + } + + // + // Copy over the raw params(not including the batch file name + // + if ( !GrowIfNecessary ( _tcslen(bc->raw_params)+1, &ret, &retlen ) ) + return NULL; + if ( varNameLen ) + *varNameLen = 2; + _tcscpy ( ret, bc->raw_params ); + return ret; case _T('%'): if ( !GrowIfNecessary ( 2, &ret, &retlen ) )

1 0

[ion] 22682: - Add some hacks to Cm to allow creating registry keys that finish with a backslash (this works under NT). - Also add a REALLY nasty hack that forces OBJ_CASE_INSENSITIVE on all Registry APIs... this is needed because we seem to completely mess up case sensitivity otherwise and any user-mode caller that doesn't specify that flag will fail. - These two fixes fix all the WINE failures for the "ntdll reg" test and should increase compatibility with some applications. - Runtime Library
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Thu Jun 29 04:30:36 2006 New Revision: 22682 URL: http://svn.reactos.org/svn/reactos?rev=22682&view=rev Log: - Add some hacks to Cm to allow creating registry keys that finish with a backslash (this works under NT). - Also add a REALLY nasty hack that forces OBJ_CASE_INSENSITIVE on all Registry APIs... this is needed because we seem to completely mess up case sensitivity otherwise and any user-mode caller that doesn't specify that flag will fail. - These two fixes fix all the WINE failures for the "ntdll reg" test and should increase compatibility with some applications. - Runtime Library Registry Wrappers Fixes and Optimizations: - Use an array of registry paths instead of duplicating them - Fix implenmentation of RTL_REGISTRY_HANDLE. - Verify all Appends for failure before continuing. - Use the strict minimum key permissions isntead of KEY_ALL_ACCESS. - Don't use OBJ_OPENIF - Use CAPS for \\REGISTRY\\USER (required to match a Windows quirk exposed by a WINE test) - Use the correct length in RtlpNtQueryValueKey - Generic cleanups, formatting and commenting. Modified: trunk/reactos/lib/rtl/registry.c trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=226… ============================================================================== --- trunk/reactos/lib/rtl/registry.c (original) +++ trunk/reactos/lib/rtl/registry.c Thu Jun 29 04:30:36 2006 @@ -21,350 +21,541 @@ #define TAG_RTLREGISTRY TAG('R', 't', 'l', 'R') -/* FUNCTIONS ***************************************************************/ - -static NTSTATUS -RtlpGetRegistryHandle(ULONG RelativeTo, - PWSTR Path, - BOOLEAN Create, - PHANDLE KeyHandle) -{ - UNICODE_STRING KeyPath; - UNICODE_STRING KeyName; - WCHAR KeyBuffer[MAX_PATH]; - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - - DPRINT("RtlpGetRegistryHandle()\n"); - - if (RelativeTo & RTL_REGISTRY_HANDLE) - { - Status = ZwDuplicateObject(NtCurrentProcess(), - (HANDLE)Path, - NtCurrentProcess(), - KeyHandle, - 0, - 0, - DUPLICATE_SAME_ACCESS); -#ifndef NDEBUG - if(!NT_SUCCESS(Status)) - { - DPRINT("ZwDuplicateObject() failed! Status: 0x%x\n", Status); - } -#endif - - return(Status); - } - - if (RelativeTo & RTL_REGISTRY_OPTIONAL) - RelativeTo &= ~RTL_REGISTRY_OPTIONAL; - - if (RelativeTo >= RTL_REGISTRY_MAXIMUM) - { - DPRINT("Invalid relative flag, parameter invalid!\n"); - return(STATUS_INVALID_PARAMETER); - } - - KeyName.Length = 0; - KeyName.MaximumLength = sizeof(KeyBuffer); - KeyName.Buffer = KeyBuffer; - KeyBuffer[0] = 0; - - switch (RelativeTo) - { - case RTL_REGISTRY_ABSOLUTE: - /* nothing to prefix! */ - break; - - case RTL_REGISTRY_SERVICES: - RtlAppendUnicodeToString(&KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"); - break; - - case RTL_REGISTRY_CONTROL: - RtlAppendUnicodeToString(&KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\"); - break; - - case RTL_REGISTRY_WINDOWS_NT: - RtlAppendUnicodeToString(&KeyName, - L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\"); - break; - - case RTL_REGISTRY_DEVICEMAP: - RtlAppendUnicodeToString(&KeyName, - L"\\Registry\\Machine\\Hardware\\DeviceMap\\"); - break; - - case RTL_REGISTRY_USER: - Status = RtlFormatCurrentUserKeyPath (&KeyPath); - if (!NT_SUCCESS(Status)) - return(Status); - RtlAppendUnicodeStringToString (&KeyName, - &KeyPath); - RtlFreeUnicodeString (&KeyPath); - RtlAppendUnicodeToString (&KeyName, - L"\\"); - break; - } - - if (Path[0] == L'\\' && RelativeTo != RTL_REGISTRY_ABSOLUTE) - { - Path++; - } - RtlAppendUnicodeToString(&KeyName, - Path); - - DPRINT("KeyName %wZ\n", &KeyName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_OPENIF, - NULL, - NULL); - - if (Create) - { - Status = ZwCreateKey(KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - } - else - { - Status = ZwOpenKey(KeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - } - -#ifndef NDEBUG - if(!NT_SUCCESS(Status)) - { - DPRINT("%s failed! Status: 0x%x\n", (Create ? "ZwCreateKey" : "ZwOpenKey"), Status); - } -#endif - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI +/* DATA **********************************************************************/ + +PCWSTR RtlpRegPaths[RTL_REGISTRY_MAXIMUM] = +{ + NULL, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Services", + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control", + L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion", + L"\\Registry\\Machine\\Hardware\\DeviceMap", + L"\\Registry\\User\\.Default", +}; + +/* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +RtlpGetRegistryHandle(IN ULONG RelativeTo, + IN PCWSTR Path, + IN BOOLEAN Create, + IN PHANDLE KeyHandle) +{ + UNICODE_STRING KeyPath, KeyName; + WCHAR KeyBuffer[MAX_PATH]; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + + /* Check if we just want the handle */ + if (RelativeTo & RTL_REGISTRY_HANDLE) + { + *KeyHandle = (HANDLE)Path; + return STATUS_SUCCESS; + } + + /* Check for optional flag */ + if (RelativeTo & RTL_REGISTRY_OPTIONAL) + { + /* Mask it out */ + RelativeTo &= ~RTL_REGISTRY_OPTIONAL; + } + + /* Fail on invalid parameter */ + if (RelativeTo >= RTL_REGISTRY_MAXIMUM) return STATUS_INVALID_PARAMETER; + + /* Initialize the key name */ + RtlInitEmptyUnicodeString(&KeyName, KeyBuffer, sizeof(KeyBuffer)); + + /* Check if we have to lookup a path to prefix */ + if (RelativeTo != RTL_REGISTRY_ABSOLUTE) + { + /* Check if we need the current user key */ + if (RelativeTo == RTL_REGISTRY_USER) + { + /* Get the path */ + Status = RtlFormatCurrentUserKeyPath(&KeyPath); + if (!NT_SUCCESS(Status)) return(Status); + + /* Append it */ + Status = RtlAppendUnicodeStringToString(&KeyName, &KeyPath); + RtlFreeUnicodeString (&KeyPath); + } + else + { + /* Get one of the prefixes */ + Status = RtlAppendUnicodeToString(&KeyName, + RtlpRegPaths[RelativeTo]); + } + + /* Check for failure, otherwise, append the path separator */ + if (!NT_SUCCESS(Status)) return Status; + Status = RtlAppendUnicodeToString(&KeyName, L"\\"); + if (!NT_SUCCESS(Status)) return Status; + } + + /* And now append the path */ + if (Path[0] == L'\\' && RelativeTo != RTL_REGISTRY_ABSOLUTE) Path++; // HACK! + Status = RtlAppendUnicodeToString(&KeyName, Path); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + /* Check if we want to create it */ + if (Create) + { + /* Create the key with write privileges */ + Status = ZwCreateKey(KeyHandle, + GENERIC_WRITE, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + } + else + { + /* Otherwise, just open it with read access */ + Status = ZwOpenKey(KeyHandle, + MAXIMUM_ALLOWED | GENERIC_READ, + &ObjectAttributes); + } + + /* Return status */ + return Status; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI RtlCheckRegistryKey(IN ULONG RelativeTo, - IN PWSTR Path) -{ - HANDLE KeyHandle; - NTSTATUS Status; - - PAGED_CODE_RTL(); - - Status = RtlpGetRegistryHandle(RelativeTo, - Path, - FALSE, - &KeyHandle); - if (!NT_SUCCESS(Status)) - return(Status); - - ZwClose(KeyHandle); - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI + IN PWSTR Path) +{ + HANDLE KeyHandle; + NTSTATUS Status; + PAGED_CODE_RTL(); + + /* Call the helper */ + Status = RtlpGetRegistryHandle(RelativeTo, + Path, + FALSE, + &KeyHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* All went well, close the handle and return success */ + ZwClose(KeyHandle); + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI RtlCreateRegistryKey(IN ULONG RelativeTo, - IN PWSTR Path) -{ - HANDLE KeyHandle; - NTSTATUS Status; - - PAGED_CODE_RTL(); - - Status = RtlpGetRegistryHandle(RelativeTo, - Path, - TRUE, - &KeyHandle); - if (!NT_SUCCESS(Status)) - return(Status); - - ZwClose(KeyHandle); - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI + IN PWSTR Path) +{ + HANDLE KeyHandle; + NTSTATUS Status; + PAGED_CODE_RTL(); + + /* Call the helper */ + Status = RtlpGetRegistryHandle(RelativeTo, + Path, + TRUE, + &KeyHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* All went well, close the handle and return success */ + ZwClose(KeyHandle); + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI RtlDeleteRegistryValue(IN ULONG RelativeTo, - IN PCWSTR Path, - IN PCWSTR ValueName) -{ - HANDLE KeyHandle; - NTSTATUS Status; - UNICODE_STRING Name; - - PAGED_CODE_RTL(); - - Status = RtlpGetRegistryHandle(RelativeTo, - (PWSTR)Path, - FALSE, - &KeyHandle); - if (!NT_SUCCESS(Status)) - return(Status); - - RtlInitUnicodeString(&Name, - ValueName); - - Status = ZwDeleteValueKey(KeyHandle, - &Name); - - ZwClose(KeyHandle); - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlFormatCurrentUserKeyPath (OUT PUNICODE_STRING KeyPath) -{ - HANDLE TokenHandle; - UCHAR Buffer[256]; - PSID_AND_ATTRIBUTES SidBuffer; - ULONG Length; - UNICODE_STRING SidString; - NTSTATUS Status; - - PAGED_CODE_RTL(); - - DPRINT ("RtlFormatCurrentUserKeyPath() called\n"); - - Status = ZwOpenThreadToken (NtCurrentThread (), - TOKEN_QUERY, - TRUE, - &TokenHandle); - if (!NT_SUCCESS (Status)) - { - if (Status != STATUS_NO_TOKEN) - { - DPRINT1 ("ZwOpenThreadToken() failed (Status %lx)\n", Status); - return Status; - } - - Status = ZwOpenProcessToken (NtCurrentProcess (), - TOKEN_QUERY, - &TokenHandle); - if (!NT_SUCCESS (Status)) - { - DPRINT1 ("ZwOpenProcessToken() failed (Status %lx)\n", Status); - return Status; - } - } - - SidBuffer = (PSID_AND_ATTRIBUTES)Buffer; - Status = ZwQueryInformationToken (TokenHandle, - TokenUser, - (PVOID)SidBuffer, - 256, - &Length); - ZwClose (TokenHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("ZwQueryInformationToken() failed (Status %lx)\n", Status); - return Status; - } - - Status = RtlConvertSidToUnicodeString (&SidString, - SidBuffer[0].Sid, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("RtlConvertSidToUnicodeString() failed (Status %lx)\n", Status); - return Status; - } - - DPRINT ("SidString: '%wZ'\n", &SidString); - - Length = SidString.Length + sizeof(L"\\Registry\\User\\"); - DPRINT ("Length: %lu\n", Length); - - KeyPath->Length = 0; - KeyPath->MaximumLength = Length; - KeyPath->Buffer = RtlpAllocateStringMemory(KeyPath->MaximumLength, TAG_USTR); - if (KeyPath->Buffer == NULL) - { - DPRINT1 ("RtlpAllocateMemory() failed\n"); - RtlFreeUnicodeString (&SidString); - return STATUS_NO_TOKEN; - } - - RtlAppendUnicodeToString (KeyPath, - L"\\Registry\\User\\"); - RtlAppendUnicodeStringToString (KeyPath, - &SidString); - RtlFreeUnicodeString (&SidString); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS NTAPI + IN PCWSTR Path, + IN PCWSTR ValueName) +{ + HANDLE KeyHandle; + NTSTATUS Status; + UNICODE_STRING Name; + PAGED_CODE_RTL(); + + /* Call the helper */ + Status = RtlpGetRegistryHandle(RelativeTo, + Path, + TRUE, + &KeyHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the key name and delete it */ + RtlInitUnicodeString(&Name, ValueName); + Status = ZwDeleteValueKey(KeyHandle, &Name); + + /* All went well, close the handle and return status */ + ZwClose(KeyHandle); + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlWriteRegistryValue(IN ULONG RelativeTo, + IN PCWSTR Path, + IN PCWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength) +{ + HANDLE KeyHandle; + NTSTATUS Status; + UNICODE_STRING Name; + PAGED_CODE_RTL(); + + /* Call the helper */ + Status = RtlpGetRegistryHandle(RelativeTo, + Path, + TRUE, + &KeyHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the key name and set it */ + RtlInitUnicodeString(&Name, ValueName); + Status = ZwSetValueKey(KeyHandle, + &Name, + 0, + ValueType, + ValueData, + ValueLength); + + /* All went well, close the handle and return status */ + ZwClose(KeyHandle); + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI RtlOpenCurrentUser(IN ACCESS_MASK DesiredAccess, - OUT PHANDLE KeyHandle) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyPath; - NTSTATUS Status; - - PAGED_CODE_RTL(); - - Status = RtlFormatCurrentUserKeyPath(&KeyPath); - if (NT_SUCCESS(Status)) - { - InitializeObjectAttributes(&ObjectAttributes, - &KeyPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(KeyHandle, - DesiredAccess, - &ObjectAttributes); - RtlFreeUnicodeString(&KeyPath); - if (NT_SUCCESS(Status)) - { - return STATUS_SUCCESS; - } - } - - RtlInitUnicodeString (&KeyPath, - L"\\Registry\\User\\.Default"); - InitializeObjectAttributes(&ObjectAttributes, - &KeyPath, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = ZwOpenKey(KeyHandle, - DesiredAccess, - &ObjectAttributes); - - return Status; -} - + OUT PHANDLE KeyHandle) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyPath; + NTSTATUS Status; + PAGED_CODE_RTL(); + + /* Get the user key */ + Status = RtlFormatCurrentUserKeyPath(&KeyPath); + if (NT_SUCCESS(Status)) + { + /* Initialize the attributes and open it */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(KeyHandle, DesiredAccess, &ObjectAttributes); + + /* Free the path and return success if it worked */ + RtlFreeUnicodeString(&KeyPath); + if (NT_SUCCESS(Status)) return STATUS_SUCCESS; + } + + /* It didn't work, so use the default key */ + RtlInitUnicodeString(&KeyPath, RtlpRegPaths[RTL_REGISTRY_USER]); + InitializeObjectAttributes(&ObjectAttributes, + &KeyPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(KeyHandle, DesiredAccess, &ObjectAttributes); + + /* Return status */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlFormatCurrentUserKeyPath(OUT PUNICODE_STRING KeyPath) +{ + HANDLE TokenHandle; + UCHAR Buffer[256]; + PSID_AND_ATTRIBUTES SidBuffer; + ULONG Length; + UNICODE_STRING SidString; + NTSTATUS Status; + PAGED_CODE_RTL(); + + /* Open the thread token */ + Status = ZwOpenThreadToken(NtCurrentThread(), + TOKEN_QUERY, + TRUE, + &TokenHandle); + if (!NT_SUCCESS(Status)) + { + /* We failed, is it because we don't have a thread token? */ + if (Status != STATUS_NO_TOKEN) return Status; + + /* It is, so use the process token */ + Status = ZwOpenProcessToken(NtCurrentProcess(), + TOKEN_QUERY, + &TokenHandle); + if (!NT_SUCCESS(Status)) return Status; + } + + /* Now query the token information */ + SidBuffer = (PSID_AND_ATTRIBUTES)Buffer; + Status = ZwQueryInformationToken(TokenHandle, + TokenUser, + (PVOID)SidBuffer, + sizeof(Buffer), + &Length); + + /* Close the handle and handle failure */ + ZwClose(TokenHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Convert the SID */ + Status = RtlConvertSidToUnicodeString(&SidString, SidBuffer[0].Sid, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + /* Add the length of the prefix */ + Length = SidString.Length + sizeof(L"\\REGISTRY\\USER\\"); + + /* Initialize a string */ + RtlInitEmptyUnicodeString(KeyPath, + RtlpAllocateStringMemory(Length, TAG_USTR), + Length); + if (!KeyPath->Buffer) + { + /* Free the string and fail */ + RtlFreeUnicodeString(&SidString); + return STATUS_NO_MEMORY; + } + + /* Append the prefix and SID */ + RtlAppendUnicodeToString(KeyPath, L"\\REGISTRY\\USER\\"); + RtlAppendUnicodeStringToString(KeyPath, &SidString); + + /* Free the temporary string and return success */ + RtlFreeUnicodeString(&SidString); + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlpNtCreateKey(OUT HANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG TitleIndex, + IN PUNICODE_STRING Class, + OUT PULONG Disposition) +{ + /* Check if we have object attributes */ + if (ObjectAttributes) + { + /* Mask out the unsupported flags */ + ObjectAttributes->Attributes &= ~(OBJ_PERMANENT | OBJ_EXCLUSIVE); + } + + /* Create the key */ + return ZwCreateKey(KeyHandle, + DesiredAccess, + ObjectAttributes, + 0, + NULL, + 0, + Disposition); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlpNtEnumerateSubKey(IN HANDLE KeyHandle, + OUT PUNICODE_STRING SubKeyName, + IN ULONG Index, + IN ULONG Unused) +{ + PKEY_BASIC_INFORMATION KeyInfo = NULL; + ULONG BufferLength = 0; + ULONG ReturnedLength; + NTSTATUS Status; + + /* Check if we have a name */ + if (SubKeyName->MaximumLength) + { + /* Allocate a buffer for it */ + BufferLength = SubKeyName->MaximumLength + + sizeof(KEY_BASIC_INFORMATION); + KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (!KeyInfo) return STATUS_NO_MEMORY; + } + + /* Enumerate the key */ + Status = ZwEnumerateKey(KeyHandle, + Index, + KeyBasicInformation, + KeyInfo, + BufferLength, + &ReturnedLength); + if (NT_SUCCESS(Status)) + { + /* Check if the name fits */ + if (KeyInfo->NameLength <= SubKeyName->MaximumLength) + { + /* Set the length */ + SubKeyName->Length = KeyInfo->NameLength; + + /* Copy it */ + RtlMoveMemory(SubKeyName->Buffer, + KeyInfo->Name, + SubKeyName->Length); + } + else + { + /* Otherwise, we ran out of buffer space */ + Status = STATUS_BUFFER_OVERFLOW; + } + } + + /* Free the buffer and return status */ + if (KeyInfo) RtlFreeHeap(RtlGetProcessHeap(), 0, KeyInfo); + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlpNtMakeTemporaryKey(IN HANDLE KeyHandle) +{ + /* This just deletes the key */ + return ZwDeleteKey(KeyHandle); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlpNtOpenKey(OUT HANDLE KeyHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG Unused) +{ + /* Check if we have object attributes */ + if (ObjectAttributes) + { + /* Mask out the unsupported flags */ + ObjectAttributes->Attributes &= ~(OBJ_PERMANENT | OBJ_EXCLUSIVE); + } + + /* Open the key */ + return ZwOpenKey(KeyHandle, DesiredAccess, ObjectAttributes); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlpNtQueryValueKey(IN HANDLE KeyHandle, + OUT PULONG Type OPTIONAL, + OUT PVOID Data OPTIONAL, + IN OUT PULONG DataLength OPTIONAL, + IN ULONG Unused) +{ + PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; + UNICODE_STRING ValueName; + ULONG BufferLength = 0; + NTSTATUS Status; + + /* Clear the value name */ + RtlInitEmptyUnicodeString(&ValueName, NULL, 0); + + /* Check if we were already given a length */ + if (DataLength) BufferLength = *DataLength; + + /* Add the size of the structure */ + BufferLength += FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); + + /* Allocate memory for the value */ + ValueInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferLength); + if (!ValueInfo) return STATUS_NO_MEMORY; + + /* Query the value */ + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + ValueInfo, + BufferLength, + &BufferLength); + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + /* Return the length and type */ + if (DataLength) *DataLength = ValueInfo->DataLength; + if (Type) *Type = ValueInfo->Type; + } + + /* Check if the caller wanted data back, and we got it */ + if ((NT_SUCCESS(Status)) && (Data)) + { + /* Copy it */ + RtlMoveMemory(Data, ValueInfo->Data, ValueInfo->DataLength); + } + + /* Free the memory and return status */ + RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlpNtSetValueKey(IN HANDLE KeyHandle, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataLength) +{ + UNICODE_STRING ValueName; + + /* Set the value */ + RtlInitEmptyUnicodeString(&ValueName, NULL, 0); + return ZwSetValueKey(KeyHandle, + &ValueName, + 0, + Type, + Data, + DataLength); +} /* * @unimplemented @@ -869,234 +1060,4 @@ return(Status); } - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlWriteRegistryValue(IN ULONG RelativeTo, - IN PCWSTR Path, - IN PCWSTR ValueName, - IN ULONG ValueType, - IN PVOID ValueData, - IN ULONG ValueLength) -{ - HANDLE KeyHandle; - NTSTATUS Status; - UNICODE_STRING Name; - - PAGED_CODE_RTL(); - - Status = RtlpGetRegistryHandle(RelativeTo, - (PWSTR)Path, - TRUE, - &KeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlpGetRegistryHandle() failed! Status: 0x%lx\n", Status); - return(Status); - } - - RtlInitUnicodeString(&Name, - ValueName); - - Status = ZwSetValueKey(KeyHandle, - &Name, - 0, - ValueType, - ValueData, - ValueLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwSetValueKey() failed! Status: 0x%lx\n", Status); - } - - ZwClose(KeyHandle); - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlpNtCreateKey(OUT HANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Unused1, - OUT PULONG Disposition, - IN ULONG Unused2) -{ - if (ObjectAttributes != NULL) - ObjectAttributes->Attributes &= ~(OBJ_PERMANENT | OBJ_EXCLUSIVE); - - return(ZwCreateKey(KeyHandle, - DesiredAccess, - ObjectAttributes, - 0, - NULL, - 0, - Disposition)); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlpNtEnumerateSubKey(IN HANDLE KeyHandle, - OUT PUNICODE_STRING SubKeyName, - IN ULONG Index, - IN ULONG Unused) -{ - PKEY_BASIC_INFORMATION KeyInfo = NULL; - ULONG BufferLength = 0; - ULONG ReturnedLength; - NTSTATUS Status; - - if (SubKeyName->MaximumLength != 0) - { - BufferLength = SubKeyName->MaximumLength + - sizeof(KEY_BASIC_INFORMATION); - KeyInfo = RtlpAllocateMemory(BufferLength, TAG_RTLREGISTRY); - if (KeyInfo == NULL) - return(STATUS_NO_MEMORY); - } - - Status = ZwEnumerateKey(KeyHandle, - Index, - KeyBasicInformation, - KeyInfo, - BufferLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - if (KeyInfo->NameLength + sizeof(WCHAR) <= SubKeyName->MaximumLength) - { - memmove(SubKeyName->Buffer, - KeyInfo->Name, - KeyInfo->NameLength); - SubKeyName->Buffer[KeyInfo->NameLength / sizeof(WCHAR)] = 0; - SubKeyName->Length = KeyInfo->NameLength; - } - else - { - Status = STATUS_BUFFER_OVERFLOW; - } - } - - if (KeyInfo != NULL) - { - RtlpFreeMemory(KeyInfo, TAG_RTLREGISTRY); - } - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlpNtMakeTemporaryKey(IN HANDLE KeyHandle) -{ - return(ZwDeleteKey(KeyHandle)); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlpNtOpenKey(OUT HANDLE KeyHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG Unused) -{ - if (ObjectAttributes != NULL) - ObjectAttributes->Attributes &= ~(OBJ_PERMANENT | OBJ_EXCLUSIVE); - - return(ZwOpenKey(KeyHandle, - DesiredAccess, - ObjectAttributes)); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlpNtQueryValueKey(IN HANDLE KeyHandle, - OUT PULONG Type OPTIONAL, - OUT PVOID Data OPTIONAL, - IN OUT PULONG DataLength OPTIONAL, - IN ULONG Unused) -{ - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - UNICODE_STRING ValueName; - ULONG BufferLength; - ULONG ReturnedLength; - NTSTATUS Status; - - RtlInitUnicodeString(&ValueName, - NULL); - - BufferLength = sizeof(KEY_VALUE_PARTIAL_INFORMATION); - if (DataLength != NULL) - BufferLength = *DataLength; - - ValueInfo = RtlpAllocateMemory(BufferLength, TAG_RTLREGISTRY); - if (ValueInfo == NULL) - return(STATUS_NO_MEMORY); - - Status = ZwQueryValueKey(KeyHandle, - &ValueName, - KeyValuePartialInformation, - ValueInfo, - BufferLength, - &ReturnedLength); - if (NT_SUCCESS(Status)) - { - if (DataLength != NULL) - *DataLength = ValueInfo->DataLength; - - if (Type != NULL) - *Type = ValueInfo->Type; - - if (Data != NULL) - { - memmove(Data, - ValueInfo->Data, - ValueInfo->DataLength); - } - } - - RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); - - return(Status); -} - - -/* - * @implemented - */ -NTSTATUS NTAPI -RtlpNtSetValueKey(IN HANDLE KeyHandle, - IN ULONG Type, - IN PVOID Data, - IN ULONG DataLength) -{ - UNICODE_STRING ValueName; - - RtlInitUnicodeString(&ValueName, - NULL); - return(ZwSetValueKey(KeyHandle, - &ValueName, - 0, - Type, - Data, - DataLength)); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu Jun 29 04:30:36 2006 @@ -411,13 +411,26 @@ because NtCreateKey doesn't create trees */ Start = RemainingPath.Buffer; if (*Start == L'\\') + { Start++; + //RemainingPath.Length -= sizeof(WCHAR); + //RemainingPath.MaximumLength -= sizeof(WCHAR); + //RemainingPath.Buffer++; + //DPRINT1("String: %wZ\n", &RemainingPath); + } + + if (RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] == '\\') + { + RemainingPath.Buffer[(RemainingPath.Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; + RemainingPath.Length -= sizeof(WCHAR); + RemainingPath.MaximumLength -= sizeof(WCHAR); + } for (i = 1; i < RemainingPath.Length / sizeof(WCHAR); i++) { if (L'\\' == RemainingPath.Buffer[i]) { - DPRINT("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); + DPRINT1("NtCreateKey() doesn't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = STATUS_OBJECT_NAME_NOT_FOUND; @@ -1395,6 +1408,13 @@ { return Status; } + } + + if (ObjectAttributes->ObjectName->Buffer[(ObjectAttributes->ObjectName->Length / sizeof(WCHAR)) - 1] == '\\') + { + ObjectAttributes->ObjectName->Buffer[(ObjectAttributes->ObjectName->Length / sizeof(WCHAR)) - 1] = UNICODE_NULL; + ObjectAttributes->ObjectName->Length -= sizeof(WCHAR); + ObjectAttributes->ObjectName->MaximumLength -= sizeof(WCHAR); } /* WINE checks for the length also */ Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Thu Jun 29 04:30:36 2006 @@ -110,6 +110,7 @@ Attributes = ObjectCreateInfo->Attributes; if (ObjectType == ObSymbolicLinkType) Attributes |= OBJ_OPENLINK; + Attributes |= OBJ_CASE_INSENSITIVE; // hello! My name is ReactOS CM and I'm brain-dead! while (TRUE) {

1 0

[arty] 22681: Claim a workspace using openfirmware.
by arty＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: arty Date: Thu Jun 29 02:55:52 2006 New Revision: 22681 URL: http://svn.reactos.org/svn/reactos?rev=22681&view=rev Log: Claim a workspace using openfirmware. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Thu Jun 29 02:55:52 2006 @@ -20,6 +20,8 @@ #include "machine.h" #include "of.h" +#define TOTAL_HEAP_NEEDED (16 * 1024 * 1024) /* 16 megs */ + extern void BootMain( char * ); extern char *GetFreeLoaderVersionString(); of_proxy ofproxy; @@ -162,24 +164,38 @@ VOID PpcVideoPrepareForReactOS() { printf( "PrepareForReactOS\n"); } -/* XXX FIXME: - * According to the linux people (this is backed up by my own experience), - * the memory object in older ofw does not do getprop right. - * - * The "right" way is to probe the pci bridge. *sigh* +/* + * Get memory the proper openfirmware way */ ULONG PpcGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap, ULONG MaxMemoryMapSize ) { - printf("GetMemoryMap(chosen=%x)\n", chosen_package); - - BiosMemoryMap[0].Type = MEMTYPE_USABLE; - BiosMemoryMap[0].BaseAddress = 0; - BiosMemoryMap[0].Length = 32 * 1024 * 1024; /* Assume 32 meg for now */ - - printf( "Returning memory map (%dk total)\n", - (int)BiosMemoryMap[0].Length / 1024 ); - - return 1; + int i, memhandle, returned, total = 0, num_mem = 0; + int memdata[256]; + + ofw_getprop(chosen_package, "memory", + (char *)&memhandle, sizeof(memhandle)); + returned = ofw_getprop(memhandle, "available", + (char *)memdata, sizeof(memdata)); + + /* We need to leave some for open firmware. Let's claim up to 16 megs + * for now */ + + for( i = 0; i < returned / sizeof(int) && !num_mem; i += 2 ) { + BiosMemoryMap[num_mem].Type = MEMTYPE_USABLE; + BiosMemoryMap[num_mem].BaseAddress = memdata[i]; + BiosMemoryMap[num_mem].Length = memdata[i+1]; + if( BiosMemoryMap[num_mem].Length >= TOTAL_HEAP_NEEDED ) { + BiosMemoryMap[num_mem].Length = TOTAL_HEAP_NEEDED; + ofw_claim(BiosMemoryMap[num_mem].BaseAddress, + BiosMemoryMap[num_mem].Length, 0x1000); /* claim it */ + total += BiosMemoryMap[0].Length; + num_mem++; + } + } + + printf( "Returning memory map (%dk total)\n", total / 1024 ); + + return num_mem; } /* Strategy: @@ -284,27 +300,15 @@ chosen_package = ofw_finddevice( "/chosen" ); - ofw_print_string("Chosen package: "); - ofw_print_number(chosen_package); - ofw_print_string("\n"); - ofw_getprop( chosen_package, "stdin", (char *)&stdin_handle, sizeof(stdin_handle) ); - ofw_print_string("ofw_getprop done\n"); - /* stdin_handle = REV(stdin_handle); */ - - ofw_print_string("Populating MachVtbl: "); - ofw_print_number((int)&MachVtbl); - ofw_print_string("\n"); MachVtbl.ConsPutChar = PpcPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; MachVtbl.ConsGetCh = PpcConsGetCh; - ofw_print_string("About to do printf\n"); - printf( "stdin_handle is %x\n", stdin_handle ); MachVtbl.VideoClearScreen = PpcVideoClearScreen;

1 0

[arty] 22680: Fixed actual bug in freeldr printf. Probably used to depend on a bug in _itoa, which was later made compliant. I'm guessing that this went unnoticed because nobody used freeldr's printf very often.
by arty＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: arty Date: Thu Jun 29 02:26:04 2006 New Revision: 22680 URL: http://svn.reactos.org/svn/reactos?rev=22680&view=rev Log: Fixed actual bug in freeldr printf. Probably used to depend on a bug in _itoa, which was later made compliant. I'm guessing that this went unnoticed because nobody used freeldr's printf very often. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/ui/tui.c Modified: branches/powerpc/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/ui/tui.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/ui/tui.c Thu Jun 29 02:26:04 2006 @@ -22,6 +22,8 @@ PVOID TextVideoBuffer = NULL; extern BOOLEAN UiDrawTime; extern BOOLEAN UiMinimal; +extern void ofw_print_string(const char *); +extern void ofw_print_number(int x); /* * printf() - prints formatted text to stdout @@ -43,19 +45,20 @@ { switch (c = *(format++)) { - case 'd': case 'u': case 'x': - if (c == 'x') - *_itoa(va_arg(ap, unsigned long), str, 16) = 0; - else - *_itoa(va_arg(ap, unsigned long), str, 10) = 0; + case 'd': case 'u': case 'x': { + unsigned long x = va_arg(ap, unsigned long); + if (c == 'x') + _itoa(x, str, 16); + else + _itoa(x, str, 10); ptr = str; while (*ptr) { - MachConsPutChar(*(ptr++)); + MachConsPutChar(*(ptr++)); } - break; + } break; case 'c': MachConsPutChar((va_arg(ap,int))&0xff); break;

1 0

[ion] 22679: - Sync RtlBitmap* implementation with WINE: Fixes 278 regression failures (for a total of 0 now). - Also adds implementations for RtlFindMostSignificantBit , RtlFindLeastSignificantBit, RtlFindNextForwardRunClear, RtlFindClearRuns. - The RtlBitmap* package is essential for compatibility with NTFS.SYS and other File System Drivers, but these fixes should not really improve user-mode app. compat.
by ion＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: ion Date: Thu Jun 29 00:51:51 2006 New Revision: 22679 URL: http://svn.reactos.org/svn/reactos?rev=22679&view=rev Log: - Sync RtlBitmap* implementation with WINE: Fixes 278 regression failures (for a total of 0 now). - Also adds implementations for RtlFindMostSignificantBit , RtlFindLeastSignificantBit, RtlFindNextForwardRunClear, RtlFindClearRuns. - The RtlBitmap* package is essential for compatibility with NTFS.SYS and other File System Drivers, but these fixes should not really improve user-mode app. compat. Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=22679… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c (original) +++ trunk/reactos/lib/rtl/bitmap.c Thu Jun 29 00:51:51 2006 @@ -12,64 +12,347 @@ #define NDEBUG #include <debug.h> - /* MACROS *******************************************************************/ -#define MASK(Count, Shift) \ - ((Count) == 32 ? 0xFFFFFFFF : ~(0xFFFFFFFF << (Count)) << (Shift)) - +/* Bits set from LSB to MSB; used as mask for runs < 8 bits */ +static const BYTE NTDLL_maskBits[8] = { 0, 1, 3, 7, 15, 31, 63, 127 }; + +/* Number of set bits for each value of a nibble; used for counting */ +static const BYTE NTDLL_nibbleBitCount[16] = { + 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 +}; + +/* First set bit in a nibble; used for determining least significant bit */ +static const BYTE NTDLL_leastSignificant[16] = { + 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 +}; + +/* Last set bit in a nibble; used for determining most significant bit */ +static const signed char NTDLL_mostSignificant[16] = { + -1, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3 +}; + +/* PRIVATE FUNCTIONS *********************************************************/ + +static +int +NTDLL_RunSortFn(const void *lhs, + const void *rhs) +{ + if (((const RTL_BITMAP_RUN*)lhs)->NumberOfBits > ((const RTL_BITMAP_RUN*)rhs)->NumberOfBits) + return -1; + return 1; +} + +static +ULONG +WINAPI +NTDLL_FindRuns(PRTL_BITMAP lpBits, + PRTL_BITMAP_RUN lpSeries, + ULONG ulCount, + BOOLEAN bLongest, + ULONG (*fn)(PRTL_BITMAP,ULONG,PULONG)) +{ + BOOL bNeedSort = ulCount > 1 ? TRUE : FALSE; + ULONG ulPos = 0, ulRuns = 0; + + if (!ulCount) + return ~0U; + + while (ulPos < lpBits->SizeOfBitMap) + { + /* Find next set/clear run */ + ULONG ulSize, ulNextPos = fn(lpBits, ulPos, &ulSize); + + if (ulNextPos == ~0U) + break; + + if (bLongest && ulRuns == ulCount) + { + /* Sort runs with shortest at end, if they are out of order */ + if (bNeedSort) + qsort(lpSeries, ulRuns, sizeof(RTL_BITMAP_RUN), NTDLL_RunSortFn); + + /* Replace last run if this one is bigger */ + if (ulSize > lpSeries[ulRuns - 1].NumberOfBits) + { + lpSeries[ulRuns - 1].StartingIndex = ulNextPos; + lpSeries[ulRuns - 1].NumberOfBits = ulSize; + + /* We need to re-sort the array, _if_ we didn't leave it sorted */ + if (ulRuns > 1 && ulSize > lpSeries[ulRuns - 2].NumberOfBits) + bNeedSort = TRUE; + } + } + else + { + /* Append to found runs */ + lpSeries[ulRuns].StartingIndex = ulNextPos; + lpSeries[ulRuns].NumberOfBits = ulSize; + ulRuns++; + + if (!bLongest && ulRuns == ulCount) + break; + } + ulPos = ulNextPos + ulSize; + } + return ulRuns; +} + +static +ULONG +NTDLL_FindSetRun(PRTL_BITMAP lpBits, + ULONG ulStart, + PULONG lpSize) +{ + LPBYTE lpOut; + ULONG ulFoundAt = 0, ulCount = 0; + + /* FIXME: It might be more efficient/cleaner to manipulate four bytes + * at a time. But beware of the pointer arithmetics... + */ + lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u); + + while (1) + { + /* Check bits in first byte */ + const BYTE bMask = (0xff << (ulStart & 7)) & 0xff; + const BYTE bFirst = *lpOut & bMask; + + if (bFirst) + { + /* Have a set bit in first byte */ + if (bFirst != bMask) + { + /* Not every bit is set */ + ULONG ulOffset; + + if (bFirst & 0x0f) + ulOffset = NTDLL_leastSignificant[bFirst & 0x0f]; + else + ulOffset = 4 + NTDLL_leastSignificant[bFirst >> 4]; + ulStart += ulOffset; + ulFoundAt = ulStart; + for (;ulOffset < 8; ulOffset++) + { + if (!(bFirst & (1 << ulOffset))) + { + *lpSize = ulCount; + return ulFoundAt; /* Set from start, but not until the end */ + } + ulCount++; + ulStart++; + } + /* Set to the end - go on to count further bits */ + lpOut++; + break; + } + /* every bit from start until the end of the byte is set */ + ulFoundAt = ulStart; + ulCount = 8 - (ulStart & 7); + ulStart = (ulStart & ~7u) + 8; + lpOut++; + break; + } + ulStart = (ulStart & ~7u) + 8; + lpOut++; + if (ulStart >= lpBits->SizeOfBitMap) + return ~0U; + } + + /* Count blocks of 8 set bits */ + while (*lpOut == 0xff) + { + ulCount += 8; + ulStart += 8; + if (ulStart >= lpBits->SizeOfBitMap) + { + *lpSize = ulCount - (ulStart - lpBits->SizeOfBitMap); + return ulFoundAt; + } + lpOut++; + } + + /* Count remaining contiguous bits, if any */ + if (*lpOut & 1) + { + ULONG ulOffset = 0; + + for (;ulOffset < 7u; ulOffset++) + { + if (!(*lpOut & (1 << ulOffset))) + break; + ulCount++; + } + } + *lpSize = ulCount; + return ulFoundAt; +} + +static +ULONG +NTDLL_FindClearRun(PRTL_BITMAP lpBits, + ULONG ulStart, + PULONG lpSize) +{ + LPBYTE lpOut; + ULONG ulFoundAt = 0, ulCount = 0; + + /* FIXME: It might be more efficient/cleaner to manipulate four bytes + * at a time. But beware of the pointer arithmetics... + */ + lpOut = ((BYTE*)lpBits->Buffer) + (ulStart >> 3u); + + while (1) + { + /* Check bits in first byte */ + const BYTE bMask = (0xff << (ulStart & 7)) & 0xff; + const BYTE bFirst = (~*lpOut) & bMask; + + if (bFirst) + { + /* Have a clear bit in first byte */ + if (bFirst != bMask) + { + /* Not every bit is clear */ + ULONG ulOffset; + + if (bFirst & 0x0f) + ulOffset = NTDLL_leastSignificant[bFirst & 0x0f]; + else + ulOffset = 4 + NTDLL_leastSignificant[bFirst >> 4]; + ulStart += ulOffset; + ulFoundAt = ulStart; + for (;ulOffset < 8; ulOffset++) + { + if (!(bFirst & (1 << ulOffset))) + { + *lpSize = ulCount; + return ulFoundAt; /* Clear from start, but not until the end */ + } + ulCount++; + ulStart++; + } + /* Clear to the end - go on to count further bits */ + lpOut++; + break; + } + /* Every bit from start until the end of the byte is clear */ + ulFoundAt = ulStart; + ulCount = 8 - (ulStart & 7); + ulStart = (ulStart & ~7u) + 8; + lpOut++; + break; + } + ulStart = (ulStart & ~7u) + 8; + lpOut++; + if (ulStart >= lpBits->SizeOfBitMap) + return ~0U; + } + + /* Count blocks of 8 clear bits */ + while (!*lpOut) + { + ulCount += 8; + ulStart += 8; + if (ulStart >= lpBits->SizeOfBitMap) + { + *lpSize = ulCount - (ulStart - lpBits->SizeOfBitMap); + return ulFoundAt; + } + lpOut++; + } + + /* Count remaining contiguous bits, if any */ + if (!(*lpOut & 1)) + { + ULONG ulOffset = 0; + + for (;ulOffset < 7u; ulOffset++) + { + if (*lpOut & (1 << ulOffset)) + break; + ulCount++; + } + } + *lpSize = ulCount; + return ulFoundAt; +} /* FUNCTIONS ****************************************************************/ /* * @implemented */ -VOID NTAPI -RtlInitializeBitMap(PRTL_BITMAP BitMapHeader, - PULONG BitMapBuffer, - ULONG SizeOfBitMap) -{ - BitMapHeader->SizeOfBitMap = SizeOfBitMap; - BitMapHeader->Buffer = BitMapBuffer; -} - - -/* - * @implemented - */ -BOOLEAN NTAPI -RtlAreBitsClear(PRTL_BITMAP BitMapHeader, - ULONG StartingIndex, - ULONG Length) -{ - ULONG Size; - ULONG Shift; - ULONG Count; - PULONG Ptr; - - Size = BitMapHeader->SizeOfBitMap; - if (StartingIndex >= Size || - !Length || - (StartingIndex + Length > Size)) - return FALSE; - - Ptr = (PULONG)BitMapHeader->Buffer + (StartingIndex / 32); - while (Length) - { - /* Get bit shift in current ulong */ - Shift = StartingIndex & 0x1F; - - /* Get number of bits to check in current ulong */ - Count = (Length > 32 - Shift) ? 32 - Shift : Length; - - /* Check ulong */ - if (*Ptr++ & MASK(Count, Shift)) +VOID +NTAPI +RtlInitializeBitMap(IN PRTL_BITMAP BitMapHeader, + IN PULONG BitMapBuffer, + IN ULONG SizeOfBitMap) +{ + /* Setup the bitmap header */ + BitMapHeader->SizeOfBitMap = SizeOfBitMap; + BitMapHeader->Buffer = BitMapBuffer; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlAreBitsClear(IN PRTL_BITMAP BitMapHeader, + IN ULONG StartingIndex, + IN ULONG Length) +{ + LPBYTE lpOut; + ULONG ulRemainder; + + if (!BitMapHeader || !Length || + StartingIndex >= BitMapHeader->SizeOfBitMap || + Length > BitMapHeader->SizeOfBitMap - StartingIndex) + return FALSE; + + /* FIXME: It might be more efficient/cleaner to manipulate four bytes + * at a time. But beware of the pointer arithmetics... + */ + lpOut = ((BYTE*)BitMapHeader->Buffer) + (StartingIndex >> 3u); + + /* Check bits in first byte, if StartingIndex isn't a byte boundary */ + if (StartingIndex & 7) + { + if (Length > 7) + { + /* Check from start bit to the end of the byte */ + if (*lpOut & ((0xff << (StartingIndex & 7)) & 0xff)) + return FALSE; + lpOut++; + Length -= (8 - (StartingIndex & 7)); + } + else + { + /* Check from the start bit, possibly into the next byte also */ + USHORT initialWord = NTDLL_maskBits[Length] << (StartingIndex & 7); + + if (*lpOut & (initialWord & 0xff)) + return FALSE; + if ((initialWord & 0xff00) && (lpOut[1] & (initialWord >> 8))) + return FALSE; + return TRUE; + } + } + + /* Check bits in blocks of 8 bytes */ + ulRemainder = Length & 7; + Length >>= 3; + while (Length--) + { + if (*lpOut++) return FALSE; - - Length -= Count; - StartingIndex += Count; - } - + } + + /* Check remaining bits, if any */ + if (ulRemainder && *lpOut & NTDLL_maskBits[ulRemainder]) + return FALSE; return TRUE; } @@ -82,107 +365,139 @@ ULONG StartingIndex, ULONG Length) { - ULONG Size; - ULONG Shift; - ULONG Count; - PULONG Ptr; - - Size = BitMapHeader->SizeOfBitMap; - if (StartingIndex >= Size || - Length == 0 || - (StartingIndex + Length > Size)) + LPBYTE lpOut; + ULONG ulRemainder; + + + if (!BitMapHeader || !Length || + StartingIndex >= BitMapHeader->SizeOfBitMap || + Length > BitMapHeader->SizeOfBitMap - StartingIndex) return FALSE; - Ptr = (PULONG)BitMapHeader->Buffer + (StartingIndex / 32); - while (Length) - { - /* Get bit shift in current ulong */ - Shift = StartingIndex & 0x1F; - - /* Get number of bits to check in current ulong */ - Count = (Length > 32 - Shift) ? 32 - Shift : Length; - - /* Check ulong */ - if (~*Ptr++ & MASK(Count, Shift)) + /* FIXME: It might be more efficient/cleaner to manipulate four bytes + * at a time. But beware of the pointer arithmetics... + */ + lpOut = ((BYTE*)BitMapHeader->Buffer) + (StartingIndex >> 3u); + + /* Check bits in first byte, if StartingIndex isn't a byte boundary */ + if (StartingIndex & 7) + { + if (Length > 7) + { + /* Check from start bit to the end of the byte */ + if ((*lpOut & + ((0xff << (StartingIndex & 7))) & 0xff) != ((0xff << (StartingIndex & 7) & 0xff))) + return FALSE; + lpOut++; + Length -= (8 - (StartingIndex & 7)); + } + else + { + /* Check from the start bit, possibly into the next byte also */ + USHORT initialWord = NTDLL_maskBits[Length] << (StartingIndex & 7); + + if ((*lpOut & (initialWord & 0xff)) != (initialWord & 0xff)) + return FALSE; + if ((initialWord & 0xff00) && + ((lpOut[1] & (initialWord >> 8)) != (initialWord >> 8))) + return FALSE; + return TRUE; + } + } + + /* Check bits in blocks of 8 bytes */ + ulRemainder = Length & 7; + Length >>= 3; + while (Length--) + { + if (*lpOut++ != 0xff) return FALSE; - - Length -= Count; - StartingIndex += Count; - } - + } + + /* Check remaining bits, if any */ + if (ulRemainder && + (*lpOut & NTDLL_maskBits[ulRemainder]) != NTDLL_maskBits[ulRemainder]) + return FALSE; return TRUE; } /* * @implemented - * - * Note: According to the documentation, SizeOfBitmap is in bits, so the - * ROUND_UP(...) must be divided by the number of bits per byte here. - * This function is exercised by the whole page allocator in npool.c - * which is how i came across this error. */ VOID NTAPI RtlClearAllBits(IN OUT PRTL_BITMAP BitMapHeader) { - memset(BitMapHeader->Buffer, - 0x00, - ROUND_UP(BitMapHeader->SizeOfBitMap, 8) / 8); - -} - - -/* - * @implemented - */ -VOID NTAPI + memset(BitMapHeader->Buffer, 0, ((BitMapHeader->SizeOfBitMap + 31) & ~31) >> 3); +} + +/* + * @implemented + */ +VOID +NTAPI RtlClearBit(PRTL_BITMAP BitMapHeader, - ULONG BitNumber) -{ - PULONG Ptr; - - if (BitNumber >= BitMapHeader->SizeOfBitMap) + ULONG BitNumber) +{ + PULONG Ptr; + + if (BitNumber >= BitMapHeader->SizeOfBitMap) return; + + Ptr = (PULONG)BitMapHeader->Buffer + (BitNumber / 32); + *Ptr &= ~(1 << (BitNumber % 32)); +} + +/* + * @implemented + */ +VOID +NTAPI +RtlClearBits(IN PRTL_BITMAP BitMapHeader, + IN ULONG StartingIndex, + IN ULONG NumberToClear) +{ + LPBYTE lpOut; + + if (!BitMapHeader || !NumberToClear || + StartingIndex >= BitMapHeader->SizeOfBitMap || + NumberToClear > BitMapHeader->SizeOfBitMap - StartingIndex) return; - Ptr = (PULONG)BitMapHeader->Buffer + (BitNumber / 32); - - *Ptr &= ~(1 << (BitNumber % 32)); -} - - -/* - * @implemented - */ -VOID NTAPI -RtlClearBits(PRTL_BITMAP BitMapHeader, - ULONG StartingIndex, - ULONG NumberToClear) -{ - ULONG Size; - ULONG Count; - ULONG Shift; - PULONG Ptr; - - Size = BitMapHeader->SizeOfBitMap; - if (StartingIndex >= Size || NumberToClear == 0) - return; - - ASSERT(StartingIndex + NumberToClear <= Size); - - Ptr = (PULONG)BitMapHeader->Buffer + (StartingIndex / 32); - while (NumberToClear) - { - /* Bit shift in current ulong */ - Shift = StartingIndex & 0x1F; - - /* Number of bits to change in current ulong */ - Count = (NumberToClear > 32 - Shift ) ? 32 - Shift : NumberToClear; - - /* Adjust ulong */ - *Ptr++ &= ~MASK(Count, Shift); - NumberToClear -= Count; - StartingIndex += Count; - } + /* FIXME: It might be more efficient/cleaner to manipulate four bytes + * at a time. But beware of the pointer arithmetics... + */ + lpOut = ((BYTE*)BitMapHeader->Buffer) + (StartingIndex >> 3u); + + /* Clear bits in first byte, if StartingIndex isn't a byte boundary */ + if (StartingIndex & 7) + { + if (NumberToClear > 7) + { + /* Clear from start bit to the end of the byte */ + *lpOut++ &= ~(0xff << (StartingIndex & 7)); + NumberToClear -= (8 - (StartingIndex & 7)); + } + else + { + /* Clear from the start bit, possibly into the next byte also */ + USHORT initialWord = ~(NTDLL_maskBits[NumberToClear] << (StartingIndex & 7)); + + *lpOut++ &= (initialWord & 0xff); + *lpOut &= (initialWord >> 8); + return; + } + } + + /* Clear bits (in blocks of 8) on whole byte boundaries */ + if (NumberToClear >> 3) + { + memset(lpOut, 0, NumberToClear >> 3); + lpOut = lpOut + (NumberToClear >> 3); + } + + /* Clear remaining bits, if any */ + if (NumberToClear & 0x7) + *lpOut &= ~NTDLL_maskBits[NumberToClear & 0x7]; } @@ -194,171 +509,44 @@ ULONG NumberToFind, ULONG HintIndex) { - ULONG Size; - ULONG Index; - ULONG Count; - PULONG Ptr; - ULONG Mask; - ULONG Loop; - ULONG End; - ULONG OriginalHint = HintIndex; - - Size = BitMapHeader->SizeOfBitMap; - if (NumberToFind > Size || NumberToFind == 0) - return -1; - - if (HintIndex >= Size) + ULONG ulPos, ulEnd; + + if (!BitMapHeader || !NumberToFind || NumberToFind > BitMapHeader->SizeOfBitMap) + return ~0U; + + ulEnd = BitMapHeader->SizeOfBitMap; + + if (HintIndex + NumberToFind > BitMapHeader->SizeOfBitMap) HintIndex = 0; - /* Initialize the values to the hint location. */ - Index = HintIndex; - Ptr = BitMapHeader->Buffer + (Index / 32); - Mask = 1 << (Index & 0x1F); - End = Size; - - /* The outer loop does the magic of first searching from the - * hint to the bitmap end and then going again from beginning - * of the bitmap to the hint location. - */ - for (Loop = 0; Loop < 2; Loop++) - { - while (HintIndex < End) - { - /* Count clear bits */ - for (Count = 0; Index < End && ~*Ptr & Mask; Index++) - { - if (++Count >= NumberToFind) - return HintIndex; - - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - /* Skip set bits */ - for (; Index < End && *Ptr & Mask; Index++) - { - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - HintIndex = Index; - } - - /* Optimalization */ - if (OriginalHint == 0) - break; - - /* Initialize the values for the beginning -> hint loop. */ - HintIndex = Index = 0; - End = OriginalHint + NumberToFind - 1; - End = End > Size ? Size : End; - Ptr = BitMapHeader->Buffer; - Mask = 1; - } - - return (ULONG)-1; -} - - -/* - * @implemented - */ -ULONG NTAPI -RtlFindClearBitsAndSet(PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex) -{ - ULONG Index; - - Index = RtlFindClearBits(BitMapHeader, - NumberToFind, - HintIndex); - if (Index != (ULONG)-1) - { - RtlSetBits(BitMapHeader, - Index, - NumberToFind); - } - - return Index; -} - - -/* - * @implemented - */ -ULONG NTAPI -RtlFindFirstRunClear(PRTL_BITMAP BitMapHeader, - PULONG StartingIndex) -{ - ULONG Size; - ULONG Index; - ULONG Count; - PULONG Ptr; - ULONG Mask; - - Size = BitMapHeader->SizeOfBitMap; - if (*StartingIndex > Size) - { - *StartingIndex = (ULONG)-1; - return 0; - } - - Index = *StartingIndex; - Ptr = (PULONG)BitMapHeader->Buffer + (Index / 32); - Mask = 1 << (Index & 0x1F); - - /* Skip set bits */ - for (; Index < Size && *Ptr & Mask; Index++) - { - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - /* Return index of first clear bit */ - if (Index >= Size) - { - *StartingIndex = (ULONG)-1; - return 0; - } - else - { - *StartingIndex = Index; - } - - /* Count clear bits */ - for (Count = 0; Index < Size && ~*Ptr & Mask; Index++) - { - Count++; - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - return Count; -} - - -/* - * @unimplemented + ulPos = HintIndex; + + while (ulPos < ulEnd) + { + /* FIXME: This could be made a _lot_ more efficient */ + if (RtlAreBitsClear(BitMapHeader, ulPos, NumberToFind)) + return ulPos; + + /* Start from the beginning if we hit the end and started from HintIndex */ + if (ulPos == ulEnd - 1 && HintIndex) + { + ulEnd = HintIndex; + ulPos = HintIndex = 0; + } + else + ulPos++; + } + return ~0U; +} + + + + + + + +/* + * @implemented */ ULONG NTAPI RtlFindClearRuns(PRTL_BITMAP BitMapHeader, @@ -366,8 +554,7 @@ ULONG SizeOfRunArray, BOOLEAN LocateLongestRuns) { - UNIMPLEMENTED; - return 0; + return NTDLL_FindRuns(BitMapHeader, RunArray, SizeOfRunArray, LocateLongestRuns, NTDLL_FindClearRun); } @@ -383,19 +570,21 @@ return 0; } - -/* - * @unimplemented +/* + * @implemented */ ULONG NTAPI RtlFindNextForwardRunClear(IN PRTL_BITMAP BitMapHeader, IN ULONG FromIndex, IN PULONG StartingRunIndex) { - UNIMPLEMENTED; - return 0; -} - + ULONG ulSize = 0; + + if (BitMapHeader && FromIndex < BitMapHeader->SizeOfBitMap && StartingRunIndex) + *StartingRunIndex = NTDLL_FindClearRun(BitMapHeader, FromIndex, &ulSize); + + return ulSize; +} /* * @implemented @@ -468,60 +657,15 @@ RtlFindLongestRunClear(PRTL_BITMAP BitMapHeader, PULONG StartingIndex) { - ULONG Size; - PULONG Ptr; - ULONG Index = 0; - ULONG Count; - ULONG Max = 0; - ULONG Start; - ULONG Maxstart = 0; - ULONG Mask = 1; - - Size = BitMapHeader->SizeOfBitMap; - Ptr = (PULONG)BitMapHeader->Buffer; - - while (Index < Size) - { - Start = Index; - - /* Count clear bits */ - for (Count = 0; Index < Size && ~*Ptr & Mask; Index++) - { - Count++; - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - /* Skip set bits */ - for (; Index < Size && *Ptr & Mask; Index++) - { - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - if (Count > Max) - { - Max = Count; - Maxstart = Start; - } - } - - if (StartingIndex != NULL) - { - *StartingIndex = Maxstart; - } - - return Max; + RTL_BITMAP_RUN br; + + if (RtlFindClearRuns(BitMapHeader, &br, 1, TRUE) == 1) + { + if (StartingIndex) + *StartingIndex = br.StartingIndex; + return br.NumberOfBits; + } + return 0; } @@ -532,60 +676,15 @@ RtlFindLongestRunSet(PRTL_BITMAP BitMapHeader, PULONG StartingIndex) { - ULONG Size; - PULONG Ptr; - ULONG Index = 0; - ULONG Count; - ULONG Max = 0; - ULONG Start; - ULONG Maxstart = 0; - ULONG Mask = 1; - - Size = BitMapHeader->SizeOfBitMap; - Ptr = (PULONG)BitMapHeader->Buffer; - - while (Index < Size) - { - Start = Index; - - /* Count set bits */ - for (Count = 0; Index < Size && *Ptr & Mask; Index++) - { - Count++; - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - /* Skip clear bits */ - for (; Index < Size && ~*Ptr & Mask; Index++) - { - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - if (Count > Max) - { - Max = Count; - Maxstart = Start; - } - } - - if (StartingIndex != NULL) - { - *StartingIndex = Maxstart; - } - - return Max; + RTL_BITMAP_RUN br; + + if (NTDLL_FindRuns(BitMapHeader, &br, 1, TRUE, NTDLL_FindSetRun) == 1) + { + if (StartingIndex) + *StartingIndex = br.StartingIndex; + return br.NumberOfBits; + } + return 0; } @@ -597,79 +696,34 @@ ULONG NumberToFind, ULONG HintIndex) { - ULONG Size; - ULONG Index; - ULONG Count; - PULONG Ptr; - ULONG Mask; - ULONG Loop; - ULONG End; - ULONG OriginalHint = HintIndex; - - Size = BitMapHeader->SizeOfBitMap; - if (NumberToFind > Size || NumberToFind == 0) - return (ULONG)-1; - - if (HintIndex >= Size) + ULONG ulPos, ulEnd; + + if (!BitMapHeader || !NumberToFind || NumberToFind > BitMapHeader->SizeOfBitMap) + return ~0U; + + ulEnd = BitMapHeader->SizeOfBitMap; + + if (HintIndex + NumberToFind > BitMapHeader->SizeOfBitMap) HintIndex = 0; - /* Initialize the values to the hint location. */ - Index = HintIndex; - Ptr = BitMapHeader->Buffer + (Index / 32); - Mask = 1 << (Index & 0x1F); - End = Size; - - /* The outer loop does the magic of first searching from the - * hint to the bitmap end and then going again from beginning - * of the bitmap to the hint location. - */ - for (Loop = 0; Loop < 2; Loop++) - { - while (HintIndex < End) - { - /* Count set bits */ - for (Count = 0; Index < End && *Ptr & Mask; Index++) - { - if (++Count >= NumberToFind) - return HintIndex; - - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - /* Skip clear bits */ - for (; Index < End && ~*Ptr & Mask; Index++) - { - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - HintIndex = Index; - } - - /* Optimalization */ - if (OriginalHint == 0) - break; - - /* Initialize the values for the beginning -> hint loop. */ - HintIndex = Index = 0; - End = OriginalHint + NumberToFind - 1; - End = End > Size ? Size : End; - Ptr = BitMapHeader->Buffer; - Mask = 1; - } - - return (ULONG)-1; + ulPos = HintIndex; + + while (ulPos < ulEnd) + { + /* FIXME: This could be made a _lot_ more efficient */ + if (RtlAreBitsSet(BitMapHeader, ulPos, NumberToFind)) + return ulPos; + + /* Start from the beginning if we hit the end and had a hint */ + if (ulPos == ulEnd - 1 && HintIndex) + { + ulEnd = HintIndex; + ulPos = HintIndex = 0; + } + else + ulPos++; + } + return ~0U; } @@ -681,52 +735,16 @@ ULONG NumberToFind, ULONG HintIndex) { - ULONG Index; - - Index = RtlFindSetBits(BitMapHeader, - NumberToFind, - HintIndex); - if (Index != (ULONG)-1) - { - RtlClearBits(BitMapHeader, - Index, - NumberToFind); - } - - return Index; -} - - -/* - * @implemented - */ -ULONG NTAPI -RtlNumberOfClearBits(PRTL_BITMAP BitMapHeader) -{ - PULONG Ptr; - ULONG Size; - ULONG Index; - ULONG Count; - ULONG Mask; - - Size = BitMapHeader->SizeOfBitMap; - Ptr = (PULONG)BitMapHeader->Buffer; - - for (Mask = 1, Index = 0, Count = 0; Index < Size; Index++) - { - if (~*Ptr & Mask) - Count++; - - Mask <<= 1; - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - return Count; -} + ULONG ulPos; + + ulPos = RtlFindSetBits(BitMapHeader, NumberToFind, HintIndex); + if (ulPos != ~0U) + RtlClearBits(BitMapHeader, ulPos, NumberToFind); + return ulPos; +} + + + /* @@ -735,46 +753,39 @@ ULONG NTAPI RtlNumberOfSetBits(PRTL_BITMAP BitMapHeader) { - PULONG Ptr; - ULONG Size; - ULONG Index; - ULONG Count; - ULONG Mask; - - Ptr = (PULONG)BitMapHeader->Buffer; - Size = BitMapHeader->SizeOfBitMap; - for (Mask = 1, Index = 0, Count = 0; Index < Size; Index++) - { - if (*Ptr & Mask) - Count++; - - Mask <<= 1; - - if (Mask == 0) - { - Mask = 1; - Ptr++; - } - } - - return Count; -} - - -/* - * @implemented - * - * Note: According to the documentation, SizeOfBitmap is in bits, so the - * ROUND_UP(...) must be divided by the number of bits per byte here. - * The companion function, RtlClearAllBits, is exercised by the whole page - * allocator in npool.c which is how i came across this error. + ULONG ulSet = 0; + + if (BitMapHeader) + { + LPBYTE lpOut = (BYTE *)BitMapHeader->Buffer; + ULONG Length, ulRemainder; + BYTE bMasked; + + Length = BitMapHeader->SizeOfBitMap >> 3; + ulRemainder = BitMapHeader->SizeOfBitMap & 0x7; + + while (Length--) + { + ulSet += NTDLL_nibbleBitCount[*lpOut >> 4]; + ulSet += NTDLL_nibbleBitCount[*lpOut & 0xf]; + lpOut++; + } + + bMasked = *lpOut & NTDLL_maskBits[ulRemainder]; + ulSet += NTDLL_nibbleBitCount[bMasked >> 4]; + ulSet += NTDLL_nibbleBitCount[bMasked & 0xf]; + } + return ulSet; +} + + +/* + * @implemented */ VOID NTAPI RtlSetAllBits(IN OUT PRTL_BITMAP BitMapHeader) { - memset(BitMapHeader->Buffer, - 0xFF, - ROUND_UP(BitMapHeader->SizeOfBitMap, 8) / 8); + memset(BitMapHeader->Buffer, 0xff, ((BitMapHeader->SizeOfBitMap + 31) & ~31) >> 3); } @@ -804,31 +815,47 @@ ULONG StartingIndex, ULONG NumberToSet) { - ULONG Size; - ULONG Count; - ULONG Shift; - PULONG Ptr; - - Size = BitMapHeader->SizeOfBitMap; - if (StartingIndex >= Size || NumberToSet == 0) + LPBYTE lpOut; + + if (!BitMapHeader || !NumberToSet || + StartingIndex >= BitMapHeader->SizeOfBitMap || + NumberToSet > BitMapHeader->SizeOfBitMap - StartingIndex) return; - ASSERT(StartingIndex + NumberToSet <= Size); - - Ptr = (PULONG)BitMapHeader->Buffer + (StartingIndex / 32); - while (NumberToSet) - { - /* Bit shift in current ulong */ - Shift = StartingIndex & 0x1F; - - /* Number of bits to change in current ulong */ - Count = (NumberToSet > 32 - Shift) ? 32 - Shift : NumberToSet; - - /* Adjust ulong */ - *Ptr++ |= MASK(Count, Shift); - NumberToSet -= Count; - StartingIndex += Count; - } + /* FIXME: It might be more efficient/cleaner to manipulate four bytes + * at a time. But beware of the pointer arithmetics... + */ + lpOut = ((BYTE*)BitMapHeader->Buffer) + (StartingIndex >> 3u); + + /* Set bits in first byte, if StartingIndex isn't a byte boundary */ + if (StartingIndex & 7) + { + if (NumberToSet > 7) + { + /* Set from start bit to the end of the byte */ + *lpOut++ |= 0xff << (StartingIndex & 7); + NumberToSet -= (8 - (StartingIndex & 7)); + } + else + { + /* Set from the start bit, possibly into the next byte also */ + USHORT initialWord = NTDLL_maskBits[NumberToSet] << (StartingIndex & 7); + + *lpOut++ |= (initialWord & 0xff); + *lpOut |= (initialWord >> 8); + return; + } + } + + /* Set bits up to complete byte count */ + if (NumberToSet >> 3) + { + memset(lpOut, 0xff, NumberToSet >> 3); + lpOut = lpOut + (NumberToSet >> 3); + } + + /* Set remaining bits, if any */ + *lpOut |= NTDLL_maskBits[NumberToSet & 0x7]; } @@ -849,4 +876,104 @@ return (*Ptr & (1 << (BitNumber % 32))); } +/* + * @implemented + */ +ULONG NTAPI +RtlFindFirstRunClear(PRTL_BITMAP BitMapHeader, + PULONG StartingIndex) +{ + return RtlFindNextForwardRunClear(BitMapHeader, 0, StartingIndex); +} + +/* + * @implemented + */ +ULONG NTAPI +RtlNumberOfClearBits(PRTL_BITMAP BitMapHeader) +{ + + if (BitMapHeader) + return BitMapHeader->SizeOfBitMap - RtlNumberOfSetBits(BitMapHeader); + return 0; +} + +/* + * @implemented + */ +ULONG NTAPI +RtlFindClearBitsAndSet(PRTL_BITMAP BitMapHeader, + ULONG NumberToFind, + ULONG HintIndex) +{ + ULONG ulPos; + + ulPos = RtlFindClearBits(BitMapHeader, NumberToFind, HintIndex); + if (ulPos != ~0U) + RtlSetBits(BitMapHeader, ulPos, NumberToFind); + return ulPos; +} + +/* + * @implemented + */ +CCHAR WINAPI RtlFindMostSignificantBit(ULONGLONG ulLong) +{ + signed char ret = 32; + DWORD dw; + + if (!(dw = (ulLong >> 32))) + { + ret = 0; + dw = (DWORD)ulLong; + } + if (dw & 0xffff0000) + { + dw >>= 16; + ret += 16; + } + if (dw & 0xff00) + { + dw >>= 8; + ret += 8; + } + if (dw & 0xf0) + { + dw >>= 4; + ret += 4; + } + return ret + NTDLL_mostSignificant[dw]; +} + +/* + * @implemented + */ +CCHAR WINAPI RtlFindLeastSignificantBit(ULONGLONG ulLong) +{ + signed char ret = 0; + DWORD dw; + + if (!(dw = (DWORD)ulLong)) + { + ret = 32; + if (!(dw = ulLong >> 32)) return -1; + } + if (!(dw & 0xffff)) + { + dw >>= 16; + ret += 16; + } + if (!(dw & 0xff)) + { + dw >>= 8; + ret += 8; + } + if (!(dw & 0x0f)) + { + dw >>= 4; + ret += 4; + } + return ret + NTDLL_leastSignificant[dw & 0x0f]; +} + /* EOF */

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