Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 18938: implemented RtlSelfRelativeToAbsoluteSD2 for 32 and 64 bit builds
by weiden＠svn.reactos.com 01 Nov '05

01 Nov '05

implemented RtlSelfRelativeToAbsoluteSD2 for 32 and 64 bit builds Modified: trunk/reactos/lib/rtl/sd.c _____ Modified: trunk/reactos/lib/rtl/sd.c --- trunk/reactos/lib/rtl/sd.c 2005-11-01 20:30:17 UTC (rev 18937) +++ trunk/reactos/lib/rtl/sd.c 2005-11-01 21:53:36 UTC (rev 18938) @@ -726,14 +726,157 @@ /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI RtlSelfRelativeToAbsoluteSD2(PISECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, PULONG BufferSize) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PISECURITY_DESCRIPTOR AbsSD = SelfRelativeSecurityDescriptor; + PISECURITY_DESCRIPTOR_RELATIVE RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)SelfRelativeSecurityDescriptor; +#ifdef _WIN64 + PVOID DataStart; + ULONG DataSize; + ULONG OwnerLength; + ULONG GroupLength; + ULONG DaclLength; + ULONG SaclLength; +#endif + PSID pOwner; + PSID pGroup; + PACL pDacl; + PACL pSacl; + + PAGED_CODE_RTL(); + + if (SelfRelativeSecurityDescriptor == NULL) + { + return STATUS_INVALID_PARAMETER_1; + } + if (BufferSize == NULL) + { + return STATUS_INVALID_PARAMETER_2; + } + + if (RelSD->Revision != SECURITY_DESCRIPTOR_REVISION1) + { + return STATUS_UNKNOWN_REVISION; + } + if (!(RelSD->Control & SE_SELF_RELATIVE)) + { + return STATUS_BAD_DESCRIPTOR_FORMAT; + } + + ASSERT(FIELD_OFFSET(SECURITY_DESCRIPTOR, Owner) == + FIELD_OFFSET(SECURITY_DESCRIPTOR_RELATIVE, Owner)); + +#ifdef _WIN64 + + RtlpQuerySecurityDescriptor(SelfRelativeSecurityDescriptor, + &pOwner, + &OwnerLength, + &pGroup, + &GroupLength, + &pDacl, + &DaclLength, + &pSacl, + &SaclLength); + + ASSERT(sizeof(SECURITY_DESCRIPTOR) > sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + + DataSize = OwnerLength + GroupLength + DaclLength + SaclLength; + if (*BufferSize < sizeof(SECURITY_DESCRIPTOR) + DataSize) + { + *BufferSize = sizeof(SECURITY_DESCRIPTOR) + DataSize; + return STATUS_BUFFER_TOO_SMALL; + } + + if (DataSize != 0) + { + /* calculate the start of the data area, we simply just move the data by + the difference between the size of the relative and absolute security + descriptor structure */ + DataStart = pOwner; + if ((pGroup != NULL && (ULONG_PTR)pGroup < (ULONG_PTR)DataStart) || DataStart == NULL) + DataStart = pGroup; + if ((pDacl != NULL && (ULONG_PTR)pDacl < (ULONG_PTR)DataStart) || DataStart == NULL) + DataStart = pDacl; + if ((pSacl != NULL && (ULONG_PTR)pSacl < (ULONG_PTR)DataStart) || DataStart == NULL) + DataStart = pSacl; + + /* if DataSize != 0 ther must be at least one SID or ACL in the security + descriptor! Also the data area must be located somewhere after the + end of the SECURITY_DESCRIPTOR_RELATIVE structure */ + ASSERT(DataStart != NULL); + ASSERT((ULONG_PTR)DataStart >= (ULONG_PTR)(RelSD + 1)); + + /* it's time to move the data */ + RtlMoveMemory((PVOID)(AbsSD + 1), + DataStart, + DataSize); + + /* adjust the pointers if neccessary */ + if (pOwner != NULL) + AbsSD->Owner = (PSID)((ULONG_PTR)pOwner + + sizeof(SECURITY_DESCRIPTOR) - sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + else + AbsSD->Owner = NULL; + + if (pGroup != NULL) + AbsSD->Group = (PSID)((ULONG_PTR)pGroup + + sizeof(SECURITY_DESCRIPTOR) - sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + else + AbsSD->Group = NULL; + + if (pSacl != NULL) + AbsSD->Sacl = (PACL)((ULONG_PTR)pSacl + + sizeof(SECURITY_DESCRIPTOR) - sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + else + AbsSD->Sacl = NULL; + + if (pDacl != NULL) + AbsSD->Dacl = (PACL)((ULONG_PTR)pDacl + + sizeof(SECURITY_DESCRIPTOR) - sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + else + AbsSD->Dacl = NULL; + } + else + { + /* all pointers must be NULL! */ + ASSERT(pOwner == NULL); + ASSERT(pGroup == NULL); + ASSERT(pSacl == NULL); + ASSERT(pDacl == NULL); + + AbsSD->Owner = NULL; + AbsSD->Group = NULL; + AbsSD->Dacl = NULL; + AbsSD->Sacl = NULL; + } + + /* clear the self-relative flag */ + AbsSD->Control &= ~SE_SELF_RELATIVE; + +#else + + RtlpQuerySecurityDescriptorPointers(SelfRelativeSecurityDescriptor, + &pOwner, + &pGroup, + &pSacl, + &pDacl); + + ASSERT(sizeof(SECURITY_DESCRIPTOR) == sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + + /* clear the self-relative flag and simply convert the offsets to pointers */ + AbsSD->Control &= ~SE_SELF_RELATIVE; + AbsSD->Owner = pOwner; + AbsSD->Group = pGroup; + AbsSD->Sacl = pDacl; + AbsSD->Dacl = pSacl; + +#endif + + return STATUS_SUCCESS; }

1 0

[mf] 18937: create two new functions String::str() and String::toLower() to avoid _tcslwr() calls and allow convenient string conversions
by mf＠svn.reactos.com 01 Nov '05

01 Nov '05

create two new functions String::str() and String::toLower() to avoid _tcslwr() calls and allow convenient string conversions Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp Modified: trunk/reactos/subsys/system/explorer/shell/unixfs.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp Modified: trunk/reactos/subsys/system/explorer/utility/utility.h _____ Modified: trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp --- trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/dialogs/searchprogram.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -151,9 +151,7 @@ TCHAR buffer[1024]; GetWindowText(GetDlgItem(_hwnd, IDC_FILTER), buffer, COUNTOF(buffer)); -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr(buffer); -#endif + CharLower(buffer); _lwr_filter = buffer; HiddenWindow hide_listctrl(_list_ctrl); @@ -230,10 +228,8 @@ String lwr_path = cache_entry._path; String lwr_name = cache_entry._entry->_display_name; -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr(&lwr_path.at(0)); - _tcslwr(&lwr_name.at(0)); -#endif + lwr_path.toLower(); + lwr_name.toLower(); if (_lwr_filter.empty()) if (_tcsstr(lwr_name, _T("uninstal")) || _tcsstr(lwr_name, _T("deinstal"))) // filter out deinstallation links _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -182,9 +182,7 @@ const FileTypeInfo& FileTypeManager::operator[](String ext) { -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr(&ext.at(0)); -#endif + ext.toLower(); iterator found = find(ext); if (found != end()) @@ -414,9 +412,7 @@ { CachePair key(path, idx); -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr(&key.first.at(0)); -#endif + key.first.toLower(); PathIdxMap::iterator found = _pathIdxMap.find(key); _____ Modified: trunk/reactos/subsys/system/explorer/shell/entries.cpp --- trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/shell/entries.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -514,7 +514,7 @@ LPCTSTR name = NULL; TCHAR buffer[MAX_PATH]; - if ( !path || 0 == path_count ) + if (!path || path_count==0) return false; const Entry* entry; _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -679,7 +679,7 @@ tvi.hInsertAfter = TVI_LAST; tvi.item.mask = TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE; ResString sFavorites(IDS_FAVORITES); - tvi.item.pszText = (LPTSTR)sFavorites.c_str(); + tvi.item.pszText = sFavorites.str(); tvi.item.iSelectedImage = tvi.item.iImage = 0; HTREEITEM hitem_bookmarks = TreeView_InsertItem(_hsidebar, &tvi); @@ -1673,7 +1673,7 @@ TCHAR path[MAX_PATH]; - if (shell_entry->get_path(path,COUNTOF(path))) { + if (shell_entry->get_path(path, COUNTOF(path))) { String url; if (path[0] == ':') _____ Modified: trunk/reactos/subsys/system/explorer/shell/shellfs.cpp --- trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/shell/shellfs.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -128,7 +128,7 @@ // get full path of a shell entry bool ShellEntry::get_path(PTSTR path, size_t path_count) const { - if ( !path || 0 == path_count ) + if (!path || path_count==0) return false; /* path[0] = TEXT('\0'); @@ -152,7 +152,7 @@ { CONTEXT("ShellDirectory::get_path()"); - if ( !path || 0 == path_count ) + if (!path || path_count==0) return false; path[0] = TEXT('\0'); _____ Modified: trunk/reactos/subsys/system/explorer/shell/unixfs.cpp --- trunk/reactos/subsys/system/explorer/shell/unixfs.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/shell/unixfs.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -161,7 +161,7 @@ int level = 0; size_t len = 0; - if ( !path || 0 == path_count ) + if (!path || path_count==0) return false; if ( path_count > 1 ) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp --- trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/taskbar/quicklaunch.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -282,7 +282,7 @@ NMTTDISPINFO* ttdi = (NMTTDISPINFO*) pnmh; int id = ttdi->hdr.idFrom; - ttdi->lpszText = (LPTSTR)_entries[id]._title.c_str(); + ttdi->lpszText = _entries[id]._title.str(); #ifdef TTF_DI_SETITEM ttdi->uFlags |= TTF_DI_SETITEM; #endif _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -257,9 +257,7 @@ *ignore_name = '\0'; String lwr_filter = _create_info._filter; -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr((LPTSTR)lwr_filter.c_str()); -#endif + lwr_filter.toLower(); int cnt = 0; for(Entry*entry=dir._down; entry; entry=entry->_next) { @@ -281,10 +279,8 @@ String lwr_name = entry->_data.cFileName; String lwr_disp = entry->_display_name; -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr((LPTSTR)lwr_name.c_str()); - _tcslwr((LPTSTR)lwr_disp.c_str()); -#endif + lwr_name.toLower(); + lwr_disp.toLower(); if (!_tcsstr(lwr_name,lwr_filter) && !_tcsstr(lwr_disp,lwr_filter)) continue; @@ -1548,7 +1544,6 @@ try { // insert directory "<user name>\Start Menu" - ShellDirectory usr_startmenu(GetDesktopFolder(), SpecialFolderPath(CSIDL_STARTMENU, _hwnd), _hwnd); _dirs.push_back(StartMenuDirectory(usr_startmenu, (LPCTSTR)SpecialFolderFSPath(CSIDL_PROGRAMS, _hwnd))); } catch(COMException&) { @@ -2217,9 +2212,7 @@ super::AddEntries(); String lwr_filter = _create_info._filter; -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr((LPTSTR)lwr_filter.c_str()); -#endif + lwr_filter.toLower(); for(BookmarkList::iterator it=_bookmarks.begin(); it!=_bookmarks.end(); ++it) { BookmarkNode& node = *it; @@ -2246,11 +2239,9 @@ String lwr_desc = bookmark._description; String lwr_url = bookmark._url; -#ifndef __WINE__ ///@todo _tcslwr() for Wine - _tcslwr((LPTSTR)lwr_name.c_str()); - _tcslwr((LPTSTR)lwr_desc.c_str()); - _tcslwr((LPTSTR)lwr_url.c_str()); -#endif + lwr_name.toLower(); + lwr_desc.toLower(); + lwr_url.toLower(); if (!_tcsstr(lwr_name,lwr_filter) && !_tcsstr(lwr_desc,lwr_filter) && !_tcsstr(lwr_url,lwr_filter)) continue; _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp --- trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/taskbar/traynotify.cpp 2005-11-01 20:30:17 UTC (rev 18937) @@ -555,7 +555,7 @@ static ResString sShowIcons(IDS_SHOW_HIDDEN_ICONS); static ResString sHideIcons(IDS_HIDE_ICONS); - pdi->lpszText = (LPTSTR)(_show_hidden? sHideIcons: sShowIcons).c_str(); + pdi->lpszText = (_show_hidden? sHideIcons: sShowIcons).str(); } else { NotifyIconSet::iterator found = IconHitTest(pt); @@ -565,7 +565,7 @@ // enable multiline tooltips (break at CR/LF and for very long one-line strings) SendMessage(pnmh->hwndFrom, TTM_SETMAXTIPWIDTH, 0, 400); - pdi->lpszText = (LPTSTR)entry._tipText.c_str(); + pdi->lpszText = entry._tipText.str(); } } } @@ -974,24 +974,24 @@ tv.mask = TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE; ResString str_cur(IDS_ITEMS_CUR); - tv.pszText = (LPTSTR)str_cur.c_str(); + tv.pszText = str_cur.str(); tv.iSelectedImage = tv.iImage = 0; // IDI_DOT _hitemCurrent = TreeView_InsertItem(_tree_ctrl, &tvi); ResString str_conf(IDS_ITEMS_CONFIGURED); - tv.pszText = (LPTSTR)str_conf.c_str(); + tv.pszText = str_conf.str(); tv.iSelectedImage = tv.iImage = 2; // IDI_DOT_RED _hitemConfig = TreeView_InsertItem(_tree_ctrl, &tvi); tvi.hParent = _hitemCurrent; ResString str_visible(IDS_ITEMS_VISIBLE); - tv.pszText = (LPTSTR)str_visible.c_str(); + tv.pszText = str_visible.str(); tv.iSelectedImage = tv.iImage = 0; // IDI_DOT _hitemCurrent_visible = TreeView_InsertItem(_tree_ctrl, &tvi); ResString str_hidden(IDS_ITEMS_HIDDEN); - tv.pszText = (LPTSTR)str_hidden.c_str(); + tv.pszText = str_hidden.str(); tv.iSelectedImage = tv.iImage = 1; // IDI_DOT_TRANS _hitemCurrent_hidden = TreeView_InsertItem(_tree_ctrl, &tvi); @@ -1075,7 +1075,7 @@ tv.mask = TVIF_TEXT|TVIF_IMAGE|TVIF_SELECTEDIMAGE|TVIF_PARAM; tv.lParam = (LPARAM)idx; - tv.pszText = (LPTSTR)txt.c_str(); + tv.pszText = txt.str(); tv.iSelectedImage = tv.iImage = ImageList_AddAlphaIcon(_himl, hicon, GetStockBrush(WHITE_BRUSH), hdc); (void)TreeView_InsertItem(_tree_ctrl, &tvi); } _____ Modified: trunk/reactos/subsys/system/explorer/utility/utility.h --- trunk/reactos/subsys/system/explorer/utility/utility.h 2005-11-01 18:53:37 UTC (rev 18936) +++ trunk/reactos/subsys/system/explorer/utility/utility.h 2005-11-01 20:30:17 UTC (rev 18937) @@ -798,6 +798,8 @@ operator wstring() const {WCHAR b[BUFFER_LEN]; return wstring(b, MultiByteToWideChar(CP_ACP, 0, c_str(), -1, b, BUFFER_LEN)-1);} #endif + LPTSTR str() {return (LPTSTR)data();} /// return modifyable character string pointer + String& printf(LPCTSTR fmt, ...) { va_list l; @@ -839,6 +841,12 @@ return *this; } + + void toLower() + { + if (!empty()) + CharLower(str()); + } }; #define _STRING_DEFINED

1 0

[greatlrd] 18936: do not try free memmory at exit it seam like the DdDeleteDirectDrawObject doing it for us, and it does not crash any longer at exists
by greatlrd＠svn.reactos.com 01 Nov '05

01 Nov '05

do not try free memmory at exit it seam like the DdDeleteDirectDrawObject doing it for us, and it does not crash any longer at exists Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 18:42:50 UTC (rev 18935) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 18:53:37 UTC (rev 18936) @@ -315,6 +315,7 @@ DdDeleteDirectDrawObject (&This->DirectDrawGlobal); + /* if(This->DirectDrawGlobal.lpDDKernelCaps) HeapFree(GetProcessHeap(), 0, This->DirectDrawGlobal.lpDDKernelCaps); @@ -344,6 +345,7 @@ if(This->DirectDrawGlobal.lpD3DGlobalDriverData) HeapFree(GetProcessHeap(), 0, (PVOID)This->DirectDrawGlobal.lpD3DGlobalDriverData); + */ } _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 18:42:50 UTC (rev 18935) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 18:53:37 UTC (rev 18936) @@ -80,6 +80,7 @@ This->Local.lpGbl = &This->Global; This->Local.lpSurfMore = &This->More; + /* FIXME do a memcopy */ This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps;

1 0

[greatlrd] 18935: Fixed a crach. and do not hardcode the flag ddsd to primersurface amd other value.
by greatlrd＠svn.reactos.com 01 Nov '05

01 Nov '05

Fixed a crach. and do not hardcode the flag ddsd to primersurface amd other value. Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 18:27:09 UTC (rev 18934) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 18:42:50 UTC (rev 18935) @@ -60,11 +60,7 @@ /************ Create Surface ***********************/ - /* FIXME we are skipping filling in some data, I do not care for now */ - - LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; - This->ddsd.dwFlags = DDSD_CAPS; - This->ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + /* FIXME we are skipping filling in some data, I do not care for now */ /* surface global struct */ memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); @@ -72,8 +68,8 @@ This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; - + /* surface more struct */ memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); @@ -87,18 +83,17 @@ /* FIXME do a memcopy */ This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; - /* for the double pointer below */ - DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; - pLocal[0] = &This->Local; - pLocal[1] = NULL; + /* for the double pointer below */ + This->pLocal[0] = &This->Local; + This->pLocal[1] = NULL; /* the parameter struct */ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); - CreateData.lpDD = pDirectDrawGlobal; + CreateData.lpDD = &This->owner->DirectDrawGlobal; CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; CreateData.dwSCnt = 1; - CreateData.lplpSList = pLocal; + CreateData.lplpSList = This->pLocal; CreateData.ddRVal = DD_FALSE; /* this is the call we were waiting for */

1 0

[greatlrd] 18934: split up CreateSurface to hal and hel interface
by greatlrd＠svn.reactos.com 01 Nov '05

01 Nov '05

split up CreateSurface to hal and hel interface Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c Modified: trunk/reactos/lib/ddraw/main/surface_main.c Modified: trunk/reactos/lib/ddraw/rosdraw.h Modified: trunk/reactos/lib/ddraw/soft/surface_hel.c _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-01 18:27:09 UTC (rev 18934) @@ -10,6 +10,112 @@ #include "rosdraw.h" +HRESULT Hal_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) +{ + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + + if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) + return DDERR_UNSUPPORTED; + + This->owner = (IDirectDrawImpl*)pDD; + + /************ fill the discription of our primary surface ***********************/ + memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); + This->ddsd.dwSize = sizeof(DDSURFACEDESC); + + RtlCopyMemory(&This->ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(Th is->ddsd.ddckCKDestBlt)); + RtlCopyMemory(&This->ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,s izeof(This->ddsd.ddckCKDestOverlay)); + RtlCopyMemory(&This->ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(This ->ddsd.ddckCKSrcBlt)); + RtlCopyMemory(&This->ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,siz eof(This->ddsd.ddckCKSrcOverlay)); + RtlCopyMemory(&This->ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeo f(This->ddsd.ddpfPixelFormat)); + RtlCopyMemory(&This->ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(This->ddsd.dds Caps)); + + This->ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; + This->ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; + This->ddsd.dwFlags = pDDSD2->dwFlags; + This->ddsd.dwHeight = pDDSD2->dwHeight; + This->ddsd.dwLinearSize = pDDSD2->dwLinearSize; + This->ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; + This->ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; + This->ddsd.dwReserved = pDDSD2->dwReserved; + This->ddsd.dwWidth = pDDSD2->dwWidth; + This->ddsd.lPitch = pDDSD2->lPitch; + This->ddsd.lpSurface = pDDSD2->lpSurface; + + /************ Test see if we can Create Surface ***********************/ + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) + { + /* can the driver create the surface */ + DDHAL_CANCREATESURFACEDATA CanCreateData; + memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); + CanCreateData.lpDD = &This->owner->DirectDrawGlobal; + CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; + + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + + if(CanCreateData.ddRVal != DD_OK) + return CanCreateData.ddRVal; + } + + /************ Create Surface ***********************/ + + /* FIXME we are skipping filling in some data, I do not care for now */ + + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; + This->ddsd.dwFlags = DDSD_CAPS; + This->ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + + /* surface global struct */ + memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + This->Global.lpDD = &This->owner->DirectDrawGlobal; + This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; + This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; + This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; + + + /* surface more struct */ + memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + /* surface local struct */ + + memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + This->Local.lpGbl = &This->Global; + This->Local.lpSurfMore = &This->More; + + /* FIXME do a memcopy */ + This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; + + /* for the double pointer below */ + DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; + pLocal[0] = &This->Local; + pLocal[1] = NULL; + + /* the parameter struct */ + DDHAL_CREATESURFACEDATA CreateData; + memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); + CreateData.lpDD = pDirectDrawGlobal; + CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; + CreateData.dwSCnt = 1; + CreateData.lplpSList = pLocal; + CreateData.ddRVal = DD_FALSE; + + /* this is the call we were waiting for */ + if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateD ata) == DDHAL_DRIVER_NOTHANDLED) + return DDERR_INVALIDPARAMS; + + /* FIXME remove the if and debug string*/ + if(CreateData.ddRVal != DD_OK) + return CreateData.ddRVal; + + OutputDebugString(L"This does hit By Ati Readon but not for nvida :( "); + OutputDebugString(L"Yet ;)"); + + return DD_OK; +} + + HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rDest, LPDIRECTDRAWSURFACE7 src, LPRECT rSrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { _____ Modified: trunk/reactos/lib/ddraw/main/surface_main.c --- trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/main/surface_main.c 2005-11-01 18:27:09 UTC (rev 18934) @@ -13,107 +13,16 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) { - IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; + IDirectDrawSurfaceImpl* This = (IDirectDrawSurfaceImpl*)iface; - if(sizeof(DDSURFACEDESC2) != pDDSD2->dwSize) - return DDERR_UNSUPPORTED; + /* Call the Hal CreateSurface */ + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATESURFACE) + { + return Hal_DDrawSurface_Initialize (iface, pDD, pDDSD2); + } - This->owner = (IDirectDrawImpl*)pDD; - - /************ fill the discription of our primary surface ***********************/ - memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); - This->ddsd.dwSize = sizeof(DDSURFACEDESC); - - RtlCopyMemory(&This->ddsd.ddckCKDestBlt,&pDDSD2->ddckCKDestBlt,sizeof(Th is->ddsd.ddckCKDestBlt)); - RtlCopyMemory(&This->ddsd.ddckCKDestOverlay,&pDDSD2->ddckCKDestOverlay,s izeof(This->ddsd.ddckCKDestOverlay)); - RtlCopyMemory(&This->ddsd.ddckCKSrcBlt,&pDDSD2->ddckCKSrcBlt,sizeof(This ->ddsd.ddckCKSrcBlt)); - RtlCopyMemory(&This->ddsd.ddckCKSrcOverlay,&pDDSD2->ddckCKSrcOverlay,siz eof(This->ddsd.ddckCKSrcOverlay)); - RtlCopyMemory(&This->ddsd.ddpfPixelFormat,&pDDSD2->ddpfPixelFormat,sizeo f(This->ddsd.ddpfPixelFormat)); - RtlCopyMemory(&This->ddsd.ddsCaps,&pDDSD2->ddsCaps,sizeof(This->ddsd.dds Caps)); - - This->ddsd.dwAlphaBitDepth = pDDSD2->dwAlphaBitDepth; - This->ddsd.dwBackBufferCount = pDDSD2->dwBackBufferCount; - This->ddsd.dwFlags = pDDSD2->dwFlags; - This->ddsd.dwHeight = pDDSD2->dwHeight; - This->ddsd.dwLinearSize = pDDSD2->dwLinearSize; - This->ddsd.dwMipMapCount = pDDSD2->dwMipMapCount; - This->ddsd.dwRefreshRate = pDDSD2->dwRefreshRate; - This->ddsd.dwReserved = pDDSD2->dwReserved; - This->ddsd.dwWidth = pDDSD2->dwWidth; - This->ddsd.lPitch = pDDSD2->lPitch; - This->ddsd.lpSurface = pDDSD2->lpSurface; - - /************ Test see if we can Create Surface ***********************/ - if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) - { - /* can the driver create the surface */ - DDHAL_CANCREATESURFACEDATA CanCreateData; - memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA)); - CanCreateData.lpDD = &This->owner->DirectDrawGlobal; - CanCreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; - - if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CanCreateSurface(&CanCre ateData) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - - if(CanCreateData.ddRVal != DD_OK) - return CanCreateData.ddRVal; - } - - /************ Create Surface ***********************/ - - /* FIXME we are skipping filling in some data, I do not care for now */ - - LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal = &This->owner->DirectDrawGlobal; - This->ddsd.dwFlags = DDSD_CAPS; - This->ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - - /* surface global struct */ - memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); - This->Global.lpDD = &This->owner->DirectDrawGlobal; - This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; - This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; - This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; - - - /* surface more struct */ - memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - /* surface local struct */ - - memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); - This->Local.lpGbl = &This->Global; - This->Local.lpSurfMore = &This->More; - - /* FIXME do a memcopy */ - This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; - - /* for the double pointer below */ - DDRAWI_DDRAWSURFACE_LCL *pLocal[2]; - pLocal[0] = &This->Local; - pLocal[1] = NULL; - - /* the parameter struct */ - DDHAL_CREATESURFACEDATA CreateData; - memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); - CreateData.lpDD = pDirectDrawGlobal; - CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; - CreateData.dwSCnt = 1; - CreateData.lplpSList = pLocal; - CreateData.ddRVal = DD_FALSE; - - /* this is the call we were waiting for */ - if(This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.CreateSurface(&CreateD ata) == DDHAL_DRIVER_NOTHANDLED) - return DDERR_INVALIDPARAMS; - - /* FIXME remove the if and debug string*/ - if(CreateData.ddRVal != DD_OK) - return CreateData.ddRVal; - - OutputDebugString(L"This does hit By Ati Readon but not for nvida :( "); - OutputDebugString(L"Yet ;)"); - - return DD_OK; + /* Call Hel if Hal of CreateSurface is not supported */ + return Hel_DDrawSurface_Initialize (iface, pDD, pDDSD2); } ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) _____ Modified: trunk/reactos/lib/ddraw/rosdraw.h --- trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/rosdraw.h 2005-11-01 18:27:09 UTC (rev 18934) @@ -97,6 +97,7 @@ HRESULT Hal_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7, DWORD, DWORD, DWORD, DWORD, DWORD ); HRESULT Hal_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); +HRESULT Hal_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 , LPDIRECTDRAW , LPDDSURFACEDESC2 ); HRESULT Hel_DirectDraw_Initialize (LPDIRECTDRAW7 ); @@ -108,6 +109,7 @@ HRESULT Hel_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 ); HRESULT Hel_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 , DWORD , DWORD ,DWORD , DWORD , DWORD ); HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX ); +HRESULT Hel_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 , LPDIRECTDRAW , LPDDSURFACEDESC2 ); /*********** Macros ***********/ _____ Modified: trunk/reactos/lib/ddraw/soft/surface_hel.c --- trunk/reactos/lib/ddraw/soft/surface_hel.c 2005-11-01 17:01:36 UTC (rev 18933) +++ trunk/reactos/lib/ddraw/soft/surface_hel.c 2005-11-01 18:27:09 UTC (rev 18934) @@ -10,6 +10,11 @@ #include "rosdraw.h" +HRESULT Hel_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAW pDD, LPDDSURFACEDESC2 pDDSD2) +{ + DX_STUB; +} + HRESULT Hel_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) {

1 0

[turner] 18933: Small unicode safe changes by me. Small msvc build error fix by jvangael@wisc.edu.
by turner＠svn.reactos.com 01 Nov '05

01 Nov '05

Small unicode safe changes by me. Small msvc build error fix by jvangael(a)wisc.edu. Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/misc.c _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-11-01 16:17:25 UTC (rev 18932) +++ trunk/reactos/subsys/system/cmd/console.c 2005-11-01 17:01:36 UTC (rev 18933) @@ -178,7 +178,7 @@ &dwWritten, NULL); WriteFile (GetStdHandle (nStdHandle), - "\n", + _T("\n"), 1, &dwWritten, NULL); @@ -294,7 +294,7 @@ for(i = 0; i < len; i++) { - if(pBuf[i] == '\n') + if(pBuf[i] == _T('\n')) { LineCount++; CharEL=0; @@ -306,7 +306,7 @@ { if (i+1<len) { - if(pBuf[i+1] != '\n') LineCount++; + if(pBuf[i+1] != _T('\n')) LineCount++; } CharEL=0; } @@ -316,8 +316,8 @@ WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(CHAR),&dwWritten,NULL); if(LineCount >= ScreenLines) { - if(strnicmp(&pBuf[i], "\n", 2)!=0) - WriteFile (GetStdHandle (nStdHandle),"\n",sizeof(CHAR),&dwWritten,NULL); + if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); if(PagePrompt() != PROMPT_YES) { _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-11-01 16:17:25 UTC (rev 18932) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-11-01 17:01:36 UTC (rev 18933) @@ -74,11 +74,11 @@ VOID GetPathCase( TCHAR * Path, TCHAR * OutPath) { INT i = 0; - _tcscpy(OutPath, _T("")); TCHAR TempPath[MAX_PATH]; WIN32_FIND_DATA FindFileData; HANDLE hFind; _tcscpy(TempPath, _T("")); + _tcscpy(OutPath, _T("")); for(i = 0; i < _tcslen(Path); i++) @@ -206,7 +206,7 @@ return FALSE; } memcpy(dirpart, pattern, pathend - pattern + 1); - dirpart[pathend - pattern + 1] = '\0'; + dirpart[pathend - pattern + 1] = _T('\0'); } else { @@ -427,7 +427,7 @@ ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead) { lpString[len++] = ch; - if ((ch == '\n') || (ch == '\r')) + if ((ch == _T('\n')) || (ch == _T('\r'))) { /* break at new line*/ break; @@ -437,7 +437,7 @@ if (!dwRead && !len) return FALSE; - lpString[len++] = '\0'; + lpString[len++] = _T('\0'); #ifdef _UNICODE MultiByteToWideChar(CP_ACP, 0, lpString, len, lpBuffer, len); free(lpString); @@ -466,7 +466,7 @@ ConInEnable (); if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || - ((ir.Event.KeyEvent.wVirtualKeyCode == 'C') && + ((ir.Event.KeyEvent.wVirtualKeyCode == _T('C')) && (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) return PROMPT_BREAK; @@ -606,7 +606,7 @@ ConInEnable (); if ((ir.Event.KeyEvent.wVirtualKeyCode == VK_ESCAPE) || - ((ir.Event.KeyEvent.wVirtualKeyCode == 'C') && + ((ir.Event.KeyEvent.wVirtualKeyCode == _T('C')) && (ir.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) return PROMPT_BREAK;

1 0

[weiden] 18932: - if a file object is a named pipe don't allow the FILE_APPEND_DATA access right as it equals FILE_CREATE_PIPE_INSTANCE (NtFlushBuffersFile and NtWriteFile)
by weiden＠svn.reactos.com 01 Nov '05

01 Nov '05

- if a file object is a named pipe don't allow the FILE_APPEND_DATA access right as it equals FILE_CREATE_PIPE_INSTANCE (NtFlushBuffersFile and NtWriteFile) - add more parameters probing and capturing code Modified: trunk/reactos/ntoskrnl/io/file.c _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-11-01 14:46:34 UTC (rev 18931) +++ trunk/reactos/ntoskrnl/io/file.c 2005-11-01 16:17:25 UTC (rev 18932) @@ -755,7 +755,6 @@ IO_SECURITY_CONTEXT SecurityContext; KPROCESSOR_MODE AccessMode; HANDLE LocalHandle; - IO_STATUS_BLOCK LocalIoStatusBlock; LARGE_INTEGER SafeAllocationSize; PVOID SystemEaBuffer = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -988,7 +987,7 @@ //trigger FileObject/Event dereferencing Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->RequestorMode = AccessMode; - Irp->UserIosb = &LocalIoStatusBlock; + Irp->UserIosb = IoStatusBlock; Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; Irp->Tail.Overlay.AuxiliaryBuffer = NULL; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -1054,7 +1053,7 @@ AccessMode, FALSE, NULL); - Status = LocalIoStatusBlock.Status; + Status = IoStatusBlock->Status; } if (!NT_SUCCESS(Status)) { @@ -1069,7 +1068,6 @@ _SEH_TRY { *FileHandle = LocalHandle; - *IoStatusBlock = LocalIoStatusBlock; } _SEH_HANDLE { @@ -1380,20 +1378,41 @@ NtCancelIoFile(IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock) { - NTSTATUS Status; PFILE_OBJECT FileObject; PETHREAD Thread; PIRP Irp; KIRQL OldIrql; BOOLEAN OurIrpsInList = FALSE; LARGE_INTEGER Interval; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; - if ((ULONG_PTR)IoStatusBlock >= (ULONG_PTR)MmUserProbeAddress && - KeGetPreviousMode() != KernelMode) - return STATUS_ACCESS_VIOLATION; + PAGED_CODE(); - Status = ObReferenceObjectByHandle(FileHandle, 0, IoFileObjectType, - KeGetPreviousMode(), (PVOID*)&FileObject, + PreviousMode = KeGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + + Status = ObReferenceObjectByHandle(FileHandle, + 0, + IoFileObjectType, + PreviousMode, + (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) return Status; @@ -1531,23 +1550,39 @@ MAILSLOT_CREATE_PARAMETERS Buffer; DPRINT("NtCreateMailslotFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); + "ObjectAttributes 0x%p)\n", + FileHandle,DesiredAccess,ObjectAttributes); + PAGED_CODE(); /* Check for Timeout */ - if (TimeOut) + if (TimeOut != NULL) { - /* Enable it */ + if (KeGetPreviousMode() != KernelMode) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + Buffer.ReadTimeout = ProbeForReadLargeInteger(TimeOut); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + else + { + Buffer.ReadTimeout = *TimeOut; + } + Buffer.TimeoutSpecified = TRUE; - - /* FIXME: Add SEH */ - Buffer.ReadTimeout = *TimeOut; } else { - /* No timeout */ Buffer.TimeoutSpecified = FALSE; } @@ -1592,25 +1627,39 @@ NAMED_PIPE_CREATE_PARAMETERS Buffer; DPRINT("NtCreateNamedPipeFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); + "ObjectAttributes 0x%p)\n", + FileHandle,DesiredAccess,ObjectAttributes); + PAGED_CODE(); /* Check for Timeout */ - if (DefaultTimeout) + if (DefaultTimeout != NULL) { - /* Enable it */ + if (KeGetPreviousMode() != KernelMode) + { + NTSTATUS Status = STATUS_SUCCESS; + + _SEH_TRY + { + Buffer.DefaultTimeout = ProbeForReadLargeInteger(DefaultTimeout); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + else + { + Buffer.DefaultTimeout = *DefaultTimeout; + } + Buffer.TimeoutSpecified = TRUE; - - /* FIXME: Add SEH */ - Buffer.DefaultTimeout = *DefaultTimeout; } else - { - /* No timeout */ Buffer.TimeoutSpecified = FALSE; - } /* Set Settings */ Buffer.NamedPipeType = NamedPipeType; @@ -1724,6 +1773,8 @@ STDCALL NtFlushWriteBuffer(VOID) { + PAGED_CODE(); + KeFlushWriteBuffer(); return STATUS_SUCCESS; } @@ -1746,21 +1797,57 @@ PFILE_OBJECT FileObject = NULL; PIRP Irp; PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT DeviceObject; KEVENT Event; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; + OBJECT_HANDLE_INFORMATION ObjectHandleInfo; + KPROCESSOR_MODE PreviousMode; + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) return Status; + } + /* Get the File Object */ Status = ObReferenceObjectByHandle(FileHandle, - FILE_WRITE_DATA, - NULL, + 0, + IoFileObjectType, PreviousMode, (PVOID*)&FileObject, - NULL); - if (Status != STATUS_SUCCESS) return(Status); + &ObjectHandleInfo); + if (!NT_SUCCESS(Status)) return(Status); + /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + granted. However, if this is a named pipe, make sure we don't ask for + FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE + access right! */ + if (!(FileObject->Flags & FO_NAMED_PIPE)) + DesiredAccess |= FILE_APPEND_DATA; + if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, + DesiredAccess)) + { + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) { @@ -1968,13 +2055,18 @@ PDEVICE_OBJECT DeviceObject; PKEVENT Event = NULL; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; + LARGE_INTEGER CapturedByteOffset, CapturedLength; NTSTATUS Status = STATUS_SUCCESS; OBJECT_HANDLE_INFORMATION HandleInformation; - - /* FIXME: instead of this, use SEH */ - if (!Length || !ByteOffset) return STATUS_INVALID_PARAMETER; + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + CapturedByteOffset.QuadPart = 0; + CapturedLength.QuadPart = 0; + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, 0, @@ -1984,13 +2076,42 @@ &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - /* Must have FILE_READ_DATA | FILE_WRITE_DATA access */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + if (PreviousMode != KernelMode) { - DPRINT1("Invalid access rights\n"); - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; + /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access unless + we're in KernelMode! */ + if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + { + DPRINT1("Invalid access rights\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + CapturedLength = ProbeForReadLargeInteger(Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return Status; + } } + else + { + CapturedByteOffset = *ByteOffset; + CapturedLength = *Length; + } /* Get Event Object */ if (EventHandle) @@ -2043,7 +2164,7 @@ ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - *LocalLength = *Length; + *LocalLength = CapturedLength; /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -2060,8 +2181,8 @@ /* Set Parameters */ StackPtr->Parameters.LockControl.Length = LocalLength; - StackPtr->Parameters.LockControl.ByteOffset = *ByteOffset; - StackPtr->Parameters.LockControl.Key = Key ? Key : 0; + StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; + StackPtr->Parameters.LockControl.Key = Key; /* Set Flags */ if (FailImmediately) StackPtr->Flags = SL_FAIL_IMMEDIATELY; @@ -2709,7 +2830,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID Buffer, IN ULONG Length, - IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ + IN PLARGE_INTEGER ByteOffset OPTIONAL, IN PULONG Key OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; @@ -2717,14 +2838,19 @@ PIRP Irp = NULL; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; BOOLEAN LocalEvent = FALSE; PKEVENT EventObject = NULL; + LARGE_INTEGER CapturedByteOffset; DPRINT("NtReadFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, IoStatusBlock); + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + CapturedByteOffset.QuadPart = 0; /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) @@ -2734,11 +2860,14 @@ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - #if 0 ProbeForWrite(Buffer, Length, - sizeof(ULONG)); - #endif + 1); + if (ByteOffset != NULL) + { + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + } + /* FIXME - probe other pointers and capture information */ } _SEH_HANDLE { @@ -2748,6 +2877,13 @@ if(!NT_SUCCESS(Status)) return Status; } + else + { + if (ByteOffset != NULL) + { + CapturedByteOffset = *ByteOffset; + } + } /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, @@ -2759,9 +2895,9 @@ if (!NT_SUCCESS(Status)) return Status; /* Check the Byte Offset */ - if (!ByteOffset || - (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && - ByteOffset->u.HighPart == -1)) + if (ByteOffset == NULL || + (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && + CapturedByteOffset.u.HighPart == -1)) { /* a valid ByteOffset is required if asynch. op. */ if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) @@ -2772,7 +2908,7 @@ } /* Use the Current Byte OFfset */ - ByteOffset = &FileObject->CurrentByteOffset; + CapturedByteOffset = FileObject->CurrentByteOffset; } /* Check for event */ @@ -2821,7 +2957,7 @@ DeviceObject, Buffer, Length, - ByteOffset, + &CapturedByteOffset, EventObject, IoStatusBlock); if (Irp == NULL) @@ -3276,7 +3412,7 @@ OUT PIO_STATUS_BLOCK IoStatusBlock, IN PLARGE_INTEGER ByteOffset, IN PLARGE_INTEGER Length, - OUT ULONG Key OPTIONAL) + IN ULONG Key OPTIONAL) { PFILE_OBJECT FileObject = NULL; PLARGE_INTEGER LocalLength = NULL; @@ -3285,13 +3421,18 @@ PDEVICE_OBJECT DeviceObject; KEVENT Event; BOOLEAN LocalEvent = FALSE; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; NTSTATUS Status = STATUS_SUCCESS; + LARGE_INTEGER CapturedByteOffset, CapturedLength; OBJECT_HANDLE_INFORMATION HandleInformation; - - /* FIXME: instead of this, use SEH */ - if (!Length || !ByteOffset) return STATUS_INVALID_PARAMETER; + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + + CapturedByteOffset.QuadPart = 0; + CapturedLength.QuadPart = 0; + /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, 0, @@ -3301,13 +3442,42 @@ &HandleInformation); if (!NT_SUCCESS(Status)) return Status; - /* Must have FILE_READ_DATA | FILE_WRITE_DATA access */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + if (PreviousMode != KernelMode) { - DPRINT1("Invalid access rights\n"); - ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; + /* Must have either FILE_READ_DATA or FILE_WRITE_DATA access unless we're + in KernelMode! */ + if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_READ_DATA))) + { + DPRINT1("Invalid access rights\n"); + ObDereferenceObject(FileObject); + return STATUS_ACCESS_DENIED; + } + + _SEH_TRY + { + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + CapturedLength = ProbeForReadLargeInteger(Length); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + return Status; + } } + else + { + CapturedByteOffset = *ByteOffset; + CapturedLength = *Length; + } /* Check if this is a direct open or not */ if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN) @@ -3349,7 +3519,7 @@ ObDereferenceObject(FileObject); return STATUS_INSUFFICIENT_RESOURCES; } - *LocalLength = *Length; + *LocalLength = CapturedLength; /* Set up the IRP */ Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; @@ -3367,8 +3537,8 @@ /* Set Parameters */ StackPtr->Parameters.LockControl.Length = LocalLength; - StackPtr->Parameters.LockControl.ByteOffset = *ByteOffset; - StackPtr->Parameters.LockControl.Key = Key ? Key : 0; + StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; + StackPtr->Parameters.LockControl.Key = Key; /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); @@ -3424,34 +3594,49 @@ IN PLARGE_INTEGER ByteOffset OPTIONAL, /* NOT optional for asynch. operations! */ IN PULONG Key OPTIONAL) { - OBJECT_HANDLE_INFORMATION HandleInformation; + OBJECT_HANDLE_INFORMATION ObjectHandleInfo; NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject; PIRP Irp = NULL; PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION StackPtr; - KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + KPROCESSOR_MODE PreviousMode; BOOLEAN LocalEvent = FALSE; PKEVENT EventObject = NULL; + LARGE_INTEGER CapturedByteOffset; + ULONG CapturedKey = 0; + ACCESS_MASK DesiredAccess = FILE_WRITE_DATA; DPRINT("NtWriteFile(FileHandle 0x%p Buffer 0x%p Length %x ByteOffset 0x%p, " "IoStatusBlock 0x%p)\n", FileHandle, Buffer, Length, ByteOffset, IoStatusBlock); + PAGED_CODE(); + + PreviousMode = KeGetPreviousMode(); + CapturedByteOffset.QuadPart = 0; + /* Validate User-Mode Buffers */ if(PreviousMode != KernelMode) { _SEH_TRY { - #if 0 ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); ProbeForRead(Buffer, Length, - sizeof(ULONG)); - #endif + 1); + if (ByteOffset != NULL) + { + CapturedByteOffset = ProbeForReadLargeInteger(ByteOffset); + } + + if (Key != NULL) + { + CapturedKey = ProbeForReadUlong(Key); + } } _SEH_HANDLE { @@ -3461,6 +3646,17 @@ if(!NT_SUCCESS(Status)) return Status; } + else + { + if (ByteOffset != NULL) + { + CapturedByteOffset = *ByteOffset; + } + if (Key != NULL) + { + CapturedKey = *Key; + } + } /* Get File Object */ Status = ObReferenceObjectByHandle(FileHandle, @@ -3468,24 +3664,29 @@ IoFileObjectType, PreviousMode, (PVOID*)&FileObject, - &HandleInformation); + &ObjectHandleInfo); if (!NT_SUCCESS(Status)) return Status; - /* Must have FILE_WRITE_DATA | FILE_APPEND_DATA access */ - if (!(HandleInformation.GrantedAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA))) + /* check if the handle has either FILE_WRITE_DATA or FILE_APPEND_DATA was + granted. However, if this is a named pipe, make sure we don't ask for + FILE_APPEND_DATA as it interferes with the FILE_CREATE_PIPE_INSTANCE + access right! */ + if (!(FileObject->Flags & FO_NAMED_PIPE)) + DesiredAccess |= FILE_APPEND_DATA; + if (!RtlAreAnyAccessesGranted(ObjectHandleInfo.GrantedAccess, + DesiredAccess)) { - DPRINT1("Invalid access rights\n"); ObDereferenceObject(FileObject); return STATUS_ACCESS_DENIED; } /* Check if we got write Access */ - if (HandleInformation.GrantedAccess & FILE_WRITE_DATA) + if (ObjectHandleInfo.GrantedAccess & FILE_WRITE_DATA) { /* Check the Byte Offset */ - if (!ByteOffset || - (ByteOffset->u.LowPart == FILE_USE_FILE_POINTER_POSITION && - ByteOffset->u.HighPart == -1)) + if (ByteOffset == NULL || + (CapturedByteOffset.u.LowPart == FILE_USE_FILE_POINTER_POSITION && + CapturedByteOffset.u.HighPart == -1)) { /* a valid ByteOffset is required if asynch. op. */ if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) @@ -3496,10 +3697,11 @@ } /* Use the Current Byte OFfset */ - ByteOffset = &FileObject->CurrentByteOffset; + CapturedByteOffset = FileObject->CurrentByteOffset; } } - else if (HandleInformation.GrantedAccess & FILE_APPEND_DATA) + else if ((ObjectHandleInfo.GrantedAccess & FILE_APPEND_DATA) && + !(FileObject->Flags & FO_NAMED_PIPE)) { /* a valid ByteOffset is required if asynch. op. */ if (!(FileObject->Flags & FO_SYNCHRONOUS_IO)) @@ -3510,8 +3712,8 @@ } /* Give the drivers somethign to understand */ - ByteOffset->u.LowPart = FILE_WRITE_TO_END_OF_FILE; - ByteOffset->u.HighPart = 0xffffffff; + CapturedByteOffset.u.LowPart = FILE_WRITE_TO_END_OF_FILE; + CapturedByteOffset.u.HighPart = 0xffffffff; } /* Check if we got an event */ @@ -3560,7 +3762,7 @@ DeviceObject, Buffer, Length, - ByteOffset, + &CapturedByteOffset, EventObject, IoStatusBlock); if (Irp == NULL) @@ -3601,7 +3803,7 @@ /* Setup Stack Data */ StackPtr = IoGetNextIrpStackLocation(Irp); StackPtr->FileObject = FileObject; - StackPtr->Parameters.Write.Key = Key ? *Key : 0; + StackPtr->Parameters.Write.Key = CapturedKey; if (FileObject->Flags & FO_WRITE_THROUGH) StackPtr->Flags = SL_WRITE_THROUGH; /* Call the Driver */

1 0

[greatlrd] 18931: * Source cleanup.
by greatlrd＠svn.reactos.com 01 Nov '05

01 Nov '05

* Source cleanup. * SetMode adding a check see if it same reslution or not if it not same we change it. * SetMode adding correct check for hal or hel. choice hal if it the drv provide it. Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c _____ Modified: trunk/reactos/lib/ddraw/hal/ddraw_hal.c --- trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 13:52:22 UTC (rev 18930) +++ trunk/reactos/lib/ddraw/hal/ddraw_hal.c 2005-11-01 14:46:34 UTC (rev 18931) @@ -447,24 +447,19 @@ return FlipGdi.ddRVal; } -HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) -{ - DX_STUB; -} -#if 0 + HRESULT Hal_DirectDraw_SetDisplayMode (LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - IDirectDrawImpl* This = (IDirectDrawImpl*)iface; - + IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + DDHAL_SETMODEDATA mode; + if (!(This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE)) { return DDERR_NODRIVERSUPPORT; } - - DDHAL_SETMODEDATA mode; + mode.lpDD = &This->DirectDrawGlobal; mode.ddRVal = DDERR_NODRIVERSUPPORT; @@ -476,11 +471,8 @@ { return DDERR_NODRIVERSUPPORT; } - - BOOL dummy; - DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); - + return mode.ddRVal; } -#endif + _____ Modified: trunk/reactos/lib/ddraw/main/ddraw_main.c --- trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 13:52:22 UTC (rev 18930) +++ trunk/reactos/lib/ddraw/main/ddraw_main.c 2005-11-01 14:46:34 UTC (rev 18931) @@ -83,20 +83,35 @@ DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { IDirectDrawImpl* This = (IDirectDrawImpl*)iface; + BOOL dummy = TRUE; + DWORD ret; + + /* FIXME check the refresrate if it same if it not same do the mode switch */ + if ((This->DirectDrawGlobal.vmiData.dwDisplayHeight == dwHeight) && + (This->DirectDrawGlobal.vmiData.dwDisplayWidth == dwWidth) && + (This->DirectDrawGlobal.vmiData.ddpfDisplay.dwRGBBitCount == dwBPP)) + { + + return DD_OK; + } - /* FIXME implement hal setMode */ - if(Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, - dwBPP, dwRefreshRate, dwFlags) == DD_OK) - { - return DD_OK; + /* Check use the Hal or Hel for SetMode */ + if (This->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_SETMODE) + { + ret = Hal_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); } - - DWORD ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); - - BOOL dummy; - DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); - - return ret; + else + { + ret = Hel_DirectDraw_SetDisplayMode(iface, dwWidth, dwHeight, dwBPP, dwRefreshRate, dwFlags); + } + + if (ret == DD_OK) + { + DdReenableDirectDrawObject(&This->DirectDrawGlobal, &dummy); + /* FIXME fill the This->DirectDrawGlobal.vmiData right */ + } + + return ret; } ULONG WINAPI Main_DirectDraw_AddRef (LPDIRECTDRAW7 iface)

1 0

[ekohl] 18930: - Mark service for delete in the registry.
by ekohl＠svn.reactos.com 01 Nov '05

01 Nov '05

- Mark service for delete in the registry. Modified: trunk/reactos/subsys/system/services/config.c Modified: trunk/reactos/subsys/system/services/database.c Modified: trunk/reactos/subsys/system/services/services.h _____ Modified: trunk/reactos/subsys/system/services/config.c --- trunk/reactos/subsys/system/services/config.c 2005-11-01 13:47:40 UTC (rev 18929) +++ trunk/reactos/subsys/system/services/config.c 2005-11-01 13:52:22 UTC (rev 18930) @@ -11,7 +11,38 @@ /* FUNCTIONS *****************************************************************/ + DWORD +ScmOpenServiceKey(LPWSTR lpServiceName, + REGSAM samDesired, + PHKEY phKey) +{ + HKEY hServicesKey = NULL; + DWORD dwError; + + *phKey = NULL; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services", + 0, + KEY_READ, + &hServicesKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegOpenKeyExW(hServicesKey, + lpServiceName, + 0, + samDesired, + phKey); + + RegCloseKey(hServicesKey); + + return dwError; +} + + +DWORD ScmWriteDependencies(HKEY hServiceKey, LPWSTR lpDependencies, DWORD dwDependenciesLength) _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-11-01 13:47:40 UTC (rev 18929) +++ trunk/reactos/subsys/system/services/database.c 2005-11-01 13:52:22 UTC (rev 18930) @@ -987,9 +987,28 @@ DWORD ScmMarkServiceForDelete(PSERVICE pService) { - DPRINT1("ScmMarkServiceForDelete() called\n"); + HKEY hServiceKey = NULL; + DWORD dwValue = 1; + DWORD dwError; - return ERROR_SUCCESS; + DPRINT("ScmMarkServiceForDelete() called\n"); + + dwError = ScmOpenServiceKey(pService->lpServiceName, + KEY_WRITE, + &hServiceKey); + if (dwError != ERROR_SUCCESS) + return dwError; + + dwError = RegSetValueExW(hServiceKey, + L"DeleteFlag", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(DWORD)); + + RegCloseKey(hServiceKey); + + return dwError; } /* EOF */ _____ Modified: trunk/reactos/subsys/system/services/services.h --- trunk/reactos/subsys/system/services/services.h 2005-11-01 13:47:40 UTC (rev 18929) +++ trunk/reactos/subsys/system/services/services.h 2005-11-01 13:52:22 UTC (rev 18930) @@ -43,6 +43,10 @@ /* config.c */ +DWORD ScmOpenServiceKey(LPWSTR lpServiceName, + REGSAM samDesired, + PHKEY phKey); + DWORD ScmWriteDependencies(HKEY hServiceKey, LPWSTR lpDependencies, DWORD dwDependenciesLength);

1 0

[ekohl] 18929: Update the Indentation.
by ekohl＠svn.reactos.com 01 Nov '05

01 Nov '05

Update the Indentation. Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-11-01 12:17:25 UTC (rev 18928) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-11-01 13:47:40 UTC (rev 18929) @@ -25,37 +25,37 @@ static VOID HandleBind(VOID) { - LPWSTR pszStringBinding; - RPC_STATUS status; + LPWSTR pszStringBinding; + RPC_STATUS status; - if (BindingHandle != NULL) - return; + if (BindingHandle != NULL) + return; - status = RpcStringBindingComposeW(NULL, - L"ncacn_np", - NULL, - L"\\pipe\\ntsvcs", - NULL, - &pszStringBinding); - if (status) - { - DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); - return; - } + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + NULL, + L"\\pipe\\ntsvcs", + NULL, + &pszStringBinding); + if (status) + { + DPRINT1("RpcStringBindingCompose returned 0x%x\n", status); + return; + } - /* Set the binding handle that will be used to bind to the server. */ - status = RpcBindingFromStringBindingW(pszStringBinding, - &BindingHandle); - if (status) - { - DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); - } + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &BindingHandle); + if (status) + { + DPRINT1("RpcBindingFromStringBinding returned 0x%x\n", status); + } - status = RpcStringFreeW(&pszStringBinding); - if (status) - { - DPRINT1("RpcStringFree returned 0x%x\n", status); - } + status = RpcStringFreeW(&pszStringBinding); + if (status) + { + DPRINT1("RpcStringFree returned 0x%x\n", status); + } } @@ -63,16 +63,16 @@ static VOID HandleUnbind(VOID) { - RPC_STATUS status; + RPC_STATUS status; - if (BindingHandle == NULL) - return; + if (BindingHandle == NULL) + return; - status = RpcBindingFree(&BindingHandle); - if (status) - { - DPRINT1("RpcBindingFree returned 0x%x\n", status); - } + status = RpcBindingFree(&BindingHandle); + if (status) + { + DPRINT1("RpcBindingFree returned 0x%x\n", status); + } } #endif @@ -179,25 +179,25 @@ BOOL STDCALL CloseServiceHandle(SC_HANDLE hSCObject) { - DWORD dwError; + DWORD dwError; - DPRINT("CloseServiceHandle() called\n"); + DPRINT("CloseServiceHandle() called\n"); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrCloseServiceHandle(BindingHandle, - (unsigned int)hSCObject); - if (dwError) - { - DPRINT1("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrCloseServiceHandle(BindingHandle, + (unsigned int)hSCObject); + if (dwError) + { + DPRINT1("ScmrCloseServiceHandle() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - DPRINT("CloseServiceHandle() done\n"); + DPRINT("CloseServiceHandle() done\n"); - return TRUE; + return TRUE; } @@ -207,32 +207,32 @@ * @unimplemented */ BOOL STDCALL -ControlService(SC_HANDLE hService, - DWORD dwControl, +ControlService(SC_HANDLE hService, + DWORD dwControl, LPSERVICE_STATUS lpServiceStatus) { - DWORD dwError; + DWORD dwError; - DPRINT("ControlService(%x, %x, %p)\n", - hService, dwControl, lpServiceStatus); + DPRINT("ControlService(%x, %x, %p)\n", + hService, dwControl, lpServiceStatus); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrControlService(BindingHandle, - (unsigned int)hService, - dwControl, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrControlService() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrControlService(BindingHandle, + (unsigned int)hService, + dwControl, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrControlService() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - DPRINT("ControlService() done\n"); + DPRINT("ControlService() done\n"); - return TRUE; + return TRUE; } @@ -364,23 +364,23 @@ BOOL STDCALL DeleteService(SC_HANDLE hService) { - DWORD dwError; + DWORD dwError; - DPRINT("DeleteService(%x)\n", hService); + DPRINT("DeleteService(%x)\n", hService); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrDeleteService(BindingHandle, - (unsigned int)hService); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrDeleteService() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrDeleteService(BindingHandle, + (unsigned int)hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrDeleteService() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - return TRUE; + return TRUE; } @@ -656,67 +656,67 @@ SC_LOCK STDCALL LockServiceDatabase(SC_HANDLE hSCManager) { - SC_LOCK hLock; - DWORD dwError; + SC_LOCK hLock; + DWORD dwError; - DPRINT("LockServiceDatabase(%x)\n", hSCManager); + DPRINT("LockServiceDatabase(%x)\n", hSCManager); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrLockServiceDatabase(BindingHandle, - (unsigned int)hSCManager, - (unsigned int *)&hLock); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrLockServiceDatabase(BindingHandle, + (unsigned int)hSCManager, + (unsigned int *)&hLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrLockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hLock = %p\n", hLock); + DPRINT("hLock = %p\n", hLock); - return hLock; + return hLock; } static VOID WaitForSCManager(VOID) { - HANDLE hEvent; + HANDLE hEvent; - DPRINT("WaitForSCManager() called\n"); + DPRINT("WaitForSCManager() called\n"); - /* Try to open the existing event */ - hEvent = OpenEventW(SYNCHRONIZE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); - if (hEvent == NULL) - { - if (GetLastError() != ERROR_FILE_NOT_FOUND) - return; - - /* Try to create a new event */ - hEvent = CreateEventW(NULL, - TRUE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); + /* Try to open the existing event */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); if (hEvent == NULL) { - /* Try to open the existing event again */ - hEvent = OpenEventW(SYNCHRONIZE, - FALSE, - L"SvcctrlStartEvent_A3725DX"); - if (hEvent == NULL) - return; + if (GetLastError() != ERROR_FILE_NOT_FOUND) + return; + + /* Try to create a new event */ + hEvent = CreateEventW(NULL, + TRUE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + { + /* Try to open the existing event again */ + hEvent = OpenEventW(SYNCHRONIZE, + FALSE, + L"SvcctrlStartEvent_A3725DX"); + if (hEvent == NULL) + return; + } } - } - /* Wait for 3 minutes */ - WaitForSingleObject(hEvent, 180000); - CloseHandle(hEvent); + /* Wait for 3 minutes */ + WaitForSingleObject(hEvent, 180000); + CloseHandle(hEvent); - DPRINT("ScmWaitForSCManager() done\n"); + DPRINT("ScmWaitForSCManager() done\n"); } @@ -730,32 +730,32 @@ LPCSTR lpDatabaseName, DWORD dwDesiredAccess) { - SC_HANDLE hScm = NULL; - DWORD dwError; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerA(%s, %s, %lx)\n", - lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT("OpenSCManagerA(%s, %s, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - WaitForSCManager(); + WaitForSCManager(); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenSCManagerA(BindingHandle, - (LPSTR)lpMachineName, - (LPSTR)lpDatabaseName, - dwDesiredAccess, - (unsigned int*)&hScm); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerA(BindingHandle, + (LPSTR)lpMachineName, + (LPSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenSCManagerA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hScm = %p\n", hScm); + DPRINT("hScm = %p\n", hScm); - return hScm; + return hScm; } @@ -769,32 +769,32 @@ LPCWSTR lpDatabaseName, DWORD dwDesiredAccess) { - SC_HANDLE hScm = NULL; - DWORD dwError; + SC_HANDLE hScm = NULL; + DWORD dwError; - DPRINT("OpenSCManagerW(%S, %S, %lx)\n", - lpMachineName, lpDatabaseName, dwDesiredAccess); + DPRINT("OpenSCManagerW(%S, %S, %lx)\n", + lpMachineName, lpDatabaseName, dwDesiredAccess); - WaitForSCManager(); + WaitForSCManager(); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenSCManagerW(BindingHandle, - (LPWSTR)lpMachineName, - (LPWSTR)lpDatabaseName, - dwDesiredAccess, - (unsigned int*)&hScm); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenSCManagerW(BindingHandle, + (LPWSTR)lpMachineName, + (LPWSTR)lpDatabaseName, + dwDesiredAccess, + (unsigned int*)&hScm); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenSCManagerW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hScm = %p\n", hScm); + DPRINT("hScm = %p\n", hScm); - return hScm; + return hScm; } @@ -808,30 +808,30 @@ LPCSTR lpServiceName, DWORD dwDesiredAccess) { - SC_HANDLE hService = NULL; - DWORD dwError; + SC_HANDLE hService = NULL; + DWORD dwError; - DPRINT("OpenServiceA(%p, %s, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceA(%p, %s, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenServiceA(BindingHandle, - (unsigned int)hSCManager, - (LPSTR)lpServiceName, - dwDesiredAccess, - (unsigned int*)&hService); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceA(BindingHandle, + (unsigned int)hSCManager, + (LPSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceA() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); - return hService; + return hService; } @@ -845,30 +845,30 @@ LPCWSTR lpServiceName, DWORD dwDesiredAccess) { - SC_HANDLE hService = NULL; - DWORD dwError; + SC_HANDLE hService = NULL; + DWORD dwError; - DPRINT("OpenServiceW(%p, %S, %lx)\n", - hSCManager, lpServiceName, dwDesiredAccess); + DPRINT("OpenServiceW(%p, %S, %lx)\n", + hSCManager, lpServiceName, dwDesiredAccess); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrOpenServiceW(BindingHandle, - (unsigned int)hSCManager, - (LPWSTR)lpServiceName, - dwDesiredAccess, - (unsigned int*)&hService); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return NULL; - } + /* Call to services.exe using RPC */ + dwError = ScmrOpenServiceW(BindingHandle, + (unsigned int)hSCManager, + (LPWSTR)lpServiceName, + dwDesiredAccess, + (unsigned int*)&hService); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return NULL; + } - DPRINT("hService = %p\n", hService); + DPRINT("hService = %p\n", hService); - return hService; + return hService; } @@ -977,25 +977,25 @@ QueryServiceStatus(SC_HANDLE hService, LPSERVICE_STATUS lpServiceStatus) { - DWORD dwError; + DWORD dwError; - DPRINT("QueryServiceStatus(%p, %p)\n", - hService, lpServiceStatus); + DPRINT("QueryServiceStatus(%p, %p)\n", + hService, lpServiceStatus); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrQueryServiceStatus(BindingHandle, - (unsigned int)hService, - lpServiceStatus); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrQueryServiceStatus(BindingHandle, + (unsigned int)hService, + lpServiceStatus); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrQueryServiceStatus() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - return TRUE; + return TRUE; } @@ -1062,23 +1062,23 @@ BOOL STDCALL UnlockServiceDatabase(SC_LOCK ScLock) { - DWORD dwError; + DWORD dwError; - DPRINT("UnlockServiceDatabase(%x)\n", ScLock); + DPRINT("UnlockServiceDatabase(%x)\n", ScLock); - HandleBind(); + HandleBind(); - /* Call to services.exe using RPC */ - dwError = ScmrUnlockServiceDatabase(BindingHandle, - (unsigned int)ScLock); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } + /* Call to services.exe using RPC */ + dwError = ScmrUnlockServiceDatabase(BindingHandle, + (unsigned int)ScLock); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("ScmrUnlockServiceDatabase() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } - return TRUE; + return TRUE; } @@ -1112,13 +1112,13 @@ void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) { - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } void __RPC_USER midl_user_free(void __RPC_FAR * ptr) { - HeapFree(GetProcessHeap(), 0, ptr); + HeapFree(GetProcessHeap(), 0, ptr); } /* 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