Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[mflyer] 20683: Proper IBrowser icon to replace the newyears version which was made in 9 minutes under influence of alcohol
by mflyer＠svn.reactos.org 07 Jan '06

07 Jan '06

Proper IBrowser icon to replace the newyears version which was made in 9 minutes under influence of alcohol Modified: trunk/reactos/subsys/system/ibrowser/res/ibrowser.ico _____ Modified: trunk/reactos/subsys/system/ibrowser/res/ibrowser.ico (Binary files differ)

1 0

[gvg] 20682: j_anderw <j_anderw@sbox.tugraz.at>:
by gvg＠svn.reactos.org 07 Jan '06

07 Jan '06

j_anderw <j_anderw(a)sbox.tugraz.at>: ReactOS system control panel displays wrong title Modified: trunk/reactos/lib/cpl/sysdm/resource.h _____ Modified: trunk/reactos/lib/cpl/sysdm/resource.h --- trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-07 23:22:56 UTC (rev 20681) +++ trunk/reactos/lib/cpl/sysdm/resource.h 2006-01-07 23:25:02 UTC (rev 20682) @@ -24,6 +24,11 @@ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 +#define IDS_DRIVE 3000 +#define IDS_SPACE 3001 +#define IDS_MIN 3002 +#define IDS_REC 3003 +#define IDS_CUR 3004 /* controls */ #define IDC_LICENSEMEMO 101 @@ -83,15 +88,6 @@ #define IDC_RECOMMENDED 252 #define IDC_CURRENT 253 -#define IDS_DRIVE 1000 -#define IDS_SPACE 1001 -#define IDS_MIN 1002 -#define IDS_REC 1003 -#define IDS_CUR 1004 - - - - #endif /* __CPL_RESOURCE_H */ /* EOF */

1 0

[ion] 20681: - Temporarily revert 20639 until a better fix is found. Thanks to Gé.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Temporarily revert 20639 until a better fix is found. Thanks to Gé. Modified: trunk/reactos/tools/rbuild/module.cpp _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2006-01-07 23:13:08 UTC (rev 20680) +++ trunk/reactos/tools/rbuild/module.cpp 2006-01-07 23:22:56 UTC (rev 20681) @@ -817,7 +817,7 @@ case Kernel: return "_NtProcessStartup"; case KernelModeDLL: - return "DriverEntry"; + return "_DriverEntry@8"; case NativeDLL: return "_DllMainCRTStartup@12"; case NativeCUI: @@ -836,7 +836,7 @@ else return "_WinMainCRTStartup"; case KernelModeDriver: - return "DriverEntry"; + return "_DriverEntry@8"; case BuildTool: case StaticLibrary: case ObjectLibrary:

1 0

[cwittich] 20680: updated resource file (patch by Brezenbak)
by cwittich＠svn.reactos.org 07 Jan '06

07 Jan '06

updated resource file (patch by Brezenbak) Modified: trunk/reactos/subsys/system/msconfig/En.rc Modified: trunk/reactos/subsys/system/msconfig/resource.h _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2006-01-07 22:49:41 UTC (rev 20679) +++ trunk/reactos/subsys/system/msconfig/En.rc 2006-01-07 23:13:08 UTC (rev 20680) @@ -41,6 +41,65 @@ PUSHBUTTON "&Deactivate all",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 END +IDD_GENERAL_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + GROUPBOX "Startup Selection", -1, 10, 10, 340, 150 + CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "&Diagnostic Startup - load basic devices and services only", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "S&elective Startup", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + CHECKBOX "P&rocess SYSTEM.INI File", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + CHECKBOX "&Load System Services", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + CHECKBOX "&L&oad Startup Items", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Set as Default", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "Move &Up", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "Move &Down", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Boot Options", -1, 10, 80, 250, 90 + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 50, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 50, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Timeout:", -1, 280, 90, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 10, ES_LEFT + LTEXT "sec.", -1, 340, 90, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE 0, 0, 175, 175 +STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "Tahoma" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12 +END + STRINGTABLE DISCARDABLE BEGIN IDS_MSCONFIG "System configuration program" _____ Modified: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2006-01-07 22:49:41 UTC (rev 20679) +++ trunk/reactos/subsys/system/msconfig/resource.h 2006-01-07 23:13:08 UTC (rev 20680) @@ -5,6 +5,7 @@ #define IDD_STARTUP_PAGE 105 #define IDD_FREELDR_PAGE 106 #define IDD_SYSTEM_PAGE 107 +#define IDD_FREELDR_ADVANCED_PAGE 108 #define IDC_TAB 1001 #define IDC_BTN_APPLY 1002 @@ -18,6 +19,43 @@ #define IDC_BTN_SERVICES_DEACTIVATE 1010 #define IDC_BTN_STARTUP_ACTIVATE 1011 #define IDC_BTN_STARTUP_DEACTIVATE 1012 +#define IDC_CBX_NORMAL_START 1013 +#define IDC_CBX_DIAGNOSTIC_START 1014 +#define IDC_CBX_SELECTIVE_STARTUP 1015 +#define IDC_CBX_SYSTEM_INI 1016 +#define IDC_CBX_SYSTEM_SERVICE 1017 +#define IDC_CBX_STARTUP_ITEM 1018 +#define IDC_LIST_BOX 1019 +#define IDC_BTN_CHECK_BOOT_PATH 1020 +#define IDC_BTN_SET_DEFAULT_BOOT 1021 +#define IDC_BTN_MOVE_UP_BOOT_OPTION 1022 +#define IDC_BTN_MOVE_DOWN_BOOT_OPTION 1023 +#define IDC_CBX_SAFE_BOOT 1024 +#define IDC_CBX_NO_GUI_BOOT 1025 +#define IDC_CBX_BOOT_LOG 1026 +#define IDC_CBX_BASE_VIDEO 1027 +#define IDC_CBX_SOS 1028 +#define IDC_BTN_ADVANCED_OPTIONS 1029 +#define IDC_TXT_BOOT_TIMEOUT 1030 +#define IDC_CBX_MAX_MEM 1031 +#define IDC_TXT_MAX_MEM 1032 +#define IDC_SCR_MAX_MEM 1033 +#define IDC_CBX_NUM_PROC 1034 +#define IDC_DRP_NUM_PROC 1035 +#define IDC_CBX_PCI_LOCK 1036 +#define IDC_CBX_PROFILE 1037 +#define IDC_CBX_IRQ 1038 +#define IDC_TXT_IRQ 1039 +#define IDC_CBX_DEBUG 1040 +#define IDC_CBX_DEBUG_PORT 1041 +#define IDC_DRP_DEBUG_PORT 1042 +#define IDC_CBX_BAUD_RATE 1043 +#define IDC_DRP_DRP_BAUD_RATE 1044 +#define IDC_CBX_CHANNEL 1045 +#define IDC_TXT_CHANNEL 1046 +#define IDC_SCR_CHANNEL 1047 +#define IDC_OK 1048 +#define IDC_CANCEL 1049 #define IDS_TAB_TOOLS 2001 #define IDS_TAB_SYSTEM 2002

1 0

[ion] 20679: - Get xboxvmp to compile.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get xboxvmp to compile. Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2006-01-07 22:36:56 UTC (rev 20678) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2006-01-07 22:49:41 UTC (rev 20679) @@ -135,9 +135,9 @@ PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket) { - BOOL Result; + BOOLEAN Result; - RequestPacket->StatusBlock->Status = STATUS_UNSUCCESSFUL; + RequestPacket->StatusBlock->Status = ERROR_INVALID_PARAMETER; switch (RequestPacket->IoControlCode) { @@ -230,13 +230,13 @@ default: VideoPortDebugPrint(Warn, "XboxVmpStartIO 0x%x not implemented\n"); - RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } if (Result) { - RequestPacket->StatusBlock->Status = STATUS_SUCCESS; + RequestPacket->StatusBlock->Status = NO_ERROR; } return TRUE; @@ -278,7 +278,7 @@ { VideoPortDebugPrint(Error, "XboxVmpGetPowerState is not supported\n"); - return ERROR_NOT_SUPPORTED; + return ERROR_INVALID_FUNCTION; } /* @@ -295,7 +295,7 @@ { VideoPortDebugPrint(Error, "XboxVmpSetPowerState not supported\n"); - return ERROR_NOT_SUPPORTED; + return ERROR_INVALID_FUNCTION; } /* @@ -304,7 +304,7 @@ * Sets the adapter to the specified operating mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpSetCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, @@ -327,7 +327,7 @@ * at system boot. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpResetDevice( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock) @@ -344,7 +344,7 @@ * space of the requestor. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpMapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, @@ -356,13 +356,14 @@ SYSTEM_BASIC_INFORMATION BasicInfo; ULONG Length; + /* FIXME: this should probably be done differently, without native API */ StatusBlock->Information = sizeof(VIDEO_MEMORY_INFORMATION); FrameBuffer.u.HighPart = 0; - if (NT_SUCCESS(ZwQuerySystemInformation(SystemBasicInformation, + if (ZwQuerySystemInformation(SystemBasicInformation, (PVOID) &BasicInfo, sizeof(SYSTEM_BASIC_INFORMATION), - &Length))) + &Length) == NO_ERROR) { FrameBuffer.u.LowPart = BasicInfo.HighestPhysicalPageNumber * PAGE_SIZE; } @@ -398,7 +399,7 @@ * frame buffer and video RAM. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpUnmapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, @@ -418,7 +419,7 @@ * buffer for an IOCTL_VIDEO_QUERY_AVAIL_MODES request. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryNumAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, @@ -430,7 +431,7 @@ return TRUE; } -static BOOL +static BOOLEAN ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus) { int nRetriesToLive=50; @@ -508,7 +509,7 @@ } -static BOOL +static BOOLEAN I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return) { return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); @@ -520,7 +521,7 @@ * Returns information about each video mode supported by the adapter. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoMode, @@ -535,7 +536,7 @@ * Returns information about current video mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoMode, _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2006-01-07 22:36:56 UTC (rev 20678) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2006-01-07 22:49:41 UTC (rev 20679) @@ -25,11 +25,35 @@ /* INCLUDES *******************************************************************/ +#ifdef _MSC_VER +#include "dderror.h" +#include "devioctl.h" +#define PAGE_SIZE 4096 +#else #include <ntddk.h> -#include <miniport.h> -#include <video.h> -#include <ndk/exfuncs.h> +#endif +#include "miniport.h" +#include "ntddvdeo.h" +#include "video.h" + +/* FIXME: NDK not compatible with miniport drivers */ +#define SystemBasicInformation 0 +typedef struct _SYSTEM_BASIC_INFORMATION +{ + ULONG Reserved; + ULONG TimerResolution; + ULONG PageSize; + ULONG NumberOfPhysicalPages; + ULONG LowestPhysicalPageNumber; + ULONG HighestPhysicalPageNumber; + ULONG AllocationGranularity; + ULONG MinimumUserModeAddress; + ULONG MaximumUserModeAddress; + KAFFINITY ActiveProcessorsAffinityMask; + CCHAR NumberOfProcessors; +} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; + typedef struct { PHYSICAL_ADDRESS PhysControlStart; @@ -72,49 +96,49 @@ ULONG HwId, PVIDEO_POWER_MANAGEMENT VideoPowerControl); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpSetCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpResetDevice( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpMapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, PVIDEO_MEMORY_INFORMATION MapInformation, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpUnmapVideoMemory( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryNumAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryAvailModes( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION ReturnedModes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpQueryCurrentMode( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoModeInfo, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL XboxVmpSetColorRegisters( PXBOXVMP_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable,

1 0

[ion] 20678: - Make VBEMP compile with msvc/ddk.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Make VBEMP compile with msvc/ddk. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2006-01-07 22:34:25 UTC (rev 20677) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2006-01-07 22:36:56 UTC (rev 20678) @@ -110,7 +110,7 @@ ULONG Pos; int Result; VBE_MODEINFO TempModeInfo; - WORD TempModeNumber; + USHORT TempModeNumber; while (!Finished) { @@ -301,7 +301,7 @@ VBEDeviceExtension->ModeInfo = VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(VBE_MODEINFO), TAG_VBE); VBEDeviceExtension->ModeNumbers = - VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(WORD), TAG_VBE); + VideoPortAllocatePool(HwDeviceExtension, VpPagedPool, ModeCount * sizeof(USHORT), TAG_VBE); /* * Get the actual mode infos. @@ -404,9 +404,9 @@ PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket) { - BOOL Result; + BOOLEAN Result; - RequestPacket->StatusBlock->Status = STATUS_UNSUCCESSFUL; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; switch (RequestPacket->IoControlCode) { @@ -507,12 +507,12 @@ break; default: - RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } if (Result) - RequestPacket->StatusBlock->Status = STATUS_SUCCESS; + RequestPacket->StatusBlock->Status = NO_ERROR; return TRUE; } @@ -615,7 +615,7 @@ &BiosRegisters); if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) - return ERROR_NOT_SUPPORTED; + return ERROR_DEV_NOT_EXIST; if (BiosRegisters.Eax != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; @@ -648,7 +648,7 @@ return NO_ERROR; } - return ERROR_NOT_SUPPORTED; + return ERROR_DEV_NOT_EXIST; } /* @@ -697,7 +697,7 @@ &BiosRegisters); if (BiosRegisters.Eax == VBE_NOT_SUPPORTED) - return ERROR_NOT_SUPPORTED; + return ERROR_DEV_NOT_EXIST; if (BiosRegisters.Eax != VBE_SUCCESS) return ERROR_INVALID_FUNCTION; @@ -710,7 +710,7 @@ * Sets the adapter to the specified operating mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBESetCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, @@ -750,7 +750,7 @@ * at system boot. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEResetDevice( PVBE_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock) @@ -774,7 +774,7 @@ * space of the requestor. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEMapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, @@ -831,7 +831,7 @@ * frame buffer and video RAM. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEUnmapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, @@ -850,7 +850,7 @@ * buffer for an IOCTL_VIDEO_QUERY_AVAIL_MODES request. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryNumAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, @@ -942,7 +942,7 @@ * Returns information about each video mode supported by the adapter. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION ReturnedModes, @@ -972,7 +972,7 @@ * Returns information about current video mode. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoModeInfo, @@ -997,7 +997,7 @@ * yet implemented. */ -BOOL FASTCALL +BOOLEAN FASTCALL VBESetColorRegisters( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable, _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2006-01-07 22:34:25 UTC (rev 20677) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h 2006-01-07 22:36:56 UTC (rev 20678) @@ -23,10 +23,17 @@ /* INCLUDES *******************************************************************/ +#ifdef _MSC_VER +#include "dderror.h" +#include "devioctl.h" +#else #include <ntddk.h> -#include <miniport.h> -#include <video.h> +#endif +#include "miniport.h" +#include "ntddvdeo.h" +#include "video.h" + #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_VBE TAG('V', 'B', 'E', ' ') @@ -91,15 +98,15 @@ typedef struct { CHAR Signature[4]; - WORD Version; - DWORD OemStringPtr; + USHORT Version; + ULONG OemStringPtr; LONG Capabilities; - DWORD VideoModePtr; - WORD TotalMemory; - WORD OemSoftwareRevision; - DWORD OemVendorNamePtr; - DWORD OemProductNamePtr; - DWORD OemProductRevPtr; + ULONG VideoModePtr; + USHORT TotalMemory; + USHORT OemSoftwareRevision; + ULONG OemVendorNamePtr; + ULONG OemProductNamePtr; + ULONG OemProductRevPtr; CHAR Reserved[222]; CHAR OemData[256]; } VBE_INFO, *PVBE_INFO; @@ -112,58 +119,58 @@ typedef struct { /* Mandatory information for all VBE revisions */ - WORD ModeAttributes; - BYTE WinAAttributes; - BYTE WinBAttributes; - WORD WinGranularity; - WORD WinSize; - WORD WinASegment; - WORD WinBSegment; - DWORD WinFuncPtr; - WORD BytesPerScanLine; + USHORT ModeAttributes; + UCHAR WinAAttributes; + UCHAR WinBAttributes; + USHORT WinGranularity; + USHORT WinSize; + USHORT WinASegment; + USHORT WinBSegment; + ULONG WinFuncPtr; + USHORT BytesPerScanLine; /* Mandatory information for VBE 1.2 and above */ - WORD XResolution; - WORD YResolution; - BYTE XCharSize; - BYTE YCharSize; - BYTE NumberOfPlanes; - BYTE BitsPerPixel; - BYTE NumberOfBanks; - BYTE MemoryModel; - BYTE BankSize; - BYTE NumberOfImagePages; - BYTE Reserved1; + USHORT XResolution; + USHORT YResolution; + UCHAR XCharSize; + UCHAR YCharSize; + UCHAR NumberOfPlanes; + UCHAR BitsPerPixel; + UCHAR NumberOfBanks; + UCHAR MemoryModel; + UCHAR BankSize; + UCHAR NumberOfImagePages; + UCHAR Reserved1; /* Direct Color fields (required for Direct/6 and YUV/7 memory models) */ - BYTE RedMaskSize; - BYTE RedFieldPosition; - BYTE GreenMaskSize; - BYTE GreenFieldPosition; - BYTE BlueMaskSize; - BYTE BlueFieldPosition; - BYTE ReservedMaskSize; - BYTE ReservedFieldPosition; - BYTE DirectColorModeInfo; + UCHAR RedMaskSize; + UCHAR RedFieldPosition; + UCHAR GreenMaskSize; + UCHAR GreenFieldPosition; + UCHAR BlueMaskSize; + UCHAR BlueFieldPosition; + UCHAR ReservedMaskSize; + UCHAR ReservedFieldPosition; + UCHAR DirectColorModeInfo; /* Mandatory information for VBE 2.0 and above */ - DWORD PhysBasePtr; - DWORD Reserved2; - WORD Reserved3; + ULONG PhysBasePtr; + ULONG Reserved2; + USHORT Reserved3; /* Mandatory information for VBE 3.0 and above */ - WORD LinBytesPerScanLine; - BYTE BnkNumberOfImagePages; - BYTE LinNumberOfImagePages; - BYTE LinRedMaskSize; - BYTE LinRedFieldPosition; - BYTE LinGreenMaskSize; - BYTE LinGreenFieldPosition; - BYTE LinBlueMaskSize; - BYTE LinBlueFieldPosition; - BYTE LinReservedMaskSize; - BYTE LinReservedFieldPosition; - DWORD MaxPixelClock; + USHORT LinBytesPerScanLine; + UCHAR BnkNumberOfImagePages; + UCHAR LinNumberOfImagePages; + UCHAR LinRedMaskSize; + UCHAR LinRedFieldPosition; + UCHAR LinGreenMaskSize; + UCHAR LinGreenFieldPosition; + UCHAR LinBlueMaskSize; + UCHAR LinBlueFieldPosition; + UCHAR LinReservedMaskSize; + UCHAR LinReservedFieldPosition; + ULONG MaxPixelClock; CHAR Reserved4[189]; } VBE_MODEINFO, *PVBE_MODEINFO; @@ -184,9 +191,9 @@ /* Saved information about video modes */ ULONG ModeCount; - WORD *ModeNumbers; + USHORT *ModeNumbers; PVBE_MODEINFO ModeInfo; - WORD CurrentMode; + USHORT CurrentMode; } VBE_DEVICE_EXTENSION, *PVBE_DEVICE_EXTENSION; VP_STATUS STDCALL @@ -223,49 +230,49 @@ ULONG HwId, PVIDEO_POWER_MANAGEMENT VideoPowerControl); -BOOL FASTCALL +BOOLEAN FASTCALL VBESetCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE RequestedMode, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEResetDevice( PVBE_DEVICE_EXTENSION DeviceExtension, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEMapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY RequestedAddress, PVIDEO_MEMORY_INFORMATION MapInformation, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEUnmapVideoMemory( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MEMORY VideoMemory, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryNumAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_NUM_MODES Modes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryAvailModes( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION ReturnedModes, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBEQueryCurrentMode( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_MODE_INFORMATION VideoModeInfo, PSTATUS_BLOCK StatusBlock); -BOOL FASTCALL +BOOLEAN FASTCALL VBESetColorRegisters( PVBE_DEVICE_EXTENSION DeviceExtension, PVIDEO_CLUT ColorLookUpTable,

1 0

[ion] 20677: - PCHify vgamp.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- PCHify vgamp. - fix some definition problems. - make it build with msvc. Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.xml Modified: trunk/reactos/drivers/video/miniport/vga/vgavideo.h _____ Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c --- trunk/reactos/drivers/video/miniport/vga/initvga.c 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/initvga.c 2006-01-07 22:34:25 UTC (rev 20677) @@ -1,11 +1,5 @@ -#include <ntddk.h> -#include <miniport.h> -#include <video.h> -#include "vgavideo.h" +#include "vgamp.h" -#define NDEBUG -#include <debug.h> - static VGA_REGISTERS Mode12Regs = { /* CRT Controller Registers */ @@ -24,10 +18,10 @@ VGA_REGISTERS TextModeRegs; -STATIC VOID FASTCALL +static VOID FASTCALL vgaSaveRegisters(PVGA_REGISTERS Registers) { - UINT i; + SIZE_T i; for (i = 0; i < sizeof(Registers->CRT); i++) { @@ -57,10 +51,10 @@ Registers->Misc = VideoPortReadPortUchar(MISC); } -STATIC VOID FASTCALL +static VOID FASTCALL vgaSetRegisters(PVGA_REGISTERS Registers) { - UINT i; + SIZE_T i; /* Update misc output register */ VideoPortWritePortUchar(MISC, Registers->Misc); _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c --- trunk/reactos/drivers/video/miniport/vga/vgamp.c 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.c 2006-01-07 22:34:25 UTC (rev 20677) @@ -72,7 +72,7 @@ // RETURNS: // VP_STATUS -static VP_STATUS STDCALL +VP_STATUS STDCALL VGAFindAdapter(PVOID DeviceExtension, PVOID Context, PWSTR ArgumentString, @@ -82,7 +82,7 @@ /* FIXME: Determine if the adapter is present */ *Again = FALSE; - return STATUS_SUCCESS; + return NO_ERROR; /* FIXME: Claim any necessary memory/IO resources for the adapter */ /* FIXME: Map resources into system memory for the adapter */ @@ -104,7 +104,7 @@ // PVOID DeviceExtension // RETURNS: // BOOLEAN Success or failure -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAInitialize(PVOID DeviceExtension) { return TRUE; @@ -161,13 +161,13 @@ // BOOLEAN This function must return TRUE, and complete the work or // set an error status in the VRP. -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAStartIO(PVOID DeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket) { - BOOL Result; + BOOLEAN Result; - RequestPacket->StatusBlock->Status = STATUS_UNSUCCESSFUL; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; switch (RequestPacket->IoControlCode) { @@ -216,7 +216,8 @@ break; case IOCTL_VIDEO_RESET_DEVICE: - Result = VGAResetDevice(RequestPacket->StatusBlock); + VGAResetDevice(RequestPacket->StatusBlock); + Result = TRUE; break; case IOCTL_VIDEO_SET_COLOR_REGISTERS: @@ -275,7 +276,7 @@ RequestPacket->StatusBlock); break; case IOCTL_VIDEO_SET_PALETTE_REGISTERS: - Result = VGASetPaletteRegisters((PWORD) RequestPacket->InputBuffer, + Result = VGASetPaletteRegisters((PUSHORT) RequestPacket->InputBuffer, RequestPacket->StatusBlock); break; @@ -318,12 +319,12 @@ #endif default: - RequestPacket->StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + RequestPacket->StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } if (Result) - RequestPacket->StatusBlock->Status = STATUS_SUCCESS; + RequestPacket->StatusBlock->Status = NO_ERROR; return TRUE; } @@ -367,7 +368,7 @@ // BOOLEAN TRUE if no further action is necessary, FALSE if the system // needs to still do a BIOS int 10 reset. -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAResetHw(PVOID DeviceExtension, ULONG Columns, ULONG Rows) @@ -397,7 +398,7 @@ #endif -BOOL VGAMapVideoMemory(IN PVOID DeviceExtension, +BOOLEAN VGAMapVideoMemory(IN PVOID DeviceExtension, IN PVIDEO_MEMORY RequestedAddress, OUT PVIDEO_MEMORY_INFORMATION MapInformation, OUT PSTATUS_BLOCK StatusBlock) @@ -428,14 +429,14 @@ return TRUE; } -BOOL VGAQueryAvailModes(OUT PVIDEO_MODE_INFORMATION ReturnedModes, +BOOLEAN VGAQueryAvailModes(OUT PVIDEO_MODE_INFORMATION ReturnedModes, OUT PSTATUS_BLOCK StatusBlock) { /* Only one mode exists in VGA (640x480), so use VGAQueryCurrentMode */ return VGAQueryCurrentMode(ReturnedModes, StatusBlock); } -BOOL VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode, +BOOLEAN VGAQueryCurrentMode(OUT PVIDEO_MODE_INFORMATION CurrentMode, OUT PSTATUS_BLOCK StatusBlock) { CurrentMode->Length = sizeof(VIDEO_MODE_INFORMATION); @@ -464,7 +465,7 @@ return TRUE; } -BOOL VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes, +BOOLEAN VGAQueryNumAvailModes(OUT PVIDEO_NUM_MODES NumberOfModes, OUT PSTATUS_BLOCK StatusBlock) { NumberOfModes->NumModes = 1; @@ -473,7 +474,7 @@ return TRUE; } -BOOL VGASetPaletteRegisters(IN PWORD PaletteRegisters, +BOOLEAN VGASetPaletteRegisters(IN PUSHORT PaletteRegisters, OUT PSTATUS_BLOCK StatusBlock) { ; @@ -502,7 +503,7 @@ return TRUE; } -BOOL VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable, +BOOLEAN VGASetColorRegisters(IN PVIDEO_CLUT ColorLookUpTable, OUT PSTATUS_BLOCK StatusBlock) { int i; @@ -518,7 +519,7 @@ return TRUE; } -BOOL VGASetCurrentMode(IN PVIDEO_MODE RequestedMode, +BOOLEAN VGASetCurrentMode(IN PVIDEO_MODE RequestedMode, OUT PSTATUS_BLOCK StatusBlock) { if(RequestedMode->RequestedMode == 12) @@ -531,17 +532,17 @@ } } -BOOL VGAShareVideoMemory(IN PVIDEO_SHARE_MEMORY RequestedMemory, +BOOLEAN VGAShareVideoMemory(IN PVIDEO_SHARE_MEMORY RequestedMemory, OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory, OUT PSTATUS_BLOCK StatusBlock) { UNIMPLEMENTED; - StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } -BOOL VGAUnmapVideoMemory(IN PVOID DeviceExtension, +BOOLEAN VGAUnmapVideoMemory(IN PVOID DeviceExtension, IN PVIDEO_MEMORY MemoryToUnmap, OUT PSTATUS_BLOCK StatusBlock) { @@ -553,11 +554,11 @@ return FALSE; } -BOOL VGAUnshareVideoMemory(IN PVIDEO_MEMORY MemoryToUnshare, +BOOLEAN VGAUnshareVideoMemory(IN PVIDEO_MEMORY MemoryToUnshare, OUT PSTATUS_BLOCK StatusBlock) { UNIMPLEMENTED; - StatusBlock->Status = STATUS_NOT_IMPLEMENTED; + StatusBlock->Status = ERROR_INVALID_FUNCTION; return FALSE; } _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.h --- trunk/reactos/drivers/video/miniport/vga/vgamp.h 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.h 2006-01-07 22:34:25 UTC (rev 20677) @@ -23,17 +23,25 @@ /* INCLUDES *******************************************************************/ +#ifdef _MSC_VER +#include "dderror.h" +#include "devioctl.h" +#else #include <ntddk.h> -#include <miniport.h> -#include <video.h> +#endif +#include "miniport.h" +#include "ntddvdeo.h" +#include "video.h" +#include "vgavideo.h" + #define UNIMPLEMENTED \ VideoPortDebugPrint(Error, "WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); void InitVGAMode(); -static VP_STATUS STDCALL +VP_STATUS STDCALL VGAFindAdapter( PVOID DeviceExtension, PVOID Context, @@ -41,11 +49,11 @@ PVIDEO_PORT_CONFIG_INFO ConfigInfo, PUCHAR Again); -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAInitialize( PVOID DeviceExtension); -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAStartIO( PVOID DeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket); @@ -53,7 +61,7 @@ /*static BOOLEAN STDCALL VGAInterrupt(PVOID DeviceExtension);*/ -static BOOLEAN STDCALL +BOOLEAN STDCALL VGAResetHw( PVOID DeviceExtension, ULONG Columns, @@ -63,59 +71,59 @@ VGATimer(PVOID DeviceExtension);*/ /* Mandatory IoControl routines */ -BOOL +BOOLEAN VGAMapVideoMemory( IN PVOID DeviceExtension, IN PVIDEO_MEMORY RequestedAddress, OUT PVIDEO_MEMORY_INFORMATION MapInformation, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAQueryAvailModes( OUT PVIDEO_MODE_INFORMATION ReturnedModes, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAQueryCurrentMode( OUT PVIDEO_MODE_INFORMATION CurrentMode, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAQueryNumAvailModes( OUT PVIDEO_NUM_MODES NumberOfModes, OUT PSTATUS_BLOCK StatusBlock); -BOOL +VOID VGAResetDevice(OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGASetColorRegisters( IN PVIDEO_CLUT ColorLookUpTable, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGASetPaletteRegisters( - IN PWORD PaletteRegisters, + IN PUSHORT PaletteRegisters, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGASetCurrentMode( IN PVIDEO_MODE RequestedMode, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAShareVideoMemory( IN PVIDEO_SHARE_MEMORY RequestedMemory, OUT PVIDEO_MEMORY_INFORMATION ReturnedMemory, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAUnmapVideoMemory( IN PVOID DeviceExtension, IN PVIDEO_MEMORY MemoryToUnmap, OUT PSTATUS_BLOCK StatusBlock); -BOOL +BOOLEAN VGAUnshareVideoMemory( IN PVIDEO_MEMORY MemoryToUnshare, OUT PSTATUS_BLOCK StatusBlock); _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.xml --- trunk/reactos/drivers/video/miniport/vga/vgamp.xml 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.xml 2006-01-07 22:34:25 UTC (rev 20677) @@ -5,4 +5,5 @@ <file>initvga.c</file> <file>vgamp.c</file> <file>vgamp.rc</file> + <pch>vgamp.h</pch> </module> _____ Modified: trunk/reactos/drivers/video/miniport/vga/vgavideo.h --- trunk/reactos/drivers/video/miniport/vga/vgavideo.h 2006-01-07 22:03:31 UTC (rev 20676) +++ trunk/reactos/drivers/video/miniport/vga/vgavideo.h 2006-01-07 22:34:25 UTC (rev 20677) @@ -1,5 +1,3 @@ -#include <ntddk.h> -#include <ntddvdeo.h> #define VGA_NORMAL 0 #define VGA_AND 8

1 0

[ion] 20676: - make vga buildable on msvc.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- make vga buildable on msvc. Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2006-01-07 22:03:31 UTC (rev 20676) @@ -7,7 +7,7 @@ #include <debug.h> typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, +typedef BOOL (STDCALL *PBLTRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, SURFOBJ* Mask, XLATEOBJ* ColorTranslation, _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2006-01-07 22:03:31 UTC (rev 20676) @@ -35,37 +35,7 @@ #define READ_REGISTER_UCHAR(p) (*((volatile UCHAR *)(p))) #define WRITE_REGISTER_UCHAR(p,c) (*((volatile CHAR *)(p))) = (c) -INT abs(INT nm) -{ - if(nm<0) - { - return nm * -1; - } else - { - return nm; - } -} -div_t div(int num, int denom) -{ - div_t r; - if (num > 0 && denom < 0) { - num = -num; - denom = -denom; - } - r.quot = num / denom; - r.rem = num % denom; - if (num < 0 && denom > 0) - { - if (r.rem > 0) - { - r.quot++; - r.rem -= denom; - } - } - return r; -} - /*int mod(int num, int denom) { div_t dvt = div(num, denom); _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h 2006-01-07 21:55:47 UTC (rev 20675) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.h 2006-01-07 22:03:31 UTC (rev 20676) @@ -50,7 +50,7 @@ INT vgaGetPixel(INT x, INT y); BOOL vgaHLine(INT x, INT y, INT len, UCHAR c); BOOL vgaVLine(INT x, INT y, INT len, UCHAR c); -INT abs(INT nm); +INT __cdecl abs(INT nm); BOOL VGADDIIntersectRect(PRECTL prcDst, PRECTL prcSrc1, PRECTL prcSrc2); #define SEQ_I 0x3C4 /* Sequencer Index */

1 0

[ion] 20675: disk, diskdump, pciidex, scsiport.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

disk, diskdump, pciidex, scsiport. Modified: trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c Modified: trunk/reactos/drivers/storage/pciidex/miniport.c Modified: trunk/reactos/drivers/storage/pciidex/pciidex.h Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h _____ Modified: trunk/reactos/drivers/storage/disk/disk.c --- trunk/reactos/drivers/storage/disk/disk.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/disk/disk.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -41,6 +41,7 @@ #define SCSI_DISK_TIMEOUT 10 /* Default timeout: 10 seconds */ #define MODE_DATA_SIZE 192 +#define MAX_PATH 260 typedef struct _DISK_DATA _____ Modified: trunk/reactos/drivers/storage/diskdump/diskdump.c --- trunk/reactos/drivers/storage/diskdump/diskdump.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/diskdump/diskdump.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -367,9 +367,9 @@ } else // hint-name { - Name = (PCHAR)((DWORD)DriverBase + + Name = (PCHAR)((ULONG)DriverBase + *FunctionNameList + 2); - Hint = *(PWORD)((DWORD)DriverBase + *FunctionNameList); + Hint = *(PUSHORT)((ULONG)DriverBase + *FunctionNameList); } #if 0 DPRINT(" Hint:%04x Name:%s\n", Hint, pName); _____ Modified: trunk/reactos/drivers/storage/pciidex/miniport.c --- trunk/reactos/drivers/storage/pciidex/miniport.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/pciidex/miniport.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -98,7 +98,7 @@ IN ULONG BufferLength) { PFDO_DEVICE_EXTENSION FdoDeviceExtension; - PBYTE CurrentBuffer = NULL; + PUCHAR CurrentBuffer = NULL; ULONG i, BytesWritten; NTSTATUS Status; @@ -117,7 +117,7 @@ goto cleanup; for (i = 0; i < BufferLength; i++) - CurrentBuffer[i] = (CurrentBuffer[i] & ~((PBYTE)DataMask)[i]) | (((PBYTE)DataMask)[i] & ((PBYTE)Buffer)[i]); + CurrentBuffer[i] = (CurrentBuffer[i] & ~((PUCHAR)DataMask)[i]) | (((PUCHAR)DataMask)[i] & ((PUCHAR)Buffer)[i]); FdoDeviceExtension = CONTAINING_RECORD(DeviceExtension, FDO_DEVICE_EXTENSION, MiniControllerExtension); if (!FdoDeviceExtension->BusInterface) _____ Modified: trunk/reactos/drivers/storage/pciidex/pciidex.h --- trunk/reactos/drivers/storage/pciidex/pciidex.h 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/pciidex/pciidex.h 2006-01-07 21:55:47 UTC (rev 20675) @@ -1,5 +1,5 @@ +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ide.h> #include <wdmguid.h> #include <stdio.h> @@ -34,7 +34,7 @@ PDEVICE_OBJECT Pdo[MAX_IDE_CHANNEL]; USHORT VendorId; USHORT DeviceId; - PBYTE MiniControllerExtension[0]; + PUCHAR MiniControllerExtension[0]; } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct _PDO_DEVICE_EXTENSION _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2006-01-07 21:55:47 UTC (rev 20675) @@ -35,6 +35,7 @@ #include <ntddstor.h> #include <ntdddisk.h> #include <stdio.h> +#include <stdarg.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2006-01-07 21:53:47 UTC (rev 20674) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h 2006-01-07 21:55:47 UTC (rev 20675) @@ -130,7 +130,7 @@ ULONG Target; SCSI_REQUEST_BLOCK Srb; UCHAR DataBuffer[256]; - BOOL Active; + BOOLEAN Active; } SCSI_PORT_SCAN_ADAPTER, *PSCSI_PORT_SCAN_ADAPTER;

1 0

[fireball] 20674: Merge r20668
by fireball＠svn.reactos.org 07 Jan '06

07 Jan '06

Merge r20668 Added: branches/usb2_6/reactos/w32api/include/pshpck16.h _____ Added: branches/usb2_6/reactos/w32api/include/pshpck16.h --- branches/usb2_6/reactos/w32api/include/pshpck16.h 2006-01-07 21:50:29 UTC (rev 20673) +++ branches/usb2_6/reactos/w32api/include/pshpck16.h 2006-01-07 21:53:47 UTC (rev 20674) @@ -0,0 +1,7 @@ +#ifndef RC_INVOKED +# if ( __FreeBSD__ == 5 ) +# pragma pack(16) +# else +# pragma pack(push,16) +# endif // __FreeBSD__ +#endif // RC_INVOKED Property changes on: branches/usb2_6/reactos/w32api/include/pshpck16.h ___________________________________________________________________ Name: svn:eol-style + native

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
59
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 January 2006