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
December 2008
----- 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
31 participants
710 discussions
Start a n
N
ew thread
[sginsberg] 38454: - Fix ICU warnings
by sginsberg@svn.reactos.org
Author: sginsberg Date: Mon Dec 29 05:05:00 2008 New Revision: 38454 URL:
http://svn.reactos.org/svn/reactos?rev=38454&view=rev
Log: - Fix ICU warnings Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu/s…
============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/umutex.c [iso-8859-1] Mon Dec 29 05:05:00 2008 @@ -104,7 +104,7 @@ * *-------------------------------------------------------------*/ static CRITICAL_SECTION gMutexes[MAX_MUTEXES]; -static CRITICAL_SECTION gGlobalWinMutex; +/* static */ CRITICAL_SECTION gGlobalWinMutex; /* On WIN32 mutexes are reentrant. This makes it difficult to debug Modified: trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu/s…
============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu/source/common/unistr.cpp [iso-8859-1] Mon Dec 29 05:05:00 2008 @@ -1377,7 +1377,7 @@ but defining it here makes sure that it is included with this object file. This makes sure that static library dependencies are kept to a minimum. */ -static void uprv_UnicodeStringDummy(void) { +/* static */ void uprv_UnicodeStringDummy(void) { U_NAMESPACE_USE delete [] (new UnicodeString[2]); } Modified: trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu4r…
============================================================================== --- trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] Mon Dec 29 05:05:00 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> -<module name="icu4ros" type="staticlibrary" allowwarnings="true"> +<module name="icu4ros" type="staticlibrary"> <define name="U_STATIC_IMPLEMENTATION" /> <define name="U_HAVE_INTTYPES_H" /> <define name="UCONFIG_NO_FILE_IO">1</define>
15 years, 12 months
1
0
0
0
[sginsberg] 38453: - Silence riched20 format warnings
by sginsberg@svn.reactos.org
Author: sginsberg Date: Mon Dec 29 05:04:13 2008 New Revision: 38453 URL:
http://svn.reactos.org/svn/reactos?rev=38453&view=rev
Log: - Silence riched20 format warnings Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2…
============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Mon Dec 29 05:04:13 2008 @@ -3,6 +3,7 @@ <group> <module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true"> <importlibrary definition="riched20.spec" /> + <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" />
15 years, 12 months
1
0
0
0
[sginsberg] 38452: - Silence Uniata warnings, add a .diff and remove allowwarnings=true
by sginsberg@svn.reactos.org
Author: sginsberg Date: Mon Dec 29 05:03:54 2008 New Revision: 38452 URL:
http://svn.reactos.org/svn/reactos?rev=38452&view=rev
Log: - Silence Uniata warnings, add a .diff and remove allowwarnings=true Added: trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/atapi.h [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -137,6 +137,10 @@ #endif // _DBGNT_ #else // _DEBUG + +#ifdef KdPrint +#undef KdPrint +#endif #define PRINT_PREFIX "UniATA: " Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -1864,7 +1864,9 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; +#ifdef _DEBUG ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; +#endif //ULONG RevID = deviceExtension->RevID; ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; UCHAR tmp8; Modified: trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_badblock.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -159,7 +159,11 @@ L"UniATA\\Parameters\\BadBlocks", QueryTable, 0, 0); +#ifdef _DEBUG KdPrint(( "InitBadBlocks returned: %#x\n", status)); +#else + UNREFERENCED_PARAMETER(status); +#endif } else { KdPrint(( "InitBadBlocks local\n")); Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -219,7 +219,7 @@ PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); BOOLEAN use_DB_IO = FALSE; - BOOLEAN use_AHCI = FALSE; + //BOOLEAN use_AHCI = FALSE; ULONG orig_count = count; ULONG max_entries = (deviceExtension->HwFlags & UNIATA_AHCI) ? ATA_AHCI_DMA_ENTRIES : ATA_DMA_ENTRIES; @@ -281,7 +281,7 @@ if(!dma_count || ((LONG)(dma_base) == -1)) { KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; + AtaReq->ahci_base64 = (ULONGLONG)NULL; return FALSE; } @@ -303,7 +303,7 @@ if (i >= max_entries) { KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; + AtaReq->ahci_base64 = (ULONGLONG)NULL; return FALSE; } KdPrint2((PRINT_PREFIX " get Phys(data[n]=%x)\n", data )); @@ -321,7 +321,7 @@ } else if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { //AtaReq->dma_base = NULL; - AtaReq->ahci_base64 = NULL; + AtaReq->ahci_base64 = (ULONGLONG)NULL; KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); return FALSE; } @@ -612,7 +612,7 @@ } if((deviceExtension->HbaCtrlFlags & HBAFLAGS_DMA_DISABLED_LBA48) && - (AtaReq->lba >= ATA_MAX_LBA28) && + (AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) && (LunExt->TransferMode > ATA_PIO5) ) { KdPrint2((PRINT_PREFIX "AtapiDmaReinit: FORCE_DOWNRATE on Device %d for LBA48\n", ldev & 1)); @@ -623,7 +623,7 @@ if(AtaReq->Flags & REQ_FLAG_FORCE_DOWNRATE) { KdPrint2((PRINT_PREFIX "AtapiDmaReinit: FORCE_DOWNRATE on Device %d\n", ldev & 1)); - if(AtaReq->lba >= ATA_MAX_LBA28) { + if(AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) { limit_lba48: LunExt->DeviceFlags |= REQ_FLAG_FORCE_DOWNRATE_LBA48; limit_pio: @@ -1046,7 +1046,7 @@ /* set PIO mode timings */ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); if((apiomode >= 0) && (ChipType != VIA133)) { - SetPciConfig1(reg-0x08, via_pio[apiomode]); + SetPciConfig1(reg-0x08, via_pio[(UCHAR)apiomode]); } via82c_timing(deviceExtension, dev, ATA_PIO0 + apiomode); AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); @@ -1067,18 +1067,18 @@ apiomode = 4; for(i=udmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[udmamode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[(UCHAR)udmamode]); return; } } for(i=wdmamode; i>=0; i--) { if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[wdmamode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[(UCHAR)wdmamode]); return; } } if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { - AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[apiomode]); + AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[(UCHAR)apiomode]); return; } return; @@ -1113,7 +1113,7 @@ } if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { ChangePciConfig4(0x44 + (dev * 8), a | 0x80000000); - SetPciConfig4(0x40 + (dev * 8), nat_piotiming[apiomode]); + SetPciConfig4(0x40 + (dev * 8), nat_piotiming[(UCHAR)apiomode]); return; } /* Use GENERIC PIO */ @@ -1413,7 +1413,7 @@ // 44 GetPciConfig4(0x44, reg44); reg44 = (reg44 & ~(0xff << bit_offset)) | - (sw_dma_modes[wdmamode] << bit_offset); + (sw_dma_modes[(UCHAR)wdmamode] << bit_offset); SetPciConfig4(0x44, reg44); // 40 GetPciConfig4(0x40, reg40); @@ -1439,7 +1439,7 @@ // 40 GetPciConfig4(0x40, reg40); reg40 = (reg40 & ~(0xff << bit_offset)) | - (sw_pio_modes[apiomode] << bit_offset); + (sw_pio_modes[(UCHAR)apiomode] << bit_offset); SetPciConfig4(0x40, reg40); return; break; } @@ -1527,7 +1527,7 @@ /* set PIO mode timings */ AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); - SetPciConfig1(treg, cmd_pio_modes[apiomode]); + SetPciConfig1(treg, cmd_pio_modes[(UCHAR)apiomode]); ChangePciConfig1(Channel ? 0x7b : 0x73, a & ~(!(DeviceNumber & 1) ? 0x35 : 0xca)); return; @@ -1538,7 +1538,7 @@ /*******/ /* SiS */ /*******/ - PULONG sis_modes; + PULONG sis_modes = NULL; static const ULONG sis_modes_new133[] = { 0x28269008, 0x0c266008, 0x04263008, 0x0c0a3008, 0x05093008, 0x22196008, 0x0c0a3008, 0x05093008, 0x050939fc, 0x050936ac, @@ -1553,9 +1553,9 @@ { 0x00cb, 0x0067, 0x0044, 0x0033, 0x0031, 0x0044, 0x0033, 0x0031, 0x8b31, 0x8731, 0x8531, 0x8431, 0x8231, 0x8131 }; - ULONG reg; + ULONG reg = 0; UCHAR reg57; - ULONG reg_size; + ULONG reg_size = 0; ULONG offs; switch(ChipType) { @@ -1901,7 +1901,7 @@ ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; - ULONG timing; + ULONG timing = 0; if(mode == ATA_PIO5) mode = ATA_PIO4; Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -52,11 +52,11 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - ULONG slotNumber = deviceExtension->slotNumber; - ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + //ULONG slotNumber = deviceExtension->slotNumber; + //ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; - ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; - ULONG RevID = deviceExtension->RevID; + //ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; + //ULONG RevID = deviceExtension->RevID; ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ULONG ChipFlags= deviceExtension->HwFlags & CHIPFLAG_MASK; @@ -216,7 +216,7 @@ PCI_DEV_HW_SPEC_BM( 0730, 1039, 0x00, ATA_UDMA5, "SiS 730" , SIS100OLD ), PCI_DEV_HW_SPEC_BM( 0646, 1039, 0x00, ATA_UDMA6, "SiS 645DX", SIS133NEW ), -/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ), +/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ),*/ /* PCI_DEV_HW_SPEC_BM( 0640, 1039, 0x00, ATA_UDMA4, "SiS 640" , SIS_SOUTH ),*/ PCI_DEV_HW_SPEC_BM( 0635, 1039, 0x00, ATA_UDMA5, "SiS 635" , SIS100NEW ), PCI_DEV_HW_SPEC_BM( 0633, 1039, 0x00, ATA_UDMA5, "SiS 633" , SIS100NEW ), @@ -419,7 +419,7 @@ BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, 4, 0, deviceExtension->NumberChannels*sizeof(IDE_BUSMASTER_REGISTERS)); for(c=0; c<deviceExtension->NumberChannels; c++) { - ULONG unit01 = (c & 1); + //ULONG unit01 = (c & 1); ULONG unit10 = (c & 2); chan = &deviceExtension->chan[c]; @@ -987,7 +987,7 @@ IN ULONG slotNumber ) { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; @@ -1039,7 +1039,7 @@ IN ULONG c ) { - PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PCI_COMMON_CONFIG pciData; ULONG funcNumber; ULONG busDataRead; @@ -1174,7 +1174,7 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; - ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + //ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; PHW_CHANNEL chan; ULONG c; // logical channel (for Compatible Mode controllers) UCHAR tmp8; @@ -1332,7 +1332,9 @@ ULONG slotNumber = deviceExtension->slotNumber; ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ULONG VendorID = deviceExtension->DevID & 0xffff; +#ifdef _DEBUG ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; +#endif ULONG RevID = deviceExtension->RevID; // ULONG i; // BUSMASTER_CONTROLLER_INFORMATION* DevTypeInfo; Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -76,7 +76,6 @@ VOID AtapiDoNothing(VOID) { - ULONG i = 0; return; } // end AtapiDoNothing() @@ -504,8 +503,8 @@ /* if(known) { RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); } else {*/ - sprintf((PCHAR)vendorStrPtr, "%4.4x", VendorID); - sprintf((PCHAR)deviceStrPtr, "%4.4x", DeviceID); + sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID); + sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID); RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); @@ -874,7 +873,11 @@ BOOLEAN found = FALSE; BOOLEAN MasterDev; BOOLEAN simplexOnly = FALSE; +#ifndef UNIATA_CORE +#ifdef UNIATA_INIT_ON_PROBE BOOLEAN skip_find_dev = FALSE; +#endif +#endif BOOLEAN AltInit = FALSE; SCSI_PHYSICAL_ADDRESS IoBasePort1; @@ -1712,7 +1715,7 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - PHW_CHANNEL chan = NULL; + //PHW_CHANNEL chan = NULL; // this buffer must be global for UNIATA_CORE build PCI_COMMON_CONFIG pciData; @@ -1743,8 +1746,8 @@ BOOLEAN found = FALSE; BOOLEAN MasterDev; BOOLEAN simplexOnly = FALSE; - BOOLEAN skip_find_dev = FALSE; - BOOLEAN AltInit = FALSE; + //BOOLEAN skip_find_dev = FALSE; + //BOOLEAN AltInit = FALSE; PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0 = NULL; @@ -1797,7 +1800,7 @@ &pciData, PCI_COMMON_HDR_LENGTH); - if (busDataRead < PCI_COMMON_HDR_LENGTH) { + if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { KdPrint2((PRINT_PREFIX "busDataRead < PCI_COMMON_HDR_LENGTH => SP_RETURN_ERROR\n")); goto exit_error; } @@ -2207,7 +2210,7 @@ PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan; PULONG adapterCount = (PULONG)Context; - PUCHAR ioSpace; + PUCHAR ioSpace = NULL; ULONG i; ULONG irq=0; ULONG portBase; @@ -2217,7 +2220,7 @@ BOOLEAN preConfig = FALSE; // PIDE_REGISTERS_1 BaseIoAddress1; - PIDE_REGISTERS_2 BaseIoAddress2; + PIDE_REGISTERS_2 BaseIoAddress2 = NULL; // The following table specifies the ports to be checked when searching for // an IDE controller. A zero entry terminates the search. Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -7,7 +7,7 @@ ) { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; - ULONG Channel = deviceExtension->Channel + lChannel; + //ULONG Channel = deviceExtension->Channel + lChannel; PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; SATA_SSTATUS_REG SStatus; ULONG i; @@ -126,7 +126,7 @@ { PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; - ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; SATA_SSTATUS_REG SStatus; SATA_SERROR_REG SError; Modified: trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/ntddk_ex.h [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -6,7 +6,8 @@ #define ASSERT #else #undef ASSERT -#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +//#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } +#define ASSERT(x) // FIXME: WTF! #endif //__REACTOS__ Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> +<module name="uniata" type="kernelmodedriver" installbase="system32/drivers" installname="uniata.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="uniata">.</include> <include base="uniata">inc</include> Added: trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff (added) +++ trunk/reactos/drivers/storage/ide/uniata/warningfixes.diff [iso-8859-1] Mon Dec 29 05:03:54 2008 @@ -1,0 +1,393 @@ +Index: atapi.h +=================================================================== +--- atapi.h (revision 38425) ++++ atapi.h (working copy) +@@ -138,6 +138,10 @@ + + #else // _DEBUG + ++#ifdef KdPrint ++#undef KdPrint ++#endif ++ + #define PRINT_PREFIX "UniATA: " + + //#define KdPrint3(_x_) {if(LOG_ON_RAISED_IRQL_W2K || MajorVersion < 0x05 || KeGetCurrentIrql() <= 2){/*DbgPrint("%x: ", PsGetCurrentThread()) ;*/ DbgPrint _x_ ; if(g_LogToDisplay){ PrintNtConsole _x_ ;} }} +Index: id_ata.cpp +=================================================================== +--- id_ata.cpp (revision 38425) ++++ id_ata.cpp (working copy) +@@ -1864,7 +1864,9 @@ + ULONG slotNumber = deviceExtension->slotNumber; + ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + ULONG VendorID = deviceExtension->DevID & 0xffff; ++#ifdef _DEBUG + ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; ++#endif + //ULONG RevID = deviceExtension->RevID; + ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + UCHAR tmp8; +Index: id_badblock.cpp +=================================================================== +--- id_badblock.cpp (revision 38425) ++++ id_badblock.cpp (working copy) +@@ -159,7 +159,11 @@ + L"UniATA\\Parameters\\BadBlocks", + QueryTable, 0, 0); + ++#ifdef _DEBUG + KdPrint(( "InitBadBlocks returned: %#x\n", status)); ++#else ++ UNREFERENCED_PARAMETER(status); ++#endif + } else { + + KdPrint(( "InitBadBlocks local\n")); +Index: id_dma.cpp +=================================================================== +--- id_dma.cpp (revision 38425) ++++ id_dma.cpp (working copy) +@@ -219,7 +219,7 @@ + PHW_CHANNEL chan = &(deviceExtension->chan[lChannel]); + PATA_REQ AtaReq = (PATA_REQ)(Srb->SrbExtension); + BOOLEAN use_DB_IO = FALSE; +- BOOLEAN use_AHCI = FALSE; ++ //BOOLEAN use_AHCI = FALSE; + ULONG orig_count = count; + ULONG max_entries = (deviceExtension->HwFlags & UNIATA_AHCI) ? ATA_AHCI_DMA_ENTRIES : ATA_DMA_ENTRIES; + +@@ -281,7 +281,7 @@ + if(!dma_count || ((LONG)(dma_base) == -1)) { + KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No 1st block\n" )); + //AtaReq->dma_base = NULL; +- AtaReq->ahci_base64 = NULL; ++ AtaReq->ahci_base64 = (ULONGLONG)NULL; + return FALSE; + } + +@@ -303,7 +303,7 @@ + if (i >= max_entries) { + KdPrint2((PRINT_PREFIX "too many segments in DMA table\n" )); + //AtaReq->dma_base = NULL; +- AtaReq->ahci_base64 = NULL; ++ AtaReq->ahci_base64 = (ULONGLONG)NULL; + return FALSE; + } + KdPrint2((PRINT_PREFIX " get Phys(data[n]=%x)\n", data )); +@@ -321,7 +321,7 @@ + } else + if(!dma_count || !dma_base || ((LONG)(dma_base) == -1)) { + //AtaReq->dma_base = NULL; +- AtaReq->ahci_base64 = NULL; ++ AtaReq->ahci_base64 = (ULONGLONG)NULL; + KdPrint2((PRINT_PREFIX "AtapiDmaSetup: No NEXT block\n" )); + return FALSE; + } +@@ -612,7 +612,7 @@ + } + + if((deviceExtension->HbaCtrlFlags & HBAFLAGS_DMA_DISABLED_LBA48) && +- (AtaReq->lba >= ATA_MAX_LBA28) && ++ (AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) && + (LunExt->TransferMode > ATA_PIO5) ) { + KdPrint2((PRINT_PREFIX + "AtapiDmaReinit: FORCE_DOWNRATE on Device %d for LBA48\n", ldev & 1)); +@@ -623,7 +623,7 @@ + if(AtaReq->Flags & REQ_FLAG_FORCE_DOWNRATE) { + KdPrint2((PRINT_PREFIX + "AtapiDmaReinit: FORCE_DOWNRATE on Device %d\n", ldev & 1)); +- if(AtaReq->lba >= ATA_MAX_LBA28) { ++ if(AtaReq->lba >= (LONGLONG)ATA_MAX_LBA28) { + limit_lba48: + LunExt->DeviceFlags |= REQ_FLAG_FORCE_DOWNRATE_LBA48; + limit_pio: +@@ -1046,7 +1046,7 @@ + /* set PIO mode timings */ + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); + if((apiomode >= 0) && (ChipType != VIA133)) { +- SetPciConfig1(reg-0x08, via_pio[apiomode]); ++ SetPciConfig1(reg-0x08, via_pio[(UCHAR)apiomode]); + } + via82c_timing(deviceExtension, dev, ATA_PIO0 + apiomode); + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); +@@ -1067,18 +1067,18 @@ + apiomode = 4; + for(i=udmamode; i>=0; i--) { + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_UDMA0 + i)) { +- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[udmamode]); ++ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_udmatiming[(UCHAR)udmamode]); + return; + } + } + for(i=wdmamode; i>=0; i--) { + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_WDMA0 + i)) { +- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[wdmamode]); ++ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_wdmatiming[(UCHAR)wdmamode]); + return; + } + } + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { +- AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[apiomode]); ++ AtapiWritePortEx4(chan, (ULONG)(&deviceExtension->BaseIoAddressBM_0), mode_reg, cyr_piotiming[(UCHAR)apiomode]); + return; + } + return; +@@ -1113,7 +1113,7 @@ + } + if(AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode)) { + ChangePciConfig4(0x44 + (dev * 8), a | 0x80000000); +- SetPciConfig4(0x40 + (dev * 8), nat_piotiming[apiomode]); ++ SetPciConfig4(0x40 + (dev * 8), nat_piotiming[(UCHAR)apiomode]); + return; + } + /* Use GENERIC PIO */ +@@ -1413,7 +1413,7 @@ + // 44 + GetPciConfig4(0x44, reg44); + reg44 = (reg44 & ~(0xff << bit_offset)) | +- (sw_dma_modes[wdmamode] << bit_offset); ++ (sw_dma_modes[(UCHAR)wdmamode] << bit_offset); + SetPciConfig4(0x44, reg44); + // 40 + GetPciConfig4(0x40, reg40); +@@ -1439,7 +1439,7 @@ + // 40 + GetPciConfig4(0x40, reg40); + reg40 = (reg40 & ~(0xff << bit_offset)) | +- (sw_pio_modes[apiomode] << bit_offset); ++ (sw_pio_modes[(UCHAR)apiomode] << bit_offset); + SetPciConfig4(0x40, reg40); + return; + break; } +@@ -1527,7 +1527,7 @@ + /* set PIO mode timings */ + AtaSetTransferMode(deviceExtension, DeviceNumber, lChannel, LunExt, ATA_PIO0 + apiomode); + +- SetPciConfig1(treg, cmd_pio_modes[apiomode]); ++ SetPciConfig1(treg, cmd_pio_modes[(UCHAR)apiomode]); + ChangePciConfig1(Channel ? 0x7b : 0x73, a & ~(!(DeviceNumber & 1) ? 0x35 : 0xca)); + return; + +@@ -1538,7 +1538,7 @@ + /*******/ + /* SiS */ + /*******/ +- PULONG sis_modes; ++ PULONG sis_modes = NULL; + static const ULONG sis_modes_new133[] = + { 0x28269008, 0x0c266008, 0x04263008, 0x0c0a3008, 0x05093008, + 0x22196008, 0x0c0a3008, 0x05093008, 0x050939fc, 0x050936ac, +@@ -1553,9 +1553,9 @@ + { 0x00cb, 0x0067, 0x0044, 0x0033, 0x0031, 0x0044, 0x0033, 0x0031, + 0x8b31, 0x8731, 0x8531, 0x8431, 0x8231, 0x8131 }; + +- ULONG reg; ++ ULONG reg = 0; + UCHAR reg57; +- ULONG reg_size; ++ ULONG reg_size = 0; + ULONG offs; + + switch(ChipType) { +@@ -1901,7 +1901,7 @@ + ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + +- ULONG timing; ++ ULONG timing = 0; + + if(mode == ATA_PIO5) + mode = ATA_PIO4; +Index: id_init.cpp +=================================================================== +--- id_init.cpp (revision 38425) ++++ id_init.cpp (working copy) +@@ -52,11 +52,11 @@ + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +- ULONG slotNumber = deviceExtension->slotNumber; +- ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; ++ //ULONG slotNumber = deviceExtension->slotNumber; ++ //ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + ULONG VendorID = deviceExtension->DevID & 0xffff; +- ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; +- ULONG RevID = deviceExtension->RevID; ++ //ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; ++ //ULONG RevID = deviceExtension->RevID; + ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + ULONG ChipFlags= deviceExtension->HwFlags & CHIPFLAG_MASK; + +@@ -216,7 +216,7 @@ + PCI_DEV_HW_SPEC_BM( 0730, 1039, 0x00, ATA_UDMA5, "SiS 730" , SIS100OLD ), + + PCI_DEV_HW_SPEC_BM( 0646, 1039, 0x00, ATA_UDMA6, "SiS 645DX", SIS133NEW ), +-/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ), ++/* PCI_DEV_HW_SPEC_BM( 0645, 1039, 0x00, ATA_UDMA6, "SiS 645" , SIS133NEW ),*/ + /* PCI_DEV_HW_SPEC_BM( 0640, 1039, 0x00, ATA_UDMA4, "SiS 640" , SIS_SOUTH ),*/ + PCI_DEV_HW_SPEC_BM( 0635, 1039, 0x00, ATA_UDMA5, "SiS 635" , SIS100NEW ), + PCI_DEV_HW_SPEC_BM( 0633, 1039, 0x00, ATA_UDMA5, "SiS 633" , SIS100NEW ), +@@ -419,7 +419,7 @@ + BaseIoAddressBM = AtapiGetIoRange(HwDeviceExtension, ConfigInfo, pciData, SystemIoBusNumber, + 4, 0, deviceExtension->NumberChannels*sizeof(IDE_BUSMASTER_REGISTERS)); + for(c=0; c<deviceExtension->NumberChannels; c++) { +- ULONG unit01 = (c & 1); ++ //ULONG unit01 = (c & 1); + ULONG unit10 = (c & 2); + chan = &deviceExtension->chan[c]; + +@@ -987,7 +987,7 @@ + IN ULONG slotNumber + ) + { +- PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; ++ //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PCI_COMMON_CONFIG pciData; + ULONG funcNumber; + ULONG busDataRead; +@@ -1039,7 +1039,7 @@ + IN ULONG c + ) + { +- PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; ++ //PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PCI_COMMON_CONFIG pciData; + ULONG funcNumber; + ULONG busDataRead; +@@ -1174,7 +1174,7 @@ + ULONG slotNumber = deviceExtension->slotNumber; + ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + +- ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; ++ //ULONG ChipType = deviceExtension->HwFlags & CHIPTYPE_MASK; + PHW_CHANNEL chan; + ULONG c; // logical channel (for Compatible Mode controllers) + UCHAR tmp8; +@@ -1332,7 +1332,9 @@ + ULONG slotNumber = deviceExtension->slotNumber; + ULONG SystemIoBusNumber = deviceExtension->SystemIoBusNumber; + ULONG VendorID = deviceExtension->DevID & 0xffff; ++#ifdef _DEBUG + ULONG DeviceID = (deviceExtension->DevID >> 16) & 0xffff; ++#endif + ULONG RevID = deviceExtension->RevID; + // ULONG i; + // BUSMASTER_CONTROLLER_INFORMATION* DevTypeInfo; +Index: id_probe.cpp +=================================================================== +--- id_probe.cpp (revision 38425) ++++ id_probe.cpp (working copy) +@@ -76,7 +76,6 @@ + VOID + AtapiDoNothing(VOID) + { +- ULONG i = 0; + return; + } // end AtapiDoNothing() + +@@ -504,8 +503,8 @@ + /* if(known) { + RtlCopyMemory(newBMListPtr, (PVOID)&(BusMasterAdapters[i]), sizeof(BUSMASTER_CONTROLLER_INFORMATION)); + } else {*/ +- sprintf((PCHAR)vendorStrPtr, "%4.4x", VendorID); +- sprintf((PCHAR)deviceStrPtr, "%4.4x", DeviceID); ++ sprintf((PCHAR)vendorStrPtr, "%4.4x", (UINT32)VendorID); ++ sprintf((PCHAR)deviceStrPtr, "%4.4x", (UINT32)DeviceID); + + RtlCopyMemory(&(newBMListPtr->VendorIdStr), (PCHAR)vendorStrPtr, 4); + RtlCopyMemory(&(newBMListPtr->DeviceIdStr), (PCHAR)deviceStrPtr, 4); +@@ -874,7 +873,11 @@ + BOOLEAN found = FALSE; + BOOLEAN MasterDev; + BOOLEAN simplexOnly = FALSE; ++#ifndef UNIATA_CORE ++#ifdef UNIATA_INIT_ON_PROBE + BOOLEAN skip_find_dev = FALSE; ++#endif ++#endif + BOOLEAN AltInit = FALSE; + + SCSI_PHYSICAL_ADDRESS IoBasePort1; +@@ -1712,7 +1715,7 @@ + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +- PHW_CHANNEL chan = NULL; ++ //PHW_CHANNEL chan = NULL; + // this buffer must be global for UNIATA_CORE build + PCI_COMMON_CONFIG pciData; + +@@ -1743,8 +1746,8 @@ + BOOLEAN found = FALSE; + BOOLEAN MasterDev; + BOOLEAN simplexOnly = FALSE; +- BOOLEAN skip_find_dev = FALSE; +- BOOLEAN AltInit = FALSE; ++ //BOOLEAN skip_find_dev = FALSE; ++ //BOOLEAN AltInit = FALSE; + + PIDE_BUSMASTER_REGISTERS BaseIoAddressBM_0 = NULL; + +@@ -1797,7 +1800,7 @@ + &pciData, + PCI_COMMON_HDR_LENGTH); + +- if (busDataRead < PCI_COMMON_HDR_LENGTH) { ++ if (busDataRead < (ULONG)PCI_COMMON_HDR_LENGTH) { + KdPrint2((PRINT_PREFIX "busDataRead < PCI_COMMON_HDR_LENGTH => SP_RETURN_ERROR\n")); + goto exit_error; + } +@@ -2207,7 +2210,7 @@ + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PHW_CHANNEL chan; + PULONG adapterCount = (PULONG)Context; +- PUCHAR ioSpace; ++ PUCHAR ioSpace = NULL; + ULONG i; + ULONG irq=0; + ULONG portBase; +@@ -2217,7 +2220,7 @@ + BOOLEAN preConfig = FALSE; + // + PIDE_REGISTERS_1 BaseIoAddress1; +- PIDE_REGISTERS_2 BaseIoAddress2; ++ PIDE_REGISTERS_2 BaseIoAddress2 = NULL; + + // The following table specifies the ports to be checked when searching for + // an IDE controller. A zero entry terminates the search. +Index: id_sata.cpp +=================================================================== +--- id_sata.cpp (revision 38425) ++++ id_sata.cpp (working copy) +@@ -7,7 +7,7 @@ + ) + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; +- ULONG Channel = deviceExtension->Channel + lChannel; ++ //ULONG Channel = deviceExtension->Channel + lChannel; + PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; + SATA_SSTATUS_REG SStatus; + ULONG i; +@@ -126,7 +126,7 @@ + { + PHW_DEVICE_EXTENSION deviceExtension = (PHW_DEVICE_EXTENSION)HwDeviceExtension; + PHW_CHANNEL chan = &deviceExtension->chan[lChannel]; +- ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; ++ //ULONG ChipFlags = deviceExtension->HwFlags & CHIPFLAG_MASK; + SATA_SSTATUS_REG SStatus; + SATA_SERROR_REG SError; + +Index: ntddk_ex.h +=================================================================== +--- ntddk_ex.h (revision 38425) ++++ ntddk_ex.h (working copy) +@@ -6,7 +6,8 @@ + #define ASSERT + #else + #undef ASSERT +-#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } ++//#define ASSERT //(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } ++#define ASSERT(x) // FIXME: WTF! + #endif //__REACTOS__ + +
15 years, 12 months
1
0
0
0
[cwittich] 38451: fix copy and paste error
by cwittich@svn.reactos.org
Author: cwittich Date: Mon Dec 29 04:30:50 2008 New Revision: 38451 URL:
http://svn.reactos.org/svn/reactos?rev=38451&view=rev
Log: fix copy and paste error Modified: trunk/rostests/winetests/crypt32/testlist.c Modified: trunk/rostests/winetests/crypt32/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/testlis…
============================================================================== --- trunk/rostests/winetests/crypt32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/testlist.c [iso-8859-1] Mon Dec 29 04:30:50 2008 @@ -24,7 +24,7 @@ const struct test winetest_testlist[] = { - { "asn", func_base64 }, + { "base64", func_base64 }, { "cert", func_cert }, { "chain", func_chain }, { "crl", func_crl },
15 years, 12 months
1
0
0
0
[cwittich] 38450: add crypt32_winetest to bootcd
by cwittich@svn.reactos.org
Author: cwittich Date: Mon Dec 29 04:11:32 2008 New Revision: 38450 URL:
http://svn.reactos.org/svn/reactos?rev=38450&view=rev
Log: add crypt32_winetest to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff 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] Mon Dec 29 04:11:32 2008 @@ -625,6 +625,7 @@ modules\rostests\winetests\comcat\comcat_winetest.exe 7 optional modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional modules\rostests\winetests\comdlg32\comdlg32_winetest.exe 7 optional +modules\rostests\winetests\crypt32\crypt32_winetest.exe 7 optional modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional
15 years, 12 months
1
0
0
0
[cwittich] 38449: add crypt32 winetest from wine 1.1.11
by cwittich@svn.reactos.org
Author: cwittich Date: Mon Dec 29 04:10:25 2008 New Revision: 38449 URL:
http://svn.reactos.org/svn/reactos?rev=38449&view=rev
Log: add crypt32 winetest from wine 1.1.11 Added: trunk/rostests/winetests/crypt32/ (with props) trunk/rostests/winetests/crypt32/base64.c (with props) trunk/rostests/winetests/crypt32/cert.c (with props) trunk/rostests/winetests/crypt32/chain.c (with props) trunk/rostests/winetests/crypt32/crl.c (with props) trunk/rostests/winetests/crypt32/crypt32.rbuild (with props) trunk/rostests/winetests/crypt32/ctl.c (with props) trunk/rostests/winetests/crypt32/encode.c (with props) trunk/rostests/winetests/crypt32/main.c (with props) trunk/rostests/winetests/crypt32/message.c (with props) trunk/rostests/winetests/crypt32/msg.c (with props) trunk/rostests/winetests/crypt32/object.c (with props) trunk/rostests/winetests/crypt32/oid.c (with props) trunk/rostests/winetests/crypt32/protectdata.c (with props) trunk/rostests/winetests/crypt32/sip.c (with props) trunk/rostests/winetests/crypt32/store.c (with props) trunk/rostests/winetests/crypt32/str.c (with props) trunk/rostests/winetests/crypt32/testlist.c (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/crypt32/base64.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/base64.…
Added: trunk/rostests/winetests/crypt32/cert.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/cert.c?…
Added: trunk/rostests/winetests/crypt32/chain.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/chain.c…
Added: trunk/rostests/winetests/crypt32/crl.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/crl.c?r…
Added: trunk/rostests/winetests/crypt32/crypt32.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/crypt32…
Added: trunk/rostests/winetests/crypt32/ctl.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/ctl.c?r…
Added: trunk/rostests/winetests/crypt32/encode.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.…
Added: trunk/rostests/winetests/crypt32/main.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/main.c?…
Added: trunk/rostests/winetests/crypt32/message.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/message…
Added: trunk/rostests/winetests/crypt32/msg.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/msg.c?r…
Added: trunk/rostests/winetests/crypt32/object.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/object.…
Added: trunk/rostests/winetests/crypt32/oid.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/oid.c?r…
Added: trunk/rostests/winetests/crypt32/protectdata.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/protect…
Added: trunk/rostests/winetests/crypt32/sip.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/sip.c?r…
Added: trunk/rostests/winetests/crypt32/store.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/store.c…
Added: trunk/rostests/winetests/crypt32/str.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/str.c?r…
Added: trunk/rostests/winetests/crypt32/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/testlis…
Modified: trunk/rostests/winetests/directory.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil…
15 years, 12 months
1
0
0
0
[cwittich] 38448: add wintrust_winetest to bootcd
by cwittich@svn.reactos.org
Author: cwittich Date: Mon Dec 29 03:58:56 2008 New Revision: 38448 URL:
http://svn.reactos.org/svn/reactos?rev=38448&view=rev
Log: add wintrust_winetest to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff 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] Mon Dec 29 03:58:56 2008 @@ -662,6 +662,7 @@ modules\rostests\winetests\version\version_winetest.exe 7 optional modules\rostests\winetests\winhttp\winhttp_winetest.exe 7 optional modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional +modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional modules\wallpaper\lake.bmp 4 optional ; Native libraries
15 years, 12 months
1
0
0
0
[cwittich] 38447: add wintrust winetest from wine 1.1.11
by cwittich@svn.reactos.org
Author: cwittich Date: Mon Dec 29 03:53:21 2008 New Revision: 38447 URL:
http://svn.reactos.org/svn/reactos?rev=38447&view=rev
Log: add wintrust winetest from wine 1.1.11 Added: trunk/rostests/winetests/wintrust/ (with props) trunk/rostests/winetests/wintrust/asn.c (with props) trunk/rostests/winetests/wintrust/crypt.c (with props) trunk/rostests/winetests/wintrust/register.c (with props) trunk/rostests/winetests/wintrust/softpub.c (with props) trunk/rostests/winetests/wintrust/testlist.c (with props) trunk/rostests/winetests/wintrust/wintrust.rbuild (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil…
Added: trunk/rostests/winetests/wintrust/asn.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/asn.c?…
Added: trunk/rostests/winetests/wintrust/crypt.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.…
Added: trunk/rostests/winetests/wintrust/register.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/regist…
Added: trunk/rostests/winetests/wintrust/softpub.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpu…
Added: trunk/rostests/winetests/wintrust/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/testli…
Added: trunk/rostests/winetests/wintrust/wintrust.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/wintru…
15 years, 12 months
1
0
0
0
[cwittich] 38446: add jscript_winetest to bootcd
by cwittich@svn.reactos.org
Author: cwittich Date: Mon Dec 29 03:44:03 2008 New Revision: 38446 URL:
http://svn.reactos.org/svn/reactos?rev=38446&view=rev
Log: add jscript_winetest to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff 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] Mon Dec 29 03:44:03 2008 @@ -629,6 +629,7 @@ modules\rostests\winetests\gdiplus\gdiplus_winetest.exe 7 optional modules\rostests\winetests\hlink\hlink_winetest.exe 7 optional modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional +modules\rostests\winetests\jscript\jscript_winetest.exe 7 optional modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional modules\rostests\winetests\mapi32\mapi32_winetest.exe 7 optional
15 years, 12 months
1
0
0
0
[cwittich] 38445: add jscript winetest from wine 1.1.11
by cwittich@svn.reactos.org
Author: cwittich Date: Mon Dec 29 03:41:56 2008 New Revision: 38445 URL:
http://svn.reactos.org/svn/reactos?rev=38445&view=rev
Log: add jscript winetest from wine 1.1.11 Added: trunk/rostests/winetests/jscript/ (with props) trunk/rostests/winetests/jscript/api.js (with props) trunk/rostests/winetests/jscript/jscript.c (with props) trunk/rostests/winetests/jscript/jscript.rbuild (with props) trunk/rostests/winetests/jscript/lang.js (with props) trunk/rostests/winetests/jscript/regexp.js (with props) trunk/rostests/winetests/jscript/rsrc.rc (with props) trunk/rostests/winetests/jscript/run.c (with props) trunk/rostests/winetests/jscript/testlist.c (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil…
Added: trunk/rostests/winetests/jscript/api.js URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/api.js?…
Added: trunk/rostests/winetests/jscript/jscript.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/jscript…
Added: trunk/rostests/winetests/jscript/jscript.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/jscript…
Added: trunk/rostests/winetests/jscript/lang.js URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/lang.js…
Added: trunk/rostests/winetests/jscript/regexp.js URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/regexp.…
Added: trunk/rostests/winetests/jscript/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/rsrc.rc…
Added: trunk/rostests/winetests/jscript/run.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/run.c?r…
Added: trunk/rostests/winetests/jscript/testlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/testlis…
15 years, 12 months
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200