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
February 2013
----- 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
11 participants
125 discussions
Start a n
N
ew thread
[tkreuzer] 58272: [MKHIVE] Try to fix *nix build
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sat Feb 2 22:05:47 2013 New Revision: 58272 URL:
http://svn.reactos.org/svn/reactos?rev=58272&view=rev
Log: [MKHIVE] Try to fix *nix build Modified: trunk/reactos/tools/mkhive/reginf.c Modified: trunk/reactos/tools/mkhive/reginf.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=…
============================================================================== --- trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/reginf.c [iso-8859-1] Sat Feb 2 22:05:47 2013 @@ -48,15 +48,15 @@ #define FLG_ADDREG_TYPE_MASK (0xFFFF0000 | FLG_ADDREG_BINVALUETYPE) #ifdef _M_IX86 -#define Architecture L"x86" +static const WCHAR Architecture[] = {'x','8','6',0}; #elif defined(_M_AMD64) -#define Architecture L"amd64" +static const WCHAR Architecture[] = {'a','m','d','6','4'0}; #elif defined(_M_IA64) -#define Architecture L"ia64" +static const WCHAR Architecture[] = {'i','a','6','4',0}; #elif defined(_M_ARM) -#define Architecture L"arm" +static const WCHAR Architecture[] = {'a','r','m',0}; #elif defined(_M_PPC) -#define Architecture L"ppc" +static const WCHAR Architecture[] = {'p','p','c',0}; #endif static const WCHAR HKCR[] = {'H','K','C','R',0}; @@ -69,6 +69,9 @@ static const WCHAR HKCUPath[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\','.','D','E','F','A','U','L','T','\\',0}; static const WCHAR HKLMPath[] = {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\',0}; static const WCHAR HKUPath[] = {'\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\',0}; + +static const WCHAR AddReg[] = {'A','d','d','R','e','g',0}; +static const WCHAR DelReg[] = {'D','e','l','R','e','g',0}; /* FUNCTIONS ****************************************************************/ @@ -489,6 +492,7 @@ { HINF hInf; ULONG ErrorLine; + WCHAR SectionName[40]; /* Load inf file from install media. */ if (InfHostOpenFile(&hInf, FileName, 0, &ErrorLine) != 0) @@ -497,22 +501,26 @@ return FALSE; } - if (!registry_callback (hInf, L"DelReg", TRUE)) + if (!registry_callback (hInf, (PWCHAR)DelReg, TRUE)) { DPRINT1 ("registry_callback() for DelReg failed\n"); } - if (!registry_callback (hInf, L"DelReg.NT" Architecture, TRUE)) + wcsncpy(SectionName, DelReg, sizeof(SectionName) / sizeof(WCHAR)); + wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR)); + if (!registry_callback (hInf, SectionName, TRUE)) { DPRINT1 ("registry_callback() for DelReg.NT* failed\n"); } - if (!registry_callback (hInf, L"AddReg", FALSE)) + if (!registry_callback (hInf, (PWCHAR)AddReg, FALSE)) { DPRINT1 ("registry_callback() for AddReg failed\n"); } - if (!registry_callback (hInf, L"AddReg.NT" Architecture, FALSE)) + wcsncpy(SectionName, AddReg, sizeof(SectionName) / sizeof(WCHAR)); + wcsncat(SectionName, Architecture, sizeof(SectionName) / sizeof(WCHAR)); + if (!registry_callback (hInf, SectionName, FALSE)) { DPRINT1 ("registry_callback() for AddReg.NT* failed\n"); }
11 years, 10 months
1
0
0
0
[tkreuzer] 58271: [SETUP] - Implement support for architecture specific INF sections both in mkhive and in usetup (For an example, check hivesys.inf at the bottom) - Get rid of architecture specifi...
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Sat Feb 2 21:56:00 2013 New Revision: 58271 URL:
http://svn.reactos.org/svn/reactos?rev=58271&view=rev
Log: [SETUP] - Implement support for architecture specific INF sections both in mkhive and in usetup (For an example, check hivesys.inf at the bottom) - Get rid of architecture specific .inf files Added: trunk/reactos/boot/bootdata/hivecls.inf - copied unchanged from r58171, trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivedef.inf - copied unchanged from r58171, trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/boot/bootdata/hiveinst.inf - copied unchanged from r58171, trunk/reactos/boot/bootdata/hiveinst_i386.inf trunk/reactos/boot/bootdata/hivesft.inf - copied unchanged from r58270, trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/hivesys.inf - copied, changed from r58270, trunk/reactos/boot/bootdata/hivesys_i386.inf Removed: trunk/reactos/boot/bootdata/hivecls_amd64.inf trunk/reactos/boot/bootdata/hivecls_arm.inf trunk/reactos/boot/bootdata/hivecls_i386.inf trunk/reactos/boot/bootdata/hivedef_amd64.inf trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/boot/bootdata/hiveinst_arm.inf trunk/reactos/boot/bootdata/hiveinst_i386.inf trunk/reactos/boot/bootdata/hivesft_amd64.inf trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/base/setup/usetup/registry.c trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/tools/mkhive/reginf.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/registry.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry…
Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t…
Removed: trunk/reactos/boot/bootdata/hivecls_amd64.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_amd6…
Removed: trunk/reactos/boot/bootdata/hivecls_arm.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_arm.…
Removed: trunk/reactos/boot/bootdata/hivecls_i386.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls_i386…
Removed: trunk/reactos/boot/bootdata/hivedef_amd64.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_amd6…
Removed: trunk/reactos/boot/bootdata/hivedef_arm.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.…
Removed: trunk/reactos/boot/bootdata/hivedef_i386.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386…
Removed: trunk/reactos/boot/bootdata/hiveinst_arm.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hiveinst_arm…
Removed: trunk/reactos/boot/bootdata/hiveinst_i386.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hiveinst_i38…
Removed: trunk/reactos/boot/bootdata/hivesft_amd64.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_amd6…
Removed: trunk/reactos/boot/bootdata/hivesft_arm.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.…
Removed: trunk/reactos/boot/bootdata/hivesft_i386.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386…
Copied: trunk/reactos/boot/bootdata/hivesys.inf (from r58270, trunk/reactos/boot/bootdata/hivesys_i386.inf) URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?…
Removed: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6…
Removed: trunk/reactos/boot/bootdata/hivesys_arm.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.…
Removed: trunk/reactos/boot/bootdata/hivesys_i386.inf URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386…
Modified: trunk/reactos/tools/mkhive/reginf.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/reginf.c?rev=…
11 years, 10 months
1
0
0
0
[akhaldi] 58270: [NTOS/FSRTL] * Remove a harmless ASSERT. Brought to you by Art Yerkes (arty). CORE-6580 #resolve #comment Committed in 58270.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Feb 2 18:49:53 2013 New Revision: 58270 URL:
http://svn.reactos.org/svn/reactos?rev=58270&view=rev
Log: [NTOS/FSRTL] * Remove a harmless ASSERT. Brought to you by Art Yerkes (arty). CORE-6580 #resolve #comment Committed in 58270. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?…
============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Sat Feb 2 18:49:53 2013 @@ -858,7 +858,10 @@ Find.Exclusive.FileLock.StartingByte = *FileOffset; Find.Exclusive.FileLock.EndingByte.QuadPart = FileOffset->QuadPart + Length->QuadPart; - ASSERT(InternalInfo); + if (!InternalInfo) { + DPRINT("File not previously locked (ever)\n"); + return STATUS_RANGE_NOT_LOCKED; + } Entry = RtlLookupElementGenericTable(&InternalInfo->RangeTable, &Find); if (!Entry) { DPRINT("Range not locked %wZ\n", &FileObject->FileName);
11 years, 10 months
1
0
0
0
[janderwald] 58269: [LIBUSB] - Fix bug introduced in 58268 - Spotted by Usurp
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Feb 2 17:26:03 2013 New Revision: 58269 URL:
http://svn.reactos.org/svn/reactos?rev=58269&view=rev
Log: [LIBUSB] - Fix bug introduced in 58268 - Spotted by Usurp Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con…
============================================================================== --- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sat Feb 2 17:26:03 2013 @@ -138,7 +138,7 @@ Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject, m_PhysicalDeviceObject, m_NextDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("[%S] Failed to initialize hardware object %x\n", Status); + DPRINT1("[%S] Failed to initialize hardware object %x\n", m_Hardware->GetUSBType(), Status); // // failed to initialize hardware object, detach from device stack
11 years, 10 months
1
0
0
0
[janderwald] 58268: [USB] - Add interface function to IUSBHardwareDevice, which returns the USB controller type - The controller type is used for debugging in the common usb library (libusb)
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Feb 2 15:45:02 2013 New Revision: 58268 URL:
http://svn.reactos.org/svn/reactos?rev=58268&view=rev
Log: [USB] - Add interface function to IUSBHardwareDevice, which returns the USB controller type - The controller type is used for debugging in the common usb library (libusb) Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/lib/drivers/libusb/common_interfaces.h trunk/reactos/lib/drivers/libusb/hcd_controller.cpp trunk/reactos/lib/drivers/libusb/hub_controller.cpp trunk/reactos/lib/drivers/libusb/libusb.cpp trunk/reactos/lib/drivers/libusb/usb_device.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa…
============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -127,6 +127,13 @@ return STATUS_UNSUCCESSFUL; } +LPCWSTR +STDMETHODCALLTYPE +CUSBHardwareDevice::GetUSBType() +{ + return L"USBEHCI"; +} + NTSTATUS STDMETHODCALLTYPE CUSBHardwareDevice::Initialize( Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r…
============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -280,7 +280,7 @@ DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); break; case URB_FUNCTION_VENDOR_DEVICE: - DPRINT1("URB_FUNCTION_VENDOR_DEVICE\n"); + DPRINT("URB_FUNCTION_VENDOR_DEVICE\n"); break; default: DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa…
============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -124,6 +124,14 @@ return STATUS_UNSUCCESSFUL; } +LPCWSTR +STDMETHODCALLTYPE +CUSBHardwareDevice::GetUSBType() +{ + return L"USBOHCI"; +} + + NTSTATUS STDMETHODCALLTYPE CUSBHardwareDevice::Initialize( Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa…
============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -145,6 +145,14 @@ return STATUS_UNSUCCESSFUL; } +LPCWSTR +STDMETHODCALLTYPE +CUSBHardwareDevice::GetUSBType() +{ + return L"USBUHCI"; +} + + NTSTATUS CUSBHardwareDevice::Initialize( PDRIVER_OBJECT DriverObject, Modified: trunk/reactos/lib/drivers/libusb/common_interfaces.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/common_…
============================================================================== --- trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -182,7 +182,9 @@ \ STDMETHOD_(VOID, SetStatusChangeEndpointCallBack)( THIS_ \ IN PVOID CallBack, \ - IN PVOID Context) PURE; + IN PVOID Context) PURE; \ + \ + STDMETHOD_(LPCWSTR, GetUSBType)(THIS) PURE; #define IMP_IUSBHARDWAREDEVICE \ @@ -228,7 +230,9 @@ \ STDMETHODIMP_(VOID) SetStatusChangeEndpointCallBack( \ IN PVOID CallBack, \ - IN PVOID Context); + IN PVOID Context); \ + \ + STDMETHODIMP_(LPCWSTR) GetUSBType(); DECLARE_INTERFACE_(IUSBHardwareDevice, IUnknown) { Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con…
============================================================================== --- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -60,6 +60,7 @@ PUSBHARDWAREDEVICE m_Hardware; PHUBCONTROLLER m_HubController; ULONG m_FDODeviceNumber; + LPCWSTR m_USBType; }; //================================================================================================= @@ -93,7 +94,7 @@ // // failed to create hardware object // - DPRINT1("[USBLIB] Failed to create hardware object\n"); + DPRINT1("Failed to create hardware object\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -137,7 +138,7 @@ Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject, m_PhysicalDeviceObject, m_NextDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] Failed to initialize hardware object %x\n", Status); + DPRINT1("[%S] Failed to initialize hardware object %x\n", Status); // // failed to initialize hardware object, detach from device stack @@ -157,6 +158,11 @@ return Status; } + + // + // get usb controller type + // + m_USBType = m_Hardware->GetUSBType(); // @@ -234,7 +240,7 @@ // PC_ASSERT(DeviceExtension->IsFDO); - DPRINT1("[USBLIB] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", + DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", m_USBType, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -279,7 +285,7 @@ // // informal debug print // - DPRINT1("[USBLIB] Result %S\n", DriverKey->DriverKeyName); + DPRINT1("[%S] Result %S\n", m_USBType, DriverKey->DriverKeyName); } } @@ -331,7 +337,7 @@ PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG) - sizeof(WCHAR) >= ResultLength); DriverKey->DriverKeyName[ResultLength / sizeof(WCHAR)] = L'\0'; - DPRINT1("[USBLIB] Result %S\n", DriverKey->DriverKeyName); + DPRINT1("[%S] Result %S\n", m_USBType, DriverKey->DriverKeyName); } // @@ -394,7 +400,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_START FDO\n"); + DPRINT("[%S] HandlePnp IRP_MN_START FDO\n", m_USBType); // // first start lower device object @@ -423,12 +429,12 @@ Status = SetSymbolicLink(TRUE); } - DPRINT("[USBLIB] HandlePnp IRP_MN_START FDO: Status %x\n", Status); + DPRINT("[%S] HandlePnp IRP_MN_START FDO: Status %x\n", m_USBType ,Status); break; } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); if (m_HubController == NULL) { @@ -508,7 +514,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); if (m_Hardware) { @@ -549,7 +555,7 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); #else - DPRINT1("[USBLIB] Denying controller removal due to reinitialization bugs\n"); + DPRINT1("[%S] Denying controller removal due to reinitialization bugs\n", m_USBType); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; @@ -557,7 +563,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); + DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n", m_USBType); // // delete the symbolic link @@ -670,7 +676,7 @@ // if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] CreateFDO: Failed to create %wZ, Status %x\n", &DeviceName, Status); + DPRINT1("[%S] CreateFDO: Failed to create %wZ, Status %x\n", m_USBType, &DeviceName, Status); return Status; } } @@ -680,7 +686,7 @@ // m_FDODeviceNumber = UsbDeviceNumber; - DPRINT("[USBLIB] CreateFDO: DeviceName %wZ\n", &DeviceName); + DPRINT("[%S] CreateFDO: DeviceName %wZ\n", m_USBType, &DeviceName); /* done */ return Status; Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con…
============================================================================== --- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -105,6 +105,8 @@ PULONG m_DeviceAddressBitmapBuffer; LIST_ENTRY m_UsbDeviceList; PIRP m_PendingSCEIrp; + LPCWSTR m_USBType; + //Internal Functions BOOLEAN QueryStatusChageEndpoint(PIRP Irp); @@ -195,8 +197,6 @@ USHORT VendorID, DeviceID; ULONG Dummy1; - DPRINT1("CHubController::Initialize\n"); - // // initialize members // @@ -205,6 +205,7 @@ m_IsRootHubDevice = IsRootHubDevice; m_DeviceAddress = DeviceAddress; m_DriverObject = DriverObject; + m_USBType = m_Hardware->GetUSBType(); KeInitializeSpinLock(&m_Lock); InitializeListHead(&m_UsbDeviceList); @@ -225,7 +226,6 @@ // RtlInitializeBitMap(&m_DeviceAddressBitmap, m_DeviceAddressBitmapBuffer, 128); RtlClearAllBits(&m_DeviceAddressBitmap); - // // create PDO @@ -310,7 +310,7 @@ // Get the number of ports and check each one for device connected // m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL); - DPRINT1("[USBLIB] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); + DPRINT1("[%S] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL); TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer; @@ -321,7 +321,7 @@ { m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange); - DPRINT1("[USBLIB] Port %d: Status %x, Change %x\n", PortId, PortStatus, PortChange); + DPRINT1("[%S] Port %d: Status %x, Change %x\n", m_USBType, PortId, PortStatus, PortChange); // @@ -329,7 +329,7 @@ // if (PortChange != 0) { - DPRINT1("[USBLIB] Change state on port %d\n", PortId); + DPRINT1("[%S] Change state on port %d\n", m_USBType, PortId); // Set the value for the port number *TransferBuffer = 1 << ((PortId + 1) & 7); Changed = TRUE; @@ -432,7 +432,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_START_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_START_DEVICE\n", m_USBType); // // register device interface // @@ -450,7 +450,7 @@ } case IRP_MN_QUERY_ID: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_ID Type %x\n", IoStack->Parameters.QueryId.IdType); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_ID Type %x\n", m_USBType, IoStack->Parameters.QueryId.IdType); if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID) { @@ -525,7 +525,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] HandlePnp> failed to get hardware id %x\n", Status); + DPRINT1("[%S] HandlePnp> failed to get hardware id %x\n", m_USBType, Status); VendorID = 0x8086; DeviceID = 0x3A37; } @@ -553,7 +553,7 @@ Index++; - DPRINT1("[USBLIB] Name %S\n", Buffer); + DPRINT1("[%S] Name %S\n", m_USBType, Buffer); // // allocate buffer @@ -587,7 +587,7 @@ } case IRP_MN_QUERY_CAPABILITIES: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_CAPABILITIES\n"); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_CAPABILITIES\n", m_USBType); DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; @@ -619,7 +619,7 @@ } case IRP_MN_QUERY_INTERFACE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_INTERFACE\n"); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_INTERFACE\n", m_USBType); // // handle device interface requests @@ -629,7 +629,7 @@ } case IRP_MN_REMOVE_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_REMOVE_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE\n", m_USBType); // // deactivate device interface for BUS PDO @@ -659,7 +659,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", m_USBType, IoStack->Parameters.QueryDeviceRelations.Type); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { @@ -700,7 +700,7 @@ } case IRP_MN_QUERY_BUS_INFORMATION: { - DPRINT("[USBLIB] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); + DPRINT("[%S] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n", m_USBType); // // allocate buffer for bus information @@ -733,7 +733,7 @@ } case IRP_MN_STOP_DEVICE: { - DPRINT("[USBLIB] HandlePnp IRP_MN_STOP_DEVICE\n"); + DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType); // // stop device // @@ -742,7 +742,7 @@ } case IRP_MN_SURPRISE_REMOVAL: { - DPRINT("[USBLIB] HandlePnp IRP_MN_SURPRISE_REMOVAL\n"); + DPRINT("[%S] HandlePnp IRP_MN_SURPRISE_REMOVAL\n", m_USBType); Status = STATUS_SUCCESS; break; } @@ -796,7 +796,7 @@ if (!EndPointDesc) { - DPRINT1("[USBLIB] Error No EndpointDesc\n"); + DPRINT1("[%S] Error No EndpointDesc\n", m_USBType); Urb->UrbIsochronousTransfer.Hdr.Status = USBD_STATUS_INVALID_PIPE_HANDLE; return STATUS_INVALID_PARAMETER; } @@ -805,7 +805,7 @@ // sanity checks // ASSERT(EndPointDesc); - DPRINT("HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes %x\n", EndPointDesc, EndPointDesc->bEndpointAddress, EndPointDesc->bmAttributes); + DPRINT("[%S] HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes %x\n", m_USBType, EndPointDesc, EndPointDesc->bEndpointAddress, EndPointDesc->bmAttributes); ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_ISOCHRONOUS); // @@ -813,7 +813,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleIsochronousTransfer invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleIsochronousTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -856,7 +856,7 @@ // // Else pend the IRP, to be completed when a device connects or disconnects. // - DPRINT("[USBLIB] Pending SCE Irp\n"); + DPRINT("[%S] Pending SCE Irp\n", m_USBType); m_PendingSCEIrp = Irp; IoMarkIrpPending(Irp); return STATUS_PENDING; @@ -878,7 +878,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleBulkOrInterruptTransfer invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleBulkOrInterruptTransfer invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -905,7 +905,7 @@ ULONG NumPort; ULONG PortId; - DPRINT("[USBLIB] HandleClassOther> Request %x Value %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); + DPRINT("[%S] HandleClassOther> Request %x Value %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); // // get number of ports available @@ -947,7 +947,7 @@ // // request contains buffer of 2 ushort which are used from submitting port status and port change status // - DPRINT("[USBLIB] PortId %x PortStatus %x PortChange %x\n", PortId, PortStatus, PortChange); + DPRINT("[%S] PortId %x PortStatus %x PortChange %x\n", m_USBType, PortId, PortStatus, PortChange); Buffer = (PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer; // @@ -974,7 +974,7 @@ Status = m_Hardware->ClearPortStatus(PortId, C_PORT_RESET); break; default: - DPRINT("[USBLIB] Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); + DPRINT("[%S] Unknown Value for Clear Feature %x \n", m_USBType, Urb->UrbControlVendorClassRequest.Value); break; } @@ -1023,13 +1023,13 @@ break; } default: - DPRINT1("[USBLIB] Unsupported request id %x\n", Urb->UrbControlVendorClassRequest.Value); + DPRINT1("[%S] Unsupported request id %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Value); PC_ASSERT(FALSE); } break; } default: - DPRINT1("[USBLIB] HandleClassOther Unknown request code %x\n", Urb->UrbControlVendorClassRequest.Request); + DPRINT1("[%S] HandleClassOther Unknown request code %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request); PC_ASSERT(0); Status = STATUS_INVALID_DEVICE_REQUEST; } @@ -1095,7 +1095,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleSelectConfiguration invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleSelectConfiguration invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1151,7 +1151,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleSelectInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleSelectInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1208,7 +1208,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleGetStatusFromDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleGetStatusFromDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1252,7 +1252,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); ASSERT(Status == STATUS_SUCCESS); - DPRINT1("[USBLIB] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); + DPRINT1("[%S] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus %x\n", m_USBType, Status, Urb->UrbControlDescriptorRequest.TransferBufferLength, *DeviceStatus); // // done @@ -1273,7 +1273,7 @@ PUSBDEVICE UsbDevice; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; - DPRINT("CHubController::HandleClassDevice Request %x Class %x\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); + DPRINT("[%S] HandleClassDevice Request %x Class %x\n", m_USBType, Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value >> 8); // // check class request type @@ -1287,7 +1287,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1371,7 +1371,7 @@ { if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle // @@ -1387,7 +1387,7 @@ break; } default: - DPRINT1("[USBLIB] HandleClassDevice Class %x not implemented\n", Urb->UrbControlVendorClassRequest.Value >> 8); + DPRINT1("[%S] HandleClassDevice Class %x not implemented\n", m_USBType, Urb->UrbControlVendorClassRequest.Value >> 8); break; } break; @@ -1399,7 +1399,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("HandleClassDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1465,7 +1465,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleGetDescriptorFromInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleGetDescriptorFromInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1494,7 +1494,7 @@ Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBufferLength, Urb->UrbControlDescriptorRequest.TransferBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("[USBLIB] HandleGetDescriptorFromInterface failed with %x\n", Status); + DPRINT1("[%S] HandleGetDescriptorFromInterface failed with %x\n", m_USBType, Status); } // @@ -1515,7 +1515,7 @@ PUSBDEVICE UsbDevice; ULONG Length, BufferLength; - DPRINT("[USBLIB] HandleGetDescriptor Type %x\n", Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT("[%S] HandleGetDescriptor Type %x\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); // // check descriptor type @@ -1547,7 +1547,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleGetDescriptor invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleGetDescriptor invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1654,7 +1654,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1719,7 +1719,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] USB_STRING_DESCRIPTOR_TYPE invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] USB_STRING_DESCRIPTOR_TYPE invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1749,7 +1749,7 @@ break; } default: - DPRINT1("[USBLIB] CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT1("[%S] CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType); break; } @@ -1781,7 +1781,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleClassEndpoint invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassEndpoint invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1862,7 +1862,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleVendorDevice invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleVendorDevice invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1930,7 +1930,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleSyncResetAndClearStall invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleSyncResetAndClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -1947,7 +1947,7 @@ // // failed // - DPRINT1("[USBLIB] failed to reset pipe %x\n", Status); + DPRINT1("[%S] failed to reset pipe %x\n", m_USBType, Status); } @@ -1967,7 +1967,7 @@ // Status = HandleClearStall(Irp, Urb); } - DPRINT1("[USBLIB] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", Status); + DPRINT1("[%S] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", m_USBType, Status); // // reset data toggle @@ -2003,7 +2003,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleAbortPipe invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2026,7 +2026,7 @@ // issue request // Status = UsbDevice->AbortPipe(EndpointDescriptor); - DPRINT1("[USBLIB] URB_FUNCTION_ABORT_PIPE Status %x\n", Status); + DPRINT1("[%S] URB_FUNCTION_ABORT_PIPE Status %x\n", m_USBType, Status); // // done @@ -2059,7 +2059,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleClearStall invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClearStall invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2076,7 +2076,7 @@ // get device // UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); - DPRINT1("[USBLIB] URB_FUNCTION_SYNC_CLEAR_STALL\n"); + DPRINT1("[%S] URB_FUNCTION_SYNC_CLEAR_STALL\n", m_USBType); // // initialize setup packet @@ -2093,7 +2093,7 @@ // Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, 0, 0); - DPRINT1("[USBLIB] URB_FUNCTION_CLEAR_STALL Status %x\n", Status); + DPRINT1("[%S] URB_FUNCTION_CLEAR_STALL Status %x\n", m_USBType, Status); // // done @@ -2124,7 +2124,7 @@ // if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) { - DPRINT1("[USBLIB] HandleClassInterface invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("[%S] HandleClassInterface invalid device handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle); // // invalid device handle @@ -2178,7 +2178,7 @@ // // display error // - DPRINT1("URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", Urb->UrbHeader.Status); + DPRINT1("[%S] URB_FUNCTION_CLASS_INTERFACE failed with Urb Status %x\n", m_USBType, Urb->UrbHeader.Status); } // @@ -2272,7 +2272,7 @@ Status = HandleVendorDevice(Irp, Urb); break; default: - DPRINT1("[USBLIB] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); + DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", m_USBType, Urb->UrbHeader.Function); break; } // @@ -2282,7 +2282,7 @@ } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: { - DPRINT("[USBLIB] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", this); + DPRINT("[%S] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", m_USBType, this); if (IoStack->Parameters.Others.Argument1) { @@ -2307,7 +2307,7 @@ } case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: { - DPRINT("[USBLIB] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n"); + DPRINT("[%S] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n", m_USBType); // // this is the first request send, it delivers the PDO to the caller @@ -2336,7 +2336,7 @@ } case IOCTL_INTERNAL_USB_GET_HUB_COUNT: { - DPRINT("[USBLIB] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n"); + DPRINT("[%S] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n", m_USBType); // // after IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO is delivered, the usbhub driver @@ -2359,13 +2359,13 @@ } case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: { - DPRINT1("[USBLIB] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION UNIMPLEMENTED\n"); + DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION UNIMPLEMENTED\n", m_USBType); Status = STATUS_SUCCESS; break; } default: { - DPRINT1("[USBLIB] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", + DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", m_USBType, IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); @@ -2797,7 +2797,7 @@ NTSTATUS Status; ULONG Index = 0; - DPRINT1("USBHI_InitializeUsbDevice\n"); + DPRINT("USBHI_InitializeUsbDevice\n"); // // first get controller @@ -2893,7 +2893,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_GetUsbDescriptors\n"); + DPRINT("USBHI_GetUsbDescriptors\n"); // // sanity check @@ -2962,7 +2962,7 @@ CHubController * Controller; NTSTATUS Status; - DPRINT1("USBHI_RemoveUsbDevice\n"); + DPRINT("USBHI_RemoveUsbDevice\n"); // // first get controller @@ -3010,7 +3010,6 @@ // invalid device handle // DPRINT1("USBHI_RemoveUsbDevice Invalid device handle %p\n", UsbDevice); - PC_ASSERT(0); return STATUS_DEVICE_NOT_CONNECTED; } @@ -3035,7 +3034,7 @@ PUSBDEVICE OldUsbDevice, NewUsbDevice; CHubController * Controller; - DPRINT1("USBHI_RestoreUsbDevice\n"); + DPRINT("USBHI_RestoreUsbDevice\n"); // // first get controller @@ -3081,7 +3080,7 @@ PUSBDEVICE UsbDevice; CHubController * Controller; - DPRINT1("USBHI_QueryDeviceInformation %p\n", BusContext); + DPRINT("USBHI_QueryDeviceInformation %p\n", BusContext); // // sanity check @@ -3203,7 +3202,7 @@ { PUSB_CONTROLLER_INFORMATION_0 ControllerInfo; - DPRINT1("USBHI_GetControllerInformation\n"); + DPRINT("USBHI_GetControllerInformation\n"); // // sanity checks @@ -3266,7 +3265,7 @@ USHORT Dummy1; NTSTATUS Status; - DPRINT1("USBHI_GetExtendedHubInformation\n"); + DPRINT("USBHI_GetExtendedHubInformation\n"); // // sanity checks @@ -3493,7 +3492,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_GetUSBDIVersion\n"); + DPRINT("USBDI_GetUSBDIVersion\n"); // // get controller @@ -3573,7 +3572,7 @@ ULONG Speed, Dummy2; USHORT Dummy1; - DPRINT1("USBDI_IsDeviceHighSpeed\n"); + DPRINT("USBDI_IsDeviceHighSpeed\n"); // // get controller Modified: trunk/reactos/lib/drivers/libusb/libusb.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/libusb.…
============================================================================== --- trunk/reactos/lib/drivers/libusb/libusb.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/libusb.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -28,7 +28,7 @@ NTSTATUS Status; PHCDCONTROLLER HcdController; - DPRINT1("EHCI_AddDevice\n"); + DPRINT1("USBLIB_AddDevice\n"); /* first create the controller object */ Status = CreateHCDController(&HcdController); @@ -114,7 +114,7 @@ } default: { - DPRINT1("EHCI_Dispatch> Major %lu Minor %lu unhandeled\n", IoStack->MajorFunction, IoStack->MinorFunction); + DPRINT1("USBLIB_Dispatch> Major %lu Minor %lu unhandeled\n", IoStack->MajorFunction, IoStack->MinorFunction); Status = STATUS_SUCCESS; } } Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev…
============================================================================== --- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sat Feb 2 15:45:02 2013 @@ -86,6 +86,7 @@ ULONG m_PortStatus; PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; + LPCWSTR m_USBType; PUSB_CONFIGURATION m_ConfigurationDescriptors; }; @@ -119,6 +120,7 @@ m_Parent = Parent; m_Port = Port; m_PortStatus = PortStatus; + m_USBType = m_Device->GetUSBType(); // // initialize device lock @@ -139,7 +141,7 @@ // // failed to get usb queue // - DPRINT1("CUSBDevice::Initialize GetUsbQueue failed with %x\n", Status); + DPRINT1("[%S] GetUsbQueue failed with %x\n", m_USBType, Status); return Status; } @@ -152,7 +154,7 @@ // // failed to get dma manager // - DPRINT1("CUSBDevice::Initialize GetDMA failed with %x\n", Status); + DPRINT1("[%S] GetDMA failed with %x\n", m_USBType, Status); return Status; } @@ -170,7 +172,7 @@ // // failed to get device descriptor // - DPRINT1("CUSBDevice::Initialize Failed to get device descriptor with %x\n", Status); + DPRINT1("[%S] Failed to get device descriptor with %x\n", m_USBType, Status); return Status; } @@ -274,7 +276,7 @@ return Usb20Device; } - DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); + DPRINT1("[%S] GetType Unknown bcdUSB Type %x\n", m_USBType, m_DeviceDescriptor.bcdUSB); //PC_ASSERT(FALSE); return Usb11Device; @@ -309,7 +311,7 @@ UCHAR OldAddress; UCHAR Index; - DPRINT1("CUSBDevice::SetDeviceAddress> Address %x\n", DeviceAddress); + DPRINT1("[%S] SetDeviceAddress> Address %x\n", m_USBType, DeviceAddress); CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBLIB); if (!CtrlSetup) @@ -332,7 +334,7 @@ if (!NT_SUCCESS(Status)) { // failed to set device address - DPRINT1("CUSBDevice::SetDeviceAddress> failed to set device address with %lx Address %x\n", Status, DeviceAddress); + DPRINT1("[%S] SetDeviceAddress> failed to set device address with %lx Address %x\n", m_USBType, Status, DeviceAddress); return Status; } @@ -349,7 +351,7 @@ Status = CreateDeviceDescriptor(); if (!NT_SUCCESS(Status)) { - DPRINT1("CUSBDevice::SetDeviceAddress> failed to retrieve device descriptor with device address set Error %lx\n", Status); + DPRINT1("[%S] SetDeviceAddress failed to retrieve device descriptor with device address set Error %lx\n", m_USBType, Status); // return error status return Status; } @@ -360,7 +362,7 @@ m_DeviceDescriptor.bNumConfigurations == 0) { // failed to retrieve device descriptor - DPRINT1("CUSBDevice::SetDeviceAddress> device returned bogus device descriptor\n"); + DPRINT1("[%S] SetDeviceAddress> device returned bogus device descriptor\n", m_USBType); DumpDeviceDescriptor(&m_DeviceDescriptor); // return error status @@ -386,7 +388,7 @@ Status = CreateConfigurationDescriptor(Index); if (!NT_SUCCESS(Status)) { - DPRINT1("CUSBDevice::SetDeviceAddress> failed to retrieve configuration %lu\n", Index); + DPRINT1("[%S] SetDeviceAddress> failed to retrieve configuration %lu\n", m_USBType, Index); break; } } @@ -429,7 +431,7 @@ // // no queue, wtf? // - DPRINT1("CUSBDevice::CommitIrp> no queue / dma !!!\n"); + DPRINT1("[%S] CommitIrp> no queue / dma !!!\n", m_USBType); return STATUS_UNSUCCESSFUL; } @@ -442,7 +444,7 @@ // // failed to build request // - DPRINT1("CUSBDevice::CommitIrp> CreateUSBRequest failed with %lx\n", Status); + DPRINT1("[%S] CommitIrp> CreateUSBRequest failed with %lx\n", m_USBType, Status); return Status; } @@ -465,7 +467,7 @@ // // failed to add request // - DPRINT1("CUSBDevice::CommitIrp> failed add request to queue with %lx\n", Status); + DPRINT1("[%S] failed add request to queue with %lx\n", m_USBType, Status); Request->Release(); return Status; } @@ -518,7 +520,7 @@ // // no queue, wtf? // - DPRINT1("CUSBDevice::CommitSetupPacket> no queue!!!\n"); + DPRINT1("[%S] CommitSetupPacket> no queue!!!\n", m_USBType); return STATUS_UNSUCCESSFUL; } @@ -531,7 +533,7 @@ // // failed to build request // - DPRINT1("CUSBDevice::CommitSetupPacket> CreateUSBRequest failed with %x\n", Status); + DPRINT1("[%S] CommitSetupPacket> CreateUSBRequest failed with %x\n", m_USBType, Status); return Status; } @@ -544,7 +546,7 @@ // // failed to initialize request // - DPRINT1("CUSBDevice::CommitSetupPacket> failed to initialize usb request with %x\n", Status); + DPRINT1("[%S] CommitSetupPacket failed to initialize usb request with %x\n", m_USBType, Status); Request->Release(); return Status; } @@ -558,7 +560,7 @@ // // failed to add request // - DPRINT1("CUSBDevice::CommitSetupPacket> failed add request to queue with %x\n", Status); + DPRINT1("[%S] CommitSetupPacket> failed add request to queue with %x\n", m_USBType, Status); Request->Release(); return Status; } @@ -759,7 +761,7 @@ // // failed to get partial configuration descriptor // - DPRINT1("[USBLIB] Failed to get partial configuration descriptor Status %x Index %x\n", Status, Index); + DPRINT1("[%S] Failed to get partial configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB); return Status; } @@ -773,7 +775,7 @@ // // failed to get full configuration descriptor // - DPRINT1("[USBLIB] Failed to get full configuration descriptor Status %x Index %x\n", Status, Index); + DPRINT1("[%S] Failed to get full configuration descriptor Status %x Index %x\n", m_USBType, Status, Index); ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB); return Status; } @@ -968,7 +970,7 @@ if (EndpointDescriptor->bLength == 0 || EndpointDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE) { // bogus configuration descriptor - DPRINT1("[USBLIB] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, + DPRINT1("[%S] Bogus descriptor found in InterfaceNumber %x Alternate %x EndpointIndex %x bLength %x bDescriptorType %x\n", m_USBType, InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, PipeIndex, EndpointDescriptor->bLength, EndpointDescriptor->bDescriptorType); // failed @@ -1040,7 +1042,7 @@ if (!Found) { - DPRINT1("[USBLIB] invalid configuration value %u\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("[%S] invalid configuration value %u\n", m_USBType, ConfigurationDescriptor->bConfigurationValue); return STATUS_INVALID_PARAMETER; } @@ -1062,13 +1064,13 @@ if (!ConfigurationDescriptor) { // unconfigure request - DPRINT1("CUSBDevice::SelectConfiguration Unconfigure Request Status %lx\n", Status); + DPRINT1("[%S] SelectConfiguration Unconfigure Request Status %lx\n", m_USBType, Status); m_ConfigurationIndex = 0; return Status; } // informal debug print - DPRINT1("CUSBDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", ConfigurationIndex, m_ConfigurationIndex, Status); + DPRINT1("[%S] SelectConfiguration New Configuration %x Old Configuration %x Result %lx\n", m_USBType, ConfigurationIndex, m_ConfigurationIndex, Status); if (!NT_SUCCESS(Status)) { // @@ -1123,7 +1125,7 @@ if (!NT_SUCCESS(Status)) { // failed - DPRINT1("[LIBUSB] Failed to copy interface descriptor Index %lu InterfaceDescriptor %p InterfaceInfo %p\n", ConfigurationIndex, InterfaceDescriptor, InterfaceInfo); + DPRINT1("[%S] Failed to copy interface descriptor Index %lu InterfaceDescriptor %p InterfaceInfo %p\n", m_USBType, ConfigurationIndex, InterfaceDescriptor, InterfaceInfo); break; } @@ -1165,7 +1167,7 @@ if (!Found) { // invalid handle passed - DPRINT1("[USBLIB] Invalid configuration handle passed %p\n", ConfigurationHandle); + DPRINT1("[%S] Invalid configuration handle passed %p\n", m_USBType, ConfigurationHandle); return STATUS_INVALID_PARAMETER; } @@ -1180,7 +1182,7 @@ Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL); // informal debug print - DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); + DPRINT1("[%S] SelectInterface AlternateSetting %x InterfaceNumber %x Status %lx\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); #if 0 if (!NT_SUCCESS(Status)) { @@ -1216,7 +1218,7 @@ InterfaceDescriptor = USBD_ParseConfigurationDescriptor(m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); if (!InterfaceDescriptor) { - DPRINT1("[LIBUSB] No such interface Alternate %x InterfaceNumber %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber); + DPRINT1("[%S] No such interface Alternate %x InterfaceNumber %x\n", m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber); return STATUS_UNSUCCESSFUL; } @@ -1225,7 +1227,7 @@ if (!NT_SUCCESS(Status)) { // failed - DPRINT1("[LIBUSB] Failed to build interface descriptor Status %x\n", Status); + DPRINT1("[%S] Failed to build interface descriptor Status %x\n", m_USBType, Status); return Status; } }
11 years, 10 months
1
0
0
0
[tfaber] 58267: [CRT] - Fix the strxfrm hack to allow dest == NULL.
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Feb 2 13:48:19 2013 New Revision: 58267 URL:
http://svn.reactos.org/svn/reactos?rev=58267&view=rev
Log: [CRT] - Fix the strxfrm hack to allow dest == NULL. Modified: trunk/reactos/lib/sdk/crt/string/strxfrm.c Modified: trunk/reactos/lib/sdk/crt/string/strxfrm.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strxfrm…
============================================================================== --- trunk/reactos/lib/sdk/crt/string/strxfrm.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strxfrm.c [iso-8859-1] Sat Feb 2 13:48:19 2013 @@ -17,7 +17,7 @@ size_t strxfrm( char *dest, const char *src, size_t n ) { strncpy(dest, src, n); - return (strlen(dest)); + return strnlen(src, n); } #else size_t strxfrm( char *dest, const char *src, size_t n )
11 years, 10 months
1
0
0
0
[tfaber] 58266: [NTOSKRNL:MM] - Ignore the unsupported MEM_TOP_DOWN flag instead of failing NtAllocateVirtualMemory CORE-6392 CORE-6805 #comment MEM_TOP_DOWN should be sufficiently fixed in r58266, ...
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Feb 2 13:27:49 2013 New Revision: 58266 URL:
http://svn.reactos.org/svn/reactos?rev=58266&view=rev
Log: [NTOSKRNL:MM] - Ignore the unsupported MEM_TOP_DOWN flag instead of failing NtAllocateVirtualMemory CORE-6392 CORE-6805 #comment MEM_TOP_DOWN should be sufficiently fixed in r58266, and setup now starts. Please confirm. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c…
============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Feb 2 13:27:49 2013 @@ -3856,8 +3856,7 @@ if ((AllocationType & MEM_TOP_DOWN) == MEM_TOP_DOWN) { DPRINT1("MEM_TOP_DOWN not supported\n"); - Status = STATUS_INVALID_PARAMETER; - goto FailPathNoLock; + AllocationType &= ~MEM_TOP_DOWN; } if ((AllocationType & MEM_RESET) == MEM_RESET) {
11 years, 10 months
1
0
0
0
[tfaber] 58265: [EXPLORER_NEW] - Do not use printf for startup debug messages - Fix some (alas, not all) TCHAR misuse
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Feb 2 11:31:30 2013 New Revision: 58265 URL:
http://svn.reactos.org/svn/reactos?rev=58265&view=rev
Log: [EXPLORER_NEW] - Do not use printf for startup debug messages - Fix some (alas, not all) TCHAR misuse Modified: trunk/reactos/base/shell/explorer-new/explorer.c trunk/reactos/base/shell/explorer-new/precomp.h trunk/reactos/base/shell/explorer-new/startup.c trunk/reactos/base/shell/explorer-new/trayntfy.c Modified: trunk/reactos/base/shell/explorer-new/explorer.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex…
============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.c [iso-8859-1] Sat Feb 2 11:31:30 2013 @@ -332,7 +332,7 @@ (LPVOID *)&lpszLocalBuf, &cbLen) != 0) { - wcsncpy(szBuffer, lpszLocalBuf, cbBufLen); + _tcsncpy(szBuffer, lpszLocalBuf, cbBufLen / sizeof(*szBuffer)); bRet = TRUE; break; Modified: trunk/reactos/base/shell/explorer-new/precomp.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/pr…
============================================================================== --- trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/precomp.h [iso-8859-1] Sat Feb 2 11:31:30 2013 @@ -79,12 +79,12 @@ } #define ASSERT(cond) \ - if (!(cond)) { \ + do if (!(cond)) { \ Win32DbgPrint(__FILE__, __LINE__, "ASSERTION %s FAILED!\n", #cond); \ - } + } while (0) #define DbgPrint(fmt, ...) \ - Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__); + Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__) extern HINSTANCE hExplorerInstance; extern HMODULE hUser32; Modified: trunk/reactos/base/shell/explorer-new/startup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st…
============================================================================== --- trunk/reactos/base/shell/explorer-new/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startup.c [iso-8859-1] Sat Feb 2 11:31:30 2013 @@ -75,12 +75,12 @@ if (!CreateProcessW(NULL, szCmdLineExp, NULL, NULL, FALSE, 0, NULL, dir, &si, &info)) { - printf("Failed to run command (%ld)\n", GetLastError()); + DbgPrint("Failed to run command (%lu)\n", GetLastError()); return INVALID_RUNCMD_RETURN; } - printf("Successfully ran command\n"); + DbgPrint("Successfully ran command\n"); if (wait) { /* wait for the process to exit */ @@ -114,9 +114,9 @@ WCHAR *szValue = NULL; if (hkRoot == HKEY_LOCAL_MACHINE) - wprintf(L"processing %s entries under HKLM\n", szKeyName); + DbgPrint("processing %ls entries under HKLM\n", szKeyName); else - wprintf(L"processing %s entries under HKCU\n", szKeyName); + DbgPrint("processing %ls entries under HKCU\n", szKeyName); res = RegOpenKeyExW(hkRoot, L"Software\\Microsoft\\Windows\\CurrentVersion", @@ -125,8 +125,7 @@ &hkWin); if (res != ERROR_SUCCESS) { - printf("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", - res); + DbgPrint("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", res); goto end; } @@ -140,12 +139,12 @@ { if (res == ERROR_FILE_NOT_FOUND) { - printf("Key doesn't exist - nothing to be done\n"); + DbgPrint("Key doesn't exist - nothing to be done\n"); res = ERROR_SUCCESS; } else - printf("RegOpenKey failed on run key (%ld)\n", res); + DbgPrint("RegOpenKeyEx failed on run key (%ld)\n", res); goto end; } @@ -164,14 +163,14 @@ NULL); if (res != ERROR_SUCCESS) { - printf("Couldn't query key info (%ld)\n", res); + DbgPrint("Couldn't query key info (%ld)\n", res); goto end; } if (i == 0) { - printf("No commands to execute.\n"); + DbgPrint("No commands to execute.\n"); res = ERROR_SUCCESS; goto end; @@ -182,7 +181,7 @@ cbMaxCmdLine); if (szCmdLine == NULL) { - printf("Couldn't allocate memory for the commands to be executed\n"); + DbgPrint("Couldn't allocate memory for the commands to be executed\n"); res = ERROR_NOT_ENOUGH_MEMORY; goto end; @@ -194,7 +193,7 @@ cchMaxValue * sizeof(*szValue)); if (szValue == NULL) { - printf("Couldn't allocate memory for the value names\n"); + DbgPrint("Couldn't allocate memory for the value names\n"); res = ERROR_NOT_ENOUGH_MEMORY; goto end; @@ -217,7 +216,7 @@ &cbDataLength); if (res != ERROR_SUCCESS) { - printf("Couldn't read in value %ld - %ld\n", i, res); + DbgPrint("Couldn't read in value %lu - %ld\n", i, res); continue; } @@ -227,12 +226,12 @@ if (bDelete && (res = RegDeleteValueW(hkRun, szValue)) != ERROR_SUCCESS) { - printf("Couldn't delete value - %ld, %ld. Running command anyways.\n", i, res); + DbgPrint("Couldn't delete value - %lu, %ld. Running command anyways.\n", i, res); } if (type != REG_SZ) { - printf("Incorrect type of value #%ld (%ld)\n", i, type); + DbgPrint("Incorrect type of value #%lu (%lu)\n", i, type); continue; } @@ -240,10 +239,10 @@ res = runCmd(szCmdLine, NULL, bSynchronous, FALSE); if (res == INVALID_RUNCMD_RETURN) { - printf("Error running cmd #%ld (%ld)\n", i, GetLastError()); - } - - printf("Done processing cmd #%ld\n", i); + DbgPrint("Error running cmd #%lu (%lu)\n", i, GetLastError()); + } + + DbgPrint("Done processing cmd #%lu\n", i); } res = ERROR_SUCCESS; @@ -257,7 +256,7 @@ if (hkWin != NULL) RegCloseKey(hkWin); - printf("done\n"); + DbgPrint("done\n"); return res == ERROR_SUCCESS ? TRUE : FALSE; } @@ -269,24 +268,22 @@ /* TODO: ProcessRunKeys already checks SM_CLEANBOOT -- items prefixed with * should probably run even in safe mode */ BOOL bNormalBoot = GetSystemMetrics(SM_CLEANBOOT) == 0; /* Perform the operations that are performed every boot */ /* First, set the current directory to SystemRoot */ - TCHAR gen_path[MAX_PATH]; + WCHAR gen_path[MAX_PATH]; DWORD res; HKEY hSessionKey, hKey; HRESULT hr; - res = GetWindowsDirectory(gen_path, sizeof(gen_path)); - + res = GetWindowsDirectoryW(gen_path, sizeof(gen_path) / sizeof(gen_path[0])); if (res == 0) { - printf("Couldn't get the windows directory - error %ld\n", - GetLastError()); + DbgPrint("Couldn't get the windows directory - error %lu\n", GetLastError()); return 100; } - if (!SetCurrentDirectory(gen_path)) - { - wprintf(L"Cannot set the dir to %s (%ld)\n", gen_path, GetLastError()); + if (!SetCurrentDirectoryW(gen_path)) + { + DbgPrint("Cannot set the dir to %ls (%lu)\n", gen_path, GetLastError()); return 100; } @@ -297,7 +294,7 @@ LONG Error; DWORD dwDisp; - Error = RegCreateKeyEx(hSessionKey, L"StartupHasBeenRun", 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp); + Error = RegCreateKeyExW(hSessionKey, L"StartupHasBeenRun", 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hKey, &dwDisp); RegCloseKey(hSessionKey); if (Error == ERROR_SUCCESS) { @@ -333,7 +330,7 @@ if (res && bNormalBoot && (SHRestricted(REST_NOCURRENTUSERRUNONCE) == 0)) res = ProcessRunKeys(HKEY_CURRENT_USER, L"RunOnce", TRUE, FALSE); - printf("Operation done\n"); + DbgPrint("Operation done\n"); return res ? 0 : 101; } Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr…
============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat Feb 2 11:31:30 2013 @@ -758,7 +758,7 @@ TMT_FONT, &clockFont); - hFont = CreateFontIndirect(&clockFont); + hFont = CreateFontIndirectW(&clockFont); TrayClockWnd_SetFont(This, hFont,
11 years, 10 months
1
0
0
0
[tfaber] 58264: [EXPLORER_NEW] - Prefer HeapAlloc over malloc
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Feb 2 11:14:58 2013 New Revision: 58264 URL:
http://svn.reactos.org/svn/reactos?rev=58264&view=rev
Log: [EXPLORER_NEW] - Prefer HeapAlloc over malloc Modified: trunk/reactos/base/shell/explorer-new/startup.c trunk/reactos/base/shell/explorer-new/trayntfy.c Modified: trunk/reactos/base/shell/explorer-new/startup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st…
============================================================================== --- trunk/reactos/base/shell/explorer-new/startup.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startup.c [iso-8859-1] Sat Feb 2 11:14:58 2013 @@ -107,9 +107,9 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, BOOL bSynchronous) { - HKEY hkWin = NULL, hkRun=NULL; + HKEY hkWin = NULL, hkRun = NULL; LONG res = ERROR_SUCCESS; - DWORD i, nMaxCmdLine = 0, nMaxValue = 0; + DWORD i, cbMaxCmdLine = 0, cchMaxValue = 0; WCHAR *szCmdLine = NULL; WCHAR *szValue = NULL; @@ -118,7 +118,12 @@ else wprintf(L"processing %s entries under HKCU\n", szKeyName); - if ((res = RegOpenKeyExW(hkRoot, L"Software\\Microsoft\\Windows\\CurrentVersion", 0, KEY_READ, &hkWin)) != ERROR_SUCCESS) + res = RegOpenKeyExW(hkRoot, + L"Software\\Microsoft\\Windows\\CurrentVersion", + 0, + KEY_READ, + &hkWin); + if (res != ERROR_SUCCESS) { printf("RegOpenKey failed on Software\\Microsoft\\Windows\\CurrentVersion (%ld)\n", res); @@ -126,8 +131,12 @@ goto end; } - if ((res = RegOpenKeyExW(hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun))!= - ERROR_SUCCESS) + res = RegOpenKeyExW(hkWin, + szKeyName, + 0, + bDelete ? KEY_ALL_ACCESS : KEY_READ, + &hkRun); + if (res != ERROR_SUCCESS) { if (res == ERROR_FILE_NOT_FOUND) { @@ -141,8 +150,19 @@ goto end; } - if ((res = RegQueryInfoKeyW(hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, - &nMaxCmdLine, NULL, NULL)) != ERROR_SUCCESS) + res = RegQueryInfoKeyW(hkRun, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &i, + &cchMaxValue, + &cbMaxCmdLine, + NULL, + NULL); + if (res != ERROR_SUCCESS) { printf("Couldn't query key info (%ld)\n", res); @@ -157,7 +177,10 @@ goto end; } - if ((szCmdLine = malloc(nMaxCmdLine)) == NULL) + szCmdLine = HeapAlloc(hProcessHeap, + 0, + cbMaxCmdLine); + if (szCmdLine == NULL) { printf("Couldn't allocate memory for the commands to be executed\n"); @@ -165,24 +188,34 @@ goto end; } - if ((szValue = malloc((++nMaxValue)*sizeof(*szValue))) == NULL) + ++cchMaxValue; + szValue = HeapAlloc(hProcessHeap, + 0, + cchMaxValue * sizeof(*szValue)); + if (szValue == NULL) { printf("Couldn't allocate memory for the value names\n"); - free(szCmdLine); res = ERROR_NOT_ENOUGH_MEMORY; goto end; } while (i > 0) { - DWORD nValLength = nMaxValue, nDataLength = nMaxCmdLine; + DWORD cchValLength = cchMaxValue, cbDataLength = cbMaxCmdLine; DWORD type; --i; - if ((res = RegEnumValueW(hkRun, i, szValue, &nValLength, 0, &type, - (LPBYTE)szCmdLine, &nDataLength)) != ERROR_SUCCESS) + res = RegEnumValueW(hkRun, + i, + szValue, + &cchValLength, + 0, + &type, + (PBYTE)szCmdLine, + &cbDataLength); + if (res != ERROR_SUCCESS) { printf("Couldn't read in value %ld - %ld\n", i, res); @@ -204,7 +237,8 @@ continue; } - if ((res = runCmd(szCmdLine, NULL, bSynchronous, FALSE)) == INVALID_RUNCMD_RETURN) + res = runCmd(szCmdLine, NULL, bSynchronous, FALSE); + if (res == INVALID_RUNCMD_RETURN) { printf("Error running cmd #%ld (%ld)\n", i, GetLastError()); } @@ -212,11 +246,12 @@ printf("Done processing cmd #%ld\n", i); } - free(szValue); - free(szCmdLine); res = ERROR_SUCCESS; - end: + if (szValue != NULL) + HeapFree(hProcessHeap, 0, szValue); + if (szCmdLine != NULL) + HeapFree(hProcessHeap, 0, szCmdLine); if (hkRun != NULL) RegCloseKey(hkRun); if (hkWin != NULL) Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr…
============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat Feb 2 11:14:58 2013 @@ -51,11 +51,12 @@ PNOTIFY_ITEM *findNotifyPointer = &This->NotifyItems; PNOTIFY_ITEM notifyItem; - notifyItem = malloc(sizeof(*notifyItem)); + notifyItem = HeapAlloc(hProcessHeap, + HEAP_ZERO_MEMORY, + sizeof(*notifyItem)); if (notifyItem == NULL) return NULL; - ZeroMemory(notifyItem, sizeof(*notifyItem)); notifyItem->next = NULL; while (*findNotifyPointer != NULL) @@ -248,7 +249,9 @@ if (!(deleteItem->iconData.dwState & NIS_HIDDEN)) This->VisibleButtonCount--; - free(deleteItem); + HeapFree(hProcessHeap, + 0, + deleteItem); This->ButtonCount--; while (updateItem != NULL)
11 years, 10 months
1
0
0
0
[tfaber] 58263: [EXPLORER_NEW] - Prefer HEAP_ZERO_MEMORY over a separate ZeroMemory call. Patch by Carlo Bramini. CORE-6928 #resolve
by tfaber@svn.reactos.org
Author: tfaber Date: Sat Feb 2 10:55:29 2013 New Revision: 58263 URL:
http://svn.reactos.org/svn/reactos?rev=58263&view=rev
Log: [EXPLORER_NEW] - Prefer HEAP_ZERO_MEMORY over a separate ZeroMemory call. Patch by Carlo Bramini. CORE-6928 #resolve Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c trunk/reactos/base/shell/explorer-new/startmnu.c trunk/reactos/base/shell/explorer-new/taskband.c trunk/reactos/base/shell/explorer-new/taskswnd.c trunk/reactos/base/shell/explorer-new/tbsite.c trunk/reactos/base/shell/explorer-new/trayntfy.c trunk/reactos/base/shell/explorer-new/traywnd.c Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/dr…
============================================================================== --- trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] Sat Feb 2 10:55:29 2013 @@ -131,14 +131,11 @@ HRESULT hr; This = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, FIELD_OFFSET(IDropTargetImpl, Formats[nSupportedFormats])); if (This != NULL) { - ZeroMemory(This, - sizeof(*This)); - This->lpVtbl = &IDropTargetImpl_Vtbl; This->Ref = 1; This->hwndTarget = hwndTarget; Modified: trunk/reactos/base/shell/explorer-new/startmnu.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/st…
============================================================================== --- trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/startmnu.c [iso-8859-1] Sat Feb 2 10:55:29 2013 @@ -773,13 +773,10 @@ IStartMenuSiteImpl *This; This = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*This)); if (This == NULL) return NULL; - - ZeroMemory(This, - sizeof(*This)); This->lpVtbl = &IStartMenuSiteImpl_Vtbl; This->lpServiceProviderVtbl = &IServiceProviderImpl_Vtbl; Modified: trunk/reactos/base/shell/explorer-new/taskband.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta…
============================================================================== --- trunk/reactos/base/shell/explorer-new/taskband.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskband.c [iso-8859-1] Sat Feb 2 10:55:29 2013 @@ -629,13 +629,11 @@ ITaskBandImpl *This; This = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*This)); if (This == NULL) return NULL; - ZeroMemory(This, - sizeof(*This)); This->lpVtbl = &ITaskBandImpl_Vtbl; This->lpDeskBandVtbl = &IDeskBandImpl_Vtbl; This->lpObjectWithSiteVtbl = &IObjectWithSiteImpl_Vtbl; Modified: trunk/reactos/base/shell/explorer-new/taskswnd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ta…
============================================================================== --- trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/taskswnd.c [iso-8859-1] Sat Feb 2 10:55:29 2013 @@ -709,13 +709,10 @@ /* Allocate a new task group */ TaskGroup = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*TaskGroup)); if (TaskGroup != NULL) { - ZeroMemory(TaskGroup, - sizeof(*TaskGroup)); - TaskGroup->dwTaskCount = 1; TaskGroup->dwProcessId = dwProcessId; TaskGroup->Index = -1; @@ -2065,13 +2062,11 @@ { LPCREATESTRUCT CreateStruct = (LPCREATESTRUCT)lParam; This = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*This)); if (This == NULL) return FALSE; - ZeroMemory(This, - sizeof(*This)); This->hWnd = hwnd; This->hWndNotify = CreateStruct->hwndParent; This->Tray = (ITrayWindow*)CreateStruct->lpCreateParams; Modified: trunk/reactos/base/shell/explorer-new/tbsite.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tb…
============================================================================== --- trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/tbsite.c [iso-8859-1] Sat Feb 2 10:55:29 2013 @@ -910,13 +910,11 @@ *phwndTaskSwitch = NULL; This = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*This)); if (This == NULL) return NULL; - ZeroMemory(This, - sizeof(*This)); This->lpVtbl = &ITrayBandSiteImpl_Vtbl; This->lpBandSiteVtbl = &IBandSiteImpl_Vtbl; This->Ref = 1; Modified: trunk/reactos/base/shell/explorer-new/trayntfy.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr…
============================================================================== --- trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/trayntfy.c [iso-8859-1] Sat Feb 2 10:55:29 2013 @@ -615,12 +615,10 @@ HWND hWnd = NULL; SpData = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*SpData)); if (SpData != NULL) { - ZeroMemory(SpData, sizeof(*SpData)); - /* Create the window. The tray window is going to move it to the correct position and resize it as needed. */ dwStyle = WS_CHILD | WS_CLIPSIBLINGS; @@ -1357,13 +1355,10 @@ HWND hWnd = NULL; TcData = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*TcData)); if (TcData != NULL) { - ZeroMemory(TcData, - sizeof(*TcData)); - TcData->IsHorizontal = TRUE; /* Create the window. The tray window is going to move it to the correct position and resize it as needed. */ @@ -1841,13 +1836,10 @@ return NULL; TnData = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*TnData)); if (TnData != NULL) { - ZeroMemory(TnData, - sizeof(*TnData)); - TnData->TrayWindow = TrayWindow; TnData->HideClock = bHideClock; Modified: trunk/reactos/base/shell/explorer-new/traywnd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/tr…
============================================================================== --- trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/traywnd.c [iso-8859-1] Sat Feb 2 10:55:29 2013 @@ -1620,13 +1620,11 @@ ITrayWindowImpl *This; This = HeapAlloc(hProcessHeap, - 0, + HEAP_ZERO_MEMORY, sizeof(*This)); if (This == NULL) return NULL; - ZeroMemory(This, - sizeof(*This)); This->lpVtbl = &ITrayWindowImpl_Vtbl; This->lpVtblShellDesktopTray = &IShellDesktopTrayImpl_Vtbl; This->Ref = 1;
11 years, 10 months
1
0
0
0
← Newer
1
...
9
10
11
12
13
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
Results per page:
10
25
50
100
200