Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[jgardou] 52365: [GDI32] - remove useless check.
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 13:11:39 2011 New Revision: 52365 URL: http://svn.reactos.org/svn/reactos?rev=52365&view=rev Log: [GDI32] - remove useless check. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sun Jun 19 13:11:39 2011 @@ -679,31 +679,27 @@ #endif cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, ScanLines); - if ( Bits ) - { - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); - if (pvSafeBits) - { - _SEH2_TRY - { - RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END - - if (Hit) - { - // We don't die, we continue on with a allocated safe pointer to kernel - // space..... - DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); - } - DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); - } - - } + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if (pvSafeBits) + { + _SEH2_TRY + { + RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Hit = TRUE; + } + _SEH2_END + + if (Hit) + { + // We don't die, we continue on with a allocated safe pointer to kernel + // space..... + DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); + } + DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); + } if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) {

1 0

[gedmurphy] 52364: [BROWSEUI] - Set the prototypes to be long instead of LONG. This only worked in rbuild previously because WIDL incorrectly generates a LONG for long types. - define SHANDLE_PTR a...
by gedmurphy＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: gedmurphy Date: Sun Jun 19 12:46:15 2011 New Revision: 52364 URL: http://svn.reactos.org/svn/reactos?rev=52364&view=rev Log: [BROWSEUI] - Set the prototypes to be long instead of LONG. This only worked in rbuild previously because WIDL incorrectly generates a LONG for long types. - define SHANDLE_PTR and use it in IWebBrowserApp::get_HWND - Along with fixing WIDL, __WINESRC__ and __ROS_LONG64__ should be removed as part of a future fix. - Should now build with both rbuild and msvc Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/exdisp.idl Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Jun 19 12:46:15 2011 @@ -124,8 +124,6 @@ "language='*'\"") #endif // __GNUC__ -#define SHANDLE_PTR LONG - struct categoryCacheHeader { long dwSize; // size of header only @@ -154,7 +152,6 @@ // temporary extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); - #ifdef SetWindowLongPtr @@ -556,19 +553,29 @@ virtual HRESULT STDMETHODCALLTYPE get_Document(IDispatch **ppDisp); virtual HRESULT STDMETHODCALLTYPE get_TopLevelContainer(VARIANT_BOOL *pBool); virtual HRESULT STDMETHODCALLTYPE get_Type(BSTR *Type); - virtual HRESULT STDMETHODCALLTYPE get_Left(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Left(LONG Left); - virtual HRESULT STDMETHODCALLTYPE get_Top(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Top(LONG Top); - virtual HRESULT STDMETHODCALLTYPE get_Width(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Width(LONG Width); - virtual HRESULT STDMETHODCALLTYPE get_Height(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Height(LONG Height); + +// WIDL temp hack : when the interface contains 'long' WIDL writes it out as a 'LONG' +// Setting the prototype to LONG in this class breaks building with MSVC so we use +// the correct 'long' type here and temp hack it for WIDL generated prototypes. +#ifdef __WIDL_EXDISP_H +#define long LONG +#endif + virtual HRESULT STDMETHODCALLTYPE get_Left(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Left(long Left); + virtual HRESULT STDMETHODCALLTYPE get_Top(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Top(long Top); + virtual HRESULT STDMETHODCALLTYPE get_Width(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Width(long Width); + virtual HRESULT STDMETHODCALLTYPE get_Height(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Height(long Height); +#ifdef __WIDL_EXDISP_H +#undef long +#endif virtual HRESULT STDMETHODCALLTYPE get_LocationName(BSTR *LocationName); virtual HRESULT STDMETHODCALLTYPE get_LocationURL(BSTR *LocationURL); virtual HRESULT STDMETHODCALLTYPE get_Busy(VARIANT_BOOL *pBool); - // *** IWebBrowser2 methods *** + // *** IWebBrowserApp methods *** virtual HRESULT STDMETHODCALLTYPE Quit(); virtual HRESULT STDMETHODCALLTYPE ClientToWindow(int *pcx, int *pcy); virtual HRESULT STDMETHODCALLTYPE PutProperty(BSTR Property, VARIANT vtValue); @@ -2546,47 +2553,51 @@ { return E_NOTIMPL; } - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Left(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Left(LONG Left) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Top(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Top(LONG Top) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Width(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Width(LONG Width) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Height(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Height(LONG Height) -{ - return E_NOTIMPL; -} - +#ifdef __WIDL_EXDISP_H +#define long LONG +#endif +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Left(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Left(long Left) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Top(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Top(long Top) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Width(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Width(long Width) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Height(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Height(long Height) +{ + return E_NOTIMPL; +} +#ifdef __WIDL_EXDISP_H +#undef long +#endif HRESULT STDMETHODCALLTYPE CShellBrowser::get_LocationName(BSTR *LocationName) { return E_NOTIMPL; Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Sun Jun 19 12:46:15 2011 @@ -77,10 +77,18 @@ #if defined(_WIN64) #define __int3264 __int64 +typedef __int64 SHANDLE_PTR; +typedef unsigned __int64 HANDLE_PTR; +typedef unsigned int UHALF_PTR, *PUHALF_PTR; +typedef int HALF_PTR, *PHALF_PTR; #define ADDRESS_TAG_BIT 0x40000000000UI64 #else /* !_WIN64 */ #define __int3264 __int32 #define ADDRESS_TAG_BIT 0x80000000UL +typedef unsigned short UHALF_PTR, *PUHALF_PTR; +typedef short HALF_PTR, *PHALF_PTR; +typedef long SHANDLE_PTR; +typedef unsigned long HANDLE_PTR; #define HandleToUlong( h ) ((ULONG)(ULONG_PTR)(h) ) #define HandleToLong( h ) ((LONG)(LONG_PTR) (h) ) #define ULongToHandle( h) ((HANDLE)(ULONG_PTR) (h)) @@ -183,14 +191,6 @@ typedef unsigned long ULONG_PTR, *PULONG_PTR; #endif -typedef unsigned short UHALF_PTR, *PUHALF_PTR; -typedef short HALF_PTR, *PHALF_PTR; - -#ifndef HANDLE_PTR_DEFINED -#define HANDLE_PTR_DEFINED - typedef unsigned long HANDLE_PTR; -#endif - #endif /* !_WIN64 */ typedef ULONG_PTR SIZE_T, *PSIZE_T; Modified: trunk/reactos/include/psdk/exdisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/exdisp.idl?re… ============================================================================== --- trunk/reactos/include/psdk/exdisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/exdisp.idl [iso-8859-1] Sun Jun 19 12:46:15 2011 @@ -224,7 +224,7 @@ [id(302)] HRESULT PutProperty([in] BSTR Property, [in] VARIANT vtValue); [id(303)] HRESULT GetProperty([in] BSTR Property, [out, retval] VARIANT *pvtValue); [id(0), propget] HRESULT Name([out, retval] BSTR* Name); - [id(DISPID_HWND), propget] HRESULT HWND([out, retval] long *pHWND); + [id(DISPID_HWND), propget] HRESULT HWND([out, retval] SHANDLE_PTR *pHWND); [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); [id(401), propget] HRESULT Path([out, retval] BSTR* Path); [id(402), propget] HRESULT Visible([out, retval] VARIANT_BOOL* pBool);

1 0

[tkreuzer] 52363: [OBJ2BIN] Fix handling of empty sections
by tkreuzer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tkreuzer Date: Sun Jun 19 11:53:10 2011 New Revision: 52363 URL: http://svn.reactos.org/svn/reactos?rev=52363&view=rev Log: [OBJ2BIN] Fix handling of empty sections Modified: trunk/reactos/tools/obj2bin/obj2bin.c Modified: trunk/reactos/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… ============================================================================== --- trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Sun Jun 19 11:53:10 2011 @@ -63,14 +63,12 @@ { char *pszSourceFile; char *pszDestFile; - unsigned long nFileSize, nBaseAddress, nOffsetSectionHeaders; + unsigned long nFileSize, nBaseAddress; FILE *pSourceFile, *pDestFile; IMAGE_FILE_HEADER *pFileHeader; IMAGE_SECTION_HEADER *pSectionHeader; unsigned int i; - size_t nSize; char *pData; - PIMAGE_RELOCATION pReloc; PIMAGE_SYMBOL pSymbols; if ((argc != 4) || (strcmp(argv[1], "--help") == 0)) @@ -129,11 +127,9 @@ /* Loop all sections */ for (i = 0; i < pFileHeader->NumberOfSections; i++) { - /* Skip empty sections */ - if (pSectionHeader->SizeOfRawData == 0) continue; - /* Check if this is '.text' section */ - if (strcmp(pSectionHeader->Name, ".text") == 0) + if ((strcmp(pSectionHeader->Name, ".text") == 0) && + (pSectionHeader->SizeOfRawData != 0)) { RelocateSection(pData, pSectionHeader,

1 0

[gadamopoulos] 52362: [rpcrt4] - Improve hacky definition of __ASM_DEFINE_FUNC to reduce build errors with msvc
by gadamopoulos＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: gadamopoulos Date: Sun Jun 19 10:44:26 2011 New Revision: 52362 URL: http://svn.reactos.org/svn/reactos?rev=52362&view=rev Log: [rpcrt4] - Improve hacky definition of __ASM_DEFINE_FUNC to reduce build errors with msvc Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sun Jun 19 10:44:26 2011 @@ -1020,6 +1020,8 @@ #else #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); #endif +#else +#define __ASM_DEFINE_FUNC(name,suffix,code) #endif /* Define to a macro to generate an assembly function directive */

1 0

[cfinck] 52361: [USBDRIVER] No objections on the mailing list, so I'm excluding "usbdriver" from build. It should still stay as a reference in the tree till the new USB drivers are finalized and me...
by cfinck＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cfinck Date: Sun Jun 19 10:13:59 2011 New Revision: 52361 URL: http://svn.reactos.org/svn/reactos?rev=52361&view=rev Log: [USBDRIVER] No objections on the mailing list, so I'm excluding "usbdriver" from build. It should still stay as a reference in the tree till the new USB drivers are finalized and merged back to Trunk. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/drivers/usb/CMakeLists.txt trunk/reactos/drivers/usb/directory.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -540,7 +540,7 @@ ;drivers\usb\miniport\usbuhci\usbuhci.sys 2 ;drivers\usb\usbhub\usbhub.sys 2 ;drivers\usb\usbport\usbport.sys 2 -drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1 Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -1,5 +1,5 @@ -add_subdirectory(nt4compat) +#add_subdirectory(nt4compat) add_subdirectory(usbd) #add_subdirectory(usbehci) The USB branch has usbehci_new #add_subdirectory(usbhub) Compiles, just skipped in trunk Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… ============================================================================== --- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="nt4compat"> +  <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory>

1 0

[tkreuzer] 52360: [FREELDR] - Fix MSVC linkerflags for setupldr - Move stack from 78000 to 98000 to fix conflicts with freeldr code, which is larger when built with MSVC - MSVC compiled setupldr wo...
by tkreuzer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tkreuzer Date: Sun Jun 19 10:03:45 2011 New Revision: 52360 URL: http://svn.reactos.org/svn/reactos?rev=52360&view=rev Log: [FREELDR] - Fix MSVC linkerflags for setupldr - Move stack from 78000 to 98000 to fix conflicts with freeldr code, which is larger when built with MSVC - MSVC compiled setupldr works now! Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Jun 19 10:03:45 2011 @@ -117,9 +117,6 @@ list(APPEND FREELDR_COMMON_SOURCE arch/i386/drvmap.S arch/i386/multiboot.S) - else() - list(APPEND FREELDR_COMMON_SOURCE - arch/i386/realmode.S) endif() elseif(ARCH MATCHES amd64) list(APPEND FREELDR_COMMON_SOURCE @@ -217,7 +214,7 @@ if(NOT MSVC) set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") else() - set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") endif() set_image_base(setupldr_pe 0x10000) Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Jun 19 10:03:45 2011 @@ -140,7 +140,7 @@ } TimeOut = GetTimeOut(); - if (!UiInitialize(TimeOut)) + if (!UiInitialize(TimeOut != 0)) { UiMessageBoxCritical("Unable to initialize UI."); return; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Sun Jun 19 10:03:45 2011 @@ -8,13 +8,14 @@ #define BSS_START HEX(6F00) #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ -#define BIOSCALLBUFFER HEX(78000) /* Buffer to store temporary data for any Int386() call */ -#define BIOSCALLBUFSEGMENT HEX(7800) /* Buffer to store temporary data for any Int386() call */ -#define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ +#define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ +#define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ #define FILESYSBUFFER HEX(80000) /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER HEX(90000) /* Buffer to store data read in from the disk via the BIOS */ #define DISKREADBUFFER_SIZE 512 + +#define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ +#define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ /* These addresses specify the realmode "BSS section" layout */ #define BSS_RealModeEntry (BSS_START + 0)

1 0

[tfaber] 52359: [KMTESTS] - add the proper testing framework functions for winetest-like feel - remove thereby obsolete Log* functions - update example test to show usage of the new macros
by tfaber＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tfaber Date: Sun Jun 19 09:23:03 2011 New Revision: 52359 URL: http://svn.reactos.org/svn/reactos?rev=52359&view=rev Log: [KMTESTS] - add the proper testing framework functions for winetest-like feel - remove thereby obsolete Log* functions - update example test to show usage of the new macros Removed: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -11,7 +11,6 @@ # list(APPEND KMTEST_DRV_SOURCE kmtest_drv/kmtest_drv.c - kmtest_drv/log.c kmtest_drv/testlist.c example/Example.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -7,10 +7,15 @@ #include <ntddk.h> #include <kmt_test.h> -#include <kmt_log.h> VOID Test_Example(VOID) { - /* TODO: this should be trace(), as in winetests */ - LogPrint("Message from kernel\n"); + KIRQL Irql; + + ok(1, "This test should succeed.\n"); + ok(0, "This test should fail.\n"); + trace("Message from kernel, low-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); + KeRaiseIrql(HIGH_LEVEL, &Irql); + trace("Message from kernel, high-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); + KeLowerIrql(Irql); } Removed: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h (removed) @@ -1,21 +1,0 @@ -/* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver logging function declarations - * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> - */ - -#ifndef _KMTEST_LOG_H_ -#define _KMTEST_LOG_H_ - -#include <ntddk.h> - -NTSTATUS LogInit(VOID); -VOID LogFree(VOID); - -VOID LogPrint(IN PCSTR Message); -VOID LogPrintF(IN PCSTR Format, ...); -VOID LogVPrintF(IN PCSTR Format, va_list Arguments); -SIZE_T LogRead(OUT PVOID Buffer, IN SIZE_T BufferSize); - -#endif /* !defined _KMTEST_LOG_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -1,8 +1,13 @@ /* * PROJECT: ReactOS kernel-mode tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite test declarations + * PURPOSE: Kernel-Mode Test Suite test framework declarations * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +/* Inspired by Wine C unit tests, Copyright (C) 2002 Alexandre Julliard + * Inspired by ReactOS kernel-mode regression tests, + * Copyright (C) Aleksey Bragin, Filip Navara */ #ifndef _KMTEST_TEST_H_ @@ -32,6 +37,18 @@ extern PKMT_RESULTBUFFER ResultBuffer; +#define KMT_STRINGIZE(x) #x +#define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) +#define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) + +#define ok_(test, file, line, ...) KmtOk(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) +#define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) + +VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments); +VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...); +VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments); +VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...); + #if defined KMT_DEFINE_TEST_FUNCTIONS PKMT_RESULTBUFFER ResultBuffer = NULL; @@ -55,6 +72,8 @@ #endif /* defined KMT_USER_MODE */ #define KmtMemCpy memcpy +#define KmtStrLen strlen +#define KmtAssert assert static VOID KmtAddToLogBuffer(PKMT_RESULTBUFFER Buffer, PCSTR String, SIZE_T Length) { @@ -82,6 +101,104 @@ #define KmtVSNPrintF vsnprintf #endif /* defined KMT_USER_MODE */ +static SIZE_T KmtXVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Prepend1, PCSTR Prepend2, PCSTR Format, va_list Arguments) +{ + SIZE_T BufferLength = 0; + SIZE_T Length; + + if (Prepend1) + { + SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend1)); + KmtMemCpy(Buffer, Prepend1, Length); + Buffer += Length; + BufferLength += Length; + BufferMaxLength -= Length; + } + if (Prepend2) + { + SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend2)); + KmtMemCpy(Buffer, Prepend2, Length); + Buffer += Length; + BufferLength += Length; + BufferMaxLength -= Length; + } + Length = KmtVSNPrintF(Buffer, BufferMaxLength, Format, Arguments); + /* vsnprintf can return more than maxLength, we don't want to do that */ + BufferLength += min(Length, BufferMaxLength); + return BufferLength; +} + +static SIZE_T KmtXSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Prepend1, PCSTR Prepend2, PCSTR Format, ...) +{ + SIZE_T BufferLength; + va_list Arguments; + va_start(Arguments, Format); + BufferLength = KmtXVSNPrintF(Buffer, BufferMaxLength, Prepend1, Prepend2, Format, Arguments); + va_end(Arguments); + return BufferLength; +} + +VOID KmtFinishTest(PCSTR TestName) +{ + CHAR MessageBuffer[512]; + SIZE_T MessageLength; + + MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, NULL, NULL, + "%s: %d tests executed (0 marked as todo, %d failures), 0 skipped.\n", + TestName, + ResultBuffer->Successes + ResultBuffer->Failures, + ResultBuffer->Failures); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); +} + +VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) +{ + CHAR MessageBuffer[512]; + SIZE_T MessageLength; + + if (Condition) + { + InterlockedIncrement(&ResultBuffer->Successes); + + if (0/*KmtReportSuccess*/) + { + MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test succeeded\n", ""); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); + } + } + else + { + InterlockedIncrement(&ResultBuffer->Failures); + MessageLength = KmtXVSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test failed: ", Format, Arguments); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); + } +} + +VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) +{ + va_list Arguments; + va_start(Arguments, Format); + KmtVOk(Condition, FileAndLine, Format, Arguments); + va_end(Arguments); +} + +VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments) +{ + CHAR MessageBuffer[512]; + SIZE_T MessageLength; + + MessageLength = KmtXVSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": ", Format, Arguments); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); +} + +VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...) +{ + va_list Arguments; + va_start(Arguments, Format); + KmtVTrace(FileAndLine, Format, Arguments); + va_end(Arguments); +} + #endif /* defined KMT_DEFINE_TEST_FUNCTIONS */ #endif /* !defined _KMTEST_TEST_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -73,6 +73,8 @@ error = GetLastError(); goto cleanup; } + + KmtFinishTest(testName); if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer, ResultBuffer->LogBufferLength, &bytesWritten, NULL)) { Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -4,13 +4,37 @@ <library>ntdll</library> <library>hal</library> <library>pseh</library> + <library>kmtest_printf</library> <define name="KMT_KERNEL_MODE" /> <directory name="kmtest_drv"> <file>kmtest_drv.c</file> - <file>log.c</file> <file>testlist.c</file> </directory> <directory name="example"> <file>Example.c</file> </directory> </module> +<module name="kmtest_printf" type="staticlibrary"> + <include base="crt">include</include> + <define name="_LIBCNT_" /> + <define name="_USER32_WSPRINTF" /> + <define name="wctomb">KmtWcToMb</define> + <directory name="kmtest_drv"> + <file>printf_stubs.c</file> + </directory> + <directory name=".."> + <directory name=".."> + <directory name=".."> + <directory name="lib"> + <directory name="sdk"> + <directory name="crt"> + <directory name="printf"> + <file>streamout.c</file> + </directory> + </directory> + </directory> + </directory> + </directory> + </directory> + </directory> +</module> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -14,7 +14,7 @@ #include <debug.h> #include <kmt_public.h> -#include <kmt_log.h> +#define KMT_DEFINE_TEST_FUNCTIONS #include <kmt_test.h> /* Prototypes */ @@ -58,11 +58,6 @@ UNREFERENCED_PARAMETER(RegistryPath); DPRINT("DriverEntry\n"); - - Status = LogInit(); - - if (!NT_SUCCESS(Status)) - goto cleanup; RtlInitUnicodeString(&DeviceName, L"\\Device\\Kmtest"); Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), &DeviceName, @@ -119,8 +114,6 @@ ASSERT(!ResultBuffer); IoDeleteDevice(MainDeviceObject); } - - LogFree(); } /** Removed: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c (removed) @@ -1,102 +1,0 @@ -/* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver logging functions - * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> - */ - -#include <ntddk.h> -#include <ntstrsafe.h> - -#include <kmt_log.h> -#define KMT_DEFINE_TEST_FUNCTIONS -#include <kmt_test.h> - -/** - * @name LogInit - * - * Initialize logging mechanism. Call from DriverEntry. - * - * @return Status - */ -NTSTATUS LogInit(VOID) -{ - NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - return Status; -} - -/** - * @name LogFree - * - * Clean up logging mechanism. Call from Unload. - * - * @return None - */ -VOID LogFree(VOID) -{ - PAGED_CODE(); -} - -/** - * @name LogPrint - * - * Print a log message. - * - * @param Message - * Ansi string to be logged - * - * @return None - */ -VOID LogPrint(IN PCSTR Message) -{ - size_t MessageLength; - ASSERT(NT_SUCCESS(RtlStringCbLengthA(Message, 512, &MessageLength))); - - KmtAddToLogBuffer(ResultBuffer, Message, MessageLength); -} - -/** - * @name LogPrintF - * - * Print a formatted log message. - * - * @param Format - * printf-like format string - * @param ... - * Arguments corresponding to the format - * - * @return None - */ -VOID LogPrintF(IN PCSTR Format, ...) -{ - va_list Arguments; - PAGED_CODE(); - va_start(Arguments, Format); - LogVPrintF(Format, Arguments); - va_end(Arguments); -} - -/** - * @name LogVPrintF - * - * Print a formatted log message. - * - * @param Format - * printf-like format string - * @param Arguments - * Arguments corresponding to the format - * - * @return None - */ -VOID LogVPrintF(IN PCSTR Format, va_list Arguments) -{ - CHAR Buffer[512]; - /* TODO: make this work from any IRQL */ - PAGED_CODE(); - - RtlStringCbVPrintfA(Buffer, sizeof Buffer, Format, Arguments); - - LogPrint(Buffer); -}

1 0

[cgutman] 52358: [NTOSKRNL] - Send IRP_MN_QUERY_POWER and IRP_MN_SET_POWER to all enumerated devices prior to a system power state change - We don't mind failure right now since our drivers suck
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 04:25:33 2011 New Revision: 52358 URL: http://svn.reactos.org/svn/reactos?rev=52358&view=rev Log: [NTOSKRNL] - Send IRP_MN_QUERY_POWER and IRP_MN_SET_POWER to all enumerated devices prior to a system power state change - We don't mind failure right now since our drivers suck Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/po/poshtdwn.c trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -696,6 +696,11 @@ OUT PULONG Disposition OPTIONAL ); + +NTSTATUS +IopTraverseDeviceTree( + PDEVICETREE_TRAVERSE_CONTEXT Context); + // // PnP Routines // Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -291,7 +291,8 @@ NTSTATUS NTAPI PopSetSystemPowerState( - SYSTEM_POWER_STATE PowerState + SYSTEM_POWER_STATE PowerState, + POWER_ACTION PowerAction ); VOID Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -84,6 +84,7 @@ /* Try platform driver first, then legacy */ //PopInvokeSystemStateHandler(PowerStateShutdownReset, NULL); + PopSetSystemPowerState(PowerSystemShutdown, SystemAction); HalReturnToFirmware(HalRebootRoutine); break; @@ -102,7 +103,7 @@ //PopInvokeSystemStateHandler(PowerStateShutdownOff, NULL); /* ReactOS Hack */ - PopSetSystemPowerState(PowerSystemShutdown); + PopSetSystemPowerState(PowerSystemShutdown, SystemAction); PopShutdownHandler(); /* If that didn't work, call the HAL */ Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=52… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Jun 19 04:25:33 2011 @@ -23,6 +23,13 @@ PVOID Context; } REQUEST_POWER_ITEM, *PREQUEST_POWER_ITEM; +typedef struct _POWER_STATE_TRAVERSE_CONTEXT +{ + SYSTEM_POWER_STATE SystemPowerState; + POWER_ACTION PowerAction; + PDEVICE_OBJECT PowerDevice; +} POWER_STATE_TRAVERSE_CONTEXT, *PPOWER_STATE_TRAVERSE_CONTEXT; + PDEVICE_NODE PopSystemPowerDeviceNode = NULL; BOOLEAN PopAcpiPresent = FALSE; POP_POWER_ACTION PopAction; @@ -64,53 +71,33 @@ } NTSTATUS -NTAPI -PopSetSystemPowerState(SYSTEM_POWER_STATE PowerState) -{ +PopSendQuerySystemPowerState(PDEVICE_OBJECT DeviceObject, SYSTEM_POWER_STATE SystemState, POWER_ACTION PowerAction) +{ + KEVENT Event; IO_STATUS_BLOCK IoStatusBlock; - PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION IrpSp; - PDEVICE_OBJECT Fdo; + PIRP Irp; NTSTATUS Status; - KEVENT Event; - PIRP Irp; - - if (!PopAcpiPresent) return STATUS_NOT_IMPLEMENTED; - - Status = IopGetSystemPowerDeviceObject(&DeviceObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("No system power driver available\n"); - return STATUS_UNSUCCESSFUL; - } - - Fdo = IoGetAttachedDeviceReference(DeviceObject); - - if (Fdo == DeviceObject) - { - DPRINT("An FDO was not attached\n"); - return STATUS_UNSUCCESSFUL; - } - + KeInitializeEvent(&Event, NotificationEvent, FALSE); - + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, - Fdo, + DeviceObject, NULL, 0, NULL, &Event, &IoStatusBlock); - + IrpSp = IoGetNextIrpStackLocation(Irp); - IrpSp->MinorFunction = IRP_MN_SET_POWER; + IrpSp->MinorFunction = IRP_MN_QUERY_POWER; IrpSp->Parameters.Power.Type = SystemPowerState; - IrpSp->Parameters.Power.State.SystemState = PowerState; - - DPRINT("Calling ACPI driver"); - Status = PoCallDriver(Fdo, Irp); + IrpSp->Parameters.Power.State.SystemState = SystemState; + IrpSp->Parameters.Power.ShutdownType = PowerAction; + + Status = PoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, @@ -118,10 +105,176 @@ KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; - } - - ObDereferenceObject(Fdo); + Status = IoStatusBlock.Status; + } + + return Status; +} + +NTSTATUS +PopSendSetSystemPowerState(PDEVICE_OBJECT DeviceObject, SYSTEM_POWER_STATE SystemState, POWER_ACTION PowerAction) +{ + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION IrpSp; + PIRP Irp; + NTSTATUS Status; + + KeInitializeEvent(&Event, + NotificationEvent, + FALSE); + + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_POWER, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatusBlock); + + IrpSp = IoGetNextIrpStackLocation(Irp); + IrpSp->MinorFunction = IRP_MN_SET_POWER; + IrpSp->Parameters.Power.Type = SystemPowerState; + IrpSp->Parameters.Power.State.SystemState = SystemState; + IrpSp->Parameters.Power.ShutdownType = PowerAction; + + Status = PoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + return Status; +} + +NTSTATUS +PopQuerySystemPowerStateTraverse(PDEVICE_NODE DeviceNode, + PVOID Context) +{ + PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context; + NTSTATUS Status; + + DPRINT("PopQuerySystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context); + + if (DeviceNode == IopRootDeviceNode) + return STATUS_SUCCESS; + + if (DeviceNode->Flags & DNF_LEGACY_DRIVER) + return STATUS_SUCCESS; + + Status = PopSendQuerySystemPowerState(DeviceNode->PhysicalDeviceObject, + PowerStateContext->SystemPowerState, + PowerStateContext->PowerAction); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Device '%wZ' failed IRP_MN_QUERY_POWER\n", &DeviceNode->InstancePath); + } + +#if 0 + return Status; +#else + return STATUS_SUCCESS; +#endif +} + +NTSTATUS +PopSetSystemPowerStateTraverse(PDEVICE_NODE DeviceNode, + PVOID Context) +{ + PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context; + NTSTATUS Status; + + DPRINT("PopSetSystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context); + + if (DeviceNode == IopRootDeviceNode) + return STATUS_SUCCESS; + + if (DeviceNode->PhysicalDeviceObject == PowerStateContext->PowerDevice) + return STATUS_SUCCESS; + + if (DeviceNode->Flags & DNF_LEGACY_DRIVER) + return STATUS_SUCCESS; + + Status = PopSendSetSystemPowerState(DeviceNode->PhysicalDeviceObject, + PowerStateContext->SystemPowerState, + PowerStateContext->PowerAction); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Device '%wZ' failed IRP_MN_SET_POWER\n", &DeviceNode->InstancePath); + } + +#if 0 + return Status; +#else + return STATUS_SUCCESS; +#endif +} + +NTSTATUS +NTAPI +PopSetSystemPowerState(SYSTEM_POWER_STATE PowerState, POWER_ACTION PowerAction) +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + DEVICETREE_TRAVERSE_CONTEXT Context; + POWER_STATE_TRAVERSE_CONTEXT PowerContext; + + Status = IopGetSystemPowerDeviceObject(&DeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("No system power driver available\n"); + Fdo = NULL; + } + else + { + Fdo = IoGetAttachedDeviceReference(DeviceObject); + if (Fdo == DeviceObject) + { + DPRINT("An FDO was not attached\n"); + return STATUS_UNSUCCESSFUL; + } + } + + /* Set up context */ + PowerContext.PowerAction = PowerAction; + PowerContext.SystemPowerState = PowerState; + PowerContext.PowerDevice = Fdo; + + /* Query for system power change */ + IopInitDeviceTreeTraverseContext(&Context, + IopRootDeviceNode, + PopQuerySystemPowerStateTraverse, + &PowerContext); + + Status = IopTraverseDeviceTree(&Context); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Query system power state failed; changing state anyway\n"); + } + + /* Set system power change */ + IopInitDeviceTreeTraverseContext(&Context, + IopRootDeviceNode, + PopSetSystemPowerStateTraverse, + &PowerContext); + + IopTraverseDeviceTree(&Context); + + if (!PopAcpiPresent) return STATUS_NOT_IMPLEMENTED; + + if (Fdo != NULL) + { + if (PowerAction != PowerActionShutdownReset) + PopSendSetSystemPowerState(Fdo, PowerState, PowerAction); + + ObDereferenceObject(Fdo); + } return Status; }

1 0

[cgutman] 52357: [PCIIDEX] - Don't ASSERT if we get an IRP that we don't understand
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 04:21:41 2011 New Revision: 52357 URL: http://svn.reactos.org/svn/reactos?rev=52357&view=rev Log: [PCIIDEX] - Don't ASSERT if we get an IRP that we don't understand Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c [iso-8859-1] Sun Jun 19 04:21:41 2011 @@ -34,7 +34,6 @@ else { DPRINT1("PDO stub for major function 0x%lx\n", MajorFunction); - ASSERT(FALSE); Status = STATUS_NOT_SUPPORTED; } Irp->IoStatus.Information = 0;

1 0

[cgutman] 52356: [NTOSKRNL] - Change the resource type if HalTranslateBusAddress indicates that we got the address type wrong
by cgutman＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cgutman Date: Sun Jun 19 01:42:05 2011 New Revision: 52356 URL: http://svn.reactos.org/svn/reactos?rev=52356&view=rev Log: [NTOSKRNL] - Change the resource type if HalTranslateBusAddress indicates that we got the address type wrong Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Jun 19 01:42:05 2011 @@ -757,6 +757,13 @@ Status = STATUS_UNSUCCESSFUL; DPRINT1("Failed to translate port resource (Start: 0x%I64x)\n", DescriptorRaw->u.Port.Start.QuadPart); goto cleanup; + } + + if (AddressSpace == 0) + { + /* This is actually a memory resource */ + DescriptorRaw->Type = CmResourceTypeMemory; + DescriptorTranslated->Type = CmResourceTypeMemory; } break; } @@ -793,6 +800,13 @@ DPRINT1("Failed to translate memory resource (Start: 0xI64x)\n", DescriptorRaw->u.Memory.Start.QuadPart); goto cleanup; } + + if (AddressSpace != 0) + { + /* This is actually an I/O port resource */ + DescriptorRaw->Type = CmResourceTypePort; + DescriptorTranslated->Type = CmResourceTypePort; + } } case CmResourceTypeDma:

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
46
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011