Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 50081: [NTOS]: Check that MaximumSize is valid value if the section is being backed by paging file.
by mjmartin＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: mjmartin Date: Tue Dec 21 15:19:58 2010 New Revision: 50081 URL: http://svn.reactos.org/svn/reactos?rev=50081&view=rev Log: [NTOS]: Check that MaximumSize is valid value if the section is being backed by paging file. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Dec 21 15:19:58 2010 @@ -1440,6 +1440,10 @@ } else if (!MaximumSize) MaximumSize = &SafeMaximumSize; + /* Check that MaximumSize is valid if backed by paging file */ + if ((!FileHandle) && (!MaximumSize->QuadPart)) + return STATUS_INVALID_PARAMETER_4; + /* Create the section */ Status = MmCreateSection(&SectionObject, DesiredAccess,

1 0

[rmessiant] 50080: [DEVMGR] - DisplayDevicePropertyText: Use full DWORD value, not just one byte of it (CID 1803). [WINMM] - MCI_Close: Use UINT instead of UINT16 for the device id (CID 1804).
by rmessiant＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: rmessiant Date: Tue Dec 21 14:58:13 2010 New Revision: 50080 URL: http://svn.reactos.org/svn/reactos?rev=50080&view=rev Log: [DEVMGR] - DisplayDevicePropertyText: Use full DWORD value, not just one byte of it (CID 1803). [WINMM] - MCI_Close: Use UINT instead of UINT16 for the device id (CID 1804). Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/winmm/mci.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Tue Dec 21 14:58:13 2010 @@ -720,6 +720,7 @@ PSP_DEVINFO_DATA DeviceInfoData; DWORD dwType; DWORD dwSize; + DWORD dwValue; LPBYTE lpBuffer; LPWSTR lpStr; INT len; @@ -791,58 +792,60 @@ } else if (dwType == REG_DWORD) { + dwValue = *(DWORD *) lpBuffer; + switch (dwProperty) { case SPDRP_CAPABILITIES: index = 0; - if (*lpBuffer & CM_DEVCAP_LOCKSUPPORTED) + if (dwValue & CM_DEVCAP_LOCKSUPPORTED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_LOCKSUPPORTED"); - if (*lpBuffer & CM_DEVCAP_EJECTSUPPORTED) + if (dwValue & CM_DEVCAP_EJECTSUPPORTED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_EJECTSUPPORTED"); - if (*lpBuffer & CM_DEVCAP_REMOVABLE) + if (dwValue & CM_DEVCAP_REMOVABLE) SetListViewText(hwndListView, index++, L"CM_DEVCAP_REMOVABLE"); - if (*lpBuffer & CM_DEVCAP_DOCKDEVICE) + if (dwValue & CM_DEVCAP_DOCKDEVICE) SetListViewText(hwndListView, index++, L"CM_DEVCAP_DOCKDEVICE"); - if (*lpBuffer & CM_DEVCAP_UNIQUEID) + if (dwValue & CM_DEVCAP_UNIQUEID) SetListViewText(hwndListView, index++, L"CM_DEVCAP_UNIQUEID"); - if (*lpBuffer & CM_DEVCAP_SILENTINSTALL) + if (dwValue & CM_DEVCAP_SILENTINSTALL) SetListViewText(hwndListView, index++, L"CM_DEVCAP_SILENTINSTALL"); - if (*lpBuffer & CM_DEVCAP_RAWDEVICEOK) + if (dwValue & CM_DEVCAP_RAWDEVICEOK) SetListViewText(hwndListView, index++, L"CM_DEVCAP_RAWDEVICEOK"); - if (*lpBuffer & CM_DEVCAP_SURPRISEREMOVALOK) + if (dwValue & CM_DEVCAP_SURPRISEREMOVALOK) SetListViewText(hwndListView, index++, L"CM_DEVCAP_SURPRISEREMOVALOK"); - if (*lpBuffer & CM_DEVCAP_HARDWAREDISABLED) + if (dwValue & CM_DEVCAP_HARDWAREDISABLED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_HARDWAREDISABLED"); - if (*lpBuffer & CM_DEVCAP_NONDYNAMIC) + if (dwValue & CM_DEVCAP_NONDYNAMIC) SetListViewText(hwndListView, index++, L"CM_DEVCAP_NONDYNAMIC"); break; case SPDRP_CONFIGFLAGS: index = 0; - if (*lpBuffer & CONFIGFLAG_DISABLED) + if (dwValue & CONFIGFLAG_DISABLED) SetListViewText(hwndListView, index++, L"CONFIGFLAG_DISABLED"); - if (*lpBuffer & CONFIGFLAG_REMOVED) + if (dwValue & CONFIGFLAG_REMOVED) SetListViewText(hwndListView, index++, L"CONFIGFLAG_REMOVED"); - if (*lpBuffer & CONFIGFLAG_MANUAL_INSTALL) + if (dwValue & CONFIGFLAG_MANUAL_INSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_MANUAL_INSTALL"); - if (*lpBuffer & CONFIGFLAG_IGNORE_BOOT_LC) + if (dwValue & CONFIGFLAG_IGNORE_BOOT_LC) SetListViewText(hwndListView, index++, L"CONFIGFLAG_IGNORE_BOOT_LC"); - if (*lpBuffer & CONFIGFLAG_NET_BOOT) + if (dwValue & CONFIGFLAG_NET_BOOT) SetListViewText(hwndListView, index++, L"CONFIGFLAG_NET_BOOT"); - if (*lpBuffer & CONFIGFLAG_REINSTALL) + if (dwValue & CONFIGFLAG_REINSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_REINSTALL"); - if (*lpBuffer & CONFIGFLAG_FAILEDINSTALL) + if (dwValue & CONFIGFLAG_FAILEDINSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_FAILEDINSTALL"); - if (*lpBuffer & CONFIGFLAG_CANTSTOPACHILD) + if (dwValue & CONFIGFLAG_CANTSTOPACHILD) SetListViewText(hwndListView, index++, L"CONFIGFLAG_CANTSTOPACHILD"); - if (*lpBuffer & CONFIGFLAG_OKREMOVEROM) + if (dwValue & CONFIGFLAG_OKREMOVEROM) SetListViewText(hwndListView, index++, L"CONFIGFLAG_OKREMOVEROM"); - if (*lpBuffer & CONFIGFLAG_NOREMOVEEXIT) + if (dwValue & CONFIGFLAG_NOREMOVEEXIT) SetListViewText(hwndListView, index++, L"CONFIGFLAG_NOREMOVEEXIT"); break; default: - swprintf(dap->szTemp, L"0x%08x", *lpBuffer); + swprintf(dap->szTemp, L"0x%08lx", dwValue); SetListViewText(hwndListView, 0, dap->szTemp); break; } Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Tue Dec 21 14:58:13 2010 @@ -1669,7 +1669,7 @@ /************************************************************************** * MCI_Close [internal] */ -static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) +static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { DWORD dwRet; LPWINE_MCIDRIVER wmd;

1 0

[janderwald] 50079: [AUDIO-BRINGUP] - Move irp completion to CompleteRequest function for debugging of multiple irp completion bugs - Remove bugs asserts in IKsDevice_PnpStartDevice - Set device to...
by janderwald＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: janderwald Date: Tue Dec 21 13:06:47 2010 New Revision: 50079 URL: http://svn.reactos.org/svn/reactos?rev=50079&view=rev Log: [AUDIO-BRINGUP] - Move irp completion to CompleteRequest function for debugging of multiple irp completion bugs - Remove bugs asserts in IKsDevice_PnpStartDevice - Set device to started when the device does not need pnp notification - Don't complete the irp in IKsDevice_Create, the driver has already done this - Comment out UNIMPLEMENTED macro in KsFilterAttemptProcessing - Fix check in FindMatchingCreateItem - Don't set DO_DIRECT_IO flags on PDO devices - Set DO_DEVICE_INITIALIZING flag on PDO device - Construct device name with swprintf - Add check if the device entry has already been constructed - Zero device capabilities - Implement bus watchdog routine. The routine checks if pdo has successfully been started, otherwise the pdo is marked invalid and the deleted and then constructed again. If the pdo has been started, all pending irp requests are completed with STATUS_REPARSE. (This is probably not supported by Ros kernel yet) - Acquire device entry list lock when working with device entries - Always store status code in irp for all Ks bus api routines - Handle IRP_MN_REMOVE_DEVICE - Start watchdog timer when IRP_MN_START_DEVICE is received - Ros KS nos successfully initializes and all audio devices appear in VBOX+WinXP+SP3. Playback not yet working (Needs KsAttemptFilterProcessing for splitter and friends) - TODO: enhance time out to make audio system initialize faster Modified: branches/audio-bringup/drivers/ksfilter/ks/allocators.c branches/audio-bringup/drivers/ksfilter/ks/api.c branches/audio-bringup/drivers/ksfilter/ks/clocks.c branches/audio-bringup/drivers/ksfilter/ks/device.c branches/audio-bringup/drivers/ksfilter/ks/filter.c branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c branches/audio-bringup/drivers/ksfilter/ks/irp.c branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h branches/audio-bringup/drivers/ksfilter/ks/kstypes.h branches/audio-bringup/drivers/ksfilter/ks/misc.c branches/audio-bringup/drivers/ksfilter/ks/pin.c branches/audio-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/allocators.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -163,7 +163,7 @@ /* complete and forget irps */ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -172,7 +172,7 @@ { /* invalid request */ Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_DEVICE_REQUEST; } @@ -190,7 +190,7 @@ Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; Irp->IoStatus.Information = sizeof(KSSTREAMALLOCATOR_FUNCTIONTABLE); /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } if (!(Property->Flags & KSPROPERTY_TYPE_GET)) @@ -198,7 +198,7 @@ /* only support retrieving the property */ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -212,7 +212,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = sizeof(KSSTREAMALLOCATOR_FUNCTIONTABLE); /* complete request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } else if (Property->Id == KSPROPERTY_STREAMALLOCATOR_STATUS) @@ -223,7 +223,7 @@ Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; Irp->IoStatus.Information = sizeof(KSPROPERTY_STREAMALLOCATOR_STATUS); /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } if (!(Property->Flags & KSPROPERTY_TYPE_GET)) @@ -231,7 +231,7 @@ /* only support retrieving the property */ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -246,14 +246,14 @@ Irp->IoStatus.Information = sizeof(KSSTREAMALLOCATOR_STATUS); /* complete request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } } /* unhandled request */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; } @@ -501,7 +501,7 @@ /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -523,7 +523,7 @@ /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Modified: branches/audio-bringup/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -1332,7 +1332,7 @@ /* complete request */ Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -1416,7 +1416,7 @@ IoStack->FileObject->FsContext2 = (PVOID)Header; Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -1429,7 +1429,7 @@ FreeItem(Header); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1703,7 +1703,7 @@ if (IoStack->MajorFunction != IRP_MJ_CLOSE) { /* can be completed immediately */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return; } @@ -1711,7 +1711,7 @@ if (!NT_SUCCESS(Irp->IoStatus.Status)) { /* closing failed, complete irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return; } Modified: branches/audio-bringup/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/clocks.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -339,7 +339,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -353,7 +353,7 @@ UNIMPLEMENTED Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } Modified: branches/audio-bringup/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/device.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -302,7 +302,7 @@ { DPRINT1("NextDevice object failed to start with %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -335,9 +335,6 @@ } ASSERT(DeviceHeader->KsDevice.Descriptor); - ASSERT(DeviceHeader->KsDevice.Descriptor->Dispatch); - ASSERT(DeviceHeader->KsDevice.Descriptor->Dispatch->Start); - /* do we have a device descriptor */ if (DeviceHeader->KsDevice.Descriptor) @@ -361,7 +358,7 @@ { DPRINT1("Driver: failed to start %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -406,12 +403,17 @@ Status = KspSetFilterFactoriesState(DeviceHeader, TRUE); } } + else + { + /* set state to run */ + DeviceHeader->KsDevice.Started = TRUE; + } } /* store result */ Irp->IoStatus.Status = Status; /* complete request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); if (Ctx) { @@ -420,7 +422,7 @@ } /* return result */ - DPRINT1("IKsDevice_PnpStartDevice Status %x PostStartRoutine %p\n", Status, Ctx); + DPRINT("IKsDevice_PnpStartDevice Status %x PostStartRoutine %p\n", Status, Ctx); return Status; } @@ -477,7 +479,7 @@ { DPRINT1("Driver: query stop failed %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -487,7 +489,7 @@ DPRINT("Next Device: Status %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -513,7 +515,7 @@ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_QUERY_INTERFACE: @@ -536,7 +538,7 @@ /* driver supports a private interface */ DPRINT1("IRP_MN_QUERY_INTERFACE Device supports interface\n"); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -545,7 +547,7 @@ DPRINT1("IRP_MN_QUERY_INTERFACE Next Device: Status %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_QUERY_DEVICE_RELATIONS: @@ -556,7 +558,7 @@ DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS Next Device: Status %x\n", Status); //Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: @@ -567,7 +569,7 @@ DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS Next Device: Status %x\n", Status); //Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: @@ -578,7 +580,7 @@ DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS Next Device: Status %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } default: @@ -587,7 +589,7 @@ Status = KspForwardIrpSynchronous(DeviceObject, Irp); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } } @@ -604,7 +606,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -669,17 +671,10 @@ } } - /* acquire list lock */ + /* release list lock */ IKsDevice_fnReleaseDevice((IKsDevice*)&DeviceHeader->BasicHeader.OuterUnknown); - if (Status != STATUS_PENDING) - { - Irp->IoStatus.Information = 0; - /* set return status */ - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - + /* done */ return Status; @@ -703,7 +698,7 @@ PKSIOBJECT_BAG Bag; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("KsInitializeDevice Descriptor %p\n", Descriptor); + DPRINT1("KsInitializeDevice Descriptor %p\n", Descriptor); /* get device extension */ DeviceExtension = (PDEVICE_EXTENSION)FunctionalDeviceObject->DeviceExtension; @@ -714,7 +709,7 @@ /* point to allocated header */ Header = DeviceExtension->DeviceHeader; - DPRINT("DeviceHeader %p\n", DeviceExtension->DeviceHeader); + DPRINT1("DeviceHeader %p\n", DeviceExtension->DeviceHeader); if (Descriptor && Descriptor->Dispatch) { @@ -896,7 +891,7 @@ IKsDevice * Device; PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; - DPRINT1("KsDereferenceSoftwareBusObject DeviceHeader %p\n", Header); + DPRINT("KsDereferenceSoftwareBusObject DeviceHeader %p\n", Header); /* get device interface */ Device = (IKsDevice*)DeviceHeader->BasicHeader.OuterUnknown; Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -485,7 +485,7 @@ Irp->IoStatus.Status = Status; /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } return Status; @@ -522,7 +522,7 @@ /* save the result */ Irp->IoStatus.Status = Status; /* complete irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); /* remove our instance from the filter factory */ IKsFilter_RemoveFilterFromFilterFactory(This, This->Factory); @@ -535,7 +535,7 @@ /* complete and forget */ Irp->IoStatus.Status = Status; /* complete irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -881,7 +881,7 @@ if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -1227,7 +1227,7 @@ { /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -1243,7 +1243,7 @@ { UNIMPLEMENTED Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -1608,7 +1608,7 @@ IN PKSFILTER Filter, IN BOOLEAN Asynchronous) { - UNIMPLEMENTED + //UNIMPLEMENTED } /* Modified: branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -69,7 +69,7 @@ { Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } return Status; Modified: branches/audio-bringup/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -34,7 +34,7 @@ { /* no create item */ Irp->IoStatus.Status = STATUS_NO_SECURITY_ON_OBJECT; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_SECURITY_ON_OBJECT; } @@ -50,7 +50,7 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Length; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -80,7 +80,7 @@ { /* no create item */ Irp->IoStatus.Status = STATUS_NO_SECURITY_ON_OBJECT; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_SECURITY_ON_OBJECT; } @@ -109,7 +109,7 @@ /* store result */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1154,7 +1154,7 @@ IN PIRP Irp) { Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_DEVICE_REQUEST; } @@ -1198,7 +1198,7 @@ /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -1643,14 +1643,15 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); + DPRINT1("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); // HACK for ms portcls if (IoStack->MajorFunction == IRP_MJ_CREATE) { // complete the request +DPRINT1("MS HACK\n"); Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return; } @@ -1736,7 +1737,7 @@ { /* let's complete it */ Irp->IoStatus.Status = STATUS_CANCELLED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } } @@ -1795,14 +1796,12 @@ continue; } - ASSERT(CreateItemEntry->CreateItem->ObjectClass.Buffer); - DPRINT("CreateItem %S Length %u Request %wZ %u\n", CreateItemEntry->CreateItem->ObjectClass.Buffer, CreateItemEntry->CreateItem->ObjectClass.Length, &RefString, - BufferSize); - - if (CreateItemEntry->CreateItem->ObjectClass.Length > BufferSize) + RefString.Length); + + if (CreateItemEntry->CreateItem->ObjectClass.Length > RefString.Length) { /* create item doesnt match in length */ Entry = Entry->Flink; @@ -1853,7 +1852,7 @@ Irp->IoStatus.Information = 0; /* set return status */ Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -1893,7 +1892,7 @@ Irp->IoStatus.Information = 0; /* set return status */ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -1929,7 +1928,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; /* complete and forget */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -2036,6 +2035,7 @@ /* get device extension */ DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; Modified: branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -5,6 +5,13 @@ #define TAG_KSDEVICE 'DESK' #define TAG_KSOBJECT_TAG 'HOSK' + +VOID +CompleteRequest( + PIRP Irp, + CCHAR PriorityBoost); + + NTSTATUS NTAPI Modified: branches/audio-bringup/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -145,7 +145,7 @@ typedef BOOLEAN (NTAPI *PKSEVENT_SYNCHRONIZED_ROUTINE)(PKSEVENT_CTX Context); struct __BUS_ENUM_DEVICE_EXTENSION__; -struct BUS_DEVICE_ENTRY; +struct __BUS_DEVICE_ENTRY__; typedef struct { @@ -158,7 +158,7 @@ }; union { - PVOID DeviceEntry; + struct __BUS_DEVICE_ENTRY__* DeviceEntry; ULONG Dummy1; }; struct __BUS_ENUM_DEVICE_EXTENSION__ *BusDeviceExtension; @@ -191,7 +191,7 @@ }DEVICE_STATE; -typedef struct +typedef struct __BUS_DEVICE_ENTRY__ { LIST_ENTRY Entry; LIST_ENTRY DeviceInterfaceList; Modified: branches/audio-bringup/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -8,6 +8,19 @@ #include "priv.h" + +VOID +CompleteRequest( + PIRP Irp, + CCHAR PriorityBoost) +{ + DPRINT("Completing IRP %p Status %x\n", Irp, Irp->IoStatus.Status); + + ASSERT(Irp->IoStatus.Status != STATUS_PENDING); + + + IoCompleteRequest(Irp, PriorityBoost); +} PVOID AllocateItem( Modified: branches/audio-bringup/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/pin.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -1875,7 +1875,7 @@ DPRINT1("KsProbeStreamIrp failed with %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1888,7 +1888,7 @@ { DPRINT("NoHeader Canceling Irp %p\n", Irp); Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1911,7 +1911,7 @@ { DPRINT("NoHeader->Data Canceling Irp %p\n", Irp); Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1960,7 +1960,7 @@ /* invalid device request */ DPRINT("Filter Centric Processing No Process Routine\n"); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -2095,7 +2095,7 @@ if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -2135,7 +2135,7 @@ { /* abort closing */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -2145,7 +2145,7 @@ if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } } @@ -2162,7 +2162,7 @@ UNIMPLEMENTED; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -2244,7 +2244,7 @@ /* done */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -2257,7 +2257,7 @@ UNIMPLEMENTED; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -35,7 +35,7 @@ CurDeviceId = InterlockedIncrement(&KsDeviceCount); /* generate new device id */ - swprintf(Buffer, L"\\Device\\KSENUM%08x\n", CurDeviceId); + swprintf(Buffer, L"\\Device\\KSENUM%08x", CurDeviceId); /* initialize new device name */ RtlInitUnicodeString(&DeviceName, Buffer); @@ -71,8 +71,8 @@ /* TODO: update last creation time in bus device extension */ /* setup flags */ - DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; - + DeviceObject->Flags |= DO_POWER_PAGABLE; + DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; /* TODO: fire time when expired */ *OutDeviceObject = DeviceObject; @@ -330,6 +330,7 @@ BOOLEAN ItemExists = FALSE; UNICODE_STRING String; NTSTATUS Status; + KIRQL OldLevel; /* first construct device name & reference guid */ Length = wcslen(DeviceCategory) + wcslen(ReferenceString); @@ -347,9 +348,7 @@ } /* construct device name */ - wcscpy(DeviceName, DeviceCategory); - wcscat(DeviceName, L"&"); - wcscat(DeviceName, ReferenceString); + swprintf(DeviceName, L"%s&%s", DeviceCategory, ReferenceString); /* scan list and check if it is already present */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -437,8 +436,17 @@ return Status; } - /* successfully initialized entry */ - InsertTailList(&BusDeviceExtension->Common.Entry, &DeviceEntry->Entry); + if (!ItemExists) + { + /* acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* successfully initialized entry */ + InsertTailList(&BusDeviceExtension->Common.Entry, &DeviceEntry->Entry); + + /* release lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + } /* done */ return Status; @@ -585,8 +593,8 @@ NTSTATUS KspQueryBusDeviceInterface( - IN PIRP Irp, - IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension) + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension, + IN PIRP Irp) { PBUS_INTERFACE_SWENUM Interface; PIO_STACK_LOCATION IoStack; @@ -628,6 +636,7 @@ { /* get bus instance entry */ InstanceEntry = (PBUS_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BUS_INSTANCE_ENTRY, Entry); + DPRINT1("Enabling %u %wZ Irql %u\n", bEnable, &InstanceEntry->SymbolicLink, KeGetCurrentIrql()); /* set interface state */ Status = IoSetDeviceInterfaceState(&InstanceEntry->SymbolicLink, bEnable); @@ -672,7 +681,7 @@ Length += 2; /* allocate buffer */ - Buffer = AllocateItem(PagedPool, Length * sizeof(WCHAR)); + Buffer = AllocateItem(NonPagedPool, Length * sizeof(WCHAR)); if (!Buffer) { /* no resources */ @@ -680,11 +689,8 @@ } /* construct buffer */ - wcscpy(Buffer, DeviceEntry->PDODeviceName); - wcscat(Buffer, L"\\"); - wcscat(Buffer, DeviceEntry->Instance); - - /* free old file name */ + swprintf(Buffer, L"%s\\%s", DeviceEntry->PDODeviceName, DeviceEntry->Instance); + ExFreePool(IoStack->FileObject->FileName.Buffer); /* store new file name */ @@ -704,7 +710,6 @@ NTSTATUS Status; /* go through list */ - while(!IsListEmpty(&DeviceEntry->IrpPendingList)) { /* get first entry */ @@ -727,11 +732,12 @@ /* store result code */ Irp->IoStatus.Status = Status; - DPRINT1("Completing IRP %p\n", Irp); + DPRINT1("Completing IRP %p Status %x\n", Irp, Status); /* complete the request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } + CompleteRequest(Irp, IO_NO_INCREMENT); + } + } @@ -760,7 +766,7 @@ } /* allocate device name buffer */ - Name = AllocateItem(PagedPool, ResultLength); + Name = AllocateItem(NonPagedPool, (ResultLength + 1) * sizeof(WCHAR)); if (!Name) { /* no memory */ @@ -784,10 +790,13 @@ /* mark device as started */ DeviceEntry->DeviceState = Started; - DPRINT1("KspStartBusDevice Name %S Started\n", Name); - - /* now complete pending i/o */ - KspCompletePendingIrps(DeviceEntry, STATUS_REPARSE); + /* reference start time */ + KeQuerySystemTime(&DeviceEntry->TimeCreated); + + DPRINT1("KspStartBusDevice Name %S DeviceName %S Instance %S Started\n", Name, DeviceEntry->DeviceName, DeviceEntry->Instance); + + /* enable device classes */ + //KspEnableBusDeviceInterface(DeviceEntry, TRUE); /* done */ return STATUS_SUCCESS; @@ -806,6 +815,8 @@ /* get capabilities */ Capabilities = IoStack->Parameters.DeviceCapabilities.Capabilities; + + RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); /* setup capabilities */ Capabilities->UniqueID = TRUE; @@ -935,9 +946,7 @@ } /* construct id */ - wcscpy(Name, BusDeviceExtension->BusIdentifier); - wcscat(Name, L"\\"); - wcscat(Name, DeviceEntry->BusId); + swprintf(Name, L"%s\\%s", BusDeviceExtension->BusIdentifier, DeviceEntry->BusId); /* store result */ Irp->IoStatus.Information = (ULONG_PTR)Name; @@ -948,8 +957,8 @@ else { /* other ids are not supported */ - DPRINT1("Not Supported ID Type %x\n", IoStack->Parameters.QueryId.IdType); - return STATUS_NOT_SUPPORTED; + //DPRINT1("Not Supported ID Type %x\n", IoStack->Parameters.QueryId.IdType); + return Irp->IoStatus.Status; } } @@ -1123,8 +1132,83 @@ KspBusWorkerRoutine( IN PVOID Parameter) { - /* TODO: implement sweeping */ - UNIMPLEMENTED + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PBUS_DEVICE_ENTRY DeviceEntry; + PLIST_ENTRY Entry; + LARGE_INTEGER Time, Diff; + BOOLEAN DoInvalidate = FALSE; + KIRQL OldLevel; + + /* acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + + /* get current time */ + KeQuerySystemTime(&Time); + + /* enumerate all device entries */ + Entry = BusDeviceExtension->Common.Entry.Flink; + while(Entry != &BusDeviceExtension->Common.Entry) + { + /* get offset to device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + + /* sanity check */ + ASSERT(DeviceEntry); + + //DPRINT1("DeviceEntry %p PDO %p State %x\n", DeviceEntry, DeviceEntry->PDO, DeviceEntry->DeviceState); + + if (DeviceEntry->PDO) + { + if (DeviceEntry->DeviceState == NotStarted) + { + Diff.QuadPart = Time.QuadPart - DeviceEntry->TimeCreated.QuadPart; + + if (Diff.QuadPart > Int32x32To64(15000, 10000)) + { + DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", DeviceEntry->DeviceName, DeviceEntry->Instance, DeviceEntry->TimeCreated.QuadPart, Time.QuadPart, Diff.QuadPart); + + /* release spin lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + + /* deactivate interfaces */ + //KspEnableBusDeviceInterface(DeviceEntry, FALSE); + + /* re-acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* pending remove device object */ + DeviceEntry->DeviceState = StopPending; + + /* perform invalidation */ + DoInvalidate = TRUE; + } + } + else if (DeviceEntry->DeviceState == Started) + { + /* found pending irps */ + KspCompletePendingIrps(DeviceEntry, STATUS_REPARSE); + } + } + + + /* move to next */ + Entry = Entry->Flink; + } + + /* release lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + + if (DoInvalidate) + { + /* invalidate device relations */ + IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); + } + + Time.QuadPart = Int32x32To64(5000, -10000); + KeSetTimer(&BusDeviceExtension->Timer, Time, &BusDeviceExtension->Dpc); } VOID @@ -1173,9 +1257,10 @@ PLIST_ENTRY Entry; PBUS_DEVICE_ENTRY DeviceEntry; ULONG Count = 0, Length; - - - /* FIXME locks */ + KIRQL OldLevel; + + /* acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); /* first scan all device entries */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -1186,7 +1271,7 @@ DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); /* is there a pdo yet */ - if (DeviceEntry->PDO) + if (DeviceEntry->PDO && (DeviceEntry->DeviceState == NotStarted || DeviceEntry->DeviceState == Started)) { /* increment count */ Count++; @@ -1205,6 +1290,7 @@ if (!DeviceRelations) { /* not enough memory */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1217,7 +1303,7 @@ DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); /* is there a pdo yet */ - if (DeviceEntry->PDO) + if (DeviceEntry->PDO && (DeviceEntry->DeviceState == NotStarted || DeviceEntry->DeviceState == Started)) { /* store pdo */ DeviceRelations->Objects[DeviceRelations->Count] = DeviceEntry->PDO; @@ -1232,6 +1318,9 @@ /* move to next entry */ Entry = Entry->Flink; } + + /* release lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); /* FIXME handle existing device relations */ ASSERT(Irp->IoStatus.Information == 0); @@ -1328,6 +1417,7 @@ } /* done */ + Irp->IoStatus.Status = Status; return Status; } @@ -1550,7 +1640,7 @@ FreeItem(BusDeviceExtension); } - DPRINT1("KsCreateBusEnumObject cp %x\n", Status); + DPRINT("KsCreateBusEnumObject Status %x\n", Status); /* done */ return Status; } @@ -1569,7 +1659,7 @@ PCOMMON_DEVICE_EXTENSION CommonDeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - DPRINT1("KsGetBusEnumPnpDeviceObject\n"); + DPRINT("KsGetBusEnumPnpDeviceObject\n"); if (!DeviceObject->DeviceExtension) { @@ -1712,13 +1802,12 @@ PLIST_ENTRY Entry; PBUS_DEVICE_ENTRY DeviceEntry = NULL; /* fix gcc */ PIO_STACK_LOCATION IoStack; - BOOLEAN ItemExists; + BOOLEAN ItemExists = FALSE; PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; //PCOMMON_DEVICE_EXTENSION ChildDeviceExtension; NTSTATUS Status; - - DPRINT1("KsServiceBusEnumCreateRequest\n"); + LARGE_INTEGER Time; /* FIXME: locks */ @@ -1735,6 +1824,8 @@ ASSERT(IoStack->FileObject); ASSERT(IoStack->FileObject->FileName.Buffer); + DPRINT1("KsServiceBusEnumCreateRequest IRP %p Name %wZ\n", Irp, &IoStack->FileObject->FileName); + /* scan list and check if it is already present */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -1768,7 +1859,11 @@ if (DeviceEntry->DeviceState == Started) { /* issue reparse */ - return KspDoReparseForIrp(Irp, DeviceEntry); + Status = KspDoReparseForIrp(Irp, DeviceEntry); + DPRINT("REPARSE Irp %p '%wZ'\n", Irp, &IoStack->FileObject->FileName); + + Irp->IoStatus.Status = Status; + return Status; } /* delay processing until pnp is finished with enumeration */ @@ -1777,9 +1872,14 @@ /* insert into irp pending list */ InsertTailList(&DeviceEntry->IrpPendingList, &Irp->Tail.Overlay.ListEntry); - /* HACK */ - IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); - + Time.QuadPart = Int32x32To64(1500, -10000); + DbgPrint("PENDING Irp %p %wZ\n", Irp, &IoStack->FileObject->FileName); + + /* query current time */ + KeQuerySystemTime(&DeviceEntry->TimeCreated); + + /* set timer */ + KeSetTimer(&BusDeviceExtension->Timer, Time, &BusDeviceExtension->Dpc); /* done for now */ return STATUS_PENDING; @@ -1796,6 +1896,7 @@ DPRINT1("KsServiceBusEnumCreateRequest failed to create PDO with %x\n", Status); return Status; } + DPRINT1("PENDING CREATE Irp %p %wZ\n", Irp, &IoStack->FileObject->FileName); /* delay processing until pnp is finished with enumeration */ IoMarkIrpPending(Irp); @@ -1826,9 +1927,12 @@ { PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PCOMMON_DEVICE_EXTENSION ChildDeviceExtension; PIO_STACK_LOCATION IoStack; - - DPRINT1("KsServiceBusEnumPnpRequest %p\n", DeviceObject); + NTSTATUS Status; + LARGE_INTEGER Time; + PDEVICE_RELATIONS DeviceRelation; + PBUS_DEVICE_ENTRY DeviceEntry; /* get device extension */ DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; @@ -1844,64 +1948,154 @@ if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { /* no op for bus driver */ - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { /* handle bus device relations */ ASSERT(IoStack->Parameters.QueryDeviceRelations.Type == BusRelations); - return KspQueryBusRelations(BusDeviceExtension, Irp); - } - DPRINT1("KsServiceBusEnumPnpRequest BusObject MinorFunction %x\n", IoStack->MinorFunction); - return STATUS_NOT_SUPPORTED; + Status = KspQueryBusRelations(BusDeviceExtension, Irp); + } + else + { + /* get default status */ + Status = Irp->IoStatus.Status; + } } else { + /* get child device extension */ + ChildDeviceExtension = DeviceExtension->Ext; + + /* get bus device extension */ + BusDeviceExtension = ChildDeviceExtension->BusDeviceExtension; + if (IoStack->MinorFunction == IRP_MN_QUERY_ID) { /* query id */ - return KspQueryId(&BusDeviceExtension->Common, Irp); + Status = KspQueryId(ChildDeviceExtension, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + ASSERT(ChildDeviceExtension->DeviceEntry->DeviceState != Started || ChildDeviceExtension->DeviceEntry->DeviceState == NotStarted); + ASSERT(ChildDeviceExtension->DeviceEntry->PDO == DeviceObject); + + /* backup device entry */ + DeviceEntry = ChildDeviceExtension->DeviceEntry; + + /* free device extension */ + FreeItem(ChildDeviceExtension); + + /* clear PDO reference */ + DeviceEntry->PDO = NULL; + + /* delete the device */ + IoDeleteDevice(DeviceObject); + + if (DeviceEntry->PDODeviceName) + { + /* delete pdo device name */ + FreeItem(DeviceEntry->PDODeviceName); + + /* set to null */ + DeviceEntry->PDODeviceName = NULL; + } + + /* set state no notstarted */ + DeviceEntry->DeviceState = NotStarted; + + /* time to create PDO */ + KspCreatePDO(BusDeviceExtension, DeviceEntry, &DeviceEntry->PDO); + + /* invalidate device relations */ + IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); + + /* done */ + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_BUS_INFORMATION) { /* query bus information */ - return KspQueryBusInformation(&BusDeviceExtension->Common, Irp); + Status = KspQueryBusInformation(ChildDeviceExtension, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCES) { /* no op */ - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCE_REQUIREMENTS) { /* no op */ - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { /* start bus */ - return KspStartBusDevice(DeviceObject, &BusDeviceExtension->Common, Irp); + Status = KspStartBusDevice(DeviceObject, ChildDeviceExtension, Irp); + + /* set time out */ + Time.QuadPart = Int32x32To64(1500, -10000); + + /* sanity check */ + ASSERT(BusDeviceExtension); + + /* set timer */ + KeSetTimer(&BusDeviceExtension->Timer, Time, &BusDeviceExtension->Dpc); } else if (IoStack->MinorFunction == IRP_MN_QUERY_CAPABILITIES) { /* query capabilities */ - return KspQueryBusDeviceCapabilities(&BusDeviceExtension->Common, Irp); + Status = KspQueryBusDeviceCapabilities(ChildDeviceExtension, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) { /* query pnp state */ - return KspQueryBusDevicePnpState(&BusDeviceExtension->Common, Irp); + Status = KspQueryBusDevicePnpState(ChildDeviceExtension, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_INTERFACE) { /* query interface */ - return KspQueryBusDeviceInterface(Irp, &BusDeviceExtension->Common); - } - - DPRINT1("KsServiceBusEnumPnpRequest BusObject MinorFunction %x\n", IoStack->MinorFunction); - return STATUS_NOT_SUPPORTED; - } + Status = KspQueryBusDeviceInterface(ChildDeviceExtension, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS && IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) + { + /* handle target device relations */ + ASSERT(IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation); + ASSERT(Irp->IoStatus.Information == 0); + + /* allocate device relation */ + DeviceRelation = AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS)); + if (DeviceRelation) + { + DeviceRelation->Count = 1; + DeviceRelation->Objects[0] = DeviceObject; + + /* reference self */ + ObReferenceObject(DeviceObject); + + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation; + + /* done */ + Status = STATUS_SUCCESS; + } + else + { + /* no memory */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + /* get default status */ + Status = Irp->IoStatus.Status; + } + } + + DPRINT("KsServiceBusEnumPnpRequest %p Bus %u Function %x Status %x\n", DeviceObject, BusDeviceExtension->Common.IsBus, IoStack->MinorFunction, Status); + Irp->IoStatus.Status = Status; + return Status; } /*

1 0

[cgutman] 50078: [EXPLORER-NEW] - Fix another "sizeof" usage mistake - CID 1631
by cgutman＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: cgutman Date: Tue Dec 21 04:48:36 2010 New Revision: 50078 URL: http://svn.reactos.org/svn/reactos?rev=50078&view=rev Log: [EXPLORER-NEW] - Fix another "sizeof" usage mistake - CID 1631 Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/dr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] Tue Dec 21 04:48:36 2010 @@ -152,7 +152,7 @@ { CopyMemory(&This->Callbacks, Callbacks, - sizeof(Callbacks)); + sizeof(*Callbacks)); } hr = CoCreateInstance(&CLSID_DragDropHelper,

1 0

[cgutman] 50077: [USBDRIVER] - Fix a bug that resulted in us only copying half of the old keyboard data - CID 10402
by cgutman＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: cgutman Date: Tue Dec 21 04:35:12 2010 New Revision: 50077 URL: http://svn.reactos.org/svn/reactos?rev=50077&view=rev Log: [USBDRIVER] - Fix a bug that resulted in us only copying half of the old keyboard data - CID 10402 Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/keyboard.c [iso-8859-1] Tue Dec 21 04:35:12 2010 @@ -277,7 +277,7 @@ } // Save old keyboard data - RtlCopyMemory(pdev_ext->kbd_old, data, sizeof(data)); + RtlCopyMemory(pdev_ext->kbd_old, data, 8); // resubmit the urb status = usb_submit_urb(pdev_ext->dev_mgr, purb);

1 0

[rmessiant] 50076: [CLASSPNP] - Use correct type in sizeof expression (CID 1646 and 10401). - Simplify signature define (CID 3653 and 3654). - Remove funky 0xFF characters.
by rmessiant＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: rmessiant Date: Tue Dec 21 00:41:52 2010 New Revision: 50076 URL: http://svn.reactos.org/svn/reactos?rev=50076&view=rev Log: [CLASSPNP] - Use correct type in sizeof expression (CID 1646 and 10401). - Simplify signature define (CID 3653 and 3654). - Remove funky 0xFF characters. Modified: trunk/reactos/drivers/storage/classpnp/dictlib.c Modified: trunk/reactos/drivers/storage/classpnp/dictlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/d… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] Tue Dec 21 00:41:52 2010 @@ -26,30 +26,27 @@ #include <ntddk.h> #include <classpnp.h> -#define DICTIONARY_SIGNATURE (((ULONG)'dict' << 32) + 'sig ') - -struct _DICTIONARY_HEADER { +#define DICTIONARY_SIGNATURE 'dsig' + +typedef struct _DICTIONARY_HEADER { struct _DICTIONARY_HEADER* Next; ULONGLONG Key; UCHAR Data[0]; -}; - -struct _DICTIONARY_HEADER; -typedef struct _DICTIONARY_HEADER DICTIONARY_HEADER, *PDICTIONARY_HEADER; - - +} DICTIONARY_HEADER, *PDICTIONARY_HEADER; + + VOID InitializeDictionary( IN PDICTIONARY Dictionary ) { - RtlZeroMemory(Dictionary, sizeof(Dictionary)); + RtlZeroMemory(Dictionary, sizeof(DICTIONARY)); Dictionary->Signature = DICTIONARY_SIGNATURE; KeInitializeSpinLock(&Dictionary->SpinLock); return; } - + BOOLEAN TestDictionarySignature( IN PDICTIONARY Dictionary @@ -136,7 +133,7 @@ return status; } - + PVOID GetDictionaryEntry( IN PDICTIONARY Dictionary, @@ -168,7 +165,7 @@ return data; } - + VOID FreeDictionaryEntry( IN PDICTIONARY Dictionary,

1 0

[jgardou] 50075: [CMAKE] - issue an error when an invalid module type is provided - add nativedll module type.
by jgardou＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: jgardou Date: Mon Dec 20 23:51:41 2010 New Revision: 50075 URL: http://svn.reactos.org/svn/reactos?rev=50075&view=rev Log: [CMAKE] - issue an error when an invalid module type is provided - add nativedll module type. Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=500… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Dec 20 23:51:41 2010 @@ -107,8 +107,7 @@ if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) - endif() - if(${TYPE} MATCHES win32gui) + elseif(${TYPE} MATCHES win32gui) set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} WinMainCRTStartup) if(NOT IS_UNICODE) @@ -117,8 +116,7 @@ target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) target_link_libraries(${MODULE} mingw_common) - endif() - if(${TYPE} MATCHES win32cui) + elseif(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) set_entrypoint(${MODULE} mainCRTStartup) if(NOT IS_UNICODE) @@ -127,8 +125,7 @@ target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) target_link_libraries(${MODULE} mingw_common) - endif() - if(${TYPE} MATCHES win32dll) + elseif(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) @@ -136,24 +133,25 @@ else() message(STATUS "${MODULE} has no base address") endif() - endif() - if(${TYPE} MATCHES win32ocx) + elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") - endif() - if(${TYPE} MATCHES cpl) + elseif(${TYPE} MATCHES cpl) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") - endif() - if(${TYPE} MATCHES kernelmodedriver) + elseif(${TYPE} MATCHES kernelmodedriver) set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") set_entrypoint(${MODULE} DriverEntry@8) set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) add_dependencies(${MODULE} bugcodes) - endif() + elseif(${TYPE} MATCHES nativedll) + set_subsystem(${MODULE} native) + else() + message(FATAL_ERROR "Unknown module type : ${TYPE}") + endif() endmacro() macro(set_unicode)

1 0

[cgutman] 50074: [URLMON] - Sync to Wine 1.3.9
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 21:29:55 2010 New Revision: 50074 URL: http://svn.reactos.org/svn/reactos?rev=50074&view=rev Log: [URLMON] - Sync to Wine 1.3.9 Modified: trunk/reactos/dll/win32/urlmon/bindctx.c trunk/reactos/dll/win32/urlmon/binding.c trunk/reactos/dll/win32/urlmon/bindprot.c trunk/reactos/dll/win32/urlmon/download.c trunk/reactos/dll/win32/urlmon/file.c trunk/reactos/dll/win32/urlmon/format.c trunk/reactos/dll/win32/urlmon/ftp.c trunk/reactos/dll/win32/urlmon/gopher.c trunk/reactos/dll/win32/urlmon/http.c trunk/reactos/dll/win32/urlmon/protocol.c trunk/reactos/dll/win32/urlmon/sec_mgr.c trunk/reactos/dll/win32/urlmon/session.c trunk/reactos/dll/win32/urlmon/umon.c trunk/reactos/dll/win32/urlmon/uri.c trunk/reactos/dll/win32/urlmon/urlmon.spec trunk/reactos/dll/win32/urlmon/urlmon_main.c trunk/reactos/dll/win32/urlmon/urlmon_main.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/urlmon/bindctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindctx.c… Modified: trunk/reactos/dll/win32/urlmon/binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/binding.c… Modified: trunk/reactos/dll/win32/urlmon/bindprot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/bindprot.… Modified: trunk/reactos/dll/win32/urlmon/download.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/download.… Modified: trunk/reactos/dll/win32/urlmon/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/file.c?re… Modified: trunk/reactos/dll/win32/urlmon/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/format.c?… Modified: trunk/reactos/dll/win32/urlmon/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/ftp.c?rev… Modified: trunk/reactos/dll/win32/urlmon/gopher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/gopher.c?… Modified: trunk/reactos/dll/win32/urlmon/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/http.c?re… Modified: trunk/reactos/dll/win32/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/protocol.… Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/sec_mgr.c… Modified: trunk/reactos/dll/win32/urlmon/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/session.c… Modified: trunk/reactos/dll/win32/urlmon/umon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/umon.c?re… Modified: trunk/reactos/dll/win32/urlmon/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/uri.c?rev… Modified: trunk/reactos/dll/win32/urlmon/urlmon.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon.sp… Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma… Modified: trunk/reactos/dll/win32/urlmon/urlmon_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/urlmon_ma…

1 0

[cgutman] 50073: [WININET] - Sync to Wine 1.3.9
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 21:25:11 2010 New Revision: 50073 URL: http://svn.reactos.org/svn/reactos?rev=50073&view=rev Log: [WININET] - Sync to Wine 1.3.9 Modified: trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/wininet.spec Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… ============================================================================== --- trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/http.c [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -5169,3 +5169,21 @@ FIXME("STUB: flags=%d host=%s length=%d\n",flags,szHost,length); return FALSE; } + +/*********************************************************************** + * InternetShowSecurityInfoByURLA (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLA(LPCSTR url, HWND window) +{ + FIXME("stub: %s %p\n", url, window); + return FALSE; +} + +/*********************************************************************** + * InternetShowSecurityInfoByURLW (@) + */ +BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) +{ + FIXME("stub: %s %p\n", debugstr_w(url), window); + return FALSE; +} Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… ============================================================================== --- trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/internet.c [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -1370,8 +1370,9 @@ InternetCrackUrlW should not include it */ if (dwUrlLength == -1) nLength--; - lpwszUrl = HeapAlloc(GetProcessHeap(), 0, nLength * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength); + lpwszUrl = HeapAlloc(GetProcessHeap(), 0, (nLength + 1) * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength + 1); + lpwszUrl[nLength] = '\0'; memset(&UCW,0,sizeof(UCW)); UCW.dwStructSize = sizeof(URL_COMPONENTSW); @@ -1788,7 +1789,7 @@ */ if (lpszcp != 0 && lpszcp - lpszUrl < dwUrlLength && (!lpszParam || lpszcp <= lpszParam)) { - INT len; + DWORD len; /* Only truncate the parameter list if it's already been saved * in lpUC->lpszExtraInfo. @@ -1806,8 +1807,46 @@ else len = dwUrlLength-(lpszcp-lpszUrl); } - SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, - lpszcp, len); + if (lpUC->dwUrlPathLength && lpUC->lpszUrlPath && + lpUC->nScheme == INTERNET_SCHEME_FILE) + { + WCHAR tmppath[MAX_PATH]; + if (*lpszcp == '/') + { + len = MAX_PATH; + PathCreateFromUrlW(lpszUrl_orig, tmppath, &len, 0); + } + else + { + WCHAR *iter; + memcpy(tmppath, lpszcp, len * sizeof(WCHAR)); + tmppath[len] = '\0'; + + iter = tmppath; + while (*iter) { + if (*iter == '/') + *iter = '\\'; + ++iter; + } + } + /* if ends in \. or \.. append a backslash */ + if (tmppath[len - 1] == '.' && + (tmppath[len - 2] == '\\' || + (tmppath[len - 2] == '.' && tmppath[len - 3] == '\\'))) + { + if (len < MAX_PATH - 1) + { + tmppath[len] = '\\'; + tmppath[len+1] = '\0'; + ++len; + } + } + SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, + tmppath, len); + } + else + SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, + lpszcp, len); } else { Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… ============================================================================== --- trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/netconnection.c [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -114,7 +114,7 @@ static void *OpenSSL_ssl_handle; static void *OpenSSL_crypto_handle; -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10000000) static const SSL_METHOD *meth; #else static SSL_METHOD *meth; @@ -152,7 +152,6 @@ MAKE_FUNCPTR(SSL_CTX_set_verify); MAKE_FUNCPTR(SSL_get_current_cipher); MAKE_FUNCPTR(SSL_CIPHER_get_bits); -MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -162,6 +161,7 @@ MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); +MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); MAKE_FUNCPTR(i2d_X509); MAKE_FUNCPTR(sk_num); MAKE_FUNCPTR(sk_value); @@ -228,13 +228,15 @@ PCCERT_CHAIN_CONTEXT chain; char oid_server_auth[] = szOID_PKIX_KP_SERVER_AUTH; char *server_auth[] = { oid_server_auth }; - DWORD err = ERROR_SUCCESS; + DWORD err = ERROR_SUCCESS, chainFlags = 0; TRACE("verifying %s\n", debugstr_w(server)); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, 0, - NULL, &chain))) + if (!(security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) + chainFlags |= CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT; + if ((ret = CertGetCertificateChain(NULL, cert, NULL, store, &chainPara, + chainFlags, NULL, &chain))) { if (chain->TrustStatus.dwErrorStatus) { @@ -431,7 +433,6 @@ DYNSSL(SSL_CTX_set_verify); DYNSSL(SSL_get_current_cipher); DYNSSL(SSL_CIPHER_get_bits); - DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -449,6 +450,7 @@ DYNCRYPTO(ERR_free_strings); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); + DYNCRYPTO(X509_STORE_CTX_get_ex_data); DYNCRYPTO(i2d_X509); DYNCRYPTO(sk_num); DYNCRYPTO(sk_value); @@ -877,7 +879,11 @@ int NETCON_GetCipherStrength(WININET_NETCONNECTION *connection) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!connection->useSSL) Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… ============================================================================== --- trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wininet/wininet.spec [iso-8859-1] Mon Dec 20 21:25:11 2010 @@ -195,9 +195,9 @@ @ stdcall InternetSetStatusCallback(ptr ptr) InternetSetStatusCallbackA @ stdcall InternetSetStatusCallbackA(ptr ptr) @ stdcall InternetSetStatusCallbackW(ptr ptr) -@ stub InternetShowSecurityInfoByURL -@ stub InternetShowSecurityInfoByURLA -@ stub InternetShowSecurityInfoByURLW +@ stdcall InternetShowSecurityInfoByURL(str ptr) InternetShowSecurityInfoByURLA +@ stdcall InternetShowSecurityInfoByURLA(str ptr) +@ stdcall InternetShowSecurityInfoByURLW(wstr ptr) @ stdcall InternetTimeFromSystemTime(ptr long ptr long) InternetTimeFromSystemTimeA @ stdcall InternetTimeFromSystemTimeA(ptr long ptr long) @ stdcall InternetTimeFromSystemTimeW(ptr long ptr long)

1 0

[cgutman] 50072: [NDIS] - Fix sizeof typo - CID 10400
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 20:57:22 2010 New Revision: 50072 URL: http://svn.reactos.org/svn/reactos?rev=50072&view=rev Log: [NDIS] - Fix sizeof typo - CID 10400 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Dec 20 20:57:22 2010 @@ -1600,7 +1600,7 @@ KeInitializeCallbackRecord(BugcheckContext->CallbackRecord); KeRegisterBugCheckCallback(BugcheckContext->CallbackRecord, NdisIBugcheckCallback, - BugcheckContext, sizeof(BugcheckContext), (PUCHAR)"Ndis Miniport"); + BugcheckContext, sizeof(*BugcheckContext), (PUCHAR)"Ndis Miniport"); IoRegisterShutdownNotification(Adapter->NdisMiniportBlock.DeviceObject); }

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