Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[akhaldi] 65876: [TRANSLATIONS] Chinese (zh-CN) translation update by Henry Tang Ih. CORE-8935

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 29 12:56:47 2014 New Revision: 65876 URL: http://svn.reactos.org/svn/reactos?rev=65876&view=rev Log: [TRANSLATIONS] Chinese (zh-CN) translation update by Henry Tang Ih. CORE-8935 Modified: trunk/reactos/base/applications/cmdutils/help/lang/zh-CN.rc trunk/reactos/base/applications/mmc/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/shutdown/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc trunk/reactos/base/applications/winhlp32/lang/Zh.rc trunk/reactos/base/applications/wordpad/lang/Zh.rc trunk/reactos/base/shell/explorer/lang/zh-CN.rc trunk/reactos/dll/cpl/access/lang/zh-CN.rc trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/input/lang/zh-CN.rc trunk/reactos/dll/cpl/intl/lang/zh-CN.rc trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc trunk/reactos/dll/win32/mshtml/lang/Zh.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc trunk/reactos/dll/win32/shdoclc/lang/Zh.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/help/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/mmc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/shutdown/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winhlp32/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/wordpad/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/shell/explorer/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/lang/z… Modified: trunk/reactos/dll/cpl/access/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/zh-CN.… Modified: trunk/reactos/dll/cpl/appwiz/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/zh-CN.… Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… Modified: trunk/reactos/dll/cpl/input/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/zh-CN.r… Modified: trunk/reactos/dll/cpl/intl/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/zh-CN.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/zh-CN.r… Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… Modified: trunk/reactos/dll/shellext/netshell/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/lang… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/… Modified: trunk/reactos/dll/win32/mshtml/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Zh.r… Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… Modified: trunk/reactos/dll/win32/shdoclc/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/lang/Zh.… Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win…

9 years, 12 months

[tkreuzer] 65875: [PSDK] Fix copypasta from r65873

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 29 12:28:56 2014 New Revision: 65875 URL: http://svn.reactos.org/svn/reactos?rev=65875&view=rev Log: [PSDK] Fix copypasta from r65873 Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Mon Dec 29 12:28:56 2014 @@ -3178,7 +3178,7 @@ HBRUSH WINAPI CreateDIBPatternBrushPt( - _In_ HGLOBAL hglbDIBPacked, + _In_ const VOID* pvPackedDIB, _In_ UINT uUsage); #define GDI_WIDTHBYTES(bits) ((DWORD)(((bits) + 31) & (~31)) / 8)

9 years, 12 months

[gadamopoulos] 65874: [SHELL32] * Give focus to the def view control when CDesktopBrowser gets focus. CORE-8980

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Dec 29 12:24:03 2014 New Revision: 65874 URL: http://svn.reactos.org/svn/reactos?rev=65874&view=rev Log: [SHELL32] * Give focus to the def view control when CDesktopBrowser gets focus. CORE-8980 Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] Mon Dec 29 12:24:03 2014 @@ -525,6 +525,10 @@ case WM_COMMAND: return pThis->OnCommand(uMsg, wParam, lParam); + + case WM_SETFOCUS: + SetFocus(pThis->hWndShellView); + break; default: DefMsgHandler: Ret = DefWindowProcW(hwnd, uMsg, wParam, lParam);

9 years, 12 months

[tkreuzer] 65873: [PSDK] Improve some prototypes in wingdi.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 29 12:01:23 2014 New Revision: 65873 URL: http://svn.reactos.org/svn/reactos?rev=65873&view=rev Log: [PSDK] Improve some prototypes in wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Mon Dec 29 12:01:23 2014 @@ -2905,73 +2905,281 @@ #define MAKEPOINTS(l) (*((POINTS*)&(l))) #define MAKEROP4(f,b) (DWORD)((((b)<<8)&0xFF000000)|(f)) -int WINAPI AbortDoc(_In_ HDC); -BOOL WINAPI AbortPath(_In_ HDC); -int WINAPI AddFontResourceA(LPCSTR); -int WINAPI AddFontResourceW(LPCWSTR); -#if (_WIN32_WINNT >= 0x0500) +INT +WINAPI +AbortDoc( + _In_ HDC hdc); + +BOOL +WINAPI +AbortPath( + _In_ HDC hdc); + +int +WINAPI +AddFontResourceA( + _In_ LPCSTR pszFilename); + +int +WINAPI +AddFontResourceW( + _In_ LPCWSTR pszFilename); HANDLE WINAPI AddFontMemResourceEx( - _In_reads_bytes_(cjSize) PVOID pFileView, - _In_ DWORD cjSize, - _Reserved_ PVOID pvResrved, - _In_ DWORD* pNumFonts); - -int WINAPI AddFontResourceExA(_In_ LPCSTR, _In_ DWORD, _Reserved_ PVOID); -int WINAPI AddFontResourceExW(_In_ LPCWSTR, _In_ DWORD, _Reserved_ PVOID); - -#endif - -BOOL WINAPI AngleArc(_In_ HDC, _In_ int, _In_ int, _In_ DWORD, _In_ FLOAT, _In_ FLOAT); + _In_reads_bytes_(cjSize) PVOID pvFileView, + _In_ DWORD cjSize, + _Reserved_ PVOID pvResrved, + _In_ DWORD* pNumFonts); + +INT +WINAPI +AddFontResourceExA( + _In_ LPCSTR pszFilename, + _In_ DWORD fl, + _Reserved_ PVOID pvReserved); + +INT +WINAPI +AddFontResourceExW( + _In_ LPCWSTR pszFilename, + _In_ DWORD fl, + _Reserved_ PVOID pvReserved); + +BOOL +WINAPI +AngleArc( + _In_ HDC hdc, + _In_ INT x, + _In_ INT y, + _In_ DWORD dwRadius, + _In_ FLOAT eStartAngle, + _In_ FLOAT eSweepAngle); BOOL WINAPI AnimatePalette( - _In_ HPALETTE hPal, - _In_ UINT iStartIndex, - _In_ UINT cEntries, - _In_reads_(cEntries) CONST PALETTEENTRY *ppe); - -BOOL WINAPI Arc(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); -BOOL WINAPI ArcTo(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); -BOOL WINAPI BeginPath(_In_ HDC); -BOOL WINAPI BitBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_opt_ HDC, _In_ int, _In_ int, _In_ DWORD); -BOOL WINAPI CancelDC(_In_ HDC); + _In_ HPALETTE hPal, + _In_ UINT iStartIndex, + _In_ UINT cEntries, + _In_reads_(cEntries) CONST PALETTEENTRY *ppe); + +BOOL +WINAPI +Arc( + _In_ HDC hdc, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom, + _In_ INT xStartArc, + _In_ INT yStartArc, + _In_ INT xEndArc, + _In_ INT yEndArc); + +BOOL +WINAPI +ArcTo( + _In_ HDC hdc, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom, + _In_ INT xRadial1, + _In_ INT yRadial1, + _In_ INT xRadial2, + _In_ INT yRadial2); + +BOOL +WINAPI +BeginPath( + _In_ HDC hdc); + +BOOL +WINAPI +BitBlt( + _In_ HDC hdcDest, + _In_ INT xDest, + _In_ INT yDest, + _In_ INT cxDest, + _In_ INT cyDest, + _In_opt_ HDC hdcSrc, + _In_ INT xSrc, + _In_ INT ySrc, + _In_ DWORD dwRop); + +BOOL +WINAPI +CancelDC( + _In_ HDC hdc); BOOL WINAPI CheckColorsInGamut( _In_ HDC hdc, - _In_reads_(nCount) LPVOID lpRGBTriple, - _Out_writes_bytes_(nCount) LPVOID dlpBuffer, + _In_reads_(nCount) LPVOID pRGBTriple, + _Out_writes_bytes_(nCount) LPVOID pvBuffer, _In_ DWORD nCount); -BOOL WINAPI Chord(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); -int WINAPI ChoosePixelFormat(_In_ HDC, _In_ CONST PIXELFORMATDESCRIPTOR*); -HENHMETAFILE WINAPI CloseEnhMetaFile(_In_ HDC); -BOOL WINAPI CloseFigure(_In_ HDC); -HMETAFILE WINAPI CloseMetaFile(_In_ HDC); -BOOL WINAPI ColorMatchToTarget(_In_ HDC, _In_ HDC, _In_ DWORD); -int WINAPI CombineRgn(_In_opt_ HRGN, _In_opt_ HRGN, _In_opt_ HRGN, _In_ int); -BOOL WINAPI CombineTransform(_Out_ LPXFORM, _In_ const XFORM*, _In_ const XFORM*); -HENHMETAFILE WINAPI CopyEnhMetaFileA(_In_ HENHMETAFILE, _In_opt_ LPCSTR); -HENHMETAFILE WINAPI CopyEnhMetaFileW(_In_ HENHMETAFILE, _In_opt_ LPCWSTR); -HMETAFILE WINAPI CopyMetaFileA(_In_ HMETAFILE, _In_opt_ LPCSTR); -HMETAFILE WINAPI CopyMetaFileW(_In_ HMETAFILE, _In_opt_ LPCWSTR); -HBITMAP WINAPI CreateBitmap(_In_ int, _In_ int, _In_ UINT, _In_ UINT, _In_opt_ CONST VOID*); -HBITMAP WINAPI CreateBitmapIndirect(_In_ const BITMAP*); -HBRUSH WINAPI CreateBrushIndirect(_In_ const LOGBRUSH*); -HCOLORSPACE WINAPI CreateColorSpaceA(_In_ LPLOGCOLORSPACEA); -HCOLORSPACE WINAPI CreateColorSpaceW(_In_ LPLOGCOLORSPACEW); -HBITMAP WINAPI CreateCompatibleBitmap(_In_ HDC, _In_ int, _In_ int); -HDC WINAPI CreateCompatibleDC(_In_opt_ HDC); -HDC WINAPI CreateDCA(_In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ const DEVMODEA*); -HDC WINAPI CreateDCW(_In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ const DEVMODEW*); -HBITMAP WINAPI CreateDIBitmap(_In_ HDC, _In_opt_ CONST BITMAPINFOHEADER*, _In_ DWORD, _In_opt_ CONST VOID*, _In_opt_ CONST BITMAPINFO*, _In_ UINT); -HBRUSH WINAPI CreateDIBPatternBrush(_In_ HGLOBAL, _In_ UINT); -HBRUSH WINAPI CreateDIBPatternBrushPt(_In_ CONST VOID*, _In_ UINT); +BOOL +WINAPI +Chord( + _In_ HDC hdc, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom, + _In_ INT xRadial1, + _In_ INT yRadial1, + _In_ INT xRadial2, + _In_ INT yRadial2); + +int +WINAPI +ChoosePixelFormat( + _In_ HDC hdc, + _In_ const PIXELFORMATDESCRIPTOR* ppfd); + +HENHMETAFILE +WINAPI +CloseEnhMetaFile( + _In_ HDC hdc); + +BOOL +WINAPI +CloseFigure( + _In_ HDC hdc); + +HMETAFILE +WINAPI +CloseMetaFile( + _In_ HDC hdc); + +BOOL +WINAPI +ColorMatchToTarget( + _In_ HDC hdc, + _In_ HDC hdcTarget, + _In_ DWORD uAction); + +int +WINAPI +CombineRgn( + _In_opt_ HRGN hrgnDest, + _In_opt_ HRGN hrgnSrc1, + _In_opt_ HRGN hrgnSrc2, + _In_ int fnCombineMode); + +BOOL +WINAPI +CombineTransform( + _Out_ LPXFORM pxformResult, + _In_ const XFORM* pxform1, + _In_ const XFORM* pxform2); + +HENHMETAFILE +WINAPI +CopyEnhMetaFileA( + _In_ HENHMETAFILE hemfSrc, + _In_opt_ LPCSTR pszFile); + +HENHMETAFILE +WINAPI +CopyEnhMetaFileW( + _In_ HENHMETAFILE hemfSrc, + _In_opt_ LPCWSTR pszFile); + +HMETAFILE +WINAPI +CopyMetaFileA( + _In_ HMETAFILE hmfSrc, + _In_opt_ LPCSTR pszFile); + +HMETAFILE +WINAPI +CopyMetaFileW( + _In_ HMETAFILE hmfSrc, + _In_opt_ LPCWSTR pszFile); + +HBITMAP +WINAPI +CreateBitmap( + _In_ INT cx, + _In_ INT cy, + _In_ UINT cPlanes, + _In_ UINT cBitsPerPel, + _In_opt_ const VOID* pvBits); + +HBITMAP +WINAPI +CreateBitmapIndirect( + _In_ const BITMAP* pbm); + +HBRUSH +WINAPI +CreateBrushIndirect( + _In_ const LOGBRUSH* plb); + +HCOLORSPACE +WINAPI +CreateColorSpaceA( + _In_ LPLOGCOLORSPACEA pLogColorSpace); + +HCOLORSPACE +WINAPI +CreateColorSpaceW( + _In_ LPLOGCOLORSPACEW pLogColorSpace); + +HBITMAP +WINAPI +CreateCompatibleBitmap( + _In_ HDC hdc, + _In_ INT cx, + _In_ INT cy); + +HDC +WINAPI +CreateCompatibleDC( + _In_opt_ HDC hdc); + +HDC +WINAPI +CreateDCA( + _In_opt_ LPCSTR pszDriver, + _In_opt_ LPCSTR pszDevice, + _In_opt_ LPCSTR pszOutput, + _In_opt_ const DEVMODEA* pdmInit); + +HDC +WINAPI +CreateDCW( + _In_opt_ LPCWSTR pszDriver, + _In_opt_ LPCWSTR pszDevice, + _In_opt_ LPCWSTR psz, + _In_opt_ const DEVMODEW* pdmInit); + +HBITMAP +WINAPI +CreateDIBitmap( + _In_ HDC hdc, + _In_opt_ const BITMAPINFOHEADER* pbmih, + _In_ DWORD fdwInit, + _In_opt_ const VOID* pvInit, + _In_opt_ const BITMAPINFO* pbmi, + _In_ UINT uUsage); + +HBRUSH +WINAPI +CreateDIBPatternBrush( + _In_ HGLOBAL hglbDIBPacked, + _In_ UINT uUsage); + +HBRUSH +WINAPI +CreateDIBPatternBrushPt( + _In_ HGLOBAL hglbDIBPacked, + _In_ UINT uUsage); #define GDI_WIDTHBYTES(bits) ((DWORD)(((bits) + 31) & (~31)) / 8) #define GDI_DIBWIDTHBYTES(bi) (DWORD)GDI_WIDTHBYTES((DWORD)(bi).biWidth * (DWORD)(bi).biBitCount)

9 years, 12 months

[hpoussin] 65872: [RAMDISK] Explicit the relation type check

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Dec 29 09:07:01 2014 New Revision: 65872 URL: http://svn.reactos.org/svn/reactos?rev=65872&view=rev Log: [RAMDISK] Explicit the relation type check Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Dec 29 09:07:01 2014 @@ -1734,7 +1734,7 @@ // // Anything but bus relations, we don't handle // - if (Type) goto PassToNext; + if (Type != BusRelations) goto PassToNext; // // Acquire the disk list lock

9 years, 12 months

[hpoussin] 65871: [RAMDISK] White space fixes

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Dec 29 09:06:58 2014 New Revision: 65871 URL: http://svn.reactos.org/svn/reactos?rev=65871&view=rev Log: [RAMDISK] White space fixes Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Dec 29 09:06:58 2014 @@ -58,10 +58,10 @@ } RAMDISK_DEVICE_STATE; DEFINE_GUID(RamdiskBusInterface, - 0x5DC52DF0, - 0x2F8A, - 0x410F, - 0x80, 0xE4, 0x05, 0xF8, 0x10, 0xE7, 0xA8, 0x8A); + 0x5DC52DF0, + 0x2F8A, + 0x410F, + 0x80, 0xE4, 0x05, 0xF8, 0x10, 0xE7, 0xA8, 0x8A); typedef struct _RAMDISK_EXTENSION { @@ -399,9 +399,9 @@ NTSTATUS NTAPI RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension, - IN PRAMDISK_CREATE_INPUT Input, - IN BOOLEAN ValidateOnly, - OUT PRAMDISK_DRIVE_EXTENSION *NewDriveExtension) + IN PRAMDISK_CREATE_INPUT Input, + IN BOOLEAN ValidateOnly, + OUT PRAMDISK_DRIVE_EXTENSION *NewDriveExtension) { ULONG BasePage, DiskType, Length; //ULONG ViewCount; @@ -417,40 +417,40 @@ PVOID BaseAddress; LARGE_INTEGER CurrentOffset, CylinderSize, DiskLength; ULONG CylinderCount, SizeByCylinders; - - // - // Check if we're a boot RAM disk - // - DiskType = Input->DiskType; - if (DiskType >= RAMDISK_BOOT_DISK) - { - // - // Check if we're an ISO - // - if (DiskType == RAMDISK_BOOT_DISK) - { - // - // NTLDR mounted us somewhere - // - BasePage = Input->BasePage; - if (!BasePage) return STATUS_INVALID_PARAMETER; - - // - // Sanitize disk options - // - Input->Options.Fixed = TRUE; - Input->Options.Readonly = Input->Options.ExportAsCd | - Input->Options.Readonly; - Input->Options.Hidden = FALSE; - Input->Options.NoDosDevice = FALSE; - Input->Options.NoDriveLetter = IsWinPEBoot ? TRUE : FALSE; - } - else - { - // - // The only other possibility is a WIM disk - // - if (DiskType != RAMDISK_WIM_DISK) + + // + // Check if we're a boot RAM disk + // + DiskType = Input->DiskType; + if (DiskType >= RAMDISK_BOOT_DISK) + { + // + // Check if we're an ISO + // + if (DiskType == RAMDISK_BOOT_DISK) + { + // + // NTLDR mounted us somewhere + // + BasePage = Input->BasePage; + if (!BasePage) return STATUS_INVALID_PARAMETER; + + // + // Sanitize disk options + // + Input->Options.Fixed = TRUE; + Input->Options.Readonly = Input->Options.ExportAsCd | + Input->Options.Readonly; + Input->Options.Hidden = FALSE; + Input->Options.NoDosDevice = FALSE; + Input->Options.NoDriveLetter = IsWinPEBoot ? TRUE : FALSE; + } + else + { + // + // The only other possibility is a WIM disk + // + if (DiskType != RAMDISK_WIM_DISK) { // // Fail @@ -458,26 +458,26 @@ return STATUS_INVALID_PARAMETER; } - // - // Read the view count instead - // - //ViewCount = Input->ViewCount; - - // - // Sanitize disk options - // - Input->Options.Hidden = FALSE; - Input->Options.NoDosDevice = FALSE; - Input->Options.Readonly = FALSE; - Input->Options.NoDriveLetter = TRUE; - Input->Options.Fixed = TRUE; - } - - // - // Are we just validating and returning to the user? - // - if (ValidateOnly) return STATUS_SUCCESS; - + // + // Read the view count instead + // + //ViewCount = Input->ViewCount; + + // + // Sanitize disk options + // + Input->Options.Hidden = FALSE; + Input->Options.NoDosDevice = FALSE; + Input->Options.Readonly = FALSE; + Input->Options.NoDriveLetter = TRUE; + Input->Options.Fixed = TRUE; + } + + // + // Are we just validating and returning to the user? + // + if (ValidateOnly) return STATUS_SUCCESS; + // // Build the GUID string // @@ -490,7 +490,7 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto FailCreate; } - + // // Allocate our device name // @@ -533,7 +533,7 @@ // Grab the drive extension // DriveExtension = DeviceObject->DeviceExtension; - + // // Check if we need a DOS device // @@ -605,9 +605,9 @@ DriveExtension->DriveLetter = Input->DriveLetter; } } - + } - + // // Setup the device object flags // @@ -620,17 +620,17 @@ *NewDriveExtension = DriveExtension; DriveExtension->Type = RamdiskDrive; DiskLength = Input->DiskLength; - ExInitializeFastMutex(&DriveExtension->DiskListLock); - IoInitializeRemoveLock(&DriveExtension->RemoveLock, - 'dmaR', - 0, - 1); + ExInitializeFastMutex(&DriveExtension->DiskListLock); + IoInitializeRemoveLock(&DriveExtension->RemoveLock, + 'dmaR', + 0, + 1); DriveExtension->DriveDeviceName = DeviceName; DriveExtension->SymbolicLinkName = SymbolicLinkName; DriveExtension->GuidString = GuidString; DriveExtension->DiskGuid = Input->DiskGuid; - DriveExtension->PhysicalDeviceObject = DeviceObject; - DriveExtension->DeviceObject = RamdiskBusFdo; + DriveExtension->PhysicalDeviceObject = DeviceObject; + DriveExtension->DeviceObject = RamdiskBusFdo; DriveExtension->AttachedDevice = RamdiskBusFdo; DriveExtension->DiskType = Input->DiskType; DriveExtension->DiskOptions = Input->Options; @@ -780,104 +780,104 @@ NTAPI RamdiskCreateRamdisk(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, - IN BOOLEAN ValidateOnly) -{ - PRAMDISK_CREATE_INPUT Input; - ULONG Length; - PRAMDISK_BUS_EXTENSION DeviceExtension; + IN BOOLEAN ValidateOnly) +{ + PRAMDISK_CREATE_INPUT Input; + ULONG Length; + PRAMDISK_BUS_EXTENSION DeviceExtension; PRAMDISK_DRIVE_EXTENSION DriveExtension; - ULONG DiskType; - PWCHAR FileNameStart, FileNameEnd; - NTSTATUS Status; - PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - - // - // Get the device extension and our input data - // - DeviceExtension = DeviceObject->DeviceExtension; - Length = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; - Input = (PRAMDISK_CREATE_INPUT)Irp->AssociatedIrp.SystemBuffer; - - // - // Validate input parameters - // - if ((Length < sizeof(RAMDISK_CREATE_INPUT)) || - (Input->Version != sizeof(RAMDISK_CREATE_INPUT))) - { - // - // Invalid input - // - return STATUS_INVALID_PARAMETER; - } - - // - // Validate the disk type - // - DiskType = Input->DiskType; - if (DiskType == RAMDISK_WIM_DISK) return STATUS_INVALID_PARAMETER; - - // - // Look at the disk type - // - if (DiskType == RAMDISK_BOOT_DISK) - { - // - // We only allow this as an early-init boot - // - if (!KeLoaderBlock) return STATUS_INVALID_PARAMETER; - - // - // Save command-line flags - // - if (ExportBootDiskAsCd) Input->Options.ExportAsCd = TRUE; - if (IsWinPEBoot) Input->Options.NoDriveLetter = TRUE; - } - - // - // Validate the disk type - // - if ((Input->Options.ExportAsCd) && (DiskType != RAMDISK_BOOT_DISK)) - { - // - // If the type isn't CDFS, it has to at least be raw CD - // - if (DiskType != RAMDISK_MEMORY_MAPPED_DISK) return STATUS_INVALID_PARAMETER; - } - - // - // Check if this is an actual file - // - if (DiskType <= RAMDISK_MEMORY_MAPPED_DISK) - { - // - // Validate the file name - // - FileNameStart = (PWCHAR)((ULONG_PTR)Input + Length); - FileNameEnd = Input->FileName + 1; - while ((FileNameEnd < FileNameStart) && *(FileNameEnd)) FileNameEnd++; - if (FileNameEnd == FileNameStart) return STATUS_INVALID_PARAMETER; - } - - // - // Create the actual device - // - Status = RamdiskCreateDiskDevice(DeviceExtension, - Input, - ValidateOnly, - &DriveExtension); - if (NT_SUCCESS(Status)) - { - // - // Invalidate and set success - // - IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, 0); - Irp->IoStatus.Information = STATUS_SUCCESS; - } - - // - // We're done - // - return Status; + ULONG DiskType; + PWCHAR FileNameStart, FileNameEnd; + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + // + // Get the device extension and our input data + // + DeviceExtension = DeviceObject->DeviceExtension; + Length = IoStackLocation->Parameters.DeviceIoControl.InputBufferLength; + Input = (PRAMDISK_CREATE_INPUT)Irp->AssociatedIrp.SystemBuffer; + + // + // Validate input parameters + // + if ((Length < sizeof(RAMDISK_CREATE_INPUT)) || + (Input->Version != sizeof(RAMDISK_CREATE_INPUT))) + { + // + // Invalid input + // + return STATUS_INVALID_PARAMETER; + } + + // + // Validate the disk type + // + DiskType = Input->DiskType; + if (DiskType == RAMDISK_WIM_DISK) return STATUS_INVALID_PARAMETER; + + // + // Look at the disk type + // + if (DiskType == RAMDISK_BOOT_DISK) + { + // + // We only allow this as an early-init boot + // + if (!KeLoaderBlock) return STATUS_INVALID_PARAMETER; + + // + // Save command-line flags + // + if (ExportBootDiskAsCd) Input->Options.ExportAsCd = TRUE; + if (IsWinPEBoot) Input->Options.NoDriveLetter = TRUE; + } + + // + // Validate the disk type + // + if ((Input->Options.ExportAsCd) && (DiskType != RAMDISK_BOOT_DISK)) + { + // + // If the type isn't CDFS, it has to at least be raw CD + // + if (DiskType != RAMDISK_MEMORY_MAPPED_DISK) return STATUS_INVALID_PARAMETER; + } + + // + // Check if this is an actual file + // + if (DiskType <= RAMDISK_MEMORY_MAPPED_DISK) + { + // + // Validate the file name + // + FileNameStart = (PWCHAR)((ULONG_PTR)Input + Length); + FileNameEnd = Input->FileName + 1; + while ((FileNameEnd < FileNameStart) && *(FileNameEnd)) FileNameEnd++; + if (FileNameEnd == FileNameStart) return STATUS_INVALID_PARAMETER; + } + + // + // Create the actual device + // + Status = RamdiskCreateDiskDevice(DeviceExtension, + Input, + ValidateOnly, + &DriveExtension); + if (NT_SUCCESS(Status)) + { + // + // Invalidate and set success + // + IoInvalidateDeviceRelations(DeviceExtension->PhysicalDeviceObject, 0); + Irp->IoStatus.Information = STATUS_SUCCESS; + } + + // + // We're done + // + return Status; } NTSTATUS @@ -2477,115 +2477,115 @@ RamdiskAddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - PRAMDISK_BUS_EXTENSION DeviceExtension; - PDEVICE_OBJECT AttachedDevice; - NTSTATUS Status; - UNICODE_STRING DeviceName; - PDEVICE_OBJECT DeviceObject; - - // - // Only create the bus FDO once - // - if (RamdiskBusFdo) return STATUS_DEVICE_ALREADY_ATTACHED; - - // - // Create the bus FDO - // - RtlInitUnicodeString(&DeviceName, L"\\Device\\Ramdisk"); - Status = IoCreateDevice(DriverObject, - sizeof(RAMDISK_BUS_EXTENSION), - &DeviceName, - FILE_DEVICE_BUS_EXTENDER, - FILE_DEVICE_SECURE_OPEN, - 0, - &DeviceObject); - if (NT_SUCCESS(Status)) - { - // - // Initialize the bus FDO extension - // - DeviceExtension = DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceObject->DeviceExtension, + PRAMDISK_BUS_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDevice; + NTSTATUS Status; + UNICODE_STRING DeviceName; + PDEVICE_OBJECT DeviceObject; + + // + // Only create the bus FDO once + // + if (RamdiskBusFdo) return STATUS_DEVICE_ALREADY_ATTACHED; + + // + // Create the bus FDO + // + RtlInitUnicodeString(&DeviceName, L"\\Device\\Ramdisk"); + Status = IoCreateDevice(DriverObject, + sizeof(RAMDISK_BUS_EXTENSION), + &DeviceName, + FILE_DEVICE_BUS_EXTENDER, + FILE_DEVICE_SECURE_OPEN, + 0, + &DeviceObject); + if (NT_SUCCESS(Status)) + { + // + // Initialize the bus FDO extension + // + DeviceExtension = DeviceObject->DeviceExtension; + RtlZeroMemory(DeviceObject->DeviceExtension, sizeof(RAMDISK_BUS_EXTENSION)); - - // - // Set bus FDO flags - // - DeviceObject->Flags |= DO_POWER_PAGABLE | DO_DIRECT_IO; - - // - // Setup the bus FDO extension - // - DeviceExtension->Type = RamdiskBus; - ExInitializeFastMutex(&DeviceExtension->DiskListLock); - IoInitializeRemoveLock(&DeviceExtension->RemoveLock, + + // + // Set bus FDO flags + // + DeviceObject->Flags |= DO_POWER_PAGABLE | DO_DIRECT_IO; + + // + // Setup the bus FDO extension + // + DeviceExtension->Type = RamdiskBus; + ExInitializeFastMutex(&DeviceExtension->DiskListLock); + IoInitializeRemoveLock(&DeviceExtension->RemoveLock, 'dmaR', 0, 1); - InitializeListHead(&DeviceExtension->DiskList); - DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; - DeviceExtension->DeviceObject = DeviceObject; - - // - // Register the RAM disk device interface - // - Status = IoRegisterDeviceInterface(PhysicalDeviceObject, - &RamdiskBusInterface, - NULL, - &DeviceExtension->BusDeviceName); - if (!NT_SUCCESS(Status)) - { - // - // Fail - // - IoDeleteDevice(DeviceObject); - return Status; - } - - // - // Attach us to the device stack - // - AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, - PhysicalDeviceObject); - DeviceExtension->AttachedDevice = AttachedDevice; - if (!AttachedDevice) - { - // - // Fail - // - IoSetDeviceInterfaceState(&DeviceExtension->BusDeviceName, 0); - RtlFreeUnicodeString(&DeviceExtension->BusDeviceName); - IoDeleteDevice(DeviceObject); - return STATUS_NO_SUCH_DEVICE; - } - - // - // Bus FDO is initialized - // - RamdiskBusFdo = DeviceObject; - - // - // Loop for loader block - // - if (KeLoaderBlock) - { - // - // Are we being booted from setup? Not yet supported - // - //ASSERT(!KeLoaderBlock->SetupLdrBlock); - } - - // - // All done - // - DeviceObject->Flags &= DO_DEVICE_INITIALIZING; - Status = STATUS_SUCCESS; - } - - // - // Return status - // - return Status; + InitializeListHead(&DeviceExtension->DiskList); + DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + DeviceExtension->DeviceObject = DeviceObject; + + // + // Register the RAM disk device interface + // + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, + &RamdiskBusInterface, + NULL, + &DeviceExtension->BusDeviceName); + if (!NT_SUCCESS(Status)) + { + // + // Fail + // + IoDeleteDevice(DeviceObject); + return Status; + } + + // + // Attach us to the device stack + // + AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, + PhysicalDeviceObject); + DeviceExtension->AttachedDevice = AttachedDevice; + if (!AttachedDevice) + { + // + // Fail + // + IoSetDeviceInterfaceState(&DeviceExtension->BusDeviceName, 0); + RtlFreeUnicodeString(&DeviceExtension->BusDeviceName); + IoDeleteDevice(DeviceObject); + return STATUS_NO_SUCH_DEVICE; + } + + // + // Bus FDO is initialized + // + RamdiskBusFdo = DeviceObject; + + // + // Loop for loader block + // + if (KeLoaderBlock) + { + // + // Are we being booted from setup? Not yet supported + // + //ASSERT(!KeLoaderBlock->SetupLdrBlock); + } + + // + // All done + // + DeviceObject->Flags &= DO_DEVICE_INITIALIZING; + Status = STATUS_SUCCESS; + } + + // + // Return status + // + return Status; } NTSTATUS

9 years, 12 months

[pschweitzer] 65870: [NTOSKRNL] Use the PIP_REGISTRY_DATA() for DevicePropertyInstallState case in IoGetDeviceProperty()

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 28 22:48:08 2014 New Revision: 65870 URL: http://svn.reactos.org/svn/reactos?rev=65870&view=rev Log: [NTOSKRNL] Use the PIP_REGISTRY_DATA() for DevicePropertyInstallState case in IoGetDeviceProperty() Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Dec 28 22:48:08 2014 @@ -3979,10 +3979,8 @@ PIP_UNIMPLEMENTED(); break; case DevicePropertyInstallState: - { - ValueName = REGSTR_VAL_CONFIGFLAGS; + PIP_REGISTRY_DATA(REGSTR_VAL_CONFIGFLAGS, REG_DWORD); break; - } case DevicePropertyResourceRequirements: PIP_UNIMPLEMENTED(); case DevicePropertyAllocatedResources:

9 years, 12 months

[pschweitzer] 65869: [RAMDISK] Implement support for IOCTL_DISK_CHECK_VERIFY, IOCTL_STORAGE_CHECK_VERIFY, IOCTL_STORAGE_CHECK_VERIFY2, IOCTL_CDROM_CHECK_VERIFY

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 28 22:37:55 2014 New Revision: 65869 URL: http://svn.reactos.org/svn/reactos?rev=65869&view=rev Log: [RAMDISK] Implement support for IOCTL_DISK_CHECK_VERIFY, IOCTL_STORAGE_CHECK_VERIFY, IOCTL_STORAGE_CHECK_VERIFY2, IOCTL_CDROM_CHECK_VERIFY Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Dec 28 22:37:55 2014 @@ -1483,7 +1483,10 @@ case IOCTL_STORAGE_CHECK_VERIFY2: case IOCTL_CDROM_CHECK_VERIFY: - UNIMPLEMENTED_DBGBREAK(); + // + // Just pretend it's OK, don't do more + // + Status = STATUS_SUCCESS; break; case IOCTL_STORAGE_GET_MEDIA_TYPES:

9 years, 12 months

[hpoussin] 65868: [NTOS:IOMGR] When booting from a ramdisk, always assign drive letter X: to it The only incomplete part to boot the LiveCD from PXE is some support in ramdisk.sys

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Dec 28 22:33:17 2014 New Revision: 65868 URL: http://svn.reactos.org/svn/reactos?rev=65868&view=rev Log: [NTOS:IOMGR] When booting from a ramdisk, always assign drive letter X: to it The only incomplete part to boot the LiveCD from PXE is some support in ramdisk.sys Modified: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c Modified: trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/ramdisk.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/ramdisk.c [iso-8859-1] Sun Dec 28 22:33:17 2014 @@ -250,6 +250,25 @@ } // + // ReactOS hack (drive letter should not be hardcoded, and maybe set by mountmgr.sys) + // + { + ANSI_STRING AnsiPath; + CHAR Buffer[256]; + UNICODE_STRING NtSystemRoot; + UNICODE_STRING DriveLetter = RTL_CONSTANT_STRING(L"\\??\\X:"); + + AnsiPath.Length = sprintf(Buffer, "X:%s", LoaderBlock->NtBootPathName); + AnsiPath.MaximumLength = AnsiPath.Length + 1; + AnsiPath.Buffer = Buffer; + RtlInitEmptyUnicodeString(&NtSystemRoot, + SharedUserData->NtSystemRoot, + sizeof(SharedUserData->NtSystemRoot)); + RtlAnsiStringToUnicodeString(&NtSystemRoot, &AnsiPath, FALSE); + IoCreateSymbolicLink(&DriveLetter, &DeviceString); + } + + // // We made it // return STATUS_SUCCESS;

9 years, 12 months

[hpoussin] 65867: [NTOS:PNPMGR] Implement IoGetDeviceProperty/DevicePropertyInstallState case

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Dec 28 22:33:11 2014 New Revision: 65867 URL: http://svn.reactos.org/svn/reactos?rev=65867&view=rev Log: [NTOS:PNPMGR] Implement IoGetDeviceProperty/DevicePropertyInstallState case Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Dec 28 22:33:11 2014 @@ -3977,8 +3977,12 @@ PIP_UNIMPLEMENTED(); case DevicePropertyRemovalPolicy: PIP_UNIMPLEMENTED(); + break; case DevicePropertyInstallState: - PIP_UNIMPLEMENTED(); + { + ValueName = REGSTR_VAL_CONFIGFLAGS; + break; + } case DevicePropertyResourceRequirements: PIP_UNIMPLEMENTED(); case DevicePropertyAllocatedResources:

9 years, 12 months

← Newer
1
2
3
4
5
6
7
8
9
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014