ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
September 2012
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
17 participants
236 discussions
Start a n
N
ew thread
[akhaldi] 57387: [W32KNAPI] * Silence some warnings.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Tue Sep 25 21:30:25 2012 New Revision: 57387 URL:
http://svn.reactos.org/svn/reactos?rev=57387&view=rev
Log: [W32KNAPI] * Silence some warnings. Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserCallNoParam.c [iso-8859-1] Tue Sep 25 21:30:25 2012 @@ -50,8 +50,8 @@ INT Test_NoParamRoutine_LoadUserApiHook(PTESTINFO pti) /* 0x1d */ { - DWORD dwRet; - dwRet = NtUserCallNoParam(_NOPARAM_ROUTINE_LOADUSERAPIHOOK); + //DWORD dwRet; + /* dwRet = */NtUserCallNoParam(_NOPARAM_ROUTINE_LOADUSERAPIHOOK); // TEST(dwRet != 0); return APISTATUS_NORMAL; Modified: trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntuser/…
============================================================================== --- trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntuser/NtUserGetClassInfo.c [iso-8859-1] Tue Sep 25 21:30:25 2012 @@ -15,7 +15,7 @@ { WNDCLASSEXW wclex, wclex2 = {0}; UNICODE_STRING us; - PWSTR pwstr; + PWSTR pwstr = NULL; us.Length = 8; us.MaximumLength = 8;
12 years, 3 months
1
0
0
0
[akhaldi] 57386: [FRAMEBUF_NEW] * Explicitly mark the functions as stdcall.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Tue Sep 25 21:10:12 2012 New Revision: 57386 URL:
http://svn.reactos.org/svn/reactos?rev=57386&view=rev
Log: [FRAMEBUF_NEW] * Explicitly mark the functions as stdcall. Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f…
============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Tue Sep 25 21:10:12 2012 @@ -13,23 +13,10 @@ ${SOURCE} framebuf_new.rc) -if(ARCH STREQUAL "i386") - # FIXME:
http://www.cmake.org/Bug/view.php?id=12998
- if(MSVC) - #add_target_compile_flags(framebuf_new "/Gz") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") - else() - #add_target_compile_flags(framebuf_new "-mrtd -fno-builtin") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") - endif() -endif() - set_entrypoint(framebuf_new DrvEnableDriver 12) set_subsystem(framebuf_new native) set_image_base(framebuf_new 0x00010000) - target_link_libraries(framebuf_new libcntpr) - add_importlibs(framebuf_new win32k) add_pch(framebuf_new driver.h) add_dependencies(framebuf_new psdk bugcodes) Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f…
============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/driver.h [iso-8859-1] Tue Sep 25 21:10:12 2012 @@ -51,14 +51,14 @@ // eVb: 3.1 [END] } PDEV, *PPDEV; -DWORD getAvailableModes(HANDLE, PVIDEO_MODE_INFORMATION *, DWORD *); -BOOL bInitPDEV(PPDEV, PDEVMODEW, GDIINFO *, DEVINFO *); -BOOL bInitSURF(PPDEV, BOOL); -BOOL bInitPaletteInfo(PPDEV, DEVINFO *); -BOOL bInitPointer(PPDEV, DEVINFO *); -BOOL bInit256ColorPalette(PPDEV); -VOID vDisablePalette(PPDEV); -VOID vDisableSURF(PPDEV); +DWORD NTAPI getAvailableModes(HANDLE, PVIDEO_MODE_INFORMATION *, DWORD *); +BOOL NTAPI bInitPDEV(PPDEV, PDEVMODEW, GDIINFO *, DEVINFO *); +BOOL NTAPI bInitSURF(PPDEV, BOOL); +BOOL NTAPI bInitPaletteInfo(PPDEV, DEVINFO *); +BOOL NTAPI bInitPointer(PPDEV, DEVINFO *); +BOOL NTAPI bInit256ColorPalette(PPDEV); +VOID NTAPI vDisablePalette(PPDEV); +VOID NTAPI vDisableSURF(PPDEV); #define MAX_CLUT_SIZE (sizeof(VIDEO_CLUT) + (sizeof(ULONG) * 256)) Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f…
============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/enable.c [iso-8859-1] Tue Sep 25 21:10:12 2012 @@ -42,7 +42,7 @@ * \**************************************************************************/ -BOOL DrvEnableDriver( +BOOL NTAPI DrvEnableDriver( ULONG iEngineVersion, ULONG cj, PDRVENABLEDATA pded) @@ -82,7 +82,7 @@ * \**************************************************************************/ -DHPDEV DrvEnablePDEV( +DHPDEV NTAPI DrvEnablePDEV( DEVMODEW *pDevmode, // Pointer to DEVMODE PWSTR pwszLogAddress, // Logical address ULONG cPatterns, // number of patterns @@ -166,7 +166,7 @@ * \**************************************************************************/ -VOID DrvCompletePDEV( +VOID NTAPI DrvCompletePDEV( DHPDEV dhpdev, HDEV hdev) { @@ -181,7 +181,7 @@ * \**************************************************************************/ -VOID DrvDisablePDEV( +VOID NTAPI DrvDisablePDEV( DHPDEV dhpdev) { vDisablePalette((PPDEV) dhpdev); @@ -197,7 +197,7 @@ * \**************************************************************************/ -HSURF DrvEnableSurface( +HSURF NTAPI DrvEnableSurface( DHPDEV dhpdev) { PPDEV ppdev; @@ -284,7 +284,7 @@ * \**************************************************************************/ -VOID DrvDisableSurface( +VOID NTAPI DrvDisableSurface( DHPDEV dhpdev) { EngDeleteSurface(((PPDEV) dhpdev)->hsurfEng); @@ -299,7 +299,7 @@ * \**************************************************************************/ -BOOL DrvAssertMode( +BOOL NTAPI DrvAssertMode( DHPDEV dhpdev, BOOL bEnable) { @@ -371,7 +371,7 @@ * \**************************************************************************/ -ULONG DrvGetModes( +ULONG NTAPI DrvGetModes( HANDLE hDriver, ULONG cjSize, DEVMODEW *pdm) Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f…
============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/palette.c [iso-8859-1] Tue Sep 25 21:10:12 2012 @@ -36,7 +36,7 @@ { 0xFF,0xFF,0xFF,0 }, // 19 }; -BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo); +BOOL NTAPI bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo); /******************************Public*Routine******************************\ * bInitPaletteInfo @@ -47,7 +47,7 @@ * \**************************************************************************/ -BOOL bInitPaletteInfo(PPDEV ppdev, DEVINFO *pDevInfo) +BOOL NTAPI bInitPaletteInfo(PPDEV ppdev, DEVINFO *pDevInfo) { if (!bInitDefaultPalette(ppdev, pDevInfo)) return(FALSE); @@ -62,7 +62,7 @@ * \**************************************************************************/ -VOID vDisablePalette(PPDEV ppdev) +VOID NTAPI vDisablePalette(PPDEV ppdev) { // Delete the default palette if we created one. @@ -83,7 +83,7 @@ * \**************************************************************************/ -BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo) +BOOL NTAPI bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo) { if (ppdev->ulBitCount == 8) { @@ -190,7 +190,7 @@ * \**************************************************************************/ -BOOL bInit256ColorPalette(PPDEV ppdev) +BOOL NTAPI bInit256ColorPalette(PPDEV ppdev) { BYTE ajClutSpace[MAX_CLUT_SIZE]; PVIDEO_CLUT pScreenClut; @@ -255,7 +255,7 @@ * \**************************************************************************/ -BOOL DrvSetPalette( +BOOL NTAPI DrvSetPalette( DHPDEV dhpdev, PALOBJ* ppalo, FLONG fl, Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f…
============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/pointer.c [iso-8859-1] Tue Sep 25 21:10:12 2012 @@ -8,17 +8,17 @@ #include "driver.h" -BOOL bCopyColorPointer( +BOOL NTAPI bCopyColorPointer( PPDEV ppdev, SURFOBJ *psoMask, SURFOBJ *psoColor, XLATEOBJ *pxlo); -BOOL bCopyMonoPointer( +BOOL NTAPI bCopyMonoPointer( PPDEV ppdev, SURFOBJ *psoMask); -BOOL bSetHardwarePointerShape( +BOOL NTAPI bSetHardwarePointerShape( SURFOBJ *pso, SURFOBJ *psoMask, SURFOBJ *psoColor, @@ -34,7 +34,7 @@ * \**************************************************************************/ -VOID DrvMovePointer +VOID NTAPI DrvMovePointer ( SURFOBJ *pso, LONG x, @@ -107,7 +107,7 @@ * \**************************************************************************/ -ULONG DrvSetPointerShape +ULONG NTAPI DrvSetPointerShape ( SURFOBJ *pso, SURFOBJ *psoMask, @@ -202,7 +202,7 @@ * \**************************************************************************/ -BOOL bSetHardwarePointerShape( +BOOL NTAPI bSetHardwarePointerShape( SURFOBJ *pso, SURFOBJ *psoMask, SURFOBJ *psoColor, @@ -293,7 +293,7 @@ * \**************************************************************************/ -BOOL bCopyMonoPointer( +BOOL NTAPI bCopyMonoPointer( PPDEV ppdev, SURFOBJ *pso) { @@ -380,7 +380,7 @@ * FALSE if not. * \**************************************************************************/ -BOOL bCopyColorPointer( +BOOL NTAPI bCopyColorPointer( PPDEV ppdev, SURFOBJ *psoMask, SURFOBJ *psoColor, @@ -397,7 +397,7 @@ * \**************************************************************************/ -BOOL bInitPointer(PPDEV ppdev, DEVINFO *pdevinfo) +BOOL NTAPI bInitPointer(PPDEV ppdev, DEVINFO *pdevinfo) { DWORD returnedDataLength; Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f…
============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/screen.c [iso-8859-1] Tue Sep 25 21:10:12 2012 @@ -39,7 +39,7 @@ * \**************************************************************************/ -BOOL bInitSURF(PPDEV ppdev, BOOL bFirst) +BOOL NTAPI bInitSURF(PPDEV ppdev, BOOL bFirst) { DWORD returnedDataLength; DWORD MaxWidth, MaxHeight; @@ -168,7 +168,7 @@ * \**************************************************************************/ -VOID vDisableSURF(PPDEV ppdev) +VOID NTAPI vDisableSURF(PPDEV ppdev) { DWORD returnedDataLength; VIDEO_MEMORY videoMemory; @@ -197,7 +197,7 @@ * \**************************************************************************/ -BOOL bInitPDEV( +BOOL NTAPI bInitPDEV( PPDEV ppdev, DEVMODEW *pDevMode, GDIINFO *pGdiInfo, @@ -503,7 +503,7 @@ * \**************************************************************************/ -DWORD getAvailableModes( +DWORD NTAPI getAvailableModes( HANDLE hDriver, PVIDEO_MODE_INFORMATION *modeInformation, DWORD *cbModeSize)
12 years, 3 months
1
0
0
0
[akhaldi] 57385: [CDROM_NEW] * Explicitly mark the functions as stdcall. * Fix warnings.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Tue Sep 25 20:59:32 2012 New Revision: 57385 URL:
http://svn.reactos.org/svn/reactos?rev=57385&view=rev
Log: [CDROM_NEW] * Explicitly mark the functions as stdcall. * Fix warnings. Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c trunk/reactos/drivers/storage/class/cdrom_new/mmc.c trunk/reactos/drivers/storage/class/cdrom_new/sec.c trunk/reactos/drivers/storage/class/cdrom_new/sec.h Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] Tue Sep 25 20:59:32 2012 @@ -13,12 +13,9 @@ if(ARCH STREQUAL "i386") # FIXME:
http://www.cmake.org/Bug/view.php?id=12998
- if(MSVC) - #add_target_compile_flags(cdrom_new "/Gz") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") - else() - #add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + if(NOT MSVC) + #add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-unused-variable -Wno-pointer-sign") endif() endif() Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] Tue Sep 25 20:59:32 2012 @@ -72,8 +72,6 @@ (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_CDROM_RAW_READ))) - - NTSTATUS NTAPI DriverEntry( @@ -175,9 +173,9 @@ return ClassInitialize( DriverObject, RegistryPath, &InitializationData); } // end DriverEntry() - VOID +NTAPI CdRomUnload( IN PDRIVER_OBJECT DriverObject ) @@ -189,9 +187,9 @@ WPP_CLEANUP(DriverObject); return; } // end CdRomUnload() - NTSTATUS +NTAPI CdRomAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject @@ -259,9 +257,9 @@ return status; } - NTSTATUS +NTAPI CdRomCreateDeviceObject( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject @@ -290,7 +288,7 @@ --*/ { UCHAR ntNameBuffer[64]; - STRING ntNameString; + //STRING ntNameString; NTSTATUS status; PDEVICE_OBJECT lowerDevice = NULL; @@ -300,12 +298,12 @@ PCDROM_DRIVER_EXTENSION driverExtension = NULL; ULONG deviceNumber; - CCHAR dosNameBuffer[64]; - CCHAR deviceNameBuffer[64]; - STRING deviceNameString; - STRING dosString; - UNICODE_STRING dosUnicodeString; - UNICODE_STRING unicodeString; + //CCHAR dosNameBuffer[64]; + //CCHAR deviceNameBuffer[64]; + //STRING deviceNameString; + //STRING dosString; + //UNICODE_STRING dosUnicodeString; + //UNICODE_STRING unicodeString; PAGED_CODE(); @@ -518,9 +516,9 @@ return status; } // end CreateCdRomDeviceObject() - NTSTATUS +NTAPI CdRomInitDevice( IN PDEVICE_OBJECT Fdo ) @@ -557,7 +555,7 @@ ULONG timeOut; PCDROM_DATA cddata = NULL; - BOOLEAN changerDevice; + //BOOLEAN changerDevice; BOOLEAN isMmcDevice = FALSE; ULONG bps; @@ -1173,9 +1171,9 @@ return status; } - NTSTATUS +NTAPI CdRomStartDevice( IN PDEVICE_OBJECT Fdo ) @@ -1321,9 +1319,9 @@ return STATUS_SUCCESS; } - NTSTATUS +NTAPI CdRomStopDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type @@ -1331,9 +1329,9 @@ { return STATUS_SUCCESS; } - VOID +NTAPI CdRomStartIo( IN PDEVICE_OBJECT Fdo, IN PIRP Irp @@ -1351,7 +1349,7 @@ ULONG transferPages; ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; - LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; + //LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; PCDROM_DATA cdData; PSCSI_REQUEST_BLOCK srb = NULL; PCDB cdb; @@ -1942,7 +1940,7 @@ if (cdData->RawAccess) { ULONG startingSector; - UCHAR min, sec, frame; + //UCHAR min, sec, frame; // // Free the recently allocated irp, as we don't need it. @@ -2962,7 +2960,7 @@ case IOCTL_CDROM_GET_CONTROL: { - PAUDIO_OUTPUT audioOutput; + //PAUDIO_OUTPUT audioOutput; PCDROM_AUDIO_CONTROL audioControl = Irp->AssociatedIrp.SystemBuffer; // @@ -3295,9 +3293,9 @@ IoCallDriver(commonExtension->LowerDeviceObject, Irp); return; } - NTSTATUS +NTAPI CdRomReadWriteVerification( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -3333,7 +3331,7 @@ SCSI_REQUEST_BLOCK srb; PCDB cdb = (PCDB)srb.Cdb; - NTSTATUS status; + //NTSTATUS status; PAGED_CODE(); @@ -3381,9 +3379,9 @@ return STATUS_SUCCESS; } // end CdRomReadWriteVerification() - NTSTATUS +NTAPI CdRomSwitchModeCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3552,7 +3550,7 @@ ULONG maximumTransferLength; ULONG transferPages; - UCHAR min, sec, frame; + //UCHAR min, sec, frame; // // Calculate starting offset. @@ -3828,9 +3826,9 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - VOID +NTAPI ScanForSpecialHandler( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, ULONG_PTR HackFlags @@ -3851,6 +3849,7 @@ } VOID +NTAPI ScanForSpecial( PDEVICE_OBJECT DeviceObject ) @@ -4187,9 +4186,9 @@ return; } - VOID +NTAPI HitachiProcessErrorGD2000( PDEVICE_OBJECT Fdo, PSCSI_REQUEST_BLOCK OriginalSrb, @@ -4234,12 +4233,12 @@ if (((senseBuffer->SenseKey & 0xf) == SCSI_SENSE_HARDWARE_ERROR) && (senseBuffer->AdditionalSenseCode == 0x44)) { - PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; - PIRP irp; - PIO_STACK_LOCATION irpStack; - PCOMPLETION_CONTEXT context; - PSCSI_REQUEST_BLOCK newSrb; - PCDB cdb; + //PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; + //PIRP irp; + //PIO_STACK_LOCATION irpStack; + //PCOMPLETION_CONTEXT context; + //PSCSI_REQUEST_BLOCK newSrb; + //PCDB cdb; TraceLog((CdromDebugWarning, "HitachiProcessErrorGD2000 (%p) => Internal Target " @@ -4266,9 +4265,9 @@ return; } - VOID +NTAPI HitachiProcessError( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -4479,9 +4478,9 @@ } } - NTSTATUS +NTAPI ToshibaProcessErrorCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -4531,9 +4530,9 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - VOID +NTAPI ToshibaProcessError( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -4713,9 +4712,9 @@ IoCallDriver(fdoExtension->CommonExtension.LowerDeviceObject, irp); } } - BOOLEAN +NTAPI CdRomIsPlayActive( IN PDEVICE_OBJECT DeviceObject ) @@ -4795,9 +4794,9 @@ return(PLAY_ACTIVE(fdoExtension)); } - VOID +NTAPI CdRomTickHandler( IN PDEVICE_OBJECT DeviceObject ) @@ -4827,12 +4826,12 @@ KIRQL oldIrql; - PIRP irp; - PIRP heldIrpList; - PIRP nextIrp; - PLIST_ENTRY listEntry; + //PIRP irp; + //PIRP heldIrpList; + //PIRP nextIrp; + //PLIST_ENTRY listEntry; PCDROM_DATA cddata; - PIO_STACK_LOCATION irpStack; + //PIO_STACK_LOCATION irpStack; UCHAR uniqueAddress; isRemoved = ClassAcquireRemoveLock(DeviceObject, (PIRP) &uniqueAddress); @@ -4915,9 +4914,9 @@ ClassReleaseRemoveLock(DeviceObject, (PIRP) &uniqueAddress); } - NTSTATUS +NTAPI CdRomUpdateGeometryCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -4955,10 +4954,10 @@ NTSTATUS status; BOOLEAN retry; ULONG retryCount; - ULONG lastSector; + //ULONG lastSector; PIRP originalIrp; - PCDROM_DATA cddata; - UCHAR uniqueAddress; + //PCDROM_DATA cddata; + //UCHAR uniqueAddress; // // Get items saved in the private IRP stack location. @@ -4975,7 +4974,7 @@ fdoExtension = DeviceObject->DeviceExtension; commonExtension = DeviceObject->DeviceExtension; - cddata = commonExtension->DriverData; + //cddata = commonExtension->DriverData; readCapacityBuffer = srb->DataBuffer; if ((NT_SUCCESS(Irp->IoStatus.Status)) && (SRB_STATUS(srb->SrbStatus) == SRB_STATUS_SUCCESS)) { @@ -5155,9 +5154,9 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS +NTAPI CdRomUpdateCapacity( IN PFUNCTIONAL_DEVICE_EXTENSION DeviceExtension, IN PIRP IrpToComplete, @@ -5194,7 +5193,7 @@ PREAD_CAPACITY_DATA capacityBuffer; PIO_STACK_LOCATION irpStack; PUCHAR senseBuffer; - NTSTATUS status; + //NTSTATUS status; irp = IoAllocateIrp((CCHAR)(commonExtension->DeviceObject->StackSize+1), FALSE); @@ -5353,9 +5352,9 @@ IrpToComplete); return STATUS_INSUFFICIENT_RESOURCES; } - NTSTATUS +NTAPI CdRomRemoveDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type @@ -5494,9 +5493,9 @@ return STATUS_SUCCESS; } - DEVICE_TYPE +NTAPI CdRomGetDeviceType( IN PDEVICE_OBJECT DeviceObject ) @@ -5621,9 +5620,9 @@ return deviceType; } - NTSTATUS +NTAPI CdRomCreateWellKnownName( IN PDEVICE_OBJECT DeviceObject ) @@ -5733,9 +5732,9 @@ return STATUS_SUCCESS; } - VOID +NTAPI CdRomDeleteWellKnownName( IN PDEVICE_OBJECT DeviceObject ) @@ -5754,9 +5753,9 @@ } return; } - NTSTATUS +NTAPI CdRomGetDeviceParameter ( IN PDEVICE_OBJECT Fdo, IN PWSTR ParameterName, @@ -5830,9 +5829,9 @@ return status; } // CdRomGetDeviceParameter - NTSTATUS +NTAPI CdRomSetDeviceParameter ( IN PDEVICE_OBJECT Fdo, IN PWSTR ParameterName, @@ -5891,9 +5890,9 @@ return status; } // CdromSetDeviceParameter - VOID +NTAPI CdRomPickDvdRegion( IN PDEVICE_OBJECT Fdo ) @@ -6372,9 +6371,9 @@ return; } - NTSTATUS +NTAPI CdRomRetryRequest( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PIRP Irp, @@ -6404,9 +6403,9 @@ return STATUS_PENDING; } - NTSTATUS +NTAPI CdRomRerunRequest( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN OPTIONAL PIRP Irp, @@ -6425,7 +6424,6 @@ return STATUS_MORE_PROCESSING_REQUIRED; } } - /*++ @@ -6625,6 +6623,7 @@ --*/ VOID +NTAPI CdRomErrorHandler( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -6704,7 +6703,6 @@ } return; } - /*++ @@ -6726,6 +6724,7 @@ --*/ NTSTATUS +NTAPI CdRomShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -7007,8 +7006,8 @@ } // end CdromShutdownFlush() - VOID +NTAPI CdromFakePartitionInfo( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN PIRP Irp @@ -7144,5 +7143,3 @@ return; } - - Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] Tue Sep 25 20:59:32 2012 @@ -355,8 +355,6 @@ #define DVD_MAX_REGION_RESET_COUNT 2 #define DVD_MAX_REGION 8 - - #define BAIL_OUT(Irp) \ DebugPrint((2, "Cdrom: [%p] Bailing with status " \ " %lx at line %x file %s\n", \ @@ -437,8 +435,9 @@ return; } - -VOID + +VOID +NTAPI CdRomDeviceControlDvdReadStructure( IN PDEVICE_OBJECT DeviceObject, IN PIRP OriginalIrp, @@ -447,6 +446,7 @@ ); VOID +NTAPI CdRomDeviceControlDvdEndSession( IN PDEVICE_OBJECT DeviceObject, IN PIRP OriginalIrp, @@ -455,6 +455,7 @@ ); VOID +NTAPI CdRomDeviceControlDvdStartSessionReadKey( IN PDEVICE_OBJECT DeviceObject, IN PIRP OriginalIrp, @@ -463,45 +464,50 @@ ); VOID +NTAPI CdRomDeviceControlDvdSendKey( IN PDEVICE_OBJECT DeviceObject, IN PIRP OriginalIrp, IN PIRP NewIrp, IN PSCSI_REQUEST_BLOCK Srb ); - - - -NTSTATUS + +NTSTATUS +NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ); VOID +NTAPI CdRomUnload( IN PDRIVER_OBJECT DriverObject ); NTSTATUS +NTAPI CdRomAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo ); NTSTATUS +NTAPI CdRomOpenClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI CdRomReadWriteVerification( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI CdRomSwitchMode( IN PDEVICE_OBJECT DeviceObject, IN ULONG SectorSize, @@ -509,12 +515,14 @@ ); NTSTATUS +NTAPI CdRomDeviceControlDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI CdRomDeviceControlCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -522,6 +530,7 @@ ); NTSTATUS +NTAPI CdRomSetVolumeIntermediateCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -529,6 +538,7 @@ ); NTSTATUS +NTAPI CdRomSwitchModeCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -536,6 +546,7 @@ ); NTSTATUS +NTAPI CdRomXACompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -543,6 +554,7 @@ ); NTSTATUS +NTAPI CdRomClassIoctlCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -550,17 +562,20 @@ ); VOID +NTAPI CdRomStartIo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); VOID +NTAPI CdRomTickHandler( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS +NTAPI CdRomUpdateCapacity( IN PFUNCTIONAL_DEVICE_EXTENSION DeviceExtension, IN PIRP IrpToComplete, @@ -568,28 +583,33 @@ ); NTSTATUS +NTAPI CdRomCreateDeviceObject( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo ); VOID +NTAPI ScanForSpecialHandler( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, ULONG_PTR HackFlags ); VOID +NTAPI ScanForSpecial( PDEVICE_OBJECT DeviceObject ); BOOLEAN +NTAPI CdRomIsPlayActive( IN PDEVICE_OBJECT DeviceObject ); VOID +NTAPI CdRomErrorHandler( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -598,6 +618,7 @@ ); VOID +NTAPI HitachiProcessErrorGD2000( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -606,6 +627,7 @@ ); VOID +NTAPI HitachiProcessError( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -614,6 +636,7 @@ ); VOID +NTAPI ToshibaProcessError( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -622,6 +645,7 @@ ); NTSTATUS +NTAPI ToshibaProcessErrorCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -629,34 +653,40 @@ ); VOID +NTAPI CdRomCreateNamedEvent( IN PFUNCTIONAL_DEVICE_EXTENSION DeviceExtension, IN ULONG DeviceNumber ); NTSTATUS +NTAPI CdRomInitDevice( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI CdRomStartDevice( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI CdRomStopDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type ); NTSTATUS +NTAPI CdRomRemoveDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type ); NTSTATUS +NTAPI CdRomDvdEndAllSessionsCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -664,6 +694,7 @@ ); NTSTATUS +NTAPI CdRomDvdReadDiskKeyCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -671,21 +702,25 @@ ); DEVICE_TYPE +NTAPI CdRomGetDeviceType( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS +NTAPI CdRomCreateWellKnownName( IN PDEVICE_OBJECT DeviceObject ); VOID +NTAPI CdRomDeleteWellKnownName( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS +NTAPI CdRomGetDeviceParameter ( IN PDEVICE_OBJECT DeviceObject, IN PWSTR ParameterName, @@ -693,6 +728,7 @@ ); NTSTATUS +NTAPI CdRomSetDeviceParameter ( IN PDEVICE_OBJECT DeviceObject, IN PWSTR ParameterName, @@ -700,11 +736,13 @@ ); VOID +NTAPI CdRomPickDvdRegion ( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI CdRomRetryRequest( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PIRP Irp, @@ -713,6 +751,7 @@ ); NTSTATUS +NTAPI CdRomRerunRequest( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN OPTIONAL PIRP Irp, @@ -720,17 +759,20 @@ ); NTSTATUS +NTAPI CdRomGetRpc0Settings( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI CdRomSetRpc0Settings( IN PDEVICE_OBJECT Fdo, IN UCHAR NewRegion ); NTSTATUS +NTAPI CdRomShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -739,6 +781,7 @@ //////////////////////////////////////////////////////////////////////////////// VOID +NTAPI CdRomIsDeviceMmcDevice( IN PDEVICE_OBJECT Fdo, OUT PBOOLEAN IsMmc @@ -754,6 +797,7 @@ ); PVOID +NTAPI CdRomFindFeaturePage( IN PGET_CONFIGURATION_HEADER FeatureBuffer, IN ULONG Length, @@ -761,6 +805,7 @@ ); NTSTATUS +NTAPI CdRomGetConfiguration( IN PDEVICE_OBJECT Fdo, OUT PGET_CONFIGURATION_HEADER *Buffer, @@ -770,12 +815,14 @@ ); VOID +NTAPI CdRomUpdateMmcDriveCapabilities( IN PDEVICE_OBJECT Fdo, IN PVOID Context // RESERVED == NULL ); VOID +NTAPI CdRomFindProfileInProfiles( IN PFEATURE_DATA_PROFILE_LIST ProfileHeader, IN FEATURE_PROFILE_TYPE ProfileToFind, @@ -783,28 +830,33 @@ ); NTSTATUS +NTAPI CdRomAllocateMmcResources( IN PDEVICE_OBJECT Fdo ); VOID +NTAPI CdRomDeAllocateMmcResources( IN PDEVICE_OBJECT Fdo ); VOID +NTAPI CdromFakePartitionInfo( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN PIRP Irp ); VOID +NTAPI CdRomInterpretReadCapacity( IN PDEVICE_OBJECT Fdo, IN PREAD_CAPACITY_DATA ReadCapacityBuffer ); NTSTATUS +NTAPI CdRomShutdownFlushCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -812,6 +864,7 @@ ); VOID +NTAPI CdRompFlushDelayedList( IN PDEVICE_OBJECT Fdo, IN PCDROM_MMC_EXTENSION MmcData, @@ -820,5 +873,3 @@ ); #endif // __CDROMP_H__ - - Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] Tue Sep 25 20:59:32 2012 @@ -51,9 +51,8 @@ #define DEFAULT_CDROM_SECTORS_PER_TRACK 32 #define DEFAULT_TRACKS_PER_CYLINDER 64 - - NTSTATUS +NTAPI CdRomDeviceControlDispatch( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -86,10 +85,10 @@ BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); SCSI_REQUEST_BLOCK srb; PCDB cdb = (PCDB)srb.Cdb; - PVOID outputBuffer; + //PVOID outputBuffer; ULONG bytesTransferred = 0; NTSTATUS status; - NTSTATUS status2; + //NTSTATUS status2; KIRQL irql; ULONG ioctlCode; @@ -274,7 +273,7 @@ ULONGLONG transferBytes; ULONGLONG endOffset; ULONGLONG mdlBytes; - ULONG startingSector; + //ULONG startingSector; PRAW_READ_INFO rawReadInfo = (PRAW_READ_INFO)irpStack->Parameters.DeviceIoControl.Type3InputBuffer; // @@ -344,8 +343,8 @@ } startingOffset.QuadPart = rawReadInfo->DiskOffset.QuadPart; - startingSector = (ULONG)(rawReadInfo->DiskOffset.QuadPart >> - fdoExtension->SectorShift); + /* startingSector = (ULONG)(rawReadInfo->DiskOffset.QuadPart >> + fdoExtension->SectorShift); */ transferBytes = (ULONGLONG)rawReadInfo->SectorCount * RAW_SECTOR_SIZE; endOffset = (ULONGLONG)rawReadInfo->SectorCount * COOKED_SECTOR_SIZE; @@ -932,7 +931,7 @@ case IOCTL_DVD_SEND_KEY2: { PDVD_COPY_PROTECT_KEY key = Irp->AssociatedIrp.SystemBuffer; - ULONG keyLength; + //ULONG keyLength; TraceLog((CdromDebugTrace, "DvdDeviceControl: [%p] IOCTL_DVD_SEND_KEY\n", Irp)); @@ -1042,7 +1041,7 @@ } else { - ULONG i; + //ULONG i; UCHAR mask; ULONG bufferLen; PDVD_READ_STRUCTURE dvdReadStructure; @@ -1866,11 +1865,11 @@ } else { - PIO_STACK_LOCATION currentStack; + //PIO_STACK_LOCATION currentStack; KeInitializeEvent(deviceControlEvent, NotificationEvent, FALSE); - currentStack = IoGetCurrentIrpStackLocation(Irp); + //currentStack = IoGetCurrentIrpStackLocation(Irp); nextStack = IoGetNextIrpStackLocation(Irp); // @@ -2017,9 +2016,9 @@ return status; } // end CdRomDeviceControl() - NTSTATUS +NTAPI CdRomClassIoctlCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -2061,9 +2060,9 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS +NTAPI CdRomDeviceControlCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -2423,9 +2422,9 @@ PDVD_DESCRIPTOR_HEADER header = realIrp->AssociatedIrp.SystemBuffer; - FOUR_BYTE fourByte; - PTWO_BYTE twoByte; - UCHAR tmp; + //FOUR_BYTE fourByte; + //PTWO_BYTE twoByte; + //UCHAR tmp; TraceLog((CdromDebugTrace, "DvdDeviceControlCompletion - IOCTL_DVD_READ_STRUCTURE: completing irp %p (buddy %p)\n", @@ -2834,9 +2833,9 @@ CdRomCompleteIrpAndStartNextPacketSafely(DeviceObject, realIrp); return STATUS_MORE_PROCESSING_REQUIRED; } - NTSTATUS +NTAPI CdRomSetVolumeIntermediateCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3180,8 +3179,9 @@ CdRomCompleteIrpAndStartNextPacketSafely(DeviceObject, realIrp); return STATUS_MORE_PROCESSING_REQUIRED; } - + NTSTATUS +NTAPI CdRomDvdEndAllSessionsCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3220,7 +3220,7 @@ PDVD_SESSION_ID sessionId = Irp->AssociatedIrp.SystemBuffer; - NTSTATUS status; + //NTSTATUS status; if(++(*sessionId) > MAX_COPY_PROTECT_AGID) { @@ -3253,8 +3253,9 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - + NTSTATUS +NTAPI CdRomDvdReadDiskKeyCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3328,8 +3329,9 @@ return STATUS_SUCCESS; } - + NTSTATUS +NTAPI CdRomXACompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3509,9 +3511,9 @@ return status; } - VOID +NTAPI CdRomDeviceControlDvdReadStructure( IN PDEVICE_OBJECT Fdo, IN PIRP OriginalIrp, @@ -3630,9 +3632,9 @@ return; } - VOID +NTAPI CdRomDeviceControlDvdEndSession( IN PDEVICE_OBJECT Fdo, IN PIRP OriginalIrp, @@ -3659,9 +3661,9 @@ return; } - VOID +NTAPI CdRomDeviceControlDvdStartSessionReadKey( IN PDEVICE_OBJECT Fdo, IN PIRP OriginalIrp, @@ -3822,9 +3824,9 @@ } return; } - VOID +NTAPI CdRomDeviceControlDvdSendKey( IN PDEVICE_OBJECT Fdo, IN PIRP OriginalIrp, @@ -3965,8 +3967,8 @@ return; } - VOID +NTAPI CdRomInterpretReadCapacity( IN PDEVICE_OBJECT Fdo, IN PREAD_CAPACITY_DATA ReadCapacityBuffer @@ -4073,5 +4075,3 @@ return; } - - Modified: trunk/reactos/drivers/storage/class/cdrom_new/mmc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] Tue Sep 25 20:59:32 2012 @@ -28,9 +28,8 @@ #include "classpnp.h" #include "cdrom.h" - - NTSTATUS +NTAPI CdRomGetConfiguration( IN PDEVICE_OBJECT Fdo, OUT PGET_CONFIGURATION_HEADER *Buffer, @@ -38,18 +37,24 @@ IN FEATURE_NUMBER StartingFeature, IN ULONG RequestedType ); + VOID +NTAPI CdRompPrintAllFeaturePages( IN PGET_CONFIGURATION_HEADER Buffer, IN ULONG Usable ); + NTSTATUS +NTAPI CdRomUpdateMmcDriveCapabilitiesCompletion( IN PDEVICE_OBJECT Unused, IN PIRP Irp, IN PDEVICE_OBJECT Fdo ); + VOID +NTAPI CdRomPrepareUpdateCapabilitiesIrp( PDEVICE_OBJECT Fdo ); @@ -62,6 +67,7 @@ --*/ VOID +NTAPI CdRomFindProfileInProfiles( IN PFEATURE_DATA_PROFILE_LIST ProfileHeader, IN FEATURE_PROFILE_TYPE ProfileToFind, @@ -107,6 +113,7 @@ --*/ PVOID +NTAPI CdRomFindFeaturePage( IN PGET_CONFIGURATION_HEADER FeatureBuffer, IN ULONG Length, @@ -189,13 +196,14 @@ } return NULL; } - + /*++ Private so we can later expose to someone wanting to use a preallocated buffer --*/ NTSTATUS +NTAPI CdRompGetConfiguration( IN PDEVICE_OBJECT Fdo, IN PGET_CONFIGURATION_HEADER Buffer, @@ -270,7 +278,7 @@ ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } - + /*++ Allocates buffer with configuration info, returns STATUS_SUCCESS @@ -282,6 +290,7 @@ --*/ NTSTATUS +NTAPI CdRomGetConfiguration( IN PDEVICE_OBJECT Fdo, OUT PGET_CONFIGURATION_HEADER *Buffer, @@ -290,7 +299,7 @@ IN ULONG RequestedType ) { - PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; + //PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; GET_CONFIGURATION_HEADER header; // eight bytes, not a lot PGET_CONFIGURATION_HEADER buffer; ULONG returned; @@ -301,7 +310,7 @@ PAGED_CODE(); - fdoExtension = Fdo->DeviceExtension; + //fdoExtension = Fdo->DeviceExtension; *Buffer = NULL; *BytesReturned = 0; @@ -411,8 +420,9 @@ "information\n", i)); return STATUS_IO_DEVICE_ERROR; } - + VOID +NTAPI CdRomIsDeviceMmcDevice( IN PDEVICE_OBJECT Fdo, OUT PBOOLEAN IsMmc @@ -541,6 +551,7 @@ } VOID +NTAPI CdRompPrintAllFeaturePages( IN PGET_CONFIGURATION_HEADER Buffer, IN ULONG Usable @@ -835,7 +846,7 @@ } return; } - + NTSTATUS NTAPI CdRomUpdateMmcDriveCapabilitiesCompletion( @@ -851,7 +862,7 @@ PSCSI_REQUEST_BLOCK srb = &(mmcData->CapabilitiesSrb); PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); NTSTATUS status = STATUS_UNSUCCESSFUL; - PIRP delayedIrp; + //PIRP delayedIrp; ULONG retryCount; LARGE_INTEGER delay; @@ -964,8 +975,8 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - VOID +NTAPI CdRomPrepareUpdateCapabilitiesIrp( PDEVICE_OBJECT Fdo ) @@ -1058,8 +1069,9 @@ return; } - + VOID +NTAPI CdRomUpdateMmcDriveCapabilities( IN PDEVICE_OBJECT Fdo, IN PVOID Context @@ -1214,8 +1226,8 @@ return; } - VOID +NTAPI CdRompFlushDelayedList( IN PDEVICE_OBJECT Fdo, IN PCDROM_MMC_EXTENSION MmcData, @@ -1315,8 +1327,9 @@ return; } - + VOID +NTAPI CdRomDeAllocateMmcResources( IN PDEVICE_OBJECT Fdo ) @@ -1324,7 +1337,7 @@ PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; PCDROM_DATA cddata = commonExtension->DriverData; PCDROM_MMC_EXTENSION mmcData = &cddata->Mmc; - NTSTATUS status; + //NTSTATUS status; if (mmcData->CapabilitiesWorkItem) { IoFreeWorkItem(mmcData->CapabilitiesWorkItem); @@ -1350,6 +1363,7 @@ } NTSTATUS +NTAPI CdRomAllocateMmcResources( IN PDEVICE_OBJECT Fdo ) Modified: trunk/reactos/drivers/storage/class/cdrom_new/sec.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/sec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/sec.c [iso-8859-1] Tue Sep 25 20:59:32 2012 @@ -7,8 +7,8 @@ #include "sec.h" - NTSTATUS +NTAPI CdRomGetRpc0Settings( IN PDEVICE_OBJECT Fdo ) @@ -21,9 +21,9 @@ return STATUS_SUCCESS; } - NTSTATUS +NTAPI CdRomSetRpc0Settings( IN PDEVICE_OBJECT Fdo, IN UCHAR NewRegion @@ -31,8 +31,3 @@ { return STATUS_SUCCESS; } - - - - - Modified: trunk/reactos/drivers/storage/class/cdrom_new/sec.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/sec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/sec.h [iso-8859-1] Tue Sep 25 20:59:32 2012 @@ -4,8 +4,6 @@ --*/ - #include "ntddk.h" #include "classpnp.h" #include "cdrom.h" -
12 years, 3 months
1
0
0
0
[ekohl] 57384: [PSDK] Remove non-existing enumeration _POLICY_LOCAL_INFORMATION_CLASS and functions LsaQueryLocalInformationPolicy and LsaSetLocalInformationPolicy.
by ekohl@svn.reactos.org
Author: ekohl Date: Tue Sep 25 17:06:25 2012 New Revision: 57384 URL:
http://svn.reactos.org/svn/reactos?rev=57384&view=rev
Log: [PSDK] Remove non-existing enumeration _POLICY_LOCAL_INFORMATION_CLASS and functions LsaQueryLocalInformationPolicy and LsaSetLocalInformationPolicy. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Tue Sep 25 17:06:25 2012 @@ -212,6 +212,9 @@ case PolicyLsaServerRoleInformation: case PolicyReplicaSourceInformation: case PolicyDefaultQuotaInformation: + case PolicyDnsDomainInformation: + case PolicyDnsDomainInformationInt: + case PolicyLocalAccountDomainInformation: DesiredAccess = POLICY_VIEW_LOCAL_INFORMATION; break; @@ -219,6 +222,7 @@ DesiredAccess = POLICY_GET_PRIVATE_INFORMATION; break; + case PolicyLastEntry: default: ERR("Invalid InformationClass!\n"); return STATUS_INVALID_PARAMETER; @@ -265,10 +269,16 @@ case PolicyModificationInformation: case PolicyAuditFullSetInformation: case PolicyAuditFullQueryInformation: - case PolicyEfsInformation: + case PolicyDnsDomainInformationInt: + case PolicyLocalAccountDomainInformation: FIXME("Information class not implemented\n"); Status = STATUS_UNSUCCESSFUL; break; + + case PolicyLastEntry: + default: + ERR("Invalid InformationClass!\n"); + Status = STATUS_INVALID_PARAMETER; } return Status; Modified: trunk/reactos/include/psdk/ntsecapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re…
============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Tue Sep 25 17:06:25 2012 @@ -242,7 +242,9 @@ PolicyAuditFullSetInformation, PolicyAuditFullQueryInformation, PolicyDnsDomainInformation, - PolicyEfsInformation + PolicyDnsDomainInformationInt, + PolicyLocalAccountDomainInformation, + PolicyLastEntry } POLICY_INFORMATION_CLASS, *PPOLICY_INFORMATION_CLASS; typedef enum _POLICY_AUDIT_EVENT_TYPE { AuditCategorySystem, @@ -255,21 +257,6 @@ AuditCategoryDirectoryServiceAccess, AuditCategoryAccountLogon } POLICY_AUDIT_EVENT_TYPE, *PPOLICY_AUDIT_EVENT_TYPE; -typedef enum _POLICY_LOCAL_INFORMATION_CLASS { - PolicyLocalAuditEventsInformation = 1, - PolicyLocalPdAccountInformation, - PolicyLocalAccountDomainInformation, - PolicyLocalLsaServerRoleInformation, - PolicyLocalReplicaSourceInformation, - PolicyLocalModificationInformation, - PolicyLocalAuditFullSetInformation, - PolicyLocalAuditFullQueryInformation, - PolicyLocalDnsDomainInformation, - PolicyLocalIPSecReferenceInformation, - PolicyLocalMachinePasswordInformation, - PolicyLocalQualityOfServiceInformation, - PolicyLocalPolicyLocationInformation -} POLICY_LOCAL_INFORMATION_CLASS, *PPOLICY_LOCAL_INFORMATION_CLASS; typedef enum _POLICY_DOMAIN_INFORMATION_CLASS { PolicyDomainIPSecReferenceInformation = 1, PolicyDomainQualityOfServiceInformation, @@ -728,8 +715,6 @@ NTSTATUS NTAPI LsaQueryDomainInformationPolicy(LSA_HANDLE, POLICY_DOMAIN_INFORMATION_CLASS,PVOID*); NTSTATUS NTAPI LsaQueryInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); -NTSTATUS NTAPI LsaQueryLocalInformationPolicy(LSA_HANDLE, - POLICY_LOCAL_INFORMATION_CLASS,PVOID*); NTSTATUS NTAPI LsaQuerySecret(LSA_HANDLE,PLSA_UNICODE_STRING*,PLARGE_INTEGER, PLSA_UNICODE_STRING*,PLARGE_INTEGER); NTSTATUS NTAPI LsaQueryTrustedDomainInfo(LSA_HANDLE,PSID, @@ -744,8 +729,6 @@ NTSTATUS NTAPI LsaSetDomainInformationPolicy(LSA_HANDLE, POLICY_DOMAIN_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); -NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE, - POLICY_LOCAL_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaSetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING); NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE,ULONG);
12 years, 3 months
1
0
0
0
[ekohl] 57383: [LSASRV] - Set the default quota limits when the LSA database is created. - Implement the PolicyDefaultQuotaInformation class of LsarQueryInformationPolicy.
by ekohl@svn.reactos.org
Author: ekohl Date: Tue Sep 25 16:08:00 2012 New Revision: 57383 URL:
http://svn.reactos.org/svn/reactos?rev=57383&view=rev
Log: [LSASRV] - Set the default quota limits when the LSA database is created. - Implement the PolicyDefaultQuotaInformation class of LsarQueryInformationPolicy. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/policy.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Tue Sep 25 16:08:00 2012 @@ -226,9 +226,18 @@ static NTSTATUS LsapCreateDatabaseObjects(VOID) { + POLICY_DEFAULT_QUOTA_INFO QuotaInfo; PLSA_DB_OBJECT PolicyObject = NULL; PSID AccountDomainSid = NULL; NTSTATUS Status; + + /* Initialize the default quota limits */ + QuotaInfo.QuotaLimits.PagedPoolLimit = 0x2000000; + QuotaInfo.QuotaLimits.NonPagedPoolLimit = 0x100000; + QuotaInfo.QuotaLimits.MinimumWorkingSetSize = 0x10000; + QuotaInfo.QuotaLimits.MaximumWorkingSetSize = 0xF000000; + QuotaInfo.QuotaLimits.PagefileLimit = 0; + QuotaInfo.QuotaLimits.TimeLimit.QuadPart = 0; /* Create a random domain SID */ Status = LsapCreateRandomDomainSid(&AccountDomainSid); @@ -263,6 +272,12 @@ L"PolAcDmS", AccountDomainSid, RtlLengthSid(AccountDomainSid)); + + /* Set the default quota limits attribute */ + LsapSetObjectAttribute(PolicyObject, + L"DefQuota", + &QuotaInfo, + sizeof(POLICY_DEFAULT_QUOTA_INFO)); done: if (PolicyObject != NULL) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Tue Sep 25 16:08:00 2012 @@ -248,6 +248,11 @@ PolicyInformation); break; + case PolicyDefaultQuotaInformation: /* 8 */ + Status = LsarQueryDefaultQuota(PolicyHandle, + PolicyInformation); + break; + case PolicyDnsDomainInformation: /* 12 (0xc) */ Status = LsarQueryDnsDomain(PolicyHandle, PolicyInformation); @@ -257,7 +262,6 @@ case PolicyPdAccountInformation: case PolicyLsaServerRoleInformation: case PolicyReplicaSourceInformation: - case PolicyDefaultQuotaInformation: case PolicyModificationInformation: case PolicyAuditFullSetInformation: case PolicyAuditFullQueryInformation: Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Tue Sep 25 16:08:00 2012 @@ -114,6 +114,10 @@ PLSAPR_POLICY_INFORMATION *PolicyInformation); NTSTATUS +LsarQueryDefaultQuota(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation); + +NTSTATUS LsarQueryDnsDomain(PLSA_DB_OBJECT PolicyObject, PLSAPR_POLICY_INFORMATION *PolicyInformation); Modified: trunk/reactos/dll/win32/lsasrv/policy.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/policy.c?…
============================================================================== --- trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/policy.c [iso-8859-1] Tue Sep 25 16:08:00 2012 @@ -351,6 +351,38 @@ MIDL_user_free(p); } + } + + return Status; +} + + +NTSTATUS +LsarQueryDefaultQuota(PLSA_DB_OBJECT PolicyObject, + PLSAPR_POLICY_INFORMATION *PolicyInformation) +{ + PPOLICY_DEFAULT_QUOTA_INFO QuotaInfo = NULL; + ULONG AttributeSize; + NTSTATUS Status; + + *PolicyInformation = NULL; + + AttributeSize = sizeof(POLICY_DEFAULT_QUOTA_INFO); + QuotaInfo = MIDL_user_allocate(AttributeSize); + if (QuotaInfo == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + Status = LsapGetObjectAttribute(PolicyObject, + L"DefQuota", + QuotaInfo, + &AttributeSize); + if (!NT_SUCCESS(Status)) + { + MIDL_user_free(QuotaInfo); + } + else + { + *PolicyInformation = (PLSAPR_POLICY_INFORMATION)QuotaInfo; } return Status;
12 years, 3 months
1
0
0
0
[ekohl] 57382: [ADVAPI32] Implement LsaEnumerateAccountsWithUserRight, LsaEnumeratePrivileges, LsaGetQuotasForAccount and LsaSetQuotasForAccount.
by ekohl@svn.reactos.org
Author: ekohl Date: Tue Sep 25 00:15:24 2012 New Revision: 57382 URL:
http://svn.reactos.org/svn/reactos?rev=57382&view=rev
Log: [ADVAPI32] Implement LsaEnumerateAccountsWithUserRight, LsaEnumeratePrivileges, LsaGetQuotasForAccount and LsaSetQuotasForAccount. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3…
============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Tue Sep 25 00:15:24 2012 @@ -357,12 +357,12 @@ @ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) @ stdcall LsaEnumerateAccounts(ptr ptr ptr long ptr) @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) -@ stub LsaEnumeratePrivileges +@ stdcall LsaEnumeratePrivileges(ptr ptr ptr long ptr) @ stdcall LsaEnumeratePrivilegesOfAccount(ptr ptr) @ stdcall LsaEnumerateTrustedDomains(ptr ptr ptr long ptr) @ stdcall LsaEnumerateTrustedDomainsEx(ptr ptr ptr long ptr) @ stdcall LsaFreeMemory(ptr) -@ stub LsaGetQuotasForAccount +@ stdcall LsaGetQuotasForAccount(ptr ptr) @ stub LsaGetRemoteUserName @ stdcall LsaGetSystemAccessAccount(ptr ptr) @ stdcall LsaGetUserName(ptr ptr) @@ -399,7 +399,7 @@ @ stdcall LsaSetForestTrustInformation(ptr ptr ptr long ptr) @ stdcall LsaSetInformationPolicy(long long ptr) @ stub LsaSetInformationTrustedDomain -@ stub LsaSetQuotasForAccount +@ stdcall LsaSetQuotasForAccount(ptr ptr) @ stdcall LsaSetSecret(ptr ptr ptr) @ stub LsaSetSecurityObject @ stdcall LsaSetSystemAccessAccount(ptr long) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa…
============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Tue Sep 25 00:15:24 2012 @@ -421,17 +421,15 @@ AccountSid, &UserRightsSet); + *UserRights = (PUNICODE_STRING)UserRightsSet.UserRights; *CountOfRights = UserRightsSet.Entries; - *UserRights = (PUNICODE_STRING)UserRightsSet.UserRights; } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { Status = I_RpcMapWin32Status(RpcExceptionCode()); if (UserRightsSet.UserRights != NULL) - { MIDL_user_free(UserRightsSet.UserRights); - } } RpcEndExcept; @@ -484,7 +482,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -493,9 +491,79 @@ OUT PVOID *Buffer, OUT PULONG CountReturned) { - FIXME("LsaEnumerateAccountsWithUserRight(%p %p %p %p) stub\n", + LSAPR_ACCOUNT_ENUM_BUFFER AccountEnumBuffer; + NTSTATUS Status; + + TRACE("LsaEnumerateAccountsWithUserRight(%p %p %p %p) stub\n", PolicyHandle, UserRight, Buffer, CountReturned); - return STATUS_NO_MORE_ENTRIES; + + AccountEnumBuffer.EntriesRead = 0; + AccountEnumBuffer.Information = NULL; + + RpcTryExcept + { + Status = LsarEnumerateAccountsWithUserRight((LSAPR_HANDLE)PolicyHandle, + (PRPC_UNICODE_STRING)UserRight, + &AccountEnumBuffer); + + *Buffer = AccountEnumBuffer.Information; + *CountReturned = AccountEnumBuffer.EntriesRead; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (AccountEnumBuffer.Information != NULL) + MIDL_user_free(AccountEnumBuffer.Information); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaEnumeratePrivileges(IN LSA_HANDLE PolicyHandle, + IN OUT PLSA_ENUMERATION_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + LSAPR_PRIVILEGE_ENUM_BUFFER PrivilegeEnumBuffer; + NTSTATUS Status; + + TRACE("LsaEnumeratePrivileges(%p %p %p %lu %p)\n", + PolicyHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + PrivilegeEnumBuffer.Entries = 0; + PrivilegeEnumBuffer.Privileges = NULL; + + RpcTryExcept + { + Status = LsarEnumeratePrivileges((LSAPR_HANDLE)PolicyHandle, + EnumerationContext, + &PrivilegeEnumBuffer, + PreferedMaximumLength); + + *Buffer = PrivilegeEnumBuffer.Privileges; + *CountReturned = PrivilegeEnumBuffer.Entries; + + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (PrivilegeEnumBuffer.Privileges != NULL) + MIDL_user_free(PrivilegeEnumBuffer.Privileges); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -542,9 +610,12 @@ PolicyHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); - if (CountReturned) *CountReturned = 0; + if (CountReturned) + *CountReturned = 0; + return STATUS_SUCCESS; } + /* * @unimplemented @@ -561,7 +632,9 @@ PolicyHandle, EnumerationContext, Buffer, PreferedMaximumLength, CountReturned); - if (CountReturned) *CountReturned = 0; + if (CountReturned) + *CountReturned = 0; + return STATUS_SUCCESS; } @@ -583,6 +656,34 @@ */ NTSTATUS WINAPI +LsaGetQuotasForAccount(IN LSA_HANDLE AccountHandle, + OUT PQUOTA_LIMITS QuotaLimits) +{ + NTSTATUS Status; + + TRACE("LsaGetQuotasForAccount(%p %p)\n", + AccountHandle, QuotaLimits); + + RpcTryExcept + { + Status = LsarGetQuotasForAccount((LSAPR_HANDLE)AccountHandle, + QuotaLimits); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI LsaGetSystemAccessAccount(IN LSA_HANDLE AccountHandle, OUT PULONG SystemAccess) { @@ -607,7 +708,7 @@ /* - * @unimplemented + * @implemented */ NTSTATUS WINAPI @@ -1463,6 +1564,34 @@ */ NTSTATUS WINAPI +LsaSetQuotasForAccount(IN LSA_HANDLE AccountHandle, + IN PQUOTA_LIMITS QuotaLimits) +{ + NTSTATUS Status; + + TRACE("LsaSetQuotasForAccount(%p %p)\n", + AccountHandle, QuotaLimits); + + RpcTryExcept + { + Status = LsarSetQuotasForAccount((LSAPR_HANDLE)AccountHandle, + QuotaLimits); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI LsaSetSecret(IN LSA_HANDLE SecretHandle, IN PLSA_UNICODE_STRING CurrentValue OPTIONAL, IN PLSA_UNICODE_STRING OldValue OPTIONAL) Modified: trunk/reactos/include/psdk/ntsecapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re…
============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Tue Sep 25 00:15:24 2012 @@ -693,6 +693,8 @@ ULONG,PULONG); NTSTATUS NTAPI LsaEnumerateAccountsWithUserRight(LSA_HANDLE,PLSA_UNICODE_STRING, PVOID*,PULONG); +NTSTATUS NTAPI LsaEnumeratePrivileges(LSA_HANDLE,PLSA_ENUMERATION_HANDLE, + PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaEnumeratePrivilegesOfAccount(LSA_HANDLE,PPRIVILEGE_SET*); NTSTATUS NTAPI LsaEnumerateTrustedDomains(LSA_HANDLE,PLSA_ENUMERATION_HANDLE, PVOID*,ULONG,PULONG); @@ -700,6 +702,7 @@ PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaFreeMemory(PVOID); NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID); +NTSTATUS NTAPI LsaGetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); NTSTATUS NTAPI LsaGetSystemAccessAccount(LSA_HANDLE, PULONG); NTSTATUS NTAPI LsaGetUserName(PUNICODE_STRING*,PUNICODE_STRING*); NTSTATUS NTAPI LsaLogonUser(HANDLE,PLSA_STRING,SECURITY_LOGON_TYPE,ULONG,PVOID, @@ -743,6 +746,7 @@ NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS, PVOID); NTSTATUS NTAPI LsaSetLocalInformationPolicy(LSA_HANDLE, POLICY_LOCAL_INFORMATION_CLASS,PVOID); +NTSTATUS NTAPI LsaSetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING); NTSTATUS NTAPI LsaSetSystemAccessAccount(LSA_HANDLE,ULONG); NTSTATUS NTAPI LsaSetTrustedDomainInformation(LSA_HANDLE,PSID,
12 years, 3 months
1
0
0
0
[zguo] 57381: [TRANSLATION] Add Chinese translation for time/date control panel applet by yinwh79 at 163.com. CORE-6702.
by zguo@svn.reactos.org
Author: zguo Date: Mon Sep 24 22:57:23 2012 New Revision: 57381 URL:
http://svn.reactos.org/svn/reactos?rev=57381&view=rev
Log: [TRANSLATION] Add Chinese translation for time/date control panel applet by yinwh79 at
163.com
. CORE-6702. Added: trunk/reactos/dll/cpl/timedate/lang/zh-CN.rc (with props) Modified: trunk/reactos/dll/cpl/timedate/rsrc.rc Added: trunk/reactos/dll/cpl/timedate/lang/zh-CN.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/zh-C…
============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/zh-CN.rc (added) +++ trunk/reactos/dll/cpl/timedate/lang/zh-CN.rc [iso-8859-1] Mon Sep 24 22:57:23 2012 @@ -1,0 +1,69 @@ +// Update yinwh +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ʱ¼äºÍÈÕÆÚ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "ÈÕÆÚ(&D)", -1, 4, 2, 122, 125 + COMBOBOX IDC_MONTHCB, 11, 17, 50, 120, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_YEARTEXT,65, 17, 55, 12, ES_LEFT | WS_GROUP | ES_READONLY + CONTROL "", IDC_YEAR, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_NOTHOUSANDS | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 120, 17, 50, 12 + + CONTROL "", IDC_MONTHCALENDAR, "MonthCalWnd", + WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 11, 37, 108, 80, WS_EX_CLIENTEDGE + GROUPBOX "ʱ¼ä(&T)", -1, 132, 2, 113, 125 + CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, + 144, 105, 90, 12 + LTEXT "", IDC_TIMEZONE, 6, 132, 242, 11 + CONTROL "", IDC_CLOCKWND, "ClockWndClass", + WS_CHILD | WS_VISIBLE, 138, 12, 102, 89 +END + + +IDD_TIMEZONEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "ʱÇø" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_TIMEZONELIST, 5, 4, 241, 136, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_WORLD_BACKGROUND, "Static", SS_OWNERDRAW, 5, 20, 240, 110, WS_EX_STATICEDGE + AUTOCHECKBOX "¸ù¾ÝÏÄʱÖÆ×Ô¶¯µ÷½ÚʱÖÓ(&U)", + IDC_AUTODAYLIGHT, 6, 132, 242, 11, WS_VISIBLE | WS_GROUP | WS_TABSTOP +END + + +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet ʱ¼ä" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + AUTOCHECKBOX "×Ô¶¯Óë Internet ʱ¼ä·þÎñÆ÷ͬ²½(&S)", IDC_AUTOSYNC, + 11, 7, 241, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + LTEXT "·þÎñÆ÷:", IDC_SERVERTEXT, 34, 22, 28, 13 + PUSHBUTTON "Á¢¼´¸üÐÂ(&U)", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "ͬ²½Ö»ÓÐÔÚÄúµÄ¼ÆËã»úÓë Internet Á¬½Óʱ²ÅÄܽøÐС£", -1, 12, 114, 225, 25 +END + + +STRINGTABLE +BEGIN + IDS_CPLNAME "ÈÕÆÚºÍʱ¼ä" + IDS_CPLDESCRIPTION "ÇëΪÄúµÄ¼ÆËã»úÉèÖÃÈÕÆÚ¡¢Ê±¼äºÍʱÇøÐÅÏ¢" + IDS_TIMEZONETEXT "µ±Ç°Ê±Çø: %s" + IDS_TIMEZONEINVALID "ÎÞЧµÄ" + IDS_TIMEZONEUNKNOWN "δ֪" + IDS_INETTIMESUCSYNC "ʱ¼äÒѳɹ¦Í¬²½£¬ÔÚ %s ÔÚ %s ÔÚ %s" + IDS_INETTIMENEXTSYNC "Ï´Îͬ²½:%s ÔÚ %s" + IDS_INETTIMESYNCING "ÇëµÈ´ý£¬ReactOS ÕýÔÚͬ²½ %s" + IDS_INETTIMEERROR "ÔÚ ReactOS ͬ²½Ê±·¢ÉúÁËÒ»¸ö´íÎó¡£%s" +END Propchange: trunk/reactos/dll/cpl/timedate/lang/zh-CN.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/timedate/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/rsrc.rc?r…
============================================================================== --- trunk/reactos/dll/cpl/timedate/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/rsrc.rc [iso-8859-1] Mon Sep 24 22:57:23 2012 @@ -55,6 +55,9 @@ #ifdef LANGUAGE_TH_TH #include "lang/th-TH.rc" #endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif // UTF-8 #pragma code_page(65001)
12 years, 3 months
1
0
0
0
[fireball] 57380: Move remaining of arwinss-specific parts to preserve files change history. Remove everything else.
by fireball@svn.reactos.org
Author: fireball Date: Mon Sep 24 21:40:19 2012 New Revision: 57380 URL:
http://svn.reactos.org/svn/reactos?rev=57380&view=rev
Log: Move remaining of arwinss-specific parts to preserve files change history. Remove everything else. Added: branches/arwinss/arwinss/libX11/ - copied from r57379, branches/arwinss/reactos/lib/3rdparty/libX11/ branches/arwinss/win32csr/ - copied from r57379, branches/arwinss/reactos/subsystems/win32/csrss/win32csr/ Removed: branches/arwinss/reactos/
12 years, 3 months
1
0
0
0
[fireball] 57379: - Start converting arwinss from feature branch into a trunk-pluggable module: * Move all arwinss-specific components to the arwinss top-level directory.
by fireball@svn.reactos.org
Author: fireball Date: Mon Sep 24 18:52:37 2012 New Revision: 57379 URL:
http://svn.reactos.org/svn/reactos?rev=57379&view=rev
Log: - Start converting arwinss from feature branch into a trunk-pluggable module: * Move all arwinss-specific components to the arwinss top-level directory. Added: branches/arwinss/arwinss/ (with props) branches/arwinss/arwinss/CMakeLists.txt (with props) branches/arwinss/arwinss/arwinss-layout.txt (with props) branches/arwinss/arwinss/client/ (with props) branches/arwinss/arwinss/client/CMakeLists.txt (with props) branches/arwinss/arwinss/client/gdi32/ - copied from r57372, branches/arwinss/reactos/dll/win32/gdi32/ branches/arwinss/arwinss/client/user32/ - copied from r57372, branches/arwinss/reactos/dll/win32/user32/ branches/arwinss/arwinss/client/winent.drv/ - copied from r57372, branches/arwinss/reactos/dll/win32/winent.drv/ branches/arwinss/arwinss/client/winex11.drv/ - copied from r57372, branches/arwinss/reactos/dll/win32/winex11.drv/ branches/arwinss/arwinss/freetype/ branches/arwinss/arwinss/freetype/CMakeLists.txt (with props) branches/arwinss/arwinss/freetype/freetype.spec (with props) branches/arwinss/arwinss/include/ (with props) branches/arwinss/arwinss/include/X11/ - copied from r57372, branches/arwinss/reactos/include/reactos/X11/ branches/arwinss/arwinss/include/ntrosgdi.h - copied unchanged from r57372, branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h branches/arwinss/arwinss/include/rosuser.h - copied unchanged from r57372, branches/arwinss/reactos/include/reactos/wine/rosuser.h branches/arwinss/arwinss/include/server.h - copied unchanged from r57372, branches/arwinss/reactos/include/reactos/wine/server.h branches/arwinss/arwinss/include/server_protocol.h - copied unchanged from r57372, branches/arwinss/reactos/include/reactos/wine/server_protocol.h branches/arwinss/arwinss/server/ - copied from r57372, branches/arwinss/reactos/subsystems/win32/win32k/ Removed: branches/arwinss/reactos/dll/win32/gdi32/ branches/arwinss/reactos/dll/win32/user32/ branches/arwinss/reactos/dll/win32/winent.drv/ branches/arwinss/reactos/dll/win32/winex11.drv/ branches/arwinss/reactos/include/reactos/X11/ branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h branches/arwinss/reactos/include/reactos/wine/rosuser.h branches/arwinss/reactos/include/reactos/wine/server.h branches/arwinss/reactos/include/reactos/wine/server_protocol.h branches/arwinss/reactos/subsystems/win32/win32k/ [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/arwinss/arwinss/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/CMakeLists.txt?…
Added: branches/arwinss/arwinss/arwinss-layout.txt URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/arwinss-layout.…
Added: branches/arwinss/arwinss/client/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/CMakeLis…
Added: branches/arwinss/arwinss/freetype/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/freetype/CMakeL…
Added: branches/arwinss/arwinss/freetype/freetype.spec URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/freetype/freety…
Removed: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
Removed: branches/arwinss/reactos/include/reactos/wine/rosuser.h URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
Removed: branches/arwinss/reactos/include/reactos/wine/server.h URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
Removed: branches/arwinss/reactos/include/reactos/wine/server_protocol.h URL:
http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos…
12 years, 3 months
1
0
0
0
[ekohl] 57378: [ADVAPI32] Implement LsaCreateTrustedDomainEx and LsaEnumerateAccounts.
by ekohl@svn.reactos.org
Author: ekohl Date: Mon Sep 24 15:04:32 2012 New Revision: 57378 URL:
http://svn.reactos.org/svn/reactos?rev=57378&view=rev
Log: [ADVAPI32] Implement LsaCreateTrustedDomainEx and LsaEnumerateAccounts. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3…
============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Mon Sep 24 15:04:32 2012 @@ -355,7 +355,7 @@ @ stdcall LsaDelete(ptr) @ stdcall LsaDeleteTrustedDomain(ptr ptr) @ stdcall LsaEnumerateAccountRights(ptr ptr ptr ptr) -@ stub LsaEnumerateAccounts +@ stdcall LsaEnumerateAccounts(ptr ptr ptr long ptr) @ stdcall LsaEnumerateAccountsWithUserRight(ptr ptr ptr ptr) @ stub LsaEnumeratePrivileges @ stdcall LsaEnumeratePrivilegesOfAccount(ptr ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa…
============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Mon Sep 24 15:04:32 2012 @@ -316,10 +316,30 @@ IN ACCESS_MASK DesiredAccess, OUT PLSA_HANDLE TrustedDomainHandle) { - FIXME("LsaCreateTrustedDomainEx(%p %p %p 0x%08lx %p) stub\n", + PLSAPR_TRUSTED_DOMAIN_AUTH_INFORMATION_INTERNAL EncryptedAuthInfo = NULL; + NTSTATUS Status; + + TRACE("LsaCreateTrustedDomainEx(%p %p %p 0x%08lx %p) stub\n", PolicyHandle, TrustedDomainInformation, AuthenticationInformation, DesiredAccess, TrustedDomainHandle); - return STATUS_SUCCESS; + + RpcTryExcept + { + /* FIXME: Encrypt AuthenticationInformation */ + + Status = LsarCreateTrustedDomainEx2((LSAPR_HANDLE)PolicyHandle, + (PLSAPR_TRUSTED_DOMAIN_INFORMATION_EX)TrustedDomainInformation, + EncryptedAuthInfo, + DesiredAccess, + (PLSAPR_HANDLE)TrustedDomainHandle); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -412,6 +432,50 @@ { MIDL_user_free(UserRightsSet.UserRights); } + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaEnumerateAccounts(IN LSA_HANDLE PolicyHandle, + IN OUT PLSA_ENUMERATION_HANDLE EnumerationContext, + OUT PVOID *Buffer, + IN ULONG PreferedMaximumLength, + OUT PULONG CountReturned) +{ + LSAPR_ACCOUNT_ENUM_BUFFER AccountEnumBuffer; + NTSTATUS Status; + + TRACE("LsaEnumerateAccounts(%p %p %p %lu %p)\n", + PolicyHandle, EnumerationContext, Buffer, + PreferedMaximumLength, CountReturned); + + AccountEnumBuffer.EntriesRead = 0; + AccountEnumBuffer.Information = NULL; + + RpcTryExcept + { + Status = LsarEnumerateAccounts((LSAPR_HANDLE)PolicyHandle, + EnumerationContext, + &AccountEnumBuffer, + PreferedMaximumLength); + + *Buffer = AccountEnumBuffer.Information; + *CountReturned = AccountEnumBuffer.EntriesRead; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (AccountEnumBuffer.Information != NULL) + MIDL_user_free(AccountEnumBuffer.Information); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); } RpcEndExcept; Modified: trunk/reactos/include/psdk/ntsecapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re…
============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Mon Sep 24 15:04:32 2012 @@ -689,6 +689,8 @@ NTSTATUS NTAPI LsaDeleteTrustedDomain(LSA_HANDLE,PSID); NTSTATUS NTAPI LsaDeregisterLogonProcess(HANDLE); NTSTATUS NTAPI LsaEnumerateAccountRights(LSA_HANDLE,PSID,PLSA_UNICODE_STRING*,PULONG); +NTSTATUS NTAPI LsaEnumerateAccounts(LSA_HANDLE,PLSA_ENUMERATION_HANDLE,PVOID*, + ULONG,PULONG); NTSTATUS NTAPI LsaEnumerateAccountsWithUserRight(LSA_HANDLE,PLSA_UNICODE_STRING, PVOID*,PULONG); NTSTATUS NTAPI LsaEnumeratePrivilegesOfAccount(LSA_HANDLE,PPRIVILEGE_SET*);
12 years, 3 months
1
0
0
0
← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
Results per page:
10
25
50
100
200