Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 19:27:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Change DbgPrint prototype back to Alex's fix. His change was correct and my commit was wrong.

Browse source 
- Respectively fix all occurences of DbgPrint()'s wrong prototypes throughout the tree
- HACKHACK: Change KeNumberProcessors definition in "else" branch of NTDDI_VERSION #if. I'm not sure how to properly fix this and for now I marked this place. Probably NTDDI_VERSION should be set correctly in ntoskrnl and other modules which use this variable. 

svn path=/trunk/; revision=23506
This commit is contained in:
Aleksey Bragin 2006-08-06 19:57:24 +00:00
parent afb2063fd3
commit 310cebde9f
18 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/boot/freeldr/freeldr/reactos/reactos.c
View file

@ -870,7 +870,7 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
#undef DbgPrint #undef DbgPrint
ULONG ULONG
DbgPrint(char *Fmt, ...) DbgPrint(const char *Fmt, ...)
{ {
UiMessageBox(Fmt); UiMessageBox(Fmt);
return 0; return 0;

2
reactos/dll/cpl/ncpa/ncpa.h
View file

@ -13,7 +13,7 @@ typedef struct
extern HINSTANCE hApplet; extern HINSTANCE hApplet;
extern DWORD DbgPrint(PCHAR Fmt, ...); extern DWORD DbgPrint(PCCH Fmt, ...);
#endif // __NCPA_H #endif // __NCPA_H

2
reactos/dll/win32/devmgr/precomp.h
View file

@ -10,7 +10,7 @@
extern HINSTANCE hDllInstance; extern HINSTANCE hDllInstance;
ULONG DbgPrint(PCH Format,...); ULONG DbgPrint(PCCH Format,...);
BOOL BOOL
WINAPI WINAPI

2
reactos/dll/win32/mmdrv/mmdrv.h
View file

@ -31,7 +31,7 @@
#include "mmdef.h" #include "mmdef.h"
ULONG DbgPrint(PCH Format, ...); ULONG DbgPrint(PCCH Format, ...);
/* /*
#define SOUND_MAX_DEVICE_NAME 1024 // GUESSWORK #define SOUND_MAX_DEVICE_NAME 1024 // GUESSWORK

2
reactos/dll/win32/ntmarta/ntmarta.h
View file

@ -13,7 +13,7 @@
#define FN_PROGRESSA FN_PROGRESS #define FN_PROGRESSA FN_PROGRESS
#endif #endif
ULONG DbgPrint(PCH Format,...); ULONG DbgPrint(PCCH Format,...);
extern HINSTANCE hDllInstance; extern HINSTANCE hDllInstance;

2
reactos/dll/win32/vdmdbg/vdmdbg.h
View file

@ -3,7 +3,7 @@
#define MAX_PATH16 255 #define MAX_PATH16 255
#define MAX_MODULE_NAME 9 #define MAX_MODULE_NAME 9
ULONG DbgPrint(PCH Format,...); ULONG DbgPrint(PCCH Format,...);
typedef struct _CONTEXT VDMCONTEXT; typedef struct _CONTEXT VDMCONTEXT;
typedef VDMCONTEXT *LPVDMCONTEXT; typedef VDMCONTEXT *LPVDMCONTEXT;

2
reactos/drivers/video/displays/vga/vgaddi.h
View file

@ -15,7 +15,7 @@
#define FASTCALL __fastcall #define FASTCALL __fastcall
#define DDKCDECLAPI __cdecl #define DDKCDECLAPI __cdecl
ULONG DbgPrint(PCH Format,...); ULONG DbgPrint(PCCH Format,...);
VOID DDKAPI DbgBreakPoint(VOID); VOID DDKAPI DbgBreakPoint(VOID);
VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value);
VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value); VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value);

7
reactos/include/ddk/winddk.h
View file

@ -402,7 +402,8 @@ extern volatile CCHAR NTSYSAPI KeNumberProcessors;
#if (NTDDI_VERSION >= NTDDI_WINXP) #if (NTDDI_VERSION >= NTDDI_WINXP)
extern CCHAR NTSYSAPI KeNumberProcessors; extern CCHAR NTSYSAPI KeNumberProcessors;
#else #else
extern PCCHAR KeNumberProcessors; //extern PCCHAR KeNumberProcessors;
extern NTSYSAPI CCHAR KeNumberProcessors; //FIXME: Note to Alex: I won't fix this atm, since I prefer to discuss this with you first.
#endif #endif
#endif #endif
@ -10450,7 +10451,7 @@ DbgBreakPointWithStatus(
ULONG ULONG
__cdecl __cdecl
DbgPrint( DbgPrint(
IN PCCHAR Format, IN PCCH Format,
IN ...); IN ...);
ULONG ULONG
@ -10458,7 +10459,7 @@ __cdecl
DbgPrintEx( DbgPrintEx(
IN ULONG ComponentId, IN ULONG ComponentId,
IN ULONG Level, IN ULONG Level,
IN PCCHAR Format, IN PCCH Format,
IN ...); IN ...);
NTOSAPI NTOSAPI

3
reactos/include/ndk/ketypes.h
View file

@ -965,7 +965,8 @@ extern volatile CCHAR NTSYSAPI KeNumberProcessors;
#if (NTDDI_VERSION >= NTDDI_WINXP) #if (NTDDI_VERSION >= NTDDI_WINXP)
extern CCHAR NTSYSAPI KeNumberProcessors; extern CCHAR NTSYSAPI KeNumberProcessors;
#else #else
extern PCCHAR KeNumberProcessors; //extern PCCHAR KeNumberProcessors;
extern NTSYSAPI CCHAR KeNumberProcessors; //FIXME: Note to Alex: I won't fix this atm, since I prefer to discuss this with you first.
#endif #endif
#endif #endif
extern ULONG NTSYSAPI KiDmaIoCoherency; extern ULONG NTSYSAPI KiDmaIoCoherency;

4
reactos/include/ndk/rtlfuncs.h
View file

@ -2454,7 +2454,7 @@ RtlFreeRangeList(IN PRTL_RANGE_LIST RangeList);
ULONG ULONG
__cdecl __cdecl
DbgPrint( DbgPrint(
IN PCCHAR Format, IN PCCH Format,
IN ... IN ...
); );
@ -2464,7 +2464,7 @@ __cdecl
DbgPrintEx( DbgPrintEx(
IN ULONG ComponentId, IN ULONG ComponentId,
IN ULONG Level, IN ULONG Level,
IN PCCHAR Format, IN PCCH Format,
IN ... IN ...
); );

2
reactos/include/psdk/winnt.h
View file

@ -116,7 +116,7 @@ typedef wchar_t WCHAR;
typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR; typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR;
typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR; typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR;
typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR; typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR;
typedef CONST CHAR *LPCCH,*PCSTR,*LPCSTR; typedef CONST CHAR *LPCCH,*PCCH,*PCSTR,*LPCSTR;
#ifndef _TCHAR_DEFINED #ifndef _TCHAR_DEFINED
#define _TCHAR_DEFINED #define _TCHAR_DEFINED
#ifdef UNICODE #ifdef UNICODE

2
reactos/include/reactos/debug.h
View file

@ -29,7 +29,7 @@
ULONG ULONG
__cdecl __cdecl
DbgPrint( DbgPrint(
IN PCCHAR Format, IN PCCH Format,
IN ... IN ...
); );

2
reactos/include/reactos/libs/pseh/framebased.h
View file

@ -45,7 +45,7 @@
# define _SEHSetJmp setjmp # define _SEHSetJmp setjmp
# define _SEHJmpBuf_t jmp_buf # define _SEHJmpBuf_t jmp_buf
#endif #endif
unsigned long DbgPrint(PCCHAR Format,...); unsigned long DbgPrint(const char * Format,...);
typedef struct __SEHFrame typedef struct __SEHFrame
{ {
_SEHPortableFrame_t SEH_Header; _SEHPortableFrame_t SEH_Header;

2
reactos/include/reactos/wine/debug.h
View file

@ -23,7 +23,7 @@
#define inline __inline #define inline __inline
#endif #endif
unsigned long DbgPrint(char *Format,...); unsigned long DbgPrint(const char *Format,...);
struct _GUID; struct _GUID;

2
reactos/include/reactos/wine/test.h
View file

@ -26,7 +26,7 @@
#include <windows.h> #include <windows.h>
/* prototype for dbgprint */ /* prototype for dbgprint */
ULONG CDECL DbgPrint(IN PCH Format,IN ...); ULONG CDECL DbgPrint(IN PCCH Format,IN ...);
/* debug level */ /* debug level */
extern int winetest_debug; extern int winetest_debug;

4
reactos/lib/crt/include/internal/debug.h
View file

@ -28,7 +28,7 @@
#define sT "s" #define sT "s"
#endif #endif
unsigned long DbgPrint(char *Format,...); unsigned long DbgPrint(const char *Format,...);
#ifdef __GNUC__ #ifdef __GNUC__
#define TRACE(...) #define TRACE(...)
@ -83,7 +83,7 @@ unsigned long DbgPrint(char *Format,...);
/* ULONG CDECL DbgPrint(PCH Format, ...); */ /* ULONG CDECL DbgPrint(PCH Format, ...); */
ULONG DbgPrint(PCH Format,...); ULONG DbgPrint(PCCH Format,...);
/* unsigned long DbgPrint(const char* Format, ...); */ /* unsigned long DbgPrint(const char* Format, ...); */

4
reactos/lib/rtl/debug.c
View file

@ -206,7 +206,7 @@ vDbgPrintEx(IN ULONG ComponentId,
*/ */
ULONG ULONG
__cdecl __cdecl
DbgPrint(PCH Format, DbgPrint(PCCH Format,
...) ...)
{ {
va_list ap; va_list ap;
@ -229,7 +229,7 @@ ULONG
__cdecl __cdecl
DbgPrintEx(IN ULONG ComponentId, DbgPrintEx(IN ULONG ComponentId,
IN ULONG Level, IN ULONG Level,
IN PCH Format, IN PCCH Format,
...) ...)
{ {
va_list ap; va_list ap;

2
reactos/regtests/winetests/powrprof/pwrprof.c
View file

@ -43,7 +43,7 @@ static const WCHAR szMachPowerPoliciesSubKey[] = { 'S', 'O', 'F', 'T', 'W', 'A',
static const WCHAR szTempPwrScheme[] = { '9', '9', 0 }; static const WCHAR szTempPwrScheme[] = { '9', '9', 0 };
ULONG DbgPrint(PCH X,...) ULONG DbgPrint(PCCH X,...)
{ {
return (ULONG)NULL; return (ULONG)NULL;
} }