Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[gvg] 20503: Fix a memory leak

by gvg＠svn.reactos.org

Fix a memory leak Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c 2006-01-01 11:34:59 UTC (rev 20502) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c 2006-01-01 11:41:05 UTC (rev 20503) @@ -69,7 +69,6 @@ #define IS_LOOPBACK_ADDR(addr) \ ((ntohl(addr) & IN_CLASSA_NET) == (IN_LOOPBACKNET << IN_CLASSA_NSHIFT)) - /* * Tcp output routine: figure out what should be sent and send it. */ @@ -87,6 +86,9 @@ int idle, sendalot; struct rmxp_tao *taop; struct rmxp_tao tao_noncached; +#ifdef __REACTOS__ + struct mbuf *n; +#endif OS_DbgPrint(OSK_MID_TRACE,("Called\n")); @@ -732,6 +734,18 @@ #endif error = ip_output(m, tp->t_inpcb->inp_options, &tp->t_inpcb->inp_route, so->so_options & SO_DONTROUTE, 0); +#ifdef __REACTOS__ + /* We allocated m, so we are responsible for freeing it. If the mbuf + contains a pointer to an external datablock, we (or rather, m_copy) + didn't allocate it but pointed it to the data to send. So we have + to cheat a little bit and keep M_FREE from freeing the external + data block */ + while (NULL != m) { + m->m_flags &= ~M_EXT; + MFREE(m, n); + m = n; + } +#endif } if (error) { out:

18 years, 8 months

[gvg] 20502: Silence debug message

by gvg＠svn.reactos.org

Silence debug message Modified: trunk/reactos/lib/rtl/env.c _____ Modified: trunk/reactos/lib/rtl/env.c --- trunk/reactos/lib/rtl/env.c 2006-01-01 10:40:23 UTC (rev 20501) +++ trunk/reactos/lib/rtl/env.c 2006-01-01 11:34:59 UTC (rev 20502) @@ -567,7 +567,7 @@ if (SysEnvUsed == TRUE) RtlReleasePebLock(); - DPRINT1("Return STATUS_VARIABLE_NOT_FOUND: %wZ\n", Name); + DPRINT("Return STATUS_VARIABLE_NOT_FOUND: %wZ\n", Name); return(STATUS_VARIABLE_NOT_FOUND); }

18 years, 8 months

[mf] 20501: explorer: merge changes from lean explorer branch (shell namespace iteration, icon extraction)

by mf＠svn.reactos.org

explorer: merge changes from lean explorer branch (shell namespace iteration, icon extraction) Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.h Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/entries.h Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/winfs.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -246,6 +246,7 @@ item.iItem = ListView_InsertItem(_list_ctrl, &item); // We could use the information in _sort to enable manual sorting while populating the list. item.mask = LVIF_TEXT; + item.iSubItem = 1; item.pszText = (LPTSTR)(LPCTSTR)cache_entry._path; ListView_SetItem(_list_ctrl, &item); _____ Modified: trunk/reactos/subsys/system/explorer/explorer.h --- trunk/reactos/subsys/system/explorer/explorer.h 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/explorer.h 2006-01-01 10:40:23 UTC (rev 20501) @@ -26,11 +26,20 @@ // +#define _LIGHT_STARTMENU +#define _LAZY_ICONEXTRACT +#define _SINGLE_ICONEXTRACT +//#define _NO_WIN_FS + + #include "utility/shellclasses.h" #include "shell/entries.h" +#ifndef _NO_WIN_FS #include "shell/winfs.h" +#endif + #include "shell/shellfs.h" #ifndef ROSSHELL _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -326,16 +326,20 @@ ICON_ID icon_id = ICID_NONE; - if (get_path(path, COUNTOF(path)) && _tcsncmp(path,TEXT("::{"),3)) + // not for ET_SHELL to display the correct desktop icon + if (_etype!=ET_SHELL && get_path(path, COUNTOF(path))) icon_id = g_Globals._icon_cache.extract(path, flags); if (icon_id == ICID_NONE) { - if (!(flags & (ICF_OPEN|ICF_OVERLAYS))) { + if (!(flags & ICF_OVERLAYS)) { IExtractIcon* pExtract; if (SUCCEEDED(GetUIObjectOf(0, IID_IExtractIcon, (LPVOID*)&pExtract))) { unsigned gil_flags; int idx; + if (flags & ICF_OPEN) + gil_flags |= GIL_OPENICON; + if (SUCCEEDED(pExtract->GetIconLocation(GIL_FORSHELL, path, COUNTOF(path), &idx, &gil_flags))) { if (gil_flags & GIL_NOTFILENAME) icon_id = g_Globals._icon_cache.extract(pExtract, path, idx, flags); @@ -377,7 +381,7 @@ const ShellPath& pidl_abs = create_absolute_pidl(); LPCITEMIDLIST pidl = pidl_abs; - int shgfi_flags = SHGFI_SYSICONINDEX|SHGFI_PIDL; + int shgfi_flags = SHGFI_PIDL; if (!(flags & ICF_LARGE)) shgfi_flags |= SHGFI_SMALLICON; @@ -385,15 +389,19 @@ if (flags & ICF_OPEN) shgfi_flags |= SHGFI_OPENICON; - // ICF_OVERLAYS is not supported in this case. + if (flags & ICF_SYSCACHE) { + assert(!(flags&ICF_OVERLAYS)); - HIMAGELIST himlSys = (HIMAGELIST) SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), shgfi_flags); - if (himlSys) - icon_id = g_Globals._icon_cache.add(sfi.iIcon); - /* - if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_PIDL|SHGFI_ICON|(g_Globals._large_icons? SHGFI_SMALLICON: 0))) - icon_id = g_Globals._icon_cache.add(sfi.hIcon)._id; - */ + HIMAGELIST himlSys = (HIMAGELIST) SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX|shgfi_flags); + if (himlSys) + icon_id = g_Globals._icon_cache.add(sfi.iIcon); + } else { + if (flags & ICF_OVERLAYS) + shgfi_flags |= SHGFI_ADDOVERLAYS; + + if (SHGetFileInfo((LPCTSTR)pidl, 0, &sfi, sizeof(sfi), SHGFI_ICON|shgfi_flags)) + icon_id = g_Globals._icon_cache.add(sfi.hIcon); + } } } @@ -675,9 +683,11 @@ memcpy(path+1, name, l*sizeof(TCHAR)); len += l+1; - if ( etype == ET_WINDOWS && entry->_up && !(entry->_up->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) // a NTFS stream? +#ifndef _NO_WIN_FS + if (etype == ET_WINDOWS && entry->_up && !(entry->_up->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) // a NTFS stream? path[0] = TEXT(':'); else +#endif path[0] = TEXT('\\'); } _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.h --- trunk/reactos/subsys/system/explorer/shell/entries.h 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/entries.h 2006-01-01 10:40:23 UTC (rev 20501) @@ -28,7 +28,9 @@ enum ENTRY_TYPE { ET_UNKNOWN, +#ifndef _NO_WIN_FS ET_WINDOWS, +#endif #ifdef __WINE__ ET_UNIX, #endif _____ Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp --- trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -39,6 +39,7 @@ : super(hmdiclient), _etype(etype) { +#ifndef _NO_WIN_FS if (etype == ET_UNKNOWN) #ifdef __WINE__ if (*path == '/') @@ -46,6 +47,7 @@ else #endif _etype = ET_WINDOWS; +#endif _path = path; @@ -134,20 +136,6 @@ _right = NULL; switch(info._etype) { - case ET_SHELL: { //@@ separate FileChildWindow into ShellChildWindow, WinChildWindow, UnixChildWindow ? - _root._drive_type = DRIVE_UNKNOWN; - _root._sort_order = SORT_NAME; - - lstrcpy(drv, TEXT("\\")); - lstrcpy(_root._volname, TEXT("Desktop")); - _root._fs_flags = 0; - lstrcpy(_root._fs, TEXT("Shell")); - - _root._entry = new ShellDirectory(GetDesktopFolder(), DesktopFolderPath(), hwnd); - const ShellChildWndInfo& shell_info = static_cast<const ShellChildWndInfo&>(info); - entry = _root.read_tree(&*shell_info._shell_path); - break;} - #ifdef __WINE__ case ET_UNIX: _root._drive_type = GetDriveType(info._path); @@ -207,6 +195,7 @@ } break;} +#ifndef _NO_WIN_FS default: // ET_WINDOWS _root._drive_type = GetDriveType(info._path); _root._sort_order = SORT_NAME; @@ -217,6 +206,24 @@ lstrcpy(_root._path, drv); _root._entry = new WinDirectory(_root._path); entry = _root.read_tree(info._path+_tcslen(_root._path)); + break; +#else + default: +#endif + + case ET_SHELL: { //@@ separate FileChildWindow into ShellChildWindow, WinChildWindow, UnixChildWindow ? + _root._drive_type = DRIVE_UNKNOWN; + _root._sort_order = SORT_NAME; + + lstrcpy(drv, TEXT("\\")); + lstrcpy(_root._volname, TEXT("Desktop")); + _root._fs_flags = 0; + lstrcpy(_root._fs, TEXT("Shell")); + + _root._entry = new ShellDirectory(GetDesktopFolder(), DesktopFolderPath(), hwnd); + const ShellChildWndInfo& shell_info = static_cast<const ShellChildWndInfo&>(info); + entry = _root.read_tree(&*shell_info._shell_path); + break;} } if (_root._entry) { _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -794,6 +794,7 @@ TBBUTTON drivebarBtn = {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0}; +#ifndef _NO_WIN_FS PTSTR p; #ifndef _NO_REBAR @@ -808,10 +809,12 @@ IDW_DRIVEBAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, &drivebarBtn, 1, 16, 13, 16, 13, sizeof(TBBUTTON)); #endif +#endif CheckMenuItem(_menu_info._hMenuView, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); +#ifndef _NO_WIN_FS GetLogicalDriveStrings(BUFFER_LEN, _drives); // register windows drive root strings @@ -835,6 +838,7 @@ while(*p++); } +#endif #ifndef _NO_REBAR @@ -856,6 +860,7 @@ rbBand.cx = 284; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); +#ifndef _NO_WIN_FS rbBand.fStyle |= RBBS_BREAK; rbBand.lpText = TEXT("Drives"); rbBand.hwndChild = _hdrivebar; @@ -864,6 +869,7 @@ rbBand.cx = 400; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif +#endif } @@ -937,13 +943,13 @@ TCHAR buffer[MAX_PATH]; LPCTSTR path; - ShellPath root_path = DesktopFolderPath(); + ShellPath shell_path = DesktopFolderPath(); if (lparam) { if (wparam & OWM_PIDL) { // take over PIDL from lparam - root_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window - FileSysShellPath fsp(root_path); + shell_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window + FileSysShellPath fsp(shell_path); path = fsp; if (path) { @@ -954,7 +960,7 @@ } else { // take over path from lparam path = (LPCTSTR)lparam; - root_path = path; // create as "rooted" window + shell_path = path; // create as "rooted" window } } else { ///@todo read paths and window placements from registry @@ -972,7 +978,7 @@ OBJ_CONTEXT("create ShellChildWndInfo", path); // Shell Namespace as default view - ShellChildWndInfo create_info(_hmdiclient, path, root_path); + ShellChildWndInfo create_info(_hmdiclient, path, shell_path); create_info._pos.showCmd = wparam&OWM_SEPARATE? SW_SHOWNORMAL: SW_SHOWMAXIMIZED; create_info._pos.rcNormalPosition.left = CW_USEDEFAULT; @@ -1010,6 +1016,7 @@ if (SendMessage(hwndClient, PM_DISPATCH_COMMAND, MAKELONG(id,code), 0)) return 0; +#ifndef _NO_WIN_FS if (id>=ID_DRIVE_FIRST && id<=ID_DRIVE_FIRST+0xFF) { TCHAR drv[_MAX_DRIVE], path[MAX_PATH]; LPCTSTR root = _drives; @@ -1034,6 +1041,7 @@ return 1; } +#endif switch(id) { case ID_WINDOW_NEW: { @@ -1064,9 +1072,11 @@ toggle_child(_hwnd, id, _hextrabar, 1); break; +#ifndef _NO_WIN_FS case ID_VIEW_DRIVE_BAR: toggle_child(_hwnd, id, _hdrivebar, 2); break; +#endif #ifdef __WINE__ case ID_DRIVE_UNIX_FS: { @@ -1174,10 +1184,12 @@ { super::frame_get_clientspace(prect); +#ifndef _NO_WIN_FS if (IsWindowVisible(_hdrivebar)) { ClientRect rt(_hdrivebar); prect->top += rt.bottom+2; } +#endif } void MDIMainFrame::resize_frame(int cx, int cy) @@ -1208,6 +1220,7 @@ // rect.bottom -= rt.bottom; } +#ifndef _NO_WIN_FS if (IsWindowVisible(_hdrivebar)) { SendMessage(_hdrivebar, WM_SIZE, 0, 0); WindowRect rt(_hdrivebar); @@ -1216,6 +1229,7 @@ rect.top = new_top; // rect.bottom -= rt.bottom; } +#endif } if (IsWindowVisible(_hstatusbar)) { @@ -1476,13 +1490,13 @@ TCHAR buffer[MAX_PATH]; LPCTSTR path; - ShellPath root_path = DesktopFolderPath(); + ShellPath shell_path = DesktopFolderPath(); if (lparam) { if (wparam & OWM_PIDL) { // take over PIDL from lparam - root_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window - FileSysShellPath fsp(root_path); + shell_path.assign((LPCITEMIDLIST)lparam); // create as "rooted" window + FileSysShellPath fsp(shell_path); path = fsp; if (path) { @@ -1493,7 +1507,7 @@ } else { // take over path from lparam path = (LPCTSTR)lparam; - root_path = path; // create as "rooted" window + shell_path = path; // create as "rooted" window } } else { ///@todo read paths and window placements from registry @@ -1501,10 +1515,15 @@ *buffer = '\0'; path = buffer; - root_path = path; + shell_path = path; } - jump_to(root_path, wparam); //@todo content of 'path' not used any more + if (wparam & OWM_ROOTED) + _shellpath_info._root_shell_path = shell_path; + else + _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DESKTOP, _hwnd); // CSIDL_DRIVES + + jump_to(shell_path, wparam); //@todo content of 'path' not used any more return TRUE;} // success default: def: @@ -1620,8 +1639,6 @@ delete _shellBrowser.release(); } - ///@todo use OWM_ROOTED flag - // create explorer treeview if (_shellpath_info._open_mode & OWM_EXPLORE) { if (!_left_hwnd) { @@ -1709,7 +1726,6 @@ } else */{ _shellpath_info._open_mode = mode; _shellpath_info._shell_path = path; - _shellpath_info._root_shell_path = SpecialFolderPath(CSIDL_DRIVES, _hwnd); //@@ path update_shell_browser(); } @@ -1726,7 +1742,6 @@ } else { _shellpath_info._open_mode = mode; _shellpath_info._shell_path = path; - _shellpath_info._root_shell_path = path; //@@ MF 02.10.2005 was: SpecialFolderPath(CSIDL_DRIVES, _hwnd); update_shell_browser(); } _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.h --- trunk/reactos/subsys/system/explorer/shell/mainframe.h 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.h 2006-01-01 10:40:23 UTC (rev 20501) @@ -112,7 +112,9 @@ HWND _hmdiclient; WindowHandle _hextrabar; +#ifndef _NO_WIN_FS WindowHandle _hdrivebar; +#endif protected: LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam); @@ -128,7 +130,9 @@ virtual bool go_to(LPCTSTR url, bool new_window); +#ifndef _NO_WIN_FS TCHAR _drives[BUFFER_LEN]; +#endif }; #endif _____ Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp --- trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -1,5 +1,5 @@ /* - * Copyright 2004 Martin Fuchs + * Copyright 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -262,12 +262,14 @@ entry = NULL; +#ifndef _NO_WIN_FS if (*w32fd.cFileName>='A' &&*w32fd.cFileName<='Z' && w32fd.cFileName[1]==':') if (!_tcsncmp(buffer,TEXT("\\??\\"),4) || // NT4 !_tcsncmp(buffer,TEXT("\\GLOBAL??"),9)) { // XP w32fd.dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY; entry = new WinDirectory(this, w32fd.cFileName); } +#endif if (!entry) entry = new NtObjDirectory(this, buffer); _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp --- trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/shellbrowser.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -117,26 +117,31 @@ //LOG(FmtString(TEXT("ShellBrowser::jump_to(): pidl=%s"), (LPCTSTR)FileSysShellPath(pidl))); + // We could call read_tree() here to iterate through the hierarchy and open all folders + // from _create_info._root_shell_path (_cur_dir) to _create_info._shell_path (pidl). + // To make it easier we just use ILFindChild() instead. if (_cur_dir) { static DynamicFct<LPITEMIDLIST(WINAPI*)(LPCITEMIDLIST, LPCITEMIDLIST)> ILFindChild(TEXT("SHELL32"), 24); -/*@todo - we should call read_tree() here to iterate through the hierarchy and open all folders from _create_info._root_shell_path (_cur_dir) to _create_info._shell_path (pidl) - _root._entry->read_tree(_create_info._root_shell_path.get_folder(), info._shell_path, SORT_NAME); - -> see FileChildWindow::FileChildWindow()_create_info._shell_path -*/ + if (ILFindChild) { + for(;;) { + LPCITEMIDLIST child_pidl = (*ILFindChild)(_cur_dir->create_absolute_pidl(), pidl); + if (!child_pidl || !child_pidl->mkid.cb) + break; - LPCITEMIDLIST child_pidl; + _cur_dir->smart_scan(); - if (ILFindChild) - child_pidl = (*ILFindChild)(_cur_dir->create_absolute_pidl(), pidl); - else - child_pidl = pidl; // This is not correct in the common case, but works on the desktop level. + entry = _cur_dir->find_entry(child_pidl); + if (!entry) + break; - if (child_pidl) { + _cur_dir = static_cast<ShellDirectory*>(entry); + _callback->entry_selected(entry); + } + } else { _cur_dir->smart_scan(); - entry = _cur_dir->find_entry(child_pidl); + entry = _cur_dir->find_entry(pidl); // This is not correct in the common case, but works on the desktop level. if (entry) { _cur_dir = static_cast<ShellDirectory*>(entry); @@ -145,7 +150,7 @@ } } - //@@ work around as long as we don't iterate correctly through the ShellEntry tree + // If not already called, now directly call UpdateFolderView() using pidl if (!entry) UpdateFolderView(ShellFolder(pidl)); } @@ -325,6 +330,12 @@ HandleException(e, g_Globals._hMainWnd); } + // remove old children items + for(HTREEITEM hchild,hnext=TreeView_GetChild(_left_hwnd, hParentItem); hchild=hnext; ) { + hnext = TreeView_GetNextSibling(_left_hwnd, hchild); + TreeView_DeleteItem(_left_hwnd, hchild); + } + TV_ITEM tvItem; TV_INSERTSTRUCT tvInsert; @@ -623,8 +634,6 @@ delete _shellBrowser.release(); } - ///@todo use OWM_ROOTED flag - // create explorer treeview if (_create_info._open_mode & OWM_EXPLORE) { if (!_left_hwnd) { _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -240,6 +240,7 @@ /*if (_folder.empty()) return;*/ +#ifndef _NO_WIN_FS TCHAR buffer[MAX_PATH]; if ((scan_flags&SCAN_FILESYSTEM) && get_path(buffer, COUNTOF(buffer)) && _tcsncmp(buffer,TEXT("::{"),3)) { @@ -304,7 +305,7 @@ DWORD attribs = SFGAO_FILESYSTEM; if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - attribs |= SFGAO_FOLDER; + attribs |= SFGAO_FOLDER|SFGAO_HASSUBFOLDER; if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_READONLY) attribs |= SFGAO_READONLY; @@ -332,9 +333,11 @@ FindClose(hFind); } + } + else // !SCAN_FILESYSTEM +#endif + { - } else { // !SCAN_FILESYSTEM - ShellItemEnumerator enumerator(_folder, SHCONTF_FOLDERS|SHCONTF_NONFOLDERS|SHCONTF_INCLUDEHIDDEN|SHCONTF_SHAREAB LE|SHCONTF_STORAGE); TCHAR name[MAX_PATH]; _____ Modified: trunk/reactos/subsys/system/explorer/shell/winfs.cpp --- trunk/reactos/subsys/system/explorer/shell/winfs.cpp 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/shell/winfs.cpp 2006-01-01 10:40:23 UTC (rev 20501) @@ -1,5 +1,5 @@ /* - * Copyright 2003, 2004 Martin Fuchs + * Copyright 2003, 2004, 2005 Martin Fuchs * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,6 +28,8 @@ #include <precomp.h> +#ifndef _NO_WIN_FS + //#include "winfs.h" @@ -138,6 +140,19 @@ if (hFind != INVALID_HANDLE_VALUE) { do { +#ifdef _NO_WIN_FS //@todo not really correct: We shouldn't hide . and .. + // ignore hidden files (usefull in the start menu) + if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + continue; + + // ignore directory entries "." and ".." + if ((w32fd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) && + w32fd.cFileName[0]==TEXT('.') && + (w32fd.cFileName[1]==TEXT('\0') || + (w32fd.cFileName[1]==TEXT('.') && w32fd.cFileName[2]==TEXT('\0')))) + continue; +#endif + lstrcpy(pname+1, w32fd.cFileName); if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) @@ -175,7 +190,8 @@ last = entry; // There is always at least one entry, because FindFirstFile() succeeded and we don't filter the file entries. } while(FindNextFile(hFind, &w32fd)); - last->_next = NULL; + if (last) + last->_next = NULL; FindClose(hFind); } @@ -245,3 +261,5 @@ return ShellPath(); } + +#endif // _NO_WIN_FS _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.h --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.h 2006-01-01 10:31:35 UTC (rev 20500) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.h 2006-01-01 10:40:23 UTC (rev 20501) @@ -26,11 +26,6 @@ // -#define _LIGHT_STARTMENU -#define _LAZY_ICONEXTRACT -#define _SINGLE_ICONEXTRACT - - #define CLASSNAME_STARTMENU TEXT("ReactosStartmenuClass") #define TITLE_STARTMENU TEXT("Start Menu")

18 years, 8 months

[ekohl] 20500: Forward ChangeServiceConfig2A, QueryServiceConfig2A/W and EnumServicesStatusExA to services.exe

by ekohl＠svn.reactos.org

Forward ChangeServiceConfig2A, QueryServiceConfig2A/W and EnumServicesStatusExA to services.exe Modified: trunk/reactos/include/idl/svcctl.idl Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/service/scm.c Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/include/idl/svcctl.idl --- trunk/reactos/include/idl/svcctl.idl 2006-01-01 10:24:27 UTC (rev 20499) +++ trunk/reactos/include/idl/svcctl.idl 2006-01-01 10:31:35 UTC (rev 20500) @@ -329,17 +329,17 @@ [in, out, ref] LPDWORD lpcchBuffer); /* Function 34 */ - /* ScmrGetCurrentGroupStateW */ + DWORD ScmrGetCurrentGroupStateW([in] handle_t BindingHandle); /* FIXME */ /* Function 35 */ - /* ScmrEnumServiceGroupW */ + DWORD ScmrEnumServiceGroupW([in] handle_t BindingHandle); /* FIXME */ /* Function 36 */ -// DWORD ScmrChangeServiceConfig2A([in] handle_t BindingHandle, -// [in] SC_HANDLE hService, -// [in] DWORD dwInfoLevel, -// [in, size_is(dwInfoSize)] LPBYTE lpInfo, -// [in] DWORD dwInfoSize); + DWORD ScmrChangeServiceConfig2A([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwInfoLevel, + [in, size_is(dwInfoSize)] LPBYTE lpInfo, + [in] DWORD dwInfoSize); /* Function 37 */ DWORD ScmrChangeServiceConfig2W([in] handle_t BindingHandle, @@ -349,10 +349,20 @@ [in] DWORD dwInfoSize); /* Function 38 */ - /* ScmrQueryServiceConfig2A */ + DWORD ScmrQueryServiceConfig2A([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwInfoLevel, + [out, unique, size_is(cbBufSize)] LPBYTE lpBuffer, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded); /* Function 39 */ - /* ScmrQueryServiceConfig2W */ + DWORD ScmrQueryServiceConfig2W([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] DWORD dwInfoLevel, + [out, unique, size_is(cbBufSize)] LPBYTE lpBuffer, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded); /* Function 40 */ DWORD ScmrQueryServiceStatusEx([in] handle_t BindingHandle, @@ -363,17 +373,17 @@ [out] LPDWORD pcbBytesNeeded); /* Function 41 */ -// DWORD ScmrEnumServicesStatusExA([in] handle_t BindingHandle, -// [in] SC_HANDLE hService, -// [in] SC_ENUM_TYPE InfoLevel, -// [in] DWORD dwServiceType, -// [in] DWORD dwServiceState, -// [out, unique, size_is(cbBufSize)] LPBYTE lpServices, -// [in] DWORD cbBufSize, -// [out] LPDWORD pcbBytesNeeded, -// [out] LPDWORD lpServicesReturned, -// [in, out, unique] LPDWORD lpResumeHandle, -// [in, string] LPCSTR pszGroupName); + DWORD ScmrEnumServicesStatusExA([in] handle_t BindingHandle, + [in] SC_HANDLE hService, + [in] SC_ENUM_TYPE InfoLevel, + [in] DWORD dwServiceType, + [in] DWORD dwServiceState, + [out, unique, size_is(cbBufSize)] LPBYTE lpServices, + [in] DWORD cbBufSize, + [out] LPDWORD pcbBytesNeeded, + [out] LPDWORD lpServicesReturned, + [in, out, unique] LPDWORD lpResumeHandle, + [in, string] LPCSTR pszGroupName); /* Function 42 */ DWORD ScmrEnumServicesStatusExW([in] handle_t BindingHandle, _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2006-01-01 10:24:27 UTC (rev 20499) +++ trunk/reactos/lib/advapi32/advapi32.def 2006-01-01 10:31:35 UTC (rev 20500) @@ -58,7 +58,7 @@ BuildTrusteeWithSidA@8 BuildTrusteeWithSidW@8 ;CancelOverlappedAccess@4 -;ChangeServiceConfig2A@12 +ChangeServiceConfig2A@12 ChangeServiceConfig2W@12 ChangeServiceConfigA@44 ChangeServiceConfigW@44 _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2006-01-01 10:24:27 UTC (rev 20499) +++ trunk/reactos/lib/advapi32/service/scm.c 2006-01-01 10:31:35 UTC (rev 20500) @@ -78,6 +78,59 @@ /********************************************************************** + * ChangeServiceConfig2A + * + * @implemented + */ +BOOL WINAPI +ChangeServiceConfig2A(SC_HANDLE hService, + DWORD dwInfoLevel, + LPVOID lpInfo) +{ + DWORD lpInfoSize; + DWORD dwError; + + DPRINT("ChangeServiceConfig2A() called\n"); + + /* Determine the length of the lpInfo parameter */ + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + lpInfoSize = sizeof(SERVICE_DESCRIPTIONA); + break; + + case SERVICE_CONFIG_FAILURE_ACTIONS: + lpInfoSize = sizeof(SERVICE_FAILURE_ACTIONSA); + break; + + default: + DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (lpInfo == NULL) + return TRUE; + + HandleBind(); + + dwError = ScmrChangeServiceConfig2A(BindingHandle, + (unsigned int)hService, + dwInfoLevel, + lpInfo, + lpInfoSize); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrChangeServiceConfig2A() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + return TRUE; +} + + +/********************************************************************** * ChangeServiceConfig2W * * @implemented @@ -96,11 +149,13 @@ switch (dwInfoLevel) { case SERVICE_CONFIG_DESCRIPTION: - lpInfoSize = sizeof(SERVICE_DESCRIPTION); + lpInfoSize = sizeof(SERVICE_DESCRIPTIONW); break; + case SERVICE_CONFIG_FAILURE_ACTIONS: - lpInfoSize = sizeof(SERVICE_FAILURE_ACTIONS); + lpInfoSize = sizeof(SERVICE_FAILURE_ACTIONSW); break; + default: DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); SetLastError(ERROR_INVALID_PARAMETER); @@ -652,23 +707,60 @@ /********************************************************************** * EnumServicesStatusA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -EnumServicesStatusA( - SC_HANDLE hSCManager, - DWORD dwServiceType, - DWORD dwServiceState, - LPENUM_SERVICE_STATUSA lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned, - LPDWORD lpResumeHandle) +BOOL STDCALL +EnumServicesStatusA(SC_HANDLE hSCManager, + DWORD dwServiceType, + DWORD dwServiceState, + LPENUM_SERVICE_STATUSA lpServices, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, + LPDWORD lpResumeHandle) { - DPRINT1("EnumServicesStatusA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPENUM_SERVICE_STATUSA lpStatusPtr; + DWORD dwError = ERROR_SUCCESS; + DWORD dwCount; + + DPRINT("EnumServicesStatusA() called\n"); + + HandleBind(); + + dwError = ScmrEnumServicesStatusA(BindingHandle, + (unsigned int)hSCManager, + dwServiceType, + dwServiceState, + (unsigned char *)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle); + + lpStatusPtr = (LPENUM_SERVICE_STATUSA)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrEnumServicesStatusA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT("ScmrEnumServicesStatusA() done\n"); + + return TRUE; } @@ -735,24 +827,64 @@ /********************************************************************** * EnumServicesStatusExA * - * @unimplemented + * @implemented */ -BOOL -STDCALL -EnumServicesStatusExA(SC_HANDLE hSCManager, - SC_ENUM_TYPE InfoLevel, - DWORD dwServiceType, - DWORD dwServiceState, - LPBYTE lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned, - LPDWORD lpResumeHandle, - LPCSTR pszGroupName) +BOOL STDCALL +EnumServicesStatusExA(SC_HANDLE hSCManager, + SC_ENUM_TYPE InfoLevel, + DWORD dwServiceType, + DWORD dwServiceState, + LPBYTE lpServices, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, + LPDWORD lpResumeHandle, + LPCSTR pszGroupName) { - DPRINT1("EnumServicesStatusExA is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + LPENUM_SERVICE_STATUS_PROCESSA lpStatusPtr; + DWORD dwError = ERROR_SUCCESS; + DWORD dwCount; + + DPRINT("EnumServicesStatusExA() called\n"); + + HandleBind(); + + dwError = ScmrEnumServicesStatusExA(BindingHandle, + (unsigned int)hSCManager, + (unsigned long)InfoLevel, + dwServiceType, + dwServiceState, + (unsigned char *)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle, + (char *)pszGroupName); + + lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSA)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrEnumServicesStatusExA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + DPRINT("ScmrEnumServicesStatusExA() done\n"); + + return TRUE; } @@ -777,7 +909,7 @@ DWORD dwError = ERROR_SUCCESS; DWORD dwCount; - DPRINT1("EnumServicesStatusExW() called\n"); + DPRINT("EnumServicesStatusExW() called\n"); HandleBind(); @@ -814,7 +946,7 @@ return FALSE; } - DPRINT1("ScmrEnumServicesStatusExW() done\n"); + DPRINT("ScmrEnumServicesStatusExW() done\n"); return TRUE; } @@ -1313,38 +1445,150 @@ /********************************************************************** * QueryServiceConfig2A * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceConfig2A( - SC_HANDLE hService, - DWORD dwInfo, - LPBYTE lpBuffer, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded) +BOOL STDCALL +QueryServiceConfig2A(SC_HANDLE hService, + DWORD dwInfoLevel, + LPBYTE lpBuffer, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceConfig2A is unimplemented\n"); - return FALSE; + DWORD dwError; + + DPRINT("QueryServiceConfig2A(%p, %lu, %p, %lu, %p)\n", + hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceConfig2A(BindingHandle, + (unsigned int)hService, + dwInfoLevel, + (unsigned char *)lpBuffer, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrQueryServiceConfig2A() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + { + LPSERVICE_DESCRIPTIONA lpPtr = (LPSERVICE_DESCRIPTIONA)lpBuffer; + + if (lpPtr->lpDescription != NULL) + lpPtr->lpDescription = + (LPSTR)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpDescription); + } + break; + + case SERVICE_CONFIG_FAILURE_ACTIONS: + { + LPSERVICE_FAILURE_ACTIONSA lpPtr = (LPSERVICE_FAILURE_ACTIONSA)lpBuffer; + + if (lpPtr->lpRebootMsg != NULL) + lpPtr->lpRebootMsg = + (LPSTR)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpRebootMsg); + + if (lpPtr->lpCommand != NULL) + lpPtr->lpCommand = + (LPSTR)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpCommand); + + if (lpPtr->lpsaActions != NULL) + lpPtr->lpsaActions = + (SC_ACTION*)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpsaActions); + } + break; + + default: + DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + DPRINT("QueryServiceConfig2A() done\n"); + + return TRUE; } /********************************************************************** * QueryServiceConfig2W * - * @unimplemented + * @implemented */ -BOOL -STDCALL -QueryServiceConfig2W( - SC_HANDLE hService, - DWORD dwInfo, - LPBYTE lpBuffer, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded) +BOOL STDCALL +QueryServiceConfig2W(SC_HANDLE hService, + DWORD dwInfoLevel, + LPBYTE lpBuffer, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) { - DPRINT1("QueryServiceConfig2W is unimplemented\n"); - return FALSE; + DWORD dwError; + + DPRINT("QueryServiceConfig2W(%p, %lu, %p, %lu, %p)\n", + hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); + + HandleBind(); + + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceConfig2W(BindingHandle, + (unsigned int)hService, + dwInfoLevel, + (unsigned char *)lpBuffer, + cbBufSize, + pcbBytesNeeded); + if (dwError != ERROR_SUCCESS) + { + DPRINT("ScmrQueryServiceConfig2W() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + switch (dwInfoLevel) + { + case SERVICE_CONFIG_DESCRIPTION: + { + LPSERVICE_DESCRIPTIONW lpPtr = (LPSERVICE_DESCRIPTIONW)lpBuffer; + + if (lpPtr->lpDescription != NULL) + lpPtr->lpDescription = + (LPWSTR)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpDescription); + } + break; + + case SERVICE_CONFIG_FAILURE_ACTIONS: + { + LPSERVICE_FAILURE_ACTIONSW lpPtr = (LPSERVICE_FAILURE_ACTIONSW)lpBuffer; + + if (lpPtr->lpRebootMsg != NULL) + lpPtr->lpRebootMsg = + (LPWSTR)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpRebootMsg); + + if (lpPtr->lpCommand != NULL) + lpPtr->lpCommand = + (LPWSTR)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpCommand); + + if (lpPtr->lpsaActions != NULL) + lpPtr->lpsaActions = + (SC_ACTION*)((UINT_PTR)lpPtr + (UINT_PTR)lpPtr->lpsaActions); + } + break; + + default: + DPRINT1("Unknown info level 0x%lx\n", dwInfoLevel); + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + DPRINT("QueryServiceConfig2W() done\n"); + + return TRUE; } _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2006-01-01 10:24:27 UTC (rev 20499) +++ trunk/reactos/subsys/system/services/rpcserver.c 2006-01-01 10:31:35 UTC (rev 20500) @@ -2105,15 +2105,34 @@ /* Function 34 */ -/* ScmrGetCurrentGroupStateW */ +unsigned long +ScmrGetCurrentGroupStateW(handle_t BindingHandle) +{ + DPRINT1("ScmrGetCurrentGroupStateW() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} /* Function 35 */ -/* ScmrEnumServiceGroupW */ +unsigned long +ScmrEnumServiceGroupW(handle_t BindingHandle) +{ + DPRINT1("ScmrEnumServiceGroupW() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} /* Function 36 */ -/* ScmrChangeServiceConfig2A */ +unsigned long +ScmrChangeServiceConfig2A(handle_t BindingHandle, + unsigned int hService, + unsigned long dwInfoLevel, + unsigned char *lpInfo, + unsigned long dwInfoSize) +{ + DPRINT1("ScmrChangeServiceConfig2A() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} /* Function 37 */ @@ -2130,11 +2149,31 @@ /* Function 38 */ -/* ScmrQueryServiceConfig2A */ +unsigned long +ScmrQueryServiceConfig2A(handle_t BindingHandle, + unsigned int hService, + unsigned long dwInfoLevel, + unsigned char *lpBuffer, + unsigned long cbBufSize, + unsigned long *pcbBytesNeeded) +{ + DPRINT1("ScmrQueryServiceConfig2A() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} /* Function 39 */ -/* ScmrQueryServiceConfig2W */ +unsigned long +ScmrQueryServiceConfig2W(handle_t BindingHandle, + unsigned int hService, + unsigned long dwInfoLevel, + unsigned char *lpBuffer, + unsigned long cbBufSize, + unsigned long *pcbBytesNeeded) +{ + DPRINT1("ScmrQueryServiceConfig2W() is unimplemented\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} /* Function 40 */ @@ -2199,7 +2238,24 @@ /* Function 41 */ -/* ScmrEnumServicesStatusExA */ +unsigned long +ScmrEnumServicesStatusExA(handle_t BindingHandle, + unsigned int hSCManager, + unsigned long InfoLevel, + unsigned long dwServiceType, + unsigned long dwServiceState, + unsigned char *lpServices, + unsigned long dwBufSize, + unsigned long *pcbBytesNeeded, + unsigned long *lpServicesReturned, + unsigned long *lpResumeHandle, + char *pszGroupName) +{ + DPRINT1("ScmrEnumServicesStatusExA() is unimplemented\n"); + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; + return ERROR_CALL_NOT_IMPLEMENTED; +} /* Function 42 */ @@ -2290,9 +2346,17 @@ if (pszGroupName) { - if ((CurrentService->lpGroup == NULL) || - _wcsicmp(pszGroupName, CurrentService->lpGroup->lpGroupName)) - continue; + if (*pszGroupName == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupName, CurrentService->lpGroup->lpGroupName)) + continue; + } } dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + @@ -2337,9 +2401,17 @@ if (pszGroupName) { - if ((CurrentService->lpGroup == NULL) || - _wcsicmp(pszGroupName, CurrentService->lpGroup->lpGroupName)) - continue; + if (*pszGroupName == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupName, CurrentService->lpGroup->lpGroupName)) + continue; + } } dwRequiredSize += (sizeof(ENUM_SERVICE_STATUS_PROCESSW) + @@ -2380,9 +2452,17 @@ if (pszGroupName) { - if ((CurrentService->lpGroup == NULL) || - _wcsicmp(pszGroupName, CurrentService->lpGroup->lpGroupName)) - continue; + if (*pszGroupName == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupName, CurrentService->lpGroup->lpGroupName)) + continue; + } } dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) +

18 years, 8 months

[gvg] 20499: Revert part of r20493. Created bug 1229 to keep track of the issue.

by gvg＠svn.reactos.org

Revert part of r20493. Created bug 1229 to keep track of the issue. Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/subsys/smss/initpage.c _____ Modified: trunk/reactos/ntoskrnl/mm/pagefile.c --- trunk/reactos/ntoskrnl/mm/pagefile.c 2006-01-01 01:09:08 UTC (rev 20498) +++ trunk/reactos/ntoskrnl/mm/pagefile.c 2006-01-01 10:24:27 UTC (rev 20499) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: ntoskrnl/mm/pagefile.c * PURPOSE: Paging file functions @@ -897,22 +896,18 @@ BytesPerAllocationUnit = FsSizeInformation.SectorsPerAllocationUnit * FsSizeInformation.BytesPerSector; - - /* We have to find a value which is a multiple of both PAGE_SIZE and - BytesPerAllocationUnit */ - SafeInitialSize.u.LowPart = ((SafeInitialSize.u.LowPart + PAGE_SIZE - 1) / - PAGE_SIZE) * PAGE_SIZE; - while (0 != (SafeInitialSize.u.LowPart % BytesPerAllocationUnit) && - SafeInitialSize.u.LowPart <= SafeMaximumSize.u.LowPart - PAGE_SIZE) + /* FIXME: If we have 2048 BytesPerAllocationUnit (FAT16 < 128MB) there is + * a problem if the paging file is fragmented. Suppose the first cluster + * of the paging file is cluster 3042 but cluster 3043 is NOT part of the + * paging file but of another file. We can't write a complete page (4096 + * bytes) to the physical location of cluster 3042 then. */ + if (BytesPerAllocationUnit % PAGE_SIZE) { - SafeInitialSize.u.LowPart += PAGE_SIZE; - } - if (0 != (SafeInitialSize.u.LowPart % BytesPerAllocationUnit)) - { + DPRINT1("BytesPerAllocationUnit %d is not a multiple of PAGE_SIZE %d\n", + BytesPerAllocationUnit, PAGE_SIZE); ZwClose(FileHandle); - return STATUS_ALLOTTED_SPACE_EXCEEDED; + return STATUS_UNSUCCESSFUL; } - ASSERT(0 == (SafeInitialSize.u.LowPart % PAGE_SIZE)); Status = ZwSetInformationFile(FileHandle, &IoStatus, _____ Modified: trunk/reactos/subsys/smss/initpage.c --- trunk/reactos/subsys/smss/initpage.c 2006-01-01 01:09:08 UTC (rev 20498) +++ trunk/reactos/subsys/smss/initpage.c 2006-01-01 10:24:27 UTC (rev 20499) @@ -225,8 +225,8 @@ 0); if (! NT_SUCCESS(Status)) { - PrintString("Creation of paging file %wZ with size %I64d KB failed (status 0x%x\n", - &FileName, InitialSize.QuadPart / 1024); + PrintString("Creation of paging file %wZ with size %I64d KB failed (status 0x%x)\n", + &FileName, InitialSize.QuadPart / 1024, Status); } Cleanup:

18 years, 8 months

[greatlrd] 20498: ShowCursor, gott a internal count to show the mouse or not, and return that value. as msdn descripe.

by greatlrd＠svn.reactos.org

ShowCursor, gott a internal count to show the mouse or not, and return that value. as msdn descripe. Modified: trunk/reactos/subsys/win32k/eng/mouse.c Modified: trunk/reactos/subsys/win32k/include/dc.h Modified: trunk/reactos/subsys/win32k/ntuser/misc.c Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-12-31 23:04:53 UTC (rev 20497) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2006-01-01 01:09:08 UTC (rev 20498) @@ -211,7 +211,7 @@ return; } - if (pgp->ShowPointer == 1) + if (pgp->ShowPointer < 0) { return ; } _____ Modified: trunk/reactos/subsys/win32k/include/dc.h --- trunk/reactos/subsys/win32k/include/dc.h 2005-12-31 23:04:53 UTC (rev 20497) +++ trunk/reactos/subsys/win32k/include/dc.h 2006-01-01 01:09:08 UTC (rev 20498) @@ -134,7 +134,7 @@ HSURF ColorSurface; HSURF MaskSurface; HSURF SaveSurface; - BOOL ShowPointer; + int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ /* public pointer information */ RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-12-31 23:04:53 UTC (rev 20497) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2006-01-01 01:09:08 UTC (rev 20498) @@ -191,17 +191,18 @@ BITMAPOBJ *BitmapObj; GDIDEVICE *ppdev; GDIPOINTER *pgp; + int showpointer=0; if(!(Screen = IntGetScreenDC())) { - return 1; /* No mouse */ + return showpointer; /* No mouse */ } PDC dc = DC_LockDc(Screen); if (!dc) { - return 1; /* No mouse */ + return showpointer; /* No mouse */ } dcbmp = dc->w.hBitmap; @@ -211,14 +212,14 @@ if ( !BitmapObj ) { BITMAPOBJ_UnlockBitmap(BitmapObj); - return 1; /* No Mouse */ + return showpointer; /* No Mouse */ } SurfObj = &BitmapObj->SurfObj; if (SurfObj == NULL) { BITMAPOBJ_UnlockBitmap(BitmapObj); - return 1; /* No mouse */ + return showpointer; /* No mouse */ } ppdev = GDIDEV(SurfObj); @@ -226,7 +227,7 @@ if(ppdev == NULL) { BITMAPOBJ_UnlockBitmap(BitmapObj); - return 1; /* No mouse */ + return showpointer; /* No mouse */ } pgp = &ppdev->Pointer; @@ -235,9 +236,11 @@ if (Param == FALSE) { - if (CurInfo->ShowingCursor != 0) - { - pgp->ShowPointer = 1; + pgp->ShowPointer--; + showpointer = pgp->ShowPointer; + + if (showpointer >= 0) + { //ppdev->SafetyRemoveCount = 1; //ppdev->SafetyRemoveLevel = 1; EngMovePointer(SurfObj,-1,-1,NULL); @@ -247,16 +250,21 @@ } else { + pgp->ShowPointer++; + showpointer = pgp->ShowPointer; + /* Show Cursor */ - pgp->ShowPointer = 0; - //ppdev->SafetyRemoveCount = 0; - //ppdev->SafetyRemoveLevel = 0; - EngMovePointer(SurfObj,-1,-1,NULL); - CurInfo->ShowingCursor = CURSOR_SHOWING; + if (showpointer < 0) + { + //ppdev->SafetyRemoveCount = 0; + //ppdev->SafetyRemoveLevel = 0; + EngMovePointer(SurfObj,-1,-1,NULL); + CurInfo->ShowingCursor = CURSOR_SHOWING; + } } BITMAPOBJ_UnlockBitmap(BitmapObj); - return 0; + return showpointer; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c --- trunk/reactos/subsys/win32k/ntuser/stubs.c 2005-12-31 23:04:53 UTC (rev 20497) +++ trunk/reactos/subsys/win32k/ntuser/stubs.c 2006-01-01 01:09:08 UTC (rev 20498) @@ -365,6 +365,35 @@ int nBufPoints, DWORD resolution) { +/* + if (cbSize != sizeof (MOUSEMOVEPOINT) + { + SetLastWin32Error(GMMP_ERR_POINT_NOT_FOUND); + return GMMP_ERR_POINT_NOT_FOUND; + } + + if (!lppt) + { + SetLastWin32Error(GMMP_ERR_POINT_NOT_FOUND); + return GMMP_ERR_POINT_NOT_FOUND; + } + + if (!lpptBuf) + { + SetLastWin32Error(GMMP_ERR_POINT_NOT_FOUND); + return GMMP_ERR_POINT_NOT_FOUND; + } + + switch(resolution) + { + case GMMP_USE_DISPLAY_POINTS: + case GMMP_USE_HIGH_RESOLUTION_POINTS: + break; + default: + SetLastWin32Error(GMMP_ERR_POINT_NOT_FOUND); + return GMMP_ERR_POINT_NOT_FOUND; + } + */ UNIMPLEMENTED return 0;

18 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006