Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 20647: Patch by Raimonds Praude raimonds.praude at sets.lv
by jimtabor＠svn.reactos.org 07 Jan '06

07 Jan '06

Patch by Raimonds Praude raimonds.praude at sets.lv Could not set the text limit for combo box. An application sent CB_LIMITTEXT text message, but it was not being processed. Now it is possible to set the text limit, 5 or 8 symbols, for instance. CB_LIMITTEXT message processing was added into ComboWndProc_common function in combo.c file. Modified: trunk/reactos/lib/user32/controls/combo.c _____ Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2006-01-07 05:11:32 UTC (rev 20646) +++ trunk/reactos/lib/user32/controls/combo.c 2006-01-07 05:23:59 UTC (rev 20647) @@ -29,7 +29,6 @@ * TODO: * - ComboBox_[GS]etMinVisible() * - CB_GETMINVISIBLE, CB_SETMINVISIBLE - * - CB_LIMITTEXT * - CB_SETTOPINDEX */ @@ -2315,7 +2314,9 @@ return (lphc->wState & CBF_EUI) ? TRUE : FALSE; case CB_GETCOMBOBOXINFO: return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); - + case CB_LIMITTEXT: + if( lphc->wState & CBF_EDIT ) + return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); default: if (message >= WM_USER) WARN("unknown msg WM_USER+%04x wp=%04x lp=%08lx\n",

1 0

[ion] 20646: - Get green to compile with msvc/ddk.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get green to compile with msvc/ddk. Modified: trunk/reactos/drivers/dd/green/green.h Modified: trunk/reactos/drivers/dd/green/green.xml Modified: trunk/reactos/drivers/dd/green/keyboard.c _____ Modified: trunk/reactos/drivers/dd/green/green.h --- trunk/reactos/drivers/dd/green/green.h 2006-01-07 03:29:02 UTC (rev 20645) +++ trunk/reactos/drivers/dd/green/green.h 2006-01-07 05:11:32 UTC (rev 20646) @@ -1,38 +1,17 @@ +#include <stdarg.h> #include <ntddk.h> +#include <ndk/iotypes.h> +#include <windef.h> +#define WINBASEAPI +typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; #include <ntddser.h> #include <kbdmou.h> #include <wincon.h> -#include <stdarg.h> +#include <drivers/blue/ntddblue.h> -#if defined(__GNUC__) - #include <drivers/blue/ntddblue.h> +#define INFINITE -1 +#define KEYBOARD_BUFFER_SIZE 100 - #define INFINITE 0xFFFFFFFF - - NTSTATUS NTAPI - ObReferenceObjectByName(PUNICODE_STRING ObjectPath, - ULONG Attributes, - PACCESS_STATE PassedAccessState, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID ParseContext, - PVOID* ObjectPtr); - - typedef struct _CLASS_INFORMATION - { - PDEVICE_OBJECT DeviceObject; - PVOID CallBack; - } CLASS_INFORMATION, *PCLASS_INFORMATION; - - #define KEYBOARD_BUFFER_SIZE 100 - -#elif defined(_MSC_VER) - /* Nothing more to do */ -#else - #error Unknown compiler! -#endif - typedef enum { Green, @@ -50,7 +29,7 @@ COMMON_DEVICE_EXTENSION Common; PDEVICE_OBJECT Green; - CLASS_INFORMATION ClassInformation; + CONNECT_DATA ClassInformation; HANDLE WorkerThreadHandle; KDPC KeyboardDpc; _____ Modified: trunk/reactos/drivers/dd/green/green.xml --- trunk/reactos/drivers/dd/green/green.xml 2006-01-07 03:29:02 UTC (rev 20645) +++ trunk/reactos/drivers/dd/green/green.xml 2006-01-07 05:11:32 UTC (rev 20646) @@ -11,4 +11,5 @@ <file>pnp.c</file> <file>screen.c</file> <file>green.rc</file> + <pch>green.h</pch> </module> _____ Modified: trunk/reactos/drivers/dd/green/keyboard.c --- trunk/reactos/drivers/dd/green/keyboard.c 2006-01-07 03:29:02 UTC (rev 20645) +++ trunk/reactos/drivers/dd/green/keyboard.c 2006-01-07 05:11:32 UTC (rev 20646) @@ -154,8 +154,8 @@ Queue = DeviceExtension->ActiveQueue % 2; InterlockedIncrement((PLONG)&DeviceExtension->ActiveQueue); - (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.CallBack) ( - DeviceExtension->ClassInformation.DeviceObject, + (*(PSERVICE_CALLBACK_ROUTINE)DeviceExtension->ClassInformation.ClassServ ice)( + DeviceExtension->ClassInformation.ClassDeviceObject, DeviceExtension->KeyboardInputData[Queue], &DeviceExtension->KeyboardInputData[Queue][DeviceExtension->InputDataCou nt[Queue]], &InputDataConsumed); @@ -300,7 +300,7 @@ } DeviceExtension->ClassInformation = - *((PCLASS_INFORMATION)Stack->Parameters.DeviceIoControl.Type3InputBuffer ); + *((PCONNECT_DATA)Stack->Parameters.DeviceIoControl.Type3InputBuffer); /* Initialize serial port */ Fcr = 0;

1 0

[turner] 20645: Remove NtGdiCheckColorsInGamut as it is not an API.
by turner＠svn.reactos.org 07 Jan '06

07 Jan '06

Remove NtGdiCheckColorsInGamut as it is not an API. Modified: trunk/reactos/include/win32k/ntgdibad.h Modified: trunk/reactos/subsys/win32k/objects/icm.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2006-01-07 02:14:42 UTC (rev 20644) +++ trunk/reactos/include/win32k/ntgdibad.h 2006-01-07 03:29:02 UTC (rev 20645) @@ -188,14 +188,6 @@ int XRadial2, int YRadial2); -/* Does not exist */ -BOOL -STDCALL -NtGdiCheckColorsInGamut(HDC hDC, - LPVOID RGBTriples, - LPVOID Buffer, - UINT Count); - /* Use NtGdiArcInternal with GdiTypeChord */ BOOL STDCALL _____ Modified: trunk/reactos/subsys/win32k/objects/icm.c --- trunk/reactos/subsys/win32k/objects/icm.c 2006-01-07 02:14:42 UTC (rev 20644) +++ trunk/reactos/subsys/win32k/objects/icm.c 2006-01-07 03:29:02 UTC (rev 20645) @@ -25,17 +25,6 @@ BOOL STDCALL -NtGdiCheckColorsInGamut(HDC hDC, - LPVOID RGBTriples, - LPVOID Buffer, - UINT Count) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL -STDCALL NtGdiColorMatchToTarget(HDC hDC, HDC hDCTarget, DWORD Action) _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-07 02:14:42 UTC (rev 20644) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-07 03:29:02 UTC (rev 20645) @@ -10,7 +10,6 @@ NtGdiBeginPath 1 NtGdiBitBlt 11 NtGdiCancelDC 1 -NtGdiCheckColorsInGamut 4 NtGdiChord 9 NtGdiCloseEnhMetaFile 1 NtGdiCloseFigure 1

1 0

[ion] 20644: - Much cleaner way to get blue building (remove ugly header hacks)
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Much cleaner way to get blue building (remove ugly header hacks) - Get bootvid working too. Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2006-01-07 02:06:49 UTC (rev 20643) +++ trunk/reactos/drivers/dd/blue/blue.c 2006-01-07 02:14:42 UTC (rev 20644) @@ -12,25 +12,9 @@ /* INCLUDES ******************************************************************/ #include <ntddk.h> - -/* FIXME: W32API NEEDS TO BE FIXED */ -#ifdef _MSC_VER -/* - * Wincon.h can't be included due to missing user-mode types, - * so we'll define them here - */ -typedef ULONG DWORD, *LPDWORD; -typedef USHORT UINT, *LPWORD; -typedef USHORT WORD; -typedef UCHAR BYTE; -typedef INT BOOL; -typedef PVOID HWND; -typedef PVOID LPVOID; -#define WINAPI NTAPI -#define APIENTRY WINAPI +#include <windef.h> #define WINBASEAPI typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; -#endif #include <wincon.h> #include <blue/ntddblue.h> _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2006-01-07 02:06:49 UTC (rev 20643) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2006-01-07 02:14:42 UTC (rev 20644) @@ -24,6 +24,7 @@ /* INCLUDES ******************************************************************/ #include <ntddk.h> +#include <windef.h> #include <ndk/ldrfuncs.h> #include "bootvid.h" #include "ntbootvid.h" @@ -78,7 +79,7 @@ /* FUNCTIONS *****************************************************************/ -STATIC BOOLEAN FASTCALL +static BOOLEAN FASTCALL InbvFindBootimage() { PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; @@ -119,7 +120,7 @@ } -STATIC BOOLEAN FASTCALL +static BOOLEAN FASTCALL InbvMapVideoMemory(VOID) { PHYSICAL_ADDRESS PhysicalAddress; @@ -131,7 +132,7 @@ } -STATIC BOOLEAN FASTCALL +static BOOLEAN FASTCALL InbvUnmapVideoMemory(VOID) { MmUnmapIoSpace(VideoMemory, 0x10000); @@ -139,7 +140,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL vgaPreCalc() { ULONG j; @@ -158,7 +159,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL vgaSetRegisters(const VGA_REGISTERS *Registers) { UINT i; @@ -246,7 +247,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvSetColor(INT Index, UCHAR Red, UCHAR Green, UCHAR Blue) { WRITE_PORT_UCHAR(PELINDEX, Index); @@ -256,7 +257,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvSetBlackPalette() { register ULONG r = 0; @@ -276,7 +277,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvDisplayBitmap(ULONG Width, ULONG Height, PCHAR ImageData) { ULONG j, k, y; @@ -322,7 +323,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvDisplayCompressedBitmap() { PBITMAPV5HEADER bminfo; @@ -470,7 +471,7 @@ } -STATIC VOID FASTCALL +static VOID FASTCALL InbvFadeUpPalette() { PBITMAPV5HEADER bminfo; @@ -542,7 +543,7 @@ } -STATIC VOID STDCALL +static VOID STDCALL InbvBitmapThreadMain(PVOID Ignored) { if (InbvFindBootimage()) @@ -558,7 +559,7 @@ } -STATIC BOOLEAN STDCALL +static BOOLEAN STDCALL VidInitialize(VOID) { NTSTATUS Status;

1 0

[ion] 20643: - Get beep and blue to compile/link on MSVC.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get beep and blue to compile/link on MSVC. Modified: trunk/reactos/drivers/dd/beep/beep.c Modified: trunk/reactos/drivers/dd/blue/blue.c _____ Modified: trunk/reactos/drivers/dd/beep/beep.c --- trunk/reactos/drivers/dd/beep/beep.c 2006-01-07 02:06:22 UTC (rev 20642) +++ trunk/reactos/drivers/dd/beep/beep.c 2006-01-07 02:06:49 UTC (rev 20643) @@ -199,7 +199,7 @@ FALSE, NULL); } - else if (BeepParam->Duration == (DWORD)-1) + else if (BeepParam->Duration == (ULONG)-1) { if (DeviceExtension->BeepOn == TRUE) { _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2006-01-07 02:06:22 UTC (rev 20642) +++ trunk/reactos/drivers/dd/blue/blue.c 2006-01-07 02:06:49 UTC (rev 20643) @@ -12,6 +12,26 @@ /* INCLUDES ******************************************************************/ #include <ntddk.h> + +/* FIXME: W32API NEEDS TO BE FIXED */ +#ifdef _MSC_VER +/* + * Wincon.h can't be included due to missing user-mode types, + * so we'll define them here + */ +typedef ULONG DWORD, *LPDWORD; +typedef USHORT UINT, *LPWORD; +typedef USHORT WORD; +typedef UCHAR BYTE; +typedef INT BOOL; +typedef PVOID HWND; +typedef PVOID LPVOID; +#define WINAPI NTAPI +#define APIENTRY WINAPI +#define WINBASEAPI +typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; +#endif + #include <wincon.h> #include <blue/ntddblue.h> #include <ndk/halfuncs.h> @@ -19,7 +39,6 @@ #define NDEBUG #include <debug.h> - /* DEFINITIONS ***************************************************************/ #define VIDMEM_BASE 0xb8000 @@ -53,14 +72,14 @@ typedef struct _DEVICE_EXTENSION { - PBYTE VideoMemory; /* Pointer to video memory */ - DWORD CursorSize; - BOOL CursorVisible; - WORD CharAttribute; - DWORD Mode; - BYTE ScanLines; /* Height of a text line */ - WORD Rows; /* Number of rows */ - WORD Columns; /* Number of columns */ + PUCHAR VideoMemory; /* Pointer to video memory */ + ULONG CursorSize; + INT CursorVisible; + USHORT CharAttribute; + ULONG Mode; + UCHAR ScanLines; /* Height of a text line */ + USHORT Rows; /* Number of rows */ + USHORT Columns; /* Number of columns */ } DEVICE_EXTENSION, *PDEVICE_EXTENSION; @@ -77,12 +96,12 @@ PHYSICAL_ADDRESS BaseAddress; NTSTATUS Status; unsigned int offset; - BYTE data, value; + UCHAR data, value; DeviceExtension = DeviceObject->DeviceExtension; /* disable interrupts */ - __asm__("cli\n\t"); + _disable(); /* get current output position */ WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); @@ -113,7 +132,7 @@ DeviceExtension->ScanLines = (READ_PORT_UCHAR (CRTC_DATA) & 0x1F) + 1; /* enable interrupts */ - __asm__("sti\n\t"); + _enable(); /* calculate number of text rows */ DeviceExtension->Rows = @@ -130,7 +149,7 @@ /* get pointer to video memory */ BaseAddress.QuadPart = VIDMEM_BASE; DeviceExtension->VideoMemory = - (PBYTE)MmMapIoSpace (BaseAddress, DeviceExtension->Rows * DeviceExtension->Columns * 2, MmNonCached); + (PUCHAR)MmMapIoSpace (BaseAddress, DeviceExtension->Rows * DeviceExtension->Columns * 2, MmNonCached); DeviceExtension->CursorSize = 5; /* FIXME: value correct?? */ DeviceExtension->CursorVisible = TRUE; @@ -141,14 +160,14 @@ ENABLE_WRAP_AT_EOL_OUTPUT; /* show blinking cursor */ - __asm__("cli\n\t"); + _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORSTART); WRITE_PORT_UCHAR (CRTC_DATA, (DeviceExtension->ScanLines - 1) & 0x1F); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSOREND); data = READ_PORT_UCHAR (CRTC_DATA) & 0xE0; WRITE_PORT_UCHAR (CRTC_DATA, data | ((DeviceExtension->ScanLines - 1) & 0x1F)); - __asm__("sti\n\t"); + _enable(); Status = STATUS_SUCCESS; @@ -167,7 +186,7 @@ PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; NTSTATUS Status; char *pch = Irp->UserBuffer; - PBYTE vidmem; + PUCHAR vidmem; unsigned int i; int j, offset; int cursorx, cursory; @@ -189,12 +208,12 @@ rows = DeviceExtension->Rows; columns = DeviceExtension->Columns; - __asm__ ("cli\n\t"); + _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); offset = READ_PORT_UCHAR (CRTC_DATA)<<8; WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); offset += READ_PORT_UCHAR (CRTC_DATA); - __asm__ ("sti\n\t"); + _enable(); cursory = offset / columns; cursorx = offset % columns; @@ -284,13 +303,13 @@ /* Set the cursor position */ offset = (cursory * columns) + cursorx; } - __asm__ ("cli\n\t"); + _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); WRITE_PORT_UCHAR (CRTC_DATA, offset); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); offset >>= 8; WRITE_PORT_UCHAR (CRTC_DATA, offset); - __asm__ ("sti\n\t"); + _enable(); Status = STATUS_SUCCESS; @@ -320,12 +339,12 @@ unsigned int offset; /* read cursor position from crtc */ - __asm__("cli\n\t"); + _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); offset = READ_PORT_UCHAR (CRTC_DATA); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); offset += (READ_PORT_UCHAR (CRTC_DATA) << 8); - __asm__("sti\n\t"); + _enable(); pcsbi->dwSize.X = columns; pcsbi->dwSize.Y = rows; @@ -357,12 +376,12 @@ offset = (pcsbi->dwCursorPosition.Y * DeviceExtension->Columns) + pcsbi->dwCursorPosition.X; - __asm__("cli\n\t"); + _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); WRITE_PORT_UCHAR (CRTC_DATA, offset); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); WRITE_PORT_UCHAR (CRTC_DATA, offset>>8); - __asm__("sti\n\t"); + _enable(); Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -384,8 +403,8 @@ case IOCTL_CONSOLE_SET_CURSOR_INFO: { PCONSOLE_CURSOR_INFO pcci = (PCONSOLE_CURSOR_INFO)Irp->AssociatedIrp.SystemBuffer; - BYTE data, value; - DWORD size, height; + UCHAR data, value; + ULONG size, height; DeviceExtension->CursorSize = pcci->dwSize; DeviceExtension->CursorVisible = pcci->bVisible; @@ -398,16 +417,16 @@ size = 1; } - data |= (BYTE)(height - size); + data |= (UCHAR)(height - size); - __asm__("cli\n\t"); + _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORSTART); WRITE_PORT_UCHAR (CRTC_DATA, data); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSOREND); value = READ_PORT_UCHAR (CRTC_DATA) & 0xE0; WRITE_PORT_UCHAR (CRTC_DATA, value | (height - 1)); - __asm__("sti\n\t"); + _enable(); Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -439,9 +458,9 @@ case IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE: { POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; - PBYTE vidmem; + PUCHAR vidmem; int offset; - DWORD dwCount; + ULONG dwCount; vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + @@ -462,10 +481,10 @@ case IOCTL_CONSOLE_READ_OUTPUT_ATTRIBUTE: { POUTPUT_ATTRIBUTE Buf = (POUTPUT_ATTRIBUTE)Irp->AssociatedIrp.SystemBuffer; - PWORD pAttr = (PWORD)MmGetSystemAddressForMdl(Irp->MdlAddress); - PBYTE vidmem; + PUSHORT pAttr = (PUSHORT)MmGetSystemAddressForMdl(Irp->MdlAddress); + PUCHAR vidmem; int offset; - DWORD dwCount; + ULONG dwCount; vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + @@ -487,9 +506,9 @@ { COORD *pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); CHAR *pAttr = (CHAR *)(pCoord + 1); - PBYTE vidmem; + PUCHAR vidmem; int offset; - DWORD dwCount; + ULONG dwCount; vidmem = DeviceExtension->VideoMemory; offset = (pCoord->Y * DeviceExtension->Columns * 2) + @@ -505,7 +524,7 @@ break; case IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE: - DeviceExtension->CharAttribute = (WORD)*(PWORD)Irp->AssociatedIrp.SystemBuffer; + DeviceExtension->CharAttribute = (USHORT)*(PUSHORT)Irp->AssociatedIrp.SystemBuffer; Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; break; @@ -513,9 +532,9 @@ case IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER: { POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; - PBYTE vidmem; + PUCHAR vidmem; int offset; - DWORD dwCount; + ULONG dwCount; vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + @@ -539,9 +558,9 @@ { POUTPUT_CHARACTER Buf = (POUTPUT_CHARACTER)Irp->AssociatedIrp.SystemBuffer; LPSTR pChar = (LPSTR)MmGetSystemAddressForMdl(Irp->MdlAddress); - PBYTE vidmem; + PUCHAR vidmem; int offset; - DWORD dwCount; + ULONG dwCount; vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + @@ -563,9 +582,9 @@ { COORD *pCoord; LPSTR pChar; - PBYTE vidmem; + PUCHAR vidmem; int offset; - DWORD dwCount; + ULONG dwCount; pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); pChar = (CHAR *)(pCoord + 1); @@ -586,11 +605,11 @@ case IOCTL_CONSOLE_DRAW: { PCONSOLE_DRAW ConsoleDraw; - PBYTE Src, Dest; + PUCHAR Src, Dest; UINT SrcDelta, DestDelta, i, Offset; ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); - Src = (PBYTE) (ConsoleDraw + 1); + Src = (PUCHAR) (ConsoleDraw + 1); SrcDelta = ConsoleDraw->SizeX * 2; Dest = DeviceExtension->VideoMemory + (ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2; @@ -606,12 +625,12 @@ Offset = (ConsoleDraw->CursorY * DeviceExtension->Columns) + ConsoleDraw->CursorX; - __asm__("cli\n\t"); + _disable(); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); WRITE_PORT_UCHAR (CRTC_DATA, Offset); WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); WRITE_PORT_UCHAR (CRTC_DATA, Offset >> 8); - __asm__("sti\n\t"); + _enable(); Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS;

1 0

[ion] 20642: - The DDK disables usage of _enable/_disable so that driver devs don't use them. Since the NDK is the home of undocumented things that drivers shouldn't use, including halfuncs.h will re-enable the intrinsics.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- The DDK disables usage of _enable/_disable so that driver devs don't use them. Since the NDK is the home of undocumented things that drivers shouldn't use, including halfuncs.h will re-enable the intrinsics. - Add the intrinsics to the w32api as well so that code which uses them can compile on both msvc and gcc. - Make DPRINT work on non-DBG msvc builds. Modified: trunk/reactos/include/ndk/halfuncs.h Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/halfuncs.h --- trunk/reactos/include/ndk/halfuncs.h 2006-01-07 01:39:56 UTC (rev 20641) +++ trunk/reactos/include/ndk/halfuncs.h 2006-01-07 02:06:22 UTC (rev 20642) @@ -28,6 +28,22 @@ #ifndef NTOS_MODE_USER // +// The DDK steals these away from you. +// +VOID +_enable( + VOID +); +VOID +_disable( + VOID +); +#ifdef _MSC_VER +#pragma intrinsic(_enable) +#pragma intrinsic(_disable) +#endif + +// // Display Functions // NTHALAPI _____ Modified: trunk/reactos/include/reactos/debug.h --- trunk/reactos/include/reactos/debug.h 2006-01-07 01:39:56 UTC (rev 20641) +++ trunk/reactos/include/reactos/debug.h 2006-01-07 02:06:22 UTC (rev 20642) @@ -82,7 +82,12 @@ #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); #else - #ifdef __GNUC__ + #ifdef _MSC_VER + static __inline void DPRINT ( const char* fmt, ... ) + { + UNREFERENCED_PARAMETER(fmt); + } + #else #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #endif #define CHECKPOINT @@ -94,17 +99,18 @@ #else /* On non-debug builds, we never show these */ -#ifdef _MSC_VER -static __inline void DPRINT1 ( const char* fmt, ... ) -{ -} -static __inline void DPRINT ( const char* fmt, ... ) -{ -} -#else - #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) -#endif + #ifdef _MSC_VER + static __inline void DPRINT1 ( const char* fmt, ... ) + { + } + static __inline void DPRINT ( const char* fmt, ... ) + { + } + #else + #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #endif + #define CHECKPOINT1 #define CHECKPOINT #define UNIMPLEMENTED _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2006-01-07 01:39:56 UTC (rev 20641) +++ trunk/reactos/w32api/include/ddk/winddk.h 2006-01-07 02:06:22 UTC (rev 20642) @@ -10270,6 +10270,10 @@ #endif +/* Available as intrinsics on MSVC */ +static __inline void _disable(void) {__asm__("cli\n\t");} +static __inline void _enable(void) {__asm__("sti\n\t");} + #ifdef __cplusplus } #endif

1 0

[ion] 20641: - Get bus drivers to compile and link on MSVC.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Get bus drivers to compile and link on MSVC. Modified: trunk/reactos/drivers/bus/acpi/include/actypes.h Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/bus/serenum/serenum.h _____ Modified: trunk/reactos/drivers/bus/acpi/include/actypes.h --- trunk/reactos/drivers/bus/acpi/include/actypes.h 2006-01-07 01:37:37 UTC (rev 20640) +++ trunk/reactos/drivers/bus/acpi/include/actypes.h 2006-01-07 01:39:56 UTC (rev 20641) @@ -191,6 +191,16 @@ /* * Local datatypes */ +#ifdef _MSC_VER +typedef ULONGLONG u64; +typedef ULONG u32; +typedef USHORT u16; +typedef UCHAR u8; +typedef LONGLONG s64; +typedef LONG s32; +typedef SHORT s16; +typedef CHAR s8; +#endif typedef u32 ACPI_STATUS; /* All ACPI Exceptions */ typedef u32 ACPI_NAME; /* 4-s8 ACPI name */ _____ Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c --- trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2006-01-07 01:37:37 UTC (rev 20640) +++ trunk/reactos/drivers/bus/acpi/ospm/acpisys.c 2006-01-07 01:39:56 UTC (rev 20641) @@ -14,6 +14,13 @@ #define NDEBUG #include <debug.h> +NTSTATUS +STDCALL +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath +); + #ifdef ALLOC_PRAGMA // Make the initialization routines discardable, so that they _____ Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c --- trunk/reactos/drivers/bus/isapnp/isapnp.c 2006-01-07 01:37:37 UTC (rev 20640) +++ trunk/reactos/drivers/bus/isapnp/isapnp.c 2006-01-07 01:39:56 UTC (rev 20641) @@ -22,13 +22,7 @@ #pragma alloc_text(init, DriverEntry) -// Make the PASSIVE_LEVEL routines pageable, so that they don't -// waste nonpaged memory -#pragma alloc_text(page, ACPIDispatchOpenClose) -#pragma alloc_text(page, ACPIDispatchRead) -#pragma alloc_text(page, ACPIDispatchWrite) - #endif /* ALLOC_PRAGMA */ @@ -92,18 +86,18 @@ #endif -static inline VOID WriteData(UCHAR Value) +static __inline VOID WriteData(UCHAR Value) { WRITE_PORT_UCHAR((PUCHAR)ISAPNP_WRITE_PORT, Value); } -static inline VOID WriteAddress(UCHAR Value) +static __inline VOID WriteAddress(UCHAR Value) { WRITE_PORT_UCHAR((PUCHAR)ISAPNP_ADDRESS_PORT, Value); KeStallExecutionProcessor(20); } -static inline UCHAR ReadData(VOID) +static __inline UCHAR ReadData(VOID) { return READ_PORT_UCHAR(IsaPnPReadPort); } @@ -158,7 +152,7 @@ } #endif -static inline VOID SetReadDataPort(ULONG Port) +static __inline VOID SetReadDataPort(ULONG Port) { IsaPnPReadPort = (PUCHAR)Port; WriteUchar(0x00, Port >> 2); _____ Modified: trunk/reactos/drivers/bus/serenum/serenum.h --- trunk/reactos/drivers/bus/serenum/serenum.h 2006-01-07 01:37:37 UTC (rev 20640) +++ trunk/reactos/drivers/bus/serenum/serenum.h 2006-01-07 01:39:56 UTC (rev 20641) @@ -7,8 +7,8 @@ * PROGRAMMERS: HervÚ Poussineau (hpoussin(a)reactos.com) */ +#include <ntifs.h> #include <ntddk.h> -#include <ntifs.h> #include <ntddser.h> #include <stdio.h>

1 0

[ion] 20640: - Properly set STDCALL as default convention, previous patch incorrectly set it as a linker setting instead of a compiler setting.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Properly set STDCALL as default convention, previous patch incorrectly set it as a linker setting instead of a compiler setting. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 01:27:20 UTC (rev 20639) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 01:37:37 UTC (rev 20640) @@ -341,6 +341,7 @@ fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", speed ? "FALSE" : "TRUE"); if ( !module.cplusplus ) fprintf ( OUT, "\t\t\t\tCompileAs=\"1\"\r\n" ); + fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", (sys || (exe && module.type == Kernel)) ? 2: 1); fprintf ( OUT, "\t\t\t\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4"); fprintf ( OUT, "\t\t\t<Tool\r\n" ); @@ -389,7 +390,6 @@ fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr == "" ? "0x10000" : baseaddr.c_str ()); } @@ -401,7 +401,6 @@ fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 3 ); fprintf ( OUT, "\t\t\t\tDriver=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"KiSystemStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ()); } @@ -409,7 +408,6 @@ { fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20\"\r\n" ); fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", 1 ); - fprintf ( OUT, "\t\t\t\tCallingConvention=\"%d\"\r\n", 2 ); fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"NtProcessStartup\"\r\n" ); fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", baseaddr.c_str ());

1 0

[ion] 20639: - Don't name-decorate the entrypoint. This lets msvc link the module properly and remains compatible with GCC.
by ion＠svn.reactos.org 07 Jan '06

07 Jan '06

- Don't name-decorate the entrypoint. This lets msvc link the module properly and remains compatible with GCC. Modified: trunk/reactos/tools/rbuild/module.cpp _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2006-01-07 01:26:05 UTC (rev 20638) +++ trunk/reactos/tools/rbuild/module.cpp 2006-01-07 01:27:20 UTC (rev 20639) @@ -817,7 +817,7 @@ case Kernel: return "_NtProcessStartup"; case KernelModeDLL: - return "_DriverEntry@8"; + return "DriverEntry"; case NativeDLL: return "_DllMainCRTStartup@12"; case NativeCUI: @@ -836,7 +836,7 @@ else return "_WinMainCRTStartup"; case KernelModeDriver: - return "_DriverEntry@8"; + return "DriverEntry"; case BuildTool: case StaticLibrary: case ObjectLibrary:

1 0

[turner] 20638: Didnt mean to commit this in the last one.
by turner＠svn.reactos.org 07 Jan '06

07 Jan '06

Didnt mean to commit this in the last one. Modified: trunk/reactos/subsys/system/usetup/bootsup.c _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-07 01:15:26 UTC (rev 20637) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-07 01:26:05 UTC (rev 20638) @@ -245,7 +245,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=COM1 /NOGUIBOOT"); + L"/DEBUGPORT=SCREEN /NOGUIBOOT"); /* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, @@ -356,7 +356,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=COM1 /NOGUIBOOT"); + L"/DEBUGPORT=SCREEN /NOGUIBOOT"); /* Save the ini file */ IniCacheSave(IniCache, IniPath);

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