Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 48829: [CMAKE] Fix ntoskrnl compilation that broke after the changes to the configuration options
by tkreuzer＠svn.reactos.org 20 Sep '10

20 Sep '10

Author: tkreuzer Date: Mon Sep 20 16:38:40 2010 New Revision: 48829 URL: http://svn.reactos.org/svn/reactos?rev=48829&view=rev Log: [CMAKE] Fix ntoskrnl compilation that broke after the changes to the configuration options Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Sep 20 16:38:40 2010 @@ -328,50 +328,50 @@ mm/powerpc/page.c) endif(ARCH MATCHES i386) -if(_WINKD_ MATCHES 0) +if(NOT _WINKD_) if(ARCH MATCHES i386) list(APPEND SOURCE kd/i386/kdmemsup.c kd/wrappers/gdbstub.c) -if(KDBG MATCHES 1) +if(KDBG) list(APPEND SOURCE kdbg/i386/i386-dis.c kdbg/i386/kdb_help.S kdbg/i386/longjmp.S kdbg/i386/setjmp.S) -endif(KDBG MATCHES 1) +endif(KDBG) elseif(ARCH MATCHES amd64) list(APPEND SOURCE kd/amd64/kd.c kd/amd64/kdmemsup.c) -if(KDBG MATCHES 1) +if(KDBG) list(APPEND SOURCE kdbg/amd64/i386-dis.c kdbg/amd64/kdb_help.S kdbg/amd64/kdb.c) -endif(KDBG MATCHES 1) +endif(KDBG) elseif(ARCH MATCHES powerpc) list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c) endif(ARCH MATCHES i386) -if(KDBG MATCHES 1) +if(KDBG) list(APPEND SOURCE kdbg/kdb.c kdbg/kdb_cli.c kdbg/kdb_expr.c kdbg/kdb_keyboard.c kdbg/kdb_serial.c) -endif(KDBG MATCHES 1) - -if(DBG_OR_KDBG MATCHES true) +endif(KDBG) + +if(DBG OR KDBG) list(APPEND SOURCE kdbg/kdb_symbols.c) -endif(DBG_OR_KDBG MATCHES true) +endif(DBG OR KDBG) list(APPEND SOURCE kd/wrappers/bochs.c @@ -380,7 +380,7 @@ kd/kdio.c kd/kdmain.c) -else() # _WINKD_ MATCHES 1 +else() # _WINKD_ list(APPEND SOURCE kd64/kdapi.c @@ -399,7 +399,7 @@ list(APPEND SOURCE kd64/arm/kdarm.c) endif(ARCH MATCHES i386) -endif(_WINKD_ MATCHES 0) +endif(NOT _WINKD_) add_executable(ntoskrnl ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl_ntoskrnl.h.gch)

1 0

[tkreuzer] 48828: [MSVC] __MINGW_ATTRIB_DEPRECATED aka __declspec(deprecated) must be put before the function declaration for MSVC.
by tkreuzer＠svn.reactos.org 20 Sep '10

20 Sep '10

Author: tkreuzer Date: Mon Sep 20 14:16:22 2010 New Revision: 48828 URL: http://svn.reactos.org/svn/reactos?rev=48828&view=rev Log: [MSVC] __MINGW_ATTRIB_DEPRECATED aka __declspec(deprecated) must be put before the function declaration for MSVC. Modified: branches/cmake-bringup/include/crt/stdlib.h Modified: branches/cmake-bringup/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/stdli… ============================================================================== --- branches/cmake-bringup/include/crt/stdlib.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/stdlib.h [iso-8859-1] Mon Sep 20 14:16:22 2010 @@ -447,10 +447,10 @@ _CRTIMP void __cdecl _wsplitpath(const wchar_t *_FullPath,wchar_t *_Drive,wchar_t *_Dir,wchar_t *_Filename,wchar_t *_Ext); #endif - _CRTIMP void __cdecl _beep(unsigned _Frequency,unsigned _Duration) __MINGW_ATTRIB_DEPRECATED; + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _beep(unsigned _Frequency,unsigned _Duration); /* Not to be confused with _set_error_mode (int). */ - _CRTIMP void __cdecl _seterrormode(int _Mode) __MINGW_ATTRIB_DEPRECATED; - _CRTIMP void __cdecl _sleep(unsigned long _Duration) __MINGW_ATTRIB_DEPRECATED; + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _seterrormode(int _Mode); + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _sleep(unsigned long _Duration); #endif #ifndef NO_OLDNAMES

1 0

[tkreuzer] 48827: [MSVC] Remove some invalid characters in uk-UA.rc resource file.
by tkreuzer＠svn.reactos.org 20 Sep '10

20 Sep '10

Author: tkreuzer Date: Mon Sep 20 13:44:32 2010 New Revision: 48827 URL: http://svn.reactos.org/svn/reactos?rev=48827&view=rev Log: [MSVC] Remove some invalid characters in uk-UA.rc resource file. Modified: branches/cmake-bringup/base/applications/calc/lang/uk-UA.rc Modified: branches/cmake-bringup/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Mon Sep 20 13:44:32 2010 @@ -245,10 +245,10 @@ LTEXT "Êàòåãîð³ÿ:",IDC_STATIC,4,20,56,8 COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Âèõ³äíà âåëè÷èíà (\"ç\"):",IDC_STATIC,4,49,56,8 + LTEXT "Âèõ³äíà âåëè÷èíà:",IDC_STATIC,4,49,56,8 COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Ê³íöåâà âåëè÷èíà (\"â\"):",IDC_STATIC,4,76,56,8 + LTEXT "Ê³íöåâà âåëè÷èíà:",IDC_STATIC,4,76,56,8 CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER |

1 0

[mjmartin] 48826: [usb/usbhub] - WaitForUsbDeviceArrivalNotification: Dont use IoBuildDeviceIoControlRequest to create the IRP as we dont wait for the IRP to complete in the current thread. It must...
by mjmartin＠svn.reactos.org 20 Sep '10

20 Sep '10

Author: mjmartin Date: Mon Sep 20 06:55:54 2010 New Revision: 48826 URL: http://svn.reactos.org/svn/reactos?rev=48826&view=rev Log: [usb/usbhub] - WaitForUsbDeviceArrivalNotification: Dont use IoBuildDeviceIoControlRequest to create the IRP as we dont wait for the IRP to complete in the current thread. It must be built using IoAllocateIrp. - DeviceArrivalCompletion: Allocate the WorkItem from NonPagedPool vice using one in the DeviceExtension. Free the Irp and return STATUS_MORE_PROCESSING_REQUIRED so the IO Manager doesnt try to do anything more with the now freed Irp. - When selecting the Interface use the routines in USBD library now that they are implemented correctly. - More fixes for passing the correct DeviceObject when calling QueryRootHub. Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h trunk/reactos/drivers/usb/usbhub/usbhub.rbuild Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Mon Sep 20 06:55:54 2010 @@ -16,13 +16,6 @@ #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) - -typedef struct _USB_LANGUAGEID_DESCRIPTOR { - UCHAR bLength; - UCHAR bDescriptorType; - WCHAR wLANGIDs[1]; -} USB_LANGUAGEID_DESCRIPTOR, *PUSB_LANGUAGEID_DESCRIPTOR; - typedef struct _PORTSTATUSANDCHANGE { USHORT Status; @@ -33,6 +26,8 @@ QueryRootHub(IN PDEVICE_OBJECT Pdo, IN ULONG IoControlCode, OUT PVOID OutParameter1, OUT PVOID OutParameter2); NTSTATUS WaitForUsbDeviceArrivalNotification(PDEVICE_OBJECT DeviceObject); +NTSTATUS +SubmitUrbToRootHub(IN PDEVICE_OBJECT Pdo, IN ULONG IoControlCode, IN PURB Urb); VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) { @@ -73,40 +68,73 @@ for (i=0; i < ConfigurationDescriptor->bNumInterfaces; i++) { - DPRINT1("bLength %x\n", InterfaceDescriptor->bLength); - DPRINT1("bDescriptorType %x\n", InterfaceDescriptor->bDescriptorType); - DPRINT1("bInterfaceNumber %x\n", InterfaceDescriptor->bInterfaceNumber); - DPRINT1("bAlternateSetting %x\n", InterfaceDescriptor->bAlternateSetting); - DPRINT1("bNumEndpoints %x\n", InterfaceDescriptor->bNumEndpoints); - DPRINT1("bInterfaceClass %x\n", InterfaceDescriptor->bInterfaceClass); - DPRINT1("bInterfaceSubClass %x\n", InterfaceDescriptor->bInterfaceSubClass); - DPRINT1("bInterfaceProtocol %x\n", InterfaceDescriptor->bInterfaceProtocol); - DPRINT1("iInterface %x\n", InterfaceDescriptor->iInterface); + DPRINT1("- Dumping InterfaceDescriptor %x\n", InterfaceDescriptor); + DPRINT1(" bLength %x\n", InterfaceDescriptor->bLength); + DPRINT1(" bDescriptorType %x\n", InterfaceDescriptor->bDescriptorType); + DPRINT1(" bInterfaceNumber %x\n", InterfaceDescriptor->bInterfaceNumber); + DPRINT1(" bAlternateSetting %x\n", InterfaceDescriptor->bAlternateSetting); + DPRINT1(" bNumEndpoints %x\n", InterfaceDescriptor->bNumEndpoints); + DPRINT1(" bInterfaceClass %x\n", InterfaceDescriptor->bInterfaceClass); + DPRINT1(" bInterfaceSubClass %x\n", InterfaceDescriptor->bInterfaceSubClass); + DPRINT1(" bInterfaceProtocol %x\n", InterfaceDescriptor->bInterfaceProtocol); + DPRINT1(" iInterface %x\n", InterfaceDescriptor->iInterface); EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)InterfaceDescriptor + sizeof(USB_INTERFACE_DESCRIPTOR)); for (j=0; j < InterfaceDescriptor->bNumEndpoints; j++) { - DPRINT1("bLength %x\n", EndpointDescriptor->bLength); - DPRINT1("bDescriptorType %x\n", EndpointDescriptor->bDescriptorType); - DPRINT1("bEndpointAddress %x\n", EndpointDescriptor->bEndpointAddress); - DPRINT1("bmAttributes %x\n", EndpointDescriptor->bmAttributes); - DPRINT1("wMaxPacketSize %x\n", EndpointDescriptor->wMaxPacketSize); - DPRINT1("bInterval %x\n", EndpointDescriptor->bInterval); - } - - InterfaceDescriptor += sizeof(USB_ENDPOINT_DESCRIPTOR); - } - -} - -VOID + DPRINT1(" bLength %x\n", EndpointDescriptor->bLength); + DPRINT1(" bDescriptorType %x\n", EndpointDescriptor->bDescriptorType); + DPRINT1(" bEndpointAddress %x\n", EndpointDescriptor->bEndpointAddress); + DPRINT1(" bmAttributes %x\n", EndpointDescriptor->bmAttributes); + DPRINT1(" wMaxPacketSize %x\n", EndpointDescriptor->wMaxPacketSize); + DPRINT1(" bInterval %x\n", EndpointDescriptor->bInterval); + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)EndpointDescriptor + sizeof(USB_ENDPOINT_DESCRIPTOR)); + } + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ULONG_PTR)EndpointDescriptor; + } + +} + +VOID DumpInterfaceInfo(PUSBD_INTERFACE_INFORMATION InterfaceInformation) +{ + PUSBD_PIPE_INFORMATION PipeInformation; + ULONG i; + + DPRINT1("IntefaceLenth %x\n",InterfaceInformation->Length); + DPRINT1("InterfaceNumber %x\n",InterfaceInformation->InterfaceNumber); + DPRINT1("AlternateSetting %x\n",InterfaceInformation->AlternateSetting); + DPRINT1("Class %x\n",InterfaceInformation->Class); + DPRINT1("SubClass %x\n",InterfaceInformation->SubClass); + DPRINT1("Protocol %x\n",InterfaceInformation->Protocol); + DPRINT1("Reserved %x\n",InterfaceInformation->Reserved); + DPRINT1("InterfaceHandle %x\n",InterfaceInformation->InterfaceHandle); + DPRINT1("NumberOfPipes %x\n", InterfaceInformation->NumberOfPipes); + + PipeInformation = &InterfaceInformation->Pipes[0]; + + for (i = 0; i < InterfaceInformation->NumberOfPipes; i++) + { + + DPRINT1("MaximumPacketSize %x\n", PipeInformation->MaximumPacketSize); + DPRINT1("EndpointAddress %x\n", PipeInformation->EndpointAddress); + DPRINT1("Interval %x\n", PipeInformation->Interval); + DPRINT1("PipeType %x\n", PipeInformation->PipeType); + DPRINT1("PipeHandle %x\n", PipeInformation->PipeHandle); + DPRINT1("PipeFlags %x\n", PipeInformation->PipeFlags); + DPRINT1("MaximumTransferSize %x\n", PipeInformation->MaximumTransferSize); + PipeInformation = (PUSBD_PIPE_INFORMATION)((ULONG_PTR)PipeInformation + sizeof(USBD_PIPE_INFORMATION)); + } +} + + +VOID NTAPI WorkerThread(IN PVOID Context) { PHUB_DEVICE_EXTENSION DeviceExtension; - PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT)Context, Pdo; + PDEVICE_OBJECT DeviceObject, Pdo; PHUB_CHILDDEVICE_EXTENSION PdoExtension; - PURB Urb; + PURB Urb = NULL; PORTSTATUSANDCHANGE PortStatusAndChange; int PortLoop, DeviceCount; NTSTATUS Status; @@ -114,7 +142,10 @@ USB_CONFIGURATION_DESCRIPTOR ConfigDesc; ULONG DevDescSize, ConfigDescSize; PUSB_STRING_DESCRIPTOR StringDesc; - USB_LANGUAGEID_DESCRIPTOR LanguageIdDescriptor; + USB_STRING_DESCRIPTOR LanguageIdDescriptor; + PWORKITEMDATA WorkItemData = (PWORKITEMDATA)Context; + + DeviceObject = (PDEVICE_OBJECT)WorkItemData->Context; DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -127,7 +158,6 @@ } } - DPRINT("Storing Device Info at %x\n", DeviceCount); Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); if (!Urb) { @@ -152,12 +182,12 @@ 0, sizeof(PORTSTATUSANDCHANGE), 0); - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); - + + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to get PortStatus!\n"); - return; + goto CleanUp; } DPRINT("Notification Port %x:\n", PortLoop + 1); @@ -180,12 +210,13 @@ sizeof(PORTSTATUSANDCHANGE), 0); - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to Clear the Port Reset with Status %x!\n", Status); - return; - } + goto CleanUp; + } + UsbBuildVendorRequest(Urb, URB_FUNCTION_CLASS_OTHER, sizeof(Urb->UrbControlVendorClassRequest), USBD_TRANSFER_DIRECTION_OUT, @@ -198,7 +229,7 @@ sizeof(PORTSTATUSANDCHANGE), 0); - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); DPRINT("Status %x\n", PortStatusAndChange.Status); DPRINT("Change %x\n", PortStatusAndChange.Change); @@ -222,7 +253,6 @@ &DevDescSize, (PUCHAR)&ConfigDesc, &ConfigDescSize); - if (!NT_SUCCESS(Status)) { DPRINT1("Failed to Get Usb Deccriptors %x!\n", Status); @@ -241,7 +271,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("UsbHub; IoCreateDevice failed with status %x\n",Status); - return; + goto CleanUp; } Pdo = DeviceExtension->Children[DeviceCount]; @@ -258,7 +288,7 @@ /* Get the LANGids */ - RtlZeroMemory(&LanguageIdDescriptor, sizeof(USB_LANGUAGEID_DESCRIPTOR)); + RtlZeroMemory(&LanguageIdDescriptor, sizeof(USB_STRING_DESCRIPTOR)); UsbBuildGetDescriptorRequest(Urb, sizeof(Urb->UrbControlDescriptorRequest), USB_STRING_DESCRIPTOR_TYPE, @@ -266,11 +296,10 @@ 0, &LanguageIdDescriptor, NULL, - sizeof(USB_LANGUAGEID_DESCRIPTOR), + sizeof(USB_STRING_DESCRIPTOR), NULL); Urb->UrbHeader.UsbdDeviceHandle = DeviceExtension->UsbChildren[DeviceCount]; - Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); /* Get the length of the SerialNumber */ @@ -283,7 +312,7 @@ sizeof(Urb->UrbControlDescriptorRequest), USB_STRING_DESCRIPTOR_TYPE, DevDesc.iSerialNumber, - LanguageIdDescriptor.wLANGIDs[0], + LanguageIdDescriptor.bString[0], StringDesc, NULL, 64, @@ -310,7 +339,7 @@ sizeof(Urb->UrbControlDescriptorRequest), USB_STRING_DESCRIPTOR_TYPE, DevDesc.iProduct, - LanguageIdDescriptor.wLANGIDs[0], + LanguageIdDescriptor.bString[0], StringDesc, NULL, 64, @@ -330,6 +359,9 @@ PdoExtension->IsFDO = FALSE; PdoExtension->Parent = DeviceObject; Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + ExFreePool(WorkItemData); + ExFreePool(Urb); IoInvalidateDeviceRelations(DeviceExtension->RootHubPdo, BusRelations); return; @@ -352,11 +384,11 @@ sizeof(PORTSTATUSANDCHANGE), 0); - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to Clear the Port Connect!\n"); - return; + goto CleanUp; } /* Send the miniport controller a SCE request so when the port resets we can be informed */ @@ -375,15 +407,20 @@ sizeof(PORTSTATUSANDCHANGE), 0); - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + if (!NT_SUCCESS(Status)) { DPRINT1("Failed to Reset the port!\n"); - return; + goto CleanUp; } /* At this point the miniport will complete another SCE to inform of Reset completed */ } } + +CleanUp: + ExFreePool(WorkItemData); + ExFreePool(Urb); } NTSTATUS @@ -391,18 +428,29 @@ { PHUB_DEVICE_EXTENSION DeviceExtension; LONG i; + PWORKITEMDATA WorkItemData; DeviceExtension = (PHUB_DEVICE_EXTENSION)((PDEVICE_OBJECT)Context)->DeviceExtension; for (i=0; i < DeviceExtension->UsbExtHubInfo.NumberOfPorts; i++) DPRINT1("Port %x DeviceExtension->PortStatus %x\n",i+1, DeviceExtension->PortStatus[i]); - if (Irp->PendingReturned) - IoMarkIrpPending(Irp); - - ExInitializeWorkItem(&DeviceExtension->WorkItem, (PWORKER_THREAD_ROUTINE)WorkerThread, Context); - ExQueueWorkItem(&DeviceExtension->WorkItem, DelayedWorkQueue); - return STATUS_SUCCESS; + IoFreeIrp(Irp); + + WorkItemData = ExAllocatePool(NonPagedPool, sizeof(WORKITEMDATA)); + if (!WorkItemData) + { + DPRINT1("Failed to allocate memory\n"); + return STATUS_NO_MEMORY; + } + + + RtlZeroMemory(WorkItemData, sizeof(WORKITEMDATA)); + WorkItemData->Context = Context; + + ExInitializeWorkItem(&WorkItemData->WorkItem, (PWORKER_THREAD_ROUTINE)WorkerThread, (PVOID)WorkItemData); + ExQueueWorkItem(&WorkItemData->WorkItem, DelayedWorkQueue); + return STATUS_MORE_PROCESSING_REQUIRED; } @@ -413,12 +461,13 @@ PIRP Irp; NTSTATUS Status; PIO_STACK_LOCATION Stack = NULL; - IO_STATUS_BLOCK IoStatus; PHUB_DEVICE_EXTENSION DeviceExtension; DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); + Urb = &DeviceExtension->Urb; + + RtlZeroMemory(Urb, sizeof(URB)); /* Send URB to the miniports Status Change Endpoint SCE */ UsbBuildInterruptOrBulkTransferRequest(Urb, @@ -432,8 +481,49 @@ Urb->UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; - Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_SUBMIT_URB, - DeviceExtension->RootHubPdo, + Irp = IoAllocateIrp(DeviceExtension->RootHubPdo->StackSize, FALSE); + + if (Irp == NULL) + { + DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + Irp->Flags = 0; + Irp->UserBuffer = NULL; + + Stack = IoGetCurrentIrpStackLocation(Irp); + Stack->DeviceObject = DeviceExtension->RootHubPdo; + + Stack = IoGetNextIrpStackLocation(Irp); + Stack->DeviceObject = DeviceExtension->RootHubPdo; + Stack->Parameters.Others.Argument1 = Urb; + Stack->Parameters.Others.Argument2 = NULL; + Stack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + Stack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + + //IoSetCompletionRoutineEx(DeviceExtension->RootHubPdo, Irp, (PIO_COMPLETION_ROUTINE)DeviceArrivalCompletion, DeviceObject, TRUE, TRUE, TRUE); + IoSetCompletionRoutine(Irp, (PIO_COMPLETION_ROUTINE)DeviceArrivalCompletion, DeviceObject, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceExtension->RootHubPdo, Irp); + DPRINT1("SCE request status %x\n", Status); + + return STATUS_PENDING; +} + +NTSTATUS +SubmitUrbToRootHub(IN PDEVICE_OBJECT Pdo, IN ULONG IoControlCode, IN PURB Urb) +{ + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + + Irp = IoBuildDeviceIoControlRequest(IoControlCode, + Pdo, NULL, 0, NULL, 0, TRUE, @@ -455,13 +545,9 @@ Stack->Parameters.Others.Argument1 = Urb; Stack->Parameters.Others.Argument2 = NULL; - //IoSetCompletionRoutineEx(DeviceExtension->RootHubPdo, Irp, (PIO_COMPLETION_ROUTINE)DeviceArrivalCompletion, DeviceObject, TRUE, TRUE, TRUE); - IoSetCompletionRoutine(Irp, (PIO_COMPLETION_ROUTINE)DeviceArrivalCompletion, DeviceObject, TRUE, TRUE, TRUE); - - Status = IoCallDriver(DeviceExtension->RootHubPdo, Irp); - - return STATUS_MORE_PROCESSING_REQUIRED; - + Status = IoCallDriver(Pdo, Irp); + + return Status; } NTSTATUS @@ -630,6 +716,12 @@ return STATUS_SUCCESS; } +VOID CallBackRoutine(IN PVOID Argument1) +{ + DPRINT1("RH_INIT_CALLBACK %x\n", Argument1); + ASSERT(FALSE); +} + NTSTATUS NTAPI UsbhubPnpFdo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -650,6 +742,10 @@ { PURB Urb; ULONG Result = 0; + PUSB_INTERFACE_DESCRIPTOR Pid; + /* Theres only one descriptor on hub */ + USBD_INTERFACE_LIST_ENTRY InterfaceList[2] = {{NULL, NULL}, {NULL, NULL}}; + PURB ConfigUrb = NULL; /* We differ from windows on hubpdo because we dont have usbport.sys which manages all usb device objects */ DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); @@ -659,7 +755,7 @@ RtlZeroMemory(Urb, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY)); /* Get the hubs PDO */ - QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, &DeviceExtension->RootHubPdo, &DeviceExtension->RootHubFdo); + QueryRootHub(DeviceExtension->LowerDevice, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, &DeviceExtension->RootHubPdo, &DeviceExtension->RootHubFdo); ASSERT(DeviceExtension->RootHubPdo); ASSERT(DeviceExtension->RootHubFdo); DPRINT1("RootPdo %x, RootFdo %x\n", DeviceExtension->RootHubPdo, DeviceExtension->RootHubFdo); @@ -707,7 +803,6 @@ return Status; } - /* FIXME: This gets nothing from MS miniport */ Status = DeviceExtension->HubInterface.QueryDeviceInformation(DeviceExtension->RootHubPdo, DeviceExtension->RootHubUsbDevice, &DeviceExtension->DeviceInformation, @@ -801,24 +896,24 @@ DPRINT1("bDescriptorType %x\n", DeviceExtension->HubDescriptor.bDescriptorType); /* Select the configuration */ - /* FIXME: Use USBD_CreateConfigurationRequestEx instead */ - RtlZeroMemory(Urb, sizeof(URB)); - UsbBuildSelectConfigurationRequest(Urb, - sizeof(Urb->UrbSelectConfiguration), - &DeviceExtension->HubConfigDescriptor); - - Urb->UrbSelectConfiguration.Interface.Length = sizeof(USBD_INTERFACE_INFORMATION); - Urb->UrbSelectConfiguration.Interface.NumberOfPipes = 1; - Urb->UrbSelectConfiguration.Interface.Pipes[0].MaximumTransferSize = 4096; - - Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); - - DeviceExtension->ConfigurationHandle = Urb->UrbSelectConfiguration.ConfigurationHandle; - DeviceExtension->PipeHandle = Urb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; + + /* Get the first one */ + Pid = USBD_ParseConfigurationDescriptorEx(&DeviceExtension->HubConfigDescriptor, + &DeviceExtension->HubConfigDescriptor, + -1, -1, -1, -1, -1); + ASSERT(Pid != NULL); + InterfaceList[0].InterfaceDescriptor = Pid; + ConfigUrb = USBD_CreateConfigurationRequestEx(&DeviceExtension->HubConfigDescriptor, (PUSBD_INTERFACE_LIST_ENTRY)&InterfaceList); + ASSERT(ConfigUrb != NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, ConfigUrb, NULL); + + DeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; + DeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; DPRINT1("Configuration Handle %x\n", DeviceExtension->ConfigurationHandle); + ExFreePool(ConfigUrb); + Status = DeviceExtension->HubInterface.Initialize20Hub(DeviceExtension->RootHubPdo, DeviceExtension->RootHubUsbDevice, 1); - DPRINT1("Status %x\n", Status); { @@ -842,7 +937,7 @@ 0); Urb->UrbOSFeatureDescriptorRequest.MS_FeatureDescriptorIndex = PortLoop + 1; - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); DPRINT1("Status %x\n", Status); @@ -858,7 +953,7 @@ 0, sizeof(PortStatusAndChange), 0); - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); DPRINT1("Status %x\n", Status); DPRINT1("PortStatus = %x\n", PortStatusAndChange[0]); Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Mon Sep 20 06:55:54 2010 @@ -63,6 +63,12 @@ USB_CONFIGURATION **Configs; } USB_DEVICE, *PUSB_DEVICE; +typedef struct _WORKITEMDATA +{ + WORK_QUEUE_ITEM WorkItem; + PVOID Context; +} WORKITEMDATA, *PWORKITEMDATA; + typedef struct _HUB_CHILDDEVICE_EXTENSION { BOOLEAN IsFDO; @@ -93,6 +99,7 @@ ULONG HubCount; USHORT PortStatus[256]; + URB Urb; USB_BUS_INTERFACE_HUB_V5 HubInterface; USB_BUS_INTERFACE_USBDI_V2 UsbDInterface; @@ -106,8 +113,6 @@ USB_EXTHUB_INFORMATION_0 UsbExtHubInfo; USB_DEVICE_INFORMATION_0 DeviceInformation; - - WORK_QUEUE_ITEM WorkItem; USBD_CONFIGURATION_HANDLE ConfigurationHandle; USBD_PIPE_HANDLE PipeHandle; Modified: trunk/reactos/drivers/usb/usbhub/usbhub.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.rbuild [iso-8859-1] Mon Sep 20 06:55:54 2010 @@ -3,6 +3,7 @@ <module name="usbhub" type="kernelmodedriver" installbase="system32/drivers" installname="usbhub.sys"> <library>ntoskrnl</library> <library>hal</library> + <library>usbd</library> <file>createclose.c</file> <file>fdo.c</file> <file>misc.c</file>

1 0

[sir_richard] 48825: [MISC]: Fix several compiler issues on my main build box. Some of the Unicode translations in kernel32 fail to compile, while other libraries don't build because old C library ...
by sir_richard＠svn.reactos.org 20 Sep '10

20 Sep '10

Author: sir_richard Date: Mon Sep 20 06:30:21 2010 New Revision: 48825 URL: http://svn.reactos.org/svn/reactos?rev=48825&view=rev Log: [MISC]: Fix several compiler issues on my main build box. Some of the Unicode translations in kernel32 fail to compile, while other libraries don't build because old C library names (without the underscore) are used. [SETUPLDR]: Unify the old setupldr settings with more recent freeldr ones. Also fixes missing _udiv/mod functions on my build. Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild trunk/reactos/dll/win32/kernel32/nls/cht.nls trunk/reactos/dll/win32/kernel32/nls/zhm.nls trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Mon Sep 20 06:30:21 2010 @@ -17,4 +17,8 @@ <library>cportlib</library> <library>rtl</library> <library>libcntpr</library> + <group linkerset="ld"> + <linkerflag>-static</linkerflag> + <linkerflag>-lgcc</linkerflag> + </group> </module> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Mon Sep 20 06:30:21 2010 @@ -5,13 +5,6 @@ <include base="ntoskrnl">include</include> <define name="_NTHAL_" /> <define name="FREELDR_REACTOS_SETUP" /> - <group compilerset="gcc"> - <compilerflag>-ffreestanding</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-fno-inline</compilerflag> - <compilerflag>-fno-zero-initialized-in-bss</compilerflag> - <compilerflag>-Os</compilerflag> - </group> <file>bootmgr.c</file> <directory name="inffile"> <file>inffile.c</file> Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.rbuild [iso-8859-1] Mon Sep 20 06:30:21 2010 @@ -15,6 +15,8 @@ <define name="UNW_FLAG_UHANDLER">2</define> <define name="UNW_FLAG_CHAININFO">3</define> </if> + <define name="lseek">_lseek</define> + <define name="read">_read</define> <file>coff.c</file> <file>cpu_i386.c</file> <file>cpu_ppc.c</file> Modified: trunk/reactos/dll/win32/kernel32/nls/cht.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cht… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/cht.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/cht.nls [iso-8859-1] Mon Sep 20 06:30:21 2010 @@ -80,9 +80,9 @@ LOCALE_SABBREVMONTHNAME7 "¤C¤ë" LOCALE_SABBREVMONTHNAME8 "¤K¤ë" LOCALE_SABBREVMONTHNAME9 "¤E¤ë" - LOCALE_SABBREVMONTHNAME10 "¤Q¤ë" - LOCALE_SABBREVMONTHNAME11 "¤Q¤@¤ë" - LOCALE_SABBREVMONTHNAME12 "¤Q¤G¤ë" + LOCALE_SABBREVMONTHNAME10 "BROKEN PLEASE FIX" + LOCALE_SABBREVMONTHNAME11 "BROKEN PLEASE FIX" + LOCALE_SABBREVMONTHNAME12 "BROKEN PLEASE FIX" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Taiwan" LOCALE_SCURRENCY "NT$" @@ -116,9 +116,9 @@ LOCALE_SMONTHNAME7 "¤C¤ë" LOCALE_SMONTHNAME8 "¤K¤ë" LOCALE_SMONTHNAME9 "¤E¤ë" - LOCALE_SMONTHNAME10 "¤Q¤ë" - LOCALE_SMONTHNAME11 "¤Q¤@¤ë" - LOCALE_SMONTHNAME12 "¤Q¤G¤ë" + LOCALE_SMONTHNAME10 "BROKEN PLEASE FIX" + LOCALE_SMONTHNAME11 "BROKEN PLEASE FIX" + LOCALE_SMONTHNAME12 "BROKEN PLEASE FIX" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "zh-TW" Modified: trunk/reactos/dll/win32/kernel32/nls/zhm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhm… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/zhm.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/zhm.nls [iso-8859-1] Mon Sep 20 06:30:21 2010 @@ -80,9 +80,9 @@ LOCALE_SABBREVMONTHNAME7 "¤C¤ë" LOCALE_SABBREVMONTHNAME8 "¤K¤ë" LOCALE_SABBREVMONTHNAME9 "¤E¤ë" - LOCALE_SABBREVMONTHNAME10 "¤Q¤ë" - LOCALE_SABBREVMONTHNAME11 "¤Q¤@¤ë" - LOCALE_SABBREVMONTHNAME12 "¤Q¤G¤ë" + LOCALE_SABBREVMONTHNAME10 "BROKEN PLEASE FIX" + LOCALE_SABBREVMONTHNAME11 "BROKEN PLEASE FIX" + LOCALE_SABBREVMONTHNAME12 "BROKEN PLEASE FIX" LOCALE_SABBREVMONTHNAME13 "" LOCALE_SCOUNTRY "Macau S.A.R." LOCALE_SCURRENCY "P" @@ -116,9 +116,9 @@ LOCALE_SMONTHNAME7 "¤C¤ë" LOCALE_SMONTHNAME8 "¤K¤ë" LOCALE_SMONTHNAME9 "¤E¤ë" - LOCALE_SMONTHNAME10 "¤Q¤ë" - LOCALE_SMONTHNAME11 "¤Q¤@¤ë" - LOCALE_SMONTHNAME12 "¤Q¤G¤ë" + LOCALE_SMONTHNAME10 "BROKEN PLEASE FIX" + LOCALE_SMONTHNAME11 "BROKEN PLEASE FIX" + LOCALE_SMONTHNAME12 "BROKEN PLEASE FIX" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "," LOCALE_SNAME "zh-MO" Modified: trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libmpg123/lib… ============================================================================== --- trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libmpg123/libmpg123.rbuild [iso-8859-1] Mon Sep 20 06:30:21 2010 @@ -9,6 +9,10 @@ <define name="EOVERFLOW">75</define> <include base="libmpg123">.</include> <include base="ReactOS">include/reactos/libs/libmpg123</include> +  + <define name="lseek">_lseek</define> + <define name="read">_read</define> + <define name="strdup">_strdup</define> <file>compat.c</file> <file>dct64.c</file> <file>dct64_i386.c</file>

1 0

[tkreuzer] 48824: [CMAKE] - Improved MSVC toolchain support, now working with WDK, as well (Thanks to Amine for solving the problems) - Add compiler specific macro set_subsystem - add nativecui mod...
by tkreuzer＠svn.reactos.org 19 Sep '10

19 Sep '10

Author: tkreuzer Date: Sun Sep 19 23:03:25 2010 New Revision: 48824 URL: http://svn.reactos.org/svn/reactos?rev=48824&view=rev Log: [CMAKE] - Improved MSVC toolchain support, now working with WDK, as well (Thanks to Amine for solving the problems) - Add compiler specific macro set_subsystem - add nativecui module type Modified: branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Sep 19 23:03:25 2010 @@ -37,6 +37,10 @@ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,-entry,_${ENTRYPOINT}") endmacro() +macro(set_subsystem MODULE SUBSYSTEM) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--subsystem:${SUBSYSTEM}") +endmacro() + macro(add_importlibs MODULE) FOREACH(LIB ${ARGN}) target_link_libraries(${MODULE} ${LIB}.a) @@ -45,7 +49,12 @@ macro(set_module_type MODULE TYPE) target_link_libraries(${MODULE} mingw_wmain mingw_common) + if(${TYPE} MATCHES nativecui) + set_subsystem(${MODULE} native) + set_entrypoint(${MODULE} NtProcessStartup@4) + endif() if(${TYPE} MATCHES win32gui) + set_subsystem(${MODULE} windows) set_entrypoint(${MODULE} wWinMainCRTStartup) endif() endmacro() Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Sep 19 23:03:25 2010 @@ -18,6 +18,10 @@ set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/ENTRY:${ENTRYPOINT}") endmacro() +macro(set_subsystem MODULE SUBSYSTEM) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/subsystem:${SUBSYSTEM}") +endmacro() + macro(add_importlibs MODULE) FOREACH(LIB ${ARGN}) target_link_libraries(${MODULE} ${LIB}.LIB) @@ -25,9 +29,17 @@ endmacro() macro(set_module_type MODULE TYPE) + if(${TYPE} MATCHES nativecui) + set_subsystem(${MODULE} native) + add_importlibs(${MODULE} ntdll) + endif() if (${TYPE} MATCHES win32gui) - set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/subsystem:windows") + set_subsystem(${MODULE} windows) endif () endmacro() endif() + +set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") +SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") + Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Sun Sep 19 23:03:25 2010 @@ -1,7 +1,24 @@ if(NOT ARCH) -set(ARCH i386) -endif(NOT ARCH) + set(ARCH i386) +endif() + +# WDK support +string(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) +string(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) +string(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) +string(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) +string(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) +string(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) + +link_directories( +#${ATL_LIB_PATH} + ${CRT_LIB_PATH} + ${DDK_LIB_PATH} +# ${IFSKIT_LIB_PATH} +# ${KMDF_LIB_PATH} +# ${MFC_LIB_PATH} + ${SDK_LIB_PATH}) # the name of the target operating system set(CMAKE_SYSTEM_NAME Windows) @@ -16,7 +33,12 @@ SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include/ /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") +set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") +SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) + +# Prevent from using run time checking when testing the compiler +set(CMAKE_BUILD_TYPE "RelwithDebInfo" CACHE STRING "Build Type")

1 0

[tkreuzer] 48823: [CMAKE] syntax... "just for consistency"
by tkreuzer＠svn.reactos.org 19 Sep '10

19 Sep '10

Author: tkreuzer Date: Sun Sep 19 20:16:40 2010 New Revision: 48823 URL: http://svn.reactos.org/svn/reactos?rev=48823&view=rev Log: [CMAKE] syntax... "just for consistency" Modified: branches/cmake-bringup/config.cmake Modified: branches/cmake-bringup/config.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/config.cmake?rev=… ============================================================================== --- branches/cmake-bringup/config.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/config.cmake [iso-8859-1] Sun Sep 19 20:16:40 2010 @@ -1,19 +1,16 @@ set(SARCH "pc" CACHE STRING -"Sub-architecture to build for. Specify one of: xbox" -) +"Sub-architecture to build for. Specify one of: xbox") set(OARCH "pentium" CACHE STRING "Generate instructions for this CPU type. Specify one of: native, i386, i486, pentium, pentium-mmx, pentiumpro, i686, pentium2, pentium3, pentium-m, pentium4, prescott, nocona, core2, k6, k6-2, athlon, athlon-xp, opteron, opteron-sse3, - barcelona, winchip-c6, winchip2, c3, c3-2, geode" -) + barcelona, winchip-c6, winchip2, c3, c3-2, geode") set(TUNE "i686" CACHE STRING -"Which CPU ReactOS should be optimized for." -) +"Which CPU ReactOS should be optimized for.") set (OPTIMIZE "1" CACHE STRING "What level of optimisation to use. @@ -22,39 +19,31 @@ 2 = -Os 3 = -O1 4 = -O2 - 5 = -O3" -) + 5 = -O3") set(DBG 1 CACHE BOOL -"Whether to compile for debugging." -) +"Whether to compile for debugging.") set(KDBG 1 CACHE BOOL -"Whether to compile in the integrated kernel debugger." -) +"Whether to compile in the integrated kernel debugger.") set(GDB 0 CACHE BOOL "Whether to compile for debugging with GDB. -If you don't use GDB, don't enable this." -) +If you don't use GDB, don't enable this.") set(_WINKD_ 0 CACHE BOOL -"Whether to compile with the KD protocol." -) +"Whether to compile with the KD protocol.") set(_ELF_ 0 CACHE BOOL "Whether to compile support for ELF files. -Do not enable unless you know what you're doing." -) +Do not enable unless you know what you're doing.") set(NSWPAT 0 CACHE BOOL "Whether to compile apps/libs with features covered software patents or not. If you live in a country where software patents are valid/apply, don't enable this (except they/you purchased a license from the patent owner). -This settings is disabled (0) by default." -) +This settings is disabled (0) by default.") set(BUILD_MP 1 CACHE BOOL -"Whether to compile the multi processor versions for ntoskrnl and hal." -) +"Whether to compile the multi processor versions for ntoskrnl and hal.")

1 0

[tkreuzer] 48822: Fix a typo.Thanks to Usurp for noticing.
by tkreuzer＠svn.reactos.org 19 Sep '10

19 Sep '10

Author: tkreuzer Date: Sun Sep 19 20:10:55 2010 New Revision: 48822 URL: http://svn.reactos.org/svn/reactos?rev=48822&view=rev Log: Fix a typo.Thanks to Usurp for noticing. 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=488… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Sep 19 20:10:55 2010 @@ -44,7 +44,7 @@ endmacro() macro(set_module_type MODULE TYPE) - target_link_libraries(calc mingw_wmain mingw_common) + target_link_libraries(${MODULE} mingw_wmain mingw_common) if(${TYPE} MATCHES win32gui) set_entrypoint(${MODULE} wWinMainCRTStartup) endif()

1 0

[tkreuzer] 48821: [CMAKE] - Add support for gui configurable options - globalize compiler specific cmake files - Add compiler specific macros set_entrypoint, set_module_type
by tkreuzer＠svn.reactos.org 19 Sep '10

19 Sep '10

Author: tkreuzer Date: Sun Sep 19 20:06:02 2010 New Revision: 48821 URL: http://svn.reactos.org/svn/reactos?rev=48821&view=rev Log: [CMAKE] - Add support for gui configurable options - globalize compiler specific cmake files - Add compiler specific macros set_entrypoint, set_module_type Added: branches/cmake-bringup/config.cmake Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Sep 19 20:06:02 2010 @@ -1,6 +1,17 @@ cmake_minimum_required(VERSION 2.8) project(REACTOS) +# Compile options +include(config.cmake) + +# Compiler specific definitions and macros +if(MSVC) +include(msc.cmake) +else() +include(gcc.cmake) +endif(MSVC) + +# Generic macros include(CMakeMacros.cmake) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -15,7 +26,6 @@ if(NOT CMAKE_CROSSCOMPILING) add_definitions(-DTARGET_i386) -add_definitions(-fshort-wchar) include_directories(${REACTOS_SOURCE_DIR}/tools/unicode) include_directories(include) @@ -27,15 +37,13 @@ add_subdirectory(tools) add_subdirectory(lib) +if(NOT MSVC) export(TARGETS widl winebuild nci buildno gendib cdmake FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +else() +export(TARGETS winebuild nci buildno gendib cdmake FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) +endif() else() - -if(MSVC) -include(msc.cmake) -else() -include(gcc.cmake) -endif(MSVC) # Activate support for assembly source files enable_language(ASM) @@ -45,11 +53,6 @@ set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables") include(${IMPORT_EXECUTABLES}) - -# Debug Options -set(_WINKD_ 0) -set(KDBG 1) -set(DBG 1) add_definitions(-DDBG=${DBG} -DKDBG=${KDBG}) @@ -161,3 +164,4 @@ add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES}) endif() + Added: branches/cmake-bringup/config.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/config.cmake?rev=… ============================================================================== --- branches/cmake-bringup/config.cmake (added) +++ branches/cmake-bringup/config.cmake [iso-8859-1] Sun Sep 19 20:06:02 2010 @@ -1,0 +1,60 @@ + +set(SARCH "pc" CACHE STRING +"Sub-architecture to build for. Specify one of: xbox" +) + +set(OARCH "pentium" CACHE STRING +"Generate instructions for this CPU type. Specify one of: + native, i386, i486, pentium, pentium-mmx, pentiumpro, i686, + pentium2, pentium3, pentium-m, pentium4, prescott, nocona, + core2, k6, k6-2, athlon, athlon-xp, opteron, opteron-sse3, + barcelona, winchip-c6, winchip2, c3, c3-2, geode" +) + +set(TUNE "i686" CACHE STRING +"Which CPU ReactOS should be optimized for." +) + +set (OPTIMIZE "1" CACHE STRING +"What level of optimisation to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = -Os + 3 = -O1 + 4 = -O2 + 5 = -O3" +) + +set(DBG 1 CACHE BOOL +"Whether to compile for debugging." +) + +set(KDBG 1 CACHE BOOL +"Whether to compile in the integrated kernel debugger." +) + +set(GDB 0 CACHE BOOL +"Whether to compile for debugging with GDB. +If you don't use GDB, don't enable this." +) + +set(_WINKD_ 0 CACHE BOOL +"Whether to compile with the KD protocol." +) + +set(_ELF_ 0 CACHE BOOL +"Whether to compile support for ELF files. +Do not enable unless you know what you're doing." +) + +set(NSWPAT 0 CACHE BOOL +"Whether to compile apps/libs with features covered software patents or not. +If you live in a country where software patents are valid/apply, don't +enable this (except they/you purchased a license from the patent owner). +This settings is disabled (0) by default." +) + +set(BUILD_MP 1 CACHE BOOL +"Whether to compile the multi processor versions for ntoskrnl and hal." +) + Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Sep 19 20:06:02 2010 @@ -1,25 +1,54 @@ - -# Linking -link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) -set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") -set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") - -# Compiler Core -add_definitions(-pipe -fms-extensions) - -set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") - -# Debugging (Note: DWARF-4 on 4.5.1 when we ship) -add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) - -# Tuning -add_definitions(-march=pentium -mtune=i686) - -# Warnings -add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) - -# Optimizations -add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) - -# C++ Flags -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") + + +if(NOT CMAKE_CROSSCOMPILING) + +add_definitions(-fshort-wchar) + + +else() + +# Linking +link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") +set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") + +# Compiler Core +add_definitions(-pipe -fms-extensions) + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +# Debugging (Note: DWARF-4 on 4.5.1 when we ship) +add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) + +# Tuning +add_definitions(-march=pentium -mtune=i686) + +# Warnings +add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) + +# Optimizations +add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) + +# C++ Flags +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") + +# Macros +macro(set_entrypoint MODULE ENTRYPOINT) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,-entry,_${ENTRYPOINT}") +endmacro() + +macro(add_importlibs MODULE) + FOREACH(LIB ${ARGN}) + target_link_libraries(${MODULE} ${LIB}.a) + ENDFOREACH() +endmacro() + +macro(set_module_type MODULE TYPE) + target_link_libraries(calc mingw_wmain mingw_common) + if(${TYPE} MATCHES win32gui) + set_entrypoint(${MODULE} wWinMainCRTStartup) + endif() +endmacro() + +endif() + Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=488… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sun Sep 19 20:06:02 2010 @@ -1,3 +1,33 @@ - -add_definitions(/GS- /Zl /Zi) -add_definitions(-Dinline=__inline -D__STDC__=1) + +if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") + add_definitions(-D__i386__) +endif() + +add_definitions(-Dinline=__inline) + +if(NOT CMAKE_CROSSCOMPILING) + + + +else() + +add_definitions(/GS- /Zl /Zi) +add_definitions(-Dinline=__inline -D__STDC__=1) + +macro(set_entrypoint MODULE ENTRYPOINT) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/ENTRY:${ENTRYPOINT}") +endmacro() + +macro(add_importlibs MODULE) + FOREACH(LIB ${ARGN}) + target_link_libraries(${MODULE} ${LIB}.LIB) + ENDFOREACH() +endmacro() + +macro(set_module_type MODULE TYPE) + if (${TYPE} MATCHES win32gui) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/subsystem:windows") + endif () +endmacro() + +endif()

1 0

[tkreuzer] 48820: [CMAKE] Add RC compiler and Assembler to MSC toolchain
by tkreuzer＠svn.reactos.org 19 Sep '10

19 Sep '10

Author: tkreuzer Date: Sun Sep 19 18:53:55 2010 New Revision: 48820 URL: http://svn.reactos.org/svn/reactos?rev=48820&view=rev Log: [CMAKE] Add RC compiler and Assembler to MSC toolchain Modified: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Sun Sep 19 18:53:55 2010 @@ -10,6 +10,10 @@ # which compilers to use for C and C++ set(CMAKE_C_COMPILER cl) set(CMAKE_CXX_COMPILER cl) +SET(CMAKE_RC_COMPILER rc) +SET(CMAKE_ASM_COMPILER ml) + +SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include/ /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")

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