Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 51743: Add some more undocumented definitions
by gadamopoulos＠svn.reactos.org 14 May '11

14 May '11

Author: gadamopoulos Date: Sat May 14 18:41:39 2011 New Revision: 51743 URL: http://svn.reactos.org/svn/reactos?rev=51743&view=rev Log: Add some more undocumented definitions Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/include… ============================================================================== --- branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] Sat May 14 18:41:39 2011 @@ -24,28 +24,30 @@ #define WS_EX_SETANSICREATOR 0x80000000 // For WNDS_ANSICREATOR /* Non SDK Window Message types. */ -#define WM_SETVISIBLE 0x00000009 -#define WM_CTLCOLOR 0x00000019 -#define WM_ALTTABACTIVE 0x00000029 -#define WM_ISACTIVEICON 0x00000035 -#define WM_QUERYPARKICON 0x00000036 -#define WM_CLIENTSHUTDOWN 0x0000003B -#define WM_COPYGLOBALDATA 0x00000049 -#define WM_LOGONNOTIFY 0x0000004c -#define WM_KEYF1 0x0000004d -#define WM_SYSTIMER 0x00000118 -#define WM_LBTRACKPOINT 0x00000131 -#define LB_CARETON 0x000001a3 -#define LB_CARETOFF 0x000001a4 -#define WM_DROPOBJECT 0x0000022A -#define WM_QUERYDROPOBJECT 0x0000022B -#define WM_BEGINDRAG 0x0000022C -#define WM_DRAGLOOP 0x0000022D -#define WM_DRAGSELECT 0x0000022E -#define WM_DRAGMOVE 0x0000022F -#define WM_POPUPSYSTEMMENU 0x00000313 -#define WM_CBT 0x000003FF // ReactOS only. -#define WM_MAXIMUM 0x0001FFFF +#define WM_SETVISIBLE 0x00000009 +#define WM_ALTTABACTIVE 0x00000029 +#define WM_ISACTIVEICON 0x00000035 +#define WM_QUERYPARKICON 0x00000036 +#define WM_CLIENTSHUTDOWN 0x0000003B +#define WM_COPYGLOBALDATA 0x00000049 +#define WM_LOGONNOTIFY 0x0000004C +#define WM_KEYF1 0x0000004D +#define WM_NCUAHDRAWCAPTION 0x000000AE +#define WM_NCUAHDRAWFRAME 0x000000AF +#define WM_SYSTIMER 0x00000118 +#define WM_LBTRACKPOINT 0x00000131 +#define LB_CARETON 0x000001a3 +#define LB_CARETOFF 0x000001a4 +#define WM_DROPOBJEC 0x0000022A +#define WM_QUERYDROPOBJECT 0x0000022B +#define WM_BEGINDRAG 0x0000022C +#define WM_DRAGLOOP 0x0000022D +#define WM_DRAGSELECT 0x0000022E +#define WM_DRAGMOVE 0x0000022F +#define WM_POPUPSYSTEMMENU 0x00000313 +#define WM_UAHINIT 0x0000031b +#define WM_CBT 0x000003FF // ReactOS only. +#define WM_MAXIMUM 0x0001FFFF /* Non SDK DCE types.*/ #define DCX_USESTYLE 0x00010000

1 0

[mkupfer] 51742: bring back progress bar for loading files
by mkupfer＠svn.reactos.org 14 May '11

14 May '11

Author: mkupfer Date: Sat May 14 18:32:59 2011 New Revision: 51742 URL: http://svn.reactos.org/svn/reactos?rev=51742&view=rev Log: bring back progress bar for loading files Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Sat May 14 18:32:59 2011 @@ -265,13 +265,6 @@ LONG Status; LARGE_INTEGER Position; ULONG i, BytesRead; - - CHAR ProgressString[256]; - - /* Inform user we are loading files */ - sprintf(ProgressString, "Loading %s...", strchr(FileName, '\\') + 1); - UiDrawBackdrop(); - UiDrawProgressBarCenter(1, 100, ProgressString); /* Open the image file */ Status = ArcOpen(FileName, OpenReadOnly, &FileId); Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat May 14 18:32:59 2011 @@ -457,6 +457,8 @@ PVOID GdtIdt; ULONG PcrBasePage=0; ULONG TssBasePage=0; + // Progress bar + CHAR ProgressString[256]; // Open the operating system section // specified in the .ini file @@ -464,7 +466,8 @@ UiDrawBackdrop(); UiDrawStatusText("Detecting Hardware..."); - UiDrawProgressBarCenter(1, 100, "Loading NT..."); + sprintf(ProgressString, "Loading NT..."); + UiDrawProgressBarCenter(1, 100, ProgressString); /* Read the system path is set in the .ini file */ if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", FullPath, sizeof(FullPath))) @@ -524,7 +527,7 @@ } /* Let user know we started loading */ - UiDrawStatusText("Loading..."); + //UiDrawStatusText("Loading..."); /* append a backslash */ strcpy(BootPath, FullPath); @@ -545,6 +548,10 @@ UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); + sprintf(ProgressString, "Loading system hive..."); + UiDrawBackdrop(); + UiDrawProgressBarCenter(15, 100, ProgressString); + /* Load Hive */ Status = WinLdrInitSystemHive(LoaderBlock, BootPath); DPRINTM(DPRINT_WINDOWS, "SYSTEM hive loaded with status %d\n", Status); @@ -555,12 +562,18 @@ /* Load kernel */ strcpy(FileName, BootPath); strcat(FileName, "SYSTEM32\\NTOSKRNL.EXE"); + sprintf(ProgressString, "Loading %s...", strchr(FileName, '\\') + 1); + UiDrawBackdrop(); + UiDrawProgressBarCenter(30, 100, ProgressString); Status = WinLdrLoadImage(FileName, LoaderSystemCode, &NtosBase); DPRINTM(DPRINT_WINDOWS, "Ntos loaded with status %d at %p\n", Status, NtosBase); /* Load HAL */ strcpy(FileName, BootPath); strcat(FileName, "SYSTEM32\\HAL.DLL"); + sprintf(ProgressString, "Loading %s...", strchr(FileName, '\\') + 1); + UiDrawBackdrop(); + UiDrawProgressBarCenter(45, 100, ProgressString); Status = WinLdrLoadImage(FileName, LoaderHalCode, &HalBase); DPRINTM(DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase); @@ -569,6 +582,9 @@ { strcpy(FileName, BootPath); strcat(FileName, "SYSTEM32\\KDCOM.DLL"); + sprintf(ProgressString, "Loading %s...", strchr(FileName, '\\') + 1); + UiDrawBackdrop(); + UiDrawProgressBarCenter(60, 100, ProgressString); Status = WinLdrLoadImage(FileName, LoaderBootDriver, &KdComBase); DPRINTM(DPRINT_WINDOWS, "KdCom loaded with status %d at %p\n", Status, KdComBase); } @@ -592,11 +608,17 @@ if (KdComDTE) WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KdComDTE); + sprintf(ProgressString, "Loading NLS and OEM fonts..."); + UiDrawBackdrop(); + UiDrawProgressBarCenter(80, 100, ProgressString); /* Load NLS data, OEM font, and prepare boot drivers list */ Status = WinLdrScanSystemHive(LoaderBlock, BootPath); DPRINTM(DPRINT_WINDOWS, "SYSTEM hive scanned with status %d\n", Status); /* Load boot drivers */ + sprintf(ProgressString, "Loading boot drivers..."); + UiDrawBackdrop(); + UiDrawProgressBarCenter(100, 100, ProgressString); Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath); DPRINTM(DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status);

1 0

[gadamopoulos] 51741: [uxtheme] - Begin implementing ThemeHooksInstall, ThemeHooksRemove and ThemeInitApiHook
by gadamopoulos＠svn.reactos.org 14 May '11

14 May '11

Author: gadamopoulos Date: Sat May 14 18:31:47 2011 New Revision: 51741 URL: http://svn.reactos.org/svn/reactos?rev=51741&view=rev Log: [uxtheme] - Begin implementing ThemeHooksInstall, ThemeHooksRemove and ThemeInitApiHook Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c (with props) branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c (with props) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxtheme.spec Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Sat May 14 18:31:47 2011 @@ -11,9 +11,11 @@ main.c metric.c msstyles.c + nonclient.c property.c stylemap.c system.c + themehooks.c uxini.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat May 14 18:31:47 2011 @@ -1,0 +1,38 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS uxtheme.dll + * FILE: dll/win32/uxtheme/themehooks.c + * PURPOSE: uxtheme non client area management + * PROGRAMMER: Giannis Adamopoulos + */ + + + +#include "config.h" + +#include <stdlib.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "vfwmsgs.h" +#include "uxtheme.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + + +LRESULT +ThemeDefWindowProcAW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC defWndProc, BOOL ANSI) +{ + UNIMPLEMENTED; + + /* Some test */ + if(Msg == WM_NCPAINT || Msg == WM_NCACTIVATE) + return FALSE; + + return defWndProc(hWnd, Msg, wParam, lParam); +} Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c [iso-8859-1] Sat May 14 18:31:47 2011 @@ -1,0 +1,127 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS uxtheme.dll + * FILE: dll/win32/uxtheme/themehooks.c + * PURPOSE: uxtheme user api hook functions + * PROGRAMMER: Giannis Adamopoulos + */ + +#include <windows.h> +#include <undocuser.h> + +#include "vfwmsgs.h" +#include "uxtheme.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); + + + +extern HINSTANCE hDllInst; + +LRESULT +ThemeDefWindowProcAW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC defWndProc, BOOL ANSI); + +USERAPIHOOK user32ApiHook; +BYTE gabDWPmessages[UAHOWP_MAX_SIZE]; + +static LRESULT CALLBACK +ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + return ThemeDefWindowProcAW(hWnd, + Msg, + wParam, + lParam, + user32ApiHook.DefWindowProcW, + FALSE); +} + +static LRESULT CALLBACK +ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + return ThemeDefWindowProcAW(hWnd, + Msg, + wParam, + lParam, + user32ApiHook.DefWindowProcA, + TRUE); +} + +BOOL CALLBACK +ThemeInitApiHook(UAPIHK State, PUSERAPIHOOK puah) +{ + /* Sanity checks for the caller */ + if (!puah || State != uahLoadInit) + { + return TRUE; + } + + /* Store the original functions from user32 */ + user32ApiHook = *puah; + + puah->DefWindowProcA = ThemeDefWindowProcA; + puah->DefWindowProcW = ThemeDefWindowProcW; + puah->DefWndProcArray.MsgBitArray = gabDWPmessages; + puah->DefWndProcArray.Size = UAHOWP_MAX_SIZE; + + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_CREATE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_DESTROY); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_THEMECHANGED); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCMOUSEMOVE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_MOUSEMOVE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCMOUSELEAVE); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCHITTEST); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCLBUTTONDOWN); + UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCLBUTTONDBLCLK); + + return TRUE; +} + +typedef BOOL (WINAPI * PREGISTER_UAH_WINXP)(HINSTANCE hInstance, USERAPIHOOKPROC CallbackFunc); +typedef BOOL (WINAPI * PREGISTER_UUAH_WIN2003)(PUSERAPIHOOKINFO puah); + +BOOL WINAPI +ThemeHooksInstall() +{ + PVOID lpFunc; + OSVERSIONINFO osvi; + + lpFunc = GetProcAddress(GetModuleHandle("user32.dll"), "RegisterUserApiHook"); + + ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + + if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1) + { + PREGISTER_UAH_WINXP lpfuncxp = (PREGISTER_UAH_WINXP)lpFunc; + return lpfuncxp(hDllInst, ThemeInitApiHook); + } + else if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2) + { + PREGISTER_UUAH_WIN2003 lpfunc2003 = (PREGISTER_UUAH_WIN2003)lpFunc; + USERAPIHOOKINFO uah; + + uah.m_size = sizeof(uah); + uah.m_dllname1 = L"uxtheme.dll"; + uah.m_funname1 = L"ThemeInitApiHook"; + uah.m_dllname2 = NULL; + uah.m_funname2 = NULL; + + return lpfunc2003(&uah); + } + else + { + UNIMPLEMENTED; + return FALSE; + } +} + +BOOL WINAPI +ThemeHooksRemove() +{ + return UnregisterUserApiHook(); +} Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxtheme.spec URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxtheme.spec [iso-8859-1] Sat May 14 18:31:47 2011 @@ -29,8 +29,8 @@ 31 stub -noname InitUserTheme 32 stub -noname InitUserRegistry 33 stub -noname ReestablishServerConnection -34 stub -noname ThemeHooksInstall -35 stub -noname ThemeHooksRemove +34 stdcall -noname ThemeHooksInstall() +35 stdcall -noname ThemeHooksRemove() 36 stub -noname RefreshThemeForTS 43 stub -noname ClassicGetSystemMetrics 44 stub -noname ClassicSystemParametersInfoA @@ -95,3 +95,4 @@ @ stdcall OpenThemeData(ptr wstr) @ stdcall SetThemeAppProperties(long) @ stdcall SetWindowTheme(ptr wstr wstr) +@ stdcall ThemeInitApiHook(long ptr)

1 0

[gadamopoulos] 51740: - Improve user api hook definitions. Add prototype of RegisterUserApiHook for xp - Add some helper macros
by gadamopoulos＠svn.reactos.org 14 May '11

14 May '11

Author: gadamopoulos Date: Sat May 14 18:17:58 2011 New Revision: 51740 URL: http://svn.reactos.org/svn/reactos?rev=51740&view=rev Log: - Improve user api hook definitions. Add prototype of RegisterUserApiHook for xp - Add some helper macros Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h Modified: branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/include… ============================================================================== --- branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/include/reactos/undocuser.h [iso-8859-1] Sat May 14 18:17:58 2011 @@ -116,6 +116,54 @@ // User api hook // +typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); + +typedef struct _UAHOWP +{ + BYTE* MsgBitArray; + DWORD Size; +} UAHOWP, *PUAHOWP; + +#define UAH_HOOK_MESSAGE(uahowp, msg) uahowp.MsgBitArray[msg/8] |= (1 << (msg % 8)); +#define UAH_IS_MESSAGE_HOOKED(uahowp, msg) (uahowp.MsgBitArray[msg/8] & (1 << (msg % 8))) +#define UAHOWP_MAX_SIZE WM_USER/8 + +typedef struct tagUSERAPIHOOK +{ + DWORD size; + WNDPROC DefWindowProcA; + WNDPROC DefWindowProcW; + UAHOWP DefWndProcArray; + FARPROC GetScrollInfo; + FARPROC SetScrollInfo; + FARPROC EnableScrollBar; + FARPROC AdjustWindowRectEx; + FARPROC SetWindowRgn; + WNDPROC_OWP PreWndProc; + WNDPROC_OWP PostWndProc; + UAHOWP WndProcArray; + WNDPROC_OWP PreDefDlgProc; + WNDPROC_OWP PostDefDlgProc; + UAHOWP DlgProcArray; + FARPROC GetSystemMetrics; + FARPROC SystemParametersInfoA; + FARPROC SystemParametersInfoW; + FARPROC ForceResetUserApiHook; + FARPROC DrawFrameControl; + FARPROC DrawCaption; + FARPROC MDIRedrawFrame; + FARPROC GetRealWindowOwner; +} USERAPIHOOK, *PUSERAPIHOOK; + +typedef enum _UAPIHK +{ + uahLoadInit, + uahStop, + uahShutdown +} UAPIHK, *PUAPIHK; + +typedef BOOL(CALLBACK *USERAPIHOOKPROC)(UAPIHK State, PUSERAPIHOOK puah); + typedef struct _USERAPIHOOKINFO { DWORD m_size; @@ -125,51 +173,12 @@ LPCWSTR m_funname2; } USERAPIHOOKINFO,*PUSERAPIHOOKINFO; -typedef enum _UAPIHK -{ - uahLoadInit, - uahStop, - uahShutdown -} UAPIHK, *PUAPIHK; +#if (WINVER == _WIN32_WINNT_WINXP) +BOOL WINAPI RegisterUserApiHook(HINSTANCE hInstance, USERAPIHOOKPROC CallbackFunc); +#elif (WINVER == _WIN32_WINNT_WS03) +BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); +#endif -typedef DWORD (CALLBACK * USERAPIHOOKPROC)(UAPIHK State, ULONG_PTR Info); - -typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); - -typedef struct _UAHOWP -{ - BYTE* MsgBitArray; - DWORD Size; -} UAHOWP, *PUAHOWP; - -typedef struct tagUSERAPIHOOK -{ - DWORD size; - WNDPROC DefWindowProcA; - WNDPROC DefWindowProcW; - UAHOWP DefWndProcArray; - FARPROC GetScrollInfo; - FARPROC SetScrollInfo; - FARPROC EnableScrollBar; - FARPROC AdjustWindowRectEx; - FARPROC SetWindowRgn; - WNDPROC_OWP PreWndProc; - WNDPROC_OWP PostWndProc; - UAHOWP WndProcArray; - WNDPROC_OWP PreDefDlgProc; - WNDPROC_OWP PostDefDlgProc; - UAHOWP DlgProcArray; - FARPROC GetSystemMetrics; - FARPROC SystemParametersInfoA; - FARPROC SystemParametersInfoW; - FARPROC ForceResetUserApiHook; - FARPROC DrawFrameControl; - FARPROC DrawCaption; - FARPROC MDIRedrawFrame; - FARPROC GetRealWindowOwner; -} USERAPIHOOK, *PUSERAPIHOOK; - -BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); BOOL WINAPI UnregisterUserApiHook(VOID); #endif

1 0

[janderwald] 51739: [USBSTOR] - Start implementing queued srb handling - Implement SRB_FUNCTION_RELEASE_QUEUE, SRB_FUNCTION_FLUSH, SRB_FUNCTION_FLUSH_QUEUE - WIP, not yet working perfectly
by janderwald＠svn.reactos.org 14 May '11

14 May '11

Author: janderwald Date: Sat May 14 18:09:00 2011 New Revision: 51739 URL: http://svn.reactos.org/svn/reactos?rev=51739&view=rev Log: [USBSTOR] - Start implementing queued srb handling - Implement SRB_FUNCTION_RELEASE_QUEUE, SRB_FUNCTION_FLUSH, SRB_FUNCTION_FLUSH_QUEUE - WIP, not yet working perfectly Added: branches/usb-bringup/drivers/usb/usbstor/queue.c (with props) Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/fdo.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Sat May 14 18:09:00 2011 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c scsi.c usbstor.c usbstor.rc) +add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c scsi.c usbstor.c usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -12,87 +12,6 @@ #include "usbstor.h" NTSTATUS -USBSTOR_HandleExecuteSCSI( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN OUT PSCSI_REQUEST_BLOCK Request, - IN PPDO_DEVICE_EXTENSION PDODeviceExtension) -{ - PCDB pCDB; - NTSTATUS Status; - - // - // get SCSI command data block - // - pCDB = (PCDB)Request->Cdb; - - DPRINT1("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); - - - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) - { - // - // sanity checks - // - ASSERT(Request->DataBuffer); - - DPRINT1("SCSIOP_READ_CAPACITY Length %\n", Request->DataTransferLength); - Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp); - } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) - { - DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); - ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); - ASSERT(Request->DataBuffer); - - // - // send mode sense command - // - Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); - } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ /*|| pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE*/) - { - DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); - - // - // send read / write command - // - Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp); - } - else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) - { - DPRINT1("SCSIOP_MEDIUM_REMOVAL\n"); - - // - // just complete the request - // - Request->SrbStatus = SRB_STATUS_SUCCESS; - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = Request->DataTransferLength; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) - { - DPRINT1("SCSIOP_TEST_UNIT_READY\n"); - - // - // send test unit command - // - Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp); - } - else - { - UNIMPLEMENTED; - Request->SrbStatus = SRB_STATUS_ERROR; - Status = STATUS_NOT_SUPPORTED; - DbgBreakPoint(); - } - - return Status; -} - -NTSTATUS USBSTOR_HandleInternalDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -128,7 +47,58 @@ case SRB_FUNCTION_EXECUTE_SCSI: { DPRINT1("SRB_FUNCTION_EXECUTE_SCSI\n"); - return USBSTOR_HandleExecuteSCSI(DeviceObject, Irp, Request, PDODeviceExtension); + + // + // check if request is valid + // + if (Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT)) + { + // + // data is transferred with this irp + // + if (Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) == (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) || + Request->DataTransferLength == 0 || + Irp->MdlAddress == NULL) + { + // + // invalid parameter + // + Status = STATUS_INVALID_PARAMETER; + break; + } + } + else + { + // + // sense buffer request + // + if (Request->DataTransferLength || + Request->DataBuffer || + Irp->MdlAddress) + { + // + // invalid parameter + // + Status = STATUS_INVALID_PARAMETER; + break; + } + } + + // + // add the request + // + if (!USBSTOR_QueueAddIrp(DeviceObject, Irp)) + { + // + // irp was not added to the queue + // + IoStartPacket(PDODeviceExtension->LowerDeviceObject, Irp, &Request->QueueSortKey, USBSTOR_CancelIo); + } + + // + // irp pending + // + return STATUS_PENDING; } case SRB_FUNCTION_RELEASE_DEVICE: { @@ -179,20 +149,37 @@ } case SRB_FUNCTION_RELEASE_QUEUE: { - DPRINT1("SRB_FUNCTION_RELEASE_QUEUE UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; + DPRINT1("SRB_FUNCTION_RELEASE_QUEUE\n"); + + // + // release queue + // + USBSTOR_QueueRelease(DeviceObject); + + + // + // set status success + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; } + case SRB_FUNCTION_FLUSH: - { - DPRINT1("SRB_FUNCTION_FLUSH UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - case SRB_FUNCTION_SET_LINK_TIMEOUT: - { - DPRINT1("SRB_FUNCTION_FLUSH UNIMPLEMENTED\n"); - Status = STATUS_NOT_IMPLEMENTED; + case SRB_FUNCTION_FLUSH_QUEUE: + { + DPRINT1("SRB_FUNCTION_FLUSH / SRB_FUNCTION_FLUSH_QUEUE\n"); + + // + // flush all requests + // + USBSTOR_QueueFlushIrps(DeviceObject); + + // + // set status success + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Status = STATUS_SUCCESS; break; } default: Modified: branches/usb-bringup/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/fdo.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -142,6 +142,11 @@ } // + // intialize irp queue + // + USBSTOR_QueueInitialize(DeviceExtension); + + // // first get device & configuration & string descriptor // Status = USBSTOR_GetDescriptors(DeviceObject); Added: branches/usb-bringup/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/queue.c (added) +++ branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -1,0 +1,561 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Storage Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbstor/queue.c + * PURPOSE: USB block storage device driver. + * PROGRAMMERS: + * James Tabor + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbstor.h" + +VOID +USBSTOR_QueueInitialize( + PFDO_DEVICE_EXTENSION FDODeviceExtension) +{ + + // + // initialize queue lock + // + KeInitializeSpinLock(&FDODeviceExtension->IrpListLock); + + // + // initialize irp list head + // + InitializeListHead(&FDODeviceExtension->IrpListHead); +} + + +VOID +NTAPI +USBSTOR_CancelIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // acquire irp list lock + // + KeAcquireSpinLockAtDpcLevel(&FDODeviceExtension->IrpListLock); + + // + // now release the cancel lock + // + IoReleaseCancelSpinLock(Irp->CancelIrql); + + // + // remove the irp from the list + // + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + // + // release irp list lock + // + KeReleaseSpinLockFromDpcLevel(&FDODeviceExtension->IrpListLock); + + // + // set cancel status + // + Irp->IoStatus.Status = STATUS_CANCELLED; + + // + // now cancel the irp + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + + +BOOLEAN +USBSTOR_QueueAddIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDRIVER_CANCEL OldDriverCancel; + KIRQL OldLevel; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + BOOLEAN IrpListFreeze; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // mark irp pending + // + IoMarkIrpPending(Irp); + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // add irp to queue + // + InsertTailList(&FDODeviceExtension->IrpListHead, &Irp->Tail.Overlay.ListEntry); + + // + // now set the driver cancel routine + // + OldDriverCancel = IoSetCancelRoutine(Irp, USBSTOR_CancelIo); + + // + // check if the irp has already been cancelled + // + if (Irp->Cancel && OldDriverCancel == NULL) + { + // + // the irp has already been cancelled + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // cancel routine requires that cancel spinlock is held + // + IoAcquireCancelSpinLock(&Irp->CancelIrql); + + // + // cancel irp + // + USBSTOR_CancelIo(DeviceObject, Irp); + + // + // irp was cancelled + // + return FALSE; + } + + // + // check if queue is freezed + // + IrpListFreeze = FDODeviceExtension->IrpListFreeze; + + // + // release list lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // if list is freezed, dont start this packet + // + return IrpListFreeze; +} + +PIRP +USBSTOR_RemoveIrp( + IN PDEVICE_OBJECT DeviceObject) +{ + KIRQL OldLevel; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PLIST_ENTRY Entry; + PIRP Irp = NULL; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // check if list is empty + // + if (!IsListEmpty(&FDODeviceExtension->IrpListHead)) + { + // + // remove entry + // + Entry = RemoveHeadList(&FDODeviceExtension->IrpListHead); + + // + // get offset to start of irp + // + Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + } + + // + // release list lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // return result + // + return Irp; +} + +VOID +USBSTOR_QueueFlushIrps( + IN PDEVICE_OBJECT DeviceObject) +{ + KIRQL OldLevel; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PLIST_ENTRY Entry; + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // complete all irps with status cancelled + // + while(!IsListEmpty(&FDODeviceExtension->IrpListHead)) + { + // + // remove irp + // + Entry = RemoveHeadList(&FDODeviceExtension->IrpListHead); + + // + // get start of irp structure + // + Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // sanity check + // + ASSERT(Request); + + // + // set srb status to flushed + // + Request->SrbStatus = SRB_STATUS_REQUEST_FLUSHED; + + // + // set unsuccessful status + // + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); +} + +VOID +USBSTOR_QueueNextRequest( + IN PDEVICE_OBJECT DeviceObject) +{ + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // remove first irp from list + // + Irp = USBSTOR_RemoveIrp(DeviceObject); + + // + // is there an irp pending + // + if (!Irp) + { + // + // no work to do + // + return; + } + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get srb + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // start next packet + // + IoStartPacket(PDODeviceExtension->LowerDeviceObject, Irp, &Request->QueueSortKey, USBSTOR_CancelIo); +} + +VOID +USBSTOR_QueueRelease( + IN PDEVICE_OBJECT DeviceObject) +{ + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PIRP Irp; + KIRQL OldLevel; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // clear freezed status + // + FDODeviceExtension->IrpListFreeze = FALSE; + + // + // release irp list lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // grab newest irp + // + Irp = USBSTOR_RemoveIrp(DeviceObject); + + // + // is there an irp + // + if (!Irp) + { + // + // no irp + // + return; + } + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get srb + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // start new packet + // + IoStartPacket(PDODeviceExtension->LowerDeviceObject, // FDO + Irp, + &Request->QueueSortKey, + USBSTOR_CancelIo); +} + + +VOID +NTAPI +USBSTOR_StartIo( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + KIRQL OldLevel; + NTSTATUS Status; + + DPRINT1("USBSTOR_StartIo\n"); + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // acquire cancel spinlock + // + IoAcquireCancelSpinLock(&OldLevel); + + // + // set cancel routine to zero + // + IoSetCancelRoutine(Irp, NULL); + + // + // check if the irp has been cancelled + // + if (Irp->Cancel) + { + // + // irp has been cancelled, release cancel spinlock + // + IoReleaseCancelSpinLock(OldLevel); + + // + // irp is cancelled + // + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + // + // complete request + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // check if the queue has been frozen + // + if (FDODeviceExtension->IrpListFreeze == FALSE) + { + // + // queue next request + // + USBSTOR_QueueNextRequest(DeviceObject); + + // + // start next request + // + IoStartNextPacket(DeviceObject, TRUE); + } + + // + // done + // + return; + } + + // + // release cancel spinlock + // + IoReleaseCancelSpinLock(OldLevel); + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // remove irp from list + // + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // get current irp stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get pdo device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)IoStack->DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); + + // + // execute scsi + // + Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp); + + // + // FIXME: synchronize action with error handling + // + USBSTOR_QueueNextRequest(IoStack->DeviceObject); + + // + // start next request + // + IoStartNextPacket(DeviceObject, TRUE); + +} Propchange: branches/usb-bringup/drivers/usb/usbstor/queue.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -1002,3 +1002,94 @@ // return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL); } + + +NTSTATUS +USBSTOR_HandleExecuteSCSI( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PCDB pCDB; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + DPRINT1("USBSTOR_HandleExecuteSCSI Operation Code %x\n", pCDB->AsByte[0]); + + if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + { + // + // sanity checks + // + ASSERT(Request->DataBuffer); + + DPRINT1("SCSIOP_READ_CAPACITY Length %\n", Request->DataTransferLength); + Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp); + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) + { + DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); + ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); + ASSERT(Request->DataBuffer); + + // + // send mode sense command + // + Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ /*|| pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE*/) + { + DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read / write command + // + Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp); + } + else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) + { + DPRINT1("SCSIOP_MEDIUM_REMOVAL\n"); + + // + // just complete the request + // + Request->SrbStatus = SRB_STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = Request->DataTransferLength; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_TEST_UNIT_READY) + { + DPRINT1("SCSIOP_TEST_UNIT_READY\n"); + + // + // send test unit command + // + Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp); + } + else + { + UNIMPLEMENTED; + Request->SrbStatus = SRB_STATUS_ERROR; + Status = STATUS_NOT_SUPPORTED; + DbgBreakPoint(); + } + + return Status; +} Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] Sat May 14 18:09:00 2011 @@ -99,18 +99,6 @@ // } -VOID -NTAPI -USBSTOR_StartIo( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - // - // implement me - // - UNIMPLEMENTED -} - NTSTATUS NTAPI USBSTOR_DispatchClose( @@ -251,10 +239,9 @@ DriverObject->DriverExtension->AddDevice = USBSTOR_AddDevice; // - // FIXME: driver start i/o routine - // - //DriverObject->DriverStartIo = USBSTOR_StartIo; - + // driver start i/o routine + // + DriverObject->DriverStartIo = USBSTOR_StartIo; // // create / close Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sat May 14 18:09:00 2011 @@ -63,6 +63,9 @@ UCHAR BulkOutPipeIndex; // bulk out pipe index UCHAR MaxLUN; // max lun for device PDEVICE_OBJECT ChildPDO[16]; // max 16 child pdo devices + KSPIN_LOCK IrpListLock; // irp list lock + LIST_ENTRY IrpListHead; // irp list head + BOOLEAN IrpListFreeze; // if true the irp list is freezed }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct @@ -75,6 +78,9 @@ ULONG BlockLength; // length of block ULONG LastLogicBlockAddress; // last block address }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; + + + // // max lun command identifier @@ -361,41 +367,53 @@ // scsi.c routines // NTSTATUS -USBSTOR_SendInquiryCmd( +USBSTOR_HandleExecuteSCSI( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +//--------------------------------------------------------------------- +// +// disk.c routines +// +NTSTATUS +USBSTOR_HandleInternalDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +USBSTOR_HandleDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +//--------------------------------------------------------------------- +// +// queue.c routines +// +VOID +NTAPI +USBSTOR_StartIo( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +VOID +USBSTOR_QueueFlushIrps( IN PDEVICE_OBJECT DeviceObject); -NTSTATUS -USBSTOR_SendCapacityCmd( +VOID +USBSTOR_QueueRelease( + IN PDEVICE_OBJECT DeviceObject); + +BOOLEAN +USBSTOR_QueueAddIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS -USBSTOR_SendModeSenseCmd( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -USBSTOR_SendReadWriteCmd( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -USBSTOR_SendTestUnitCmd( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -//--------------------------------------------------------------------- -// -// disk.c routines -// -NTSTATUS -USBSTOR_HandleInternalDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - -NTSTATUS -USBSTOR_HandleDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); - - +VOID +NTAPI +USBSTOR_CancelIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +VOID +USBSTOR_QueueInitialize( + PFDO_DEVICE_EXTENSION FDODeviceExtension);

1 0

[rharabien] 51738: - Fix build
by rharabien＠svn.reactos.org 14 May '11

14 May '11

Author: rharabien Date: Sat May 14 16:01:54 2011 New Revision: 51738 URL: http://svn.reactos.org/svn/reactos?rev=51738&view=rev Log: - Fix build Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Sat May 14 16:01:54 2011 @@ -66,7 +66,7 @@ #endif #ifdef USE_DBGPRINT_LOGGER -#include "inc\PostDbgMesg.h" +#include "inc/PostDbgMesg.h" #define DbgPrint DbgDump_Printf #define Connect_DbgPrint() {DbgDump_SetAutoReconnect(TRUE); DbgDump_Reconnect();} #else // USE_DBGPRINT_LOGGER Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/stdafx.h [iso-8859-1] Sat May 14 16:01:54 2011 @@ -8,7 +8,7 @@ #include "stddef.h" #include "stdarg.h" -#include "inc\CrossNt.h" +#include "inc/CrossNt.h" #include "atapi.h" // includes scsi.h #include "ntdddisk.h"

1 0

[tkreuzer] 51737: [CMAKE/NTOSKRNL] Fix warnings
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 15:58:47 2011 New Revision: 51737 URL: http://svn.reactos.org/svn/reactos?rev=51737&view=rev Log: [CMAKE/NTOSKRNL] Fix warnings Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Sat May 14 15:58:47 2011 @@ -56,7 +56,7 @@ PROSSYM_KM_OWN_CONTEXT Context = (PROSSYM_KM_OWN_CONTEXT)FileContext; IO_STATUS_BLOCK Iosb; NTSTATUS Status = MiSimpleRead - (Context->FileObject, + (Context->FileObject, &Context->FileOffset, Buffer, Length, @@ -65,7 +65,7 @@ return NT_SUCCESS(Status); } -static PROSSYM_OWN_FILECONTEXT +static PROSSYM_OWN_FILECONTEXT KdbpCaptureFileForSymbols(PFILE_OBJECT FileObject) { PROSSYM_KM_OWN_CONTEXT Context = ExAllocatePool(NonPagedPool, sizeof(*Context)); @@ -205,13 +205,13 @@ else if (Address < MmSystemRangeStart) { MemoryArea = MmLocateMemoryAreaByAddress(&PsGetCurrentProcess()->Vm, Address); - if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) + if (!MemoryArea || MemoryArea->Type != MEMORY_AREA_SECTION_VIEW) { goto end; } SectionObject = MemoryArea->Data.SectionData.Section; if (!(SectionObject->AllocationAttributes & SEC_IMAGE)) goto end; - if (MemoryArea->StartingAddress != KdbpImageBase) + if (MemoryArea->StartingAddress != (PVOID)KdbpImageBase) { if (KdbpRosSymInfo) { @@ -223,7 +223,7 @@ if ((FileContext = KdbpCaptureFileForSymbols(SectionObject->FileObject))) { if (RosSymCreateFromFile(FileContext, &KdbpRosSymInfo)) - KdbpImageBase = MemoryArea->StartingAddress; + KdbpImageBase = (ULONG_PTR)MemoryArea->StartingAddress; KdbpReleaseFileForSymbols(FileContext); } @@ -242,7 +242,7 @@ { DbgPrint ("<%wZ:%x (%s:%d (%s))>", - &SectionObject->FileObject->FileName, + &SectionObject->FileObject->FileName, RelativeAddress, FileName, LineNumber, FunctionName); return TRUE; }

1 0

[rharabien] 51736: [UNIATA] - Sync to 0.41b2 - Fixed bug with unnecessary call to AtapiEnableInterrupts() inside AtapiSendCommand() when DRQ is never asserted - Added registry option AtapiSendDisab...
by rharabien＠svn.reactos.org 14 May '11

14 May '11

Author: rharabien Date: Sat May 14 15:52:49 2011 New Revision: 51736 URL: http://svn.reactos.org/svn/reactos?rev=51736&view=rev Log: [UNIATA] - Sync to 0.41b2 - Fixed bug with unnecessary call to AtapiEnableInterrupts() inside AtapiSendCommand() when DRQ is never asserted - Added registry option AtapiSendDisableIntr to manage ATAPI command sending behavior. AFAIU, under VirtualBox it is unnecessary to disable interrupts around sending ATAPI commands. - Implemented registry options for BUSY and DRQ timing adjustments. - Added VirtualBox tuning option - VirtualBox value in registry. Sets timings and ATAPI (CD/DVD) related options to the most compatible values. - Fixed bug with UDMA2 support on Intel ICH1/2/3/4/5 chips. - Made some experimental changes in automatic slow-down algorithm. This code is rather old, but was not tested properly. - Fixed bug with accessing SATA registers on Intel chips - Many other fixes Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/badblock.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.h trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h trunk/reactos/drivers/storage/ide/uniata/inc/misc.h trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/ide/uniata/stdafx.h trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/badblock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrNtStubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/stdafx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uata_ctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

1 0

[tkreuzer] 51735: [NETEVENT] Forgot this change
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 14:24:39 2011 New Revision: 51735 URL: http://svn.reactos.org/svn/reactos?rev=51735&view=rev Log: [NETEVENT] Forgot this change Modified: trunk/reactos/dll/win32/netevent/netevt.rc Modified: trunk/reactos/dll/win32/netevent/netevt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netevent/netevt.… ============================================================================== --- trunk/reactos/dll/win32/netevent/netevt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netevent/netevt.rc [iso-8859-1] Sat May 14 14:24:39 2011 @@ -6,4 +6,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "netevent.dll\0" #include <reactos/version.rc> -#include "netevent.rc" +#include "neteventmsg.rc"

1 0

[tkreuzer] 51734: [NETEVENT] Rename netevent.mc to neteventmsg.mc
by tkreuzer＠svn.reactos.org 14 May '11

14 May '11

Author: tkreuzer Date: Sat May 14 14:16:42 2011 New Revision: 51734 URL: http://svn.reactos.org/svn/reactos?rev=51734&view=rev Log: [NETEVENT] Rename netevent.mc to neteventmsg.mc Added: trunk/reactos/include/reactos/mc/neteventmsg.mc - copied unchanged from r51706, trunk/reactos/include/reactos/mc/netevent.mc Removed: trunk/reactos/include/reactos/mc/netevent.mc Modified: trunk/reactos/include/reactos/mc/mc.rbuild Modified: trunk/reactos/include/reactos/mc/mc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/mc.rbui… ============================================================================== --- trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/mc.rbuild [iso-8859-1] Sat May 14 14:16:42 2011 @@ -18,7 +18,7 @@ </module> <module name="neteventmsg" type="messageheader"> - <file>netevent.mc</file> + <file>neteventmsg.mc</file> </module> <module name="ntiologc" type="messageheader"> Removed: trunk/reactos/include/reactos/mc/netevent.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… ============================================================================== --- trunk/reactos/include/reactos/mc/netevent.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/netevent.mc (removed) @@ -1,484 +1,0 @@ -; -; netevent.mc MESSAGE resources for netevent.dll -; - -MessageIdTypedef=DWORD - -SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS - Informational=0x1:STATUS_SEVERITY_INFORMATIONAL - Warning=0x2:STATUS_SEVERITY_WARNING - Error=0x3:STATUS_SEVERITY_ERROR - ) - -FacilityNames=(System=0x0:FACILITY_SYSTEM - ) - -LanguageNames=(English=0x409:MSG00409) - - -; -; message definitions -; - -; Facility=System - -; -; eventlog events 6000-6099 -; - -MessageId=6000 -Severity=Warning -Facility=System -SymbolicName=EVENT_LOG_FULL -Language=English -The %1 log file is full. -. - -MessageId=6001 -Severity=Warning -Facility=System -SymbolicName=EVENT_LogFileNotOpened -Language=English -The %1 log file cannot be opened. -. - -MessageId=6002 -Severity=Warning -Facility=System -SymbolicName=EVENT_LogFileCorrupt -Language=English -The %1 log file is corrupted and will be cleared. -. - -MessageId=6003 -Severity=Warning -Facility=System -SymbolicName=EVENT_DefaultLogCorrupt -Language=English -The Application log file could not be opened. %1 will be used as the default log file. -. - -MessageId=6004 -Severity=Warning -Facility=System -SymbolicName=EVENT_BadDriverPacket -Language=English -A driver packet received from the I/O subsystem was invalid. The data is the packet. -. - -MessageId=6005 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogStarted -Language=English -The Event log service was started. -. - -MessageId=6006 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogStopped -Language=English -The Event log service was stopped. -. - -MessageId=6007 -Severity=Warning -Facility=System -SymbolicName=TITLE_EventlogMessageBox -Language=English -Eventlog Service %0 -. - -MessageId=6008 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventlogAbnormalShutdown -Language=English -The previous system shutdown at %1 on %2 was unexpected. -. - -MessageId=6009 -Severity=Warning -Facility=System -SymbolicName=EVENT_EventLogProductInfo -Language=English -ReactOS %1 %2 %3 %4. -. - -MessageId=6010 -Severity=Error -Facility=System -SymbolicName=EVENT_ServiceNoEventLog -Language=English -The %1 service was unable to set up an event source. -. - -MessageId=6011 -Severity=Error -Facility=System -SymbolicName=EVENT_ComputerNameChange -Language=English -The NetBIOS name and DNS host name of this machine have been changed from %1 to %2. -. - -MessageId=6012 -Severity=Error -Facility=System -SymbolicName=EVENT_DNSDomainNameChange -Language=English -The DNS domain assigned to this computer has been changed from %1 to %2. -. - - -; -; system events 6100 - 6199 -; - -MessageId=6100 -Severity=Error -Facility=System -SymbolicName=EVENT_UP_DRIVER_ON_MP -Language=English -A uniprocessor-specific driver was loaded on a multiprocessor system. The driver could not load. -. - - -; -; service controller events 7000-7899 -; - -MessageId=7000 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED -Language=English -The %1 service failed to start due to the following error: %n%2 -. - -MessageId=7001 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED_II -Language=English -The %1 service depends on the %2 service which failed to start because of the following error: %n%3 -. - -MessageId=7002 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED_GROUP -Language=English -The %1 service depends on the %2 group and no member of this group started. -. - -MessageId=7003 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_FAILED_NONE -Language=English -The %1 service depends on the following nonexistent service: %2 -. - -MessageId=7004 -Severity=Error -Facility=System -SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED -Language=English -The %1 call failed with the following error: %n%2 -. - -MessageId=7005 -Severity=Error -Facility=System -SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED_II -Language=English -The %1 call failed for %2 with the following error: %n%3 -. - -MessageId=7006 -Severity=Error -Facility=System -SymbolicName=EVENT_REVERTED_TO_LASTKNOWNGOOD -Language=English -The system reverted to its last known good configuration. The system is restarting.... -. - -MessageId=7007 -Severity=Error -Facility=System -SymbolicName=EVENT_BAD_ACCOUNT_NAME -Language=English -No backslash is in the account name. -. - -MessageId=7008 -Severity=Error -Facility=System -SymbolicName=EVENT_CONNECTION_TIMEOUT -Language=English -Timeout (%1 milliseconds) waiting for the %2 service to connect. -. - -MessageId=7009 -Severity=Error -Facility=System -SymbolicName=EVENT_READFILE_TIMEOUT -Language=English -Timeout (%1 milliseconds) waiting for ReadFile. -. - -MessageId=7010 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSACT_TIMEOUT -Language=English -Timeout (%1 milliseconds) waiting for a transaction response from the %2 service. -. - -MessageId=7011 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSACT_INVALID -Language=English -Message returned in transaction has incorrect size. -. - -MessageId=7012 -Severity=Error -Facility=System -SymbolicName=EVENT_FIRST_LOGON_FAILED -Language=English -Logon attempt with current password failed with the following error: %n%1 -. - -MessageId=7013 -Severity=Error -Facility=System -SymbolicName=EVENT_SECOND_LOGON_FAILED -Language=English -Second logon attempt with old password also failed with the following error: %n%1 -. - -MessageId=7014 -Severity=Error -Facility=System -SymbolicName=EVENT_INVALID_DRIVER_DEPENDENCY -Language=English -Boot-start or system-start driver (%1) must not depend on a service. -. - -MessageId=7015 -Severity=Error -Facility=System -SymbolicName=EVENT_BAD_SERVICE_STATE -Language=English -The %1 service has reported an invalid current state %2. -. - -MessageId=7016 -Severity=Error -Facility=System -SymbolicName=EVENT_CIRCULAR_DEPENDENCY_DEMAND -Language=English -Detected circular dependencies demand starting %1. -. - -MessageId=7017 -Severity=Error -Facility=System -SymbolicName=EVENT_CIRCULAR_DEPENDENCY_AUTO -Language=English -Detected circular dependencies auto-starting services. -. - -MessageId=7018 -Severity=Error -Facility=System -SymbolicName=EVENT_DEPEND_ON_LATER_SERVICE -Language=English -Circular dependency: The %1 service depends on a service in a group which starts later. -. - -MessageId=7019 -Severity=Error -Facility=System -SymbolicName=EVENT_DEPEND_ON_LATER_GROUP -Language=English -Circular dependency: The %1 service depends on a group which starts later. -. - -MessageId=7020 -Severity=Error -Facility=System -SymbolicName=EVENT_SEVERE_SERVICE_FAILED -Language=English -About to revert to the last known good configuration because the %1 service failed to start. -. - -MessageId=7021 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_HUNG -Language=English -The %1 service hung on starting. -. - -MessageId=7022 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_EXIT_FAILED -Language=English -The %1 service terminated with the following error: %n%2 -. - -MessageId=7023 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_EXIT_FAILED_SPECIFIC -Language=English -The %1 service terminated with service-specific error %2. -. - -MessageId=7024 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_START_AT_BOOT_FAILED -Language=English -At least one service or driver failed during system startup. Use Event Viewer to examine the event log for details. -. - -MessageId=7025 -Severity=Error -Facility=System -SymbolicName=EVENT_BOOT_SYSTEM_DRIVERS_FAILED -Language=English -The following boot-start or system-start driver(s) failed to load: %1 -. - -MessageId=7026 -Severity=Error -Facility=System -SymbolicName=EVENT_RUNNING_LASTKNOWNGOOD -Language=English -ReactOS could not be started as configured. A previous working configuration was used instead. -. - -MessageId=7027 -Severity=Error -Facility=System -SymbolicName=EVENT_TAKE_OWNERSHIP -Language=English -The %1 Registry key denied access to SYSTEM account programs so the Service Control Manager took ownership of the Registry key. -. - -MessageId=7028 -Severity=Error -Facility=System -SymbolicName=TITLE_SC_MESSAGE_BOX -Language=English -Service Control Manager %0 -. - -MessageId=7029 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_NOT_INTERACTIVE -Language=English -The %1 service is marked as an interactive service. However, the system is configured to not allow interactive services. This service may not function properly. -. - -MessageId=7030 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_CRASH -Language=English -The %1 service terminated unexpectedly. It has done this %2 time(s). The following corrective action will be taken in %3 milliseconds: %5. -. - -MessageId=7031 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_RECOVERY_FAILED -Language=English -The Service Control Manager tried to take a corrective action (%2) after the unexpected termination of the %3 service, but this action failed with the following error: %n%4 -. - -MessageId=7032 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_SCESRV_FAILED -Language=English -The Service Control Manager did not initialize successfully. The security -configuration server (scesrv.dll) failed to initialize with error %1. The -system is restarting... -. - -MessageId=7033 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_CRASH_NO_ACTION -Language=English -The %1 service terminated unexpectedly. It has done this %2 time(s). -. - -MessageId=7034 -Severity=Informational -Facility=System -SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS -Language=English -The %1 service was successfully sent a %2 control. -. - -MessageId=7035 -Severity=Informational -Facility=System -SymbolicName=EVENT_SERVICE_STATUS_SUCCESS -Language=English -Service Control Manager %0 -. - -MessageId=7036 -Severity=Error -Facility=System -SymbolicName=EVENT_SERVICE_CONFIG_BACKOUT_FAILED -Language=English -The Service Control Manager encountered an error undoing a configuration change -to the %1 service. The service's %2 is currently in an unpredictable state. - -If you do not correct this configuration, you may not be able to restart the %1 -service or may encounter other errors. To ensure that the service is configured -properly, use the Services snap-in in Microsoft Management Console (MMC). -. - -MessageId=7037 -Severity=Error -Facility=System -SymbolicName=EVENT_FIRST_LOGON_FAILED_II -Language=English -The %1 service was unable to log on as %2 with the currently configured -password due to the following error: %n%3%n%nTo ensure that the service is -configured properly, use the Services snap-in in Microsoft Management -Console (MMC). -. - - -; -; transport events 9000-9499 -; - -MessageId=9004 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSPORT_REGISTER_FAILED -Language=English -%2 failed to register itself with the NDIS wrapper. -. - -MessageId=9006 -Severity=Error -Facility=System -SymbolicName=EVENT_TRANSPORT_ADAPTER_NOT_FOUND -Language=English -%2 could not find adapter %3. -.

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