ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete all Trailing spaces in code.

Browse Source 
svn path=/trunk/; revision=29690
This commit is contained in:
Daniel Reimer
2007-10-19 23:21:45 +00:00
parent a7fddf9c07
commit ae7da04787
2821 changed files with 211074 additions and 211075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/include/GL/gl.h
+1 -1
View File
@@ -1452,7 +1452,7 @@ GLAPI void APIENTRY glSamplePass( GLenum pass );
/* Include external definitions of OpenGL extensions */
/* Removed, see this bug report for reference:
* http://sourceforge.net/tracker/index.php?func=detail&aid=610178&group_id=2435&atid=102435
*
*
* #include <GL/glext.h>
*/
reactos/include/GL/glext.h
+4 -4
View File
@@ -13,21 +13,21 @@ extern "C" {
** this file except in compliance with the License. You may obtain a copy
** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
**
**
** http://oss.sgi.com/projects/FreeB
**
**
** Note that, as provided in the License, the Software is distributed on an
** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
**
**
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
**
**
** Additional Notice Provisions: This software was created using the
** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
** not been independently verified as being compliant with the OpenGL(R)
reactos/include/GL/glu.h
+4 -4
View File
@@ -6,21 +6,21 @@
** this file except in compliance with the License. You may obtain a copy
** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
**
**
** http://oss.sgi.com/projects/FreeB
**
**
** Note that, as provided in the License, the Software is distributed on an
** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
** PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
**
**
** Original Code. The Original Code is: OpenGL Sample Implementation,
** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
** Copyright in any portions created by third parties is as indicated
** elsewhere herein. All Rights Reserved.
**
**
** Additional Notice Provisions: This software was created using the
** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has
** not been independently verified as being compliant with the OpenGL(R)
reactos/include/crt/assert.h
+2 -2
View File
@@ -1,4 +1,4 @@
/*
/*
* assert.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -10,7 +10,7 @@
/* We should be able to include this file multiple times to allow the assert
macro to be enabled/disabled for different parts of code. So don't add a
header guard. */
header guard. */
#ifndef RC_INVOKED
reactos/include/crt/ctype.h
+8 -8
View File
@@ -1,4 +1,4 @@
/*
/*
* ctype.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -33,7 +33,7 @@
#define _CONTROL 0x0020
/* _BLANK is set for SP and non-ASCII horizontal space chars (eg,
"no-break space", 0xA0, in CP1250) but not for HT. */
#define _BLANK 0x0040
#define _BLANK 0x0040
#define _HEX 0x0080
#define _LEADBYTE 0x8000
@@ -79,7 +79,7 @@ _CRTIMP int __cdecl toupper(int);
/*
* These are the cheap non-std versions: The return values are undefined
* if the argument is not ASCII char or is not of appropriate case
*/
*/
_CRTIMP int __cdecl _tolower(int);
_CRTIMP int __cdecl _toupper(int);
#endif
@@ -114,7 +114,7 @@ __MINGW_IMPORT unsigned short _ctype[];
# else /* CRTDLL */
__MINGW_IMPORT unsigned short* _pctype_dll;
# define _pctype _pctype_dll
# endif
# endif
#else /* __DECLSPEC_SUPPORTED */
extern unsigned short** _imp___ctype;
@@ -129,7 +129,7 @@ extern unsigned short** _imp___ctype;
#endif /* __DECLSPEC_SUPPORTED */
/*
* Use inlines here rather than macros, because macros will upset
* Use inlines here rather than macros, because macros will upset
* C++ usage (eg, ::isalnum), and so usually get undefined
*
* According to standard for SB chars, these function are defined only
@@ -139,7 +139,7 @@ extern unsigned short** _imp___ctype;
*
* If no MB char support is needed, these can be simplified even
* more by command line define -DMB_CUR_MAX=1. The compiler will then
* optimise away the constant condition.
* optimise away the constant condition.
*/
#if ! (defined (__NO_INLINE__) || defined (__NO_CTYPE_INLINES) \
@@ -245,14 +245,14 @@ int __cdecl __iscsymf (int); /* Valid first character in C symbol */
int __cdecl __iscsym (int); /* Valid character in C symbol (after first) */
#if !(defined (__NO_INLINE__) || defined (__NO_CTYPE_INLINES))
__CRT_INLINE int __cdecl __isascii(int c) {return ((c & ~0x7F) == 0);}
__CRT_INLINE int __cdecl __isascii(int c) {return ((c & ~0x7F) == 0);}
__CRT_INLINE int __cdecl __toascii(int c) {return (c & 0x7F);}
__CRT_INLINE int __cdecl __iscsymf(int c) {return (isalpha(c) || (c == '_'));}
__CRT_INLINE int __cdecl __iscsym(int c) {return (isalnum(c) || (c == '_'));}
#endif /* __NO_CTYPE_INLINES */
#ifndef _NO_OLDNAMES
/* Not _CRTIMP */
/* Not _CRTIMP */
int __cdecl isascii (int);
int __cdecl toascii (int);
int __cdecl iscsymf (int);
reactos/include/crt/direct.h
+2 -2
View File
@@ -36,7 +36,7 @@ struct _diskfree_t {
unsigned bytes_per_sector;
};
#define _DISKFREE_T_DEFINED
#endif
#endif
/*
* You really shouldn't be using these. Use the Win32 API functions instead.
@@ -54,7 +54,7 @@ _CRTIMP unsigned __cdecl _getdiskfree (unsigned, struct _diskfree_t *);
#ifndef _WDIRECT_DEFINED
/* wide character versions. Also in wchar.h */
#ifdef __MSVCRT__
#ifdef __MSVCRT__
_CRTIMP int __cdecl _wchdir(const wchar_t*);
_CRTIMP wchar_t* __cdecl _wgetcwd(wchar_t*, int);
_CRTIMP wchar_t* __cdecl _wgetdcwd(int, wchar_t*, int);
reactos/include/crt/dos.h
+1 -1
View File
@@ -72,7 +72,7 @@ struct _diskfree_t {
unsigned bytes_per_sector;
};
#define _DISKFREE_T_DEFINED
#endif
#endif
_CRTIMP unsigned __cdecl _getdiskfree (unsigned, struct _diskfree_t *);
reactos/include/crt/errno.h
+1 -1
View File
@@ -1,4 +1,4 @@
/*
/*
* errno.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
reactos/include/crt/excpt.h
+1 -1
View File
@@ -1,4 +1,4 @@
/*
/*
* excpt.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
reactos/include/crt/float.h
+3 -3
View File
@@ -1,4 +1,4 @@
/*
/*
* float.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -12,7 +12,7 @@
* NOTE: GCC provides float.h, but it doesn't include the non-standard
* stuff for accessing the fp controller. We include_next the
* GCC-supplied header and just define the MS-specific extensions
* here.
* here.
*
*/
@@ -116,7 +116,7 @@ _CRTIMP unsigned int __cdecl _statusfp (void); /* Report the FPU status word */
word to 0x37f (64 bit mantissa precison rather than 53 bit).
By default, the mingw version of _fpreset sets fp control as
per fninit. To use the MSVCRT.dll _fpreset, include CRT_fp8.o when
building your application.
building your application.
*/
void __cdecl _fpreset (void);
void __cdecl fpreset (void);
reactos/include/crt/inttypes.h
+2 -2
View File
@@ -20,7 +20,7 @@ typedef struct {
#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS)
/* 7.8.1 Macros for format specifiers
*
*
* MS runtime does not yet understand C9x standard "ll"
* length specifier. It appears to treat "ll" as "l".
* The non-standard I64 length specifier causes warning in GCC,
@@ -227,7 +227,7 @@ typedef struct {
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/*
* no length modifier for char types prior to C9x
* MS runtime scanf appears to treat "hh" as "h"
* MS runtime scanf appears to treat "hh" as "h"
*/
/* signed char */
reactos/include/crt/io.h
+10 -10
View File
@@ -1,4 +1,4 @@
/*
/*
* io.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -42,7 +42,7 @@ typedef unsigned long _fsize_t;
/*
* The maximum length of a file name. You should use GetVolumeInformation
* instead of this constant. But hey, this works.
* Also defined in stdio.h.
* Also defined in stdio.h.
*/
#ifndef FILENAME_MAX
#define FILENAME_MAX (260)
@@ -73,8 +73,8 @@ struct _finddatai64_t {
struct __finddata64_t {
unsigned attrib;
__time64_t time_create;
__time64_t time_access;
__time64_t time_create;
__time64_t time_access;
__time64_t time_write;
_fsize_t size;
char name[FILENAME_MAX];
@@ -101,7 +101,7 @@ struct _wfinddatai64_t {
struct __wfinddata64_t {
unsigned attrib;
__time64_t time_create;
__time64_t time_create;
__time64_t time_access;
__time64_t time_write;
_fsize_t size;
@@ -139,14 +139,14 @@ _CRTIMP long __cdecl _findfirsti64(const char*, struct _finddatai64_t*);
_CRTIMP int __cdecl _findnexti64(long, struct _finddatai64_t*);
_CRTIMP __int64 __cdecl _lseeki64(int, __int64, int);
_CRTIMP __int64 __cdecl _telli64(int);
/* These require newer versions of msvcrt.dll (6.1 or higher). */
/* These require newer versions of msvcrt.dll (6.1 or higher). */
#if __MSVCRT_VERSION__ >= 0x0601
_CRTIMP intptr_t __cdecl _findfirst64(const char*, struct __finddata64_t*);
_CRTIMP intptr_t __cdecl _findnext64(intptr_t, struct __finddata64_t*);
_CRTIMP intptr_t __cdecl _findnext64(intptr_t, struct __finddata64_t*);
#endif /* __MSVCRT_VERSION__ >= 0x0601 */
#ifndef __NO_MINGW_LFS
__CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
__CRT_INLINE off64_t lseek64 (int fd, off64_t offset, int whence)
{
return _lseeki64(fd, (__int64) offset, whence);
}
@@ -181,7 +181,7 @@ _CRTIMP int __cdecl chmod (const char*, int);
* it doesn't seem to hurt to add them). */
#define F_OK 0 /* Check for file existence */
/* Well maybe it does hurt. On newer versions of MSVCRT, an access mode
of 1 causes invalid parameter error. */
of 1 causes invalid parameter error. */
#define X_OK 1 /* MS access() doesn't check for execute permission. */
#define W_OK 2 /* Check for write permission */
#define R_OK 4 /* Check for read permission */
@@ -259,7 +259,7 @@ _CRTIMP wchar_t * __cdecl _wmktemp(wchar_t*);
_CRTIMP long __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
_CRTIMP int __cdecl _wfindnexti64(long, struct _wfinddatai64_t*);
#if __MSVCRT_VERSION__ >= 0x0601
_CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t*, struct __wfinddata64_t*);
_CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t*, struct __wfinddata64_t*);
_CRTIMP intptr_t __cdecl _wfindnext64(intptr_t, struct __wfinddata64_t*);
#endif
#endif /* defined (__MSVCRT__) */
reactos/include/crt/limits.h
+2 -2
View File
@@ -1,4 +1,4 @@
/*
/*
* limits.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -80,7 +80,7 @@
#define ULONG_MAX 0xffffffffUL
#ifndef __STRICT_ANSI__
/* POSIX wants this. */
/* POSIX wants this. */
#define SSIZE_MAX LONG_MAX
#endif
reactos/include/crt/locale.h
+1 -1
View File
@@ -1,4 +1,4 @@
/*
/*
* locale.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
reactos/include/crt/malloc.h
+4 -4
View File
@@ -67,11 +67,11 @@ _CRTIMP int __cdecl _heapmin (void); /* Return unused heap to the OS. */
_CRTIMP int __cdecl _heapset (unsigned int);
_CRTIMP size_t __cdecl _msize (void*);
_CRTIMP size_t __cdecl _get_sbh_threshold (void);
_CRTIMP size_t __cdecl _get_sbh_threshold (void);
_CRTIMP int __cdecl _set_sbh_threshold (size_t);
_CRTIMP void* __cdecl _expand (void*, size_t);
_CRTIMP void* __cdecl _expand (void*, size_t);
/* These require msvcr70.dll or higher. */
/* These require msvcr70.dll or higher. */
#if __MSVCRT_VERSION__ >= 0x0700
_CRTIMP void * __cdecl _aligned_offset_malloc(size_t, size_t, size_t);
_CRTIMP void * __cdecl _aligned_offset_realloc(void*, size_t, size_t, size_t);
@@ -81,7 +81,7 @@ _CRTIMP void * __cdecl _aligned_realloc (void*, size_t, size_t);
_CRTIMP void __cdecl _aligned_free (void*);
#endif /* __MSVCRT_VERSION__ >= 0x0700 */
/* These require libmingwex.a. */
/* These require libmingwex.a. */
void * __cdecl __mingw_aligned_offset_malloc (size_t, size_t, size_t);
void * __cdecl __mingw_aligned_offset_realloc (void*, size_t, size_t, size_t);
reactos/include/crt/math.h
+25 -25
View File
@@ -1,4 +1,4 @@
/*
/*
* math.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -65,7 +65,7 @@
#define M_SQRT1_2 0.70710678118654752440
#endif
/* These are also defined in Mingw float.h; needed here as well to work
/* These are also defined in Mingw float.h; needed here as well to work
around GCC build issues. */
#ifndef __STRICT_ANSI__
#ifndef __MINGW_FPCLASS_DEFINED
@@ -224,7 +224,7 @@ _CRTIMP double __cdecl _y1 (double);
_CRTIMP double __cdecl _yn (int, double);
_CRTIMP int __cdecl _matherr (struct _exception *);
/* These are also declared in Mingw float.h; needed here as well to work
/* These are also declared in Mingw float.h; needed here as well to work
around GCC build issues. */
/* BEGIN FLOAT.H COPY */
/*
@@ -276,7 +276,7 @@ _CRTIMP int __cdecl fpclass (double);
#endif /* Not _NO_OLDNAMES */
/* This require msvcr70.dll or higher. */
/* This require msvcr70.dll or higher. */
#if __MSVCRT_VERSION__ >= 0x0700
_CRTIMP int __cdecl _set_SSE2_enable (int);
#endif /* __MSVCRT_VERSION__ >= 0x0700 */
@@ -321,8 +321,8 @@ extern const double __QNAN;
/*
We can't inline float or double, because we want to ensure truncation
to semantic type before classification.
(A normal long double value might become subnormal when
to semantic type before classification.
(A normal long double value might become subnormal when
converted to double, and zero when converted to float.)
*/
@@ -442,7 +442,7 @@ __CRT_INLINE float __cdecl tanhf (float x)
{return (float) tanh (x);}
extern long double __cdecl tanhl (long double);
/* Inverse hyperbolic trig functions */
/* Inverse hyperbolic trig functions */
/* 7.12.5.1 */
extern double __cdecl acosh (double);
extern float __cdecl acoshf (float);
@@ -516,7 +516,7 @@ extern float __cdecl logbf (float);
extern long double __cdecl logbl (long double);
/* Inline versions. GCC-4.0+ can do a better fast-math optimization
with __builtins. */
with __builtins. */
#if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ )
__CRT_INLINE double __cdecl logb (double x)
{
@@ -557,7 +557,7 @@ extern float __cdecl scalblnf (float, long);
extern long double __cdecl scalblnl (long double, long);
/* 7.12.7.1 */
/* Implementations adapted from Cephes versions */
/* Implementations adapted from Cephes versions */
extern double __cdecl cbrt (double);
extern float __cdecl cbrtf (float);
extern long double __cdecl cbrtl (long double);
@@ -629,7 +629,7 @@ extern long long __cdecl llrint (double);
extern long long __cdecl llrintf (float);
extern long long __cdecl llrintl (long double);
/* Inline versions of above.
/* Inline versions of above.
GCC 4.0+ can do a better fast-math job with __builtins. */
#if !(__MINGW_GNUC_PREREQ (4, 0) && defined __FAST_MATH__ )
__CRT_INLINE double __cdecl rint (double x)
@@ -653,15 +653,7 @@ __CRT_INLINE long double __cdecl rintl (long double x)
return retval;
}
__CRT_INLINE long __cdecl lrint (double x)
{
long retval;
__asm__ __volatile__
("fistpl %0" : "=m" (retval) : "t" (x) : "st");
return retval;
}
__CRT_INLINE long __cdecl lrintf (float x)
__CRT_INLINE long __cdecl lrint (double x)
{
long retval;
__asm__ __volatile__
@@ -669,7 +661,15 @@ __CRT_INLINE long __cdecl lrintf (float x)
return retval;
}
__CRT_INLINE long __cdecl lrintl (long double x)
__CRT_INLINE long __cdecl lrintf (float x)
{
long retval;
__asm__ __volatile__
("fistpl %0" : "=m" (retval) : "t" (x) : "st");
return retval;
}
__CRT_INLINE long __cdecl lrintl (long double x)
{
long retval;
__asm__ __volatile__
@@ -693,7 +693,7 @@ __CRT_INLINE long long __cdecl llrintf (float x)
return retval;
}
__CRT_INLINE long long __cdecl llrintl (long double x)
__CRT_INLINE long long __cdecl llrintl (long double x)
{
long long retval;
__asm__ __volatile__
@@ -727,7 +727,7 @@ extern long double __cdecl truncl (long double);
extern float __cdecl fmodf (float, float);
extern long double __cdecl fmodl (long double, long double);
/* 7.12.10.2 */
/* 7.12.10.2 */
extern double __cdecl remainder (double, double);
extern float __cdecl remainderf (float, float);
extern long double __cdecl remainderl (long double, long double);
@@ -785,18 +785,18 @@ extern float __cdecl fminf (float, float);
extern long double __cdecl fminl (long double, long double);
/* 7.12.13.1 */
/* return x * y + z as a ternary op */
/* return x * y + z as a ternary op */
extern double __cdecl fma (double, double, double);
extern float __cdecl fmaf (float, float, float);
extern long double __cdecl fmal (long double, long double, long double);
/* 7.12.14 */
/*
/*
* With these functions, comparisons involving quiet NaNs set the FP
* condition code to "unordered". The IEEE floating-point spec
* dictates that the result of floating-point comparisons should be
* false whenever a NaN is involved, with the exception of the != op,
* false whenever a NaN is involved, with the exception of the != op,
* which always returns true: yes, (NaN != NaN) is true).
*/
reactos/include/crt/mbctype.h
+4 -4
View File
@@ -1,4 +1,4 @@
/*
/*
* mbctype.h
*
* Functions for testing multibyte character types and converting characters.
@@ -25,8 +25,8 @@
#include <_mingw.h>
/* return values for _mbsbtype and _mbbtype in mbstring.h */
#define _MBC_SINGLE 0
#define _MBC_LEAD 1
#define _MBC_SINGLE 0
#define _MBC_LEAD 1
#define _MBC_TRAIL 2
#define _MBC_ILLEGAL (-1)
@@ -48,7 +48,7 @@
#ifndef RC_INVOKED
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
reactos/include/crt/mbstring.h
+2 -2
View File
@@ -1,7 +1,7 @@
/*
* mbstring.h
*
* Protototypes for string functions supporting multibyte characters.
* Protototypes for string functions supporting multibyte characters.
*
* This file is part of the Mingw32 package.
*
@@ -29,7 +29,7 @@
#define __need_size_t
#include <stddef.h>
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
reactos/include/crt/mingw32/stdarg.h
+1 -1
View File
@@ -58,7 +58,7 @@ typedef __builtin_va_list __gnuc_va_list;
/* Define va_list, if desired, from __gnuc_va_list. */
/* We deliberately do not define va_list when called from
stdio.h, because ANSI C says that stdio.h is not supposed to define
va_list. stdio.h needs to have access to that data type,
va_list. stdio.h needs to have access to that data type,
but must not use that name. It should use the name __gnuc_va_list,
which is safe because it is reserved for the implementation. */
reactos/include/crt/mingw32/stddef.h
+1 -1
View File
@@ -283,7 +283,7 @@ typedef long ssize_t;
symbols in the _FOO_T_ family, stays defined even after its
corresponding type is defined). If we define wchar_t, then we
must undef _WCHAR_T_; for BSD/386 1.1 (and perhaps others), if
we undef _WCHAR_T_, then we must also define rune_t, since
we undef _WCHAR_T_, then we must also define rune_t, since
headers like runetype.h assume that if machine/ansi.h is included,
and _BSD_WCHAR_T_ is not defined, then rune_t is available.
machine/ansi.h says, "Note that _WCHAR_T_ and _RUNE_T_ must be of
reactos/include/crt/process.h
+2 -2
View File
@@ -1,4 +1,4 @@
/*
/*
* process.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -98,7 +98,7 @@ _CRTIMP void __cdecl _endthread (void);
#ifdef __MSVCRT__
_CRTIMP unsigned long __cdecl
_beginthreadex (void *, unsigned, unsigned (__stdcall *) (void *),
_beginthreadex (void *, unsigned, unsigned (__stdcall *) (void *),
void*, unsigned, unsigned*);
_CRTIMP void __cdecl _endthreadex (unsigned);
#endif
reactos/include/crt/search.h
+2 -2
View File
@@ -1,4 +1,4 @@
/*
/*
* search.h
*
* Functions for searching and sorting.
@@ -38,7 +38,7 @@ typedef unsigned int size_t;
#endif
/* bsearch and qsort are also declared in stdlib.h */
_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t,
_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t,
int (*)(const void*, const void*));
_CRTIMP void __cdecl qsort (void*, size_t, size_t,
int (*)(const void*, const void*));
reactos/include/crt/setjmp.h
+1 -1
View File
@@ -1,4 +1,4 @@
/*
/*
* setjmp.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
reactos/include/crt/signal.h
+1 -1
View File
@@ -1,4 +1,4 @@
/*
/*
* signal.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
reactos/include/crt/stdint.h
+5 -5
View File
@@ -43,9 +43,9 @@ typedef unsigned uint_least32_t;
typedef long long int_least64_t;
typedef unsigned long long uint_least64_t;
/* 7.18.1.3 Fastest minimum-width integer types
/* 7.18.1.3 Fastest minimum-width integer types
* Not actually guaranteed to be fastest for all purposes
* Here we use the exact-width types for 8 and 16-bit ints.
* Here we use the exact-width types for 8 and 16-bit ints.
*/
typedef char int_fast8_t;
typedef unsigned char uint_fast8_t;
@@ -68,7 +68,7 @@ typedef unsigned long long uintmax_t;
#if !defined ( __cplusplus) || defined (__STDC_LIMIT_MACROS)
/* 7.18.2.1 Limits of exact-width integer types */
#define INT8_MIN (-128)
#define INT8_MIN (-128)
#define INT16_MIN (-32768)
#define INT32_MIN (-2147483647 - 1)
#define INT64_MIN (-9223372036854775807LL - 1)
@@ -116,7 +116,7 @@ typedef unsigned long long uintmax_t;
#define UINT_FAST64_MAX UINT64_MAX
/* 7.18.2.4 Limits of integer types capable of holding
object pointers */
object pointers */
#define INTPTR_MIN INT32_MIN
#define INTPTR_MAX INT32_MAX
#define UINTPTR_MAX UINT32_MAX
@@ -135,7 +135,7 @@ typedef unsigned long long uintmax_t;
#define SIZE_MAX UINT32_MAX
#ifndef WCHAR_MIN /* also in wchar.h */
#ifndef WCHAR_MIN /* also in wchar.h */
#define WCHAR_MIN 0
#define WCHAR_MAX 0xffff /* UINT16_MAX */
#endif
reactos/include/crt/stdio.h
+2 -2
View File
@@ -407,7 +407,7 @@ _CRTIMP int __cdecl fileno (FILE*);
#include <sys/types.h>
__CRT_INLINE FILE* __cdecl fopen64 (const char* filename, const char* mode)
{
return fopen (filename, mode);
return fopen (filename, mode);
}
int __cdecl fseeko64 (FILE*, off64_t, int);
@@ -448,7 +448,7 @@ _CRTIMP wint_t __cdecl fgetwc (FILE*);
_CRTIMP wint_t __cdecl fputwc (wchar_t, FILE*);
_CRTIMP wint_t __cdecl ungetwc (wchar_t, FILE*);
#ifdef __MSVCRT__
#ifdef __MSVCRT__
_CRTIMP wchar_t* __cdecl fgetws (wchar_t*, int, FILE*);
_CRTIMP int __cdecl fputws (const wchar_t*, FILE*);
_CRTIMP wint_t __cdecl getwc (FILE*);
reactos/include/crt/stdlib.h
+8 -8
View File
@@ -128,8 +128,8 @@ __MINGW_IMPORT char** __argv_dll;
#endif /* __DECLSPEC_SUPPORTED */
#endif /* MB_CUR_MAX */
/*
* MS likes to declare errno in stdlib.h as well.
/*
* MS likes to declare errno in stdlib.h as well.
*/
#ifdef _UWIN
@@ -144,7 +144,7 @@ extern int errno;
#if !defined (__STRICT_ANSI__)
/*
* Use environ from the DLL, not as a global.
* Use environ from the DLL, not as a global.
*/
#ifdef __MSVCRT__
@@ -355,7 +355,7 @@ _CRTIMP int __cdecl system (const char*);
_CRTIMP char* __cdecl getenv (const char*);
/* bsearch and qsort are also in non-ANSI header search.h */
_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t,
_CRTIMP void* __cdecl bsearch (const void*, const void*, size_t, size_t,
int (*)(const void*, const void*));
_CRTIMP void __cdecl qsort (void*, size_t, size_t,
int (*)(const void*, const void*));
@@ -481,7 +481,7 @@ void __cdecl _Exit(int) __MINGW_ATTRIB_NORETURN;
#ifndef __STRICT_ANSI__ /* inline using non-ansi functions */
__CRT_INLINE void __cdecl _Exit(int __status)
{ _exit (__status); }
#endif
#endif
typedef struct { long long quot, rem; } lldiv_t;
@@ -494,7 +494,7 @@ __CRT_INLINE long long __cdecl llabs(long long _j)
long long __cdecl strtoll (const char* __restrict__, char** __restrict, int);
unsigned long long __cdecl strtoull (const char* __restrict__, char** __restrict__, int);
#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */
#if defined (__MSVCRT__) /* these are stubs for MS _i64 versions */
long long __cdecl atoll (const char *);
#if !defined (__STRICT_ANSI__)
@@ -514,9 +514,9 @@ __CRT_INLINE char* __cdecl ulltoa (unsigned long long _n, char * _c, int _i)
__CRT_INLINE long long __cdecl wtoll (const wchar_t * _w)
{ return _wtoi64 (_w); }
__CRT_INLINE wchar_t* __cdecl lltow (long long _n, wchar_t * _w, int _i)
{ return _i64tow (_n, _w, _i); }
{ return _i64tow (_n, _w, _i); }
__CRT_INLINE wchar_t* __cdecl ulltow (unsigned long long _n, wchar_t * _w, int _i)
{ return _ui64tow (_n, _w, _i); }
{ return _ui64tow (_n, _w, _i); }
#endif /* (__STRICT_ANSI__) */
#endif /* __MSVCRT__ */
reactos/include/crt/strings.h
+1 -1
View File
@@ -2,7 +2,7 @@
File: strings.h
Copyright: Public Domain
This file is provided because non ANSI fuctions are described in string.h
This file is provided because non ANSI fuctions are described in string.h
that belong in strings.h. These functions are provided for in the OLDNAME
libraries.
*/
reactos/include/crt/sys/stat.h
+1 -1
View File
@@ -171,7 +171,7 @@ _CRTIMP int __cdecl stat (const char*, struct stat*);
#if defined (__MSVCRT__)
_CRTIMP int __cdecl _fstati64(int, struct _stati64 *);
_CRTIMP int __cdecl _stati64(const char *, struct _stati64 *);
/* These require newer versions of msvcrt.dll (6.10 or higher). */
/* These require newer versions of msvcrt.dll (6.10 or higher). */
#if __MSVCRT_VERSION__ >= 0x0601
_CRTIMP int __cdecl _fstat64 (int, struct __stat64*);
_CRTIMP int __cdecl _stat64 (const char*, struct __stat64*);
reactos/include/crt/sys/time.h
+1 -1
View File
@@ -35,7 +35,7 @@ struct timezone
IEEE Std 1003.1, 2004 Edition
The timezone pointer arg is ignored. Errors are ignored.
*/
*/
int __cdecl gettimeofday(struct timeval *__restrict__,
void *__restrict__ /* tzp (unused) */);
reactos/include/crt/sys/timeb.h
+1 -1
View File
@@ -60,7 +60,7 @@ _CRTIMP void __cdecl _ftime (struct _timeb*);
_CRTIMP void __cdecl ftime (struct timeb*);
#endif /* Not _NO_OLDNAMES */
/* This requires newer versions of msvcrt.dll (6.10 or higher). */
/* This requires newer versions of msvcrt.dll (6.10 or higher). */
#if __MSVCRT_VERSION__ >= 0x0601
_CRTIMP void __cdecl _ftime64 (struct __timeb64*);
#endif /* __MSVCRT_VERSION__ >= 0x0601 */
reactos/include/crt/sys/types.h
+1 -1
View File
@@ -103,7 +103,7 @@ typedef long _ssize_t;
#ifndef _NO_OLDNAMES
typedef _ssize_t ssize_t;
#endif
#endif /* Not _SSIZE_T_ */
#endif /* Not _SSIZE_T_ */
#ifndef _FPOS64_T_
#define _FPOS64_T_
reactos/include/crt/sys/utime.h
+1 -1
View File
@@ -66,7 +66,7 @@ _CRTIMP int __cdecl _futime (int, struct _utimbuf*);
_CRTIMP int __cdecl _wutime (const wchar_t*, struct _utimbuf*);
#endif /* MSVCRT runtime */
/* These require newer versions of msvcrt.dll (6.10 or higher). */
/* These require newer versions of msvcrt.dll (6.10 or higher). */
#if __MSVCRT_VERSION__ >= 0x0601
_CRTIMP int __cdecl _utime64 (const char*, struct __utimbuf64*);
_CRTIMP int __cdecl _wutime64 (const wchar_t*, struct __utimbuf64*);
reactos/include/crt/time.h
+4 -4
View File
@@ -1,4 +1,4 @@
/*
/*
* time.h
* This file has no copyright assigned and is placed in the Public Domain.
* This file is a part of the mingw-runtime package.
@@ -114,7 +114,7 @@ extern _CRTIMP void __cdecl tzset (void);
_CRTIMP char* __cdecl _strdate(char*);
_CRTIMP char* __cdecl _strtime(char*);
/* These require newer versions of msvcrt.dll (6.10 or higher). */
/* These require newer versions of msvcrt.dll (6.10 or higher). */
#if __MSVCRT_VERSION__ >= 0x0601
_CRTIMP __time64_t __cdecl _time64( __time64_t*);
_CRTIMP __time64_t __cdecl _mktime64 (struct tm*);
@@ -177,7 +177,7 @@ __MINGW_IMPORT char *tzname[2];
#else /* not __MSVCRT__ */
/* CRTDLL is royally messed up when it comes to these macros.
TODO: import and alias these via oldnames import library instead
TODO: import and alias these via oldnames import library instead
of macros. */
#define daylight _daylight
@@ -206,7 +206,7 @@ _CRTIMP wchar_t* __cdecl _wctime64 (const __time64_t*);
#endif /* __STRICT_ANSI__ */
_CRTIMP size_t __cdecl wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
#define _WTIME_DEFINED
#endif /* _WTIME_DEFINED */
#endif /* _WTIME_DEFINED */
#ifdef __cplusplus
}
reactos/include/crt/wchar.h
+7 -7
View File
@@ -59,7 +59,7 @@
#ifndef RC_INVOKED
#ifdef __cplusplus
#ifdef __cplusplus
extern "C" {
#endif
@@ -115,7 +115,7 @@ _CRTIMP wint_t __cdecl fgetwc (FILE*);
_CRTIMP wint_t __cdecl fputwc (wchar_t, FILE*);
_CRTIMP wint_t __cdecl ungetwc (wchar_t, FILE*);
#ifdef __MSVCRT__
#ifdef __MSVCRT__
_CRTIMP wchar_t* __cdecl fgetws (wchar_t*, int, FILE*);
_CRTIMP int __cdecl fputws (const wchar_t*, FILE*);
_CRTIMP wint_t __cdecl getwc (FILE*);
@@ -179,7 +179,7 @@ _CRTIMP wchar_t* __cdecl _wctime64 (const __time64_t*);
#endif /* __STRICT_ANSI__ */
_CRTIMP size_t __cdecl wcsftime (wchar_t*, size_t, const wchar_t*, const struct tm*);
#define _WTIME_DEFINED
#endif /* _WTIME_DEFINED */
#endif /* _WTIME_DEFINED */
#ifndef _WSTRING_DEFINED
@@ -280,7 +280,7 @@ int __cdecl wctob(wint_t);
#ifndef __NO_ISOCEXT /* these need static lib libmingwex.a */
__CRT_INLINE int __cdecl fwide(FILE* __UNUSED_PARAM(stream),
int __UNUSED_PARAM(mode))
{return -1;} /* limited to byte orientation */
{return -1;} /* limited to byte orientation */
__CRT_INLINE int __cdecl mbsinit(const mbstate_t* __UNUSED_PARAM(ps))
{return 1;}
wchar_t* __cdecl wmemset(wchar_t *, wchar_t, size_t);
@@ -323,7 +323,7 @@ struct _wfinddatai64_t {
};
struct __wfinddata64_t {
unsigned attrib;
__time64_t time_create;
__time64_t time_create;
__time64_t time_access;
__time64_t time_write;
_fsize_t size;
@@ -350,7 +350,7 @@ _CRTIMP wchar_t* __cdecl _wmktemp (wchar_t*);
_CRTIMP long __cdecl _wfindfirsti64 (const wchar_t*, struct _wfinddatai64_t*);
_CRTIMP int __cdecl _wfindnexti64 (long, struct _wfinddatai64_t*);
#if __MSVCRT_VERSION__ >= 0x0601
_CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t*, struct __wfinddata64_t*);
_CRTIMP intptr_t __cdecl _wfindfirst64(const wchar_t*, struct __wfinddata64_t*);
_CRTIMP intptr_t __cdecl _wfindnext64(intptr_t, struct __wfinddata64_t*);
#endif /* __MSVCRT_VERSION__ >= 0x0601 */
#endif /* defined (__MSVCRT__) */
@@ -359,7 +359,7 @@ _CRTIMP intptr_t __cdecl _wfindnext64(intptr_t, struct __wfinddata64_t*);
#ifndef _WDIRECT_DEFINED
/* Also in direct.h */
#ifdef __MSVCRT__
#ifdef __MSVCRT__
_CRTIMP int __cdecl _wchdir (const wchar_t*);
_CRTIMP wchar_t* __cdecl _wgetcwd (wchar_t*, int);
_CRTIMP wchar_t* __cdecl _wgetdcwd (int, wchar_t*, int);
reactos/include/crt/wctype.h
+2 -2
View File
@@ -1,4 +1,4 @@
/*
/*
* wctype.h
*
* Functions for testing wide character types and converting characters.
@@ -148,7 +148,7 @@ typedef wchar_t wctrans_t;
of wctrans and towctrans are not C99 compliant in that wctrans("tolower")
returns 0, while std specifies that a non-zero value should be returned
for a valid string descriptor. If you want the MS behaviour (and you have
msvcp60.dll in your path) add -lmsvcp60 to your command line. */
msvcp60.dll in your path) add -lmsvcp60 to your command line. */
wint_t __cdecl towctrans(wint_t, wctrans_t);
wctrans_t __cdecl wctrans(const char*);
reactos/include/ddk/atsmedia.h
+1 -1
View File
@@ -3,7 +3,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE:
* FILE:
* PURPOSE: headers
* PROGRAMMER: Magnus Olsen (greatlrd)
*
reactos/include/ddk/csq.h
+3 -3
View File
@@ -68,7 +68,7 @@ struct _IO_CSQ;
* Function to insert an IRP in the queue. No need to worry about locking;
* just tack it onto your list or something.
*
* Sample implementation:
* Sample implementation:
*
VOID NTAPI CsqInsertIrp(PIO_CSQ Csq, PIRP Irp)
{
@@ -151,7 +151,7 @@ typedef VOID (NTAPI *PIO_CSQ_RELEASE_LOCK) (struct _IO_CSQ *Csq,
/*
* Finally, this is called by the queue library when it wants to complete
* a canceled IRP.
*
*
* Sample:
*
VOID NTAPI CsqCompleteCancelledIrp(PIO_CSQ Csq, PIRP Irp)
@@ -286,7 +286,7 @@ PIRP NTAPI IoCsqRemoveIrp(PIO_CSQ Csq,
PIO_CSQ_IRP_CONTEXT Context);
/*
* Remove the next IRP from the queue
* Remove the next IRP from the queue
*/
NTKERNELAPI
PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq,
reactos/include/ddk/d3dhal.h
+1 -1
View File
@@ -328,7 +328,7 @@ typedef enum _D3DHAL_DP2OPERATION {
D3DDP2OP_SETMATERIAL = 33,
D3DDP2OP_SETLIGHT = 34,
D3DDP2OP_CREATELIGHT = 35,
D3DDP2OP_SETTRANSFORM = 36,
D3DDP2OP_SETTRANSFORM = 36,
D3DDP2OP_TEXBLT = 38,
D3DDP2OP_STATESET = 39,
D3DDP2OP_SETPRIORITY = 40,
reactos/include/ddk/d3dnthal.h
+13 -13
View File
@@ -1,4 +1,4 @@
/*
/*
* Direct3D NT driver interface
*/
@@ -20,7 +20,7 @@ DEFINE_GUID(GUID_D3DParseUnknownCommandCallback, 0x2E04FFA0, 0x98E4, 0x11D1, 0x8
DEFINE_GUID(GUID_ZPixelFormats, 0x93869880, 0x36CF, 0x11D1, 0x9B, 0x1B, 0x00, 0xAA, 0x00, 0xBB, 0xB8, 0xAE);
DEFINE_GUID(GUID_DDStereoMode, 0xF828169C, 0xA8E8, 0x11D2, 0xA1, 0xF2, 0x00, 0xA0, 0xC9, 0x83, 0xEA, 0xF6);
typedef struct _D3DNTHAL_CONTEXTCREATEDATA
typedef struct _D3DNTHAL_CONTEXTCREATEDATA
{
union
{
@@ -42,26 +42,26 @@ typedef struct _D3DNTHAL_CONTEXTCREATEDATA
HRESULT ddrval;
} D3DNTHAL_CONTEXTCREATEDATA, *LPD3DNTHAL_CONTEXTCREATEDATA;
typedef struct _D3DNTHAL_CONTEXTDESTROYDATA
typedef struct _D3DNTHAL_CONTEXTDESTROYDATA
{
ULONG_PTR dwhContext;
HRESULT ddrval;
} D3DNTHAL_CONTEXTDESTROYDATA, *LPD3DNTHAL_CONTEXTDESTROYDATA;
typedef struct _D3DNTHAL_CONTEXTDESTROYALLDATA
typedef struct _D3DNTHAL_CONTEXTDESTROYALLDATA
{
DWORD dwPID;
HRESULT ddrval;
} D3DNTHAL_CONTEXTDESTROYALLDATA, *LPD3DNTHAL_CONTEXTDESTROYALLDATA;
typedef struct _D3DNTHAL_SCENECAPTUREDATA
typedef struct _D3DNTHAL_SCENECAPTUREDATA
{
ULONG_PTR dwhContext;
DWORD dwFlag;
HRESULT ddrval;
} D3DNTHAL_SCENECAPTUREDATA, *LPD3DNTHAL_SCENECAPTUREDATA;
typedef struct _D3DNTHAL_TEXTURECREATEDATA
typedef struct _D3DNTHAL_TEXTURECREATEDATA
{
ULONG_PTR dwhContext;
HANDLE hDDS;
@@ -69,14 +69,14 @@ typedef struct _D3DNTHAL_TEXTURECREATEDATA
HRESULT ddrval;
} D3DNTHAL_TEXTURECREATEDATA, *LPD3DNTHAL_TEXTURECREATEDATA;
typedef struct _D3DNTHAL_TEXTUREDESTROYDATA
typedef struct _D3DNTHAL_TEXTUREDESTROYDATA
{
ULONG_PTR dwhContext;
ULONG_PTR dwHandle;
HRESULT ddrval;
} D3DNTHAL_TEXTUREDESTROYDATA, *LPD3DNTHAL_TEXTUREDESTROYDATA;
typedef struct _D3DNTHAL_TEXTURESWAPDATA
typedef struct _D3DNTHAL_TEXTURESWAPDATA
{
ULONG_PTR dwhContext;
ULONG_PTR dwHandle1;
@@ -84,10 +84,10 @@ typedef struct _D3DNTHAL_TEXTURESWAPDATA
HRESULT ddrval;
} D3DNTHAL_TEXTURESWAPDATA, *LPD3DNTHAL_TEXTURESWAPDATA;
typedef struct _D3DNTHAL_TEXTUREGETSURFDATA
typedef struct _D3DNTHAL_TEXTUREGETSURFDATA
{
ULONG_PTR dwhContext;
HANDLE hDDS;
HANDLE hDDS;
ULONG_PTR dwHandle;
HRESULT ddrval;
} D3DNTHAL_TEXTUREGETSURFDATA, *LPD3DNTHAL_TEXTUREGETSURFDATA;
@@ -101,7 +101,7 @@ typedef DWORD (APIENTRY *LPD3DNTHAL_TEXTUREDESTROYCB)(LPD3DNTHAL_TEXTUREDESTROYD
typedef DWORD (APIENTRY *LPD3DNTHAL_TEXTURESWAPCB)(LPD3DNTHAL_TEXTURESWAPDATA);
typedef DWORD (APIENTRY *LPD3DNTHAL_TEXTUREGETSURFCB)(LPD3DNTHAL_TEXTUREGETSURFDATA);
typedef struct _D3DNTHALDeviceDesc_V1
typedef struct _D3DNTHALDeviceDesc_V1
{
DWORD dwSize;
DWORD dwFlags;
@@ -118,7 +118,7 @@ typedef struct _D3DNTHALDeviceDesc_V1
DWORD dwMaxVertexCount;
} D3DNTHALDEVICEDESC_V1, *LPD3DNTHALDEVICEDESC_V1;
typedef struct _D3DNTHAL_GLOBALDRIVERDATA
typedef struct _D3DNTHAL_GLOBALDRIVERDATA
{
DWORD dwSize;
D3DNTHALDEVICEDESC_V1 hwCaps;
@@ -128,7 +128,7 @@ typedef struct _D3DNTHAL_GLOBALDRIVERDATA
LPDDSURFACEDESC lpTextureFormats;
} D3DNTHAL_GLOBALDRIVERDATA, *LPD3DNTHAL_GLOBALDRIVERDATA;
typedef struct _D3DNTHAL_CALLBACKS
typedef struct _D3DNTHAL_CALLBACKS
{
DWORD dwSize;
LPD3DNTHAL_CONTEXTCREATECB ContextCreate;
reactos/include/ddk/dderror.h
+14 -14
View File
@@ -3,18 +3,18 @@
#define _DDERROR_
#define _WINERROR_
#define NO_ERROR 0
#define ERROR_INVALID_FUNCTION 1
#define ERROR_NOT_ENOUGH_MEMORY 8
#define ERROR_DEV_NOT_EXIST 55
#define ERROR_INVALID_PARAMETER 87
#define ERROR_INSUFFICIENT_BUFFER 122
#define ERROR_INVALID_NAME 123
#define ERROR_BUSY 170
#define ERROR_MORE_DATA 234
#define WAIT_TIMEOUT 258
#define ERROR_IO_PENDING 997
#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164
#define ERROR_CONTINUE 1246
#define ERROR_NO_MORE_DEVICES 1248
#endif
#define ERROR_INVALID_FUNCTION 1
#define ERROR_NOT_ENOUGH_MEMORY 8
#define ERROR_DEV_NOT_EXIST 55
#define ERROR_INVALID_PARAMETER 87
#define ERROR_INSUFFICIENT_BUFFER 122
#define ERROR_INVALID_NAME 123
#define ERROR_BUSY 170
#define ERROR_MORE_DATA 234
#define WAIT_TIMEOUT 258
#define ERROR_IO_PENDING 997
#define ERROR_DEVICE_REINITIALIZATION_NEEDED 1164
#define ERROR_CONTINUE 1246
#define ERROR_NO_MORE_DEVICES 1248
#endif
reactos/include/ddk/ddkernel.h
+1 -1
View File
@@ -2,7 +2,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE:
* FILE:
* PURPOSE: Directx headers
* PROGRAMMER: Magnus Olsen (greatlrd)
*
reactos/include/ddk/ddrawi.h
+2 -2
View File
@@ -701,7 +701,7 @@ typedef struct _DDHALINFO {
#define DDHALINFO_MODEXILLEGAL 0x00000002
#define DDHALINFO_GETDRIVERINFOSET 0x00000004
#define DDHALINFO_GETDRIVERINFO2 0x00000008
#endif
#endif
#define DDRAWI_VPORTSTART 0x0001
#define DDRAWI_VPORTSTOP 0x0002
#define DDRAWI_VPORTUPDATE 0x0003
@@ -735,7 +735,7 @@ typedef struct _DDHALINFO {
#define DDHAL_EXEBUFCB32_DESTROYEXEBUF 0x00000004
#define DDHAL_EXEBUFCB32_LOCKEXEBUF 0x00000008
#define DDHAL_EXEBUFCB32_UNLOCKEXEBUF 0x00000010
#endif
#endif
#define DDHAL_VPORT32_CANCREATEVIDEOPORT 0x00000001
#define DDHAL_VPORT32_CREATEVIDEOPORT 0x00000002
#define DDHAL_VPORT32_FLIP 0x00000004
reactos/include/ddk/ddrawint.h
+44 -44
View File
@@ -1,4 +1,4 @@
/*
/*
* DirectDraw NT driver interface
*/
@@ -59,7 +59,7 @@ extern "C" {
typedef ULONG_PTR FLATPTR;
typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL;
typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL;
/************************************************************************/
/* _DD_GETHEAPALIGNMENTDATA is defined in dmemmgr.h */
@@ -122,13 +122,13 @@ typedef struct _DD_DIRECTDRAW_LOCAL
typedef struct _DD_SURFACE_GLOBAL
{
union
union
{
DWORD dwBlockSizeY;
LONG lSlicePitch;
};
union
union
{
PVIDEOMEMORY lpVidMemHeap;
DWORD dwBlockSizeX;
@@ -561,7 +561,7 @@ typedef struct _DD_GETAVAILDRIVERMEMORYDATA
PVOID GetAvailDriverMemory;
} DD_GETAVAILDRIVERMEMORYDATA, *PDD_GETAVAILDRIVERMEMORYDATA;
typedef DWORD (STDCALL *PDD_GETAVAILDRIVERMEMORY)(PDD_GETAVAILDRIVERMEMORYDATA);
typedef struct _DD_MISCELLANEOUSCALLBACKS
{
DWORD dwSize;
@@ -1146,7 +1146,7 @@ typedef struct _DD_GETDRIVERINFODATA
PVOID lpvData;
// Output:
DWORD dwActualSize;
HRESULT ddRVal;
HRESULT ddRVal;
} DD_GETDRIVERINFODATA, *PDD_GETDRIVERINFODATA;
typedef DWORD (STDCALL *PDD_GETDRIVERINFO)(PDD_GETDRIVERINFODATA);
@@ -1265,30 +1265,30 @@ typedef struct _DD_MORESURFACECAPS
/*********************************************************/
typedef struct _DD_SYNCSURFACEDATA
{
PDD_DIRECTDRAW_LOCAL lpDD;
PDD_DIRECTDRAW_LOCAL lpDD;
PDD_SURFACE_LOCAL lpDDSurface;
DWORD dwSurfaceOffset;
ULONG_PTR fpLockPtr;
LONG lPitch;
DWORD dwOverlayOffset;
ULONG dwDriverReserved1;
ULONG dwDriverReserved2;
ULONG dwDriverReserved3;
ULONG dwDriverReserved4;
DWORD dwSurfaceOffset;
ULONG_PTR fpLockPtr;
LONG lPitch;
DWORD dwOverlayOffset;
ULONG dwDriverReserved1;
ULONG dwDriverReserved2;
ULONG dwDriverReserved3;
ULONG dwDriverReserved4;
HRESULT ddRVal;
} DD_SYNCSURFACEDATA, *PDD_SYNCSURFACEDATA;
typedef DWORD (STDCALL *PDD_KERNELCB_SYNCSURFACE)(PDD_SYNCSURFACEDATA);
typedef struct _DD_SYNCVIDEOPORTDATA
{
PDD_DIRECTDRAW_LOCAL lpDD;
PDD_DIRECTDRAW_LOCAL lpDD;
PDD_VIDEOPORT_LOCAL lpVideoPort;
DWORD dwOriginOffset;
DWORD dwHeight;
DWORD dwVBIHeight;
ULONG dwDriverReserved1;
ULONG dwDriverReserved2;
ULONG dwDriverReserved3;
DWORD dwOriginOffset;
DWORD dwHeight;
DWORD dwVBIHeight;
ULONG dwDriverReserved1;
ULONG dwDriverReserved2;
ULONG dwDriverReserved3;
HRESULT ddRVal;
} DD_SYNCVIDEOPORTDATA, *PDD_SYNCVIDEOPORTDATA;
typedef DWORD (STDCALL *PDD_KERNELCB_SYNCVIDEOPORT)(PDD_SYNCVIDEOPORTDATA);
@@ -1302,18 +1302,18 @@ typedef struct DD_NTPRIVATEDRIVERCAPS
typedef struct _DD_UPDATENONLOCALHEAPDATA
{
PDD_DIRECTDRAW_GLOBAL lpDD;
DWORD dwHeap;
FLATPTR fpGARTLin;
FLATPTR fpGARTDev;
PDD_DIRECTDRAW_GLOBAL lpDD;
DWORD dwHeap;
FLATPTR fpGARTLin;
FLATPTR fpGARTDev;
ULONG_PTR ulPolicyMaxBytes;
HRESULT ddRVal;
HRESULT ddRVal;
VOID* UpdateNonLocalHeap;
} DD_UPDATENONLOCALHEAPDATA, *PDD_UPDATENONLOCALHEAPDATA;
typedef struct _DD_STEREOMODE
{
DWORD dwSize;
DWORD dwSize;
DWORD dwHeight;
DWORD dwWidth;
DWORD dwBpp;
@@ -1392,12 +1392,12 @@ typedef struct DD_KERNELCALLBACKS
#define DDHAL_PLEASEALLOC_USERMEM 0x00000004l
#define VIDMEM_ISLINEAR 0x00000001l
#define VIDMEM_ISRECTANGULAR 0x00000002l
#define VIDMEM_ISHEAP 0x00000004l
#define VIDMEM_ISNONLOCAL 0x00000008l
#define VIDMEM_ISWC 0x00000010l
#define VIDMEM_HEAPDISABLED 0x00000020l
#define VIDMEM_ISLINEAR 0x00000001l
#define VIDMEM_ISRECTANGULAR 0x00000002l
#define VIDMEM_ISHEAP 0x00000004l
#define VIDMEM_ISNONLOCAL 0x00000008l
#define VIDMEM_ISWC 0x00000010l
#define VIDMEM_HEAPDISABLED 0x00000020l
#define DDHAL_CREATESURFACEEX_SWAPHANDLES 0x00000001l
@@ -1408,13 +1408,13 @@ typedef struct DD_KERNELCALLBACKS
#define DDHAL_DRIVER_HANDLED 0x00000001l
#define DDHAL_DRIVER_NOCKEYHW 0x00000002l
#define DDRAWISURF_HASCKEYSRCBLT 0x00000800L
#define DDRAWISURF_HASPIXELFORMAT 0x00002000L
#define DDRAWISURF_HASOVERLAYDATA 0x00004000L
#define DDRAWISURF_FRONTBUFFER 0x04000000L
#define DDRAWISURF_BACKBUFFER 0x08000000L
#define DDRAWISURF_INVALID 0x10000000L
#define DDRAWISURF_DRIVERMANAGED 0x40000000L
#define DDRAWISURF_HASCKEYSRCBLT 0x00000800L
#define DDRAWISURF_HASPIXELFORMAT 0x00002000L
#define DDRAWISURF_HASOVERLAYDATA 0x00004000L
#define DDRAWISURF_FRONTBUFFER 0x04000000L
#define DDRAWISURF_BACKBUFFER 0x08000000L
#define DDRAWISURF_INVALID 0x10000000L
#define DDRAWISURF_DRIVERMANAGED 0x40000000L
#define ROP_HAS_SOURCE 0x00000001l
#define ROP_HAS_PATTERN 0x00000002l
@@ -1437,9 +1437,9 @@ typedef struct DD_KERNELCALLBACKS
#define DDHALINFO_GETDRIVERINFOSET 0x00000004
#define DDHALINFO_GETDRIVERINFO2 0x00000008
#define DDRAWIVPORT_ON 0x00000001
#define DDRAWIVPORT_SOFTWARE_AUTOFLIP 0x00000002
#define DDRAWIVPORT_COLORKEYANDINTERP 0x00000004
#define DDRAWIVPORT_ON 0x00000001
#define DDRAWIVPORT_SOFTWARE_AUTOFLIP 0x00000002
#define DDRAWIVPORT_COLORKEYANDINTERP 0x00000004
#define DDHAL_PRIVATECAP_ATOMICSURFACECREATION 0x00000001l
#define DDHAL_PRIVATECAP_NOTIFYPRIMARYCREATION 0x00000002l
reactos/include/ddk/diskguid.h
+1 -1
View File
@@ -2,7 +2,7 @@
#ifdef DEFINE_GUID
DEFINE_GUID(PARTITION_ENTRY_UNUSED_GUID, 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); // Entry unused
DEFINE_GUID(PARTITION_SYSTEM_GUID, 0xC12A7328, 0xF81F, 0x11D2, 0xBA, 0x4B, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B); // EFI system partition
DEFINE_GUID(PARTITION_MSFT_RESERVED_GUID, 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE); // Microsoft reserved space
DEFINE_GUID(PARTITION_MSFT_RESERVED_GUID, 0xE3C9E316, 0x0B5C, 0x4DB8, 0x81, 0x7D, 0xF9, 0x2D, 0xF0, 0x02, 0x15, 0xAE); // Microsoft reserved space
DEFINE_GUID(PARTITION_BASIC_DATA_GUID, 0xEBD0A0A2, 0xB9E5, 0x4433, 0x87, 0xC0, 0x68, 0xB6, 0xB7, 0x26, 0x99, 0xC7); // Basic data partition
DEFINE_GUID(PARTITION_LDM_METADATA_GUID, 0x5808C8AA, 0x7E8F, 0x42E0, 0x85, 0xD2, 0xE1, 0xE9, 0x04, 0x34, 0xCF, 0xB3); // Logical Disk Manager metadata partition
DEFINE_GUID(PARTITION_LDM_DATA_GUID, 0xAF9B60A0, 0x1431, 0x4F62, 0xBC, 0x68, 0x33, 0x11, 0x71, 0x4A, 0x69, 0xAD); // Logical Disk Manager data partition
reactos/include/ddk/dmemmgr.h
+6 -6
View File
@@ -3,7 +3,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE:
* FILE:
* PURPOSE: Directx headers
* PROGRAMMER: Magnus Olsen (greatlrd)
*
@@ -25,7 +25,7 @@ typedef struct _VIDEOMEMORY *LPVIDMEM;
#endif
#define SURFACEALIGN_DISCARDABLE 0x00000001
#define VMEMHEAP_LINEAR 0x00000001
#define VMEMHEAP_LINEAR 0x00000001
#define VMEMHEAP_RECTANGULAR 0x00000002
#define VMEMHEAP_ALIGNMENT 0x00000004
@@ -41,7 +41,7 @@ typedef struct _VMEMR
{
struct _VMEMR *next;
struct _VMEMR *prev;
struct _VMEMR *pUp;
struct _VMEMR *pDown;
struct _VMEMR *pLeft;
@@ -101,7 +101,7 @@ typedef struct _VMEMHEAP
DWORD dwTotalSize;
FLATPTR fpGARTLin;
FLATPTR fpGARTDev;
DWORD dwCommitedSize;
DWORD dwCommitedSize;
DWORD dwCoalesceCount;
HEAPALIGNMENT Alignment;
DDSCAPSEX ddsCapsEx;
@@ -117,7 +117,7 @@ typedef struct _VMEMHEAP
typedef struct _DD_GETHEAPALIGNMENTDATA
{
ULONG_PTR dwInstance;
ULONG_PTR dwInstance;
DWORD dwHeap;
HRESULT ddRVal;
VOID* GetHeapAlignment;
@@ -127,7 +127,7 @@ typedef struct _DD_GETHEAPALIGNMENTDATA
extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr);
extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);
extern FLATPTR WINAPI
extern FLATPTR WINAPI
HeapVidMemAllocAligned(
LPVIDMEM lpVidMem,
DWORD dwWidth,
reactos/include/ddk/drmk.h
+83 -83
View File
@@ -1,83 +1,83 @@
/*
ReactOS Kernel Streaming
Digital Rights Management
Author: Andrew Greenwood
*/
#ifndef DRMK_H
#define DRMK_H
#include <ntddk.h>
#include <debug.h>
#include <punknown.h>
typedef struct
{
DWORD Flags;
PDEVICE_OBJECT DeviceObject;
PFILE_OBJECT FileObject;
PVOID Context;
} DRMFORWARD, *PDRMFORWARD, *PCDRMFORWARD;
typedef struct
{
BOOL CopyProtect;
ULONG Reserved;
BOOL DigitalOutputDisable;
} DRMRIGHTS, *PDRMRIGHTS;
/* ===============================================================
Digital Rights Management Functions
TODO: Check calling convention
*/
#ifdef __cplusplus
extern "C"
{
#endif
NTAPI NTSTATUS
DrmAddContentHandlers(
IN ULONG ContentId,
IN PVOID *paHandlers,
IN ULONG NumHandlers);
NTAPI NTSTATUS
DrmCreateContentMixed(
IN PULONG paContentId,
IN ULONG cContentId,
OUT PULONG pMixedContentId);
NTAPI NTSTATUS
DrmDestroyContent(
IN ULONG ContentId);
NTAPI NTSTATUS
DrmForwardContentToDeviceObject(
IN ULONG ContentId,
IN PVOID Reserved,
IN PCDRMFORWARD DrmForward);
NTAPI NTSTATUS
DrmForwardContentToFileObject(
IN ULONG ContentId,
IN PFILE_OBJECT FileObject);
NTAPI NTSTATUS
DrmForwardContentToInterface(
IN ULONG ContentId,
IN PUNKNOWN pUnknown,
IN ULONG NumMethods);
NTAPI NTSTATUS
DrmGetContentRights(
IN ULONG ContentId,
OUT PDRMRIGHTS DrmRights);
#ifdef __cplusplus
}
#endif
#endif
/*
ReactOS Kernel Streaming
Digital Rights Management
Author: Andrew Greenwood
*/
#ifndef DRMK_H
#define DRMK_H
#include <ntddk.h>
#include <debug.h>
#include <punknown.h>
typedef struct
{
DWORD Flags;
PDEVICE_OBJECT DeviceObject;
PFILE_OBJECT FileObject;
PVOID Context;
} DRMFORWARD, *PDRMFORWARD, *PCDRMFORWARD;
typedef struct
{
BOOL CopyProtect;
ULONG Reserved;
BOOL DigitalOutputDisable;
} DRMRIGHTS, *PDRMRIGHTS;
/* ===============================================================
Digital Rights Management Functions
TODO: Check calling convention
*/
#ifdef __cplusplus
extern "C"
{
#endif
NTAPI NTSTATUS
DrmAddContentHandlers(
IN ULONG ContentId,
IN PVOID *paHandlers,
IN ULONG NumHandlers);
NTAPI NTSTATUS
DrmCreateContentMixed(
IN PULONG paContentId,
IN ULONG cContentId,
OUT PULONG pMixedContentId);
NTAPI NTSTATUS
DrmDestroyContent(
IN ULONG ContentId);
NTAPI NTSTATUS
DrmForwardContentToDeviceObject(
IN ULONG ContentId,
IN PVOID Reserved,
IN PCDRMFORWARD DrmForward);
NTAPI NTSTATUS
DrmForwardContentToFileObject(
IN ULONG ContentId,
IN PFILE_OBJECT FileObject);
NTAPI NTSTATUS
DrmForwardContentToInterface(
IN ULONG ContentId,
IN PUNKNOWN pUnknown,
IN ULONG NumMethods);
NTAPI NTSTATUS
DrmGetContentRights(
IN ULONG ContentId,
OUT PDRMRIGHTS DrmRights);
#ifdef __cplusplus
}
#endif
#endif
reactos/include/ddk/dvp.h
+29 -29
View File
@@ -3,7 +3,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE:
* FILE:
* PURPOSE: Directx headers
* PROGRAMMER: Magnus Olsen (greatlrd)
*
@@ -51,7 +51,7 @@ typedef struct _DDVIDEOPORTCONNECT
ULONG_PTR dwReserved1;
} DDVIDEOPORTCONNECT, *LPDDVIDEOPORTCONNECT;
typedef struct _DDVIDEOPORTDESC
typedef struct _DDVIDEOPORTDESC
{
DWORD dwSize;
DWORD dwFieldWidth;
@@ -69,32 +69,32 @@ typedef struct _DDVIDEOPORTDESC
typedef struct _DDVIDEOPORTBANDWIDTH
{
DWORD dwSize;
DWORD dwOverlay;
DWORD dwColorkey;
DWORD dwOverlay;
DWORD dwColorkey;
DWORD dwYInterpolate;
DWORD dwYInterpAndColorkey;
ULONG_PTR dwReserved1;
ULONG_PTR dwReserved2;
ULONG_PTR dwReserved1;
ULONG_PTR dwReserved2;
} DDVIDEOPORTBANDWIDTH, *LPDDVIDEOPORTBANDWIDTH;
typedef struct _DDVIDEOPORTCAPS
{
DWORD dwSize;
DWORD dwFlags;
DWORD dwMaxWidth;
DWORD dwSize;
DWORD dwFlags;
DWORD dwMaxWidth;
DWORD dwMaxVBIWidth;
DWORD dwMaxHeight;
DWORD dwMaxHeight;
DWORD dwVideoPortID;
DWORD dwCaps;
DWORD dwFX;
DWORD dwCaps;
DWORD dwFX;
DWORD dwNumAutoFlipSurfaces;
DWORD dwAlignVideoPortBoundary;
DWORD dwAlignVideoPortBoundary;
DWORD dwAlignVideoPortPrescaleWidth;
DWORD dwAlignVideoPortCropBoundary;
DWORD dwAlignVideoPortCropWidth;
DWORD dwPreshrinkXStep;
DWORD dwPreshrinkYStep;
DWORD dwNumVBIAutoFlipSurfaces;
DWORD dwAlignVideoPortCropBoundary;
DWORD dwAlignVideoPortCropWidth;
DWORD dwPreshrinkXStep;
DWORD dwPreshrinkYStep;
DWORD dwNumVBIAutoFlipSurfaces;
DWORD dwNumPreferredAutoflip;
WORD wNumFilterTapsX;
WORD wNumFilterTapsY;
@@ -130,10 +130,10 @@ typedef struct _DDVIDEOPORTSTATUS
typedef struct _DDVIDEOPORTNOTIFY
{
LARGE_INTEGER ApproximateTimeStamp;
LONG lField;
UINT dwSurfaceIndex;
LONG lDone;
LARGE_INTEGER ApproximateTimeStamp;
LONG lField;
UINT dwSurfaceIndex;
LONG lDone;
} DDVIDEOPORTNOTIFY, *LPDDVIDEOPORTNOTIFY;
@@ -246,10 +246,10 @@ typedef HRESULT (*LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID);
#undef INTERFACE
#define INTERFACE IDDVideoPortContainer
DECLARE_INTERFACE_( IDDVideoPortContainer, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(CreateVideoPort)(THIS_ DWORD, LPDDVIDEOPORTDESC, LPDIRECTDRAWVIDEOPORT *, IUnknown *) PURE;
STDMETHOD(EnumVideoPorts)(THIS_ DWORD, LPDDVIDEOPORTCAPS, LPVOID,LPDDENUMVIDEOCALLBACK ) PURE;
STDMETHOD(GetVideoPortConnectInfo)(THIS_ DWORD, LPDWORD, LPDDVIDEOPORTCONNECT ) PURE;
@@ -279,10 +279,10 @@ typedef HRESULT (*LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID);
#undef INTERFACE
#define INTERFACE IDirectDrawVideoPort
DECLARE_INTERFACE_( IDirectDrawVideoPort, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE, DWORD) PURE;
STDMETHOD(GetBandwidthInfo)(THIS_ LPDDPIXELFORMAT, DWORD, DWORD, DWORD, LPDDVIDEOPORTBANDWIDTH) PURE;
STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL) PURE;
@@ -343,10 +343,10 @@ typedef HRESULT (*LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID);
#define INTERFACE IDirectDrawVideoPortNotify
DECLARE_INTERFACE_( IDirectDrawVideoPortNotify, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(AcquireNotification)(THIS_ HANDLE *, LPDDVIDEOPORTNOTIFY) PURE;
STDMETHOD(ReleaseNotification)(THIS_ HANDLE) PURE;
};
@@ -369,5 +369,5 @@ typedef HRESULT (*LPDDENUMVIDEOCALLBACK)(LPDDVIDEOPORTCAPS, LPVOID);
#ifdef __cplusplus
};
#endif
#endif
#endif
#endif
reactos/include/ddk/dxapi.h
+1 -1
View File
@@ -1,4 +1,4 @@
ULONG DxApiGetVersion();
ULONG DxApi( IN ULONG dwFunctionNum,IN PVOID lpvInBuffer, IN ULONG cbInBuffer,
ULONG DxApi( IN ULONG dwFunctionNum,IN PVOID lpvInBuffer, IN ULONG cbInBuffer,
IN PVOID lpvOutBuffer, IN ULONG cbOutBuffer);
reactos/include/ddk/ide.h
+1 -1
View File
@@ -272,7 +272,7 @@ PciIdeXSetBusData(
IN ULONG ConfigDataOffset,
IN ULONG BufferLength);
/* Bit field values for
/* Bit field values for
* PCIIDE_TRANSFER_MODE_SELECT.DeviceTransferModeSupported and
* IDE_CONTROLLER_PROPERTIES.SupportedTransferMode
*/
reactos/include/ddk/ieverp.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define VER_MAJOR_PRODUCTVER 6
#define VER_MINOR_PRODUCTVER 0
#undef VER_PRODUCTBUILD
#undef VER_PRODUCTBUILD
#define VER_PRODUCTBUILD 2900
#define VER_PRODUCTVERSION VER_MAJOR_PRODUCTVER,VER_MINOR_PRODUCTVER,VER_PRODUCTBUILD,VER_PRODUCTBUILD_QFE
#define VER_PRODUCTVERSION_W (0x0600)
reactos/include/ddk/kcom.h
+3 -3
View File
@@ -7,7 +7,7 @@
#if defined(__cplusplus)
extern "C" {
#endif
#endif
#define STATIC_KoCreateObject 0x72CF721CL, 0x525A, 0x11D1, 0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96
DEFINE_GUIDSTRUCT("72CF721C-525A-11D1-9AA1-00A0C9223196", KoCreateObject);
@@ -27,14 +27,14 @@ interface __declspec(uuid("21B36996-8DE3-11D1-8AE0-00A0C9223196")) IKoInitialize
#ifndef COMDDKMETHOD
#ifdef _COMDDK_
#define COMDDKMETHOD
#else
#else
#define COMDDKMETHOD DECLSPEC_IMPORT
#endif
#endif
#ifdef _COMDDK_
#define COMDDKAPI
#else
#else
#define COMDDKAPI DECLSPEC_IMPORT
#endif
reactos/include/ddk/ksdebug.h
+1 -1
View File
@@ -10,7 +10,7 @@
#if defined(__cplusplus)
extern "C" {
#endif
#endif
#if defined(_NTDDK_)
#define DEBUGLVL_ERROR 0
reactos/include/ddk/lmon.h
+2 -2
View File
@@ -10,14 +10,14 @@
#define LPPORT_INFO_FF LPPORT_INFO_FFA
#endif
typedef struct _PORT_INFO_FFW
typedef struct _PORT_INFO_FFW
{
LPWSTR pName;
DWORD cbMonitorData;
LPBYTE pMonitorData;
} PORT_INFO_FFW, *PPORT_INFO_FFW, *LPPORT_INFO_FFW;
typedef struct _PORT_INFO_FFA
typedef struct _PORT_INFO_FFA
{
LPSTR pName;
DWORD cbMonitorData;
reactos/include/ddk/ntddbeep.h
+2 -2
View File
@@ -13,7 +13,7 @@ extern "C" {
#define BEEP_FREQUENCY_MAXIMUM 0x7FFF
#define IOCTL_BEEP_SET CTL_CODE(FILE_DEVICE_BEEP, 0, METHOD_BUFFERED, FILE_ANY_ACCESS)
typedef struct _BEEP_SET_PARAMETERS
typedef struct _BEEP_SET_PARAMETERS
{
ULONG Frequency;
ULONG Duration;
@@ -22,5 +22,5 @@ typedef struct _BEEP_SET_PARAMETERS
#ifdef __cplusplus
}
#endif
#endif
#endif
reactos/include/ddk/ntddft.h
+1 -1
View File
@@ -17,5 +17,5 @@ extern "C" {
#ifdef __cplusplus
}
#endif
#endif
#endif
reactos/include/ddk/ntddtdi.h
+1 -1
View File
@@ -27,4 +27,4 @@ extern "C" {
}
#endif
#endif
#endif
reactos/include/ddk/ntnls.h
+3 -3
View File
@@ -7,7 +7,7 @@
extern "C" {
#endif
#define MAXIMUM_LEADBYTES 12
typedef struct _CPTABLEINFO
typedef struct _CPTABLEINFO
{
USHORT CodePage;
USHORT MaximumCharacterSize;
@@ -23,7 +23,7 @@ typedef struct _CPTABLEINFO
PUSHORT DBCSOffsets;
} CPTABLEINFO, *PCPTABLEINFO;
typedef struct _NLSTABLEINFO
typedef struct _NLSTABLEINFO
{
CPTABLEINFO OemTableInfo;
CPTABLEINFO AnsiTableInfo;
@@ -34,4 +34,4 @@ typedef struct _NLSTABLEINFO
#ifdef __cplusplus
}
#endif
#endif
#endif
reactos/include/ddk/objerror.h
+1 -1
View File
@@ -3,7 +3,7 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE:
* FILE:
* PURPOSE: Directx headers
* PROGRAMMER: Magnus Olsen (greatlrd)
*
reactos/include/ddk/polarity.h
+3 -3
View File
@@ -2,8 +2,8 @@
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* FILE:
* PURPOSE:
* FILE:
* PURPOSE:
* PROGRAMMER: Magnus Olsen (greatlrd)
*
*/
@@ -14,7 +14,7 @@
#ifdef USE_POLARITY
#ifdef BUILDING_DLL
#define POLARITY __declspec( dllexport )
#else
#else
#define POLARITY __declspec( dllimport )
#endif
#else
reactos/include/ddk/portcls.h
+47 -47
View File
@@ -14,87 +14,87 @@
== EXPORTS ==
DRM (new in XP):
* PcAddContentHandlers
* PcAddContentHandlers
* PcCreateContentMixed
* PcDestroyContent
* PcForwardContentToDeviceObject
* PcForwardContentToDeviceObject
* PcForwardContentToFileObject
* PcForwardContentToInterface
* PcGetContentRights
IRP HANDLING:
* PcCompleteIrp
* PcDispatchIrp
* PcCompleteIrp
* PcDispatchIrp
* PcForwardIrpSynchronous
ADAPTER:
* PcAddAdapterDevice
* PcInitializeAdapterDriver
* PcAddAdapterDevice
* PcInitializeAdapterDriver
FACTORIES:
* PcNewDmaChannel
* PcNewInterruptSync
* PcNewMiniport
* PcNewPort
* PcNewRegistryKey
* PcNewResourceList
* PcNewResourceSublist
* PcNewServiceGroup
* PcNewDmaChannel
* PcNewInterruptSync
* PcNewMiniport
* PcNewPort
* PcNewRegistryKey
* PcNewResourceList
* PcNewResourceSublist
* PcNewServiceGroup
POWER MANAGEMENT:
* PcRegisterAdapterPowerManagement
* PcRegisterAdapterPowerManagement
* PcRequestNewPowerState
PROPERTIES:
* PcCompletePendingPropertyRequest
* PcGetDeviceProperty
* PcCompletePendingPropertyRequest
* PcGetDeviceProperty
IO TIMEOUTS:
* PcRegisterIoTimeout
* PcUnregisterIoTimeout
PHYSICAL CONNECTIONS:
* PcRegisterPhysicalConnection
* PcRegisterPhysicalConnectionFromExternal
* PcRegisterPhysicalConnectionToExternal
* PcRegisterPhysicalConnection
* PcRegisterPhysicalConnectionFromExternal
* PcRegisterPhysicalConnectionToExternal
MISC:
* PcGetTimeInterval
* PcRegisterSubdevice
* PcGetTimeInterval
* PcRegisterSubdevice
== AUDIO HELPER OBJECT INTERFACES ==
IDmaChannel
IDmaChannelSlave
IDmaOperations
IDmaChannel
IDmaChannelSlave
IDmaOperations
IDrmPort (XP)
IDrmPort2 (XP)
IInterruptSync
IMasterClock
IInterruptSync
IMasterClock
IPortClsVersion (XP)
IPortEvents
IPortEvents
IPreFetchOffset (XP)
IRegistryKey
IResourceList
IServiceGroup
IResourceList
IServiceGroup
IServiceSink
IUnregisterPhysicalConnection (Vista)
IUnregisterSubdevice (Vista)
== AUDIO PORT OBJECT INTERFACES ==
IPort
IPortDMus
IPortMidi
IPortTopology
IPortWaveCyclic
IPort
IPortDMus
IPortMidi
IPortTopology
IPortWaveCyclic
IPortWavePci
== AUDIO MINIPORT OBJECT INTERFACES ==
IMiniport
IMiniportDMus
IMiniportMidi
IMiniportTopology
IMiniportWaveCyclic
IMiniport
IMiniportDMus
IMiniportMidi
IMiniportTopology
IMiniportWaveCyclic
IMiniportWavePci
== AUDIO MINIPORT AUXILIARY INTERFACES ==
@@ -102,17 +102,17 @@
IPinCount (XP)
== AUDIO STREAM OBJECT INTERFACES ==
IAllocatorMXF
IAllocatorMXF
IDrmAudioStream (XP)
IMiniportMidiStream
IMiniportWaveCyclicStream
IMiniportWavePciStream
IMXF
IPortWavePciStream
IMiniportMidiStream
IMiniportWaveCyclicStream
IMiniportWavePciStream
IMXF
IPortWavePciStream
ISynthSinkDMus
== DIRECTMUSIC USERMODE SYNTH AND SYNTH SINK INTERFACES ==
IDirectMusicSynth
IDirectMusicSynth
IDirectMusicSynthSink
== AUDIO POWER MANAGEMENT INTERFACES ==
reactos/include/ddk/punknown.h
+80 -80
View File
@@ -1,81 +1,81 @@
/*
ReactOS Kernel-Mode COM
by Andrew Greenwood
Please see COPYING in the top-level directory for license information.
*/
#ifndef _UNKNOWN_H_
#define _UNKNOWN_H_
#include <windef.h>
#define COM_NO_WINDOWS_H
#include <basetyps.h>
#ifdef PUT_GUIDS_HERE
#include <initguid.h>
#endif
/* ===============================================================
IUnknown
*/
/*
ReactOS Kernel-Mode COM
by Andrew Greenwood
Please see COPYING in the top-level directory for license information.
*/
#ifndef _UNKNOWN_H_
#define _UNKNOWN_H_
#include <windef.h>
#define COM_NO_WINDOWS_H
#include <basetyps.h>
#ifdef PUT_GUIDS_HERE
#include <initguid.h>
#endif
/* ===============================================================
IUnknown
*/
#ifndef __IUnknown_INTERFACE_DEFINED__
#define __IUnknown_INTERFACE_DEFINED__
DEFINE_GUID(
IID_IUnknown,
0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46);
#undef INTERFACE
#define INTERFACE IUnknown
DECLARE_INTERFACE(IUnknown)
{
STDMETHOD_(NTSTATUS, QueryInterface)( THIS_
IN REFIID,
OUT PVOID*)
PURE;
STDMETHOD_(ULONG, AddRef)( THIS )
PURE;
STDMETHOD_(ULONG, Release)( THIS )
PURE;
};
#endif
#undef INTERFACE
typedef IUnknown *PUNKNOWN;
/* ===============================================================
IUnknown definition
Boilerplate code macro for use in subclassed interfaces
*/
#define DEFINE_ABSTRACT_UNKNOWN() \
STDMETHOD_(NTSTATUS, QueryInterface)( THIS_ \
REFIID InterfaceId, \
PVOID* Interface) \
PURE; \
\
STDMETHOD_(ULONG, AddRef)(THIS) \
PURE; \
\
STDMETHOD_(ULONG, Release)(THIS) \
PURE;
/* ===============================================================
Constructor callback definition
*/
typedef HRESULT (*PFNCREATEINSTANCE)(
OUT PUNKNOWN* Unknown,
IN REFCLSID ClassId,
IN PUNKNOWN OuterUnknown,
IN POOL_TYPE PoolType);
#endif
#define __IUnknown_INTERFACE_DEFINED__
DEFINE_GUID(
IID_IUnknown,
0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46);
#undef INTERFACE
#define INTERFACE IUnknown
DECLARE_INTERFACE(IUnknown)
{
STDMETHOD_(NTSTATUS, QueryInterface)( THIS_
IN REFIID,
OUT PVOID*)
PURE;
STDMETHOD_(ULONG, AddRef)( THIS )
PURE;
STDMETHOD_(ULONG, Release)( THIS )
PURE;
};
#endif
#undef INTERFACE
typedef IUnknown *PUNKNOWN;
/* ===============================================================
IUnknown definition
Boilerplate code macro for use in subclassed interfaces
*/
#define DEFINE_ABSTRACT_UNKNOWN() \
STDMETHOD_(NTSTATUS, QueryInterface)( THIS_ \
REFIID InterfaceId, \
PVOID* Interface) \
PURE; \
\
STDMETHOD_(ULONG, AddRef)(THIS) \
PURE; \
\
STDMETHOD_(ULONG, Release)(THIS) \
PURE;
/* ===============================================================
Constructor callback definition
*/
typedef HRESULT (*PFNCREATEINSTANCE)(
OUT PUNKNOWN* Unknown,
IN REFCLSID ClassId,
IN PUNKNOWN OuterUnknown,
IN POOL_TYPE PoolType);
#endif
reactos/include/ddk/stdunk.h
+218 -218
View File
@@ -1,218 +1,218 @@
/*
ReactOS Kernel-Mode COM
IUnknown implementations
LICENSE
Please see COPYING in the top-level directory for license information.
AUTHORS
Andrew Greenwood
*/
#ifndef STDUNK_H
#define STDUNK_H
#define STDUNK_TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#include <punknown.h>
/* ===============================================================
INonDelegatingUnknown interface
*/
DECLARE_INTERFACE(INonDelegatingUnknown)
{
STDMETHOD_(NTSTATUS, NonDelegatingQueryInterface)( THIS_
IN REFIID,
OUT PVOID*) PURE;
STDMETHOD_(ULONG, NonDelegatingAddRef)( THIS ) PURE;
STDMETHOD_(ULONG, NonDelegatingRelease)( THIS ) PURE;
};
typedef INonDelegatingUnknown *PNONDELEGATINGUNKNOWN;
/* ===============================================================
CUnknown declaration / definition
There are 2 variants for this, and I'm not sure if the C
version is correct.
*/
#ifdef __cplusplus
class CUnknown : public INonDelegatingUnknown
{
private :
LONG m_ref_count;
PUNKNOWN m_outer_unknown;
public :
/* CUnknown */
CUnknown(PUNKNOWN pUnknownOuter);
virtual ~CUnknown();
PUNKNOWN GetOuterUnknown()
{ return m_outer_unknown; }
/* INonDelegatingUnknown */
STDMETHODIMP_(ULONG) NonDelegatingAddRef();
STDMETHODIMP_(ULONG) NonDelegatingRelease();
STDMETHODIMP_(NTSTATUS) NonDelegatingQueryInterface(
REFIID rIID,
PVOID* ppVoid);
};
#define DECLARE_STD_UNKNOWN() \
STDMETHODIMP_(NTSTATUS) NonDelegatingQueryInterface( \
REFIID iid, \
PVOID* ppvObject); \
\
STDMETHODIMP_(NTSTATUS) QueryInterface( \
REFIID riid, \
void** ppv) \
{ \
return GetOuterUnknown()->QueryInterface(riid, ppv); \
} \
\
STDMETHODIMP_(ULONG) AddRef() \
{ \
return GetOuterUnknown()->AddRef(); \
} \
\
STDMETHODIMP_(ULONG) Release() \
{ \
return GetOuterUnknown()->Release(); \
}
#define DEFINE_STD_CONSTRUCTOR(classname) \
classname(PUNKNOWN outer_unknown) \
: CUnknown(outer_unknown) \
{ }
#else /* Not C++ - this is probably very buggy... */
STDMETHODCALLTYPE
NTSTATUS
Unknown_QueryInterface(
IUnknown* this,
IN REFIID refiid,
OUT PVOID* output);
STDMETHODCALLTYPE
ULONG
Unknown_AddRef(
IUnknown* unknown_this);
STDMETHODCALLTYPE
ULONG
Unknown_Release(
IUnknown* unknown_this);
typedef struct CUnknown
{
union
{
IUnknown IUnknown;
INonDelegatingUnknown INonDelegatingUnknown;
};
LONG m_ref_count;
PUNKNOWN m_outer_unknown;
} CUnknown;
#endif /* __cplusplus */
#ifdef __cplusplus
/* ===============================================================
Construction helpers
*/
#define QICAST(typename) \
PVOID( (typename) (this) )
#define QICASTUNKNOWN(typename) \
PVOID( PUNKNOWN( (typename) (this) ) )
#define STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, base) \
classname *new_ptr = new(pool_type, tag) classname(outer_unknown); \
\
if ( ! new_ptr ) \
return STATUS_INSUFFICIENT_RESOURCES; \
\
*unknown = PUNKNOWN((base)(new_ptr)); \
(*unknown)->AddRef(); \
return STATUS_SUCCESS
#define STD_CREATE_BODY_WITH_TAG(classname, unknown, outer_unknown, pool_type, tag, base) \
STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, PUNKNOWN)
#define STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, base) \
STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, STDUNK_TAG('r','C','c','P'), base)
#define STD_CREATE_BODY(classname, unknown, outer_unknown, pool_type) \
STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, PUNKNOWN)
/* ===============================================================
Custom "new" and "delete" C++ operators
*/
#ifndef ALLOCATION_OPERATORS_DEFINED
#define ALLOCATION_OPERATORS_DEFINED
inline PVOID
KCOM_New(
size_t size,
POOL_TYPE pool_type,
ULONG tag)
{
PVOID result;
result = ExAllocatePoolWithTag(pool_type, size, tag);
if ( result )
RtlZeroMemory(result, size);
return result;
}
inline PVOID
operator new (
size_t size,
POOL_TYPE pool_type)
{
return KCOM_New(size, pool_type, STDUNK_TAG ('w','N','c','P'));
}
inline PVOID
operator new (
size_t size,
POOL_TYPE pool_type,
ULONG tag)
{
return KCOM_New(size, pool_type, tag);
}
inline void __cdecl
operator delete(
PVOID ptr)
{
ExFreePool(ptr);
}
#endif /* ALLOCATION_OPERATORS_DEFINED */
#else /* Being compiled with C */
#endif /* __cplusplus */
#endif /* include guard */
/*
ReactOS Kernel-Mode COM
IUnknown implementations
LICENSE
Please see COPYING in the top-level directory for license information.
AUTHORS
Andrew Greenwood
*/
#ifndef STDUNK_H
#define STDUNK_H
#define STDUNK_TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
#include <punknown.h>
/* ===============================================================
INonDelegatingUnknown interface
*/
DECLARE_INTERFACE(INonDelegatingUnknown)
{
STDMETHOD_(NTSTATUS, NonDelegatingQueryInterface)( THIS_
IN REFIID,
OUT PVOID*) PURE;
STDMETHOD_(ULONG, NonDelegatingAddRef)( THIS ) PURE;
STDMETHOD_(ULONG, NonDelegatingRelease)( THIS ) PURE;
};
typedef INonDelegatingUnknown *PNONDELEGATINGUNKNOWN;
/* ===============================================================
CUnknown declaration / definition
There are 2 variants for this, and I'm not sure if the C
version is correct.
*/
#ifdef __cplusplus
class CUnknown : public INonDelegatingUnknown
{
private :
LONG m_ref_count;
PUNKNOWN m_outer_unknown;
public :
/* CUnknown */
CUnknown(PUNKNOWN pUnknownOuter);
virtual ~CUnknown();
PUNKNOWN GetOuterUnknown()
{ return m_outer_unknown; }
/* INonDelegatingUnknown */
STDMETHODIMP_(ULONG) NonDelegatingAddRef();
STDMETHODIMP_(ULONG) NonDelegatingRelease();
STDMETHODIMP_(NTSTATUS) NonDelegatingQueryInterface(
REFIID rIID,
PVOID* ppVoid);
};
#define DECLARE_STD_UNKNOWN() \
STDMETHODIMP_(NTSTATUS) NonDelegatingQueryInterface( \
REFIID iid, \
PVOID* ppvObject); \
\
STDMETHODIMP_(NTSTATUS) QueryInterface( \
REFIID riid, \
void** ppv) \
{ \
return GetOuterUnknown()->QueryInterface(riid, ppv); \
} \
\
STDMETHODIMP_(ULONG) AddRef() \
{ \
return GetOuterUnknown()->AddRef(); \
} \
\
STDMETHODIMP_(ULONG) Release() \
{ \
return GetOuterUnknown()->Release(); \
}
#define DEFINE_STD_CONSTRUCTOR(classname) \
classname(PUNKNOWN outer_unknown) \
: CUnknown(outer_unknown) \
{ }
#else /* Not C++ - this is probably very buggy... */
STDMETHODCALLTYPE
NTSTATUS
Unknown_QueryInterface(
IUnknown* this,
IN REFIID refiid,
OUT PVOID* output);
STDMETHODCALLTYPE
ULONG
Unknown_AddRef(
IUnknown* unknown_this);
STDMETHODCALLTYPE
ULONG
Unknown_Release(
IUnknown* unknown_this);
typedef struct CUnknown
{
union
{
IUnknown IUnknown;
INonDelegatingUnknown INonDelegatingUnknown;
};
LONG m_ref_count;
PUNKNOWN m_outer_unknown;
} CUnknown;
#endif /* __cplusplus */
#ifdef __cplusplus
/* ===============================================================
Construction helpers
*/
#define QICAST(typename) \
PVOID( (typename) (this) )
#define QICASTUNKNOWN(typename) \
PVOID( PUNKNOWN( (typename) (this) ) )
#define STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, base) \
classname *new_ptr = new(pool_type, tag) classname(outer_unknown); \
\
if ( ! new_ptr ) \
return STATUS_INSUFFICIENT_RESOURCES; \
\
*unknown = PUNKNOWN((base)(new_ptr)); \
(*unknown)->AddRef(); \
return STATUS_SUCCESS
#define STD_CREATE_BODY_WITH_TAG(classname, unknown, outer_unknown, pool_type, tag, base) \
STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, tag, PUNKNOWN)
#define STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, base) \
STD_CREATE_BODY_WITH_TAG_(classname, unknown, outer_unknown, pool_type, STDUNK_TAG('r','C','c','P'), base)
#define STD_CREATE_BODY(classname, unknown, outer_unknown, pool_type) \
STD_CREATE_BODY_(classname, unknown, outer_unknown, pool_type, PUNKNOWN)
/* ===============================================================
Custom "new" and "delete" C++ operators
*/
#ifndef ALLOCATION_OPERATORS_DEFINED
#define ALLOCATION_OPERATORS_DEFINED
inline PVOID
KCOM_New(
size_t size,
POOL_TYPE pool_type,
ULONG tag)
{
PVOID result;
result = ExAllocatePoolWithTag(pool_type, size, tag);
if ( result )
RtlZeroMemory(result, size);
return result;
}
inline PVOID
operator new (
size_t size,
POOL_TYPE pool_type)
{
return KCOM_New(size, pool_type, STDUNK_TAG ('w','N','c','P'));
}
inline PVOID
operator new (
size_t size,
POOL_TYPE pool_type,
ULONG tag)
{
return KCOM_New(size, pool_type, tag);
}
inline void __cdecl
operator delete(
PVOID ptr)
{
ExFreePool(ptr);
}
#endif /* ALLOCATION_OPERATORS_DEFINED */
#else /* Being compiled with C */
#endif /* __cplusplus */
#endif /* include guard */
reactos/include/ddk/usb.h
+3 -3
View File
@@ -87,7 +87,7 @@ typedef struct _USBD_INTERFACE_INFORMATION
UCHAR Protocol;
UCHAR Reserved;
USBD_INTERFACE_HANDLE InterfaceHandle;
ULONG NumberOfPipes;
ULONG NumberOfPipes;
USBD_PIPE_INFORMATION Pipes[1];
} USBD_INTERFACE_INFORMATION, *PUSBD_INTERFACE_INFORMATION;
@@ -318,7 +318,7 @@ struct _URB_ISOCH_TRANSFER
ULONG StartFrame;
ULONG NumberOfPackets;
ULONG ErrorCount;
USBD_ISO_PACKET_DESCRIPTOR IsoPacket[1];
USBD_ISO_PACKET_DESCRIPTOR IsoPacket[1];
};
typedef struct _URB
@@ -497,6 +497,6 @@ typedef struct _URB
#define MS_GENRE_DESCRIPTOR_INDEX 0x0001
#define MS_POWER_DESCRIPTOR_INDEX 0x0002
#define MS_OS_STRING_SIGNATURE L"MSFT100"
#define USBD_PIPE_DIRECTION_IN(pipeInformation) ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK)
#define USBD_PIPE_DIRECTION_IN(pipeInformation) ((pipeInformation)->EndpointAddress & USB_ENDPOINT_DIRECTION_MASK)
#endif /* __USB_H */
reactos/include/ddk/usb200.h
+1 -1
View File
@@ -28,7 +28,7 @@ typedef union _BM_REQUEST_TYPE
UCHAR Type:2;
UCHAR Dir:1;
};
UCHAR B;
UCHAR B;
} BM_REQUEST_TYPE, *PBM_REQUEST_TYPE;
typedef struct _USB_DEFAULT_PIPE_SETUP_PACKET
reactos/include/ddk/usbprint.h
+6 -6
View File
@@ -1,17 +1,17 @@
#define USBPRINT_IOCTL_INDEX 0x0000
#define IOCTL_USBPRINT_GET_LPT_STATUS \
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+12, METHOD_BUFFERED, FILE_ANY_ACCESS)
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+12, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_USBPRINT_GET_1284_ID \
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+13, METHOD_BUFFERED, FILE_ANY_ACCESS)
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+13, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_USBPRINT_VENDOR_SET_COMMAND \
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+14, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_USBPRINT_VENDOR_SET_COMMAND \
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+14, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_USBPRINT_VENDOR_GET_COMMAND \
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+15, METHOD_BUFFERED, FILE_ANY_ACCESS)
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+15, METHOD_BUFFERED, FILE_ANY_ACCESS)
#define IOCTL_USBPRINT_SOFT_RESET \
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+16, METHOD_BUFFERED, FILE_ANY_ACCESS)
CTL_CODE(FILE_DEVICE_UNKNOWN, USBPRINT_IOCTL_INDEX+16, METHOD_BUFFERED, FILE_ANY_ACCESS)
reactos/include/ddk/wdm.h
+24 -24
View File
@@ -1,24 +1,24 @@
/*
WDM (far from finished!)
*/
#ifndef WDM_H
#define WDM_H
typedef int CM_RESOURCE_TYPE;
#define CmResourceTypeNull 0
#define CmResourceTypePort 1
#define CmResourceTypeInterrupt 2
#define CmResourceTypeMemory 3
#define CmResourceTypeDma 4
#define CmResourceTypeDeviceSpecific 5
#define CmResourceTypeBusNumber 6
#define CmResourceTypeNonArbitrated 128
#define CmResourceTypeConfigData 128
#define CmResourceTypeDevicePrivate 129
#define CmResourceTypePcCardConfig 130
#define CmResourceTypeMfCardConfig 131
#endif
/*
WDM (far from finished!)
*/
#ifndef WDM_H
#define WDM_H
typedef int CM_RESOURCE_TYPE;
#define CmResourceTypeNull 0
#define CmResourceTypePort 1
#define CmResourceTypeInterrupt 2
#define CmResourceTypeMemory 3
#define CmResourceTypeDma 4
#define CmResourceTypeDeviceSpecific 5
#define CmResourceTypeBusNumber 6
#define CmResourceTypeNonArbitrated 128
#define CmResourceTypeConfigData 128
#define CmResourceTypeDevicePrivate 129
#define CmResourceTypePcCardConfig 130
#define CmResourceTypeMfCardConfig 131
#endif
reactos/include/ddk/winddi.h
+25 -25
View File
@@ -316,7 +316,7 @@ typedef struct _DEVINFO {
typedef struct _DRIVEROBJ *PDRIVEROBJ;
typedef BOOL
typedef BOOL
(APIENTRY CALLBACK *FREEOBJPROC)(
IN PDRIVEROBJ pDriverObj);
@@ -3499,7 +3499,7 @@ DrvUnloadFontFile(
#define WOC_SPRITE_OVERLAP 0x00000080
#define WOC_SPRITE_NO_OVERLAP 0x00000100
typedef VOID
typedef VOID
(APIENTRY CALLBACK * WNDOBJCHANGEPROC)(
WNDOBJ *pwo,
FLONG fl);
@@ -3515,12 +3515,12 @@ typedef BOOL
IN RECTL *prclSrc,
IN BLENDOBJ *pBlendObj);
typedef BOOL
typedef BOOL
(APIENTRY *PFN_DrvAssertMode)(
IN DHPDEV dhpdev,
IN BOOL bEnable);
typedef BOOL
typedef BOOL
(APIENTRY *PFN_DrvBitBlt)(
IN SURFOBJ *psoTrg,
IN SURFOBJ *psoSrc,
@@ -3534,12 +3534,12 @@ typedef BOOL
IN POINTL *pptlBrush,
IN ROP4 rop4);
typedef VOID
typedef VOID
(APIENTRY *PFN_DrvCompletePDEV)(
IN DHPDEV dhpdev,
IN HDEV hdev);
typedef BOOL
typedef BOOL
(APIENTRY *PFN_DrvCopyBits)(
IN SURFOBJ *psoDest,
IN SURFOBJ *psoSrc,
@@ -3548,52 +3548,52 @@ typedef BOOL
IN RECTL *prclDest,
IN POINTL *pptlSrc);
typedef HBITMAP
typedef HBITMAP
(APIENTRY *PFN_DrvCreateDeviceBitmap)(
IN DHPDEV dhpdev,
IN SIZEL sizl,
IN ULONG iFormat);
typedef VOID
typedef VOID
(APIENTRY *PFN_DrvDeleteDeviceBitmap)(
IN DHSURF dhsurf);
typedef HBITMAP
typedef HBITMAP
(APIENTRY *PFN_DrvDeriveSurface)(
DD_DIRECTDRAW_GLOBAL *pDirectDraw,
DD_SURFACE_LOCAL *pSurface);
typedef LONG
typedef LONG
(APIENTRY *PFN_DrvDescribePixelFormat)(
IN DHPDEV dhpdev,
IN LONG iPixelFormat,
IN ULONG cjpfd,
OUT PIXELFORMATDESCRIPTOR *ppfd);
typedef VOID
typedef VOID
(APIENTRY *PFN_DrvDestroyFont)(
IN FONTOBJ *pfo);
typedef VOID
typedef VOID
(APIENTRY *PFN_DrvDisableDriver)(
VOID);
typedef VOID
typedef VOID
(APIENTRY *PFN_DrvDisablePDEV)(
IN DHPDEV dhpdev);
typedef VOID
typedef VOID
(APIENTRY *PFN_DrvDisableSurface)(
IN DHPDEV dhpdev);
typedef ULONG
typedef ULONG
(APIENTRY *PFN_DrvDitherColor)(
IN DHPDEV dhpdev,
IN ULONG iMode,
IN ULONG rgb,
OUT ULONG *pul);
typedef ULONG
typedef ULONG
(APIENTRY *PFN_DrvDrawEscape)(
IN SURFOBJ *pso,
IN ULONG iEsc,
@@ -3602,13 +3602,13 @@ typedef ULONG
IN ULONG cjIn,
IN PVOID pvIn);
typedef BOOL
typedef BOOL
(APIENTRY *PFN_DrvEnableDriver)(
IN ULONG iEngineVersion,
IN ULONG cj,
OUT DRVENABLEDATA *pded);
#if 0
typedef DHPDEV
typedef DHPDEV
(APIENTRY *PFN_DrvEnablePDEV)(
IN DEVMODEW *pdm,
IN LPWSTR pwszLogAddress,
@@ -3622,16 +3622,16 @@ typedef DHPDEV
IN LPWSTR pwszDeviceName,
IN HANDLE hDriver);
#endif
typedef HSURF
typedef HSURF
(APIENTRY *PFN_DrvEnableSurface)(
IN DHPDEV dhpdev);
typedef BOOL
typedef BOOL
(APIENTRY *PFN_DrvEndDoc)(
IN SURFOBJ *pso,
IN FLONG fl);
typedef ULONG
typedef ULONG
(APIENTRY *PFN_DrvEscape)(
IN SURFOBJ *pso,
IN ULONG iEsc,
@@ -3640,7 +3640,7 @@ typedef ULONG
IN ULONG cjOut,
OUT PVOID pvOut);
typedef BOOL
typedef BOOL
(APIENTRY *PFN_DrvFillPath)(
IN SURFOBJ *pso,
IN PATHOBJ *ppo,
@@ -3650,7 +3650,7 @@ typedef BOOL
IN MIX mix,
IN FLONG flOptions);
typedef ULONG
typedef ULONG
(APIENTRY *PFN_DrvFontManagement)(
IN SURFOBJ *pso,
IN FONTOBJ *pfo,
@@ -3660,12 +3660,12 @@ typedef ULONG
IN ULONG cjOut,
OUT PVOID pvOut);
typedef VOID
typedef VOID
(APIENTRY *PFN_DrvFree)(
IN PVOID pv,
IN ULONG_PTR id);
typedef ULONG
typedef ULONG
(APIENTRY *PFN_DrvGetGlyphMode)(
IN DHPDEV dhpdev,
IN FONTOBJ *pfo);
reactos/include/ddk/winddk.h
+1 -1
View File
@@ -5396,7 +5396,7 @@ KeGetCurrentProcessorNumber(VOID)
);
return Number;
}
#else
#error Unknown architecture
#endif
reactos/include/dxsdk/DShow.h
+1 -1
View File
@@ -53,5 +53,5 @@
#define OAFALSE (0)
#endif
#endif
#endif
reactos/include/dxsdk/PIXPlugin.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#ifdef __cplusplus
extern "C"
extern "C"
{
#endif
reactos/include/dxsdk/amparse.h
+1 -1
View File
@@ -4,7 +4,7 @@
#ifdef __cplusplus
extern "C" {
#endif
#endif
DEFINE_GUID(IID_IAMParse, 0xC47A3420, 0x005C, 0x11D2, 0x90, 0x38, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x98);
reactos/include/dxsdk/amvideo.h
+34 -34
View File
@@ -11,53 +11,53 @@
#ifdef __cplusplus
extern "C" {
#endif
#endif
#include <ddraw.h>
#define AMDDS_NONE 0x00
#define AMDDS_DCIPS 0x01
#define AMDDS_PS 0x02
#define AMDDS_RGBOVR 0x04
#define AMDDS_YUVOVR 0x08
#define AMDDS_RGBOFF 0x10
#define AMDDS_YUVOFF 0x20
#define AMDDS_RGBFLP 0x40
#define AMDDS_YUVFLP 0x80
#define AMDDS_ ALL 0xFF
#define AMDDS_PS 0x02
#define AMDDS_RGBOVR 0x04
#define AMDDS_YUVOVR 0x08
#define AMDDS_RGBOFF 0x10
#define AMDDS_YUVOFF 0x20
#define AMDDS_RGBFLP 0x40
#define AMDDS_YUVFLP 0x80
#define AMDDS_ ALL 0xFF
#define AMDDS_DEFAULT AMDDS_ALL
#define AMDDS_YUV (AMDDS_YUVOFF | AMDDS_YUVOVR | AMDDS_YUVFLP)
#define AMDDS_RGB (AMDDS_RGBOFF | AMDDS_RGBOVR | AMDDS_RGBFLP)
#define AMDDS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)
#define iPALETTE_COLORS 256
#define iPALETTE_COLORS 256
#define iEGA_COLORS 16
#define iMASK_COLORS 3
#define iTRUECOLOR 16
#define iRED 0
#define iGREEN 1
#define iBLUE 2
#define iPALETTE 8
#define iMAXBITS 8
#define iTRUECOLOR 16
#define iRED 0
#define iGREEN 1
#define iBLUE 2
#define iPALETTE 8
#define iMAXBITS 8
typedef struct tag_TRUECOLORINFO
typedef struct tag_TRUECOLORINFO
{
DWORD dwBitMasks[iMASK_COLORS];
RGBQUAD bmiColors[iPALETTE_COLORS];
} TRUECOLORINFO;
typedef struct tagVIDEOINFOHEADER
typedef struct tagVIDEOINFOHEADER
{
RECT rcSource;
RECT rcTarget;
DWORD dwBitRate;
DWORD dwBitRate;
DWORD dwBitErrorRate;
REFERENCE_TIME AvgTimePerFrame;
BITMAPINFOHEADER bmiHeader;
} VIDEOINFOHEADER;
typedef struct tagVIDEOINFO
typedef struct tagVIDEOINFO
{
RECT rcSource;
RECT rcTarget;
@@ -65,7 +65,7 @@ typedef struct tagVIDEOINFO
DWORD dwBitErrorRate;
REFERENCE_TIME AvgTimePerFrame;
BITMAPINFOHEADER bmiHeader;
union
union
{
RGBQUAD bmiColors[iPALETTE_COLORS];
DWORD dwBitMasks[iMASK_COLORS];
@@ -73,15 +73,15 @@ typedef struct tagVIDEOINFO
};
} VIDEOINFO;
typedef struct tagMPEG1VIDEOINFO
typedef struct tagMPEG1VIDEOINFO
{
VIDEOINFOHEADER hdr;
DWORD dwStartTimeCode;
DWORD cbSequenceHeader;
BYTE bSequenceHeader[1];
DWORD dwStartTimeCode;
DWORD cbSequenceHeader;
BYTE bSequenceHeader[1];
} MPEG1VIDEOINFO;
typedef struct tagAnalogVideoInfo
typedef struct tagAnalogVideoInfo
{
RECT rcSource;
RECT rcTarget;
@@ -101,7 +101,7 @@ typedef struct tagAnalogVideoInfo
#define SIZE_VIDEOHEADER (sizeof(BITMAPINFOHEADER) + SIZE_PREHEADER)
#define WIDTHBYTES(BTIS) ((DWORD)(((BTIS)+31) & (~31)) / 8)
#define DIBWIDTHBYTES(BI) (DWORD)(BI).biBitCount) * (DWORD)WIDTHBYTES((DWORD)(BI).biWidth
#define DIBWIDTHBYTES(BI) (DWORD)(BI).biBitCount) * (DWORD)WIDTHBYTES((DWORD)(BI).biWidth
#define _DIBSIZE(BI) (DIBWIDTHBYTES(BI) * (DWORD)(BI).biHeight)
#define DIBSIZE(BI) ((BI).biHeight < 0 ? (-1)*(_DIBSIZE(BI)) : _DIBSIZE(BI))
@@ -184,11 +184,11 @@ DECLARE_INTERFACE_(IQualProp, IUnknown)
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
STDMETHOD(get_FramesDroppedInRenderer)(THIS_ int *pcFrames) PURE;
STDMETHOD(get_FramesDrawn)(THIS_ int *pcFramesDrawn) PURE;
STDMETHOD(get_AvgFrameRate)(THIS_ int *piAvgFrameRate) PURE;
STDMETHOD(get_Jitter)(THIS_ int *iJitter) PURE;
STDMETHOD(get_AvgSyncOffset)(THIS_ int *piAvg) PURE;
STDMETHOD(get_DevSyncOffset)(THIS_ int *piDev) PURE;
STDMETHOD(get_FramesDrawn)(THIS_ int *pcFramesDrawn) PURE;
STDMETHOD(get_AvgFrameRate)(THIS_ int *piAvgFrameRate) PURE;
STDMETHOD(get_Jitter)(THIS_ int *iJitter) PURE;
STDMETHOD(get_AvgSyncOffset)(THIS_ int *piAvg) PURE;
STDMETHOD(get_DevSyncOffset)(THIS_ int *piDev) PURE;
};
@@ -240,7 +240,7 @@ DECLARE_INTERFACE_(IFullScreenVideoEx, IFullScreenVideo)
typedef enum
typedef enum
{
AM_PROPERTY_FRAMESTEP_STEP = 0x01,
AM_PROPERTY_FRAMESTEP_CANCEL = 0x02,
@@ -256,5 +256,5 @@ typedef struct _AM_FRAMESTEP_STEP
#ifdef __cplusplus
}
#endif
#endif
#endif
reactos/include/dxsdk/aviriff.h
+2 -2
View File
@@ -248,8 +248,8 @@ typedef struct _avitimedindex
typedef struct _avitimecodeindex
{
FOURCC fcc;
UINT cb;
FOURCC fcc;
UINT cb;
WORD wLongsPerEntry;
BYTE bIndexSubType;
BYTE bIndexType;
reactos/include/dxsdk/bdatypes.h
+2 -2
View File
@@ -18,7 +18,7 @@
#define BDA_CHAN_BANDWITH_NOT_SET -1
#define BDA_CHAN_BANDWITH_NOT_DEFINED 0
#define BDA_FREQUENCY_MULTIPLIER_NOT_SET -1
#define BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED 0
#define BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED 0
typedef struct _BDA_TEMPLATE_CONNECTION
@@ -375,5 +375,5 @@ typedef V1_ENUM enum HierarchyAlpha
#endif
#endif
reactos/include/dxsdk/d3dx9shape.h
+6 -6
View File
@@ -7,16 +7,16 @@
extern "C" {
#endif
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateBox(
LPDIRECT3DDEVICE9 pDevice,
LPDIRECT3DDEVICE9 pDevice,
FLOAT Width,
FLOAT Height,
FLOAT Depth,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
HRESULT WINAPI
HRESULT WINAPI
D3DXCreateCylinder(
LPDIRECT3DDEVICE9 pDevice,
FLOAT Radius1,
@@ -27,7 +27,7 @@ HRESULT WINAPI
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
HRESULT WINAPI
HRESULT WINAPI
D3DXCreatePolygon(
LPDIRECT3DDEVICE9 pDevice,
FLOAT Length,
@@ -37,7 +37,7 @@ D3DXCreatePolygon(
HRESULT WINAPI
D3DXCreateSphere(
LPDIRECT3DDEVICE9 pDevice,
LPDIRECT3DDEVICE9 pDevice,
FLOAT Radius,
UINT Slices,
UINT Stacks,
@@ -78,7 +78,7 @@ D3DXCreateTorus(
FLOAT InnerRadius,
FLOAT OuterRadius,
UINT Sides,
UINT Rings,
UINT Rings,
LPD3DXMESH* ppMesh,
LPD3DXBUFFER* ppAdjacency);
reactos/include/dxsdk/d3dx9xof.h
+1 -1
View File
@@ -68,7 +68,7 @@ typedef struct _D3DXF_FILELOADRESOURCE
#if !defined( DECLSPEC_UUID )
#if _MSC_VER >= 1100
#define DECLSPEC_UUID( x ) __declspec( uuid( x ) )
#else
#else
#define DECLSPEC_UUID( x )
#endif
#endif
reactos/include/dxsdk/ddraw.h
+49 -49
View File
@@ -18,7 +18,7 @@
#ifndef DIRECTDRAW_VERSION
#define DIRECTDRAW_VERSION 0x0700
#endif
#endif
#undef ENABLE_NAMELESS_UNION_PRAGMA
#ifdef DIRECTX_REDIST
@@ -46,7 +46,7 @@
#ifdef __cplusplus
extern "C" {
#endif
#endif
/* This define are obsolete in ms ddk, but are use internal in Windows NT4/2000/XP/2003/ReactOS */
#define DDCAPS_STEREOVIEW 0x00040000
@@ -158,7 +158,7 @@ extern "C" {
#define DDERR_NOFOCUSWINDOW MAKE_DDHRESULT(602)
#define DDERR_NOTONMIPMAPSUBLEVEL MAKE_DDHRESULT(603)
#define DDERR_DCALREADYCREATED MAKE_DDHRESULT(620)
#define DDERR_NONONLOCALVIDMEM MAKE_DDHRESULT(630)
#define DDERR_NONONLOCALVIDMEM MAKE_DDHRESULT(630)
#define DDERR_CANTPAGELOCK MAKE_DDHRESULT(640)
#define DDERR_CANTPAGEUNLOCK MAKE_DDHRESULT(660)
#define DDERR_NOTPAGELOCKED MAKE_DDHRESULT(680)
@@ -289,7 +289,7 @@ extern "C" {
DDSCAPS2_CUBEMAP_NEGATIVEY |\
DDSCAPS2_CUBEMAP_POSITIVEZ |\
DDSCAPS2_CUBEMAP_NEGATIVEZ )
#define DDSCAPS2_MIPMAPSUBLEVEL 0x00010000
#define DDSCAPS2_D3DTEXTUREMANAGE 0x00020000
#define DDSCAPS2_DONOTPERSIST 0x00040000
@@ -659,7 +659,7 @@ extern "C" {
#ifndef MAKEFOURCC
#define MAKEFOURCC(c0,c1,c2,c3) \
((DWORD)(BYTE)(c0)|((DWORD)(BYTE)(c1)<<8)|((DWORD)(BYTE)(c2)<< 16)|((DWORD)(BYTE)(c3)<<24))
#endif
#endif
#define FOURCC_DXT1 (MAKEFOURCC('D','X','T','1'))
#define FOURCC_DXT2 (MAKEFOURCC('D','X','T','2'))
@@ -997,7 +997,7 @@ typedef struct _DDCAPS_DX7
DWORD dwNLVBCKeyCaps;
DWORD dwNLVBFXCaps;
DWORD dwNLVBRops[DD_ROP_SPACE];
DDSCAPS2 ddsCaps;
DDSCAPS2 ddsCaps;
} DDCAPS_DX7, *LPDDCAPS_DX7;
#if DIRECTDRAW_VERSION<=0x300
@@ -1030,7 +1030,7 @@ typedef struct _DDCOLORKEY
{
DWORD dwColorSpaceLowValue;
DWORD dwColorSpaceHighValue;
} DDCOLORKEY, *LPDDCOLORKEY;
typedef struct _DDOSCAPS
@@ -1068,7 +1068,7 @@ typedef struct _DDPIXELFORMAT
{
DWORD dwRBitMask;
DWORD dwYBitMask;
DWORD dwStencilBitDepth;
DWORD dwStencilBitDepth;
DWORD dwLuminanceBitMask;
DWORD dwBumpDuBitMask;
DWORD dwOperations;
@@ -1205,7 +1205,7 @@ typedef struct _DDRGBA
typedef BOOL (* LPDDENUMCALLBACKW)(GUID *, LPWSTR, LPWSTR, LPVOID);
extern HRESULT WINAPI DirectDrawEnumerateW( LPDDENUMCALLBACKW lpCallback, LPVOID lpContext );
extern HRESULT WINAPI DirectDrawEnumerateA( LPDDENUMCALLBACKA lpCallback, LPVOID lpContext );
#if !defined(HMONITOR_DECLARED) && (WINVER < 0x0500)
#define HMONITOR_DECLARED
DECLARE_HANDLE(HMONITOR);
@@ -1213,10 +1213,10 @@ typedef struct _DDRGBA
typedef BOOL (*LPDDENUMCALLBACKEXA)(GUID *, LPSTR, LPSTR, LPVOID, HMONITOR);
typedef BOOL (*LPDDENUMCALLBACKEXW)(GUID *, LPWSTR, LPWSTR, LPVOID, HMONITOR);
extern HRESULT WINAPI DirectDrawEnumerateExW( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
extern HRESULT WINAPI DirectDrawEnumerateExA( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXA)( LPDDENUMCALLBACKEXA lpCallback, LPVOID lpContext, DWORD dwFlags);
typedef HRESULT (WINAPI * LPDIRECTDRAWENUMERATEEXW)( LPDDENUMCALLBACKEXW lpCallback, LPVOID lpContext, DWORD dwFlags);
@@ -1312,20 +1312,20 @@ typedef struct tagDDDEVICEIDENTIFIER
char szDriver[MAX_DDDEVICEID_STRING];
char szDescription[MAX_DDDEVICEID_STRING];
#ifdef _WIN32
LARGE_INTEGER liDriverVersion;
LARGE_INTEGER liDriverVersion;
#else
DWORD dwDriverVersionLowPart;
DWORD dwDriverVersionLowPart;
DWORD dwDriverVersionHighPart;
#endif
DWORD dwVendorId;
DWORD dwDeviceId;
DWORD dwSubSysId;
DWORD dwRevision;
DWORD dwRevision;
GUID guidDeviceIdentifier;
} DDDEVICEIDENTIFIER, * LPDDDEVICEIDENTIFIER;
typedef struct tagDDDEVICEIDENTIFIER2
{
{
char szDriver[MAX_DDDEVICEID_STRING];
char szDescription[MAX_DDDEVICEID_STRING];
#ifdef _WIN32
@@ -1382,11 +1382,11 @@ typedef struct _DDOVERLAYFX
#define INTERFACE IDirectDraw
DECLARE_INTERFACE_( IDirectDraw, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(Compact)(THIS) PURE;
STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER *, IUnknown * ) PURE;
STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown * ) PURE;
@@ -1464,10 +1464,10 @@ typedef struct _DDOVERLAYFX
#undef INTERFACE
#define INTERFACE IDirectDraw2
DECLARE_INTERFACE_( IDirectDraw2, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(Compact)(THIS) PURE;
STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER *, IUnknown * ) PURE;
STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown * ) PURE;
@@ -1487,7 +1487,7 @@ typedef struct _DDOVERLAYFX
STDMETHOD(RestoreDisplayMode)(THIS) PURE;
STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD, DWORD, DWORD) PURE;
STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS, LPDWORD, LPDWORD) PURE;
};
@@ -1549,10 +1549,10 @@ typedef struct _DDOVERLAYFX
#define INTERFACE IDirectDraw4
DECLARE_INTERFACE_( IDirectDraw4, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(Compact)(THIS) PURE;
STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER *, IUnknown * ) PURE;
STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown * ) PURE;
@@ -1572,8 +1572,8 @@ typedef struct _DDOVERLAYFX
STDMETHOD(RestoreDisplayMode)(THIS) PURE;
STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD, DWORD, DWORD) PURE;
STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2, LPDWORD, LPDWORD) PURE;
STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2, LPDWORD, LPDWORD) PURE;
STDMETHOD(GetSurfaceFromDC) (THIS_ HDC, LPDIRECTDRAWSURFACE4 *) PURE;
STDMETHOD(RestoreAllSurfaces)(THIS) PURE;
STDMETHOD(TestCooperativeLevel)(THIS) PURE;
@@ -1645,10 +1645,10 @@ typedef struct _DDOVERLAYFX
#define INTERFACE IDirectDraw7
DECLARE_INTERFACE_( IDirectDraw7, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(Compact)(THIS) PURE;
STDMETHOD(CreateClipper)(THIS_ DWORD, LPDIRECTDRAWCLIPPER *, IUnknown * ) PURE;
STDMETHOD(CreatePalette)(THIS_ DWORD, LPPALETTEENTRY, LPDIRECTDRAWPALETTE *, IUnknown * ) PURE;
@@ -1668,8 +1668,8 @@ typedef struct _DDOVERLAYFX
STDMETHOD(RestoreDisplayMode)(THIS) PURE;
STDMETHOD(SetCooperativeLevel)(THIS_ HWND, DWORD) PURE;
STDMETHOD(SetDisplayMode)(THIS_ DWORD, DWORD,DWORD, DWORD, DWORD) PURE;
STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2, LPDWORD, LPDWORD) PURE;
STDMETHOD(WaitForVerticalBlank)(THIS_ DWORD, HANDLE ) PURE;
STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2, LPDWORD, LPDWORD) PURE;
STDMETHOD(GetSurfaceFromDC) (THIS_ HDC, LPDIRECTDRAWSURFACE7 *) PURE;
STDMETHOD(RestoreAllSurfaces)(THIS) PURE;
STDMETHOD(TestCooperativeLevel)(THIS) PURE;
@@ -1780,10 +1780,10 @@ typedef struct _DDOVERLAYFX
#define INTERFACE IDirectDrawGammaControl
DECLARE_INTERFACE_( IDirectDrawGammaControl, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(GetGammaRamp)(THIS_ DWORD, LPDDGAMMARAMP) PURE;
STDMETHOD(SetGammaRamp)(THIS_ DWORD, LPDDGAMMARAMP) PURE;
};
@@ -1807,10 +1807,10 @@ typedef struct _DDOVERLAYFX
#define INTERFACE IDirectDrawColorControl
DECLARE_INTERFACE_( IDirectDrawColorControl, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(GetColorControls)(THIS_ LPDDCOLORCONTROL) PURE;
STDMETHOD(SetColorControls)(THIS_ LPDDCOLORCONTROL) PURE;
};
@@ -1834,7 +1834,7 @@ typedef struct _DDOVERLAYFX
#undef INTERFACE
#define INTERFACE IDirectDrawClipper
DECLARE_INTERFACE_( IDirectDrawClipper, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
@@ -1873,10 +1873,10 @@ typedef struct _DDOVERLAYFX
#define INTERFACE IDirectDrawSurface
DECLARE_INTERFACE_( IDirectDrawSurface, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE) PURE;
STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE, LPRECT,DWORD, LPDDBLTFX) PURE;
@@ -1995,7 +1995,7 @@ typedef struct _DDOVERLAYFX
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE2) PURE;
STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE2, LPRECT,DWORD, LPDDBLTFX) PURE;
@@ -2028,7 +2028,7 @@ typedef struct _DDOVERLAYFX
STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE2,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE2) PURE;
STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE2) PURE;
STDMETHOD(GetDDInterface)(THIS_ LPVOID *) PURE;
STDMETHOD(PageLock)(THIS_ DWORD) PURE;
STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
@@ -2124,7 +2124,7 @@ DECLARE_INTERFACE_( IDirectDrawSurface3, IUnknown )
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE3) PURE;
STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE3, LPRECT,DWORD, LPDDBLTFX) PURE;
@@ -2157,10 +2157,10 @@ DECLARE_INTERFACE_( IDirectDrawSurface3, IUnknown )
STDMETHOD(Unlock)(THIS_ LPVOID) PURE;
STDMETHOD(UpdateOverlay)(THIS_ LPRECT, LPDIRECTDRAWSURFACE3,LPRECT,DWORD, LPDDOVERLAYFX) PURE;
STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD) PURE;
STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE3) PURE;
STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE3) PURE;
STDMETHOD(GetDDInterface)(THIS_ LPVOID *) PURE;
STDMETHOD(PageLock)(THIS_ DWORD) PURE;
STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC, DWORD) PURE;
};
@@ -2254,10 +2254,10 @@ DECLARE_INTERFACE_( IDirectDrawSurface3, IUnknown )
#define INTERFACE IDirectDrawSurface4
DECLARE_INTERFACE_( IDirectDrawSurface4, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4) PURE;
STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE4, LPRECT,DWORD, LPDDBLTFX) PURE;
@@ -2293,8 +2293,8 @@ DECLARE_INTERFACE_( IDirectDrawSurface3, IUnknown )
STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE4) PURE;
STDMETHOD(GetDDInterface)(THIS_ LPVOID *) PURE;
STDMETHOD(PageLock)(THIS_ DWORD) PURE;
STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2, DWORD) PURE;
STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2, DWORD) PURE;
STDMETHOD(SetPrivateData)(THIS_ REFGUID, LPVOID, DWORD, DWORD) PURE;
STDMETHOD(GetPrivateData)(THIS_ REFGUID, LPVOID, LPDWORD) PURE;
STDMETHOD(FreePrivateData)(THIS_ REFGUID) PURE;
@@ -2401,10 +2401,10 @@ DECLARE_INTERFACE_( IDirectDrawSurface3, IUnknown )
#define INTERFACE IDirectDrawSurface7
DECLARE_INTERFACE_( IDirectDrawSurface7, IUnknown )
{
{
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE7) PURE;
STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT) PURE;
STDMETHOD(Blt)(THIS_ LPRECT,LPDIRECTDRAWSURFACE7, LPRECT,DWORD, LPDDBLTFX) PURE;
@@ -2440,13 +2440,13 @@ DECLARE_INTERFACE_( IDirectDrawSurface3, IUnknown )
STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD, LPDIRECTDRAWSURFACE7) PURE;
STDMETHOD(GetDDInterface)(THIS_ LPVOID *) PURE;
STDMETHOD(PageLock)(THIS_ DWORD) PURE;
STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2, DWORD) PURE;
STDMETHOD(PageUnlock)(THIS_ DWORD) PURE;
STDMETHOD(SetSurfaceDesc)(THIS_ LPDDSURFACEDESC2, DWORD) PURE;
STDMETHOD(SetPrivateData)(THIS_ REFGUID, LPVOID, DWORD, DWORD) PURE;
STDMETHOD(GetPrivateData)(THIS_ REFGUID, LPVOID, LPDWORD) PURE;
STDMETHOD(FreePrivateData)(THIS_ REFGUID) PURE;
STDMETHOD(GetUniquenessValue)(THIS_ LPDWORD) PURE;
STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
STDMETHOD(ChangeUniquenessValue)(THIS) PURE;
STDMETHOD(SetPriority)(THIS_ DWORD) PURE;
STDMETHOD(GetPriority)(THIS_ LPDWORD) PURE;
STDMETHOD(SetLOD)(THIS_ DWORD) PURE;
reactos/include/dxsdk/dmdls.h
+1 -1
View File
@@ -132,7 +132,7 @@ typedef struct _DMUS_WAVE
typedef struct _DMUS_WAVEDATA
{
ULONG cbSize;
BYTE byData[DMUS_MIN_DATA_SIZE];
BYTE byData[DMUS_MIN_DATA_SIZE];
} DMUS_WAVEDATA;
typedef struct _DMUS_ARTICULATION
reactos/include/dxsdk/dmusics.h
+4 -4
View File
@@ -9,7 +9,7 @@
interface IDirectMusicSynth;
interface IDirectMusicSynthSink;
#ifndef __cplusplus
#ifndef __cplusplus
typedef interface IDirectMusicSynth IDirectMusicSynth;
typedef interface IDirectMusicSynthSink IDirectMusicSynthSink;
#endif
@@ -22,7 +22,7 @@ DEFINE_GUID(IID_IDirectMusicSynth, 0x9823661, 0x5C85, 0x11D2, 0xAF, 0x
DEFINE_GUID(IID_IDirectMusicSynth8, 0x53CAB625, 0x2711, 0x4C9F, 0x9D, 0xE7, 0x1B, 0x7F, 0x92, 0x5F, 0x6F, 0xC8);
DEFINE_GUID(IID_IDirectMusicSynthSink, 0x09823663, 0x5C85, 0x11D2, 0xAF, 0xA6, 0x00, 0xAA, 0x00, 0x24, 0xD8, 0xB6);
DEFINE_GUID(GUID_DMUS_PROP_SetSynthSink, 0x0A3A5BA5, 0x37B6, 0x11D2, 0xB9, 0xF9, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12);
DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xBE208857, 0x8952, 0x11D2, 0xBA, 0x1C, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12);
DEFINE_GUID(GUID_DMUS_PROP_SinkUsesDSound, 0xBE208857, 0x8952, 0x11D2, 0xBA, 0x1C, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12);
#define REFRESH_F_LASTBUFFER 0x00000001
@@ -30,7 +30,7 @@ typedef struct _DMUS_VOICE_STATE
{
BOOL bExists;
SAMPLE_POSITION spPosition;
} DMUS_VOICE_STATE;
} DMUS_VOICE_STATE;
#endif
@@ -72,7 +72,7 @@ DECLARE_INTERFACE_(IDirectMusicSynth8, IDirectMusicSynth)
STDMETHOD(Close) (THIS) PURE;
STDMETHOD(SetNumChannelGroups) (THIS_ DWORD dwGroups) PURE;
STDMETHOD(Download) (THIS_ LPHANDLE phDownload, LPVOID pvData, LPBOOL pbFree ) PURE;
STDMETHOD(Unload) (THIS_ HANDLE hDownload, HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData ) PURE;
STDMETHOD(Unload) (THIS_ HANDLE hDownload, HRESULT ( CALLBACK *lpFreeHandle)(HANDLE,HANDLE), HANDLE hUserData ) PURE;
STDMETHOD(PlayBuffer) (THIS_ REFERENCE_TIME rt, LPBYTE pbBuffer, DWORD cbBuffer) PURE;
STDMETHOD(GetRunningStats) (THIS_ LPDMUS_SYNTHSTATS pStats) PURE;
STDMETHOD(GetPortCaps) (THIS_ LPDMUS_PORTCAPS pCaps) PURE;
reactos/include/dxsdk/dsetup.h
+1 -1
View File
@@ -129,7 +129,7 @@ INT WINAPI DirectXUnRegisterApplication( HWND hWnd, LPGUID lpGUID);
#define DirectXSetup DirectXSetupA
#define DirectXRegisterApplication DirectXRegisterApplicationA
#define DirectXSetupGetEULA DirectXSetupGetEULAA
#endif
typedef DWORD (*DSETUP_CALLBACK)( DWORD Reason, DWORD MsgType, LPSTR szMessage,
reactos/include/dxsdk/dv.h
+1 -1
View File
@@ -11,7 +11,7 @@ typedef struct Tag_DVAudInfo
WORD wBlkMode;
WORD wDIFMode;
WORD wBlkDiv;
} DVAudInfo;
#define DV_AUDIOMODE 0x00000f00
reactos/include/dxsdk/dxdiag.h
+2 -2
View File
@@ -35,7 +35,7 @@ DECLARE_INTERFACE_(IDxDiagContainer,IUnknown)
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(GetNumberOfChildContainers) (THIS_ DWORD *pdwCount) PURE;
STDMETHOD(EnumChildContainerNames) (THIS_ DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) PURE;
STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE;
STDMETHOD(GetChildContainer) (THIS_ LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) PURE;
STDMETHOD(GetNumberOfProps) (THIS_ DWORD *pdwCount) PURE;
STDMETHOD(EnumPropNames) (THIS_ DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) PURE;
STDMETHOD(GetProp) (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE;
@@ -49,7 +49,7 @@ DECLARE_INTERFACE_(IDxDiagProvider,IUnknown)
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE;
STDMETHOD_(ULONG,AddRef) (THIS) PURE;
STDMETHOD_(ULONG,Release) (THIS) PURE;
STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE;
STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE;
};
reactos/include/dxsdk/dxerr9.h
+2 -2
View File
@@ -3,7 +3,7 @@
#ifdef __cplusplus
extern "C" {
#endif
#endif
const char* WINAPI DXGetErrorString9A(HRESULT hr);
@@ -22,7 +22,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC
#define DXGetErrorString9 DXGetErrorString9A
#define DXGetErrorDescription9 DXGetErrorDescription9A
#define DXTrace DXTraceA
#endif
#endif
#if defined(DEBUG) | defined(_DEBUG)
reactos/include/dxsdk/dxsdkver.h
+1 -1
View File
@@ -7,4 +7,4 @@
#define _DXSDK_BUILD_MAJOR 91
#define _DXSDK_BUILD_MINOR 0000
#endif
#endif
reactos/include/dxsdk/mmstream.idl
+1 -1
View File
@@ -23,7 +23,7 @@ cpp_quote("#define MS_E_NOTRUNNING MS_ERROR_CODE(10)")
// FIXME HACK remove the // for two cpp_quote
// FIXME HACK remove the // for two cpp_quote
cpp_quote("#if 0");
typedef LPVOID PAPCFUNC;
cpp_quote("#endif");
reactos/include/dxsdk/regbag.idl
+1 -1
View File
@@ -7,7 +7,7 @@ import "oaidl.idl";
import "ocidl.idl";
#endif
[object,
[object,
hidden, restricted,
uuid(8A674B48-1F63-11d3-B64C-00C04F79498E),
pointer_default(unique),
reactos/include/dxsdk/tvratings.idl
+10 -10
View File
@@ -2,7 +2,7 @@
import "oaidl.idl";
import "ocidl.idl";
typedef enum
typedef enum
{
MPAA = 0,
US_TV = 1,
@@ -32,7 +32,7 @@ typedef enum
} EnTvRat_GenericLevel;
typedef enum
typedef enum
{
MPAA_NotApplicable = TvRat_0,
MPAA_G = TvRat_1,
@@ -44,7 +44,7 @@ typedef enum
MPAA_NotRated = TvRat_7
} EnTvRat_MPAA;
typedef enum
typedef enum
{
US_TV_None = TvRat_0,
US_TV_Y = TvRat_1,
@@ -56,7 +56,7 @@ typedef enum
US_TV_None7 = TvRat_7
} EnTvRat_US_TV;
typedef enum
typedef enum
{
CAE_TV_Exempt = TvRat_0,
CAE_TV_C = TvRat_1,
@@ -68,7 +68,7 @@ typedef enum
CAE_TV_Reserved = TvRat_7
} EnTvRat_CAE_TV;
typedef enum
typedef enum
{
CAF_TV_Exempt = TvRat_0,
CAF_TV_G = TvRat_1,
@@ -80,7 +80,7 @@ typedef enum
CAF_TV_Reserved = TvRat_7
} EnTvRat_CAF_TV;
typedef enum
typedef enum
{
BfAttrNone = 0,
BfIsBlocked = 1,
@@ -94,7 +94,7 @@ typedef enum
BfValidAttrSubmask = 255
} BfEnTvRat_GenericAttributes;
typedef enum
typedef enum
{
US_TV_IsBlocked = BfIsBlocked,
US_TV_IsViolent = BfIsAttr_1,
@@ -104,19 +104,19 @@ typedef enum
US_TV_ValidAttrSubmask = 31
} BfEnTvRat_Attributes_US_TV;
typedef enum
typedef enum
{
MPAA_IsBlocked = BfIsBlocked,
MPAA_ValidAttrSubmask = 1
} BfEnTvRat_Attributes_MPAA;
typedef enum
typedef enum
{
CAE_IsBlocked = BfIsBlocked,
CAE_ValidAttrSubmask = 1
} BfEnTvRat_Attributes_CAE_TV;
typedef enum
typedef enum
{
CAF_IsBlocked = BfIsBlocked,
CAF_ValidAttrSubmask = 1
reactos/include/dxsdk/vpconfig.h
+2 -2
View File
@@ -18,7 +18,7 @@ DECLARE_INTERFACE_(IVPBaseConfig, IUnknown)
STDMETHOD (GetMaxPixelRate)(THIS_ IN OUT LPAMVPSIZE pamvpSize,
OUT LPDWORD pdwMaxPixelsPerSecond) PURE;
STDMETHOD (InformVPInputFormats)(THIS_ IN DWORD dwNumFormats,
STDMETHOD (InformVPInputFormats)(THIS_ IN DWORD dwNumFormats,
IN LPDDPIXELFORMAT pDDPixelFormats) PURE;
STDMETHOD (GetVideoFormats)(THIS_ IN OUT LPDWORD pdwNumFormats,
@@ -30,7 +30,7 @@ DECLARE_INTERFACE_(IVPBaseConfig, IUnknown)
STDMETHOD (SetDirectDrawKernelHandle)(THIS_ IN ULONG_PTR dwDDKernelHandle) PURE;
STDMETHOD (SetVideoPortID)(THIS_ IN DWORD dwVideoPortID) PURE;
STDMETHOD (SetDDSurfaceKernelHandles)(THIS_ IN DWORD cHandles,
STDMETHOD (SetDDSurfaceKernelHandles)(THIS_ IN DWORD cHandles,
IN ULONG_PTR *rgDDKernelHandles) PURE;
STDMETHOD (SetSurfaceParameters)(THIS_ IN DWORD dwPitch, IN DWORD dwXOrigin,
reactos/include/host/typedefs.h
+1 -1
View File
@@ -46,7 +46,7 @@
#define FALSE 0
#define TRUE (!(FALSE))
/* FIXME: this value is target specific, host tools MUST not use it
/* FIXME: this value is target specific, host tools MUST not use it
* and this line has to be removed */
#define PAGE_SIZE 4096
reactos/include/ndk/extypes.h
+3 -3
View File
@@ -832,7 +832,7 @@ typedef struct _SYSTEM_PERFORMANCE_INFORMATION
ULONG SystemCalls;
} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION;
// Class 3
// Class 3
typedef struct _SYSTEM_TIMEOFDAY_INFORMATION
{
LARGE_INTEGER BootTime;
@@ -1170,7 +1170,7 @@ typedef struct _SYSTEM_GDI_DRIVER_INFORMATION
} SYSTEM_GDI_DRIVER_INFORMATION, *PSYSTEM_GDI_DRIVER_INFORMATION;
// Class 27
// Not an actually class, simply a PVOID to the ImageAddress
// Not an actually class, simply a PVOID to the ImageAddress
// Class 28
typedef struct _SYSTEM_QUERY_TIME_ADJUST_INFORMATION
@@ -1356,7 +1356,7 @@ typedef struct _SYSTEM_VERIFIER_INFORMATION
// FIXME: Class 52
// Class 53
// Class 53
typedef struct _SYSTEM_SESSION_PROCESS_INFORMATION
{
ULONG SessionId;
reactos/include/ndk/i386/ketypes.h
+1 -1
View File
@@ -609,7 +609,7 @@ typedef struct _KIPCR
union
{
NT_TIB NtTib;
struct
struct
{
struct _EXCEPTION_REGISTRATION_RECORD *Used_ExceptionList;
PVOID Used_StackBase;
reactos/include/ndk/ldrfuncs.h
+1 -1
View File
@@ -50,7 +50,7 @@ LdrFindResource_U(
);
NTSTATUS
NTAPI
NTAPI
LdrFindResourceDirectory_U(
IN PVOID BaseAddress,
IN PLDR_RESOURCE_INFO ResourceInfo,
reactos/include/ndk/psfuncs.h
+2 -2
View File
@@ -82,7 +82,7 @@ PsGetThreadHardErrorsAreDisabled(
);
NTKERNELAPI
VOID
VOID
NTAPI
PsSetThreadHardErrorsAreDisabled(
PETHREAD Thread,
@@ -90,7 +90,7 @@ PsSetThreadHardErrorsAreDisabled(
);
NTKERNELAPI
VOID
VOID
NTAPI
PsEstablishWin32Callouts(
PWIN32_CALLOUTS_FPNS CalloutData
reactos/include/ndk/pstypes.h
+1 -1
View File
@@ -697,7 +697,7 @@ typedef struct _INITIAL_TEB
//
// TEB Active Frame Structures
//
typedef struct _TEB_ACTIVE_FRAME_CONTEXT
typedef struct _TEB_ACTIVE_FRAME_CONTEXT
{
ULONG Flags;
LPSTR FrameName;
reactos/include/psdk/activscp.idl
+10 -10
View File
@@ -19,7 +19,7 @@
import "ocidl.idl";
import "oleidl.idl";
import "oaidl.idl";
typedef enum tagSCRIPTSTATE {
SCRIPTSTATE_UNINITIALIZED = 0,
SCRIPTSTATE_STARTED = 1,
@@ -91,13 +91,13 @@ interface IActiveScriptError : IUnknown
HRESULT GetExceptionInfo(
[out] EXCEPINFO *pexcepinfo
);
HRESULT GetSourcePosition(
[out] DWORD *pdwSourceContext,
[out] ULONG *pulLineNumber,
[out] LONG *plCharacterPosition
);
HRESULT GetSourceLineText(
[out] BSTR *pbstrSourceLine
);
@@ -112,33 +112,33 @@ interface IActiveScriptSite : IUnknown
{
HRESULT GetLCID(
[out] LCID *plcid);
HRESULT GetItemInfo(
[in] LPCOLESTR pstrName,
[in] DWORD dwReturnMask,
[out] IUnknown **ppiunkItem,
[out] ITypeInfo **ppti
);
HRESULT GetDocVersionString(
[out] BSTR *pbstrVersion
);
HRESULT OnScriptTerminate(
[in] const VARIANT *pvarResult,
[in] const EXCEPINFO *pexcepinfo
);
HRESULT OnStateChange(
[in] SCRIPTSTATE ssScriptState
);
HRESULT OnScriptError(
[in] IActiveScriptError *pscripterror
);
HRESULT OnEnterScript(void);
HRESULT OnLeaveScript(void);
}
reactos/include/psdk/af_irda.h
+1 -1
View File
@@ -53,7 +53,7 @@ DEFINE_GUID(GUID_DEVINTERFACE_IRDAENUM_BUS_ENUMERATOR,
#define IRDA_PROTO_SOCK_STREAM 1
#define PF_IRDA AF_IRDA
#define SOL_IRLMP 0x00FF
#define SIO_LAZY_DISCOVERY _IOR('t', 127, ULONG)
#define SIO_LAZY_DISCOVERY _IOR('t', 127, ULONG)
#define IAS_MAX_USER_STRING 256
reactos/include/psdk/cryptuiapi.h
+1 -1
View File
@@ -5,7 +5,7 @@ typedef struct _CRYPTUI_CERT_MGR_STRUCT {
DWORD dwFlags;
LPCWSTR pwszTitle;
LPCSTR pszInitUsageOID;
} CRYPTUI_CERT_MGR_STRUCT,
} CRYPTUI_CERT_MGR_STRUCT,
*PCRYPTUI_CERT_MGR_STRUCT;
typedef const CRYPTUI_CERT_MGR_STRUCT *PCCRYPTUI_CERT_MGR_STRUCT;
reactos/include/psdk/cvconst.h
+8 -8
View File
@@ -40,13 +40,13 @@ enum SymTagEnum
SymTagPointerType,
SymTagArrayType,
SymTagBaseType,
SymTagTypedef,
SymTagTypedef,
SymTagBaseClass,
SymTagFriend,
SymTagFunctionArgType,
SymTagFuncDebugStart,
SymTagFunctionArgType,
SymTagFuncDebugStart,
SymTagFuncDebugEnd,
SymTagUsingNamespace,
SymTagUsingNamespace,
SymTagVTableShape,
SymTagVTable,
SymTagCustom,
@@ -287,7 +287,7 @@ enum CV_HREG_e
CV_M4_Psr = 51,
CV_M4_FltF0 = 60, /* this includes FltF1 to Flt31 */
CV_M4_FltFsr = 92,
/* Alpha AXP CPU */
CV_ALPHA_NOREG = CV_REG_NONE,
CV_ALPHA_FltF0 = 10, /* this includes FltF1 to FltF31 */
@@ -311,7 +311,7 @@ enum CV_HREG_e
CV_ALPHA_Psr = 76,
CV_ALPHA_FltFsr = 77,
CV_ALPHA_SoftFpcr = 78,
/* Motorola & IBM PowerPC CPU */
CV_PPC_GPR0 = 1, /* this includes GPR1 to GPR31 */
CV_PPC_CR = 33,
@@ -357,7 +357,7 @@ enum CV_HREG_e
CV_ARM_LR = 24,
CV_ARM_PC = 25,
CV_ARM_CPSR = 26,
/* Intel IA64 CPU */
CV_IA64_NOREG = CV_REG_NONE,
CV_IA64_Br0 = 512, /* this includes Br1 to Br7 */
@@ -428,5 +428,5 @@ typedef enum
THUNK_ORDINAL_ADJUSTOR,
THUNK_ORDINAL_VCALL,
THUNK_ORDINAL_PCODE,
THUNK_ORDINAL_LOAD
THUNK_ORDINAL_LOAD
} THUNK_ORDINAL;
reactos/include/psdk/d3d8types.h
+2 -2
View File
@@ -142,7 +142,7 @@
#define D3DTA_ALPHAREPLICATE 0x00000020
#define D3DTA_TEMP 0x00000005
#define D3DCOLORWRITEENABLE_RED (1L<<0)
#define D3DCOLORWRITEENABLE_RED (1L<<0)
#define D3DCOLORWRITEENABLE_GREEN (1L<<1)
#define D3DCOLORWRITEENABLE_BLUE (1L<<2)
#define D3DCOLORWRITEENABLE_ALPHA (1L<<3)
@@ -154,7 +154,7 @@
((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 ))
/****************************
/****************************
* Vertex Shaders Declaration
*/

Some files were not shown because too many files have changed in this diff Show More