Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[ekohl] 51659: [NETEVENT] Add some eventlog and service manager events.
by ekohl＠svn.reactos.org 09 May '11

09 May '11

Author: ekohl Date: Mon May 9 14:42:10 2011 New Revision: 51659 URL: http://svn.reactos.org/svn/reactos?rev=51659&view=rev Log: [NETEVENT] Add some eventlog and service manager events. Modified: trunk/reactos/include/reactos/mc/netevent.mc Modified: trunk/reactos/include/reactos/mc/netevent.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/neteven… ============================================================================== --- trunk/reactos/include/reactos/mc/netevent.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/netevent.mc [iso-8859-1] Mon May 9 14:42:10 2011 @@ -22,7 +22,49 @@ ; Facility=System -; Eventlog messages 6xxx- +; +; eventlog events 6000-6099 +; + +MessageId=6000 +Severity=Warning +Facility=System +SymbolicName=EVENT_LOG_FULL +Language=English +The %1 log file is full. +. + +MessageId=6001 +Severity=Warning +Facility=System +SymbolicName=EVENT_LogFileNotOpened +Language=English +The %1 log file cannot be opened. +. + +MessageId=6002 +Severity=Warning +Facility=System +SymbolicName=EVENT_LogFileCorrupt +Language=English +The %1 log file is corrupted and will be cleared. +. + +MessageId=6003 +Severity=Warning +Facility=System +SymbolicName=EVENT_DefaultLogCorrupt +Language=English +The Application log file could not be opened. %1 will be used as the default log file. +. + +MessageId=6004 +Severity=Warning +Facility=System +SymbolicName=EVENT_BadDriverPacket +Language=English +A driver packet received from the I/O subsystem was invalid. The data is the packet. +. MessageId=6005 Severity=Warning @@ -40,6 +82,22 @@ The Event log service was stopped. . +MessageId=6007 +Severity=Warning +Facility=System +SymbolicName=TITLE_EventlogMessageBox +Language=English +Eventlog Service %0 +. + +MessageId=6008 +Severity=Warning +Facility=System +SymbolicName=EVENT_EventlogAbnormalShutdown +Language=English +The previous system shutdown at %1 on %2 was unexpected. +. + MessageId=6009 Severity=Warning Facility=System @@ -48,8 +106,366 @@ ReactOS %1 %2 %3 %4. . - -; transport messages +MessageId=6010 +Severity=Error +Facility=System +SymbolicName=EVENT_ServiceNoEventLog +Language=English +The %1 service was unable to set up an event source. +. + +MessageId=6011 +Severity=Error +Facility=System +SymbolicName=EVENT_ComputerNameChange +Language=English +The NetBIOS name and DNS host name of this machine have been changed from %1 to %2. +. + +MessageId=6012 +Severity=Error +Facility=System +SymbolicName=EVENT_DNSDomainNameChange +Language=English +The DNS domain assigned to this computer has been changed from %1 to %2. +. + + +; +; system events 6100 - 6199 +; + +MessageId=6100 +Severity=Error +Facility=System +SymbolicName=EVENT_UP_DRIVER_ON_MP +Language=English +A uniprocessor-specific driver was loaded on a multiprocessor system. The driver could not load. +. + + +; +; service controller events 7000-7899 +; + +MessageId=7000 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED +Language=English +The %1 service failed to start due to the following error: %n%2 +. + +MessageId=7001 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED_II +Language=English +The %1 service depends on the %2 service which failed to start because of the following error: %n%3 +. + +MessageId=7002 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED_GROUP +Language=English +The %1 service depends on the %2 group and no member of this group started. +. + +MessageId=7003 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_FAILED_NONE +Language=English +The %1 service depends on the following nonexistent service: %2 +. + +MessageId=7004 +Severity=Error +Facility=System +SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED +Language=English +The %1 call failed with the following error: %n%2 +. + +MessageId=7005 +Severity=Error +Facility=System +SymbolicName=EVENT_CALL_TO_FUNCTION_FAILED_II +Language=English +The %1 call failed for %2 with the following error: %n%3 +. + +MessageId=7006 +Severity=Error +Facility=System +SymbolicName=EVENT_REVERTED_TO_LASTKNOWNGOOD +Language=English +The system reverted to its last known good configuration. The system is restarting.... +. + +MessageId=7007 +Severity=Error +Facility=System +SymbolicName=EVENT_BAD_ACCOUNT_NAME +Language=English +No backslash is in the account name. +. + +MessageId=7008 +Severity=Error +Facility=System +SymbolicName=EVENT_CONNECTION_TIMEOUT +Language=English +Timeout (%1 milliseconds) waiting for the %2 service to connect. +. + +MessageId=7009 +Severity=Error +Facility=System +SymbolicName=EVENT_READFILE_TIMEOUT +Language=English +Timeout (%1 milliseconds) waiting for ReadFile. +. + +MessageId=7010 +Severity=Error +Facility=System +SymbolicName=EVENT_TRANSACT_TIMEOUT +Language=English +Timeout (%1 milliseconds) waiting for a transaction response from the %2 service. +. + +MessageId=7011 +Severity=Error +Facility=System +SymbolicName=EVENT_TRANSACT_INVALID +Language=English +Message returned in transaction has incorrect size. +. + +MessageId=7012 +Severity=Error +Facility=System +SymbolicName=EVENT_FIRST_LOGON_FAILED +Language=English +Logon attempt with current password failed with the following error: %n%1 +. + +MessageId=7013 +Severity=Error +Facility=System +SymbolicName=EVENT_SECOND_LOGON_FAILED +Language=English +Second logon attempt with old password also failed with the following error: %n%1 +. + +MessageId=7014 +Severity=Error +Facility=System +SymbolicName=EVENT_INVALID_DRIVER_DEPENDENCY +Language=English +Boot-start or system-start driver (%1) must not depend on a service. +. + +MessageId=7015 +Severity=Error +Facility=System +SymbolicName=EVENT_BAD_SERVICE_STATE +Language=English +The %1 service has reported an invalid current state %2. +. + +MessageId=7016 +Severity=Error +Facility=System +SymbolicName=EVENT_CIRCULAR_DEPENDENCY_DEMAND +Language=English +Detected circular dependencies demand starting %1. +. + +MessageId=7017 +Severity=Error +Facility=System +SymbolicName=EVENT_CIRCULAR_DEPENDENCY_AUTO +Language=English +Detected circular dependencies auto-starting services. +. + +MessageId=7018 +Severity=Error +Facility=System +SymbolicName=EVENT_DEPEND_ON_LATER_SERVICE +Language=English +Circular dependency: The %1 service depends on a service in a group which starts later. +. + +MessageId=7019 +Severity=Error +Facility=System +SymbolicName=EVENT_DEPEND_ON_LATER_GROUP +Language=English +Circular dependency: The %1 service depends on a group which starts later. +. + +MessageId=7020 +Severity=Error +Facility=System +SymbolicName=EVENT_SEVERE_SERVICE_FAILED +Language=English +About to revert to the last known good configuration because the %1 service failed to start. +. + +MessageId=7021 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_HUNG +Language=English +The %1 service hung on starting. +. + +MessageId=7022 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_EXIT_FAILED +Language=English +The %1 service terminated with the following error: %n%2 +. + +MessageId=7023 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_EXIT_FAILED_SPECIFIC +Language=English +The %1 service terminated with service-specific error %2. +. + +MessageId=7024 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_START_AT_BOOT_FAILED +Language=English +At least one service or driver failed during system startup. Use Event Viewer to examine the event log for details. +. + +MessageId=7025 +Severity=Error +Facility=System +SymbolicName=EVENT_BOOT_SYSTEM_DRIVERS_FAILED +Language=English +The following boot-start or system-start driver(s) failed to load: %1 +. + +MessageId=7026 +Severity=Error +Facility=System +SymbolicName=EVENT_RUNNING_LASTKNOWNGOOD +Language=English +ReactOS could not be started as configured. A previous working configuration was used instead. +. + +MessageId=7027 +Severity=Error +Facility=System +SymbolicName=EVENT_TAKE_OWNERSHIP +Language=English +The %1 Registry key denied access to SYSTEM account programs so the Service Control Manager took ownership of the Registry key. +. + +MessageId=7028 +Severity=Error +Facility=System +SymbolicName=TITLE_SC_MESSAGE_BOX +Language=English +Service Control Manager %0 +. + +MessageId=7029 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_NOT_INTERACTIVE +Language=English +The %1 service is marked as an interactive service. However, the system is configured to not allow interactive services. This service may not function properly. +. + +MessageId=7030 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_CRASH +Language=English +The %1 service terminated unexpectedly. It has done this %2 time(s). The following corrective action will be taken in %3 milliseconds: %5. +. + +MessageId=7031 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_RECOVERY_FAILED +Language=English +The Service Control Manager tried to take a corrective action (%2) after the unexpected termination of the %3 service, but this action failed with the following error: %n%4 +. + +MessageId=7032 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_SCESRV_FAILED +Language=English +The Service Control Manager did not initialize successfully. The security +configuration server (scesrv.dll) failed to initialize with error %1. The +system is restarting... +. + +MessageId=7033 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_CRASH_NO_ACTION +Language=English +The %1 service terminated unexpectedly. It has done this %2 time(s). +. + +MessageId=7034 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_CONTROL_SUCCESS +Language=English +The %1 service was successfully sent a %2 control. +. + +MessageId=7035 +Severity=Informational +Facility=System +SymbolicName=EVENT_SERVICE_STATUS_SUCCESS +Language=English +Service Control Manager %0 +. + +MessageId=7036 +Severity=Error +Facility=System +SymbolicName=EVENT_SERVICE_CONFIG_BACKOUT_FAILED +Language=English +The Service Control Manager encountered an error undoing a configuration change +to the %1 service. The service's %2 is currently in an unpredictable state. + +If you do not correct this configuration, you may not be able to restart the %1 +service or may encounter other errors. To ensure that the service is configured +properly, use the Services snap-in in Microsoft Management Console (MMC). +. + +MessageId=7037 +Severity=Error +Facility=System +SymbolicName=EVENT_FIRST_LOGON_FAILED_II +Language=English +The %1 service was unable to log on as %2 with the currently configured +password due to the following error: %n%3%n%nTo ensure that the service is +configured properly, use the Services snap-in in Microsoft Management +Console (MMC). +. + + +; +; transport events 9000-9499 +; MessageId=9004 Severity=Error

1 0

[ilardig] 51658: [winine] - Read also the shift key state patch by Carlo Bramini. See issue #6238 for more details.
by ilardig＠svn.reactos.org 09 May '11

09 May '11

Author: ilardig Date: Mon May 9 11:24:10 2011 New Revision: 51658 URL: http://svn.reactos.org/svn/reactos?rev=51658&view=rev Log: [winine] - Read also the shift key state patch by Carlo Bramini. See issue #6238 for more details. Modified: trunk/reactos/base/applications/games/winmine/main.c Modified: trunk/reactos/base/applications/games/winmine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1] Mon May 9 11:24:10 2011 @@ -885,7 +885,7 @@ case WM_LBUTTONDOWN: WINE_TRACE("WM_LBUTTONDOWN\n"); - if( wParam & MK_RBUTTON ) + if( wParam & (MK_RBUTTON | MK_SHIFT) ) msg = WM_MBUTTONDOWN; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); @@ -893,7 +893,7 @@ case WM_LBUTTONUP: WINE_TRACE("WM_LBUTTONUP\n"); - if( wParam & MK_RBUTTON ) + if( wParam & (MK_RBUTTON | MK_SHIFT) ) msg = WM_MBUTTONUP; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture();

1 0

[mjmartin] 51657: [USBHUB_NEW] - Forgotten change in 51641. Fixes build of usbhub.
by mjmartin＠svn.reactos.org 09 May '11

09 May '11

Author: mjmartin Date: Mon May 9 10:48:00 2011 New Revision: 51657 URL: http://svn.reactos.org/svn/reactos?rev=51657&view=rev Log: [USBHUB_NEW] - Forgotten change in 51641. Fixes build of usbhub. Modified: branches/usb-bringup/drivers/usb/usbhub_new/misc.c Modified: branches/usb-bringup/drivers/usb/usbhub_new/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbhub_… ============================================================================== --- branches/usb-bringup/drivers/usb/usbhub_new/misc.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbhub_new/misc.c [iso-8859-1] Mon May 9 10:48:00 2011 @@ -44,6 +44,54 @@ DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); +} + +VOID +DumpFullConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + LONG i, j; + + DPRINT1("Dumping ConfigurationDescriptor %x\n", ConfigurationDescriptor); + DPRINT1("bLength %x\n", ConfigurationDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", ConfigurationDescriptor->bDescriptorType); + DPRINT1("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength); + DPRINT1("bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); + DPRINT1("bConfigurationValue %x\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); + DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); + + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR) ((ULONG_PTR)ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + for (i=0; i < ConfigurationDescriptor->bNumInterfaces; i++) + { + 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); + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)EndpointDescriptor + sizeof(USB_ENDPOINT_DESCRIPTOR)); + } + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ULONG_PTR)EndpointDescriptor; + } } NTSTATUS

1 0

[ilardig] 51656: [explorer] - Run the dialog window in a new thread patch by Mikhail Denisenko <denisenkom AT gmail DOT com> See issue #3339 for more details.
by ilardig＠svn.reactos.org 09 May '11

09 May '11

Author: ilardig Date: Mon May 9 10:32:49 2011 New Revision: 51656 URL: http://svn.reactos.org/svn/reactos?rev=51656&view=rev Log: [explorer] - Run the dialog window in a new thread patch by Mikhail Denisenko <denisenkom AT gmail DOT com> See issue #3339 for more details. Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Mon May 9 10:32:49 2011 @@ -2111,14 +2111,37 @@ MessageBox(0, TEXT("SHFindComputer() not yet implemented in SHELL32"), ResString(IDS_TITLE), MB_OK); } -void StartMenuHandler::ShowLaunchDialog(HWND hwndOwner) +struct RunDialogThread : public Thread +{ + int Run(); +}; + +int RunDialogThread::Run() { static DynamicFct<RUNFILEDLG> RunFileDlg(TEXT("SHELL32"), 61); + + // RunFileDlg needs owner window to properly position dialog + // that window will be disabled so we can't use DesktopBar + RECT rect = {0}; +#ifndef TASKBAR_AT_TOP + rect.top = GetSystemMetrics(SM_CYSCREEN) - DESKTOPBARBAR_HEIGHT; +#endif + rect.right = GetSystemMetrics(SM_CXSCREEN); + rect.bottom = rect.top + DESKTOPBARBAR_HEIGHT; + Static dlgOwner(0, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, 0, 0); // Show "Run..." dialog if (RunFileDlg) { - (*RunFileDlg)(hwndOwner, 0, NULL, NULL, NULL, RFF_CALCDIRECTORY); - } + (*RunFileDlg)(dlgOwner, 0, NULL, NULL, NULL, RFF_CALCDIRECTORY); + } + DestroyWindow(dlgOwner); + return 0; +} + +void StartMenuHandler::ShowLaunchDialog(HWND hwndOwner) +{ + RunDialogThread * rdt = new RunDialogThread(); + rdt->Start(); } void StartMenuHandler::ShowLogoffDialog(HWND hwndOwner)

1 0

[tkreuzer] 51655: [PSDK] Improve MAKEINTRESOURCE macros to silence warnings on overzealous gcc versions. See issue #5343 for more details.
by tkreuzer＠svn.reactos.org 09 May '11

09 May '11

Author: tkreuzer Date: Mon May 9 08:15:26 2011 New Revision: 51655 URL: http://svn.reactos.org/svn/reactos?rev=51655&view=rev Log: [PSDK] Improve MAKEINTRESOURCE macros to silence warnings on overzealous gcc versions. See issue #5343 for more details. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon May 9 08:15:26 2011 @@ -577,8 +577,8 @@ #define SB_BOTTOM 7 #define SB_TOP 6 #define IS_INTRESOURCE(i) (((ULONG_PTR)(i) >> 16) == 0) -#define MAKEINTRESOURCEA(i) (LPSTR)((ULONG_PTR)((WORD)(i))) -#define MAKEINTRESOURCEW(i) (LPWSTR)((ULONG_PTR)((WORD)(i))) +#define MAKEINTRESOURCEA(i) ((LPSTR)(ULONG_PTR)LOWORD(i)) +#define MAKEINTRESOURCEW(i) ((LPWSTR)(ULONG_PTR)LOWORD(i)) #ifndef XFree86Server # define RT_CURSOR MAKEINTRESOURCE(1) # define RT_FONT MAKEINTRESOURCE(8)

1 0

[janderwald] 51654: [USBSTOR] - Start implementing SCSI read
by janderwald＠svn.reactos.org 08 May '11

08 May '11

Author: janderwald Date: Sun May 8 22:18:55 2011 New Revision: 51654 URL: http://svn.reactos.org/svn/reactos?rev=51654&view=rev Log: [USBSTOR] - Start implementing SCSI read Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sun May 8 22:18:55 2011 @@ -103,6 +103,35 @@ Request->SrbStatus = SRB_STATUS_ERROR; } } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ) + { + DPRINT1("SCSIOP_READ DataTransferLength %lu\n", Request->DataTransferLength); + ASSERT(Request->DataBuffer); + + // + // send read command + // + Status = USBSTOR_SendReadCmd(DeviceObject, Request, &TransferredLength); + DPRINT1("USBSTOR_SendReadCmd Status %x BytesReturned %lu\n", Status, TransferredLength); + + if (NT_SUCCESS(Status)) + { + // + // store returned info length + // + Irp->IoStatus.Information = TransferredLength; + Request->SrbStatus = SRB_STATUS_SUCCESS; + } + else + { + // + // failed to retrieve sense data + // + Irp->IoStatus.Information = 0; + Request->SrbStatus = SRB_STATUS_ERROR; + } + } + else { UNIMPLEMENTED; Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 8 22:18:55 2011 @@ -488,6 +488,12 @@ CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; CapacityData->BytesPerBlock = Response->BlockLength; } + + // + // store result in device extension + // + PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress); + PDODeviceExtension->BlockLength = NTOHL(Response->BlockLength); // // send csw @@ -672,3 +678,138 @@ return Status; } +NTSTATUS +USBSTOR_SendReadCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request, + OUT PULONG TransferBufferLength) +{ + UFI_READ_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PVOID Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + PCDB pCDB; + ULONG BlockCount; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // allocate read buffer response from non paged pool + // + Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, Request->DataTransferLength); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // FIXME: support more logical blocks + // + ASSERT(Request->DataTransferLength == PDODeviceExtension->BlockLength); + + // + // block count + // + BlockCount = Request->DataTransferLength / PDODeviceExtension->BlockLength; + + // + // initialize read sense cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_READ_CMD)); + Cmd.Code = SCSIOP_READ; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + Cmd.ContiguousLogicBlocks = _byteswap_ushort(BlockCount); + + RtlCopyMemory(&Cmd.LogicalBlockAddress, pCDB->READ12.LogicalBlock, sizeof(UCHAR) * 4); + + DPRINT1("BlockAddress %lu BlockCount %lu BlockLength %lu\n", NTOHL(Cmd.LogicalBlockAddress), BlockCount, PDODeviceExtension->BlockLength); + + // + // now send read cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_READ_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendReadCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // now read the logical block + // + Status = USBSTOR_SendData(DeviceObject, Request->DataTransferLength, Response); + if (!NT_SUCCESS(Status)) + { + // + // failed to read logical block + // + DPRINT1("USBSTOR_SendReadCmd> USBSTOR_SendData failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + + DbgBreakPoint(); + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + ASSERT(CSW.DataResidue == 0); + + // + // calculate transfer length + // + *TransferBufferLength = Request->DataTransferLength - CSW.DataResidue; + + // + // copy buffer + // + RtlCopyMemory(Request->DataBuffer, Response, *TransferBufferLength); + + // + // free item + // + FreeItem(OutControl); + + // + // free response + // + FreeItem(Response); + + // + // done + // + return Status; +}

1 0

[ekohl] 51653: [NTOSKRNL] Implement CmpSetVersionData: Set the CurrentType value in the HKLM\Software\Microsoft\Windows NT\CurrentVersion key.
by ekohl＠svn.reactos.org 08 May '11

08 May '11

Author: ekohl Date: Sun May 8 21:37:00 2011 New Revision: 51653 URL: http://svn.reactos.org/svn/reactos?rev=51653&view=rev Log: [NTOSKRNL] Implement CmpSetVersionData: Set the CurrentType value in the HKLM\Software\Microsoft\Windows NT\CurrentVersion key. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun May 8 21:37:00 2011 @@ -1938,4 +1938,71 @@ CmpDoFlushAll(TRUE); } +VOID +NTAPI +CmpSetVersionData(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + UNICODE_STRING ValueData; + HANDLE KeyHandle; + WCHAR Buffer[128]; + NTSTATUS Status; + + /* Open the 'CurrentVersion' key */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + 0, + NULL); + + Status = NtCreateKey(&KeyHandle, + KEY_CREATE_SUB_KEY, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create key &wZ (Status: %08lx)\n", &KeyName, Status); + return; + } + + /* Set the 'CurrentType' value */ + RtlInitUnicodeString(&ValueName, + L"CurrentType"); + +#ifdef CONFIG_SMP + wcscpy(Buffer, L"Multiprocessor"); +#else + wcscpy(Buffer, L"Uniprocessor"); +#endif + + wcscat(Buffer, L" "); + +#if (DBG == 1) + wcscat(Buffer, L"Checked"); +#else + wcscat(Buffer, L"Free"); +#endif + + RtlInitUnicodeString(&ValueData, + Buffer); + + NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueData.Buffer, + ValueData.Length + sizeof(WCHAR)); + + /* Close the key */ + NtClose(KeyHandle); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun May 8 21:37:00 2011 @@ -937,8 +937,8 @@ /* Initialize the hives and lazy flusher */ CmpCmdInit(SetupBoot); - /* FIXME: Save version data */ - //CmpSetVersionData(); + /* Save version data */ + CmpSetVersionData(); /* Release the registry lock */ //CmpUnlockRegistry(); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun May 8 21:37:00 2011 @@ -1527,6 +1527,12 @@ NTAPI CmSetLazyFlushState( IN BOOLEAN Enable +); + +VOID +NTAPI +CmpSetVersionData( + VOID ); //

1 0

[janderwald] 51649: [USBEHCI_NEW] - Fix retrieving drive capacity - Fix ufi command structures
by janderwald＠svn.reactos.org 08 May '11

08 May '11

Author: janderwald Date: Sun May 8 19:33:41 2011 New Revision: 51649 URL: http://svn.reactos.org/svn/reactos?rev=51649&view=rev Log: [USBEHCI_NEW] - Fix retrieving drive capacity - Fix ufi command structures Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sun May 8 19:33:41 2011 @@ -97,7 +97,7 @@ else { // - // failed to retrieve capacity + // failed to retrieve sense data // Irp->IoStatus.Information = 0; Request->SrbStatus = SRB_STATUS_ERROR; Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 8 19:33:41 2011 @@ -410,7 +410,7 @@ OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, OUT PREAD_CAPACITY_DATA CapacityData) { - UFI_INQUIRY_CMD Cmd; + UFI_CAPACITY_CMD Cmd; CSW CSW; NTSTATUS Status; PUFI_CAPACITY_RESPONSE Response; @@ -438,9 +438,8 @@ // initialize capacity cmd // RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); - Cmd.Code = SCSIOP_INQUIRY; + Cmd.Code = SCSIOP_READ_CAPACITY; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); - Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); // // now send capacity cmd @@ -472,9 +471,9 @@ return Status; } - DPRINT1("LastLogicalBlockAddress %lu\n", Response->LastLogicalBlockAddress); - DPRINT1("BlockLength %lu\n", Response->BlockLength); - DPRINT1("Medium Length %lu\n", Response->BlockLength * Response->LastLogicalBlockAddress); + DPRINT1("LastLogicalBlockAddress %lu\n", NTOHL(Response->LastLogicalBlockAddress)); + DPRINT1("BlockLength %lu\n", NTOHL(Response->BlockLength)); + DPRINT1("Medium Length %lu\n", NTOHL(Response->BlockLength) * NTOHL(Response->LastLogicalBlockAddress)); // // store response @@ -536,6 +535,7 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PCBW OutControl; PCDB pCDB; + PUFI_MODE_PARAMETER_HEADER Header; // // get SCSI command data block @@ -558,6 +558,18 @@ // return STATUS_INSUFFICIENT_RESOURCES; } + + // + // sanity check + // + + + // Supported pages + // MODE_PAGE_ERROR_RECOVERY + // MODE_PAGE_FLEXIBILE + // MODE_PAGE_LUN_MAPPING + // MODE_PAGE_FAULT_REPORTING + // MODE_SENSE_RETURN_ALL // // initialize mode sense cmd @@ -567,12 +579,15 @@ Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); Cmd.PageCode = pCDB->MODE_SENSE.PageCode; Cmd.PC = pCDB->MODE_SENSE.Pc; - Cmd.AllocationLength = pCDB->MODE_SENSE.AllocationLength; + Cmd.AllocationLength = HTONS(pCDB->MODE_SENSE.AllocationLength); + + DPRINT1("PageCode %x\n", pCDB->MODE_SENSE.PageCode); + DPRINT1("PC %x\n", pCDB->MODE_SENSE.Pc); // // now send mode sense cmd // - Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); + Status = USBSTOR_SendCBW(DeviceObject, UFI_SENSE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); if (!NT_SUCCESS(Status)) { // @@ -598,6 +613,20 @@ ASSERT(FALSE); return Status; } + + Header = (PUFI_MODE_PARAMETER_HEADER)Response; + + // + // TODO: build layout + // + // first struct is the header + // MODE_PARAMETER_HEADER / _MODE_PARAMETER_HEADER10 + // + // followed by + // MODE_PARAMETER_BLOCK + // + // + DbgBreakPoint(); // // send csw Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun May 8 19:33:41 2011 @@ -63,7 +63,7 @@ // #define USB_BULK_GET_MAX_LUN 0xFE - +#include <pshpack1.h> typedef struct { ULONG Signature; // CBW signature @@ -75,6 +75,9 @@ UCHAR CommandBlock[16]; }CBW, *PCBW; +C_ASSERT(sizeof(CBW) == 31); + + #define CBW_SIGNATURE 0x43425355 #define MAX_LUN 0xF @@ -114,7 +117,7 @@ UCHAR Version; // contains version 0x00 UCHAR Format; // response format UCHAR Length; // additional length - USHORT Reserved; // reserved + UCHAR Reserved[3]; // reserved UCHAR Vendor[8]; // vendor identification string UCHAR Product[16]; // product identification string UCHAR Revision[4]; // product revision code @@ -148,6 +151,24 @@ ULONG LastLogicalBlockAddress; // last logical block address ULONG BlockLength; // block length in bytes }UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; + +C_ASSERT(sizeof(UFI_CAPACITY_RESPONSE) == 8); + +#define HTONS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) +#define NTOHS(n) (((((unsigned short)(n) & 0xFF)) << 8) | (((unsigned short)(n) & 0xFF00) >> 8)) + +#define HTONL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ + ((((unsigned long)(n) & 0xFF00)) << 8) | \ + ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ + ((((unsigned long)(n) & 0xFF000000)) >> 24)) + + +#define NTOHL(n) (((((unsigned long)(n) & 0xFF)) << 24) | \ + ((((unsigned long)(n) & 0xFF00)) << 8) | \ + ((((unsigned long)(n) & 0xFF0000)) >> 8) | \ + ((((unsigned long)(n) & 0xFF000000)) >> 24)) + + //-------------------------------------------------------------------------------------------------------------------------------------------- // @@ -164,7 +185,34 @@ UCHAR Reserved1[3]; }UFI_SENSE_CMD, *PUFI_SENSE_CMD; -C_ASSERT(sizeof(UFI_CAPACITY_CMD) == 12); +C_ASSERT(sizeof(UFI_SENSE_CMD) == 12); + +#define UFI_SENSE_CMD_LEN (6) + +typedef struct +{ + USHORT ModeDataLength; // length of parameters for sense cmd + UCHAR MediumTypeCode; // 00 for mass storage, 0x94 for floppy + UCHAR WP:1; // write protect bit + UCHAR Reserved1:2; // reserved 00 + UCHAR DPOFUA:1; // should be zero + UCHAR Reserved2:4; // reserved + UCHAR Reserved[4]; // reserved +}UFI_MODE_PARAMETER_HEADER, *PUFI_MODE_PARAMETER_HEADER; + + +C_ASSERT(sizeof(UFI_MODE_PARAMETER_HEADER) == 8); + +typedef struct +{ + UCHAR PC; + UCHAR PageLength; + UCHAR Reserved1; + UCHAR ITM; + UCHAR Flags; + UCHAR Reserved[3]; +}UFI_TIMER_PROTECT_PAGE, *PUFI_TIMER_PROTECT_PAGE; +C_ASSERT(sizeof(UFI_TIMER_PROTECT_PAGE) == 8); //--------------------------------------------------------------------- //

1 0

[tkreuzer] 51648: [GDI FONT DRIVER] - Add an info file describing how to install and test the driver
by tkreuzer＠svn.reactos.org 08 May '11

08 May '11

Author: tkreuzer Date: Sun May 8 17:24:34 2011 New Revision: 51648 URL: http://svn.reactos.org/svn/reactos?rev=51648&view=rev Log: [GDI FONT DRIVER] - Add an info file describing how to install and test the driver Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt (with props) Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Sun May 8 17:24:34 2011 @@ -165,7 +165,7 @@ return NULL; } - /* Check if there is rotation / shearing (cannot use iComplexity!?) */ + /* Check if there is rotation / skewing (cannot use iComplexity!?) */ if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21)) { __debugbreak(); Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt (added) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt [iso-8859-1] Sun May 8 17:24:34 2011 @@ -1,0 +1,23 @@ + + +Installation +======== +To install the driver, copy it to your Windows\system32 folder. Then go the following registry key: +HKLM\SOFTWARE\Microsodt\Windows NT\CurrentVersion\Font Drivers +There should be at least one value: "Adobe Type Manager" : REG_SZ : "atmfd.dll" +Create a new value of type REG_SZ. The name is "Freetype Font driver", the value is "ftfd.dll" +Reboot. + +Testing +===== +Since Windows uses an internal driver for TrueType fonts, build into win32k and loaded before any +other font driver, custom drivers will never see any ttf files. To test it, you can use OpenType fonts +in Adobe Type1 format. Those would usually be handled by the "Adobe Type Manager font driver" atmfd.dll. +But the newly installed driver will see the font file first. + +Warning +====== +The driver is not production quality, so expect crashes. Don't use it on your production machine, but in +a virtual machine. Attaching WinDbg to Windows is recommended to see the debug output. Or use DbgView +from SysInternals. + Propchange: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/info.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Sun May 8 17:24:34 2011 @@ -152,7 +152,7 @@ switch (jClassId) { case 0: // Class ID = 0 No Classification - break; + return FF_SWISS; case 1: // Class ID = 1 Oldstyle Serifs switch (jSubclassId) @@ -299,8 +299,9 @@ break; } -__debugbreak(); - return 0; + WARN("Unhandled class: jClassId=%d, jSubclassId=%d\n", jClassId, jSubclassId); +//__debugbreak(); + return FF_SWISS; } BOOL

1 0

[tkreuzer] 51647: [GDI FONT DRIVER] - Add portable helper macro FLOATOBJ_bIsNull - Implement arbitrary character coordinate transformation (untested)
by tkreuzer＠svn.reactos.org 08 May '11

08 May '11

Author: tkreuzer Date: Sun May 8 16:24:07 2011 New Revision: 51647 URL: http://svn.reactos.org/svn/reactos?rev=51647&view=rev Log: [GDI FONT DRIVER] - Add portable helper macro FLOATOBJ_bIsNull - Implement arbitrary character coordinate transformation (untested) Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Sun May 8 16:24:07 2011 @@ -40,6 +40,12 @@ #define FATAL(...) #endif +/* Helper for FLOATOBJ */ +#ifdef _M_IX86 +#define FLOATOBJ_bIsNull(pf) (((pf)->ul1 == 0) && ((pf)->ul2 == 0)) +#else +#define FLOATOBJ_bIsNull(pf) (*(pf) == 0) +#endif /** Driver specific types *****************************************************/ Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Sun May 8 16:24:07 2011 @@ -26,24 +26,22 @@ FT_Vector ftvector; LONG lLength; -//__debugbreak(); -#if 0 /* Optimization for scaling transformations */ - if (pptef->y.ul1 == 0 && ppfted->y.ul2 == 0) + if (FLOATOBJ_bIsNull(&pptef->y)) { efLength = pptef->x; FLOATOBJ_SetLong(&pptef->x, 1); return efLength; } - if (pptef->x.ul1 == 0 && ppfted->x.ul2 == 0) + if (FLOATOBJ_bIsNull(&pptef->x)) { efLength = pptef->y; FLOATOBJ_SetLong(&pptef->y, 1); return efLength; } -#endif - /* Convert the point into 8.24 fixpoint format */ + + /* Convert the point into a 8.24 fixpoint vector */ efTmp = pptef->x; FLOATOBJ_MulLong(&efTmp, 0x01000000); ftvector.x = FLOATOBJ_GetLong(&efTmp); @@ -62,6 +60,7 @@ FLOATOBJ_Div(&pptef->x, &efLength); FLOATOBJ_Div(&pptef->y, &efLength); + /* Return the former length of the vector */ return efLength; } @@ -80,7 +79,7 @@ FT_Matrix ftmatrix; ULONG iComplexity; FTFD_DEVICEMETRICS *pmetrics; - FLOATOBJ efScaleX, efScaleY; + FLOATOBJ efTemp, efScaleX, efScaleY; /* Allocate a font structure */ pfont = EngAllocMem(0, sizeof(FTFD_FONT), 0); @@ -125,6 +124,12 @@ iComplexity = XFORMOBJ_iGetFloatObjXform(pxo, &fxform); ASSERT(iComplexity != DDI_ERROR); + // FIXME: quantize to 16.16 fixpoint + pfont->fdxQuantized.eXX = FLOATOBJ_GetFloat(&fxform.eM11); + pfont->fdxQuantized.eXY = FLOATOBJ_GetFloat(&fxform.eM12); + pfont->fdxQuantized.eYX = FLOATOBJ_GetFloat(&fxform.eM21); + pfont->fdxQuantized.eYY = FLOATOBJ_GetFloat(&fxform.eM22); + /* Get the base vectors (unnormalized) */ pfont->ptefBase.x = fxform.eM11; pfont->ptefBase.y = fxform.eM21; @@ -134,12 +139,6 @@ /* Normalize the base vectors and get their length */ efScaleX = FtfdNormalizeBaseVector(&pfont->ptefBase); efScaleY = FtfdNormalizeBaseVector(&pfont->ptefSide); - - // FIXME: quantize to 16.16 fixpoint - pfont->fdxQuantized.eXX = FLOATOBJ_GetFloat(&fxform.eM11); - pfont->fdxQuantized.eXY = FLOATOBJ_GetFloat(&fxform.eM12); - pfont->fdxQuantized.eYX = FLOATOBJ_GetFloat(&fxform.eM21); - pfont->fdxQuantized.eYY = FLOATOBJ_GetFloat(&fxform.eM22); /* The coordinate transformation given by Windows transforms from font * space to device space. Since we use FT_Set_Char_Size, which allows @@ -167,26 +166,32 @@ } /* Check if there is rotation / shearing (cannot use iComplexity!?) */ - if (fxform.eM12.ul1 != 0 || fxform.eM12.ul2 != 0 || - fxform.eM21.ul1 != 0 || fxform.eM21.ul2 != 0) + if (!FLOATOBJ_bIsNull(&fxform.eM12) || !FLOATOBJ_bIsNull(&fxform.eM21)) { __debugbreak(); - // FIXME: need to calculate scaling - - /* Initialize a matrix */ - ftmatrix.xx = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / - pfo->sizLogResPpi.cx; - ftmatrix.xy = 0x00000000; - ftmatrix.yx = 0x00000000; - ftmatrix.yy = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / - pfo->sizLogResPpi.cy; - - /* Apply the XFORMOBJ to the matrix */ - XFORMOBJ_bApplyXform(pxo, XF_LTOL, 2, &ftmatrix, &ftmatrix); - - /* Set non-orthogonal transformation */ - // FT_Set_Transform - + + /* Create a transformation matrix that is applied after the character + * scaling. We simply use the normalized base vectors and convert them + * to 16.16 fixpoint format */ + + efTemp = pfont->ptefBase.x; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pfont->ptefSide.x; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xy = FLOATOBJ_GetLong(&efTemp); + + efTemp = pfont->ptefBase.y; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pfont->ptefSide.y; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); + + /* Set the transformation matrix */ + FT_Set_Transform(ftface, &ftmatrix, 0); } /* Check if there is a design vector */ @@ -376,16 +381,18 @@ if (1 /* layout horizontal */) { + // FIXME: ftglyph->metrics doesn't handle non-orthogonal transformations + // http://www.freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT… pgd->fxA = ftglyph->metrics.horiBearingX; pgd->fxAB = pgd->fxA + ftglyph->metrics.width / 4; - pgd->fxD = ftglyph->metrics.horiAdvance / 4; } else { pgd->fxA = ftglyph->metrics.vertBearingX; pgd->fxAB = pgd->fxA + ftglyph->metrics.height; - pgd->fxD = ftglyph->metrics.vertAdvance; - } + } + + pgd->fxD = ftglyph->advance.x / 4; // should be projected on the x-axis pgd->fxInkBottom = 0; pgd->fxInkTop = pgd->fxInkBottom + (ftglyph->bitmap.rows << 4); @@ -398,9 +405,9 @@ if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; - pgd->ptqD.x.LowPart = 0x000000fd; + pgd->ptqD.x.LowPart = 0x000000fd; // ftglyph->advance.x pgd->ptqD.x.HighPart = 0; - pgd->ptqD.y.LowPart = 0x000000a0; // 0x000000a0 + pgd->ptqD.y.LowPart = 0x000000a0; // ftglyph->advance.y pgd->ptqD.y.HighPart = 0; //pgd->ptqD.x.QuadPart = 0; //pgd->ptqD.y.QuadPart = 0;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011