[ros-diffs] [fireball] 23506: - Change DbgPrint prototype back to Alex's fix. His change was correct and my commit was wrong. - 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.

fireball at svn.reactos.org fireball at svn.reactos.org
Sun Aug 6 21:57:25 CEST 2006


Author: fireball
Date: Sun Aug  6 23:57:24 2006
New Revision: 23506

URL: http://svn.reactos.org/svn/reactos?rev=23506&view=rev
Log:
- Change DbgPrint prototype back to Alex's fix. His change was correct and my commit was wrong.
- 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. 

Modified:
    trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
    trunk/reactos/dll/cpl/ncpa/ncpa.h
    trunk/reactos/dll/win32/devmgr/precomp.h
    trunk/reactos/dll/win32/mmdrv/mmdrv.h
    trunk/reactos/dll/win32/ntmarta/ntmarta.h
    trunk/reactos/dll/win32/vdmdbg/vdmdbg.h
    trunk/reactos/drivers/video/displays/vga/vgaddi.h
    trunk/reactos/include/ddk/winddk.h
    trunk/reactos/include/ndk/ketypes.h
    trunk/reactos/include/ndk/rtlfuncs.h
    trunk/reactos/include/psdk/winnt.h
    trunk/reactos/include/reactos/debug.h
    trunk/reactos/include/reactos/libs/pseh/framebased.h
    trunk/reactos/include/reactos/wine/debug.h
    trunk/reactos/include/reactos/wine/test.h
    trunk/reactos/lib/crt/include/internal/debug.h
    trunk/reactos/lib/rtl/debug.c
    trunk/reactos/regtests/winetests/powrprof/pwrprof.c

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Sun Aug  6 23:57:24 2006
@@ -870,7 +870,7 @@
 
 #undef DbgPrint
 ULONG
-DbgPrint(char *Fmt, ...)
+DbgPrint(const char *Fmt, ...)
 {
   UiMessageBox(Fmt);
   return 0;

Modified: trunk/reactos/dll/cpl/ncpa/ncpa.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/ncpa.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/ncpa/ncpa.h (original)
+++ trunk/reactos/dll/cpl/ncpa/ncpa.h Sun Aug  6 23:57:24 2006
@@ -13,7 +13,7 @@
 
 extern HINSTANCE hApplet;
 
-extern DWORD DbgPrint(PCHAR Fmt, ...);
+extern DWORD DbgPrint(PCCH Fmt, ...);
 
 #endif // __NCPA_H
 

Modified: trunk/reactos/dll/win32/devmgr/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/dll/win32/devmgr/precomp.h (original)
+++ trunk/reactos/dll/win32/devmgr/precomp.h Sun Aug  6 23:57:24 2006
@@ -10,7 +10,7 @@
 
 extern HINSTANCE hDllInstance;
 
-ULONG DbgPrint(PCH Format,...);
+ULONG DbgPrint(PCCH Format,...);
 
 BOOL
 WINAPI

Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/mmdrv.h (original)
+++ trunk/reactos/dll/win32/mmdrv/mmdrv.h Sun Aug  6 23:57:24 2006
@@ -31,7 +31,7 @@
 
 #include "mmdef.h"
 
-ULONG DbgPrint(PCH Format, ...);
+ULONG DbgPrint(PCCH Format, ...);
 
 /*
 #define SOUND_MAX_DEVICE_NAME 1024   // GUESSWORK

Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/dll/win32/ntmarta/ntmarta.h (original)
+++ trunk/reactos/dll/win32/ntmarta/ntmarta.h Sun Aug  6 23:57:24 2006
@@ -13,7 +13,7 @@
 #define FN_PROGRESSA FN_PROGRESS
 #endif
 
-ULONG DbgPrint(PCH Format,...);
+ULONG DbgPrint(PCCH Format,...);
 
 extern HINSTANCE hDllInstance;
 

Modified: trunk/reactos/dll/win32/vdmdbg/vdmdbg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vdmdbg/vdmdbg.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/dll/win32/vdmdbg/vdmdbg.h (original)
+++ trunk/reactos/dll/win32/vdmdbg/vdmdbg.h Sun Aug  6 23:57:24 2006
@@ -3,7 +3,7 @@
 #define MAX_PATH16 255
 #define MAX_MODULE_NAME 9
 
-ULONG DbgPrint(PCH Format,...);
+ULONG DbgPrint(PCCH Format,...);
 
 typedef struct _CONTEXT VDMCONTEXT;
 typedef VDMCONTEXT *LPVDMCONTEXT;

Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga/vgaddi.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/drivers/video/displays/vga/vgaddi.h (original)
+++ trunk/reactos/drivers/video/displays/vga/vgaddi.h Sun Aug  6 23:57:24 2006
@@ -15,7 +15,7 @@
 #define FASTCALL __fastcall
 #define DDKCDECLAPI __cdecl
 
-ULONG DbgPrint(PCH Format,...);
+ULONG DbgPrint(PCCH Format,...);
 VOID DDKAPI DbgBreakPoint(VOID);
 VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR  Port, IN UCHAR  Value);
 VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR  Register, IN UCHAR  Value);

Modified: trunk/reactos/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/ddk/winddk.h (original)
+++ trunk/reactos/include/ddk/winddk.h Sun Aug  6 23:57:24 2006
@@ -402,7 +402,8 @@
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 extern CCHAR NTSYSAPI KeNumberProcessors;
 #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
 
@@ -10450,7 +10451,7 @@
 ULONG
 __cdecl
 DbgPrint(
-  IN PCCHAR  Format,
+  IN PCCH  Format,
   IN ...);
 
 ULONG
@@ -10458,7 +10459,7 @@
 DbgPrintEx(
   IN ULONG  ComponentId,
   IN ULONG  Level,
-  IN PCCHAR  Format,
+  IN PCCH  Format,
   IN ...);
 
 NTOSAPI

Modified: trunk/reactos/include/ndk/ketypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/ndk/ketypes.h (original)
+++ trunk/reactos/include/ndk/ketypes.h Sun Aug  6 23:57:24 2006
@@ -965,7 +965,8 @@
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 extern CCHAR NTSYSAPI KeNumberProcessors;
 #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
 extern ULONG NTSYSAPI KiDmaIoCoherency;

Modified: trunk/reactos/include/ndk/rtlfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/ndk/rtlfuncs.h (original)
+++ trunk/reactos/include/ndk/rtlfuncs.h Sun Aug  6 23:57:24 2006
@@ -2454,7 +2454,7 @@
 ULONG
 __cdecl
 DbgPrint(
-    IN PCCHAR  Format,
+    IN PCCH  Format,
     IN ...
 );
 
@@ -2464,7 +2464,7 @@
 DbgPrintEx(
     IN ULONG ComponentId,
     IN ULONG Level,
-    IN PCCHAR Format,
+    IN PCCH Format,
     IN ...
 );
 

Modified: trunk/reactos/include/psdk/winnt.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/psdk/winnt.h (original)
+++ trunk/reactos/include/psdk/winnt.h Sun Aug  6 23:57:24 2006
@@ -116,7 +116,7 @@
 typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR;
 typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR;
 typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR;
-typedef CONST CHAR *LPCCH,*PCSTR,*LPCSTR;
+typedef CONST CHAR *LPCCH,*PCCH,*PCSTR,*LPCSTR;
 #ifndef _TCHAR_DEFINED
 #define _TCHAR_DEFINED
 #ifdef UNICODE

Modified: trunk/reactos/include/reactos/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/reactos/debug.h (original)
+++ trunk/reactos/include/reactos/debug.h Sun Aug  6 23:57:24 2006
@@ -29,7 +29,7 @@
 ULONG
 __cdecl
 DbgPrint(
-    IN PCCHAR  Format,
+    IN PCCH  Format,
     IN ...
 );
 

Modified: trunk/reactos/include/reactos/libs/pseh/framebased.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/framebased.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/reactos/libs/pseh/framebased.h (original)
+++ trunk/reactos/include/reactos/libs/pseh/framebased.h Sun Aug  6 23:57:24 2006
@@ -45,7 +45,7 @@
 # define _SEHSetJmp setjmp
 # define _SEHJmpBuf_t jmp_buf
 #endif
-unsigned long DbgPrint(PCCHAR Format,...);
+unsigned long DbgPrint(const char * Format,...);
 typedef struct __SEHFrame
 {
  _SEHPortableFrame_t SEH_Header;

Modified: trunk/reactos/include/reactos/wine/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/debug.h (original)
+++ trunk/reactos/include/reactos/wine/debug.h Sun Aug  6 23:57:24 2006
@@ -23,7 +23,7 @@
 #define	inline __inline
 #endif
 
-unsigned long DbgPrint(char *Format,...);
+unsigned long DbgPrint(const char *Format,...);
 
 struct _GUID;
 

Modified: trunk/reactos/include/reactos/wine/test.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/include/reactos/wine/test.h (original)
+++ trunk/reactos/include/reactos/wine/test.h Sun Aug  6 23:57:24 2006
@@ -26,7 +26,7 @@
 #include <windows.h>
 
 /* prototype for dbgprint */
-ULONG CDECL DbgPrint(IN PCH  Format,IN ...);
+ULONG CDECL DbgPrint(IN PCCH  Format,IN ...);
 
 /* debug level */
 extern int winetest_debug;

Modified: trunk/reactos/lib/crt/include/internal/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/crt/include/internal/debug.h?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/lib/crt/include/internal/debug.h (original)
+++ trunk/reactos/lib/crt/include/internal/debug.h Sun Aug  6 23:57:24 2006
@@ -28,7 +28,7 @@
    #define sT "s"
 #endif
 
-unsigned long DbgPrint(char *Format,...);
+unsigned long DbgPrint(const char *Format,...);
 
 #ifdef __GNUC__
 	#define TRACE(...)
@@ -83,7 +83,7 @@
 
 
 /* ULONG CDECL DbgPrint(PCH Format, ...); */
-ULONG DbgPrint(PCH Format,...);
+ULONG DbgPrint(PCCH Format,...);
 /* unsigned long DbgPrint(const char* Format, ...); */
 
 

Modified: trunk/reactos/lib/rtl/debug.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/lib/rtl/debug.c (original)
+++ trunk/reactos/lib/rtl/debug.c Sun Aug  6 23:57:24 2006
@@ -206,7 +206,7 @@
  */
 ULONG
 __cdecl
-DbgPrint(PCH Format,
+DbgPrint(PCCH Format,
          ...)
 {
     va_list ap;
@@ -229,7 +229,7 @@
 __cdecl
 DbgPrintEx(IN ULONG ComponentId,
            IN ULONG Level,
-           IN PCH Format,
+           IN PCCH Format,
            ...)
 {
     va_list ap;

Modified: trunk/reactos/regtests/winetests/powrprof/pwrprof.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/regtests/winetests/powrprof/pwrprof.c?rev=23506&r1=23505&r2=23506&view=diff
==============================================================================
--- trunk/reactos/regtests/winetests/powrprof/pwrprof.c (original)
+++ trunk/reactos/regtests/winetests/powrprof/pwrprof.c Sun Aug  6 23:57:24 2006
@@ -43,7 +43,7 @@
 
 static const WCHAR szTempPwrScheme[] = { '9', '9', 0 };
 
-ULONG DbgPrint(PCH X,...)
+ULONG DbgPrint(PCCH X,...)
 {
    return (ULONG)NULL;
 }




More information about the Ros-diffs mailing list