- mciGetCreatorTask returns HTASK not HANDLE

- remove broken LargeInteger functions from wintrnl.h

svn path=/branches/ros-amd64-bringup/; revision=44818

diff --git a/reactos/include/psdk/mmsystem.h b/reactos/include/psdk/mmsystem.h
index b8085c8..a979ed0 100644 (file)
--- a/reactos/include/psdk/mmsystem.h
+++ b/reactos/include/psdk/mmsystem.h
@@ -1886,7 +1886,7 @@ MCIDEVICEID WINAPI mciGetDeviceIDFromElementIDW(DWORD,LPCWSTR);
 BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT);
 BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT);
 BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD);
-HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID);
+HTASK WINAPI mciGetCreatorTask(MCIDEVICEID);
 YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD);
 
 #ifdef _WINE

diff --git a/reactos/include/psdk/winternl.h b/reactos/include/psdk/winternl.h
index b403f97..1464c6e 100644 (file)
--- a/reactos/include/psdk/winternl.h
+++ b/reactos/include/psdk/winternl.h
@@ -2126,15 +2126,6 @@ BOOLEAN   WINAPI RtlIsTextUnicode(LPCVOID,INT,INT *);
 BOOLEAN   WINAPI RtlIsValidHandle(const RTL_HANDLE_TABLE *, const RTL_HANDLE *);
 BOOLEAN   WINAPI RtlIsValidIndexHandle(const RTL_HANDLE_TABLE *, ULONG Index, RTL_HANDLE **);
 
-#ifdef _M_AMD64
-#define RtlLargeIntegerAdd(x1, x2) ((x1)+(x2))
-#define RtlLargeIntegerArithmeticShift(x, s) ((x) >> (s))
-//#define RtlLargeIntegerDivide(a,b,c,d) 
-#define RtlLargeIntegerNegate(x) (-(x))
-#define RtlLargeIntegerShiftLeft(x, s) ((x)<<(s))
-#define RtlLargeIntegerShiftRight(x, s) ((x)>>(s))
-#define RtlLargeIntegerSubtract(x1, x2) ((x1)-(x2))
-#else
 LONGLONG  WINAPI RtlLargeIntegerAdd(LONGLONG,LONGLONG);
 LONGLONG  WINAPI RtlLargeIntegerArithmeticShift(LONGLONG,INT);
 ULONGLONG WINAPI RtlLargeIntegerDivide( ULONGLONG,ULONGLONG,ULONGLONG *);
@@ -2142,7 +2133,6 @@ LONGLONG  WINAPI RtlLargeIntegerNegate(LONGLONG);
 LONGLONG  WINAPI RtlLargeIntegerShiftLeft(LONGLONG,INT);
 LONGLONG  WINAPI RtlLargeIntegerShiftRight(LONGLONG,INT);
 LONGLONG  WINAPI RtlLargeIntegerSubtract(LONGLONG,LONGLONG);
-#endif
 NTSTATUS  WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PCHAR);
 NTSTATUS  WINAPI RtlLeaveCriticalSection(RTL_CRITICAL_SECTION *);
 DWORD     WINAPI RtlLengthRequiredSid(DWORD);