Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20643: - Get beep and blue to compile/link on MSVC.

by ion＠svn.reactos.org

- 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;

18 years, 8 months

[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

- 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

18 years, 8 months

[ion] 20641: - Get bus drivers to compile and link on MSVC.

by ion＠svn.reactos.org

- 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>

18 years, 8 months

[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

- 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 ());

18 years, 8 months

[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

- 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:

18 years, 8 months

[turner] 20638: Didnt mean to commit this in the last one.

by turner＠svn.reactos.org

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);

18 years, 8 months

[ion] 20637: * Rbuild MSVC Backend changes:

by ion＠svn.reactos.org

* Rbuild MSVC Backend changes: - Don't do runtime checks for drivers - Don't do buffer checks for drivers - Use W0 for speed build, not for the release build. - Disable Wp64 only for the speed build, not for the release build - Use /STDCALL default calling convention for native modules because the DDK requires it - Remove some duplicated options that were passed on the command line - Replace some options that were passed on the commandline with their appropriate XML keywords. 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:14:38 UTC (rev 20636) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-07 01:15:26 UTC (rev 20637) @@ -96,9 +96,10 @@ ifs_list.push_back ( &module.project.non_if_data ); ifs_list.push_back ( &module.non_if_data ); - // this is a define in MinGW w32api, but not Microsoft's headers + // MinGW doesn't have a safe-string library yet defines.push_back ( "_CRT_SECURE_NO_DEPRECATE" ); defines.push_back ( "_CRT_NON_CONFORMING_SWPRINTFS" ); + // this is a define in MinGW w32api, but not Microsoft's headers defines.push_back ( "STDCALL=__stdcall" ); string baseaddr; @@ -309,9 +310,9 @@ fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tMinimalRebuild=\"%s\"\r\n", speed ? "FALSE" : "TRUE" ); - fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", debug ? "3" : "0" ); + fprintf ( OUT, "\t\t\t\tBasicRuntimeChecks=\"%s\"\r\n", sys ? 0 : (debug ? "3" : "0") ); fprintf ( OUT, "\t\t\t\tRuntimeLibrary=\"5\"\r\n" ); - fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); + fprintf ( OUT, "\t\t\t\tBufferSecurityCheck=\"%s\"\r\n", sys ? "FALSE" : (debug ? "TRUE" : "FALSE" )); fprintf ( OUT, "\t\t\t\tEnableFunctionLevelLinking=\"%s\"\r\n", debug ? "TRUE" : "FALSE" ); if ( module.pch != NULL ) @@ -336,8 +337,8 @@ fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE"); fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127;4214\"\r\n" ); - fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); - fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); + fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", speed ? "0" : "4" ); + 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\tDebugInformationFormat=\"%s\"/>\r\n", speed ? "0" : "4"); @@ -384,31 +385,39 @@ if ( sys ) { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /SUBSYSTEM:NATIVE /SECTION:INIT,D /NODEFAULTLIB /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /ALIGN:0x20 /SECTION:INIT,D /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); 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 ()); } else if ( exe ) { if ( module.type == Kernel ) - { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SECTION:INIT,D /ALIGN:0x80\"\r\n" ); + 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 ()); - } + } else if ( module.type == NativeCUI ) { - fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /NODEFAULTLIB /ALIGN:0x20\"\r\n" ); - fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + 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 ()); } else if ( module.type == Win32CUI || module.type == Win32GUI ) - { - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); - } + { + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + } } else if ( dll ) {

18 years, 8 months

[gedmurphy] 20636: pull service info out of the registry to populate the list view

by gedmurphy＠svn.reactos.org

pull service info out of the registry to populate the list view Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/resource.h _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-07 01:06:48 UTC (rev 20635) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-07 01:14:38 UTC (rev 20636) @@ -82,6 +82,9 @@ IDS_SERVICES_STATUS_STOPPED "Stopped" IDS_SERVICES_YES "Yes" IDS_SERVICES_UNKNOWN "Unknown" + IDS_SERVICES_AUTO "Automatic" + IDS_SERVICES_MAN "Manual" + IDS_SERVICES_DIS "Disabled" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-07 01:06:48 UTC (rev 20635) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-07 01:14:38 UTC (rev 20636) @@ -47,12 +47,31 @@ _stprintf(buf, szNumServices, NumServices); SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)buf); + for (Index = 0; Index < NumServices; Index++) { HKEY hKey = NULL; - TCHAR Description[5000]; - DWORD Size = 5000; + LPTSTR Description = NULL; + LONG ret; + LPTSTR LogOnAs = NULL; + DWORD StartUp = 0; + DWORD dwValueSize; + /* open the registry key for the service */ + _stprintf(buf, _T("System\\CurrentControlSet\\Services\\%s"), + pServiceStatus[Index].lpServiceName); + + if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + GetError(); + return FALSE; + } + + /* set the display name */ ZeroMemory(&item, sizeof(LV_ITEM)); @@ -60,35 +79,51 @@ //item.iImage = 0; item.pszText = pServiceStatus[Index].lpDisplayName; item.iItem = ListView_GetItemCount(hListView); - item.lParam = 0; + //item.lParam = 0; item.iItem = ListView_InsertItem(hListView, &item); /* set the description */ - - _stprintf(buf, _T("System\\CurrentControlSet\\Services\\%s"), - pServiceStatus[Index].lpServiceName); - - if( RegOpenKeyEx(HKEY_LOCAL_MACHINE, - buf, - 0, - KEY_READ, - &hKey) != ERROR_SUCCESS) + dwValueSize = 0; + ret = RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + NULL, + &dwValueSize); + if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND) { - GetError(); + RegCloseKey(hKey); return FALSE; } + + if (ret != ERROR_FILE_NOT_FOUND) + { + Description = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); + if (Description == NULL) + { + RegCloseKey(hKey); + return FALSE; + } + if(RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + (LPBYTE)Description, + &dwValueSize)) + { + HeapFree(GetProcessHeap(), 0, Description); + RegCloseKey(hKey); + return FALSE; + } - RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)Description, - &Size); + item.pszText = Description; + item.iSubItem = 1; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - item.pszText = Description; - item.iSubItem = 1; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + HeapFree(GetProcessHeap(), 0, Description); + } + /* set the status */ @@ -106,9 +141,88 @@ item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } - } - } + /* set the startup type */ + + dwValueSize = sizeof(DWORD); + if (RegQueryValueEx(hKey, + _T("Start"), + NULL, + NULL, + (LPBYTE)StartUp, + &dwValueSize)) + { + RegCloseKey(hKey); + return FALSE; + } + + if (StartUp == 0x02) + { + LoadString(hInstance, IDS_SERVICES_AUTO, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (StartUp == 0x03) + { + LoadString(hInstance, IDS_SERVICES_MAN, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + else if (StartUp == 0x04) + { + LoadString(hInstance, IDS_SERVICES_DIS, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } + + + + /* set Log On As */ + + dwValueSize = 0; + if (RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + NULL, + &dwValueSize)) + { + RegCloseKey(hKey); + return FALSE; + } + + LogOnAs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); + if (LogOnAs == NULL) + { + RegCloseKey(hKey); + return FALSE; + } + if(RegQueryValueEx(hKey, + _T("ObjectName"), + NULL, + NULL, + (LPBYTE)LogOnAs, + &dwValueSize)) + { + HeapFree(GetProcessHeap(), 0, LogOnAs); + RegCloseKey(hKey); + return FALSE; + } + + item.pszText = LogOnAs; + item.iSubItem = 4; + SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + + HeapFree(GetProcessHeap(), 0, LogOnAs); + + RegCloseKey(hKey); + + } + } + return TRUE; } _____ Modified: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-07 01:06:48 UTC (rev 20635) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-07 01:14:38 UTC (rev 20636) @@ -43,7 +43,10 @@ #define IDS_SERVICES_STATUS_STOPPED 5001 #define IDS_SERVICES_YES 5002 #define IDS_SERVICES_UNKNOWN 5003 -#define IDS_SERVICES_NUM_SERVICES 5004 +#define IDS_SERVICES_AUTO 5004 +#define IDS_SERVICES_MAN 5005 +#define IDS_SERVICES_DIS 5006 +#define IDS_SERVICES_NUM_SERVICES 5010 #define IDB_START 50 #define IDI_SM_ICON 51

18 years, 8 months

[turner] 20635: Remove NtGdiDeleteDC

by turner＠svn.reactos.org

Remove NtGdiDeleteDC Modified: trunk/reactos/include/win32k/ntgdibad.h Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/misc/gdientry.c Modified: trunk/reactos/subsys/system/usetup/bootsup.c Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c Modified: trunk/reactos/subsys/win32k/ntuser/metric.c Modified: trunk/reactos/subsys/win32k/ntuser/windc.c Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/objects/dc.c Modified: trunk/reactos/subsys/win32k/objects/dib.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntgdibad.h --- trunk/reactos/include/win32k/ntgdibad.h 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/include/win32k/ntgdibad.h 2006-01-07 01:06:48 UTC (rev 20635) @@ -348,9 +348,6 @@ int Count ); -/* Use NtGdiDeleteObjectApp. */ -BOOL STDCALL NtGdiDeleteDC(HDC hDC); - /* Meta are user-mode. */ BOOL STDCALL _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/lib/gdi32/gdi32.def 2006-01-07 01:06:48 UTC (rev 20635) @@ -91,7 +91,7 @@ CreateSolidBrush@4 DPtoLP@12=NtGdiDPtoLP@12 DeleteColorSpace@4 -DeleteDC@4=NtGdiDeleteDC@4 +DeleteDC@4=NtGdiDeleteObjectApp@4 DeleteEnhMetaFile@4 DeleteMetaFile@4 DeleteObject@4 _____ Modified: trunk/reactos/lib/gdi32/misc/gdientry.c --- trunk/reactos/lib/gdi32/misc/gdientry.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/lib/gdi32/misc/gdientry.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -83,7 +83,7 @@ if ((ULONG_PTR)newHdc != pDirectDrawGlobalInternal->hDD) { pDirectDrawGlobalInternal->hDD = (ULONG_PTR) NtGdiDdCreateDirectDrawObject(newHdc); - NtGdiDeleteDC(newHdc); + NtGdiDeleteObjectApp(newHdc); } /* pDirectDrawGlobal->hDD = pDirectDrawGlobalInternal->hDD; ? */ _____ Modified: trunk/reactos/subsys/system/usetup/bootsup.c --- trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/system/usetup/bootsup.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -245,7 +245,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT"); /* Create "DOS" section */ IniSection = IniCacheAppendSection(IniCache, @@ -356,7 +356,7 @@ NULL, INSERT_LAST, L"Options", - L"/DEBUGPORT=SCREEN /NOGUIBOOT"); + L"/DEBUGPORT=COM1 /NOGUIBOOT"); /* Save the ini file */ IniCacheSave(IniCache, IniPath); _____ Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c --- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -1312,7 +1312,7 @@ } if (NULL == BitmapStretched) { - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); DPRINT1("Failed to create temporary bitmap\n"); return; } @@ -1320,7 +1320,7 @@ if (NULL == OldBitmap) { NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); DPRINT1("Failed to create temporary bitmap\n"); return; } @@ -1334,7 +1334,7 @@ } NtGdiSelectObject(DcStretched, OldBitmap); NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteDC(DcStretched); + NtGdiDeleteObjectApp(DcStretched); } } #else @@ -1439,7 +1439,7 @@ hbmOff = NtGdiCreateCompatibleBitmap(hdc, cxWidth, cyHeight); if(!hbmOff) { - NtGdiDeleteDC(hdcOff); + NtGdiDeleteObjectApp(hdcOff); goto done; } hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); @@ -1511,10 +1511,10 @@ NtGdiSelectObject(hdcOff, hOldOffBmp); NtGdiSelectObject(hdcOff, hOldOffBrush); NtGdiDeleteObject(hbmOff); - NtGdiDeleteDC(hdcOff); + NtGdiDeleteObjectApp(hdcOff); } if(hdcMem) - NtGdiDeleteDC(hdcMem); + NtGdiDeleteObjectApp(hdcMem); done: ObDereferenceObject(WinSta); _____ Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c --- trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -1320,7 +1320,7 @@ 0); } NtGdiSelectObject(hWallpaperDC, hOldBitmap); - NtGdiDeleteDC(hWallpaperDC); + NtGdiDeleteObjectApp(hWallpaperDC); } } } _____ Modified: trunk/reactos/subsys/win32k/ntuser/metric.c --- trunk/reactos/subsys/win32k/ntuser/metric.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/metric.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -171,7 +171,7 @@ Height = ScreenDC->GDIInfo->ulVertRes; DC_UnlockDc(ScreenDC); } - NtGdiDeleteDC(ScreenDCHandle); + NtGdiDeleteObjectApp(ScreenDCHandle); } return SM_CXSCREEN == Index ? Width : Height; } _____ Modified: trunk/reactos/subsys/win32k/ntuser/windc.c --- trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/windc.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -647,7 +647,7 @@ DC_SetOwnership(dce->hDC, PsGetCurrentProcess()); } - NtGdiDeleteDC(dce->hDC); + NtGdiDeleteObjectApp(dce->hDC); if (dce->hClipRgn && ! (dce->DCXFlags & DCX_KEEPCLIPRGN)) { NtGdiDeleteObject(dce->hClipRgn); _____ Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c --- trunk/reactos/subsys/win32k/ntuser/winsta.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/ntuser/winsta.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -371,7 +371,7 @@ if (NULL != ScreenDeviceContext) { DC_SetOwnership(ScreenDeviceContext, PsGetCurrentProcess()); - NtGdiDeleteDC(ScreenDeviceContext); + NtGdiDeleteObjectApp(ScreenDeviceContext); ScreenDeviceContext = NULL; } IntHideDesktop(IntGetActiveDesktop()); _____ Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c --- trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -729,7 +729,7 @@ } NtGdiDeleteObject ( hBmpTmp ); } - NtGdiDeleteDC ( hDCTmp ); + NtGdiDeleteObjectApp ( hDCTmp ); } } @@ -941,9 +941,9 @@ NtGdiDeleteObject(hBitmap2); NtGdiDeleteObject(hBitmap3); - NtGdiDeleteDC(hDC1); - NtGdiDeleteDC(hDC2); - NtGdiDeleteDC(hDCMask); + NtGdiDeleteObjectApp(hDC1); + NtGdiDeleteObjectApp(hDC2); + NtGdiDeleteObjectApp(hDCMask); return TRUE; } _____ Modified: trunk/reactos/subsys/win32k/objects/dc.c --- trunk/reactos/subsys/win32k/objects/dc.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/dc.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -165,7 +165,7 @@ { if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -176,7 +176,7 @@ DC_UnlockDc(OrigDC); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -213,7 +213,7 @@ DC_FreeDC( hNewDC ); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } return NULL; } @@ -233,7 +233,7 @@ DC_UnlockDc(OrigDC); if (NULL != DisplayDC) { - NtGdiDeleteDC(DisplayDC); + NtGdiDeleteObjectApp(DisplayDC); } hVisRgn = NtGdiCreateRectRgn(0, 0, 1, 1); @@ -1060,7 +1060,7 @@ } BOOL STDCALL -NtGdiDeleteDC(HDC DCHandle) +NtGdiDeleteObjectApp(HANDLE DCHandle) { PDC DCToDelete; @@ -1092,7 +1092,7 @@ DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC)); DCToDelete->saveLevel--; DC_UnlockDc( savedDC ); - NtGdiDeleteDC (savedHDC); + NtGdiDeleteObjectApp (savedHDC); } /* Free GDI resources allocated to this DC */ @@ -1991,7 +1991,7 @@ { DC_UnlockDc( dcs ); } - NtGdiDeleteDC (hdcs); + NtGdiDeleteObjectApp (hdcs); } DC_UnlockDc( dc ); return success; @@ -2034,7 +2034,7 @@ */ if (!PATH_AssignGdiPath (&dcs->w.path, &dc->w.path)) { - NtGdiDeleteDC (hdcs); + NtGdiDeleteObjectApp (hdcs); return 0; } #endif _____ Modified: trunk/reactos/subsys/win32k/objects/dib.c --- trunk/reactos/subsys/win32k/objects/dib.c 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/subsys/win32k/objects/dib.c 2006-01-07 01:06:48 UTC (rev 20635) @@ -579,7 +579,7 @@ SrcWidth, SrcHeight, ROP, 0); NtGdiSelectObject(hdcMem, hOldBitmap); - NtGdiDeleteDC(hdcMem); + NtGdiDeleteObjectApp(hdcMem); NtGdiDeleteObject(hBitmap); return SrcHeight; @@ -799,7 +799,7 @@ } if (bDesktopDC) - NtGdiDeleteDC(hDC); + NtGdiDeleteObjectApp(hDC); return hbitmap; } _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-06 23:47:15 UTC (rev 20634) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-07 01:06:48 UTC (rev 20635) @@ -52,7 +52,7 @@ NtGdiCreateSolidBrush 2 NtGdiDPtoLP 3 NtGdiDeleteColorSpace 1 -NtGdiDeleteDC 1 +NtGdiDeleteObjectApp 1 NtGdiDeleteEnhMetaFile 1 NtGdiDeleteMetaFile 1 NtGdiDeleteObject 1

18 years, 8 months

[cwittich] 20634: disabled warning 4214

by cwittich＠svn.reactos.org

disabled warning 4214 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-06 23:13:23 UTC (rev 20633) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-06 23:47:15 UTC (rev 20634) @@ -335,7 +335,7 @@ } fprintf ( OUT, "\t\t\t\tEnablePREfast=\"%s\"\r\n", debug ? "TRUE" : "FALSE"); - fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDisableSpecificWarnings=\"4201;4127;4214\"\r\n" ); fprintf ( OUT, "\t\t\t\tWarningLevel=\"%s\"\r\n", release ? "0" : "4" ); fprintf ( OUT, "\t\t\t\tDetect64BitPortabilityProblems=\"%s\"\r\n", release ? "FALSE" : "TRUE"); if ( !module.cplusplus )

18 years, 8 months

← Newer
1
...
42
43
44
45
46
47
48
...
59
Older →

Jump to page:

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