Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[hpoussin] 17981: Fix IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs for root USB hubs.
by hpoussin＠svn.reactos.com 22 Sep '05

22 Sep '05

Fix IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs for root USB hubs. The vendor and device IDs are not filled in Cromwell code, so ask directly the PCI device to retrieve the information Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c _____ Modified: trunk/reactos/drivers/usb/miniport/common/pdo.c --- trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-22 09:17:17 UTC (rev 17980) +++ trunk/reactos/drivers/usb/miniport/common/pdo.c 2005-09-22 11:20:52 UTC (rev 17981) @@ -104,18 +104,55 @@ { CHAR Buffer[2][40]; PCHAR RootHubName; - USHORT Vendor, Product, Revision; + PCI_COMMON_CONFIG PciData; + ULONG BusNumber, SlotNumber; + ULONG ret; + PDEVICE_OBJECT Pdo; DPRINT("USBMP: IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); - Vendor = DeviceExtension->pdev->vendor; - Product = DeviceExtension->pdev->device; - Revision = 0; /* FIXME */ + Pdo = DeviceExtension->PhysicalDeviceObject; + Status = IoGetDeviceProperty( + Pdo, + DevicePropertyBusNumber, + sizeof(ULONG), + &BusNumber, + &ret); + if (!NT_SUCCESS(Status)) + { + DPRINT("USBMP: IoGetDeviceProperty() failed with status 0x%08lx\n", Status); + break; + } + Status = IoGetDeviceProperty( + Pdo, + DevicePropertyAddress, + sizeof(ULONG), + &SlotNumber, + &ret); + if (!NT_SUCCESS(Status)) + { + DPRINT("USBMP: IoGetDeviceProperty() failed with status 0x%08lx\n", Status); + break; + } + + ret = HalGetBusDataByOffset(PCIConfiguration, + BusNumber, + SlotNumber, + &PciData, + 0, + PCI_COMMON_HDR_LENGTH); + if (ret != PCI_COMMON_HDR_LENGTH) + { + DPRINT("USBMP: HalGetBusDataByOffset() failed (ret = %ld)\n", ret); + Status = STATUS_IO_DEVICE_ERROR; + break; + } + sprintf(Buffer[0], "USB\\VID%04X&PID%04X&REV%04X", - Vendor, Product, Revision); + PciData.VendorID, PciData.DeviceID, PciData.RevisionID); sprintf(Buffer[1], "USB\\VID%04X&PID%04X", - Vendor, Product); + PciData.VendorID, PciData.DeviceID); if (roothub->speed == USB_SPEED_LOW || roothub->speed == USB_SPEED_FULL) RootHubName = "USB\\ROOT_HUB"; /* USB 1.1 */ else

1 0

[hpoussin] 17980: Fix IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation for USB devices
by hpoussin＠svn.reactos.com 22 Sep '05

22 Sep '05

Fix IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation for USB devices I was mis-using usb_get_string() method... Modified: trunk/reactos/drivers/usb/usbhub/pdo.c _____ Modified: trunk/reactos/drivers/usb/usbhub/pdo.c --- trunk/reactos/drivers/usb/usbhub/pdo.c 2005-09-22 07:24:08 UTC (rev 17979) +++ trunk/reactos/drivers/usb/usbhub/pdo.c 2005-09-22 09:17:17 UTC (rev 17980) @@ -156,30 +156,47 @@ }*/ case DeviceTextLocationInformation: { - int size; - char *buf; + unsigned short size; + int ret; + PWCHAR buf; + PWCHAR bufret; DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_TEXT / DeviceTextLocationInformation\n"); if (!DeviceExtension->dev->descriptor.iProduct) return STATUS_NOT_SUPPORTED; - size = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, NULL, 0); - if (size < 2) + ret = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, &size, sizeof(size)); + if (ret < 2) { - DPRINT("Usbhub: usb_get_string() failed\n"); + DPRINT("Usbhub: usb_get_string() failed with error %d\n", ret); return STATUS_IO_DEVICE_ERROR; } + size &= 0xff; buf = ExAllocatePool(PagedPool, size); if (buf == NULL) + { + DPRINT("Usbhub: ExAllocatePool() failed\n"); return STATUS_INSUFFICIENT_RESOURCES; - size = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, buf, size); - if (size < 0) + } + ret = usb_get_string(DeviceExtension->dev, LocaleId, DeviceExtension->dev->descriptor.iProduct, buf, size); + if (ret < 0) { - DPRINT("Usbhub: usb_get_string() failed\n"); + DPRINT("Usbhub: usb_get_string() failed with error %d\n", ret); ExFreePool(buf); return STATUS_IO_DEVICE_ERROR; } - *Information = (ULONG_PTR)buf; + bufret = ExAllocatePool(PagedPool, size - 2 /* size of length identifier */ + 2 /* final NULL */); + if (bufret == NULL) + { + DPRINT("Usbhub: ExAllocatePool() failed\n"); + ExFreePool(buf); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(bufret, &buf[1], size - 2); + bufret[(size - 1) / sizeof(WCHAR)] = 0; + *Information = (ULONG_PTR)bufret; + ExFreePool(buf); return STATUS_SUCCESS; } default:

1 0

[gvg] 17979: Slicencium <silencium@wanadoo.es>:
by gvg＠svn.reactos.com 22 Sep '05

22 Sep '05

Slicencium <silencium(a)wanadoo.es>: Fix precision bug (bug 775) Modified: trunk/reactos/subsys/system/calc/winecalc.h _____ Modified: trunk/reactos/subsys/system/calc/winecalc.h --- trunk/reactos/subsys/system/calc/winecalc.h 2005-09-21 23:56:52 UTC (rev 17978) +++ trunk/reactos/subsys/system/calc/winecalc.h 2005-09-22 07:24:08 UTC (rev 17979) @@ -23,8 +23,8 @@ // numerics are defined here for easier porting typedef double calcfloat; -#define FMT_DESC_FLOAT TEXT("%.32g") -#define FMT_DESC_EXP TEXT("%.32e") +#define FMT_DESC_FLOAT TEXT("%g") +#define FMT_DESC_EXP TEXT("%e") #define CALC_ATOF(x) atof(x)

1 0

[weiden] 17978: fixed some handle leaks in RegDeleteTree() in some failure cases
by weiden＠svn.reactos.com 21 Sep '05

21 Sep '05

fixed some handle leaks in RegDeleteTree() in some failure cases Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-09-21 22:55:37 UTC (rev 17977) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-09-21 23:56:52 UTC (rev 17978) @@ -991,8 +991,7 @@ static NTSTATUS -RegpDeleteTree(IN HKEY hKey, - OUT PBOOLEAN KeysDeleted) +RegpDeleteTree(IN HKEY hKey) { typedef struct { @@ -1009,8 +1008,6 @@ NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status2 = STATUS_SUCCESS; - *KeysDeleted = FALSE; - InitializeListHead(&delQueueHead); ProcessHeap = RtlGetProcessHeap(); @@ -1147,10 +1144,22 @@ /* NOTE: do NOT close the handle anymore, it's invalid already! */ - if (!NT_SUCCESS(Status2) && NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status2)) { - /* don't break, let's try to delete as many keys as possible */ - Status = Status2; + /* close the key handle so we don't leak handles for keys we were + unable to delete. But only do this for handles not supplied + by the caller! */ + + if (delKeys->KeyHandle != hKey) + { + NtClose(delKeys->KeyHandle); + } + + if (!NT_SUCCESS(Status)) + { + /* don't break, let's try to delete as many keys as possible */ + Status = Status2; + } } /* remove the entry from the list */ @@ -1160,8 +1169,6 @@ 0, delKeys); } while (!IsListEmpty(&delQueueHead)); - - *KeysDeleted = TRUE; } else Status = STATUS_INSUFFICIENT_RESOURCES; @@ -1179,7 +1186,6 @@ RegDeleteTreeW(IN HKEY hKey, IN LPCWSTR lpSubKey OPTIONAL) { - BOOLEAN KeysDeleted; HANDLE KeyHandle, CurKey, SubKeyHandle = NULL; NTSTATUS Status; @@ -1217,12 +1223,22 @@ else CurKey = KeyHandle; - Status = RegpDeleteTree(CurKey, - &KeysDeleted); + Status = RegpDeleteTree(CurKey); - if (!KeysDeleted) + if (NT_SUCCESS(Status)) { - /* only close handles of keys that weren't deleted! */ + /* make sure we only close hKey (KeyHandle) when the caller specified a + subkey, because the handle would be invalid already! */ + if (CurKey != KeyHandle) + { + CloseDefaultKey(KeyHandle); + } + + return ERROR_SUCCESS; + } + else + { + /* make sure we close all handles we created! */ if (SubKeyHandle != NULL) { NtClose(SubKeyHandle); @@ -1230,14 +1246,9 @@ Cleanup: CloseDefaultKey(KeyHandle); - } - - if (!NT_SUCCESS(Status)) - { + return RtlNtStatusToDosError(Status); } - - return ERROR_SUCCESS; }

1 0

[gvg] 17977: brbak <mpd000@yahoo.de>:
by gvg＠svn.reactos.com 21 Sep '05

21 Sep '05

brbak <mpd000(a)yahoo.de>: Reset on new calculation. Patch from bug 775. Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-09-21 22:48:52 UTC (rev 17976) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-09-21 22:55:37 UTC (rev 17977) @@ -3261,6 +3261,7 @@ calc.next = 1; calc.buffer[0] = TEXT('\0'); calc.value = 0; + calc.init = 1; break; case TEXT('0'):

1 0

[gvg] 17976: brbak <mpd000@yahoo.de>:
by gvg＠svn.reactos.com 21 Sep '05

21 Sep '05

brbak <mpd000(a)yahoo.de>: fixes repositioning of text (from bug 749) Modified: trunk/reactos/lib/user32/controls/edit.c _____ Modified: trunk/reactos/lib/user32/controls/edit.c --- trunk/reactos/lib/user32/controls/edit.c 2005-09-21 22:16:17 UTC (rev 17975) +++ trunk/reactos/lib/user32/controls/edit.c 2005-09-21 22:48:52 UTC (rev 17976) @@ -2919,7 +2919,7 @@ dx = es->text_width - x_offset_in_pixels; nyoff = max(0, es->y_offset + dy); if (nyoff >= es->line_count - lines_per_page) - nyoff = es->line_count - lines_per_page; + nyoff = max(0,es->line_count - lines_per_page); dy = (es->y_offset - nyoff) * es->line_height; if (dx || dy) { RECT rc1;

1 0

[hbirr] 17975: - Do only create a registry entry for partitions if the signature of the disk is non zero.
by hbirr＠svn.reactos.com 21 Sep '05

21 Sep '05

- Do only create a registry entry for partitions if the signature of the disk is non zero. - Do only mount partitions from a registry key if the signature is non zero. - Do delete all registry keys for non existing partitions. Modified: trunk/reactos/ntoskrnl/io/disk.c _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-09-21 21:54:52 UTC (rev 17974) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-09-21 22:16:17 UTC (rev 17975) @@ -377,7 +377,7 @@ } -static VOID +static BOOLEAN HalpAssignDrive(IN PUNICODE_STRING PartitionName, IN ULONG DriveNumber, IN UCHAR DriveType, @@ -399,7 +399,7 @@ if ((ObSystemDeviceMap->DriveMap & (1 << DriveNumber)) != 0) { DbgPrint("Drive letter already used!\n"); - return; + return FALSE; } } else @@ -419,7 +419,7 @@ if (DriveNumber == AUTO_DRIVE) { DbgPrint("No drive letter available!\n"); - return; + return FALSE; } } @@ -444,7 +444,9 @@ Status = IoCreateSymbolicLink(&DriveName, PartitionName); - if (DriveType == DOSDEVICE_DRIVE_FIXED && hKey) + if (hKey && + DriveType == DOSDEVICE_DRIVE_FIXED && + Signature) { DiskMountInfo.Signature = Signature; DiskMountInfo.StartingOffset = StartingOffset; @@ -462,6 +464,7 @@ DPRINT1("ZwCreateValueKey failed for %wZ, status=%x\n", &DriveName, Status); } } + return TRUE; } ULONG @@ -806,41 +809,50 @@ { DPRINT("%wZ => %08x:%08x%08x\n", &UnicodeString1, DiskMountInfo->Signature, DiskMountInfo->StartingOffset.u.HighPart, DiskMountInfo->StartingOffset.u.LowPart); - for (i = 0; i < ConfigInfo->DiskCount; i++) { - DPRINT("%x\n", LayoutArray[i]->Signature); - if (LayoutArray[i] && - LayoutArray[i]->Signature == DiskMountInfo->Signature) + BOOLEAN Found = FALSE; + for (i = 0; i < ConfigInfo->DiskCount; i++) { - for (j = 0; j < LayoutArray[i]->PartitionCount; j++) + DPRINT("%x\n", LayoutArray[i]->Signature); + if (LayoutArray[i] && + LayoutArray[i]->Signature && + LayoutArray[i]->Signature == DiskMountInfo->Signature) { - if (LayoutArray[i]->PartitionEntry[j].StartingOffset.QuadPart == DiskMountInfo->StartingOffset.QuadPart) + for (j = 0; j < LayoutArray[i]->PartitionCount; j++) { - if (IsRecognizedPartition(LayoutArray[i]->PartitionEntry[j].PartitionType)) + if (LayoutArray[i]->PartitionEntry[j].StartingOffset.QuadPart == DiskMountInfo->StartingOffset.QuadPart) { - swprintf(Buffer2, - L"\\Device\\Harddisk%d\\Partition%d", - i, - LayoutArray[i]->PartitionEntry[j].PartitionNumber); - RtlInitUnicodeString(&UnicodeString2, - Buffer2); + if (IsRecognizedPartition(LayoutArray[i]->PartitionEntry[j].PartitionType) && + LayoutArray[i]->PartitionEntry[j].RewritePartition == FALSE) + { + swprintf(Buffer2, + L"\\Device\\Harddisk%d\\Partition%d", + i, + LayoutArray[i]->PartitionEntry[j].PartitionNumber); + RtlInitUnicodeString(&UnicodeString2, + Buffer2); - /* Assign drive */ - DPRINT(" %wZ\n", &UnicodeString2); - HalpAssignDrive(&UnicodeString2, - k, - DOSDEVICE_DRIVE_FIXED, - DiskMountInfo->Signature, - DiskMountInfo->StartingOffset, - NULL); - /* Mark the partition as assigned */ - LayoutArray[i]->PartitionEntry[j].RewritePartition = TRUE; + /* Assign drive */ + DPRINT(" %wZ\n", &UnicodeString2); + Found = HalpAssignDrive(&UnicodeString2, + k, + DOSDEVICE_DRIVE_FIXED, + DiskMountInfo->Signature, + DiskMountInfo->StartingOffset, + NULL); + /* Mark the partition as assigned */ + LayoutArray[i]->PartitionEntry[j].RewritePartition = TRUE; + } + break; } - break; } } - break; } + if (Found == FALSE) + { + /* We didn't find a partition for this entry, remove them. */ + Status = ZwDeleteValueKey(hKey, &UnicodeString1); + } } } } @@ -871,7 +883,7 @@ Buffer2); /* Assign drive */ - DPRINT1(" %wZ\n", &UnicodeString2); + DPRINT(" %wZ\n", &UnicodeString2); HalpAssignDrive(&UnicodeString2, AUTO_DRIVE, DOSDEVICE_DRIVE_FIXED,

1 0

[mf] 17974: - use size_t for buffer/string lengths instead of int
by mf＠svn.reactos.com 21 Sep '05

21 Sep '05

- use size_t for buffer/string lengths instead of int - define COUNTOF if not defined already Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-09-21 21:44:39 UTC (rev 17973) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-09-21 21:54:52 UTC (rev 17974) @@ -97,6 +97,10 @@ #define XS_vsnprintf _vsntprintf #endif +#ifndef COUNTOF +#define COUNTOF(b) (sizeof(b)/sizeof(b[0])) +#endif + #if defined(_STRING_DEFINED) && !defined(XS_STRING_UTF8) #define XS_String String @@ -121,46 +125,46 @@ XS_String() {} XS_String(LPCXSSTR s) {if (s) super::assign(s);} - XS_String(LPCXSSTR s, int l) : super(s, l) {} + XS_String(LPCXSSTR s, size_t l) : super(s, l) {} XS_String(const super& other) : super(other) {} XS_String(const XS_String& other) : super(other) {} #if defined(UNICODE) && !defined(XS_STRING_UTF8) XS_String(LPCSTR s) {assign(s);} - XS_String(LPCSTR s, int l) {assign(s, l);} + XS_String(LPCSTR s, size_t l) {assign(s, l);} XS_String(const std::string& other) {assign(other.c_str());} XS_String& operator=(LPCSTR s) {assign(s); return *this;} - void assign(LPCSTR s) {if (s) {int bl=strlen(s); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, bl, b, bl));} else erase();} - void assign(LPCSTR s, int l) {if (s) {int bl=l; LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, l, b, bl));} else erase();} + void assign(LPCSTR s) {if (s) {size_t bl=strlen(s); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, bl, b, bl));} else erase();} + void assign(LPCSTR s, size_t l) {if (s) {size_t bl=l; LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, l, b, bl));} else erase();} #else XS_String(LPCWSTR s) {assign(s);} - XS_String(LPCWSTR s, int l) {assign(s, l);} + XS_String(LPCWSTR s, size_t l) {assign(s, l);} XS_String(const std::wstring& other) {assign(other.c_str());} XS_String& operator=(LPCWSTR s) {assign(s); return *this;} #ifdef XS_STRING_UTF8 void assign(const XS_String& s) {assign(s.c_str());} - void assign(LPCWSTR s) {if (s) {int bl=2*wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, bl, b, bl, 0, 0));} else erase();} - void assign(LPCWSTR s, int l) {int bl=2*l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, l, b, bl, 0, 0));} else erase();} + void assign(LPCWSTR s) {if (s) {size_t bl=wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, (int)bl, b, (int)bl, 0, 0));} else erase();} + void assign(LPCWSTR s, size_t l) {size_t bl=l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, (int)l, b, (int)bl, 0, 0));} else erase();} #else // if !UNICODE && !XS_STRING_UTF8 - void assign(LPCWSTR s) {if (s) {int bl=wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, bl, b, bl, 0, 0));} else erase();} - void assign(LPCWSTR s, int l) {int bl=l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, l, b, bl, 0, 0));} else erase();} + void assign(LPCWSTR s) {if (s) {size_t bl=wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, (int)bl, b, (int)bl, 0, 0));} else erase();} + void assign(LPCWSTR s, size_t l) {size_t bl=l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, (int)l, b, (int)bl, 0, 0));} else erase();} #endif #endif XS_String& operator=(LPCXSSTR s) {if (s) super::assign(s); else erase(); return *this;} XS_String& operator=(const super& s) {super::assign(s); return *this;} void assign(LPCXSSTR s) {super::assign(s);} - void assign(LPCXSSTR s, int l) {super::assign(s, l);} + void assign(LPCXSSTR s, size_t l) {super::assign(s, l);} operator LPCXSSTR() const {return c_str();} #ifdef XS_STRING_UTF8 - operator std::wstring() const {int bl=length(); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); return std::wstring(b, MultiByteToWideChar(CP_UTF8, 0, c_str(), bl, b, bl));} + operator std::wstring() const {size_t bl=length(); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); return std::wstring(b, MultiByteToWideChar(CP_UTF8, 0, c_str(), bl, b, bl));} #elif defined(UNICODE) - operator std::string() const {int bl=length(); LPSTR b=(LPSTR)alloca(bl); return std::string(b, WideCharToMultiByte(CP_ACP, 0, c_str(), bl, b, bl, 0, 0));} + operator std::string() const {size_t bl=length(); LPSTR b=(LPSTR)alloca(bl); return std::string(b, WideCharToMultiByte(CP_ACP, 0, c_str(), bl, b, bl, 0, 0));} #else - operator std::wstring() const {int bl=length(); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); return std::wstring(b, MultiByteToWideChar(CP_ACP, 0, c_str(), bl, b, bl));} + operator std::wstring() const {size_t bl=length(); LPWSTR b=(LPWSTR)alloca(sizeof(WCHAR)*bl); return std::wstring(b, MultiByteToWideChar(CP_ACP, 0, c_str(), (int)bl, b, (int)bl));} #endif XS_String& printf(LPCXSSTR fmt, ...) @@ -215,7 +219,7 @@ inline void assign_utf8(XS_String& s, const char* str) { - int lutf8 = strlen(str); + int lutf8 = (int)strlen(str); #ifdef UNICODE LPTSTR buffer = (LPTSTR)alloca(sizeof(TCHAR)*lutf8); @@ -231,17 +235,17 @@ s.assign(buffer, l); } -inline std::string get_utf8(LPCTSTR s, int l) +inline std::string get_utf8(LPCTSTR s, size_t l) { #ifdef UNICODE - int bl=2*l; LPSTR buffer = (LPSTR)alloca(bl); - l = WideCharToMultiByte(CP_UTF8, 0, s, l, buffer, bl, 0, 0); + size_t bl=2*l; LPSTR buffer = (LPSTR)alloca(bl); + l = WideCharToMultiByte(CP_UTF8, 0, s, (int)l, buffer, (int)bl, 0, 0); #else LPWSTR wbuffer = (LPWSTR)alloca(sizeof(WCHAR)*l); - l = MultiByteToWideChar(CP_ACP, 0, s, l, wbuffer, l); + l = MultiByteToWideChar(CP_ACP, 0, s, (int)l, wbuffer, (int)l); - int bl=2*l; LPSTR buffer = (LPSTR)alloca(bl); - l = WideCharToMultiByte(CP_UTF8, 0, wbuffer, l, buffer, bl, 0, 0); + size_t bl=2*l; LPSTR buffer = (LPSTR)alloca(bl); + l = WideCharToMultiByte(CP_UTF8, 0, wbuffer, (int)l, buffer, (int)bl, 0, 0); #endif return std::string(buffer, l); @@ -1602,10 +1606,13 @@ { } - void print(std::ostream& out) const + void print(std::ostream& out, bool pretty=true) const { - out << "<?xml version=\"" << _version << "\" encoding=\"" << _encoding << "\"?>\n"; + out << "<?xml version=\"" << _version << "\" encoding=\"" << _encoding << "\"?>"; + if (pretty) + out << std::endl; + if (!_doctype.empty()) out << _doctype << '\n'; @@ -1847,7 +1854,7 @@ WRITESTATE _state; bool _children; - StackEntry() : _children(false), _state(NOTHING) {} + StackEntry() : _state(NOTHING), _children(false) {} }; std::stack<StackEntry> _stack;

1 0

[mf] 17973: - Bugfix for UTF-8 strings
by mf＠svn.reactos.com 21 Sep '05

21 Sep '05

- Bugfix for UTF-8 strings - insert more XS_vsnprintf() calls - additional comments - struct XMLWriter Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-09-21 18:24:16 UTC (rev 17972) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2005-09-21 21:44:39 UTC (rev 17973) @@ -36,6 +36,10 @@ */ +#ifndef _NO_COMMENT +#define _NO_COMMENT // no #pragma comment(lib, ...) statements in .lib files +#endif + //#include "xmlstorage.h" #include <precomp.h> @@ -51,6 +55,7 @@ namespace XMLStorage { + /// remove escape characters from zero terminated string static std::string unescape(const char* s, char b='"', char e='"') { const char* end = s + strlen(s); @@ -68,6 +73,7 @@ return std::string(s, end-s); } + /// remove escape characters from string with specified length static std::string unescape(const char* s, int l, char b='"', char e='"') { const char* end = s + l; @@ -391,6 +397,7 @@ } + /// return error strings for Expat errors std::string XMLReaderBase::get_error_string() const { XML_Error error = XML_GetErrorCode(_parser); @@ -453,6 +460,7 @@ } + /// encode XML string literals std::string EncodeXMLString(const XS_String& str) { LPCXSSTR s = str.c_str(); @@ -492,6 +500,7 @@ #endif } + /// decode XML string literals XS_String DecodeXMLString(const XS_String& str) { LPCXSSTR s = str.c_str(); _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.h --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-09-21 18:24:16 UTC (rev 17972) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.h 2005-09-21 21:44:39 UTC (rev 17973) @@ -140,8 +140,8 @@ XS_String& operator=(LPCWSTR s) {assign(s); return *this;} #ifdef XS_STRING_UTF8 void assign(const XS_String& s) {assign(s.c_str());} - void assign(LPCWSTR s) {if (s) {int bl=wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, bl, b, bl, 0, 0));} else erase();} - void assign(LPCWSTR s, int l) {int bl=l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, l, b, bl, 0, 0));} else erase();} + void assign(LPCWSTR s) {if (s) {int bl=2*wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, bl, b, bl, 0, 0));} else erase();} + void assign(LPCWSTR s, int l) {int bl=2*l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_UTF8, 0, s, l, b, bl, 0, 0));} else erase();} #else // if !UNICODE && !XS_STRING_UTF8 void assign(LPCWSTR s) {if (s) {int bl=wcslen(s); LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, bl, b, bl, 0, 0));} else erase();} void assign(LPCWSTR s, int l) {int bl=l; if (s) {LPSTR b=(LPSTR)alloca(bl); super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, l, b, bl, 0, 0));} else erase();} @@ -169,7 +169,7 @@ XS_CHAR b[BUFFER_LEN]; va_start(l, fmt); - super::assign(b, XS_vsprintf(b, fmt, l)); + super::assign(b, XS_vsnprintf(b, COUNTOF(b), fmt, l)); va_end(l); return *this; @@ -179,7 +179,7 @@ { XS_CHAR b[BUFFER_LEN]; - super::assign(b, XS_vsprintf(b, fmt, l)); + super::assign(b, XS_vsnprintf(b, COUNTOF(b), fmt, l)); return *this; } @@ -190,7 +190,7 @@ XS_CHAR b[BUFFER_LEN]; va_start(l, fmt); - super::append(b, XS_vsprintf(b, fmt, l)); + super::append(b, XS_vsnprintf(b, COUNTOF(b), fmt, l)); va_end(l); return *this; @@ -200,7 +200,7 @@ { XS_CHAR b[BUFFER_LEN]; - super::append(b, XS_vsprintf(b, fmt, l)); + super::append(b, XS_vsnprintf(b, COUNTOF(b), fmt, l)); return *this; } @@ -336,6 +336,7 @@ #else + /// converter from Expat strings to XMLStorage internal strings struct String_from_XML_Char : public XS_String { String_from_XML_Char(const XML_Char* str) @@ -397,6 +398,7 @@ typedef std::map<XS_String, XS_String> AttributeMap; #endif + /// internal children node list struct Children : public std::list<XMLNode*> { void assign(const Children& other) @@ -678,9 +680,10 @@ } #endif - /// XPath find functions + /// XPath find function (const) const XMLNode* find_relative(const char* path) const; + /// XPath find function XMLNode* find_relative(const char* path) {return const_cast<XMLNode*>(const_cast<const XMLNode*>(this)->find_relative(path));} @@ -708,6 +711,7 @@ { } + /// internal iterator class struct iterator { typedef XMLNode::Children::iterator BaseIterator; @@ -806,6 +810,7 @@ { } + /// internal iterator class struct const_iterator { typedef XMLNode::Children::const_iterator BaseIterator; @@ -954,6 +959,7 @@ return _cur->get(attr_name); } + /// attribute setting void put(const XS_String& attr_name, const XS_String& value) { _cur->put(attr_name, value); @@ -1230,6 +1236,7 @@ #endif + /// type converter for boolean data struct XMLBool { XMLBool(bool value=false) @@ -1277,6 +1284,7 @@ void operator=(const XMLBool&); // disallow assignment operations }; + /// type converter for boolean data with write access struct XMLBoolRef { XMLBoolRef(XMLNode* node, const XS_String& attr_name, bool def=false) @@ -1318,6 +1326,7 @@ }; + /// type converter for integer data struct XMLInt { XMLInt(int value) @@ -1362,6 +1371,7 @@ void operator=(const XMLInt&); // disallow assignment operations }; + /// type converter for integer data with write access struct XMLIntRef { XMLIntRef(XMLNode* node, const XS_String& attr_name, int def=0) @@ -1395,6 +1405,7 @@ }; + /// type converter for string data struct XMLString { XMLString(const XS_String& value) @@ -1437,6 +1448,7 @@ void operator=(const XMLString&); // disallow assignment operations }; + /// type converter for string data with write access struct XMStringRef { XMStringRef(XMLNode* node, const XS_String& attr_name, LPCXSSTR def=XS_TEXT("")) @@ -1580,6 +1592,7 @@ }; + /// management of XML file headers struct XMLHeader { XMLHeader(const std::string& xml_version="1.0", const std::string& encoding="UTF-8", const std::string& doctype="") @@ -1595,6 +1608,7 @@ if (!_doctype.empty()) out << _doctype << '\n'; + if (!_additional.empty()) out << _additional << '\n'; } @@ -1606,6 +1620,7 @@ }; + /// XML document holder struct XMLDoc : public XMLNode { XMLDoc() @@ -1715,6 +1730,7 @@ }; + /// XML message wrapper struct XMLMessage : public XMLDoc { XMLMessage(const char* name) @@ -1727,6 +1743,174 @@ }; +enum PRETTY_FLAGS { + PRETTY_PLAIN = 0, + PRETTY_LINEFEED = 1, + PRETTY_INDENT = 2 +}; + +struct XMLWriter +{ + XMLWriter(std::ostream& out, PRETTY_FLAGS pretty=PRETTY_INDENT, const XMLHeader& header=XMLHeader()) + : _pofstream(NULL), + _out(out), + _pretty(pretty) + { + header.print(_out, false); + } + + XMLWriter(LPCTSTR path, PRETTY_FLAGS pretty=PRETTY_INDENT, const XMLHeader& header=XMLHeader()) + : _pofstream(new tofstream(path)), + _out(*_pofstream), + _pretty(pretty) + { + header.print(_out, false); + } + + ~XMLWriter() + { + _out << std::endl; + delete _pofstream; + } + + /// create node and move to it + void create(const XS_String& name) + { + if (!_stack.empty()) { + StackEntry& last = _stack.top(); + + if (last._state < PRE_CLOSED) { + write_attributes(last); + close_pre(last); + } + + ++last._children; + } + + StackEntry entry; + entry._node_name = name; + _stack.push(entry); + + write_pre(entry); + } + + /// go back to previous position + bool back() + { + if (!_stack.empty()) { + write_post(_stack.top()); + + _stack.pop(); + return true; + } else + return false; + } + + /// attribute setting + void put(const XS_String& attr_name, const XS_String& value) + { + if (!_stack.empty()) + _stack.top()._attributes[attr_name] = value; + } + + /// C++ write access to an attribute + XS_String& operator[](const XS_String& attr_name) + { + if (_stack.empty()) + return s_empty_attr; + + return _stack.top()._attributes[attr_name]; + } + + void set_content(const XS_String& s) + { + if (!_stack.empty()) + _stack.top()._content = s; + } + + // public for access in StackEntry + enum WRITESTATE { + NOTHING, /*PRE,*/ ATTRIBUTES, PRE_CLOSED, /*CONTENT,*/ POST + }; + +protected: + tofstream* _pofstream; + std::ostream& _out; + PRETTY_FLAGS _pretty; + + typedef XMLNode::AttributeMap AttrMap; + + struct StackEntry { + XS_String _node_name; + AttrMap _attributes; + std::string _content; + WRITESTATE _state; + bool _children; + + StackEntry() : _children(false), _state(NOTHING) {} + }; + + std::stack<StackEntry> _stack; + + static XS_String s_empty_attr; + + void close_pre(StackEntry& entry) + { + _out << '>'; + + entry._state = PRE_CLOSED; + } + + void write_pre(StackEntry& entry) + { + if (_pretty >= PRETTY_LINEFEED) + _out << std::endl; + + if (_pretty == PRETTY_INDENT) + for(int i=_stack.size(); --i>0; ) + _out << XML_INDENT_SPACE; + + _out << '<' << EncodeXMLString(entry._node_name); + //entry._state = PRE; + } + + void write_attributes(StackEntry& entry) + { + for(AttrMap::const_iterator it=entry._attributes.begin(); it!=entry._attributes.end(); ++it) + _out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; + + entry._state = ATTRIBUTES; + } + + void write_post(StackEntry& entry) + { + if (entry._state < ATTRIBUTES) + write_attributes(entry); + + if (entry._children || !entry._content.empty()) { + if (entry._state < PRE_CLOSED) + close_pre(entry); + + _out << entry._content; + //entry._state = CONTENT; + + if (_pretty>=PRETTY_LINEFEED && entry._content.empty()) + _out << std::endl; + + if (_pretty==PRETTY_INDENT && entry._content.empty()) + for(int i=_stack.size(); --i>0; ) + _out << XML_INDENT_SPACE; + + _out << "</" << EncodeXMLString(entry._node_name) << ">"; + } else { + _out << "/>"; + } + + entry._state = POST; + } +}; + + } // namespace XMLStorage #define _XMLSTORAGE_H

1 0

[weiden] 17972: fixed some mismatching prototypes, sorry for breaking the build
by weiden＠svn.reactos.com 21 Sep '05

21 Sep '05

fixed some mismatching prototypes, sorry for breaking the build Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hub.c Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hub.c _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci-hub.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci-hub.c 2005-09-21 17:57:07 UTC (rev 17971) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci-hub.c 2005-09-21 18:24:16 UTC (rev 17972) @@ -153,7 +153,7 @@ u16 typeReq, u16 wValue, u16 wIndex, - char *buf, + u8 *buf, u16 wLength ) { struct ohci_hcd *ohci = hcd_to_ohci (hcd); _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hub.c --- trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hub.c 2005-09-21 17:57:07 UTC (rev 17971) +++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci-hub.c 2005-09-21 18:24:16 UTC (rev 17972) @@ -54,7 +54,7 @@ /* size of returned buffer is part of USB spec */ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, - u16 wIndex, char *buf, u16 wLength) + u16 wIndex, u8 *buf, u16 wLength) { struct uhci_hcd *uhci = hcd_to_uhci(hcd); int i, status, retval = 0, len = 0;

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
59
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005