Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 46546: [COMPBATT]: More miniclass driver interface work: CompBattQueryInformation and CompBattGetBatteryGranularity.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 04:27:41 2010 New Revision: 46546 URL: http://svn.reactos.org/svn/reactos?rev=46546&view=rev Log: [COMPBATT]: More miniclass driver interface work: CompBattQueryInformation and CompBattGetBatteryGranularity. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Mon Mar 29 04:27:41 2010 @@ -394,22 +394,99 @@ CompBattGetBatteryGranularity(OUT PBATTERY_REPORTING_SCALE ReportingScale, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { + NTSTATUS Status = STATUS_SUCCESS; + BATTERY_QUERY_INFORMATION InputBuffer; + PCOMPBATT_BATTERY_DATA BatteryData; + BATTERY_REPORTING_SCALE BatteryScale[4]; + PLIST_ENTRY ListHead, NextEntry; + ULONG i; + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryGranularity\n"); + + /* Set defaults */ + ReportingScale[0].Granularity = -1; + ReportingScale[1].Granularity = -1; + ReportingScale[2].Granularity = -1; + ReportingScale[3].Granularity = -1; + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Try to acquire the remove lock */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (NT_SUCCESS(IoAcquireRemoveLock(&BatteryData->RemoveLock, 0))) + { + /* Now release the device lock since the battery can't go away */ + ExReleaseFastMutex(&DeviceExtension->Lock); + + /* Build the query */ + InputBuffer.BatteryTag = BatteryData->Tag; + InputBuffer.InformationLevel = BatteryGranularityInformation; + + /* Make sure the battery has a tag */ + if (BatteryData->Tag) + { + /* Send the IOCTL to query the information */ + RtlZeroMemory(&BatteryData->BatteryInformation, + sizeof(BatteryData->BatteryInformation)); + Status = BatteryIoctl(IOCTL_BATTERY_QUERY_INFORMATION, + BatteryData->DeviceObject, + &InputBuffer, + sizeof(InputBuffer), + &BatteryScale, + sizeof(BatteryScale), + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail if the query had a problem */ + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + break; + } + + /* Loop all 4 scales */ + for (i = 0; i < 4; i++) + { + /* Check for valid granularity */ + if (BatteryScale[i].Granularity) + { + /* If it's smaller, use it instead */ + ReportingScale[i].Granularity = min(BatteryScale[i].Granularity, + ReportingScale[i].Granularity); + } + + } + } + + /* Re-acquire the device extension lock and release the remove lock */ + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + } + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* All done */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryGranularity\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +CompBattGetEstimatedTime(OUT PULONG Time, + IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) +{ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - -NTSTATUS -NTAPI -CompBattGetEstimatedTime(OUT PULONG Time, - IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION FdoExtension, + +NTSTATUS +NTAPI +CompBattQueryInformation(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, IN ULONG Tag, IN BATTERY_QUERY_INFORMATION_LEVEL InfoLevel, IN OPTIONAL LONG AtRate, @@ -417,8 +494,109 @@ IN ULONG BufferLength, OUT PULONG ReturnedLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + BATTERY_INFORMATION BatteryInfo; + BATTERY_REPORTING_SCALE BatteryGranularity[4]; + PWCHAR BatteryName = L"Composite Battery"; + BATTERY_MANUFACTURE_DATE Date; + ULONG Dummy, Time; + PVOID QueryData = NULL; + ULONG QueryLength = 0; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING QueryInformation\n"); + + /* Check for valid/correct tag */ + if ((Tag != DeviceExtension->Tag) || + (!(DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED))) + { + /* Not right, so fail */ + return STATUS_NO_SUCH_DEVICE; + } + + /* Check what caller wants */ + switch (InfoLevel) + { + case BatteryInformation: + + /* Query combined battery information */ + RtlZeroMemory(&BatteryInfo, sizeof(BatteryInfo)); + Status = CompBattGetBatteryInformation(&BatteryInfo, DeviceExtension); + if (NT_SUCCESS(Status)) + { + /* Return the data if successful */ + QueryData = &BatteryInfo; + QueryLength = sizeof(BatteryInfo); + } + break; + + case BatteryGranularityInformation: + + /* Query combined granularity information */ + RtlZeroMemory(&BatteryGranularity, sizeof(BatteryGranularity)); + Status = CompBattGetBatteryGranularity(BatteryGranularity, DeviceExtension); + if (NT_SUCCESS(Status)) + { + /* Return the data if successful */ + QueryLength = sizeof(BatteryGranularity); + QueryData = &BatteryGranularity; + } + break; + + case BatteryEstimatedTime: + + /* Query combined time estimate information */ + RtlZeroMemory(&Time, sizeof(Time)); + Status = CompBattGetEstimatedTime(&Time, DeviceExtension); + if (NT_SUCCESS(Status)) + { + /* Return the data if successful */ + QueryLength = sizeof(Time); + QueryData = &Time; + } + break; + + case BatteryManufactureName: + case BatteryDeviceName: + + /* Return the static buffer */ + QueryData = BatteryName; + QueryLength = sizeof(L"Composite Battery"); + break; + + case BatteryManufactureDate: + + /* Static data */ + Date.Day = 26; + Date.Month = 06; + Date.Year = 1997; + break; + + case BatteryTemperature: + case BatteryUniqueID: + + /* Return zero */ + Dummy = 0; + QueryData = &Dummy; + QueryLength = sizeof(Dummy); + break; + + default: + + /* Everything else is unknown */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Return the required length and check if the caller supplied enough */ + *ReturnedLength = QueryLength; + if (BufferLength < QueryLength) Status = STATUS_BUFFER_TOO_SMALL; + + /* Copy the data if there's enough space and it exists */ + if ((NT_SUCCESS(Status)) && (QueryData)) RtlCopyMemory(Buffer, QueryData, QueryLength); + + /* Return function result */ + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING QueryInformation\n"); + return Status; } NTSTATUS

1 0

[tkreuzer] 46545: Fix build
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 04:15:21 2010 New Revision: 46545 URL: http://svn.reactos.org/svn/reactos?rev=46545&view=rev Log: Fix build Modified: trunk/reactos/include/reactos/idl/pnp.idl Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Mon Mar 29 04:15:21 2010 @@ -16,6 +16,13 @@ cpp_quote("#ifndef _CFGMGR32_H_") typedef unsigned long RESOURCEID; + +typedef struct _HWPROFILEINFO { + DWORD HWPI_ulHWProfile; + WCHAR HWPI_szFriendlyName[80]; + DWORD HWPI_dwFlags; +} HWPROFILEINFO; + cpp_quote("#endif") typedef unsigned long DEVPROPTYPE; typedef [range(0, PNP_MAX_PROP_SIZE)] unsigned long PNP_PROP_SIZE; @@ -242,12 +249,6 @@ DWORD pid; } DEVPROPKEY; -typedef struct _HWPROFILEINFO { - DWORD HWPI_ulHWProfile; - WCHAR HWPI_szFriendlyName[80]; - DWORD HWPI_dwFlags; -} HWPROFILEINFO; - [ uuid (809F4e40-A03D-11CE-8F69-08003E30051B), version(1.0),

1 0

[tkreuzer] 46544: Reintegrate header-branch 2/x - PCVOID -> LPCVOID / CONST VOID * - move cfgmgr32.h and cfg.h to psdk - remove wine/cfgmgr32.h make setupapi use the proper header
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 04:03:41 2010 New Revision: 46544 URL: http://svn.reactos.org/svn/reactos?rev=46544&view=rev Log: Reintegrate header-branch 2/x - PCVOID -> LPCVOID / CONST VOID * - move cfgmgr32.h and cfg.h to psdk - remove wine/cfgmgr32.h make setupapi use the proper header Added: trunk/reactos/include/psdk/cfg.h - copied unchanged from r46492, trunk/reactos/include/psdk/cfg.h trunk/reactos/include/psdk/cfgmgr32.h - copied unchanged from r46492, trunk/reactos/include/psdk/cfgmgr32.h Removed: trunk/reactos/include/ddk/cfg.h trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/reactos/wine/cfgmgr32.h Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/dll/win32/hid/precomp.h trunk/reactos/dll/win32/setupapi/setupapi.rbuild trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/include/ndk/amd64/ (props changed) trunk/reactos/include/ndk/amd64/asmmacro.S (props changed) trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winuser.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… Modified: trunk/reactos/dll/win32/hid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/precomp.h?re… Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… Removed: trunk/reactos/include/ddk/cfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfg.h?rev=4654… Removed: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… Removed: trunk/reactos/include/reactos/wine/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/cfgmg…

1 0

[sir_richard] 46543: [COMPBATT]: Mini-class driver interface work: CompBattDisableStatusNotify, CompBattQueryTag, CompBattRecalculateTag, CompBattGetBatteryInformation.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 04:02:07 2010 New Revision: 46543 URL: http://svn.reactos.org/svn/reactos?rev=46543&view=rev Log: [COMPBATT]: Mini-class driver interface work: CompBattDisableStatusNotify, CompBattQueryTag, CompBattRecalculateTag, CompBattGetBatteryInformation. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Mon Mar 29 04:02:07 2010 @@ -81,12 +81,41 @@ return STATUS_NOT_IMPLEMENTED; } -NTSTATUS +VOID NTAPI CompBattRecalculateTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PCOMPBATT_BATTERY_DATA BatteryData; + ULONG Tag; + PLIST_ENTRY ListHead, NextEntry; + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING CompBattRecalculateTag\n"); + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the battery information and check if it has a tag */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (BatteryData->Flags & COMPBATT_TAG_ASSIGNED) + { + /* Generate the next tag and exit */ + Tag = DeviceExtension->NextTag; + DeviceExtension->Flags |= COMPBATT_TAG_ASSIGNED; + DeviceExtension->Tag = Tag; + DeviceExtension->NextTag = Tag + 1; + break; + } + + /* No tag for this device extension, clear it */ + DeviceExtension->Tag = 0; + NextEntry = NextEntry->Flink; + } + + /* We're done */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING CompBattRecalculateTag\n"); } NTSTATUS @@ -118,16 +147,61 @@ CompBattQueryTag(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension, OUT PULONG Tag) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PAGED_CODE(); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING QueryTag\n"); + + /* Was a tag assigned? */ + if (!(DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED)) + { + /* Assign one */ + CompBattRecalculateTag(DeviceExtension); + } + + /* Do we have a tag now? */ + if ((DeviceExtension->Flags & COMPBATT_TAG_ASSIGNED) && (DeviceExtension->Tag)) + { + /* Return the tag */ + *Tag = DeviceExtension->Tag; + Status = STATUS_SUCCESS; + } + else + { + /* No tag */ + *Tag = 0; + Status = STATUS_NO_SUCH_DEVICE; + } + + /* Return status */ + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING QueryTag\n"); + return Status; } NTSTATUS NTAPI CompBattDisableStatusNotify(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PCOMPBATT_BATTERY_DATA BatteryData; + PLIST_ENTRY ListHead, NextEntry; + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING DisableStatusNotify\n"); + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the battery information and clear capacity data */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + BatteryData->WaitStatus.LowCapacity = 0; + BatteryData->WaitStatus.HighCapacity = 0x7FFFFFFF; + NextEntry = NextEntry->Flink; + } + + /* Done */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING DisableStatusNotify\n"); + return STATUS_SUCCESS; } NTSTATUS @@ -161,11 +235,158 @@ NTSTATUS NTAPI -CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInformation, +CompBattGetBatteryInformation(OUT PBATTERY_INFORMATION BatteryInfo, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_SUCCESS; + BATTERY_QUERY_INFORMATION InputBuffer; + PCOMPBATT_BATTERY_DATA BatteryData; + PLIST_ENTRY ListHead, NextEntry; + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteryInformation\n"); + + /* Set defaults */ + BatteryInfo->DefaultAlert1 = 0; + BatteryInfo->DefaultAlert2 = 0; + BatteryInfo->CriticalBias = 0; + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Try to acquire the remove lock */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (NT_SUCCESS(IoAcquireRemoveLock(&BatteryData->RemoveLock, 0))) + { + /* Now release the device lock since the battery can't go away */ + ExReleaseFastMutex(&DeviceExtension->Lock); + + /* Build the query */ + InputBuffer.BatteryTag = BatteryData->Tag; + InputBuffer.InformationLevel = BatteryInformation; + InputBuffer.AtRate = 0; + + /* Make sure the battery has a tag */ + if (BatteryData->Tag) + { + /* Do we already have the data? */ + if (!(BatteryData->Flags & COMPBATT_BATTERY_INFORMATION_PRESENT)) + { + /* Send the IOCTL to query the information */ + RtlZeroMemory(&BatteryData->BatteryInformation, + sizeof(BatteryData->BatteryInformation)); + Status = BatteryIoctl(IOCTL_BATTERY_QUERY_INFORMATION, + BatteryData->DeviceObject, + &InputBuffer, + sizeof(InputBuffer), + &BatteryData->BatteryInformation, + sizeof(BatteryData->BatteryInformation), + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail if the query had a problem */ + if (Status == STATUS_DEVICE_REMOVED) Status = STATUS_NO_SUCH_DEVICE; + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + break; + } + + /* Next time we can use the static copy */ + BatteryData->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; + if (CompBattDebug & 2) + DbgPrint("CompBattGetBatteryInformation: Read individual BATTERY_INFORMATION\n" + "-------- Capabilities = %x\n-------- Technology = %x\n" + "-------- Chemistry[4] = %x\n-------- DesignedCapacity = %x\n" + "-------- FullChargedCapacity = %x\n-------- DefaultAlert1 = %x\n" + "-------- DefaultAlert2 = %x\n-------- CriticalBias = %x\n" + "-------- CycleCount = %x\n", + BatteryData->BatteryInformation.Capabilities, + BatteryData->BatteryInformation.Technology, + BatteryData->BatteryInformation.Chemistry, + BatteryData->BatteryInformation.DesignedCapacity, + BatteryData->BatteryInformation.FullChargedCapacity, + BatteryData->BatteryInformation.DefaultAlert1, + BatteryData->BatteryInformation.DefaultAlert2, + BatteryData->BatteryInformation.CriticalBias, + BatteryData->BatteryInformation.CycleCount); + } + + /* Combine capabilities */ + BatteryInfo->Capabilities |= BatteryData->BatteryInformation.Capabilities; + + /* Add-on capacity */ + if (BatteryData->BatteryInformation.DesignedCapacity != BATTERY_UNKNOWN_CAPACITY) + { + BatteryInfo->DesignedCapacity += BatteryData->BatteryInformation.DesignedCapacity; + } + + /* Add on fully charged capacity */ + if (BatteryData->BatteryInformation.FullChargedCapacity != BATTERY_UNKNOWN_CAPACITY) + { + BatteryInfo->FullChargedCapacity += BatteryData->BatteryInformation.FullChargedCapacity; + } + + /* Choose the highest alert */ + BatteryInfo->DefaultAlert1 = max(BatteryInfo->DefaultAlert1, + BatteryData->BatteryInformation.DefaultAlert1); + + /* Choose the highest alert */ + BatteryInfo->DefaultAlert2 = max(BatteryInfo->DefaultAlert2, + BatteryData->BatteryInformation.DefaultAlert2); + + /* Choose the highest critical bias */ + BatteryInfo->CriticalBias = max(BatteryInfo->CriticalBias, + BatteryData->BatteryInformation.CriticalBias); + } + + /* Re-acquire the device extension lock and release the remove lock */ + ExAcquireFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLock(&BatteryData->RemoveLock, 0); + } + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* We are done with the list, check if the information was queried okay */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (NT_SUCCESS(Status)) + { + /* If there's no fully charged capacity, use the design capacity */ + if (!BatteryInfo->FullChargedCapacity) + { + BatteryInfo->FullChargedCapacity = BatteryInfo->DesignedCapacity; + } + + /* Print out final combined data */ + if (CompBattDebug & 2) + DbgPrint("CompBattGetBatteryInformation: Returning BATTERY_INFORMATION\n" + "-------- Capabilities = %x\n-------- Technology = %x\n" + "-------- Chemistry[4] = %x\n-------- DesignedCapacity = %x\n" + "-------- FullChargedCapacity = %x\n-------- DefaultAlert1 = %x\n" + "-------- DefaultAlert2 = %x\n-------- CriticalBias = %x\n" + "-------- CycleCount = %x\n", + BatteryInfo->Capabilities, + BatteryInfo->Technology, + BatteryInfo->Chemistry, + BatteryInfo->DesignedCapacity, + BatteryInfo->FullChargedCapacity, + BatteryInfo->DefaultAlert1, + BatteryInfo->DefaultAlert2, + BatteryInfo->CriticalBias, + BatteryInfo->CycleCount); + + /* Copy the data into the device extension */ + RtlCopyMemory(&DeviceExtension->BatteryInformation, + BatteryInfo, + sizeof(DeviceExtension->BatteryInformation)); + DeviceExtension->Flags |= COMPBATT_BATTERY_INFORMATION_PRESENT; + } + + /* We are done */ + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteryInformation\n"); + return Status; } NTSTATUS @@ -209,13 +430,12 @@ DriverObject->DriverExtension->AddDevice = CompBattAddDevice; /* Register other handlers */ - DriverObject->MajorFunction[0] = CompBattOpenClose; - DriverObject->MajorFunction[2] = CompBattOpenClose; - DriverObject->MajorFunction[14] = CompBattIoctl; - DriverObject->MajorFunction[22] = CompBattPowerDispatch; - DriverObject->MajorFunction[23] = CompBattSystemControl; - DriverObject->MajorFunction[27] = CompBattPnpDispatch; - + DriverObject->MajorFunction[IRP_MJ_CREATE] = CompBattOpenClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = CompBattOpenClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = CompBattIoctl; + DriverObject->MajorFunction[IRP_MJ_POWER] = CompBattPowerDispatch; + DriverObject->MajorFunction[IRP_MJ_SYSTEM_CONTROL] = CompBattSystemControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = CompBattPnpDispatch; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] Mon Mar 29 04:02:07 2010 @@ -11,6 +11,9 @@ #include <batclass.h> #include <debug.h> #include <wdmguid.h> + +#define COMPBATT_BATTERY_INFORMATION_PRESENT 0x04 +#define COMPBATT_TAG_ASSIGNED 0x80 typedef struct _COMPBATT_BATTERY_DATA { @@ -137,6 +140,18 @@ OUT PFILE_OBJECT *FileObject, OUT PDEVICE_OBJECT *DeviceObject ); + +NTSTATUS +NTAPI +BatteryIoctl( + IN ULONG IoControlCode, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN BOOLEAN InternalDeviceIoControl +); extern ULONG CompBattDebug; Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Mon Mar 29 04:02:07 2010 @@ -59,6 +59,9 @@ ExReleaseFastMutex(&DeviceExtension->Lock); return BatteryData; } + + /* Next */ + NextEntry = NextEntry->Flink; } /* Done */ @@ -92,6 +95,9 @@ Found = TRUE; break; } + + /* Next */ + NextEntry = NextEntry->Flink; } /* Release the lock and return search status */

1 0

[tkreuzer] 46542: Reintegrate header branch part 1/x DDKAPI -> NTAPI
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 03:51:11 2010 New Revision: 46542 URL: http://svn.reactos.org/svn/reactos?rev=46542&view=rev Log: Reintegrate header branch part 1/x DDKAPI -> NTAPI Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/drivers/battery/battc/battc.c trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/scsiport/stubs.c trunk/reactos/drivers/video/displays/vga/vgaddi.h trunk/reactos/include/ddk/afilter.h trunk/reactos/include/ddk/hidclass.h trunk/reactos/include/ddk/hidpi.h trunk/reactos/include/ddk/mcd.h trunk/reactos/include/ddk/miniport.h trunk/reactos/include/ddk/minitape.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ntagp.h trunk/reactos/include/ddk/ntdd8042.h trunk/reactos/include/ddk/ntpoapi.h trunk/reactos/include/ddk/parallel.h trunk/reactos/include/ddk/scsiwmi.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/srb.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/tdikrnl.h trunk/reactos/include/ddk/upssvc.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/videoagp.h trunk/reactos/include/psdk/batclass.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… Modified: trunk/reactos/drivers/battery/battc/battc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/batt… Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… Modified: trunk/reactos/include/ddk/afilter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/afilter.h?rev=… Modified: trunk/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidclass.h?rev… Modified: trunk/reactos/include/ddk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidpi.h?rev=46… Modified: trunk/reactos/include/ddk/mcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mcd.h?rev=4654… Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… Modified: trunk/reactos/include/ddk/minitape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/minitape.h?rev… Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=465… Modified: trunk/reactos/include/ddk/ntagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntagp.h?rev=46… Modified: trunk/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdd8042.h?rev… Modified: trunk/reactos/include/ddk/ntpoapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntpoapi.h?rev=… Modified: trunk/reactos/include/ddk/parallel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/parallel.h?rev… Modified: trunk/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/scsiwmi.h?rev=… Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=46… Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4654… Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=… Modified: trunk/reactos/include/ddk/upssvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/upssvc.h?rev=4… Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=46… Modified: trunk/reactos/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/videoagp.h?rev… Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re…

1 0

[sir_richard] 46541: [COMPBATT]: Helper code, CompBattGetDeviceObjectPointer and BatteryIoctl.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 02:10:56 2010 New Revision: 46541 URL: http://svn.reactos.org/svn/reactos?rev=46541&view=rev Log: [COMPBATT]: Helper code, CompBattGetDeviceObjectPointer and BatteryIoctl. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] Mon Mar 29 02:10:56 2010 @@ -132,7 +132,7 @@ NTSTATUS NTAPI CompBattGetDeviceObjectPointer( - IN PCUNICODE_STRING DeviceName, + IN PUNICODE_STRING DeviceName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, OUT PDEVICE_OBJECT *DeviceObject Modified: trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compmisc.c [iso-8859-1] Mon Mar 29 02:10:56 2010 @@ -22,19 +22,102 @@ IN ULONG OutputBufferLength, IN BOOLEAN InternalDeviceIoControl) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IO_STATUS_BLOCK IoStatusBlock; + KEVENT Event; + NTSTATUS Status; + PIRP Irp; + PAGED_CODE(); + if (CompBattDebug & 0x100) DbgPrint("CompBatt: ENTERING BatteryIoctl\n"); + + /* Initialize the event and IRP */ + KeInitializeEvent(&Event, SynchronizationEvent, 0); + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + DeviceObject, + InputBuffer, + InputBufferLength, + OutputBuffer, + OutputBufferLength, + InternalDeviceIoControl, + &Event, + &IoStatusBlock); + if (Irp) + { + /* Call the class driver miniport */ + Status = IofCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for result */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + /* Print failure */ + if (!(NT_SUCCESS(Status)) && (CompBattDebug & 8)) + DbgPrint("BatteryIoctl: Irp failed - %x\n", Status); + + /* Done */ + if (CompBattDebug & 0x100) DbgPrint("CompBatt: EXITING BatteryIoctl\n"); + } + else + { + /* Out of memory */ + if (CompBattDebug & 8) DbgPrint("BatteryIoctl: couldn't create Irp\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return status */ + return Status; } NTSTATUS NTAPI -CompBattGetDeviceObjectPointer(IN PCUNICODE_STRING DeviceName, +CompBattGetDeviceObjectPointer(IN PUNICODE_STRING DeviceName, IN ACCESS_MASK DesiredAccess, OUT PFILE_OBJECT *FileObject, OUT PDEVICE_OBJECT *DeviceObject) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PFILE_OBJECT LocalFileObject; + HANDLE DeviceHandle; + PAGED_CODE(); + + /* Open a file object handle to the device */ + InitializeObjectAttributes(&ObjectAttributes, DeviceName, 0, NULL, NULL); + Status = ZwCreateFile(&DeviceHandle, + DesiredAccess, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + if (NT_SUCCESS(Status)) + { + /* Reference the file object */ + Status = ObReferenceObjectByHandle(DeviceHandle, + 0, + IoFileObjectType, + KernelMode, + (PVOID)&LocalFileObject, + NULL); + if (NT_SUCCESS(Status)) + { + /* Return the FO and the associated DO */ + *FileObject = LocalFileObject; + *DeviceObject = IoGetRelatedDeviceObject(LocalFileObject); + } + + /* Close the handle */ + ZwClose(DeviceHandle); + } + + /* Return status */ + return Status; } /* EOF */ Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Mon Mar 29 02:10:56 2010 @@ -102,7 +102,7 @@ NTSTATUS NTAPI -CompBattAddNewBattery(IN PCUNICODE_STRING BatteryName, +CompBattAddNewBattery(IN PUNICODE_STRING BatteryName, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { NTSTATUS Status = STATUS_SUCCESS;

1 0

[sir_richard] 46540: [COMPBATT]: Main battery detection/PnP notification logic: CompBattAddNewBattery, CompBattRemoveBattery, IsBatteryAlreadyOnList, RemoveBatteryFromList, CompBattGetBatteries, CompBattPnpEventHandler.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 02:02:05 2010 New Revision: 46540 URL: http://svn.reactos.org/svn/reactos?rev=46540&view=rev Log: [COMPBATT]: Main battery detection/PnP notification logic: CompBattAddNewBattery, CompBattRemoveBattery, IsBatteryAlreadyOnList, RemoveBatteryFromList, CompBattGetBatteries, CompBattPnpEventHandler. Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.c [iso-8859-1] Mon Mar 29 02:02:05 2010 @@ -27,7 +27,7 @@ /* Complete the IRP with success */ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); /* Return success */ if (CompBattDebug & 0x100) DbgPrint("CompBatt: Exiting OpenClose\n"); @@ -56,7 +56,7 @@ /* We don't support WMI */ Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* Return status */ @@ -75,7 +75,7 @@ NTSTATUS NTAPI -CompBattMonitorIrpCompleteWorker(IN PCOMPBATT_BATTERY_ENTRY BatteryData) +CompBattMonitorIrpCompleteWorker(IN PCOMPBATT_BATTERY_DATA BatteryData) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/compbatt.h [iso-8859-1] Mon Mar 29 02:02:05 2010 @@ -10,8 +10,9 @@ #include <initguid.h> #include <batclass.h> #include <debug.h> +#include <wdmguid.h> -typedef struct _COMPBATT_BATTERY_ENTRY +typedef struct _COMPBATT_BATTERY_DATA { LIST_ENTRY BatteryLink; IO_REMOVE_LOCK RemoveLock; @@ -31,7 +32,7 @@ BATTERY_STATUS BatteryStatus; ULONGLONG InterruptTime; UNICODE_STRING BatteryName; -} COMPBATT_BATTERY_ENTRY, *PCOMPBATT_BATTERY_ENTRY; +} COMPBATT_BATTERY_DATA, *PCOMPBATT_BATTERY_DATA; typedef struct _COMPBATT_DEVICE_EXTENSION { @@ -114,6 +115,29 @@ OUT PULONG Tag ); +NTSTATUS +NTAPI +CompBattMonitorIrpComplete( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PKEVENT Event +); + +NTSTATUS +NTAPI +CompBattMonitorIrpCompleteWorker( + IN PCOMPBATT_BATTERY_DATA BatteryData +); + +NTSTATUS +NTAPI +CompBattGetDeviceObjectPointer( + IN PCUNICODE_STRING DeviceName, + IN ACCESS_MASK DesiredAccess, + OUT PFILE_OBJECT *FileObject, + OUT PDEVICE_OBJECT *DeviceObject +); + extern ULONG CompBattDebug; /* EOF */ Modified: trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/compbatt/… ============================================================================== --- trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/compbatt/comppnp.c [iso-8859-1] Mon Mar 29 02:02:05 2010 @@ -28,13 +28,43 @@ return PoCallDriver(DeviceExtension->AttachedDevice, Irp); } -PCOMPBATT_BATTERY_ENTRY +PCOMPBATT_BATTERY_DATA NTAPI RemoveBatteryFromList(IN PCUNICODE_STRING BatteryName, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return NULL; + PLIST_ENTRY ListHead, NextEntry; + PCOMPBATT_BATTERY_DATA BatteryData; + if (CompBattDebug & 1) + DbgPrint("CompBatt: ENTERING RemoveBatteryFromList\n"); + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the battery information and compare the name */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (!RtlCompareUnicodeString(BatteryName, &BatteryData->BatteryName, TRUE)) + { + /* Flush pending deletes and any lock waiters */ + IoAcquireRemoveLock(&BatteryData->RemoveLock, 0); + ExReleaseFastMutex(&DeviceExtension->Lock); + IoReleaseRemoveLockAndWait(&BatteryData->RemoveLock, 0); + + /* Remove the entry from the list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + RemoveEntryList(&BatteryData->BatteryLink); + ExReleaseFastMutex(&DeviceExtension->Lock); + return BatteryData; + } + } + + /* Done */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING RemoveBatteryFromList\n"); + return STATUS_SUCCESS; } BOOLEAN @@ -42,8 +72,32 @@ IsBatteryAlreadyOnList(IN PCUNICODE_STRING BatteryName, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return FALSE; + PLIST_ENTRY ListHead, NextEntry; + PCOMPBATT_BATTERY_DATA BatteryData; + BOOLEAN Found = FALSE; + if (CompBattDebug & 1) + DbgPrint("CompBatt: ENTERING IsBatteryAlreadyOnList\n"); + + /* Loop the battery list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + ListHead = &DeviceExtension->BatteryList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the battery information and compare the name */ + BatteryData = CONTAINING_RECORD(NextEntry, COMPBATT_BATTERY_DATA, BatteryLink); + if (!RtlCompareUnicodeString(BatteryName, &BatteryData->BatteryName, TRUE)) + { + /* Got it */ + Found = TRUE; + break; + } + } + + /* Release the lock and return search status */ + ExReleaseFastMutex(&DeviceExtension->Lock); + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING IsBatteryAlreadyOnList\n"); + return Found; } NTSTATUS @@ -51,8 +105,107 @@ CompBattAddNewBattery(IN PCUNICODE_STRING BatteryName, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status = STATUS_SUCCESS; + PCOMPBATT_BATTERY_DATA BatteryData; + PIRP Irp; + PIO_STACK_LOCATION IoStackLocation; + PFILE_OBJECT FileObject; + PAGED_CODE(); + if (CompBattDebug & 1) + DbgPrint("CompBatt: ENTERING AddNewBattery \"%w\" \n", BatteryName->Buffer); + + /* Is this a new battery? */ + if (!IsBatteryAlreadyOnList(BatteryName, DeviceExtension)) + { + /* Allocate battery data */ + BatteryData = ExAllocatePoolWithTag(NonPagedPool, + sizeof(COMPBATT_BATTERY_DATA) + + BatteryName->Length, + 'CtaB'); + if (BatteryData) + { + /* Initialize the data and write the battery name */ + RtlZeroMemory(BatteryData, sizeof(COMPBATT_BATTERY_DATA)); + BatteryData->Tag = 0; + BatteryData->BatteryName.MaximumLength = BatteryName->Length; + BatteryData->BatteryName.Buffer = (PWCHAR)(BatteryData + 1); + RtlCopyUnicodeString(&BatteryData->BatteryName, BatteryName); + + /* Get the device object */ + Status = CompBattGetDeviceObjectPointer(BatteryName, + FILE_ALL_ACCESS, + &FileObject, + &BatteryData->DeviceObject); + if (NT_SUCCESS(Status)) + { + /* Reference the DO and drop the FO */ + ObfReferenceObject(BatteryData->DeviceObject); + ObfDereferenceObject(FileObject); + + /* Allocate the battery IRP */ + Irp = IoAllocateIrp(BatteryData->DeviceObject->StackSize + 1, 0); + if (Irp) + { + /* Save it */ + BatteryData->Irp = Irp; + + /* Setup the stack location */ + IoStackLocation = IoGetNextIrpStackLocation(Irp); + IoStackLocation->Parameters.Others.Argument1 = DeviceExtension; + IoStackLocation->Parameters.Others.Argument2 = BatteryData; + + /* Set IRP data */ + IoSetNextIrpStackLocation(Irp); + Irp->IoStatus.Status = STATUS_DEVICE_NOT_CONNECTED; + BatteryData->WaitFlag = 0; + + /* Insert this battery in the list */ + ExAcquireFastMutex(&DeviceExtension->Lock); + InsertTailList(&DeviceExtension->BatteryList, + &BatteryData->BatteryLink); + ExReleaseFastMutex(&DeviceExtension->Lock); + + /* Initialize the work item and delete lock */ + IoInitializeRemoveLock(&BatteryData->RemoveLock, 0, 0, 0); + ExInitializeWorkItem(&BatteryData->WorkItem, + (PVOID)CompBattMonitorIrpCompleteWorker, + BatteryData); + + /* Setup the IRP work entry */ + CompBattMonitorIrpComplete(BatteryData->DeviceObject, Irp, 0); + Status = STATUS_SUCCESS; + } + else + { + /* Fail, no memory */ + if (CompBattDebug & 8) + DbgPrint("CompBatt: Couldn't allocate new battery Irp\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + ObfDereferenceObject(BatteryData->DeviceObject); + } + } + else if (CompBattDebug & 8) + { + /* Fail */ + DbgPrint("CompBattAddNewBattery: Failed to get device Object. status = %lx\n", + Status); + } + + /* Free the battery data */ + ExFreePool(BatteryData); + } + else + { + /* Fail, no memory */ + if (CompBattDebug & 8) + DbgPrint("CompBatt: Couldn't allocate new battery node\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* We're done */ + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING AddNewBattery\n"); + return Status; } NTSTATUS @@ -60,16 +213,65 @@ CompBattRemoveBattery(IN PCUNICODE_STRING BatteryName, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PCOMPBATT_BATTERY_DATA BatteryData; + if (CompBattDebug & 1) DbgPrint("CompBatt: RemoveBattery\n"); + + /* Remove the entry */ + BatteryData = RemoveBatteryFromList(BatteryName, DeviceExtension); + if (BatteryData) + { + /* Dereference and free it */ + ObfDereferenceObject(BatteryData->DeviceObject); + ExFreePool(BatteryData); + + /* Notify class driver */ + DeviceExtension->Flags = 0; + BatteryClassStatusNotify(DeviceExtension->ClassData); + } + + /* It's done */ + return STATUS_SUCCESS; } NTSTATUS NTAPI CompBattGetBatteries(IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PWCHAR p; + NTSTATUS Status; + PWCHAR LinkList; + UNICODE_STRING LinkString; + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING GetBatteries\n"); + + /* Get all battery links */ + Status = IoGetDeviceInterfaces(&GUID_DEVICE_BATTERY, NULL, 0, &LinkList); + p = LinkList; + if (NT_SUCCESS(Status)) + { + /* Loop all strings inside */ + while (TRUE) + { + /* Create the string */ + RtlInitUnicodeString(&LinkString, p); + if (!LinkString.Length) break; + + /* Add this battery and move on */ + Status = CompBattAddNewBattery(&LinkString, DeviceExtension); + p += (LinkString.Length / sizeof(WCHAR)) + sizeof(UNICODE_NULL); + } + + /* Parsing complete, clean up buffer */ + ExFreePool(LinkList); + } + else if (CompBattDebug & 8) + { + /* Fail */ + DbgPrint("CompBatt: Couldn't get list of batteries\n"); + } + + /* Done */ + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING GetBatteries\n"); + return Status; } NTSTATUS @@ -77,8 +279,32 @@ CompBattPnpEventHandler(IN PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification, IN PCOMPBATT_DEVICE_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (CompBattDebug & 1) DbgPrint("CompBatt: ENTERING PnpEventHandler\n"); + if (CompBattDebug & 2) DbgPrint("CompBatt: Received device interface change notification\n"); + + /* Check what happened */ + if (IsEqualGUIDAligned(&Notification->Event, &GUID_DEVICE_INTERFACE_ARRIVAL)) + { + /* Add the new battery */ + if (CompBattDebug & 2) + DbgPrint("CompBatt: Received notification of battery arrival\n"); + CompBattAddNewBattery(Notification->SymbolicLinkName, DeviceExtension); + } + else if (IsEqualGUIDAligned(&Notification->Event, &GUID_DEVICE_INTERFACE_REMOVAL)) + { + /* Don't do anything */ + if (CompBattDebug & 2) + DbgPrint("CompBatt: Received notification of battery removal\n"); + } + else + { + /* Shouldn't happen */ + if (CompBattDebug & 2) DbgPrint("CompBatt: Received unhandled PnP event\n"); + } + + /* Done, return success */ + if (CompBattDebug & 1) DbgPrint("CompBatt: EXITING PnpEventHandler\n"); + return STATUS_SUCCESS; } NTSTATUS @@ -251,7 +477,7 @@ { /* Complete the request */ Status = Irp->IoStatus.Status; - IofCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* Release the remove lock and return status */

1 0

[tkreuzer] 46539: [MINGW] Apply MSVC compilation fixes
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 01:34:21 2010 New Revision: 46539 URL: http://svn.reactos.org/svn/reactos?rev=46539&view=rev Log: [MINGW] Apply MSVC compilation fixes Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] Mon Mar 29 01:34:21 2010 @@ -7,6 +7,16 @@ void _fpreset (void); void _fpreset (void) - { __asm__ ("fninit" ) ;} +{ +#ifdef __GNUC__ + __asm__ ("fninit" ); +#else + __asm fninit; +#endif +} +#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); +#else +void fpreset(void) { _fpreset(); } +#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Mon Mar 29 01:34:21 2010 @@ -14,4 +14,8 @@ (* __MINGW_IMP_SYMBOL(_fpreset))(); } +#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); +#else +void fpreset(void) { _fpreset(); } +#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Mon Mar 29 01:34:21 2010 @@ -20,6 +20,7 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> +#include <intrin.h> #ifndef __winitenv extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); @@ -51,7 +52,11 @@ #define _commode (* __MINGW_IMP_SYMBOL(_commode)) extern int _dowildcard; +#if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; +#else +int _MINGW_INSTALL_DEBUG_MATHERR = 0; +#endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Mon Mar 29 01:34:21 2010 @@ -112,12 +112,22 @@ else #endif { +#ifdef __GNUC__ #ifdef _WIN64 GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; #else GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; +#endif +#else +#ifdef _WIN64 + GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); + GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); +#else + GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); + GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); +#endif #endif }

1 0

[tkreuzer] 46538: Apply MSVC compilation fix.
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 01:32:29 2010 New Revision: 46538 URL: http://svn.reactos.org/svn/reactos?rev=46538&view=rev Log: Apply MSVC compilation fix. Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Mon Mar 29 01:32:29 2010 @@ -35,6 +35,12 @@ #define __IOINFO_TM_UTF8 1 #define __IOINFO_TM_UTF16LE 2 +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#pragma warning(disable:4820) +#endif + typedef struct { intptr_t osfhnd; char osfile; @@ -45,6 +51,10 @@ char unicode : 1; char pipech2[2]; } ioinfo; + +#ifdef _MSC_VER +#pragma warning(pop) +#endif #define IOINFO_ARRAY_ELTS (1 << 5) Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] Mon Mar 29 01:32:29 2010 @@ -30,6 +30,11 @@ #endif #endif +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:4214) +#endif + typedef struct _FTIME { unsigned short twosecs : 5; @@ -46,6 +51,10 @@ unsigned short year : 7; } FDATE; +#ifdef _MSC_VER +#pragma warning(pop) +#endif + typedef FDATE *PFDATE; #endif Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/reactos.diff [iso-8859-1] Mon Mar 29 01:32:29 2010 @@ -1,8 +1,8 @@ Index: internal.h =================================================================== ---- internal.h (Revision 43956) +--- internal.h (Revision 46537) +++ internal.h (Arbeitskopie) -@@ -32,6 +32,12 @@ +@@ -35,6 +35,12 @@ #define __IOINFO_TM_UTF8 1 #define __IOINFO_TM_UTF16LE 2 @@ -15,7 +15,7 @@ typedef struct { intptr_t osfhnd; char osfile; -@@ -43,6 +49,10 @@ +@@ -46,6 +52,10 @@ char pipech2[2]; } ioinfo; @@ -28,7 +28,7 @@ #define _pioinfo(i) (__pioinfo[(i) >> 5] + ((i) & (IOINFO_ARRAY_ELTS - 1))) Index: oscalls.h =================================================================== ---- oscalls.h (Revision 43956) +--- oscalls.h (Revision 46537) +++ oscalls.h (Arbeitskopie) @@ -30,6 +30,11 @@ #endif @@ -55,7 +55,7 @@ #endif Index: sect_attribs.h =================================================================== ---- sect_attribs.h (Revision 43956) +--- sect_attribs.h (Revision 46537) +++ sect_attribs.h (Arbeitskopie) @@ -10,7 +10,7 @@ #define _ATTRIBUTES shared Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Mon Mar 29 01:32:29 2010 @@ -10,7 +10,7 @@ #define _ATTRIBUTES shared #endif -#if 0 +#if defined(_MSC_VER) /* Reference list of existing section for msvcrt. */ #pragma section(".CRTMP$XCA",long,_ATTRIBUTES) #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES) @@ -55,6 +55,14 @@ #pragma section(".rtc$IZZ",long,read) #pragma section(".rtc$TAA",long,read) #pragma section(".rtc$TZZ",long,read) +#pragma section(".tls",long,read,write) +#pragma section(".tls$ZZZ",long,read,write) #endif +#if defined(_MSC_VER) +#define _CRTALLOC(x) __declspec(allocate(x)) +#elif defined(__GNUC__) #define _CRTALLOC(x) __attribute__ ((section (x) )) +#else +#error +#endif

1 0

[tkreuzer] 46537: [MINGW] Update mingw library to mingw-w64 trunk (mingw-w64-src_20100325)
by tkreuzer＠svn.reactos.org 28 Mar '10

28 Mar '10

Author: tkreuzer Date: Mon Mar 29 01:27:01 2010 New Revision: 46537 URL: http://svn.reactos.org/svn/reactos?rev=46537&view=rev Log: [MINGW] Update mingw library to mingw-w64 trunk (mingw-w64-src_20100325) Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_noglob.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtbegin.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtend.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmcrt.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmthread.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsthrd.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ucrtexe.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udll_argv.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udllargc.c (with props) branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c (with props) Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_newmode.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/charmax.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/merr.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_helpers.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/natstart.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xncommod.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xthdloc.c branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xtxtmode.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/internal.h [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #ifndef _INC_INTERNAL @@ -18,9 +18,12 @@ #pragma pack(push,_CRT_PACKING) +#ifndef __INTERNAL_FUNC_DEFINED +#define __INTERNAL_FUNC_DEFINED typedef void (__cdecl *_PVFV)(void); typedef int (__cdecl *_PIFV)(void); typedef void (__cdecl *_PVFI)(int); +#endif #if defined (SPECIAL_CRTEXE) && (defined (_DLL) || defined (__GNUC__)) extern int _commode; @@ -32,12 +35,6 @@ #define __IOINFO_TM_UTF8 1 #define __IOINFO_TM_UTF16LE 2 -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4214) -#pragma warning(disable:4820) -#endif - typedef struct { intptr_t osfhnd; char osfile; @@ -48,10 +45,6 @@ char unicode : 1; char pipech2[2]; } ioinfo; - -#ifdef _MSC_VER -#pragma warning(pop) -#endif #define IOINFO_ARRAY_ELTS (1 << 5) Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/oscalls.h [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #ifndef _INC_OSCALLS @@ -30,11 +30,6 @@ #endif #endif -#ifdef _MSC_VER -#pragma warning(push) -#pragma warning(disable:4214) -#endif - typedef struct _FTIME { unsigned short twosecs : 5; @@ -51,10 +46,6 @@ unsigned short year : 7; } FDATE; -#ifdef _MSC_VER -#pragma warning(pop) -#endif - typedef FDATE *PFDATE; #endif Modified: branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #if defined (__ia64__) || defined (__x86_64) @@ -10,7 +10,7 @@ #define _ATTRIBUTES shared #endif -#if defined(_MSC_VER) +#if 0 /* Reference list of existing section for msvcrt. */ #pragma section(".CRTMP$XCA",long,_ATTRIBUTES) #pragma section(".CRTMP$XCZ",long,_ATTRIBUTES) @@ -55,14 +55,6 @@ #pragma section(".rtc$IZZ",long,read) #pragma section(".rtc$TAA",long,read) #pragma section(".rtc$TZZ",long,read) -#pragma section(".tls",long,read,write) -#pragma section(".tls$ZZZ",long,read,write) #endif -#if defined(_MSC_VER) -#define _CRTALLOC(x) __declspec(allocate(x)) -#elif defined(__GNUC__) #define _CRTALLOC(x) __attribute__ ((section (x) )) -#else -#error -#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp10.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,22 +1,12 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ void _fpreset (void); void _fpreset (void) -{ -#ifdef __GNUC__ - __asm__ ("fninit" ); -#else - __asm fninit; -#endif -} + { __asm__ ("fninit" ) ;} -#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); -#else -void fpreset(void) { _fpreset(); } -#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_fp8.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <_mingw.h> @@ -14,8 +14,4 @@ (* __MINGW_IMP_SYMBOL(_fpreset))(); } -#ifdef __GNUC__ void __attribute__ ((alias ("_fpreset"))) fpreset(void); -#else -void fpreset(void) { _fpreset(); } -#endif Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_glob.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -2,7 +2,7 @@ * CRT_glob.c * This file has no copyright is assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within the package. + * No warranty is given; refer to the file DISCLAIMER.PD within the package. * * Include this object file to set _dowildcard to a state that will turn on * command line globbing by default. (wildcard.o which goes into libmingw32.a Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_noglob.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_noglob.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_noglob.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,17 @@ +/* + * CRT_noglob.c + * This file has no copyright is assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within the package. + * + * Include this object file to set _dowildcard to a state that will turn off + * command line globbing by default. (wildcard.o which goes into libmingw32.a + * has a default state of off if not configured with --enable-wildcard.) + * + * To use this object include the object file in your link command: + * gcc -o foo.exe foo.o CRT_noglob.o + * + */ + +int _dowildcard = 0; + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/CRT_noglob.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_newmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_newmode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/_newmode.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ int _newmode = 0; Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/atonexit.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #undef CRTDLL Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/binmode.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #define SPECIAL_CRTEXE Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/charmax.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/charmax.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/charmax.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <sect_attribs.h> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_c.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <windows.h> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt0_w.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <windows.h> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crt_handler.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <windows.h> @@ -12,6 +12,14 @@ #include <memory.h> #include <signal.h> #include <stdio.h> + +#if defined (_WIN64) && defined (__ia64__) +#error FIXME: Unsupported __ImageBase implementation. +#else +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +/* This symbol is defined by the linker. */ +extern IMAGE_DOS_HEADER __ImageBase; +#endif #pragma pack(push,1) typedef struct _UNWIND_INFO { @@ -107,6 +115,8 @@ (*old_handler) (SIGSEGV); action = EXCEPTION_CONTINUE_EXECUTION; } + else + action = EXCEPTION_EXECUTE_HANDLER; break; case EXCEPTION_ILLEGAL_INSTRUCTION: case EXCEPTION_PRIV_INSTRUCTION: @@ -125,6 +135,8 @@ (*old_handler) (SIGILL); action = EXCEPTION_CONTINUE_EXECUTION; } + else + action = EXCEPTION_EXECUTE_HANDLER; break; case EXCEPTION_FLT_INVALID_OPERATION: case EXCEPTION_FLT_DIVIDE_BY_ZERO: Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtbegin.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtbegin.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtbegin.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,6 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtbegin.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #ifdef CRTDLL @@ -40,6 +40,7 @@ extern _CRTALLOC(".CRT$XCA") _PVFV __xc_a[]; extern _CRTALLOC(".CRT$XCZ") _PVFV __xc_z[]; +/* TLS initialization hook. */ extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback; static int __proc_attached = 0; @@ -49,9 +50,9 @@ extern int mingw_app_type; -extern BOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved); - -extern BOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); +extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved); + +extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); static int pre_c_init (void); @@ -71,7 +72,7 @@ return 0; } -BOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) +WINBOOL WINAPI _CRT_INIT (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { if (dwReason == DLL_PROCESS_DETACH) { @@ -148,12 +149,12 @@ return TRUE; } -static BOOL __DllMainCRTStartup (HANDLE, DWORD, LPVOID); - -BOOL WINAPI DllMainCRTStartup (HANDLE, DWORD, LPVOID); +static WINBOOL __DllMainCRTStartup (HANDLE, DWORD, LPVOID); + +WINBOOL WINAPI DllMainCRTStartup (HANDLE, DWORD, LPVOID); int __mingw_init_ehandler (void); -BOOL WINAPI +WINBOOL WINAPI DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { mingw_app_type = 0; @@ -167,10 +168,10 @@ return __DllMainCRTStartup (hDllHandle, dwReason, lpreserved); } -__declspec(noinline) BOOL +__declspec(noinline) WINBOOL __DllMainCRTStartup (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) { - BOOL retcode = TRUE; + WINBOOL retcode = TRUE; __native_dllmain_reason = dwReason; if (dwReason == DLL_PROCESS_DETACH && __proc_attached == 0) Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtend.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtend.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtend.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,6 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtend.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #undef CRTDLL @@ -20,7 +20,6 @@ #include <tchar.h> #include <sect_attribs.h> #include <locale.h> -#include <intrin.h> #ifndef __winitenv extern wchar_t *** __MINGW_IMP_SYMBOL(__winitenv); @@ -31,6 +30,11 @@ extern char *** __MINGW_IMP_SYMBOL(__initenv); #define __initenv (* __MINGW_IMP_SYMBOL(__initenv)) #endif + +/* Hack, for bug in ld. Will be removed soon. */ +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +/* This symbol is defined by ld. */ +extern IMAGE_DOS_HEADER __ImageBase; extern void _fpreset (void); #define SPACECHAR _T(' ') @@ -47,11 +51,7 @@ #define _commode (* __MINGW_IMP_SYMBOL(_commode)) extern int _dowildcard; -#if defined(__GNUC__) int _MINGW_INSTALL_DEBUG_MATHERR __attribute__((weak)) = 0; -#else -int _MINGW_INSTALL_DEBUG_MATHERR = 0; -#endif extern int __defaultmatherr; extern _CRTIMP void __cdecl _initterm(_PVFV *, _PVFV *); @@ -62,6 +62,7 @@ extern _CRTALLOC(".CRT$XCA") _PVFV __xc_a[]; extern _CRTALLOC(".CRT$XCZ") _PVFV __xc_z[]; +/* TLS initialization hook. */ extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback; extern _PVFV *__onexitbegin; @@ -179,7 +180,7 @@ { _TCHAR *lpszCommandLine = NULL; STARTUPINFO StartupInfo; - BOOL inDoubleQuote = FALSE; + WINBOOL inDoubleQuote = FALSE; memset (&StartupInfo, 0, sizeof (STARTUPINFO)); if (mingw_app_type) Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dll_argv.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #ifdef CRTDLL Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllargv.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #ifdef CRTDLL Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dllentry.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <oscalls.h> Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/dummy_mingwthrd.c (removed) @@ -1,148 +1,0 @@ -/* - * mthr_stub.c - * - * Implement Mingw-w64 thread-support. - * - * This file is used by if gcc is built with --enable-threads=win32. - * - * Based on version created by Mumit Khan <khan(a)nanotech.wisc.edu> - * - */ - -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include <windows.h> -#include <stdlib.h> - -BOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); -int ___w64_mingwthr_remove_key_dtor (DWORD key); -int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)); - -/* To protect the thread/key association data structure modifications. */ -static CRITICAL_SECTION __mingwthr_cs; -static volatile int __mingwthr_cs_init = 0; - -typedef struct __mingwthr_key __mingwthr_key_t; - -/* The list of threads active with key/dtor pairs. */ -struct __mingwthr_key { - DWORD key; - void (*dtor)(void *); - __mingwthr_key_t volatile *next; -}; - - -static __mingwthr_key_t volatile *key_dtor_list; - -int -___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)) -{ - __mingwthr_key_t *new_key; - - if (__mingwthr_cs_init == 0) - return 0; - new_key = (__mingwthr_key_t *)malloc(sizeof (__mingwthr_key_t)); - - if (new_key == NULL) - return -1; - - memset(new_key, 0,sizeof (__mingwthr_key_t)); - new_key->key = key; - new_key->dtor = dtor; - - EnterCriticalSection (&__mingwthr_cs); - - new_key->next = key_dtor_list; - key_dtor_list = new_key; - - LeaveCriticalSection (&__mingwthr_cs); - return 0; -} - -int -___w64_mingwthr_remove_key_dtor (DWORD key) -{ - __mingwthr_key_t volatile *prev_key; - __mingwthr_key_t volatile *cur_key; - - if (__mingwthr_cs_init == 0) - return 0; - - EnterCriticalSection (&__mingwthr_cs); - - prev_key = NULL; - cur_key = key_dtor_list; - - while (cur_key != NULL) - { - if ( cur_key->key == key) - { - if (prev_key == NULL) - key_dtor_list = cur_key->next; - else - prev_key->next = cur_key->next; - - free ((void*)cur_key); - break; - } - prev_key = cur_key; - cur_key = cur_key->next; - } - - LeaveCriticalSection (&__mingwthr_cs); - return 0; -} - -static void -__mingwthr_run_key_dtors (void) -{ - __mingwthr_key_t volatile *keyp; - - if (__mingwthr_cs_init == 0) - return; - EnterCriticalSection (&__mingwthr_cs); - - for (keyp = key_dtor_list; keyp; ) - { - LPVOID value = TlsGetValue (keyp->key); - if (GetLastError () == ERROR_SUCCESS) - { - if (value) - (*keyp->dtor) (value); - } - keyp = keyp->next; - } - - LeaveCriticalSection (&__mingwthr_cs); -} - -BOOL -__mingw_TLScallback (HANDLE hDllHandle __attribute__ ((__unused__)), - DWORD reason, - LPVOID reserved __attribute__ ((__unused__))) -{ - switch (reason) - { - case DLL_PROCESS_ATTACH: - if (__mingwthr_cs_init == 0) - InitializeCriticalSection (&__mingwthr_cs); - __mingwthr_cs_init = 1; - break; - case DLL_PROCESS_DETACH: - __mingwthr_run_key_dtors(); - if (__mingwthr_cs_init == 1) - { - __mingwthr_cs_init = 0; - DeleteCriticalSection (&__mingwthr_cs); - } - break; - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - __mingwthr_run_key_dtors(); - break; - } - return TRUE; -} - Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gccmain.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <windows.h> Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/getopt.c (removed) @@ -1,394 +1,0 @@ -#include <assert.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <getopt.h> -#include <stdarg.h> -#include <stdio.h> - -#define REPLACE_GETOPT - -#define _DIAGASSERT(x) do {} while (0) - -#ifdef REPLACE_GETOPT -#ifdef __weak_alias -__weak_alias(getopt,_getopt) -#endif -int opterr = 1; -int optind = 1; -int optopt = '?'; -int optreset; -char *optarg; -#endif - -#ifdef __weak_alias -__weak_alias(getopt_long,_getopt_long) -#endif - -#ifndef __CYGWIN__ -#define __progname __argv[0] -#else -extern char __declspec(dllimport) *__progname; -#endif - -#define IGNORE_FIRST (*options == '-' || *options == '+') -#define PRINT_ERROR ((opterr) && ((*options != ':') || (IGNORE_FIRST && options[1] != ':'))) - -#ifndef IS_POSIXLY_CORRECT -#define IS_POSIXLY_CORRECT (getenv("POSIXLY_CORRECT") != NULL) -#endif - -#define PERMUTE (!IS_POSIXLY_CORRECT && !IGNORE_FIRST) - -#define IN_ORDER (!IS_POSIXLY_CORRECT && *options == '-') - -#define BADCH (int)'?' -#define BADARG ((IGNORE_FIRST && options[1] == ':') || (*options == ':') ? (int)':' : (int)'?') -#define INORDER (int)1 - -static char EMSG[1]; - -static int getopt_internal (int,char * const *,const char *); -static int gcd (int,int); -static void permute_args (int,int,int,char * const *); - -static char *place = EMSG; - -static int nonopt_start = -1; -static int nonopt_end = -1; - -static const char recargchar[] = "option requires an argument -- %c"; -static const char recargstring[] = "option requires an argument -- %s"; -static const char ambig[] = "ambiguous option -- %.*s"; -static const char noarg[] = "option doesn't take an argument -- %.*s"; -static const char illoptchar[] = "unknown option -- %c"; -static const char illoptstring[] = "unknown option -- %s"; - -static void -_vwarnx(const char *fmt,va_list ap) -{ - (void)fprintf(stderr,"%s: ",__progname); - if (fmt != NULL) - (void)vfprintf(stderr,fmt,ap); - (void)fprintf(stderr,"\n"); -} - -static void -warnx(const char *fmt,...) -{ - va_list ap; - va_start(ap,fmt); - _vwarnx(fmt,ap); - va_end(ap); -} - -static int -gcd(a,b) - int a; - int b; -{ - int c; - - c = a % b; - while (c != 0) { - a = b; - b = c; - c = a % b; - } - - return b; -} - -static void -permute_args(panonopt_start,panonopt_end,opt_end,nargv) - int panonopt_start; - int panonopt_end; - int opt_end; - char * const *nargv; -{ - int cstart,cyclelen,i,j,ncycle,nnonopts,nopts,pos; - char *swap; - - _DIAGASSERT(nargv != NULL); - - nnonopts = panonopt_end - panonopt_start; - nopts = opt_end - panonopt_end; - ncycle = gcd(nnonopts,nopts); - cyclelen = (opt_end - panonopt_start) / ncycle; - - for (i = 0; i < ncycle; i++) { - cstart = panonopt_end+i; - pos = cstart; - for (j = 0; j < cyclelen; j++) { - if (pos >= panonopt_end) - pos -= nnonopts; - else - pos += nopts; - swap = nargv[pos]; - - ((char **) nargv)[pos] = nargv[cstart]; - - ((char **)nargv)[cstart] = swap; - } - } -} - -static int -getopt_internal(nargc,nargv,options) - int nargc; - char * const *nargv; - const char *options; -{ - char *oli; - int optchar; - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(options != NULL); - - optarg = NULL; - - if (optind == 0) - optind = 1; - - if (optreset) - nonopt_start = nonopt_end = -1; -start: - if (optreset || !*place) { - optreset = 0; - if (optind >= nargc) { - place = EMSG; - if (nonopt_end != -1) { - - permute_args(nonopt_start,nonopt_end,optind,nargv); - optind -= nonopt_end - nonopt_start; - } - else if (nonopt_start != -1) { - - optind = nonopt_start; - } - nonopt_start = nonopt_end = -1; - return -1; - } - if ((*(place = nargv[optind]) != '-') - || (place[1] == '\0')) { - place = EMSG; - if (IN_ORDER) { - - optarg = nargv[optind++]; - return INORDER; - } - if (!PERMUTE) { - - return -1; - } - - if (nonopt_start == -1) - nonopt_start = optind; - else if (nonopt_end != -1) { - permute_args(nonopt_start,nonopt_end,optind,nargv); - nonopt_start = optind - - (nonopt_end - nonopt_start); - nonopt_end = -1; - } - optind++; - - goto start; - } - if (nonopt_start != -1 && nonopt_end == -1) - nonopt_end = optind; - if (place[1] && *++place == '-') { - place++; - return -2; - } - } - if ((optchar = (int)*place++) == (int)':' || - (oli = strchr(options + (IGNORE_FIRST ? 1 : 0),optchar)) == NULL) { - - if (!*place) - ++optind; - if (PRINT_ERROR) - warnx(illoptchar,optchar); - optopt = optchar; - return BADCH; - } - if (optchar == 'W' && oli[1] == ';') { - - if (*place) - return -2; - - if (++optind >= nargc) { - place = EMSG; - if (PRINT_ERROR) - warnx(recargchar,optchar); - optopt = optchar; - return BADARG; - } else - place = nargv[optind]; - - return -2; - } - if (*++oli != ':') { - if (!*place) - ++optind; - } else { - optarg = NULL; - if (*place) - optarg = place; - - else if (oli[1] != ':') { - if (++optind >= nargc) { - place = EMSG; - if (PRINT_ERROR) - warnx(recargchar,optchar); - optopt = optchar; - return BADARG; - } else - optarg = nargv[optind]; - } - place = EMSG; - ++optind; - } - - return optchar; -} - -#ifdef REPLACE_GETOPT - -int -getopt(nargc,nargv,options) - int nargc; - char * const *nargv; - const char *options; -{ - int retval; - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(options != NULL); - - if ((retval = getopt_internal(nargc,nargv,options)) == -2) { - ++optind; - - if (nonopt_end != -1) { - permute_args(nonopt_start,nonopt_end,optind,nargv); - optind -= nonopt_end - nonopt_start; - } - nonopt_start = nonopt_end = -1; - retval = -1; - } - return retval; -} -#endif - -int -getopt_long(nargc,nargv,options,long_options,idx) - int nargc; - char * const *nargv; - const char *options; - const struct option *long_options; - int *idx; -{ - int retval; - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(options != NULL); - _DIAGASSERT(long_options != NULL); - - if ((retval = getopt_internal(nargc,nargv,options)) == -2) { - char *current_argv,*has_equal; - size_t current_argv_len; - int i,match; - - current_argv = place; - match = -1; - - optind++; - place = EMSG; - - if (*current_argv == '\0') { - - if (nonopt_end != -1) { - permute_args(nonopt_start,nonopt_end,optind,nargv); - optind -= nonopt_end - nonopt_start; - } - nonopt_start = nonopt_end = -1; - return -1; - } - if ((has_equal = strchr(current_argv,'=')) != NULL) { - - current_argv_len = has_equal - current_argv; - has_equal++; - } else - current_argv_len = strlen(current_argv); - - for (i = 0; long_options[i].name; i++) { - - if (strncmp(current_argv,long_options[i].name,current_argv_len)) - continue; - - if (strlen(long_options[i].name) == - (unsigned)current_argv_len) { - - match = i; - break; - } - if (match == -1) - match = i; - else { - - if (PRINT_ERROR) - warnx(ambig,(int)current_argv_len,current_argv); - optopt = 0; - return BADCH; - } - } - if (match != -1) { - if (long_options[match].has_arg == no_argument - && has_equal) { - if (PRINT_ERROR) - warnx(noarg,(int)current_argv_len,current_argv); - - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - return BADARG; - } - if (long_options[match].has_arg == required_argument || - long_options[match].has_arg == optional_argument) { - if (has_equal) - optarg = has_equal; - else if (long_options[match].has_arg == - required_argument) { - - optarg = nargv[optind++]; - } - } - if ((long_options[match].has_arg == required_argument) - && (optarg == NULL)) { - - if (PRINT_ERROR) - warnx(recargstring,current_argv); - - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - --optind; - return BADARG; - } - } else { - if (PRINT_ERROR) - warnx(illoptstring,current_argv); - optopt = 0; - return BADCH; - } - if (long_options[match].flag) { - *long_options[match].flag = long_options[match].val; - retval = 0; - } else - retval = long_options[match].val; - if (idx) - *idx = match; - } - return retval; -} Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <windows.h> @@ -112,22 +112,12 @@ else #endif { -#ifdef __GNUC__ #ifdef _WIN64 GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; #else GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; -#endif -#else -#ifdef _WIN64 - GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); - GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); -#else - GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); - GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); -#endif #endif } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,16 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#include <ctype.h> + +#undef isascii +int isascii (int); + +int +isascii (int c) +{ + return __isascii(c); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/isascii.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,16 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#include <ctype.h> +#undef iscsym + +int iscsym (int); + +int +iscsym (int c) +{ + return __iscsym(c); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsym.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,16 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#include <ctype.h> +#undef iscsymf + +int iscsymf (int); + +int +iscsymf (int c) +{ + return __iscsymf(c); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/iscsymf.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/merr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/merr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/merr.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <internal.h> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -3,6 +3,10 @@ <group> <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll"> <define name="_CRTBLD" /> + +  + <define name="_M_CEE_PURE" /> + <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="ReactOS">include/reactos/mingw-w64</include> <if property="USERMODE" value="1"> @@ -18,19 +22,18 @@ <file>CRT_glob.c</file> <file>crt_handler.c</file> <file>dllentry.c</file> - <file>dummy_mingwthrd.c</file> <file>gccmain.c</file> - <file>getopt.c</file> <file>gs_support.c</file> <file>merr.c</file>  <file>mingw_helpers.c</file> - <file>mingwthrd_nomt.c</file> <file>natstart.c</file> <file>pesect.c</file> <file>pseudo-reloc.c</file> <file>pseudo-reloc-list.c</file> + <file>tlsmcrt.c</file> <file>tlssup.c</file> + <file>tlsthrd.c</file> <file>txtmode.c</file> <file>wildcard.c</file> <file>xncommod.c</file> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_custom.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <_mingw.h> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_helpers.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_helpers.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw_helpers.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <oscalls.h> Removed: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingwthrd_nomt.c (removed) @@ -1,30 +1,0 @@ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include <windows.h> -#include <stdlib.h> - -/* We support TLS cleanup code in any case. If shared version of libgcc is used _CRT_MT has value 1, otherwise - we do tls cleanup in runtime and _CRT_MT has value 2. */ -int _CRT_MT = 2; - -int __mingwthr_key_dtor (DWORD key, void (*dtor)(void *)); -int __mingwthr_remove_key_dtor (DWORD key); - -extern int ___w64_mingwthr_remove_key_dtor (DWORD key); -extern int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)); - -int -__mingwthr_remove_key_dtor (DWORD key) -{ - return ___w64_mingwthr_remove_key_dtor (key); -} - -int -__mingwthr_key_dtor (DWORD key, void (*dtor)(void *)) -{ - if (dtor) - return ___w64_mingwthr_add_key_dtor (key, dtor); - - return 0; -} Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/natstart.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/natstart.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/natstart.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <crtdefs.h> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pesect.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,15 +1,24 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <windows.h> #include <string.h> -BOOL _ValidateImageBase (PBYTE); +#if defined (_WIN64) && defined (__ia64__) +#error FIXME: Unsupported __ImageBase implementation. +#else +/* Hack, for bug in ld. Will be removed soon. */ +#define __ImageBase __MINGW_LSYMBOL(_image_base__) +/* This symbol is defined by the linker. */ +extern IMAGE_DOS_HEADER __ImageBase; +#endif -BOOL +WINBOOL _ValidateImageBase (PBYTE); + +WINBOOL _ValidateImageBase (PBYTE pImageBase) { PIMAGE_DOS_HEADER pDOSHeader; @@ -122,9 +131,9 @@ return pImageBase; } -BOOL _IsNonwritableInCurrentImage (PBYTE); +WINBOOL _IsNonwritableInCurrentImage (PBYTE); -BOOL +WINBOOL _IsNonwritableInCurrentImage (PBYTE pTarget) { PBYTE pImageBase; Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc-list.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ char __RUNTIME_PSEUDO_RELOC_LIST_END__ = 0; Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/pseudo-reloc.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,27 +1,71 @@ -/** - * This file has no copyright assigned and is placed in the Public Domain. - * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. - * - * Contributed by Egor Duda <deo(a)logos-m.ru> - * Modified by addition of runtime_pseudo_reloc version 2 - * by Kai Tietz <kai.tietz(a)onevision.com> - */ +/* pseudo-reloc.c + + Contributed by Egor Duda <deo(a)logos-m.ru> + Modified by addition of runtime_pseudo_reloc version 2 + by Kai Tietz <kai.tietz(a)onevision.com> + + THIS SOFTWARE IS NOT COPYRIGHTED + + This source code is offered for use in the public domain. You may + use, modify or distribute it freely. + + This code is distributed in the hope that it will be useful but + WITHOUT ANY WARRANTY. ALL WARRENTIES, EXPRESS OR IMPLIED ARE HEREBY + DISCLAMED. This includes but is not limited to warrenties of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ #include <windows.h> #include <stdio.h> #include <stdlib.h> +#include <stdarg.h> #include <memory.h> -#include <assert.h> + +#if defined(__CYGWIN__) +#include <wchar.h> +#include <ntdef.h> +#include <sys/cygwin.h> +/* copied from winsup.h */ +# define NO_COPY __attribute__((nocommon)) __attribute__((section(".data_cygwin_nocopy"))) +/* custom status code: */ +#define STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION ((NTSTATUS) 0xe0000269) +#define SHORT_MSG_BUF_SZ 128 +#else +# define NO_COPY +#endif + +#ifdef __GNUC__ +#define ATTRIBUTE_NORETURN __attribute__ ((noreturn)) +#else +#define ATTRIBUTE_NORETURN +#endif + +#ifndef __MINGW_LSYMBOL +#define __MINGW_LSYMBOL(sym) sym +#endif extern char __RUNTIME_PSEUDO_RELOC_LIST__; extern char __RUNTIME_PSEUDO_RELOC_LIST_END__; - +extern char __MINGW_LSYMBOL(_image_base__); + +void _pei386_runtime_relocator (void); + +/* v1 relocation is basically: + * *(base + .target) += .addend + * where (base + .target) is always assumed to point + * to a DWORD (4 bytes). + */ typedef struct { DWORD addend; DWORD target; } runtime_pseudo_reloc_item_v1; +/* v2 relocation is more complex. In effect, it is + * *(base + .target) += *(base + .sym) - (base + .sym) + * with care taken in both reading, sign extension, and writing + * because .flags may indicate that (base + .target) may point + * to a BYTE, WORD, DWORD, or QWORD (w64). + */ typedef struct { DWORD sym; DWORD target; @@ -29,24 +73,123 @@ } runtime_pseudo_reloc_item_v2; typedef struct { - DWORD magic1; - DWORD magic2; - DWORD version; + DWORD magic1; + DWORD magic2; + DWORD version; } runtime_pseudo_reloc_v2; +static void ATTRIBUTE_NORETURN +__report_error (const char *msg, ...) +{ +#ifdef __CYGWIN__ + /* This function is used to print short error messages + * to stderr, which may occur during DLL initialization + * while fixing up 'pseudo' relocations. This early, we + * may not be able to use cygwin stdio functions, so we + * use the win32 WriteFile api. This should work with both + * normal win32 console IO handles, redirected ones, and + * cygwin ptys. + */ + char buf[SHORT_MSG_BUF_SZ]; + wchar_t module[MAX_PATH]; + char * posix_module = NULL; + static const char UNKNOWN_MODULE[] = "<unknown module>: "; + static const size_t UNKNOWN_MODULE_LEN = sizeof (UNKNOWN_MODULE) - 1; + static const char CYGWIN_FAILURE_MSG[] = "Cygwin runtime failure: "; + static const size_t CYGWIN_FAILURE_MSG_LEN = sizeof (CYGWIN_FAILURE_MSG) - 1; + DWORD len; + DWORD done; + va_list args; + HANDLE errh = GetStdHandle (STD_ERROR_HANDLE); + ssize_t modulelen = GetModuleFileNameW (NULL, module, sizeof (module)); + + if (errh == INVALID_HANDLE_VALUE) + cygwin_internal (CW_EXIT_PROCESS, + STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION, + 1); + + if (modulelen > 0) + posix_module = cygwin_create_path (CCP_WIN_W_TO_POSIX, module); + + va_start (args, msg); + len = (DWORD) vsnprintf (buf, SHORT_MSG_BUF_SZ, msg, args); + va_end (args); + buf[SHORT_MSG_BUF_SZ-1] = '\0'; /* paranoia */ + + if (posix_module) + { + WriteFile (errh, (PCVOID)CYGWIN_FAILURE_MSG, + CYGWIN_FAILURE_MSG_LEN, &done, NULL); + WriteFile (errh, (PCVOID)posix_module, + strlen(posix_module), &done, NULL); + WriteFile (errh, (PCVOID)": ", 2, &done, NULL); + WriteFile (errh, (PCVOID)buf, len, &done, NULL); + free (posix_module); + } + else + { + WriteFile (errh, (PCVOID)CYGWIN_FAILURE_MSG, + CYGWIN_FAILURE_MSG_LEN, &done, NULL); + WriteFile (errh, (PCVOID)UNKNOWN_MODULE, + UNKNOWN_MODULE_LEN, &done, NULL); + WriteFile (errh, (PCVOID)buf, len, &done, NULL); + } + WriteFile (errh, (PCVOID)"\n", 1, &done, NULL); + + cygwin_internal (CW_EXIT_PROCESS, + STATUS_ILLEGAL_DLL_PSEUDO_RELOCATION, + 1); + /* not reached, but silences noreturn warning */ + abort (); +#else + va_list argp; + va_start (argp, msg); +# ifdef __MINGW64_VERSION_MAJOR + fprintf (stderr, "Mingw-w64 runtime failure:\n"); +# else + fprintf (stderr, "Mingw runtime failure:\n"); +# endif + vfprintf (stderr, msg, argp); + va_end (argp); + abort (); +#endif +} + +/* This function temporarily marks the page containing addr + * writable, before copying len bytes from *src to *addr, and + * then restores the original protection settings to the page. + * + * Using this function eliminates the requirement with older + * pseudo-reloc implementations, that sections containing + * pseudo-relocs (such as .text and .rdata) be permanently + * marked writable. This older behavior sabotaged any memory + * savings achieved by shared libraries on win32 -- and was + * slower, too. However, on cygwin as of binutils 2.20 the + * .text section is still marked writable, and the .rdata section + * is folded into the (writable) .data when --enable-auto-import. + */ static void __write_memory (void *addr, const void *src, size_t len) { MEMORY_BASIC_INFORMATION b; DWORD oldprot; + if (!len) return; - assert (VirtualQuery (addr, &b, sizeof(b))); + + if (!VirtualQuery (addr, &b, sizeof(b))) + { + __report_error (" VirtualQuery failed for %d bytes at address %p", + (int) sizeof(b), addr); + } + /* Temporarily allow write access to read-only protected memory. */ if (b.Protect != PAGE_EXECUTE_READWRITE && b.Protect != PAGE_READWRITE) VirtualProtect (b.BaseAddress, b.RegionSize, PAGE_EXECUTE_READWRITE, &oldprot); + /* write the data. */ memcpy (addr, src, len); + /* Restore original protection. */ if (b.Protect != PAGE_EXECUTE_READWRITE && b.Protect != PAGE_READWRITE) VirtualProtect (b.BaseAddress, b.RegionSize, oldprot, &oldprot); } @@ -55,66 +198,122 @@ #define RP_VERSION_V2 1 static void -do_pseudo_reloc (void *start, void *end, void *base) +do_pseudo_reloc (void * start, void * end, void * base) { ptrdiff_t addr_imp, reldata; ptrdiff_t reloc_target = (ptrdiff_t) ((char *)end - (char*)start); runtime_pseudo_reloc_v2 *v2_hdr = (runtime_pseudo_reloc_v2 *) start; runtime_pseudo_reloc_item_v2 *r; + /* A valid relocation list will contain at least one entry, and + * one v1 data structure (the smallest one) requires two DWORDs. + * So, if the relocation list is smaller than 8 bytes, bail. + */ if (reloc_target < 8) return; - /* Check if this is old version pseudo relocation version. */ + + /* Check if this is the old pseudo relocation version. */ + /* There are two kinds of v1 relocation lists: + * 1) With a (v2-style) version header. In this case, the + * first entry in the list is a 3-DWORD structure, with + * value: + * { 0, 0, RP_VERSION_V1 } + * In this case, we skip to the next entry in the list, + * knowing that all elements after the head item can + * be cast to runtime_pseudo_reloc_item_v1. + * 2) Without a (v2-style) version header. In this case, the + * first element in the list IS an actual v1 relocation + * record, which is two DWORDs. Because there will never + * be a case where a v1 relocation record has both + * addend == 0 and target == 0, this case will not be + * confused with the prior one. + * All current binutils, when generating a v1 relocation list, + * use the second (e.g. original) form -- that is, without the + * v2-style version header. + */ if (reloc_target >= 12 && v2_hdr->magic1 == 0 && v2_hdr->magic2 == 0 && v2_hdr->version == RP_VERSION_V1) + { + /* We have a list header item indicating that the rest + * of the list contains v1 entries. Move the pointer to + * the first true v1 relocation record. By definition, + * that v1 element will not have both addend == 0 and + * target == 0 (and thus, when interpreted as a + * runtime_pseudo_reloc_v2, it will not have both + * magic1 == 0 and magic2 == 0). + */ v2_hdr++; + } + if (v2_hdr->magic1 != 0 || v2_hdr->magic2 != 0) { - runtime_pseudo_reloc_item_v1 *o; - for (o = (runtime_pseudo_reloc_item_v1 *) v2_hdr; o < (runtime_pseudo_reloc_item_v1 *)end; o++) - { - DWORD newval; + /************************* + * Handle v1 relocations * + *************************/ + runtime_pseudo_reloc_item_v1 * o; + for (o = (runtime_pseudo_reloc_item_v1 *) v2_hdr; + o < (runtime_pseudo_reloc_item_v1 *)end; + o++) + { + DWORD newval; reloc_target = (ptrdiff_t) base + o->target; newval = (*((DWORD*) reloc_target)) + o->addend; __write_memory ((void *) reloc_target, &newval, sizeof(DWORD)); - } + } return; } + + /* If we got this far, then we have relocations of version 2 or newer */ + /* Check if this is a known version. */ if (v2_hdr->version != RP_VERSION_V2) { -#ifdef DEBUG - fprintf (stderr, "pseudo_relocation protocol version %d is unknown to this runtime.\n", - (int) v2_hdr->version); -#endif + __report_error (" Unknown pseudo relocation protocol version %d.\n", + (int) v2_hdr->version); return; } - /* Walk over header. */ + + /************************* + * Handle v2 relocations * + *************************/ + + /* Walk over header. */ r = (runtime_pseudo_reloc_item_v2 *) &v2_hdr[1]; for (; r < (runtime_pseudo_reloc_item_v2 *) end; r++) { + /* location where new address will be written */ reloc_target = (ptrdiff_t) base + r->target; + + /* get sym pointer. It points either to the iat entry + * of the referenced element, or to the stub function. + */ addr_imp = (ptrdiff_t) base + r->sym; addr_imp = *((ptrdiff_t *) addr_imp); - switch ((r->flags&0xff)) + /* read existing relocation value from image, casting to the + * bitsize indicated by the 8 LSBs of flags. If the value is + * negative, manually sign-extend to ptrdiff_t width. Raise an + * error if the bitsize indicated by the 8 LSBs of flags is not + * supported. + */ + switch ((r->flags & 0xff)) { case 8: reldata = (ptrdiff_t) (*((unsigned char *)reloc_target)); - if ((reldata&0x80) != 0) + if ((reldata & 0x80) != 0) reldata |= ~((ptrdiff_t) 0xff); break; case 16: reldata = (ptrdiff_t) (*((unsigned short *)reloc_target)); - if ((reldata&0x8000) != 0) + if ((reldata & 0x8000) != 0) reldata |= ~((ptrdiff_t) 0xffff); break; case 32: reldata = (ptrdiff_t) (*((unsigned int *)reloc_target)); #ifdef _WIN64 - if ((reldata&0x80000000) != 0) + if ((reldata & 0x80000000) != 0) reldata |= ~((ptrdiff_t) 0xffffffff); #endif break; @@ -125,15 +324,18 @@ #endif default: reldata=0; -#ifdef DEBUG - fprintf(stderr, "Unknown pseudo relocation bit size %d\n",(int) (r->flags & 0xff)); -#endif + __report_error (" Unknown pseudo relocation bit size %d.\n", + (int) (r->flags & 0xff)); break; } + + /* Adjust the relocation value */ reldata -= ((ptrdiff_t) base + r->sym); reldata += addr_imp; + + /* Write the new relocation value back to *reloc_target */ switch ((r->flags & 0xff)) - { + { case 8: __write_memory ((void *) reloc_target, &reldata, 1); break; @@ -148,18 +350,18 @@ __write_memory ((void *) reloc_target, &reldata, 8); break; #endif - } - } + } + } } - -void _pei386_runtime_relocator (void); void _pei386_runtime_relocator (void) { - static int was_init = 0; + static NO_COPY int was_init = 0; if (was_init) return; ++was_init; - do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__,&__RUNTIME_PSEUDO_RELOC_LIST_END__,&__ImageBase); + do_pseudo_reloc (&__RUNTIME_PSEUDO_RELOC_LIST__, + &__RUNTIME_PSEUDO_RELOC_LIST_END__, + &__MINGW_LSYMBOL(_image_base__)); } Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,16 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#define __CRT__NO_INLINE +#include <string.h> + +#undef strcasecmp +int strcasecmp (const char *, const char *); +int +strcasecmp (const char *sz1, const char *sz2) +{ + return _stricmp (sz1,sz2); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strcasecmp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,17 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#define __CRT__NO_INLINE +#include <string.h> + +#undef strncasecmp +int strncasecmp (const char *, const char *, size_t); + +int +strncasecmp (const char *sz1,const char *sz2,size_t sizeMaxCompare) +{ + return _strnicmp (sz1,sz2,sizeMaxCompare); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/strncasecmp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmcrt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmcrt.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmcrt.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,13 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * + * Written by Kai Tietz <kai.tietz(a)onevision.com> + */ + +/* We support TLS cleanup code in any case. If shared version of libgcc is used _CRT_MT has value 1, + otherwise + we do tls cleanup in runtime and _CRT_MT has value 2. */ +int _CRT_MT = 2; + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmcrt.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmthread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmthread.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmthread.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,59 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * + * Written by Kai Tietz <kai.tietz(a)onevision.com> + */ +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#include <windows.h> +#include <stdlib.h> + +int __mingwthr_key_dtor (DWORD key, void (*dtor)(void *)); +int __mingwthr_remove_key_dtor (DWORD key); + +extern int ___w64_mingwthr_remove_key_dtor (DWORD key); +extern int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)); + + +#ifndef _WIN64 +#define MINGWM10_DLL "mingwm10.dll" +typedef int (*fMTRemoveKeyDtor)(DWORD key); +typedef int (*fMTKeyDtor)(DWORD key, void (*dtor)(void *)); +extern fMTRemoveKeyDtor __mingw_gMTRemoveKeyDtor; +extern fMTKeyDtor __mingw_gMTKeyDtor; +extern int __mingw_usemthread_dll; +#endif + +int +__mingwthr_remove_key_dtor (DWORD key) +{ +#ifndef _WIN64 + if (!__mingw_usemthread_dll) +#endif + return ___w64_mingwthr_remove_key_dtor (key); +#ifndef _WIN64 + if (__mingw_gMTRemoveKeyDtor) + return (*__mingw_gMTRemoveKeyDtor) (key); + return 0; +#endif +} + +int +__mingwthr_key_dtor (DWORD key, void (*dtor)(void *)) +{ + if (dtor) + { +#ifndef _WIN64 + if (!__mingw_usemthread_dll) +#endif + return ___w64_mingwthr_add_key_dtor (key, dtor); +#ifndef _WIN64 + if (__mingw_gMTKeyDtor) + return (*__mingw_gMTKeyDtor) (key, dtor); +#endif + } + return 0; +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsmthread.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlssup.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,20 +1,32 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * + * Written by Kai Tietz <kai.tietz(a)onevision.com> */ #ifdef CRTDLL #undef CRTDLL #endif -#include <internal.h> -#include <sect_attribs.h> #include <windows.h> +#include <stdio.h> +#include <memory.h> #include <malloc.h> -#include <crtdbg.h> - -extern BOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); + +#ifndef _CRTALLOC +#define _CRTALLOC(x) __attribute__ ((section (x) )) +#endif + +#ifndef __INTERNAL_FUNC_DEFINED +#define __INTERNAL_FUNC_DEFINED + typedef void (__cdecl *_PVFV)(void); + typedef int (__cdecl *_PIFV)(void); + typedef void (__cdecl *_PVFI)(int); +#endif + +extern WINBOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); #define FUNCS_PER_NODE 30 @@ -66,6 +78,16 @@ extern int _CRT_MT; +#ifndef _WIN64 +#define MINGWM10_DLL "mingwm10.dll" +typedef int (*fMTRemoveKeyDtor)(DWORD key); +typedef int (*fMTKeyDtor)(DWORD key, void (*dtor)(void *)); +fMTRemoveKeyDtor __mingw_gMTRemoveKeyDtor; +fMTKeyDtor __mingw_gMTKeyDtor; +int __mingw_usemthread_dll; +static HANDLE __mingw_mthread_hdll; +#endif + BOOL WINAPI __dyn_tls_init (HANDLE, DWORD, LPVOID); BOOL WINAPI @@ -73,6 +95,30 @@ { _PVFV *pfunc; +#ifndef _WIN64 + if (_winmajor < 4) + { + __mingw_usemthread_dll = 1; + __mingw_mthread_hdll = LoadLibrary (MINGWM10_DLL); + if (__mingw_mthread_hdll != NULL) + { + __mingw_gMTRemoveKeyDtor = (fMTRemoveKeyDtor) GetProcAddress (__mingw_mthread_hdll, "__mingwthr_remove_key_dtor"); + __mingw_gMTKeyDtor = (fMTKeyDtor) GetProcAddress (__mingw_mthread_hdll, "__mingwthr_key_dtor"); + } + if (__mingw_mthread_hdll == NULL || !__mingw_gMTRemoveKeyDtor || !__mingw_gMTKeyDtor) + { + __mingw_gMTKeyDtor = NULL; + __mingw_gMTRemoveKeyDtor = NULL; + if (__mingw_mthread_hdll) + FreeLibrary (__mingw_mthread_hdll); + __mingw_mthread_hdll = NULL; + _CRT_MT = 0; + return TRUE; + } + _CRT_MT = 1; + return TRUE; + } +#endif /* We don't let us trick here. */ if (_CRT_MT != 2) _CRT_MT = 2; Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsthrd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsthrd.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsthrd.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,148 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + * + * Written by Kai Tietz <kai.tietz(a)onevision.com> + * + * This file is used by if gcc is built with --enable-threads=win32. + * + * Based on version created by Mumit Khan <khan(a)nanotech.wisc.edu> + * + */ + +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif +#include <windows.h> +#include <stdlib.h> + +WINBOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved); +int ___w64_mingwthr_remove_key_dtor (DWORD key); +int ___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)); + +/* To protect the thread/key association data structure modifications. */ +static CRITICAL_SECTION __mingwthr_cs; +static volatile int __mingwthr_cs_init = 0; + +typedef struct __mingwthr_key __mingwthr_key_t; + +/* The list of threads active with key/dtor pairs. */ +struct __mingwthr_key { + DWORD key; + void (*dtor)(void *); + __mingwthr_key_t volatile *next; +}; + + +static __mingwthr_key_t volatile *key_dtor_list; + +int +___w64_mingwthr_add_key_dtor (DWORD key, void (*dtor)(void *)) +{ + __mingwthr_key_t *new_key; + + if (__mingwthr_cs_init == 0) + return 0; + new_key = (__mingwthr_key_t *) calloc (1, sizeof (__mingwthr_key_t)); + if (new_key == NULL) + return -1; + + new_key->key = key; + new_key->dtor = dtor; + + EnterCriticalSection (&__mingwthr_cs); + + new_key->next = key_dtor_list; + key_dtor_list = new_key; + + LeaveCriticalSection (&__mingwthr_cs); + return 0; +} + +int +___w64_mingwthr_remove_key_dtor (DWORD key) +{ + __mingwthr_key_t volatile *prev_key; + __mingwthr_key_t volatile *cur_key; + + if (__mingwthr_cs_init == 0) + return 0; + + EnterCriticalSection (&__mingwthr_cs); + + prev_key = NULL; + cur_key = key_dtor_list; + + while (cur_key != NULL) + { + if ( cur_key->key == key) + { + if (prev_key == NULL) + key_dtor_list = cur_key->next; + else + prev_key->next = cur_key->next; + + free ((void*)cur_key); + break; + } + prev_key = cur_key; + cur_key = cur_key->next; + } + + LeaveCriticalSection (&__mingwthr_cs); + return 0; +} + +static void +__mingwthr_run_key_dtors (void) +{ + __mingwthr_key_t volatile *keyp; + + if (__mingwthr_cs_init == 0) + return; + EnterCriticalSection (&__mingwthr_cs); + + for (keyp = key_dtor_list; keyp; ) + { + LPVOID value = TlsGetValue (keyp->key); + if (GetLastError () == ERROR_SUCCESS) + { + if (value) + (*keyp->dtor) (value); + } + keyp = keyp->next; + } + + LeaveCriticalSection (&__mingwthr_cs); +} + +WINBOOL +__mingw_TLScallback (HANDLE hDllHandle __attribute__ ((__unused__)), + DWORD reason, + LPVOID reserved __attribute__ ((__unused__))) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + if (__mingwthr_cs_init == 0) + InitializeCriticalSection (&__mingwthr_cs); + __mingwthr_cs_init = 1; + break; + case DLL_PROCESS_DETACH: + __mingwthr_run_key_dtors(); + if (__mingwthr_cs_init == 1) + { + __mingwthr_cs_init = 0; + DeleteCriticalSection (&__mingwthr_cs); + } + break; + case DLL_THREAD_ATTACH: + break; + case DLL_THREAD_DETACH: + __mingwthr_run_key_dtors(); + break; + } + return TRUE; +} + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/tlsthrd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,17 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#include <ctype.h> + +#undef toascii + +int toascii (int); + +int +toascii (int c) +{ + return __toascii(c); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/toascii.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/txtmode.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ #include <fcntl.h> Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ucrtexe.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ucrtexe.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ucrtexe.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,14 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef UNICODE +#define UNICODE +#endif + +#define WPRFLAG 1 + +#include "crtexe.c" + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/ucrtexe.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udll_argv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udll_argv.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udll_argv.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,14 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef UNICODE +#define UNICODE +#endif + +#define WPRFLAG 1 + +#include "dll_argv.c" + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udll_argv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udllargc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udllargc.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udllargc.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,14 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#ifndef UNICODE +#define UNICODE +#endif + +#define WPRFLAG 1 + +#include "dllargv.c" + Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/udllargc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c (added) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,0 +1,17 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ + +#define __CRT__NO_INLINE +#include <string.h> + +#undef wcscmpi +int wcscmpi (const wchar_t *, const wchar_t *); + +int +wcscmpi (const wchar_t * ws1,const wchar_t * ws2) +{ + return _wcsicmp (ws1,ws2); +} Propchange: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wcscmpi.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/wildcard.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,19 +1,33 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ /* _dowildcard is an int that controls the globbing of the command line. * If _dowildcard is non-zero, the command line will be globbed: *.* * will be expanded to be all files in the startup directory. + * * In the mingw-w64 library the _dowildcard variable is defined as being * 0, therefore command line globbing is DISABLED by default. To turn it * on and to leave wildcard command line processing MS's globbing code, * include a line in one of your source modules defining _dowildcard and * setting it to -1, like so: * int _dowildcard = -1; + * + * Alternatively, the mingw-w64 library can be configured using the + * --enable-wildcard option and compiled thusly upon which the resulting + * library will have _dowildcard as -1 and command line globbing will be + * enabled by default. */ -int _dowildcard = 0; +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#ifndef __ENABLE_GLOBBING +#define __ENABLE_GLOBBING 0 /* -1 */ +#endif + +int _dowildcard = __ENABLE_GLOBBING; + Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xncommod.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xncommod.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xncommod.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ int _commode = 0; Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xthdloc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xthdloc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xthdloc.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ int __globallocalestatus = ~0x1; Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xtxtmode.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xtxtmode.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/xtxtmode.c [iso-8859-1] Mon Mar 29 01:27:01 2010 @@ -1,7 +1,7 @@ /** * This file has no copyright assigned and is placed in the Public Domain. * This file is part of the w64 mingw-runtime package. - * No warranty is given; refer to the file DISCLAIMER within this package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. */ int _fmode = 0;

1 0

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