[ros-diffs] [gdalsnes] 16793: my 1st

my 1st
Added: branches/hardons1stbranch/
Deleted: branches/hardons1stbranch/debug.h
Deleted: branches/hardons1stbranch/debug1.h
Modified: branches/hardons1stbranch/kapi.h
Modified: branches/hardons1stbranch/ntuser.h
  _____  

Copied: branches/hardons1stbranch (from rev 16677,
trunk/reactos/include/win32k)
  _____  

Deleted: branches/hardons1stbranch/debug.h
--- trunk/reactos/include/win32k/debug.h	2005-07-21 10:31:29 UTC
(rev 16677)
+++ branches/hardons1stbranch/debug.h	2005-07-27 11:06:08 UTC (rev
16793)
@@ -1,12 +0,0 @@

-
-#ifndef  H_WIN32K_DEBUG
-#define  H_WIN32K_DEBUG
-
-#ifdef CHECKED_BUILD
-#define  FIXME(S) DbgPrint ("win32k: FIXME at: File:%s line:%d
reason:%s", __FILE__, __LINE__, S)
-#else
-#define  FIXME(S)
-#endif
-
-#endif
-
  _____  

Deleted: branches/hardons1stbranch/debug1.h
--- trunk/reactos/include/win32k/debug1.h	2005-07-21 10:31:29 UTC
(rev 16677)
+++ branches/hardons1stbranch/debug1.h	2005-07-27 11:06:08 UTC (rev
16793)
@@ -1,72 +0,0 @@

-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS kernel
- * FILE:            include/internal/debug.h
- * PURPOSE:         Useful debugging macros
- * PROGRAMMER:      David Welch (welch(a)mcmail.com)
- * UPDATE HISTORY:
- *                28/05/98: Created
- */
-
-/*
- * NOTE: Define NDEBUG before including this header to disable
debugging
- * macros
- */
-
-#ifndef __INTERNAL_DEBUG
-#define __INTERNAL_DEBUG
-
-#define UNIMPLEMENTED do {DbgPrint("%s at %s:%d is unimplemented, have
a nice day\n",__FUNCTION__,__FILE__,__LINE__); for(;;);  } while(0);
-
-/*  FIXME: should probably remove this later  */
-#if !defined(CHECKED) && !defined(NDEBUG)
-#define CHECKED
-#endif
-
-#ifndef NASSERT
-#ifndef assert
-#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at
%s:%d\n", __FILE__,__LINE__); KeBugCheck(0); }
-#endif
-#ifndef ASSERT
-#define ASSERT(x) assert(x)
-#endif
-#else
-#ifndef assert
-#define assert(x)
-#endif
-#ifndef ASSERT
-#define ASSERT(x)
-#endif
-#endif
-
-#ifdef DBG
-#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
-#define CHECKPOINT1 DbgPrint("%s:%d\n",__FILE__,__LINE__);
-#else
-#define DPRINT1(args...)
-#define CHECKPOINT1(args...)
-#endif
-
-#ifdef __NTOSKRNL__
-#define DPRINT_CHECKS
-#else
-#define DPRINT_CHECKS
-#endif
-
-#ifndef NDEBUG
-#define DPRINT DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
-#define CHECKPOINT DbgPrint("%s:%d\n",__FILE__,__LINE__);
-#else
-#define DPRINT(args...)
-#define CHECKPOINT
-#endif /* NDEBUG */
-
-/*
- * FUNCTION: Assert a maximum value for the current irql
- * ARGUMENTS:
- *        x = Maximum irql
- */
-#define ASSERT_IRQL(x) assert(KeGetCurrentIrql()<=(x))
-#define assert_irql(x) assert(KeGetCurrentIrql()<=(x))
-
-#endif /* __INTERNAL_DEBUG */
  _____  

Modified: branches/hardons1stbranch/kapi.h
--- trunk/reactos/include/win32k/kapi.h	2005-07-21 10:31:29 UTC (rev
16677)
+++ branches/hardons1stbranch/kapi.h	2005-07-27 11:06:08 UTC (rev
16793)
@@ -16,7 +16,7 @@

 #include <win32k/dc.h>
 #include <win32k/coord.h>
 #include <win32k/bitmaps.h>
-#include <win32k/debug.h>
+//#include <win32k/debug.h>
 #include <win32k/fillshap.h>
 #include <win32k/font.h>
 #include <win32k/icm.h>
  _____  

Modified: branches/hardons1stbranch/ntuser.h
--- trunk/reactos/include/win32k/ntuser.h	2005-07-21 10:31:29 UTC
(rev 16677)
+++ branches/hardons1stbranch/ntuser.h	2005-07-27 11:06:08 UTC (rev
16793)
@@ -1,7 +1,7 @@

 #ifndef __WIN32K_NTUSER_H
 #define __WIN32K_NTUSER_H
 
-#define WM_SYSTIMER 280
+//#define WM_SYSTIMER 280
 
 ULONG STDCALL
 NtUserGetSystemMetrics(ULONG Index);
@@ -301,7 +301,7 @@
   int nWidth,
   int nHeight);
 
-HANDLE
+HCURSOR
 STDCALL
 NtUserCreateCursorIconHandle(
   PICONINFO IconInfo,
@@ -395,7 +395,7 @@
 BOOL
 STDCALL
 NtUserDestroyCursorIcon(
-  HANDLE Handle,
+  HCURSOR Handle,
   DWORD Unknown);
 
 BOOLEAN STDCALL
@@ -718,13 +718,13 @@
 BOOL
 STDCALL
 NtUserGetCursorIconInfo(
-  HANDLE Handle,
+  HCURSOR Handle,
   PICONINFO IconInfo);
 
 BOOL
 STDCALL
 NtUserGetCursorIconSize(
-  HANDLE Handle,
+  HCURSOR Handle,
   BOOL *fIcon,
   SIZE *Size);
 
@@ -1339,7 +1339,7 @@
 BOOL
 STDCALL
 NtUserSetCursorIconContents(
-  HANDLE Handle,
+  HCURSOR Handle,
   PICONINFO IconInfo);
 
 BOOL