Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

by ion＠svn.reactos.com

revert accidental commit Modified: trunk/reactos/tools/helper.mk _____ Modified: trunk/reactos/tools/helper.mk --- trunk/reactos/tools/helper.mk 2005-05-03 09:32:10 UTC (rev 14957) +++ trunk/reactos/tools/helper.mk 2005-05-03 11:56:46 UTC (rev 14958) @@ -684,9 +684,9 @@ MK_CFLAGS += -mpreferred-stack-boundary=2 #CC_VERSION=$(word 1,$(shell gcc -dumpversion)) - #ifeq ($(CC_VERSION),3.4.3) + ifeq ($(CC_VERSION),3.4.3) MK_CFLAGS += -funit-at-a-time -fweb - #endif + endif # # Remove Symbols if no debugging is used at all

19 years, 4 months

[mf] 14957: context menu interface pointer cleanup

by mf＠svn.reactos.com

context menu interface pointer cleanup Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-05-03 09:21:42 UTC (rev 14956) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-05-03 09:32:10 UTC (rev 14957) @@ -3499,7 +3499,8 @@ hr = (*pcm->lpVtbl->InvokeCommand)(pcm, &cmi); } - } + } else + CtxMenu_reset(); } (*pcm->lpVtbl->Release)(pcm);

19 years, 4 months

[mf] 14956: small optimization for the last change

by mf＠svn.reactos.com

small optimization for the last change Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp --- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-03 08:04:58 UTC (rev 14955) +++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-03 09:21:42 UTC (rev 14956) @@ -250,7 +250,8 @@ if (_tcsicmp(trim_path_slash(dir_path), trim_path_slash(ignore_path))) *ignore_name = '\0'; - } + } else + *ignore_name = '\0'; int cnt = 0; for(Entry*entry=dir._down; entry; entry=entry->_next) { @@ -259,10 +260,9 @@ //not appropriate for drive roots: if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) continue; - // hide subfolders if requested - if (!ignore.empty()) - if (*ignore_name && !_tcsicmp(entry->_data.cFileName, ignore_name)) - continue; + // hide "Programs" subfolders if requested + if (*ignore_name && !_tcsicmp(entry->_data.cFileName, ignore_name)) + continue; // only 'max' entries shall be added. if (++cnt == max) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-03 08:04:58 UTC (rev 14955) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-03 09:21:42 UTC (rev 14956) @@ -252,7 +252,8 @@ if (_tcsicmp(trim_path_slash(dir_path), trim_path_slash(ignore_path))) *ignore_name = '\0'; - } + } else + *ignore_name = '\0'; int cnt = 0; for(Entry*entry=dir._down; entry; entry=entry->_next) { @@ -261,10 +262,9 @@ //not appropriate for drive roots: if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) continue; - // hide subfolders if requested - if (!ignore.empty()) - if (*ignore_name && !_tcsicmp(entry->_data.cFileName, ignore_name)) - continue; + // hide "Programs" subfolders if requested + if (*ignore_name && !_tcsicmp(entry->_data.cFileName, ignore_name)) + continue; // only 'max' entries shall be added. if (++cnt == max)

19 years, 4 months

[mf] 14955: display custom folders in start menu root

by mf＠svn.reactos.com

display custom folders in start menu root Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-03 08:03:46 UTC (rev 14954) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-05-03 08:04:58 UTC (rev 14955) @@ -219,15 +219,42 @@ #endif } - AddShellEntries(dir, -1, smd._subfolders); + AddShellEntries(dir, -1, smd._ignore); } } -void StartMenu::AddShellEntries(const ShellDirectory& dir, int max, bool subfolders) +static LPTSTR trim_path_slash(LPTSTR path) { + LPTSTR p = path; + + while(*p) + ++p; + + if (p>path && (p[-1]=='\\' || p[-1]=='/')) + *--p = '\0'; + + return path; +} + +void StartMenu::AddShellEntries(const ShellDirectory& dir, int max, const String& ignore) +{ + TCHAR ignore_path[MAX_PATH], ignore_dir[MAX_PATH], ignore_name[_MAX_FNAME], ignore_ext[_MAX_EXT]; + TCHAR dir_path[MAX_PATH]; + + if (!ignore.empty()) { + _tsplitpath(ignore, ignore_path, ignore_dir, ignore_name, ignore_ext); + + _tcscat(ignore_path, ignore_dir); + _tcscat(ignore_name, ignore_ext); + + dir.get_path(dir_path); + + if (_tcsicmp(trim_path_slash(dir_path), trim_path_slash(ignore_path))) + *ignore_name = '\0'; + } + int cnt = 0; - for(Entry*entry=dir._down; entry; entry=entry->_next) { // hide files like "desktop.ini" if (entry->_shell_attribs & SFGAO_HIDDEN) @@ -235,8 +262,8 @@ continue; // hide subfolders if requested - if (!subfolders) - if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (!ignore.empty()) + if (*ignore_name && !_tcsicmp(entry->_data.cFileName, ignore_name)) continue; // only 'max' entries shall be added. @@ -1494,7 +1521,7 @@ try { // insert directory "All Users\Start Menu" ShellDirectory cmn_startmenu(GetDesktopFolder(), SpecialFolderPath(CSIDL_COMMON_STARTMENU, _hwnd), _hwnd); - _dirs.push_back(StartMenuDirectory(cmn_startmenu, false)); // don't add subfolders + _dirs.push_back(StartMenuDirectory(cmn_startmenu, (LPCTSTR)SpecialFolderFSPath(CSIDL_COMMON_PROGRAMS, _hwnd))); } catch(COMException&) { // ignore exception and don't show additional shortcuts } @@ -1503,7 +1530,7 @@ // insert directory "<user name>\Start Menu" ShellDirectory usr_startmenu(GetDesktopFolder(), SpecialFolderPath(CSIDL_STARTMENU, _hwnd), _hwnd); - _dirs.push_back(StartMenuDirectory(usr_startmenu, false)); // don't add subfolders + _dirs.push_back(StartMenuDirectory(usr_startmenu, (LPCTSTR)SpecialFolderFSPath(CSIDL_PROGRAMS, _hwnd))); } catch(COMException&) { // ignore exception and don't show additional shortcuts } @@ -2128,7 +2155,7 @@ } dir.sort_directory(SORT_DATE); - AddShellEntries(dir, RECENT_DOCS_COUNT, smd._subfolders); + AddShellEntries(dir, RECENT_DOCS_COUNT, smd._ignore); ///@todo read max. count of entries from registry } } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.h 2005-05-03 08:03:46 UTC (rev 14954) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.h 2005-05-03 08:04:58 UTC (rev 14955) @@ -56,8 +56,8 @@ /// StartMenuDirectory is used to store the base directory of start menus. struct StartMenuDirectory { - StartMenuDirectory(const ShellDirectory& dir, bool subfolders=true) - : _dir(dir), _subfolders(subfolders) + StartMenuDirectory(const ShellDirectory& dir, const String& ignore="") + : _dir(dir), _ignore(ignore) { } @@ -67,7 +67,7 @@ } ShellDirectory _dir; - bool _subfolders; + String _ignore; }; typedef list<StartMenuDirectory> StartMenuShellDirs; @@ -280,7 +280,7 @@ ShellEntryMap::iterator AddEntry(const ShellFolder folder, ShellEntry* entry); ShellEntryMap::iterator AddEntry(const ShellFolder folder, Entry* entry); - void AddShellEntries(const ShellDirectory& dir, int max=-1, bool subfolders=true); + void AddShellEntries(const ShellDirectory& dir, int max=-1, const String& ignore=""); void AddButton(LPCTSTR title, ICON_ID icon_id=ICID_NONE, bool hasSubmenu=false, int id=-1, bool enabled=true); void AddSeparator();

19 years, 4 months

[mf] 14954: context menu interface pointer cleanup

by mf＠svn.reactos.com

context menu interface pointer cleanup Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp _____ Modified: trunk/reactos/subsys/system/explorer/desktop/desktop.cpp --- trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-05-03 08:01:18 UTC (rev 14953) +++ trunk/reactos/subsys/system/explorer/desktop/desktop.cpp 2005-05-03 08:03:46 UTC (rev 14954) @@ -643,7 +643,8 @@ hr = pcm->InvokeCommand(&cmi); } - } + } else + _cm_ifs.reset(); } pcm->Release(); _____ Modified: trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp --- trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp 2005-05-03 08:01:18 UTC (rev 14953) +++ trunk/reactos/subsys/system/explorer/utility/shellclasses.cpp 2005-05-03 08:03:46 UTC (rev 14954) @@ -509,7 +509,7 @@ _pctxmenu3 = (LPCONTEXTMENU3)pcm; else #endif - if (pcm1->QueryInterface (IID_IContextMenu2, (void**)&pcm) == NOERROR) + if (pcm1->QueryInterface(IID_IContextMenu2, (void**)&pcm) == NOERROR) _pctxmenu2 = (LPCONTEXTMENU2)pcm; if (pcm) { @@ -556,7 +556,8 @@ hr = pcm->InvokeCommand(&cmi); } - } + } else + cm_ifs.reset(); } pcm->Release();

19 years, 4 months

[mf] 14953: display custom folders in start menu root

by mf＠svn.reactos.com

display custom folders in start menu root Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. h _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp --- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-03 08:00:23 UTC (rev 14952) +++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. cpp 2005-05-03 08:01:18 UTC (rev 14953) @@ -217,15 +217,42 @@ #endif } - AddShellEntries(dir, -1, smd._subfolders); + AddShellEntries(dir, -1, smd._ignore); } } -void StartMenu::AddShellEntries(const ShellDirectory& dir, int max, bool subfolders) +static LPTSTR trim_path_slash(LPTSTR path) { + LPTSTR p = path; + + while(*p) + ++p; + + if (p>path && (p[-1]=='\\' || p[-1]=='/')) + *--p = '\0'; + + return path; +} + +void StartMenu::AddShellEntries(const ShellDirectory& dir, int max, const String& ignore) +{ + TCHAR ignore_path[MAX_PATH], ignore_dir[MAX_PATH], ignore_name[_MAX_FNAME], ignore_ext[_MAX_EXT]; + TCHAR dir_path[MAX_PATH]; + + if (!ignore.empty()) { + _tsplitpath(ignore, ignore_path, ignore_dir, ignore_name, ignore_ext); + + _tcscat(ignore_path, ignore_dir); + _tcscat(ignore_name, ignore_ext); + + dir.get_path(dir_path); + + if (_tcsicmp(trim_path_slash(dir_path), trim_path_slash(ignore_path))) + *ignore_name = '\0'; + } + int cnt = 0; - for(Entry*entry=dir._down; entry; entry=entry->_next) { // hide files like "desktop.ini" if (entry->_shell_attribs & SFGAO_HIDDEN) @@ -233,8 +260,8 @@ continue; // hide subfolders if requested - if (!subfolders) - if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (!ignore.empty()) + if (*ignore_name && !_tcsicmp(entry->_data.cFileName, ignore_name)) continue; // only 'max' entries shall be added. @@ -1467,7 +1494,7 @@ try { // insert directory "All Users\Start Menu" ShellDirectory cmn_startmenu(GetDesktopFolder(), SpecialFolderPath(CSIDL_COMMON_STARTMENU, _hwnd), _hwnd); - _dirs.push_back(StartMenuDirectory(cmn_startmenu, false)); // don't add subfolders + _dirs.push_back(StartMenuDirectory(cmn_startmenu, (LPCTSTR)SpecialFolderFSPath(CSIDL_COMMON_PROGRAMS, _hwnd))); } catch(COMException&) { // ignore exception and don't show additional shortcuts } @@ -1476,7 +1503,7 @@ // insert directory "<user name>\Start Menu" ShellDirectory usr_startmenu(GetDesktopFolder(), SpecialFolderPath(CSIDL_STARTMENU, _hwnd), _hwnd); - _dirs.push_back(StartMenuDirectory(usr_startmenu, false)); // don't add subfolders + _dirs.push_back(StartMenuDirectory(usr_startmenu, (LPCTSTR)SpecialFolderFSPath(CSIDL_PROGRAMS, _hwnd))); } catch(COMException&) { // ignore exception and don't show additional shortcuts } @@ -1998,6 +2025,6 @@ } dir.sort_directory(SORT_DATE); - AddShellEntries(dir, RECENT_DOCS_COUNT, smd._subfolders); ///@todo read max. count of entries from registry + AddShellEntries(dir, RECENT_DOCS_COUNT, smd._ignore); ///@todo read max. count of entries from registry } } _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. h --- branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. h 2005-05-03 08:00:23 UTC (rev 14952) +++ branches/lean-explorer/reactos/subsys/system/explorer/taskbar/startmenu. h 2005-05-03 08:01:18 UTC (rev 14953) @@ -56,8 +56,8 @@ /// StartMenuDirectory is used to store the base directory of start menus. struct StartMenuDirectory { - StartMenuDirectory(const ShellDirectory& dir, bool subfolders=true) - : _dir(dir), _subfolders(subfolders) + StartMenuDirectory(const ShellDirectory& dir, const String& ignore="") + : _dir(dir), _ignore(ignore) { } @@ -67,7 +67,7 @@ } ShellDirectory _dir; - bool _subfolders; + String _ignore; }; typedef list<StartMenuDirectory> StartMenuShellDirs; @@ -278,7 +278,7 @@ StartMenuEntry& AddEntry(const ShellFolder folder, ShellEntry* entry); StartMenuEntry& AddEntry(const ShellFolder folder, Entry* entry); - void AddShellEntries(const ShellDirectory& dir, int max=-1, bool subfolders=true); + void AddShellEntries(const ShellDirectory& dir, int max=-1, const String& ignore=""); void AddButton(LPCTSTR title, ICON_ID icon_id=ICID_NONE, bool hasSubmenu=false, int id=-1, bool enabled=true); void AddSeparator();

19 years, 4 months

[mf] 14952: context menu interface pointer cleanup

by mf＠svn.reactos.com

context menu interface pointer cleanup Modified: branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p Modified: branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.cpp _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p --- branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p 2005-05-02 20:30:29 UTC (rev 14951) +++ branches/lean-explorer/reactos/subsys/system/explorer/desktop/desktop.cp p 2005-05-03 08:00:23 UTC (rev 14952) @@ -547,7 +547,8 @@ hr = pcm->InvokeCommand(&cmi); } - } + } else + _cm_ifs.reset(); } pcm->Release(); _____ Modified: branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.cpp --- branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.cpp 2005-05-02 20:30:29 UTC (rev 14951) +++ branches/lean-explorer/reactos/subsys/system/explorer/utility/shellclass es.cpp 2005-05-03 08:00:23 UTC (rev 14952) @@ -505,7 +505,7 @@ _pctxmenu3 = (LPCONTEXTMENU3)pcm; else #endif - if (pcm1->QueryInterface (IID_IContextMenu2, (void**)&pcm) == NOERROR) + if (pcm1->QueryInterface(IID_IContextMenu2, (void**)&pcm) == NOERROR) _pctxmenu2 = (LPCONTEXTMENU2)pcm; if (pcm) { @@ -552,7 +552,8 @@ hr = pcm->InvokeCommand(&cmi); } - } + } else + cm_ifs.reset(); } pcm->Release();

19 years, 4 months

[hbirr] 14951: Open/create all files with the necessary rights.

by hbirr＠svn.reactos.com

Open/create all files with the necessary rights. Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/system/usetup/cabinet.c Modified: trunk/reactos/subsys/system/usetup/filesup.c Modified: trunk/reactos/subsys/system/usetup/inicache.c _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-02 19:12:31 UTC (rev 14950) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2005-05-02 20:30:29 UTC (rev 14951) @@ -564,7 +564,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -602,7 +602,7 @@ NULL); Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, NULL, @@ -667,7 +667,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -716,7 +716,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -762,7 +762,7 @@ NULL); Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, NULL, @@ -831,7 +831,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -880,7 +880,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -932,7 +932,7 @@ NULL); Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, NULL, @@ -975,7 +975,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, @@ -1038,7 +1038,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -1087,7 +1087,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -1135,7 +1135,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, @@ -1195,7 +1195,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -1244,7 +1244,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, @@ -1292,7 +1292,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, @@ -1357,7 +1357,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -1406,7 +1406,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, @@ -1457,7 +1457,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_WRITE_ACCESS | FILE_WRITE_ATTRIBUTES, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, @@ -1555,7 +1555,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, + GENERIC_READ|GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, @@ -1626,7 +1626,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, + GENERIC_READ|GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, 0, _____ Modified: trunk/reactos/subsys/system/usetup/cabinet.c --- trunk/reactos/subsys/system/usetup/cabinet.c 2005-05-02 19:12:31 UTC (rev 14950) +++ trunk/reactos/subsys/system/usetup/cabinet.c 2005-05-02 20:30:29 UTC (rev 14951) @@ -1319,7 +1319,7 @@ NULL); NtStatus = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ, @@ -1673,7 +1673,7 @@ NULL); NtStatus = NtCreateFile(&DestFile, - FILE_WRITE_ACCESS, + GENERIC_WRITE|FILE_READ_ATTRIBUTES, &ObjectAttributes, &IoStatusBlock, NULL, @@ -1692,7 +1692,7 @@ { /* Create destination file, overwrite if it already exists */ NtStatus = NtCreateFile(&DestFile, - FILE_WRITE_ACCESS, + GENERIC_WRITE|FILE_READ_ATTRIBUTES, &ObjectAttributes, &IoStatusBlock, NULL, _____ Modified: trunk/reactos/subsys/system/usetup/filesup.c --- trunk/reactos/subsys/system/usetup/filesup.c 2005-05-02 19:12:31 UTC (rev 14950) +++ trunk/reactos/subsys/system/usetup/filesup.c 2005-05-02 20:30:29 UTC (rev 14951) @@ -125,7 +125,7 @@ NULL); Status = NtOpenFile(&FileHandleSource, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, FILE_SHARE_READ, @@ -166,7 +166,7 @@ NULL); Status = NtCreateFile(&FileHandleDest, - FILE_WRITE_ACCESS, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, NULL, @@ -383,7 +383,7 @@ NULL); Status = NtOpenFile(&FileHandle, - FILE_READ_ACCESS, + GENERIC_READ, &ObjectAttributes, &IoStatusBlock, 0, _____ Modified: trunk/reactos/subsys/system/usetup/inicache.c --- trunk/reactos/subsys/system/usetup/inicache.c 2005-05-02 19:12:31 UTC (rev 14950) +++ trunk/reactos/subsys/system/usetup/inicache.c 2005-05-02 20:30:29 UTC (rev 14951) @@ -1082,7 +1082,7 @@ NULL); Status = NtCreateFile(&FileHandle, - FILE_WRITE_ACCESS, + GENERIC_WRITE, &ObjectAttributes, &IoStatusBlock, NULL,

19 years, 4 months

[hbirr] 14950: - Check first for a valid returned object in ObOpenObjectByName.

by hbirr＠svn.reactos.com

- Check first for a valid returned object in ObOpenObjectByName. - Free always the remaining path string if an error is returned in ObOpenObjectByName. Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-02 16:35:58 UTC (rev 14949) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-02 19:12:31 UTC (rev 14950) @@ -143,15 +143,21 @@ return Status; } + if (Object == NULL) + { + RtlFreeUnicodeString(&RemainingPath); + return STATUS_UNSUCCESSFUL; + } if (RemainingPath.Buffer != NULL) { if (wcschr(RemainingPath.Buffer + 1, L'\\') == NULL) - return STATUS_OBJECT_NAME_NOT_FOUND; + Status = STATUS_OBJECT_NAME_NOT_FOUND; else - return STATUS_OBJECT_PATH_NOT_FOUND; + Status =STATUS_OBJECT_PATH_NOT_FOUND; + RtlFreeUnicodeString(&RemainingPath); + ObDereferenceObject(Object); + return Status; } - if (Object == NULL) - return STATUS_UNSUCCESSFUL; Status = ObCreateHandle(PsGetCurrentProcess(), Object,

19 years, 4 months

[hpoussin] 14949: Add i8042prt.sys and kbdclass.sys to boot cd

by hpoussin＠svn.reactos.com

Add i8042prt.sys and kbdclass.sys to boot cd Remove leftover of keyboard.sys and psaux.sys drivers (Pointed by Usurp) Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-05-02 14:15:56 UTC (rev 14948) +++ trunk/reactos/bootdata/hivesys.inf 2005-05-02 16:35:58 UTC (rev 14949) @@ -574,13 +574,6 @@ ;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Start",0x00010001,0x00000 004 ;HKLM,"SYSTEM\CurrentControlSet\Services\Ide","Type",0x00010001,0x000000 01 -; Keyboard driver -;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","ErrorControl",0x000 10001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Group",0x00000000," Keyboard Port" -;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","ImagePath",0x000200 00,"system32\drivers\keyboard.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Start",0x00010001,0 x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\Keyboard","Type",0x00010001,0x 00000001 - ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","ErrorControl",0x00010 001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\i8042Prt","Group",0x00000000,"Ke yboard Port" @@ -856,14 +849,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Start",0x00010001,0x0 0000002 HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00 000010 -; PS/2 mouse port driver -;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","ErrorControl",0x000100 01,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Group",0x00000000,"Poi nter Port" -;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","ImagePath",0x00020000, "system32\drivers\psaux.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Start",0x00010001,0x00 000004 -;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux","Type",0x00010001,0x000 00001 -;HKLM,"SYSTEM\CurrentControlSet\Services\Psaux\Parameters","DisableExte nsionDetection",0x00010001,0x00000000 - ; RPC service HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001 ,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"% SystemRoot%\system32\rpcss.exe" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-05-02 14:15:56 UTC (rev 14948) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-05-02 16:35:58 UTC (rev 14949) @@ -43,8 +43,9 @@ drivers\fs\ms\msfs.sys 2 drivers\fs\mup\mup.sys 2 drivers\fs\np\npfs.sys 2 +drivers\input\i8042prt\i8042prt.sys 2 +drivers\input\kbdclass\kbdclass.sys 2 drivers\input\mouclass\mouclass.sys 2 -drivers\input\psaux\psaux.sys 2 drivers\input\sermouse\sermouse.sys 2 drivers\net\afd\afd.sys 2 drivers\net\ndis\ndis.sys 2

19 years, 4 months

← Newer
1
...
73
74
75
76
77
78
79
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005