Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 31041: zero DEVMODE and setting the correct size before calling ChangeDisplaySettings
by cwittich＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: cwittich Date: Thu Dec 6 17:46:56 2007 New Revision: 31041 URL: http://svn.reactos.org/svn/reactos?rev=31041&view=rev Log: zero DEVMODE and setting the correct size before calling ChangeDisplaySettings Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Thu Dec 6 17:46:56 2007 @@ -41,7 +41,6 @@ { DevMode.dmSize = sizeof(DEVMODE); - DevMode.dmDriverExtra = 0; while (EnumDisplaySettingsEx(NULL, iMode, &DevMode, 0) == TRUE) { @@ -139,7 +138,8 @@ LONG retval; // Here we go DEVMODE DevMode; - DevMode.dmFields = 0; + ZeroMemory(&DevMode, sizeof(DEVMODE)); + DevMode.dmSize = sizeof(DEVMODE); if (dwHeight) DevMode.dmFields |= DM_PELSHEIGHT;

1 0

[hpoussin] 31040: Fix small typo
by hpoussin＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: hpoussin Date: Thu Dec 6 16:43:47 2007 New Revision: 31040 URL: http://svn.reactos.org/svn/reactos?rev=31040&view=rev Log: Fix small typo Modified: trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Thu Dec 6 16:43:47 2007 @@ -906,7 +906,7 @@ VOID NTAPI -CmpAcquireTwoKcbLocksExcusiveByKey( +CmpAcquireTwoKcbLocksExclusiveByKey( IN ULONG ConvKey1, IN ULONG ConvKey2 ); Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Thu Dec 6 16:43:47 2007 @@ -660,7 +660,7 @@ if (Parent) { /* Lock the parent KCB and ourselves */ - CmpAcquireTwoKcbLocksExcusiveByKey(ConvKey, Parent->ConvKey); + CmpAcquireTwoKcbLocksExclusiveByKey(ConvKey, Parent->ConvKey); } else { 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 (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Thu Dec 6 16:43:47 2007 @@ -1595,8 +1595,8 @@ VOID NTAPI -CmpAcquireTwoKcbLocksExcusiveByKey(IN ULONG ConvKey1, - IN ULONG ConvKey2) +CmpAcquireTwoKcbLocksExclusiveByKey(IN ULONG ConvKey1, + IN ULONG ConvKey2) { ULONG Index1, Index2;

1 0

[hpoussin] 31039: Define serial port bases only once Formatting, cleanup, code factorization
by hpoussin＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: hpoussin Date: Thu Dec 6 16:11:21 2007 New Revision: 31039 URL: http://svn.reactos.org/svn/reactos?rev=31039&view=rev Log: Define serial port bases only once Formatting, cleanup, code factorization Modified: trunk/reactos/drivers/base/kdcom/kdbg.c Modified: trunk/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdbg.c?… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdbg.c (original) +++ trunk/reactos/drivers/base/kdcom/kdbg.c Thu Dec 6 16:11:21 2007 @@ -1,13 +1,10 @@ -/* $Id: kdbg.c 23670 2006-08-23 17:28:39Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/kdbg.c + * FILE: drivers/base/kdcom/kdbg.c * PURPOSE: Serial i/o functions for the kernel debugger. - * PROGRAMMER: Emanuele Aliberti - * Eric Kohl - * UPDATE HISTORY: - * Created 05/09/99 + * PROGRAMMER: Alex Ionescu + * Hervé Poussineau */ /* INCLUDES *****************************************************************/ @@ -20,6 +17,7 @@ #include <debug.h> #include "arc/arc.h" #include "windbgkd.h" +#include <kddll.h> typedef struct _KD_PORT_INFORMATION { @@ -28,27 +26,61 @@ ULONG BaseAddress; } KD_PORT_INFORMATION, *PKD_PORT_INFORMATION; +BOOLEAN +NTAPI +KdPortInitializeEx( + IN PKD_PORT_INFORMATION PortInformation, + IN ULONG Unknown1, + IN ULONG Unknown2); + +BOOLEAN +NTAPI +KdPortGetByteEx( + IN PKD_PORT_INFORMATION PortInformation, + OUT PUCHAR ByteReceived); + +BOOLEAN +NTAPI +KdPortPollByteEx( + IN PKD_PORT_INFORMATION PortInformation, + OUT PUCHAR ByteReceived); + +VOID +NTAPI +KdPortPutByteEx( + IN PKD_PORT_INFORMATION PortInformation, + IN UCHAR ByteToSend); + #define DEFAULT_BAUD_RATE 19200 +#ifdef _M_IX86 +const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; +#elif defined(_M_PPC) +const ULONG BaseArray[5] = {0, 0x800003f8}; +#elif defined(_M_MIPS) +const ULONG BaseArray[5] = {0, 0x80006000, 0x80007000}; +#else +#error Unknown architecture +#endif /* MACROS *******************************************************************/ -#define SER_RBR(x) ((x)+0) -#define SER_THR(x) ((x)+0) -#define SER_DLL(x) ((x)+0) -#define SER_IER(x) ((x)+1) +#define SER_RBR(x) ((PUCHAR)(x)+0) +#define SER_THR(x) ((PUCHAR)(x)+0) +#define SER_DLL(x) ((PUCHAR)(x)+0) +#define SER_IER(x) ((PUCHAR)(x)+1) #define SR_IER_ERDA 0x01 #define SR_IER_ETHRE 0x02 #define SR_IER_ERLSI 0x04 #define SR_IER_EMS 0x08 #define SR_IER_ALL 0x0F -#define SER_DLM(x) ((x)+1) -#define SER_IIR(x) ((x)+2) -#define SER_FCR(x) ((x)+2) +#define SER_DLM(x) ((PUCHAR)(x)+1) +#define SER_IIR(x) ((PUCHAR)(x)+2) +#define SER_FCR(x) ((PUCHAR)(x)+2) #define SR_FCR_ENABLE_FIFO 0x01 #define SR_FCR_CLEAR_RCVR 0x02 #define SR_FCR_CLEAR_XMIT 0x04 -#define SER_LCR(x) ((x)+3) +#define SER_LCR(x) ((PUCHAR)(x)+3) #define SR_LCR_CS5 0x00 #define SR_LCR_CS6 0x01 #define SR_LCR_CS7 0x02 @@ -62,28 +94,26 @@ #define SR_LCR_PSP 0x38 #define SR_LCR_BRK 0x40 #define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((x)+4) +#define SER_MCR(x) ((PUCHAR)(x)+4) #define SR_MCR_DTR 0x01 #define SR_MCR_RTS 0x02 #define SR_MCR_OUT1 0x04 #define SR_MCR_OUT2 0x08 #define SR_MCR_LOOP 0x10 -#define SER_LSR(x) ((x)+5) +#define SER_LSR(x) ((PUCHAR)(x)+5) #define SR_LSR_DR 0x01 #define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((x)+6) +#define SER_MSR(x) ((PUCHAR)(x)+6) #define SR_MSR_CTS 0x10 #define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((x)+7) +#define SER_SCR(x) ((PUCHAR)(x)+7) /* GLOBAL VARIABLES *********************************************************/ /* STATIC VARIABLES *********************************************************/ -static ULONG ComPort = 0; -static ULONG BaudRate = 0; -static PUCHAR PortBase = (PUCHAR)0; +static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 }; /* The com port must only be initialized once! */ static BOOLEAN PortInitialized = FALSE; @@ -92,468 +122,340 @@ /* STATIC FUNCTIONS *********************************************************/ static BOOLEAN -KdpDoesComPortExist (PUCHAR BaseAddress) -{ - BOOLEAN found; - UCHAR mcr; - UCHAR msr; - - found = FALSE; - - /* save Modem Control Register (MCR) */ - mcr = READ_PORT_UCHAR (SER_MCR(BaseAddress)); - - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); - - /* clear all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); +KdpDoesComPortExist( + IN ULONG BaseAddress) +{ + BOOLEAN found; + UCHAR mcr; + UCHAR msr; + + found = FALSE; + + /* save Modem Control Register (MCR) */ + mcr = READ_PORT_UCHAR(SER_MCR(BaseAddress)); + + /* enable loop mode (set Bit 4 of the MCR) */ + WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); + + /* clear all modem output bits */ + WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_LOOP); + + /* read the Modem Status Register */ + msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); + + /* + * the upper nibble of the MSR (modem output bits) must be + * equal to the lower nibble of the MCR (modem input bits) + */ + if ((msr & 0xF0) == 0x00) + { + /* set all modem output bits */ + WRITE_PORT_UCHAR(SER_MCR(BaseAddress), SR_MCR_DTR | SR_MCR_RTS | SR_MCR_OUT1 | SR_MCR_OUT2 | SR_MCR_LOOP); /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); + msr = READ_PORT_UCHAR(SER_MSR(BaseAddress)); /* * the upper nibble of the MSR (modem output bits) must be * equal to the lower nibble of the MCR (modem input bits) */ - if ((msr & 0xF0) == 0x00) + if ((msr & 0xF0) == 0xF0) { - /* set all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x1F); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0xF0) + /* + * setup a resonable state for the port: + * enable fifo and clear recieve/transmit buffers + */ + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), + (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); + WRITE_PORT_UCHAR(SER_FCR(BaseAddress), 0); + READ_PORT_UCHAR(SER_RBR(BaseAddress)); + WRITE_PORT_UCHAR(SER_IER(BaseAddress), 0); + found = TRUE; + } + } + + /* restore MCR */ + WRITE_PORT_UCHAR(SER_MCR(BaseAddress), mcr); + + return found; +} + + +/* FUNCTIONS ****************************************************************/ + +/* HAL.KdPortInitialize */ +BOOLEAN +NTAPI +KdPortInitialize( + IN PKD_PORT_INFORMATION PortInformation, + IN ULONG Unknown1, + IN ULONG Unknown2) +{ + SIZE_T i; + CHAR buffer[80]; + + if (!PortInitialized) + { + DefaultPort.BaudRate = PortInformation->BaudRate; + + if (PortInformation->ComPort == 0) + { + for (i = sizeof(BaseArray) / sizeof(BaseArray[0]) - 1; i > 0; i--) + { + if (KdpDoesComPortExist(BaseArray[i])) { - /* - * setup a resonable state for the port: - * enable fifo and clear recieve/transmit buffers - */ - WRITE_PORT_UCHAR (SER_FCR(BaseAddress), - (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); - WRITE_PORT_UCHAR (SER_FCR(BaseAddress), 0); - READ_PORT_UCHAR (SER_RBR(BaseAddress)); - WRITE_PORT_UCHAR (SER_IER(BaseAddress), 0); - found = TRUE; + DefaultPort.BaseAddress = BaseArray[i]; + DefaultPort.ComPort = i; + PortInformation->BaseAddress = DefaultPort.BaseAddress; + PortInformation->ComPort = DefaultPort.ComPort; + break; } + } + if (i == 0) + { + sprintf(buffer, + "\nKernel Debugger: No COM port found!\n\n"); + HalDisplayString(buffer); + return FALSE; + } } - /* restore MCR */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), mcr); - - return (found); -} - - -/* FUNCTIONS ****************************************************************/ - -/* HAL.KdPortInitialize */ -BOOLEAN -STDCALL -KdPortInitialize ( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 - ) -{ - ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - char buffer[80]; - ULONG divisor; - UCHAR lcr; - - if (PortInitialized == FALSE) - { - if (PortInformation->BaudRate != 0) - { - BaudRate = PortInformation->BaudRate; - } - else - { - BaudRate = DEFAULT_BAUD_RATE; - } - - if (PortInformation->ComPort == 0) - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[2])) - { - PortBase = (PUCHAR)BaseArray[2]; - ComPort = 2; - PortInformation->BaseAddress = (ULONG)PortBase; - PortInformation->ComPort = ComPort; + PortInitialized = TRUE; + } + + /* initialize port */ + if (!KdPortInitializeEx(&DefaultPort, Unknown1, Unknown2)) + return FALSE; + + /* set global info */ + *KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress; + + return TRUE; +} + + +/* HAL.KdPortInitializeEx */ +BOOLEAN +NTAPI +KdPortInitializeEx( + IN PKD_PORT_INFORMATION PortInformation, + IN ULONG Unknown1, + IN ULONG Unknown2) +{ + ULONG ComPortBase; + CHAR buffer[80]; + ULONG divisor; + UCHAR lcr; + + if (PortInformation->BaudRate == 0) + PortInformation->BaudRate = DEFAULT_BAUD_RATE; + + if (PortInformation->ComPort == 0) + return FALSE; + + if (!KdpDoesComPortExist(BaseArray[PortInformation->ComPort])) + { + sprintf(buffer, + "\nKernel Debugger: Serial port not found!\n\n"); + HalDisplayString(buffer); + return FALSE; + } + + ComPortBase = BaseArray[PortInformation->ComPort]; + PortInformation->BaseAddress = ComPortBase; #ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); + sprintf(buffer, + "\nSerial port COM%ld found at 0x%lx\n", + PortInformation->ComPort, + ComPortBase]; + HalDisplayString(buffer); #endif /* NDEBUG */ - } - else if (KdpDoesComPortExist ((PUCHAR)BaseArray[1])) - { - PortBase = (PUCHAR)BaseArray[1]; - ComPort = 1; - PortInformation->BaseAddress = (ULONG)PortBase; - PortInformation->ComPort = ComPort; + + /* set baud rate and data format (8N1) */ + + /* turn on DTR and RTS */ + WRITE_PORT_UCHAR(SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS); + + /* set DLAB */ + lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)) | SR_LCR_DLAB; + WRITE_PORT_UCHAR(SER_LCR(ComPortBase), lcr); + + /* set baud rate */ + divisor = 115200 / PortInformation->BaudRate; + WRITE_PORT_UCHAR(SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff)); + WRITE_PORT_UCHAR(SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff)); + + /* reset DLAB and set 8N1 format */ + WRITE_PORT_UCHAR(SER_LCR(ComPortBase), + SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); + + /* read junk out of the RBR */ + lcr = READ_PORT_UCHAR(SER_RBR(ComPortBase)); + #ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); + /* print message to blue screen */ + sprintf(buffer, + "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", + PortInformation->ComPort, + ComPortBase, + PortInformation->BaudRate); + + HalDisplayString(buffer); #endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: No COM port found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - else - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) - { - PortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; - ComPort = PortInformation->ComPort; - PortInformation->BaseAddress = (ULONG)PortBase; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: No serial port found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - - PortInitialized = TRUE; - } - - /* - * set baud rate and data format (8N1) - */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR (SER_MCR(PortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR (SER_LCR(PortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR (SER_LCR(PortBase), lcr); - - /* set baud rate */ - divisor = 115200 / BaudRate; - WRITE_PORT_UCHAR (SER_DLL(PortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR (SER_DLM(PortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR (SER_LCR(PortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR (SER_RBR(PortBase)); - - /* - * set global info - */ - *KdComPortInUse = PortBase; - - /* - * print message to blue screen - */ - sprintf (buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - ComPort, - (ULONG)PortBase, - BaudRate); - - HalDisplayString (buffer); - + + return TRUE; +} + + +/* HAL.KdPortGetByte */ +BOOLEAN +NTAPI +KdPortGetByte( + OUT PUCHAR ByteReceived) +{ + if (!PortInitialized) + return FALSE; + return KdPortGetByteEx(&DefaultPort, ByteReceived); +} + + +/* HAL.KdPortGetByteEx */ +BOOLEAN +NTAPI +KdPortGetByteEx( + IN PKD_PORT_INFORMATION PortInformation, + OUT PUCHAR ByteReceived) +{ + PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; + + if ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR)) + { + *ByteReceived = READ_PORT_UCHAR(SER_RBR(ComPortBase)); return TRUE; -} - - -/* HAL.KdPortInitializeEx */ -BOOLEAN -STDCALL -KdPortInitializeEx ( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 - ) -{ -#ifdef _M_IX86 - ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; -#elif defined(_M_PPC) - ULONG BaseArray[5] = {0, 0x800003f8}; -#endif - PUCHAR ComPortBase; - char buffer[80]; - ULONG divisor; - UCHAR lcr; - - if (PortInformation->BaudRate == 0) - { - PortInformation->BaudRate = DEFAULT_BAUD_RATE; - } - - if (PortInformation->ComPort == 0) - { - return FALSE; - } - else - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) - { - ComPortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; - PortInformation->BaseAddress = (ULONG)ComPortBase; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - PortInformation->ComPort, - (ULONG)ComPortBase]; - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: Serial port not found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - - /* - * set baud rate and data format (8N1) - */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR (SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR (SER_LCR(ComPortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR (SER_LCR(ComPortBase), lcr); - - /* set baud rate */ - divisor = 115200 / PortInformation->BaudRate; - WRITE_PORT_UCHAR (SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR (SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR (SER_LCR(ComPortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - -#ifndef NDEBUG - - /* - * print message to blue screen - */ - sprintf (buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - PortInformation->ComPort, - (ULONG)ComPortBase, - PortInformation->BaudRate); - - HalDisplayString (buffer); - -#endif /* NDEBUG */ - - return TRUE; -} - - -/* HAL.KdPortGetByte */ -BOOLEAN -STDCALL -KdPortGetByte ( - PUCHAR ByteRecieved - ) -{ - if (PortInitialized == FALSE) - return FALSE; - - if ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR)) - { - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); - return TRUE; - } - - return FALSE; -} - - -/* HAL.KdPortGetByteEx */ -BOOLEAN -STDCALL -KdPortGetByteEx ( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - if ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR)) - { - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - return TRUE; - } - - return FALSE; + } + + return FALSE; } /* HAL.KdPortPollByte */ BOOLEAN -STDCALL -KdPortPollByte ( - PUCHAR ByteRecieved - ) -{ - if (PortInitialized == FALSE) - return FALSE; - - while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR) == 0) - ; - - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); - - return TRUE; +NTAPI +KdPortPollByte( + OUT PUCHAR ByteReceived) +{ + if (!PortInitialized) + return FALSE; + return KdPortPollByteEx(&DefaultPort, ByteReceived); } /* HAL.KdPortPollByteEx */ BOOLEAN -STDCALL -KdPortPollByteEx ( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR) == 0) - ; - - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - - return TRUE; -} - - +NTAPI +KdPortPollByteEx( + IN PKD_PORT_INFORMATION PortInformation, + OUT PUCHAR ByteReceived) +{ + PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; + + while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DR) == 0) + ; + + *ByteReceived = READ_PORT_UCHAR(SER_RBR(ComPortBase)); + + return TRUE; +} /* HAL.KdPortPutByte */ VOID -STDCALL -KdPortPutByte ( - UCHAR ByteToSend - ) -{ - if (PortInitialized == FALSE) - return; - - while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR (SER_THR(PortBase), ByteToSend); +NTAPI +KdPortPutByte( + IN UCHAR ByteToSend) +{ + if (!PortInitialized) + return; + KdPortPutByteEx(&DefaultPort, ByteToSend); } /* HAL.KdPortPutByteEx */ VOID -STDCALL -KdPortPutByteEx ( - PKD_PORT_INFORMATION PortInformation, - UCHAR ByteToSend - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR (SER_THR(ComPortBase), ByteToSend); +NTAPI +KdPortPutByteEx( + IN PKD_PORT_INFORMATION PortInformation, + IN UCHAR ByteToSend) +{ + PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; + + while ((READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) + ; + + WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend); } /* HAL.KdPortRestore */ VOID -STDCALL -KdPortRestore ( - VOID - ) -{ +NTAPI +KdPortRestore(VOID) +{ + UNIMPLEMENTED; } /* HAL.KdPortSave */ VOID -STDCALL -KdPortSave ( - VOID - ) -{ +NTAPI +KdPortSave(VOID) +{ + UNIMPLEMENTED; } /* HAL.KdPortDisableInterrupts */ BOOLEAN -STDCALL -KdPortDisableInterrupts() -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR (SER_MCR (PortBase)); - ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); - WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); - - ch = READ_PORT_UCHAR (SER_IER (PortBase)); - ch &= (~SR_IER_ALL); - WRITE_PORT_UCHAR (SER_IER (PortBase), ch); - - return TRUE; +NTAPI +KdPortDisableInterrupts(VOID) +{ + UCHAR ch; + + if (!PortInitialized) + return FALSE; + + ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); + ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); + WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); + + ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); + ch &= (~SR_IER_ALL); + WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); + + return TRUE; } /* HAL.KdPortEnableInterrupts */ BOOLEAN -STDCALL -KdPortEnableInterrupts() -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR (SER_IER (PortBase)); - ch &= (~SR_IER_ALL); - ch |= SR_IER_ERDA; - WRITE_PORT_UCHAR (SER_IER (PortBase), ch); - - ch = READ_PORT_UCHAR (SER_MCR (PortBase)); - ch &= (~SR_MCR_LOOP); - ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); - WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); - - return TRUE; +NTAPI +KdPortEnableInterrupts(VOID) +{ + UCHAR ch; + + if (PortInitialized == FALSE) + return FALSE; + + ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); + ch &= (~SR_IER_ALL); + ch |= SR_IER_ERDA; + WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); + + ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); + ch &= (~SR_MCR_LOOP); + ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); + WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); + + return TRUE; } /* @@ -561,10 +463,11 @@ */ NTSTATUS NTAPI -KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; +KdDebuggerInitialize0( + IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -572,10 +475,11 @@ */ NTSTATUS NTAPI -KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) -{ - /* FIXME: TODO */ - return STATUS_UNSUCCESSFUL; +KdDebuggerInitialize1( + IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -583,7 +487,8 @@ */ NTSTATUS NTAPI -KdSave(IN BOOLEAN SleepTransition) +KdSave( + IN BOOLEAN SleepTransition) { /* Nothing to do on COM ports */ return STATUS_SUCCESS; @@ -594,7 +499,8 @@ */ NTSTATUS NTAPI -KdRestore(IN BOOLEAN SleepTransition) +KdRestore( + IN BOOLEAN SleepTransition) { /* Nothing to do on COM ports */ return STATUS_SUCCESS; @@ -605,27 +511,29 @@ */ VOID NTAPI -KdSendPacket(IN USHORT PacketType, - IN PSTRING Header, - IN PSTRING Data OPTIONAL, - OUT PKD_CONTEXT Context) -{ - /* FIXME: TODO */ +KdSendPacket( + IN ULONG PacketType, + IN PSTRING MessageHeader, + IN PSTRING MessageData, + IN OUT PKD_CONTEXT Context) +{ + UNIMPLEMENTED; return; } /* * @unimplemented */ -ULONG -NTAPI -KdReceivePacket(IN USHORT PacketType, - OUT PSTRING Header, - OUT PSTRING Data, - OUT PUSHORT DataSize, - OUT PKD_CONTEXT Context OPTIONAL) -{ - /* FIXME: TODO */ +KDSTATUS +NTAPI +KdReceivePacket( + IN ULONG PacketType, + OUT PSTRING MessageHeader, + OUT PSTRING MessageData, + OUT PULONG DataLength, + IN OUT PKD_CONTEXT Context) +{ + UNIMPLEMENTED; return 0; }

1 0

[peterw] 31038: - Update the readme a bit (Basic Usage section) and update the changelog.
by peterw＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: peterw Date: Thu Dec 6 11:16:57 2007 New Revision: 31038 URL: http://svn.reactos.org/svn/reactos?rev=31038&view=rev Log: - Update the readme a bit (Basic Usage section) and update the changelog. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Thu Dec 6 11:16:57 2007 @@ -11,14 +11,21 @@ - Add a pushd/popd to options.cmd so that options.exe pulls up a better default path for MinGW/GCC. (Peter Ward) - Set the working directory for the "Options" shortcut correctly (see above bullet). (Colin Fink) - Add back detection of previous versions of RosBE (versions 0.3.5b2 and before). (Peter Ward) +- Prevent multiple instances of the installer from running. (Peter Ward) - Fix the uninstall previous routine. (Peter Ward) +- Added a small utility (rquote) to remove any quotes from a string (needed for the spaces fix in chdefgcc.cmd). (Peter Ward) +- Fix a problem with spaces in chdefgcc.cmd. (Peter Ward) +- Make 'chdefgcc' bail if no MinGW/GCC is found in the given path. (Peter Ward) - Fix a bug in Clean.cmd. It accidently killed some not anymore Autogenerated Resources. (Daniel Reimer) +- Remove file deletions that are no longer needed from Clean.cmd so it now only removes + obj-i386\., output-i386\., reactos\. and makefile.auto. (Peter Ward) - Fix a bug in TimeDate.cmd. (Peter Ward) - Fix a bug in reladdr2line.cmd. (Peter Ward) - Change the default ReactOS source directory from APPDATA\RosBE\Source to PROFILE\reactos. (Peter Ward) - Remove the installation and APPDATA\RosBE directories on uninstall which weren't being removed. (Peter Ward) - Set the ccache directory to APPDATA\RosBE\.ccache instead of PROFILE\.ccache. (Peter Ward) - Switch default install directory back to PROGRAMFILES\RosBE. (Peter Ward) +- Detect if running on a x64 system and install to "Program Files" and not "Program Files (x86)" to avoid problems with (). (Peter Ward) - Add a "Standard MinGW Build Environment" and the associated MinGW.cmd + an icon. (Peter Ward) *** Nov 18th, 2007 - RosBE 1.0 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

1 0

[cwittich] 31037: really fix the bug now - count from CM_KCBS_PER_PAGE -1 to 0 instead of CM_KCBS_PER_PAGE -1 to 1
by cwittich＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: cwittich Date: Thu Dec 6 10:11:20 2007 New Revision: 31037 URL: http://svn.reactos.org/svn/reactos?rev=31037&view=rev Log: really fix the bug now - count from CM_KCBS_PER_PAGE -1 to 0 instead of CM_KCBS_PER_PAGE -1 to 1 Modified: trunk/reactos/ntoskrnl/config/cmalloc.c Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c Thu Dec 6 10:11:20 2007 @@ -88,12 +88,12 @@ if (++AllocPage->FreeCount == CM_KCBS_PER_PAGE) { /* Loop all the entries */ - for (i = CM_KCBS_PER_PAGE - 1; i; i--) + for (i = CM_KCBS_PER_PAGE; i; i--) { /* Get the KCB */ Kcb = (PVOID)((ULONG_PTR)AllocPage + FIELD_OFFSET(CM_ALLOC_PAGE, AllocPage) + - i * sizeof(CM_KEY_CONTROL_BLOCK)); + (i - 1) * sizeof(CM_KEY_CONTROL_BLOCK)); /* Remove the entry */ RemoveEntryList(&Kcb->FreeListEntry);

1 0

[peterw] 31036: - Prevent multiple instances of the installer from running.
by peterw＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: peterw Date: Thu Dec 6 08:54:22 2007 New Revision: 31036 URL: http://svn.reactos.org/svn/reactos?rev=31036&view=rev Log: - Prevent multiple instances of the installer from running. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Thu Dec 6 08:54:22 2007 @@ -42,6 +42,11 @@ ;; Read our custom page ini, remove previous version. ;; Function .onInit + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' + Pop $R0 + StrCmp $R0 0 +3 + MessageBox MB_OK|MB_ICONEXCLAMATION "The ${PRODUCT_NAME} v${PRODUCT_VERSION} installer is already running." + Abort ${If} ${RunningX64} StrCpy $INSTDIR "$PROGRAMFILES64\RosBE" ${Else}

1 0

[jimtabor] 31035: Restore to default behavior for now.
by jimtabor＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: jimtabor Date: Thu Dec 6 07:00:51 2007 New Revision: 31035 URL: http://svn.reactos.org/svn/reactos?rev=31035&view=rev Log: Restore to default behavior for now. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 6 07:00:51 2007 @@ -108,6 +108,7 @@ HDC STDCALL NtUserGetDC(HWND hWnd) { +#if 0 if (!hWnd) { // MSDN: //"hWnd [in] Handle to the window whose DC is to be retrieved. @@ -119,6 +120,9 @@ return NULL; } return NtUserGetDCEx(hWnd, NULL, DCX_USESTYLE); +#endif +// We have a problem here! + return NtUserGetDCEx(hWnd, NULL, NULL == hWnd ? DCX_CACHE | DCX_WINDOW : DCX_USESTYLE); } PDCE FASTCALL @@ -406,9 +410,9 @@ if (NULL == Window) { // Do the same as GetDC with a NULL. - Window = UserGetWindowObject(IntGetDesktopWindow()); - if (Window) Wnd = Window->Wnd; - else +// Window = UserGetWindowObject(IntGetDesktopWindow()); +// if (Window) Wnd = Window->Wnd; +// else Flags &= ~DCX_USESTYLE; } else @@ -729,7 +733,7 @@ } IntGdiDeleteDC(pdce->hDC, TRUE); - + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(pdce->hClipRgn);

1 0

[jimtabor] 31034: Sorry Fix bug.
by jimtabor＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: jimtabor Date: Thu Dec 6 05:20:37 2007 New Revision: 31034 URL: http://svn.reactos.org/svn/reactos?rev=31034&view=rev Log: Sorry Fix bug. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Dec 6 05:20:37 2007 @@ -932,9 +932,9 @@ { DPRINT1("No! You Naughty Application!\n"); // if(!UserReleaseDC(NULL, hDC, FALSE)) Ret = FALSE; - } - DC_UnlockDc( DCToDelete ); - return Ret; + DC_UnlockDc( DCToDelete ); + return Ret; + } } /* First delete all saved DCs */

1 0

[jimtabor] 31033: Fixed one more test, now from 23 to 22 fail. Reordered NtGdiDeleteObjectApp and created a separate function so that applications can not delete DCs belonging to DCEs. Add a check for Wnd = NULL for UserGetDCEx, this did not help the test results. Test Qemu Linux, Xp and hardware. Install and run AbiWord and FF as tests.
by jimtabor＠svn.reactos.org 06 Dec '07

06 Dec '07

Author: jimtabor Date: Thu Dec 6 05:09:56 2007 New Revision: 31033 URL: http://svn.reactos.org/svn/reactos?rev=31033&view=rev Log: Fixed one more test, now from 23 to 22 fail. Reordered NtGdiDeleteObjectApp and created a separate function so that applications can not delete DCs belonging to DCEs. Add a check for Wnd = NULL for UserGetDCEx, this did not help the test results. Test Qemu Linux, Xp and hardware. Install and run AbiWord and FF as tests. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Dec 6 05:09:56 2007 @@ -108,12 +108,14 @@ VOID FASTCALL DC_UnlockDisplay(HDC); VOID FASTCALL IntGdiCopyFromSaveState(PDC, PDC, HDC); VOID FASTCALL IntGdiCopyToSaveState(PDC, PDC); +BOOL FASTCALL IntGdiDeleteDC(HDC, BOOL); VOID FASTCALL DC_UpdateXforms(PDC dc); BOOL FASTCALL DC_InvertXform(const XFORM *xformSrc, XFORM *xformDest); BOOL FASTCALL DCU_SyncDcAttrtoUser(PDC); BOOL FASTCALL DCU_SynchDcAttrtoUser(HDC); +VOID FASTCALL DCU_SetDcUndeletable(HDC); VOID FASTCALL IntGetViewportExtEx(PDC dc, LPSIZE pt); VOID FASTCALL IntGetViewportOrgEx(PDC dc, LPPOINT pt); Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h Thu Dec 6 05:09:56 2007 @@ -40,6 +40,7 @@ #define DCX_DCEEMPTY 0x00000800 #define DCX_DCEBUSY 0x00001000 #define DCX_DCEDIRTY 0x00002000 +#define DCX_DCOWNED 0x00008000 #define DCX_USESTYLE 0x00010000 #define DCX_KEEPCLIPRGN 0x00040000 #define DCX_NOCLIPCHILDREN 0x00080000 Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Dec 6 05:09:56 2007 @@ -161,6 +161,8 @@ FirstDce = pDce; KeLeaveCriticalRegion(); + DCU_SetDcUndeletable(pDce->hDC); + if (Type == DCE_WINDOW_DC) //Window DCE have ownership. { // Process should already own it. pDce->pProcess = PsGetCurrentProcess(); @@ -403,8 +405,11 @@ PWINDOW Wnd = NULL; if (NULL == Window) - { - Flags &= ~DCX_USESTYLE; + { // Do the same as GetDC with a NULL. + Window = UserGetWindowObject(IntGetDesktopWindow()); + if (Window) Wnd = Window->Wnd; + else + Flags &= ~DCX_USESTYLE; } else Wnd = Window->Wnd; @@ -723,7 +728,8 @@ } } - NtGdiDeleteObjectApp(pdce->hDC); + IntGdiDeleteDC(pdce->hDC, TRUE); + if (pdce->hClipRgn && ! (pdce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(pdce->hClipRgn); Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Dec 6 05:09:56 2007 @@ -910,29 +910,32 @@ } +// +// +// BOOL -STDCALL -NtGdiDeleteObjectApp(HANDLE DCHandle) -{ - PDC DCToDelete; - - if (GDI_HANDLE_GET_TYPE(DCHandle) != GDI_OBJECT_TYPE_DC) - return NtGdiDeleteObject((HGDIOBJ) DCHandle); - - if(IsObjectDead((HGDIOBJ)DCHandle)) return TRUE; - - if (!GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, DCHandle)) +FASTCALL +IntGdiDeleteDC(HDC hDC, BOOL Force) +{ + BOOL Ret = FALSE; + PDC DCToDelete = DC_LockDc(hDC); + + if (DCToDelete == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - DCToDelete = DC_LockDc(DCHandle); - if (DCToDelete == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } + if(!Force) + { + if (DCToDelete->DC_Flags & DC_FLAG_PERMANENT) + { + DPRINT1("No! You Naughty Application!\n"); +// if(!UserReleaseDC(NULL, hDC, FALSE)) Ret = FALSE; + } + DC_UnlockDc( DCToDelete ); + return Ret; + } /* First delete all saved DCs */ while (DCToDelete->saveLevel) @@ -995,8 +998,29 @@ } DC_UnlockDc( DCToDelete ); - DC_FreeDC ( DCHandle ); + DC_FreeDC ( hDC ); return TRUE; +} + +BOOL +STDCALL +NtGdiDeleteObjectApp(HANDLE DCHandle) +{ + + if (GDI_HANDLE_IS_STOCKOBJ(DCHandle)) return TRUE; + + if (GDI_HANDLE_GET_TYPE(DCHandle) != GDI_OBJECT_TYPE_DC) + return NtGdiDeleteObject((HGDIOBJ) DCHandle); + + if(IsObjectDead((HGDIOBJ)DCHandle)) return TRUE; + + if (!GDIOBJ_OwnedByCurrentProcess(GdiHandleTable, DCHandle)) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + return IntGdiDeleteDC(DCHandle, FALSE); } INT Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Thu Dec 6 05:09:56 2007 @@ -257,3 +257,19 @@ NtGdiSelectBrush(hDC, hBrush); return oldColor; } + +VOID +FASTCALL +DCU_SetDcUndeletable(HDC hDC) +{ + PDC dc = DC_LockDc(hDC); + if (!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return; + } + + dc->DC_Flags |= DC_FLAG_PERMANENT; + DC_UnlockDc( dc ); + return; +}

1 0

[cfinck] 31032: - Changes by Martin Grogan (groganm AT gmail DOT com, IRC nick _Lazybones_): * Make the appearance and layout more like the MS version * Added functionality for resetting scores * Auto-complete the board, when the player is guaranteed to win - Changes by myself: * Add a new define WINEMINE_REGKEY to define the registry path of the WineMine settings only one time * Store the settings in HKCU instead of HKLM and use REG_DWORD, when it makes sense * Get WineMine to compile warning-f
by cfinck＠svn.reactos.org 05 Dec '07

05 Dec '07

Author: cfinck Date: Thu Dec 6 02:17:15 2007 New Revision: 31032 URL: http://svn.reactos.org/svn/reactos?rev=31032&view=rev Log: - Changes by Martin Grogan (groganm AT gmail DOT com, IRC nick _Lazybones_): * Make the appearance and layout more like the MS version * Added functionality for resetting scores * Auto-complete the board, when the player is guaranteed to win - Changes by myself: * Add a new define WINEMINE_REGKEY to define the registry path of the WineMine settings only one time * Store the settings in HKCU instead of HKLM and use REG_DWORD, when it makes sense * Get WineMine to compile warning-free under MSVC * Make the new "seconds" string translateable * Make all WineMine resource files consistent and ensure that all visual elements are visible See issue #2060 for more details. Modified: trunk/reactos/base/applications/games/winemine/dialog.c trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc trunk/reactos/base/applications/games/winemine/lang/de-DE.rc trunk/reactos/base/applications/games/winemine/lang/el-GR.rc trunk/reactos/base/applications/games/winemine/lang/en-US.rc trunk/reactos/base/applications/games/winemine/lang/es-ES.rc trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc trunk/reactos/base/applications/games/winemine/lang/id-ID.rc trunk/reactos/base/applications/games/winemine/lang/it-IT.rc trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc trunk/reactos/base/applications/games/winemine/lang/th-TH.rc trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc trunk/reactos/base/applications/games/winemine/main.c trunk/reactos/base/applications/games/winemine/main.h trunk/reactos/base/applications/games/winemine/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/games/winemine/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/games/winemine/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi…

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