Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[jimtabor] 31220: Use long for HandleIndex.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 14 21:02:22 2007 New Revision: 31220 URL: http://svn.reactos.org/svn/reactos?rev=31220&view=rev Log: Use long for HandleIndex. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Dec 14 21:02:22 2007 @@ -238,7 +238,7 @@ DPRINT1("reporting gdi handle abusers:\n"); /* step through GDI handle table and find out who our culprit is... */ - for ( i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT-1; i++ ) + for ( i = RESERVE_ENTRIES_COUNT; i < GDI_HANDLE_COUNT; i++ ) { for ( j = 0; j < n; j++ ) { @@ -776,7 +776,7 @@ GDIOBJ_LockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) #endif /* GDI_DEBUG */ { - USHORT HandleIndex; + ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, HandleProcessId, LockedProcessId, PrevProcId; PGDIOBJ Object = NULL; @@ -787,7 +787,7 @@ HandleUpper = GDI_HANDLE_GET_UPPER(hObj); /* Check that the handle index is valid. */ - if (HandleIndex >= GDI_HANDLE_COUNT-1) + if (HandleIndex >= GDI_HANDLE_COUNT) return NULL; Entry = &HandleTable->Entries[HandleIndex]; @@ -924,7 +924,7 @@ GDIOBJ_ShareLockObj (PGDI_HANDLE_TABLE HandleTable, HGDIOBJ hObj, DWORD ExpectedType) #endif /* GDI_DEBUG */ { - USHORT HandleIndex; + ULONG HandleIndex; PGDI_TABLE_ENTRY Entry; HANDLE ProcessId, HandleProcessId, LockedProcessId, PrevProcId; PGDIOBJ Object = NULL; @@ -935,7 +935,7 @@ HandleUpper = GDI_HANDLE_GET_UPPER(hObj); /* Check that the handle index is valid. */ - if (HandleIndex >= GDI_HANDLE_COUNT-1) + if (HandleIndex >= GDI_HANDLE_COUNT) return NULL; /* Check if we have the requested type */

16 years, 9 months

[jimtabor] 31219: Add more items for device capabilities.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Dec 14 20:35:31 2007 New Revision: 31219 URL: http://svn.reactos.org/svn/reactos?rev=31219&view=rev Log: Add more items for device capabilities. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Fri Dec 14 20:35:31 2007 @@ -177,6 +177,9 @@ ULONG ulDesktopHorzRes; ULONG ulDesktopVertRes; ULONG ulBltAlignment; + ULONG ulReserved[4]; + ULONG ulShadeBlend; + ULONG ulColorMgmtCaps; } DEVCAPS, *PDEVCAPS; /* Font Structures */

16 years, 9 months

[hpoussin] 31218: Add missing space

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 14 19:56:20 2007 New Revision: 31218 URL: http://svn.reactos.org/svn/reactos?rev=31218&view=rev Log: Add missing space Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Fri Dec 14 19:56:20 2007 @@ -110,22 +110,22 @@ DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); #if defined(__GNUC__) - #define ERR_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define ERR_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, ##args) - #define WARN_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define WARN_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, ##args) - #define TRACE_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define TRACE_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, ##args) - #define INFO_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define INFO_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, ##args) #elif defined(_MSC_VER) - #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, __VA_ARGS__) - #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, __VA_ARGS__) - #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, __VA_ARGS__) - #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) ", __FILE__, __LINE__), \ DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, __VA_ARGS__) #else #error Unknown compiler

16 years, 9 months

[fireball] 31217: - Add compile-time assert, since ReactOS opengl32 depends on the hardcoded value.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 14 19:00:53 2007 New Revision: 31217 URL: http://svn.reactos.org/svn/reactos?rev=31217&view=rev Log: - Add compile-time assert, since ReactOS opengl32 depends on the hardcoded value. Modified: trunk/reactos/dll/win32/opengl32/gl.c Modified: trunk/reactos/dll/win32/opengl32/gl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/gl.c?re… ============================================================================== --- trunk/reactos/dll/win32/opengl32/gl.c (original) +++ trunk/reactos/dll/win32/opengl32/gl.c Fri Dec 14 19:00:53 2007 @@ -24,6 +24,9 @@ #define WIN32_NO_STATUS #include <windows.h> #include "teb.h" + +#define C_ASSERT(e) extern char __C_ASSERT__[(e)?1:-1] +C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8); #include "opengl32.h"

16 years, 9 months

[hpoussin] 31216: Add ERR_, WARN_, TRACE_ and INFO_ macros which call DbgPrintEx

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 14 18:59:14 2007 New Revision: 31216 URL: http://svn.reactos.org/svn/reactos?rev=31216&view=rev Log: Add ERR_, WARN_, TRACE_ and INFO_ macros which call DbgPrintEx Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h (original) +++ trunk/reactos/include/reactos/debug.h Fri Dec 14 18:59:14 2007 @@ -21,14 +21,26 @@ #define CHECKED #endif -/* Define DbgPrint/RtlAssert unless the NDK is used */ +/* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ #if !defined(_RTLFUNCS_H) && (!defined(_NTDDK_) || !defined(__NTDDK_H)) /* Make sure we have basic types (some people include us *before* SDK... */ -#if defined(_NTDEF_) || (defined _WINDEF_) || (defined _WINDEF_H) +#if !defined(_NTDEF_) && !defined(_WINDEF_) && !defined(_WINDEF_H) +#error Please include SDK first. +#endif + ULONG __cdecl DbgPrint( + IN PCCH Format, + IN ... +); + +ULONG +__cdecl +DbgPrintEx( + IN ULONG ComponentId, + IN ULONG Level, IN PCCH Format, IN ... ); @@ -42,7 +54,6 @@ ULONG LineNumber, PCHAR Message ); -#endif #endif @@ -98,6 +109,28 @@ #define UNIMPLEMENTED \ DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); + #if defined(__GNUC__) + #define ERR_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, ##args) + #define WARN_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, ##args) + #define TRACE_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, ##args) + #define INFO_(ch, args...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, ##args) + #elif defined(_MSC_VER) + #define ERR_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, __VA_ARGS__) + #define WARN_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, __VA_ARGS__) + #define TRACE_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, __VA_ARGS__) + #define INFO_(ch, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d)", __FILE__, __LINE__), \ + DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, __VA_ARGS__) + #else + #error Unknown compiler + #endif + #else /* On non-debug builds, we never show these */ @@ -107,6 +140,11 @@ #define CHECKPOINT1 #define CHECKPOINT #define UNIMPLEMENTED + + #define ERR_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define WARN_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define TRACE_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) + #define INFO_(ch, ...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #endif /*

16 years, 9 months

[hpoussin] 31215: Stop abusing <debug.h> by including SDK first

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 14 18:37:21 2007 New Revision: 31215 URL: http://svn.reactos.org/svn/reactos?rev=31215&view=rev Log: Stop abusing <debug.h> by including SDK first Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/dll/cpl/desk/classinst.c trunk/reactos/drivers/filesystems/vfat/vfat.h trunk/reactos/drivers/storage/floppy/csqrtns.c trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/hardware.c trunk/reactos/drivers/storage/floppy/ioctl.c trunk/reactos/drivers/storage/floppy/readwrite.c trunk/reactos/drivers/storage/ide/pciide/pciide.c trunk/reactos/drivers/storage/ide/pciidex/fdo.c trunk/reactos/drivers/storage/ide/pciidex/miniport.c trunk/reactos/drivers/storage/ide/pciidex/misc.c trunk/reactos/drivers/storage/ide/pciidex/pciidex.c trunk/reactos/drivers/storage/ide/pciidex/pdo.c trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c (original) +++ trunk/reactos/base/system/autochk/autochk.c Fri Dec 14 18:37:21 2007 @@ -9,15 +9,15 @@ /* INCLUDES *****************************************************************/ -//#define NDEBUG -#include <debug.h> - #include <stdio.h> #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <fmifs/fmifs.h> + +//#define NDEBUG +#include <debug.h> /* DEFINES ******************************************************************/ Modified: trunk/reactos/dll/cpl/desk/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/classinst.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/classinst.c (original) +++ trunk/reactos/dll/cpl/desk/classinst.c Fri Dec 14 18:37:21 2007 @@ -7,10 +7,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#include "desk.h" + //#define NDEBUG #include <debug.h> - -#include "desk.h" DWORD WINAPI DisplayClassInstaller( Modified: trunk/reactos/drivers/filesystems/vfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/vfat.h (original) +++ trunk/reactos/drivers/filesystems/vfat/vfat.h Fri Dec 14 18:37:21 2007 @@ -1,7 +1,7 @@ -#include <debug.h> #include <ntifs.h> #include <ntdddisk.h> #include <reactos/helper.h> +#include <debug.h> #ifdef __GNUC__ #include <ccros.h> Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.c (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c Fri Dec 14 18:37:21 2007 @@ -38,9 +38,9 @@ * that my lock choice is a spin lock. */ +#include <ntddk.h> #define NDEBUG #include <debug.h> -#include <ntddk.h> #include "floppy.h" #include "csqrtns.h" Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c Fri Dec 14 18:37:21 2007 @@ -40,9 +40,9 @@ * TODO: Media detection based on sector 1 */ +#include <ntddk.h> #define NDEBUG #include <debug.h> -#include <ntddk.h> #include "floppy.h" #include "hardware.h" Modified: trunk/reactos/drivers/storage/floppy/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har… ============================================================================== --- trunk/reactos/drivers/storage/floppy/hardware.c (original) +++ trunk/reactos/drivers/storage/floppy/hardware.c Fri Dec 14 18:37:21 2007 @@ -48,9 +48,9 @@ * TODO: Figure out the right delays in Send_Byte and Get_Byte */ +#include <ntddk.h> #define NDEBUG #include <debug.h> -#include <ntddk.h> #include "floppy.h" #include "hardware.h" Modified: trunk/reactos/drivers/storage/floppy/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.c (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.c Fri Dec 14 18:37:21 2007 @@ -31,9 +31,9 @@ * TODO: Implement format */ +#include <ntddk.h> #define NDEBUG #include <debug.h> -#include <ntddk.h> #include "floppy.h" #include "hardware.h" Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c Fri Dec 14 18:37:21 2007 @@ -52,9 +52,9 @@ * TODO: Figure out specify timings */ +#include <ntddk.h> #define NDEBUG #include <debug.h> -#include <ntddk.h> #include "floppy.h" #include "csqrtns.h" Modified: trunk/reactos/drivers/storage/ide/pciide/pciide.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciide/pciide.c (original) +++ trunk/reactos/drivers/storage/ide/pciide/pciide.c Fri Dec 14 18:37:21 2007 @@ -6,10 +6,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#include "pciide.h" + #define NDEBUG #include <debug.h> - -#include "pciide.h" IDE_CHANNEL_STATE NTAPI PciIdeChannelEnabled( Modified: trunk/reactos/drivers/storage/ide/pciidex/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/fdo.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/fdo.c Fri Dec 14 18:37:21 2007 @@ -6,10 +6,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#include "pciidex.h" + #define NDEBUG #include <debug.h> - -#include "pciidex.h" static NTSTATUS GetBusInterface( Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/miniport.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c Fri Dec 14 18:37:21 2007 @@ -6,11 +6,11 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#define INITGUID +#include "pciidex.h" + #define NDEBUG #include <debug.h> - -#define INITGUID -#include "pciidex.h" static DRIVER_DISPATCH PciIdeXForwardOrIgnore; static NTSTATUS NTAPI Modified: trunk/reactos/drivers/storage/ide/pciidex/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/misc.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/misc.c Fri Dec 14 18:37:21 2007 @@ -6,10 +6,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#include "pciidex.h" + #define NDEBUG #include <debug.h> - -#include "pciidex.h" NTSTATUS NTAPI PciIdeXGenericCompletion( Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pciidex.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.c Fri Dec 14 18:37:21 2007 @@ -6,10 +6,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#include "pciidex.h" + #define NDEBUG #include <debug.h> - -#include "pciidex.h" NTSTATUS NTAPI DriverEntry( Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c Fri Dec 14 18:37:21 2007 @@ -6,10 +6,10 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ +#include "pciidex.h" + #define NDEBUG #include <debug.h> - -#include "pciidex.h" static NTSTATUS PciIdeXPdoQueryId( Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp (original) +++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/adapter.cpp Fri Dec 14 18:37:21 2007 @@ -15,8 +15,8 @@ #define PUT_GUIDS_HERE #define INITGUID +#include <ntddk.h> #include <debug.h> -#include <ntddk.h> #include <portcls.h>

16 years, 9 months

[mpiulachs] 31214: usetup Spanish localization by gabriel <gabrielilardi at hotmail dot it> - slight changes to make it use a more neutral and MS-like terminology See issue #2890 for more details.

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Fri Dec 14 17:56:32 2007 New Revision: 31214 URL: http://svn.reactos.org/svn/reactos?rev=31214&view=rev Log: usetup Spanish localization by gabriel <gabrielilardi at hotmail dot it> - slight changes to make it use a more neutral and MS-like terminology See issue #2890 for more details. Added: trunk/reactos/base/setup/usetup/lang/es-ES.h (with props) Modified: trunk/reactos/base/setup/usetup/mui.c Added: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h (added) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h Fri Dec 14 17:56:32 2007 @@ -1,0 +1,733 @@ +#ifndef LANG_ES_ES_H__ +#define LANG_ES_ES_H__ + +static MUI_ENTRY esESWelcomePageEntries[] = +{ + { + 6, + 8, + "Bienvenido a la instalación de ReactOS", + TEXT_HIGHLIGHT + }, + { + 6, + 11, + "Esta parte de la instalación copia ReactOS en su equipo y", + TEXT_NORMAL + }, + { + 6, + 12, + "prepara la segunda parte de la instalación.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Presione ENTER para instalar ReactOS.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Presione R para reparar ReactOS.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Presione L para ver las condiciones y términos de licencia", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Presione F3 para salir sin instalar ReactOS.", + TEXT_NORMAL + }, + { + 6, + 23, + "Para más información sobre ReactOS, visite por favor:", + TEXT_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_HIGHLIGHT + }, + { + 0, + 0, + " ENTER = Continuar R = Reparar F3 = Salir", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESIntroPageEntries[] = +{ + { + 4, + 3, + " Instalación de ReactOS " KERNEL_VERSION_STR, + TEXT_UNDERLINE + }, + { + 6, + 8, + "El instalador de ReactOS se encuentra en una etapa preliminar.", + TEXT_NORMAL + }, + { + 6, + 9, + "Aún no posee todas las funciones de un instalador.", + TEXT_NORMAL + }, + { + 6, + 12, + "Se presentan las siguientes limitaciones:", + TEXT_NORMAL + }, + { + 8, + 13, + "- El instalador no soporta más de una partición primaria por disco.", + TEXT_NORMAL + }, + { + 8, + 14, + "- El instalador no puede eliminar una partición primaria de un disco", + TEXT_NORMAL + }, + { + 8, + 15, + " si hay particiones extendidas en el mismo.", + TEXT_NORMAL + }, + { + 8, + 16, + "- El instalador no puede eliminar la primer partición extendida", + TEXT_NORMAL + }, + { + 8, + 17, + " si existen otras particiones extendidas en el disco.", + TEXT_NORMAL + }, + { + 8, + 18, + "- El instalador soporta solamente el sistema de archivos FAT.", + TEXT_NORMAL + }, + { + 8, + 19, + "- El comprobador de integridad del sistema de archivos no está aún implementado.", + TEXT_NORMAL + }, + { + 8, + 23, + "\x07 Presione ENTER para instalar ReactOS.", + TEXT_NORMAL + }, + { + 8, + 25, + "\x07 Presione F3 para salir sin instalar ReactOS.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuar F3 = Salir", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESLicensePageEntries[] = +{ + { + 6, + 6, + "Licencia:", + TEXT_HIGHLIGHT + }, + { + 8, + 8, + "ReactOS obedece los terminos de la licencia", + TEXT_NORMAL + }, + { + 8, + 9, + "GNU GPL con partes que contienen código de otras", + TEXT_NORMAL + }, + { + 8, + 10, + "licencias compatibles como la X11 o BSD y la GNU LGPL.", + TEXT_NORMAL + }, + { + 8, + 11, + "Todo el software que forma parte del sistema ReactOS está", + TEXT_NORMAL + }, + { + 8, + 12, + "por tanto liberado bajo licencia GNU GPL así como manteniendo", + TEXT_NORMAL + }, + { + 8, + 13, + "la licencia original.", + TEXT_NORMAL + }, + { + 8, + 15, + "Este software viene SIN GARANTIA o restricciones de uso", + TEXT_NORMAL + }, + { + 8, + 16, + "excepto leyes locales o internacionales aplicables. La licencia", + TEXT_NORMAL + }, + { + 8, + 17, + "de ReactOS cubre solo la distribución a terceras partes.", + TEXT_NORMAL + }, + { + 8, + 18, + "Si por algún motivo no recibió una copia de la", + TEXT_NORMAL + }, + { + 8, + 19, + "GNU General Public License con ReactOS por favor visite", + TEXT_NORMAL + }, + { + 8, + 20, + "http://www.gnu.org/licenses/licenses.html", + TEXT_HIGHLIGHT + }, + { + 8, + 22, + "Garantía:", + TEXT_HIGHLIGHT + }, + { + 8, + 24, + "Este es software libre; vea el código para las condiciones de copia.", + TEXT_NORMAL + }, + { + 8, + 25, + "NO existe garantía; ni siquiera para MERCANTIBILIDAD", + TEXT_NORMAL + }, + { + 8, + 26, + "o el cumplimiento de algún propósito particular", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Regresar", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESDevicePageEntries[] = +{ + { + 6, + 8, + "La lista inferior muestra la configuración del dispositivo actual.", + TEXT_NORMAL + }, + { + 8, + 11, + " Equipo:", + TEXT_NORMAL + }, + { + 8, + 12, + " Pantalla:", + TEXT_NORMAL, + }, + { + 8, + 13, + " Teclado:", + TEXT_NORMAL + }, + { + 8, + 14, + " Disp. Teclado:", + TEXT_NORMAL + }, + { + 8, + 16, + " Aceptar:", + TEXT_NORMAL + }, + { + 25, + 16, "Aceptar la configuración de los dispositivos", + TEXT_NORMAL + }, + { + 6, + 19, + "Puede modificar la configuración con las teclas ARRIBA y ABAJO", + TEXT_NORMAL + }, + { + 6, + 20, + "para elegir. Luego presione ENTER para cambiar a una configuración", + TEXT_NORMAL + }, + { + 6, + 21, + "alternativa.", + TEXT_NORMAL + }, + { + 6, + 23, + "Cuando la configuración sea correcta, elija \"Aceptar la configuración", + TEXT_NORMAL + }, + { + 6, + 24, + "de los dispostivos\" y presione ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuar F3 = Salir", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESRepairPageEntries[] = +{ + { + 6, + 8, + "El instalador de ReactOS se encuentra en una etapa preliminar.", + TEXT_NORMAL + }, + { + 6, + 9, + "Aún no posee todas las funciones de un instalador.", + TEXT_NORMAL + }, + { + 6, + 12, + "Las funciones de reparación no han sido aún implementadas.", + TEXT_NORMAL + }, + { + 8, + 15, + "\x07 Presione U para actualizar el SO.", + TEXT_NORMAL + }, + { + 8, + 17, + "\x07 Presione R para la consola de recuperación.", + TEXT_NORMAL + }, + { + 8, + 19, + "\x07 Presione ESC para volver al menú principal.", + TEXT_NORMAL + }, + { + 8, + 21, + "\x07 Presione ENTER para reiniciar su computadora.", + TEXT_NORMAL + }, + { + 0, + 0, + "ESC = Menú inicial ENTER = Reiniciar", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; +static MUI_ENTRY esESComputerPageEntries[] = +{ + { + 6, + 8, + "Desea modificar el tipo de equipo a instalar.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Presione las teclas ARRIBA y ABAJO para elegir el tipo.", + TEXT_NORMAL + }, + { + 8, + 11, + "Luego presione ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Presione ESC para volver a la página anterior sin cambiar", + TEXT_NORMAL + }, + { + 8, + 14, + "el tipo de equipo.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuar ESC = Cancelar F3 = Salir", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESFlushPageEntries[] = +{ + { + 10, + 6, + "El sistema se está asegurando que todos los datos sean salvados", + TEXT_NORMAL + }, + { + 10, + 8, + "Esto puede tardar un minuto", + TEXT_NORMAL + }, + { + 10, + 9, + "Cuando haya terminado, su equipo se reiniciará automáticamente", + TEXT_NORMAL + }, + { + 0, + 0, + "Vaciando el cache", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESQuitPageEntries[] = +{ + { + 10, + 6, + "ReactOS no ha sido instalado completamente", + TEXT_NORMAL + }, + { + 10, + 8, + "Quite el diskette de la unidad A: y", + TEXT_NORMAL + }, + { + 10, + 9, + "todos los CD-ROMs de la unidades.", + TEXT_NORMAL + }, + { + 10, + 11, + "Presione ENTER para reiniciar su equipo.", + TEXT_NORMAL + }, + { + 0, + 0, + " Espere por favor ...", + TEXT_STATUS, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESDisplayPageEntries[] = +{ + { + 6, + 8, + "Desea modificar el tipo de pantalla a instalar.", + TEXT_NORMAL + }, + { 8, + 10, + "\x07 Presione las teclas ARRIBA y ABAJO para modificar el tipo.", + TEXT_NORMAL + }, + { + 8, + 11, + " Luego presione ENTER.", + TEXT_NORMAL + }, + { + 8, + 13, + "\x07 Presione la tecla ESC para volver a la página anterior sin", + TEXT_NORMAL + }, + { + 8, + 14, + " modificar el tipo de pantalla.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Continuar ESC = Cancelar F3 = Salir", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESSuccessPageEntries[] = +{ + { + 10, + 6, + "Los componentes básicos de ReactOS han sido instalados correctamente.", + TEXT_NORMAL + }, + { + 10, + 8, + "Retire el disco de la unidad A: y", + TEXT_NORMAL + }, + { + 10, + 9, + "todos los CD-ROMs de las unidades.", + TEXT_NORMAL + }, + { + 10, + 11, + "Presione ENTER para reiniciar su equipo.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Reiniciar su equipo", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY esESBootPageEntries[] = +{ + { + 6, + 8, + "El instalador no pudo instalar el bootloader en el disco", + TEXT_NORMAL + }, + { + 6, + 9, + "de su equipo", + TEXT_NORMAL + }, + { + 6, + 13, + "Por favor inserte un disco formateado en la unidad A: y", + TEXT_NORMAL + }, + { + 6, + 14, + "presione ENTER.", + TEXT_NORMAL, + }, + { + 0, + 0, + " ENTER = Continuar F3 = Salir", + TEXT_STATUS + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +MUI_PAGE esESPages[] = +{ + { + LANGUAGE_PAGE, + LanguagePageEntries + }, + { + START_PAGE, + esESWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + esESIntroPageEntries + }, + { + LICENSE_PAGE, + esESLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + esESDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + esESRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + esESComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + esESDisplayPageEntries + }, + { + FLUSH_PAGE, + esESFlushPageEntries + }, + { + QUIT_PAGE, + esESQuitPageEntries + }, + { + SUCCESS_PAGE, + esESSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + esESBootPageEntries + }, + { + -1, + NULL + } +}; + +#endif + Propchange: trunk/reactos/base/setup/usetup/lang/es-ES.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/setup/usetup/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.c?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.c (original) +++ trunk/reactos/base/setup/usetup/mui.c Fri Dec 14 17:56:32 2007 @@ -3,6 +3,7 @@ #include "lang/en-US.h" #include "lang/de-DE.h" +#include "lang/es-ES.h" static MUI_LANGUAGE LanguageList[] = { @@ -13,6 +14,10 @@ { "German", deDEPages + }, + { + "Spanish", + esESPages }, { NULL,

16 years, 9 months

[fireball] 31213: - Add debugging macros support to CmLib (to use, set the CmlibTraceLevel debugging mask in cminit.c). - Add tracing to hivecell.c.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 14 16:02:39 2007 New Revision: 31213 URL: http://svn.reactos.org/svn/reactos?rev=31213&view=rev Log: - Add debugging macros support to CmLib (to use, set the CmlibTraceLevel debugging mask in cminit.c). - Add tracing to hivecell.c. Modified: trunk/reactos/lib/cmlib/cminit.c trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hivewrt.c trunk/reactos/tools/mkhive/rtl.c Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=312… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c (original) +++ trunk/reactos/lib/cmlib/cminit.c Fri Dec 14 16:02:39 2007 @@ -6,6 +6,8 @@ */ #include "cmlib.h" + +ULONG CmlibTraceLevel = 0; BOOLEAN CMAPI CmCreateRootNode( Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=3121… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h (original) +++ trunk/reactos/lib/cmlib/cmlib.h Fri Dec 14 16:02:39 2007 @@ -23,6 +23,30 @@ #define STATUS_NOT_REGISTRY_FILE ((NTSTATUS)0xC000015C) #define STATUS_REGISTRY_RECOVERED ((NTSTATUS)0x40000009) +#endif + +// +// Debug support switch +// +#define _CMLIB_DEBUG_ 1 + +// +// These define the Debug Masks Supported +// +#define CMLIB_HCELL_DEBUG 0x01 + +// +// Debug/Tracing support +// +#if _CMLIB_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define CMLTRACE DbgPrintEx +#else +#define CMLTRACE(x, ...) \ + if (x & CmlibTraceLevel) DbgPrint(__VA_ARGS__) +#endif +#else +#define CMLTRACE(x, ...) DPRINT(__VA_ARGS__) #endif #ifndef _TYPEDEFS_HOST_H @@ -158,6 +182,7 @@ #endif +extern ULONG CmlibTraceLevel; /* * Public functions. Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=3… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c (original) +++ trunk/reactos/lib/cmlib/hivecell.c Fri Dec 14 16:02:39 2007 @@ -15,6 +15,9 @@ HCELL_INDEX CellIndex) { PVOID Block; + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + __FUNCTION__, RegistryHive, CellIndex); ASSERT(CellIndex != HCELL_NIL); if (!RegistryHive->Flat) @@ -105,6 +108,9 @@ ULONG CellLastBlock; ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, HoldingLock %b\n", + __FUNCTION__, RegistryHive, CellIndex, HoldingLock); if ((CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT != Stable) return FALSE; @@ -321,6 +327,9 @@ ASSERT(RegistryHive->ReadOnly == FALSE); + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, Size %x, %s, Vicinity %08lx\n", + __FUNCTION__, RegistryHive, Size, (Storage == 0) ? "Stable" : "Volatile", Vicinity); + /* Round to 16 bytes multiple. */ Size = ROUND_UP(Size + sizeof(HCELL), 16); @@ -356,6 +365,9 @@ FreeCell->Size = -FreeCell->Size; RtlZeroMemory(FreeCell + 1, Size - sizeof(HCELL)); + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - CellIndex %08lx\n", + __FUNCTION__, FreeCellOffset); + return FreeCellOffset; } @@ -372,6 +384,9 @@ HSTORAGE_TYPE Storage; ASSERT(CellIndex != HCELL_NIL); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx, Size %x\n", + __FUNCTION__, RegistryHive, CellIndex, Size); Storage = (CellIndex & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT; @@ -415,6 +430,9 @@ ULONG CellBlock; ASSERT(RegistryHive->ReadOnly == FALSE); + + CMLTRACE(CMLIB_HCELL_DEBUG, "%s - Hive %p, CellIndex %08lx\n", + __FUNCTION__, RegistryHive, CellIndex); Free = HvpGetCellHeader(RegistryHive, CellIndex); Modified: trunk/reactos/lib/cmlib/hivewrt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=31… ============================================================================== --- trunk/reactos/lib/cmlib/hivewrt.c (original) +++ trunk/reactos/lib/cmlib/hivewrt.c Fri Dec 14 16:02:39 2007 @@ -163,7 +163,7 @@ RegistryHive->BaseBlock->Type = HFILE_TYPE_PRIMARY; RegistryHive->BaseBlock->Sequence1++; RegistryHive->BaseBlock->CheckSum = - HvpHiveHeaderChecksum(RegistryHive->BaseBlock); + HvpHiveHeaderChecksum(RegistryHive->BaseBlock); /* Write hive block */ FileOffset = 0; Modified: trunk/reactos/tools/mkhive/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/rtl.c?rev=312… ============================================================================== --- trunk/reactos/tools/mkhive/rtl.c (original) +++ trunk/reactos/tools/mkhive/rtl.c Fri Dec 14 16:02:39 2007 @@ -5,6 +5,7 @@ */ #include <stdlib.h> +#include <stdarg.h> #include "mkhive.h" #include <bitmap.c> @@ -157,3 +158,14 @@ free(p); } +ULONG +__cdecl +DbgPrint( + IN CHAR *Format, + IN ...) +{ + va_list ap; + va_start(ap, Format); + vprintf(Format, ap); + va_end(ap); +}

16 years, 9 months

[janderwald] 31212: - add resources for folder options cpl

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Dec 14 15:25:15 2007 New Revision: 31212 URL: http://svn.reactos.org/svn/reactos?rev=31212&view=rev Log: - add resources for folder options cpl Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/eo-EO.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/lang/nb-NO.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/wa-WA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… Modified: trunk/reactos/dll/win32/shell32/lang/eo-EO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/eo-… Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… Modified: trunk/reactos/dll/win32/shell32/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nb-… Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… Modified: trunk/reactos/dll/win32/shell32/lang/wa-WA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/wa-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-…

16 years, 9 months

[hpoussin] 31211: Add back support for function pointers override in HalDispatchTable structure Fixes detection of Xbox disk partitioning

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 14 14:32:18 2007 New Revision: 31211 URL: http://svn.reactos.org/svn/reactos?rev=31211&view=rev Log: Add back support for function pointers override in HalDispatchTable structure Fixes detection of Xbox disk partitioning Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/fstub/halstub.c trunk/reactos/ntoskrnl/include/internal/hal.h Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Fri Dec 14 14:32:18 2007 @@ -395,7 +395,8 @@ return(Status); } -VOID FASTCALL +VOID +FASTCALL xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN PSTRING NtDeviceName, OUT PUCHAR NtSystemPath, @@ -1205,17 +1206,12 @@ return; } -/* PUBLIC FUNCTIONS **********************************************************/ - -/* - * @implemented - */ VOID FASTCALL -HalExamineMBR(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG MbrTypeIdentifier, - OUT PVOID *MbrBuffer) +xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MbrTypeIdentifier, + OUT PVOID *MbrBuffer) { LARGE_INTEGER Offset; PUCHAR Buffer; @@ -1316,15 +1312,12 @@ } } -/* - * @implemented - */ NTSTATUS FASTCALL -IoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN BOOLEAN ReturnRecognizedPartitions, - IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) +xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) { KEVENT Event; IO_STATUS_BLOCK IoStatusBlock; @@ -1746,15 +1739,12 @@ return Status; } -/* - * @implemented - */ NTSTATUS FASTCALL -IoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG PartitionNumber, - IN ULONG PartitionType) +xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType) { PIRP Irp; KEVENT Event; @@ -1937,16 +1927,13 @@ return Status; } -/* - * @implemented - */ NTSTATUS FASTCALL -IoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, - IN ULONG SectorSize, - IN ULONG SectorsPerTrack, - IN ULONG NumberOfHeads, - IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) +xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) { KEVENT Event; IO_STATUS_BLOCK IoStatusBlock; @@ -2229,6 +2216,74 @@ return Status; } +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +FASTCALL +HalExamineMBR(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MbrTypeIdentifier, + OUT PVOID *MbrBuffer) +{ + HalDispatchTable.HalExamineMBR(DeviceObject, + SectorSize, + MbrTypeIdentifier, + MbrBuffer); +} + +/* + * @implemented + */ +NTSTATUS +FASTCALL +IoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer) +{ + return HalIoReadPartitionTable(DeviceObject, + SectorSize, + ReturnRecognizedPartitions, + PartitionBuffer); +} + +/* + * @implemented + */ +NTSTATUS +FASTCALL +IoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType) +{ + return HalIoSetPartitionInformation(DeviceObject, + SectorSize, + PartitionNumber, + PartitionType); +} + +/* + * @implemented + */ +NTSTATUS +FASTCALL +IoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer) +{ + return HalIoWritePartitionTable(DeviceObject, + SectorSize, + SectorsPerTrack, + NumberOfHeads, + PartitionBuffer); +} + /* * @implemented */ @@ -2239,11 +2294,10 @@ OUT PUCHAR NtSystemPath, OUT PSTRING NtSystemPathString) { - /* Call our deprecated function for now */ - xHalIoAssignDriveLetters(LoaderBlock, - NtDeviceName, - NtSystemPath, - NtSystemPathString); -} + HalIoAssignDriveLetters(LoaderBlock, + NtDeviceName, + NtSystemPath, + NtSystemPathString); +} /* EOF */ Modified: trunk/reactos/ntoskrnl/fstub/halstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/halstub.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/halstub.c (original) +++ trunk/reactos/ntoskrnl/fstub/halstub.c Fri Dec 14 14:32:18 2007 @@ -21,11 +21,11 @@ (pHalSetSystemInformation)NULL, (pHalQueryBusSlots)NULL, 0, - (pHalExamineMBR)HalExamineMBR, - (pHalIoAssignDriveLetters)IoAssignDriveLetters, - (pHalIoReadPartitionTable)IoReadPartitionTable, - (pHalIoSetPartitionInformation)IoSetPartitionInformation, - (pHalIoWritePartitionTable)IoWritePartitionTable, + xHalExamineMBR, + xHalIoAssignDriveLetters, + xHalIoReadPartitionTable, + xHalIoSetPartitionInformation, + xHalIoWritePartitionTable, (pHalHandlerForBus)NULL, (pHalReferenceBusHandler)NULL, (pHalReferenceBusHandler)NULL, Modified: trunk/reactos/ntoskrnl/include/internal/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hal.h (original) +++ trunk/reactos/ntoskrnl/include/internal/hal.h Fri Dec 14 14:32:18 2007 @@ -7,6 +7,45 @@ */ #ifndef _HAL_ #define _HAL_ + +// +// Default implementations of HAL dispatch table +// +VOID +FASTCALL +xHalExamineMBR(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG MbrTypeIdentifier, + OUT PVOID *MbrBuffer); + +VOID +FASTCALL +xHalIoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN PSTRING NtDeviceName, + OUT PUCHAR NtSystemPath, + OUT PSTRING NtSystemPathString); + +NTSTATUS +FASTCALL +xHalIoReadPartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + IN OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer); + +NTSTATUS +FASTCALL +xHalIoSetPartitionInformation(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG PartitionNumber, + IN ULONG PartitionType); + +NTSTATUS +FASTCALL +xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONG SectorsPerTrack, + IN ULONG NumberOfHeads, + IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer); // // Various offsets in the boot record

16 years, 9 months

← Newer
1
...
29
30
31
32
33
34
35
...
61
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 December 2007