[greatlrd] 30140: Fix varus issue. make audiosrv using the new ks.h and link with ksguid Fix dxapi build Fix ddkmapi.h so it works like windkk version 3790.1830 offline #define DEFINE_KSPROPERTY_TOPOLOGYSET in ks.h it seam some type problem there
4 Nov
2007
4 Nov
'07
11:54 p.m.
Author: greatlrd
Date: Mon Nov 5 02:54:40 2007
New Revision: 30140
URL: http://svn.reactos.org/svn/reactos?rev=30140&view=rev
Log:
Fix varus issue.
make audiosrv using the new ks.h and link with ksguid
Fix dxapi build
Fix ddkmapi.h so it works like windkk version 3790.1830
offline #define DEFINE_KSPROPERTY_TOPOLOGYSET in ks.h it seam some type problem there
Modified:
branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild
branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild
branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild
branches/reactx/reactos/include/ddk/ddkmapi.h
branches/reactx/reactos/include/dxsdk/ks.h
branches/reactx/reactos/lib/sdk/sdk.rbuild
Modified: branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/base/services/au…
==============================================================================
--- branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild (original)
+++ branches/reactx/reactos/base/services/audiosrv/audiosrv.rbuild Mon Nov 5 02:54:40
2007
@@ -9,6 +9,7 @@
<library>advapi32</library>
<library>user32</library>
<library>setupapi</library>
+ <library>ksguid</library>
<file>main.c</file>
<file>pnp_list_manager.c</file>
<file>pnp_list_lock.c</file>
Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra…
==============================================================================
--- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild (original)
+++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild Mon Nov 5 02:54:40 2007
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="ddraw" type="win32dll" entrypoint="0"
installbase="system32" installname="ddraw.dll" allowwarnings
="true">
+<module name="ddraw" type="win32dll"
installbase="system32" installname="ddraw.dll" allowwarnings
="true">
<importlibrary definition="ddraw.def" />
<include base="ddraw">.</include>
<define name="UNICODE" />
Modified: branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/drivers/directx/…
==============================================================================
--- branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild (original)
+++ branches/reactx/reactos/drivers/directx/dxapi/dxapi.rbuild Mon Nov 5 02:54:40 2007
@@ -8,7 +8,7 @@
<define name="_DXAPI_" />
<library>ntoskrnl</library>
<library>hal</library>
- <library>videoport</library>
+ <library>videoprt</library>
<file>main.c</file>
<file>dxapi.rc</file>
</module>
Modified: branches/reactx/reactos/include/ddk/ddkmapi.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/ddk/ddkm…
==============================================================================
--- branches/reactx/reactos/include/ddk/ddkmapi.h (original)
+++ branches/reactx/reactos/include/ddk/ddkmapi.h Mon Nov 5 02:54:40 2007
@@ -20,16 +20,9 @@
*
*/
-#ifndef __DDKMAPI_H
-#define __DDKMAPI_H
-
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef __DDKMAPI_INCLUDED__
+#define __DDKMAPI_INCLUDED__
+
#if defined(_DXAPI_)
#define DXAPI DECLSPEC_EXPORT
@@ -37,29 +30,12 @@
#define DXAPI DECLSPEC_IMPORT
#endif
-DXAPI
-DWORD
-FAR PASCAL
-DxApi(
- IN DWORD dwFunctionNum,
- IN LPVOID lpvInBuffer,
- IN DWORD cbInBuffer,
- OUT LPVOID lpvOutBuffer,
- OUT DWORD cbOutBuffer);
-
-typedef DWORD (FAR PASCAL *LPDXAPI)(
- DWORD dwFunctionNum,
- LPVOID lpvInBuffer,
- DWORD cbInBuffer,
- LPVOID lpvOutBuffer,
- DWORD cbOutBuffer);
#define DXAPI_MAJORVERSION 1
#define DXAPI_MINORVERSION 0
-#define DD_FIRST_DXAPI 0x500
-
+#define DD_FIRST_DXAPI 0x500
#define DD_DXAPI_GETVERSIONNUMBER (DD_FIRST_DXAPI)
#define DD_DXAPI_CLOSEHANDLE (DD_FIRST_DXAPI+1)
#define DD_DXAPI_OPENDIRECTDRAW (DD_FIRST_DXAPI+2)
@@ -83,114 +59,159 @@
#define DD_DXAPI_ADDVPCAPTUREBUFFER (DD_FIRST_DXAPI+20)
#define DD_DXAPI_FLUSHVPCAPTUREBUFFERS (DD_FIRST_DXAPI+21)
-
-typedef struct _DDCAPBUFFINFO {
- DWORD dwFieldNumber;
- DWORD bPolarity;
- LARGE_INTEGER liTimeStamp;
- DWORD ddRVal;
-} DDCAPBUFFINFO, FAR * LPDDCAPBUFFINFO;
+/* DDOPENVPCAPTUREDEVICEIN.dwFlags constants */
+#define DDOPENCAPTURE_VIDEO 0x0001
+#define DDOPENCAPTURE_VBI 0x0002
/* DDADDVPCAPTUREBUFF.dwFlags constants */
-#define DDADDBUFF_SYSTEMMEMORY 0x0001
-#define DDADDBUFF_NONLOCALVIDMEM 0x0002
-#define DDADDBUFF_INVERT 0x0004
-
-typedef struct _DDADDVPCAPTUREBUFF {
- HANDLE hCapture;
- DWORD dwFlags;
- PMDL pMDL;
- PKEVENT pKEvent;
- LPDDCAPBUFFINFO lpBuffInfo;
-} DDADDVPCAPTUREBUFF, FAR * LPDDADDVPCAPTUREBUFF;
-
-typedef struct _DDCLOSEHANDLE {
- HANDLE hHandle;
-} DDCLOSEHANDLE, FAR *LPDDCLOSEHANDLE;
-
-typedef struct _DDFLIPOVERLAY {
- HANDLE hDirectDraw;
+#define DDADDBUFF_SYSTEMMEMORY 0x0001
+#define DDADDBUFF_NONLOCALVIDMEM 0x0002
+#define DDADDBUFF_INVERT 0x0004
+
+/* DDGETSURFACESTATEOUT.dwStateCaps/dwStateStatus constants */
+#define DDSTATE_BOB 0x0001
+#define DDSTATE_WEAVE 0x0002
+#define DDSTATE_EXPLICITLY_SET 0x0004
+#define DDSTATE_SOFTWARE_AUTOFLIP 0x0008
+#define DDSTATE_SKIPEVENFIELDS 0x0010
+
+/* DDREGISTERCALLBACK.dwEvents constants */
+#define DDEVENT_DISPLAY_VSYNC 0x0001
+#define DDEVENT_VP_VSYNC 0x0002
+#define DDEVENT_VP_LINE 0x0004
+#define DDEVENT_PRERESCHANGE 0x0008
+#define DDEVENT_POSTRESCHANGE 0x0010
+#define DDEVENT_PREDOSBOX 0x0020
+#define DDEVENT_POSTDOSBOX 0x0040
+
+/* LPDD_NOTIFYCALLBACK.dwFlags constants */
+#define DDNOTIFY_DISPLAY_VSYNC 0x0001
+#define DDNOTIFY_VP_VSYNC 0x0002
+#define DDNOTIFY_VP_LINE 0x0004
+#define DDNOTIFY_PRERESCHANGE 0x0008
+#define DDNOTIFY_POSTRESCHANGE 0x0010
+#define DDNOTIFY_PREDOSBOX 0x0020
+#define DDNOTIFY_POSTDOSBOX 0x0040
+#define DDNOTIFY_CLOSEDIRECTDRAW 0x0080
+#define DDNOTIFY_CLOSESURFACE 0x0100
+#define DDNOTIFY_CLOSEVIDEOPORT 0x0200
+#define DDNOTIFY_CLOSECAPTURE 0x0400
+
+typedef DWORD (*LPDXAPI)(DWORD dwFunctionNum, LPVOID lpvInBuffer, DWORD cbInBuffer,
LPVOID lpvOutBuffer, DWORD cbOutBuffer);
+typedef ULONG (*LPDD_NOTIFYCALLBACK) (DWORD dwFlags, PVOID pContext, DWORD dwParam1,
DWORD dwParam2);
+
+typedef struct _DDCAPBUFFINFO
+{
+ DWORD dwFieldNumber;
+ DWORD bPolarity;
+ LARGE_INTEGER liTimeStamp;
+ DWORD ddRVal;
+} DDCAPBUFFINFO, * LPDDCAPBUFFINFO;
+
+typedef struct _DDADDVPCAPTUREBUFF
+{
+ HANDLE hCapture;
+ DWORD dwFlags;
+ PMDL pMDL;
+ PKEVENT pKEvent;
+ LPDDCAPBUFFINFO lpBuffInfo;
+} DDADDVPCAPTUREBUFF, * LPDDADDVPCAPTUREBUFF;
+
+typedef struct _DDCLOSEHANDLE
+{
+ HANDLE hHandle;
+} DDCLOSEHANDLE, *LPDDCLOSEHANDLE;
+
+typedef struct _DDFLIPOVERLAY
+{
+ HANDLE hDirectDraw;
+ HANDLE hCurrentSurface;
+ HANDLE hTargetSurface;
+ DWORD dwFlags;
+} DDFLIPOVERLAY, *LPDDFLIPOVERLAY;
+
+typedef struct _DDFLIPVIDEOPORT
+{
+ HANDLE hDirectDraw;
+ HANDLE hVideoPort;
HANDLE hCurrentSurface;
HANDLE hTargetSurface;
DWORD dwFlags;
-} DDFLIPOVERLAY, FAR *LPDDFLIPOVERLAY;
-
-typedef struct _DDFLIPVIDEOPORT {
- HANDLE hDirectDraw;
- HANDLE hVideoPort;
- HANDLE hCurrentSurface;
- HANDLE hTargetSurface;
- DWORD dwFlags;
-} DDFLIPVIDEOPORT, FAR *LPDDFLIPVIDEOPORT;
-
-typedef struct _DDGETAUTOFLIPIN {
- HANDLE hDirectDraw;
- HANDLE hVideoPort;
-} DDGETAUTOFLIPIN, FAR *LPDDGETAUTOFLIPIN;
-
-typedef struct _DDGETAUTOFLIPOUT {
+} DDFLIPVIDEOPORT, *LPDDFLIPVIDEOPORT;
+
+typedef struct _DDGETAUTOFLIPIN
+{
+ HANDLE hDirectDraw;
+ HANDLE hVideoPort;
+} DDGETAUTOFLIPIN, *LPDDGETAUTOFLIPIN;
+
+typedef struct _DDGETAUTOFLIPOUT
+{
DWORD ddRVal;
HANDLE hVideoSurface;
HANDLE hVBISurface;
BOOL bPolarity;
-} DDGETAUTOFLIPOUT, FAR *LPDDGETAUTOFLIPOUT;
-
-typedef struct _DDGETPOLARITYIN {
- HANDLE hDirectDraw;
- HANDLE hVideoPort;
-} DDGETPOLARITYIN, FAR *LPDDGETPOLARITYIN;
-
-typedef struct _DDGETPOLARITYOUT {
+} DDGETAUTOFLIPOUT, *LPDDGETAUTOFLIPOUT;
+
+typedef struct _DDGETPOLARITYIN
+{
+ HANDLE hDirectDraw;
+ HANDLE hVideoPort;
+} DDGETPOLARITYIN, *LPDDGETPOLARITYIN;
+
+typedef struct _DDGETPOLARITYOUT
+{
DWORD ddRVal;
BOOL bPolarity;
-} DDGETPOLARITYOUT, FAR *LPDDGETPOLARITYOUT;
-
-typedef struct _DDGETSURFACESTATEIN {
+} DDGETPOLARITYOUT, *LPDDGETPOLARITYOUT;
+
+typedef struct _DDGETSURFACESTATEIN
+{
HANDLE hDirectDraw;
HANDLE hSurface;
-} DDGETSURFACESTATEIN, FAR *LPDDGETSURFACESTATEIN;
-
-/* DDGETSURFACESTATEOUT.dwStateCaps/dwStateStatus constants */
-#define DDSTATE_BOB 0x0001
-#define DDSTATE_WEAVE 0x0002
-#define DDSTATE_EXPLICITLY_SET 0x0004
-#define DDSTATE_SOFTWARE_AUTOFLIP 0x0008
-#define DDSTATE_SKIPEVENFIELDS 0x0010
-
-typedef struct _DDGETSURFACESTATEOUT {
+} DDGETSURFACESTATEIN, *LPDDGETSURFACESTATEIN;
+
+typedef struct _DDGETSURFACESTATEOUT
+{
DWORD ddRVal;
DWORD dwStateCaps;
DWORD dwStateStatus;
-} DDGETSURFACESTATEOUT, FAR *LPDDGETSURFACESTATEOUT;
-
-typedef struct _DDGETFIELDNUMIN {
- HANDLE hDirectDraw;
- HANDLE hVideoPort;
-} DDGETFIELDNUMIN, FAR *LPDDGETFIELDNUMIN;
-
-typedef struct _DDGETFIELDNUMOUT {
+} DDGETSURFACESTATEOUT, *LPDDGETSURFACESTATEOUT;
+
+typedef struct _DDGETFIELDNUMIN
+{
+ HANDLE hDirectDraw;
+ HANDLE hVideoPort;
+} DDGETFIELDNUMIN, *LPDDGETFIELDNUMIN;
+
+typedef struct _DDGETFIELDNUMOUT
+{
DWORD ddRVal;
DWORD dwFieldNum;
-} DDGETFIELDNUMOUT, FAR *LPDDGETFIELDNUMOUT;
-
-typedef struct _DDGETKERNELCAPSOUT {
+} DDGETFIELDNUMOUT, *LPDDGETFIELDNUMOUT;
+
+typedef struct _DDGETKERNELCAPSOUT
+{
DWORD ddRVal;
DWORD dwCaps;
DWORD dwIRQCaps;
-} DDGETKERNELCAPSOUT, FAR *LPDDGETKERNELCAPSOUT;
-
-typedef struct _DDGETVERSIONNUMBER {
+} DDGETKERNELCAPSOUT, *LPDDGETKERNELCAPSOUT;
+
+typedef struct _DDGETVERSIONNUMBER
+{
DWORD ddRVal;
DWORD dwMajorVersion;
DWORD dwMinorVersion;
-} DDGETVERSIONNUMBER, FAR *LPDDGETVERSIONNUMBER;
-
-typedef struct _DDLOCKIN {
+} DDGETVERSIONNUMBER, *LPDDGETVERSIONNUMBER;
+
+typedef struct _DDLOCKIN
+{
HANDLE hDirectDraw;
HANDLE hSurface;
-} DDLOCKIN, FAR *LPDDLOCKIN;
-
-typedef struct _DDLOCKOUT {
+} DDLOCKIN, *LPDDLOCKIN;
+
+typedef struct _DDLOCKOUT
+{
DWORD ddRVal;
DWORD dwSurfHeight;
DWORD dwSurfWidth;
@@ -200,79 +221,67 @@
DWORD dwFormatFlags;
DWORD dwFormatFourCC;
DWORD dwFormatBitCount;
- _ANONYMOUS_UNION union {
+ union
+ {
DWORD dwRBitMask;
DWORD dwYBitMask;
- } DUMMYUNIONNAME;
- _ANONYMOUS_UNION union {
+ };
+ union
+ {
DWORD dwGBitMask;
DWORD dwUBitMask;
- } DUMMYUNIONNAME2;
- _ANONYMOUS_UNION union {
+ };
+ union
+ {
DWORD dwBBitMask;
DWORD dwVBitMask;
- } DUMMYUNIONNAME3;
-} DDLOCKOUT, FAR *LPDDLOCKOUT;
-
-/* LPDD_NOTIFYCALLBACK.dwFlags constants */
-#define DDNOTIFY_DISPLAY_VSYNC 0x0001
-#define DDNOTIFY_VP_VSYNC 0x0002
-#define DDNOTIFY_VP_LINE 0x0004
-#define DDNOTIFY_PRERESCHANGE 0x0008
-#define DDNOTIFY_POSTRESCHANGE 0x0010
-#define DDNOTIFY_PREDOSBOX 0x0020
-#define DDNOTIFY_POSTDOSBOX 0x0040
-#define DDNOTIFY_CLOSEDIRECTDRAW 0x0080
-#define DDNOTIFY_CLOSESURFACE 0x0100
-#define DDNOTIFY_CLOSEVIDEOPORT 0x0200
-#define DDNOTIFY_CLOSECAPTURE 0x0400
-
-typedef ULONG (FAR PASCAL *LPDD_NOTIFYCALLBACK)(
- DWORD dwFlags,
- PVOID pContext,
- DWORD dwParam1,
- DWORD dwParam2);
-
-typedef struct _DDOPENDIRECTDRAWIN {
- ULONG_PTR dwDirectDrawHandle;
+ };
+} DDLOCKOUT, *LPDDLOCKOUT;
+
+
+typedef struct _DDOPENDIRECTDRAWIN
+{
+ ULONG_PTR dwDirectDrawHandle;
LPDD_NOTIFYCALLBACK pfnDirectDrawClose;
PVOID pContext;
-} DDOPENDIRECTDRAWIN, FAR *LPDDOPENDIRECTDRAWIN;
-
-typedef struct _DDOPENDIRECTDRAWOUT {
- DWORD ddRVal;
- HANDLE hDirectDraw;
-} DDOPENDIRECTDRAWOUT, FAR *LPDDOPENDIRECTDRAWOUT;
-
-typedef struct _DDOPENSURFACEIN {
+} DDOPENDIRECTDRAWIN, *LPDDOPENDIRECTDRAWIN;
+
+typedef struct _DDOPENDIRECTDRAWOUT
+{
+ DWORD ddRVal;
+ HANDLE hDirectDraw;
+} DDOPENDIRECTDRAWOUT, *LPDDOPENDIRECTDRAWOUT;
+
+typedef struct _DDOPENSURFACEIN
+{
HANDLE hDirectDraw;
ULONG_PTR dwSurfaceHandle;
LPDD_NOTIFYCALLBACK pfnSurfaceClose;
PVOID pContext;
-} DDOPENSURFACEIN, FAR *LPDDOPENSURFACEIN;
-
-typedef struct _DDOPENSURFACEOUT {
+} DDOPENSURFACEIN, *LPDDOPENSURFACEIN;
+
+typedef struct _DDOPENSURFACEOUT
+{
DWORD ddRVal;
HANDLE hSurface;
-} DDOPENSURFACEOUT, FAR *LPDDOPENSURFACEOUT;
-
-typedef struct _DDOPENVIDEOPORTIN {
+} DDOPENSURFACEOUT, *LPDDOPENSURFACEOUT;
+
+typedef struct _DDOPENVIDEOPORTIN
+{
HANDLE hDirectDraw;
ULONG dwVideoPortHandle;
LPDD_NOTIFYCALLBACK pfnVideoPortClose;
PVOID pContext;
-} DDOPENVIDEOPORTIN, FAR *LPDDOPENVIDEOPORTIN;
-
-typedef struct _DDOPENVIDEOPORTOUT {
- DWORD ddRVal;
- HANDLE hVideoPort;
-} DDOPENVIDEOPORTOUT, FAR *LPDDOPENVIDEOPORTOUT;
-
-/* DDOPENVPCAPTUREDEVICEIN.dwFlags constants */
-#define DDOPENCAPTURE_VIDEO 0x0001
-#define DDOPENCAPTURE_VBI 0x0002
-
-typedef struct _DDOPENVPCAPTUREDEVICEIN {
+} DDOPENVIDEOPORTIN, *LPDDOPENVIDEOPORTIN;
+
+typedef struct _DDOPENVIDEOPORTOUT
+{
+ DWORD ddRVal;
+ HANDLE hVideoPort;
+} DDOPENVIDEOPORTOUT, *LPDDOPENVIDEOPORTOUT;
+
+typedef struct _DDOPENVPCAPTUREDEVICEIN
+{
HANDLE hDirectDraw;
HANDLE hVideoPort;
DWORD dwStartLine;
@@ -281,52 +290,55 @@
LPDD_NOTIFYCALLBACK pfnCaptureClose;
PVOID pContext;
DWORD dwFlags;
-} DDOPENVPCAPTUREDEVICEIN, FAR * LPDDOPENVPCAPTUREDEVICEIN;
-
-typedef struct _DDOPENVPCAPTUREDEVICEOUT {
+} DDOPENVPCAPTUREDEVICEIN, * LPDDOPENVPCAPTUREDEVICEIN;
+
+typedef struct _DDOPENVPCAPTUREDEVICEOUT
+{
DWORD ddRVal;
HANDLE hCapture;
-} DDOPENVPCAPTUREDEVICEOUT, FAR * LPDDOPENVPCAPTUREDEVICEOUT;
-
-/* DDREGISTERCALLBACK.dwEvents constants */
-#define DDEVENT_DISPLAY_VSYNC 0x0001
-#define DDEVENT_VP_VSYNC 0x0002
-#define DDEVENT_VP_LINE 0x0004
-#define DDEVENT_PRERESCHANGE 0x0008
-#define DDEVENT_POSTRESCHANGE 0x0010
-#define DDEVENT_PREDOSBOX 0x0020
-#define DDEVENT_POSTDOSBOX 0x0040
-
-typedef struct _DDREGISTERCALLBACK {
+} DDOPENVPCAPTUREDEVICEOUT, * LPDDOPENVPCAPTUREDEVICEOUT;
+
+typedef struct _DDREGISTERCALLBACK
+{
HANDLE hDirectDraw;
ULONG dwEvents;
LPDD_NOTIFYCALLBACK pfnCallback;
ULONG_PTR dwParam1;
ULONG_PTR dwParam2;
PVOID pContext;
-} DDREGISTERCALLBACK, FAR *LPDDREGISTERCALLBACK;
-
-typedef struct _DDSETSURFACETATE {
+} DDREGISTERCALLBACK, *LPDDREGISTERCALLBACK;
+
+typedef struct _DDSETSURFACETATE
+{
HANDLE hDirectDraw;
HANDLE hSurface;
DWORD dwState;
DWORD dwStartField;
-} DDSETSURFACESTATE, FAR *LPDDSETSURFACESTATE;
-
-typedef struct _DDSETFIELDNUM {
+} DDSETSURFACESTATE, *LPDDSETSURFACESTATE;
+
+typedef struct _DDSETFIELDNUM
+{
HANDLE hDirectDraw;
HANDLE hVideoPort;
DWORD dwFieldNum;
-} DDSETFIELDNUM, FAR *LPDDSETFIELDNUM;
-
-typedef struct _DDSETSKIPFIELD {
+} DDSETFIELDNUM, *LPDDSETFIELDNUM;
+
+typedef struct _DDSETSKIPFIELD
+{
HANDLE hDirectDraw;
HANDLE hVideoPort;
DWORD dwStartField;
-} DDSETSKIPFIELD, FAR *LPDDSETSKIPFIELD;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __DDKMAPI_H */
+} DDSETSKIPFIELD, *LPDDSETSKIPFIELD;
+
+
+DXAPI
+DWORD
+DxApi(IN DWORD dwFunctionNum,
+ IN LPVOID lpvInBuffer,
+ IN DWORD cbInBuffer,
+ OUT LPVOID lpvOutBuffer,
+ OUT DWORD cbOutBuffer);
+
+
+
+#endif /* __DDKMAPI_INCLUDED__ */
Modified: branches/reactx/reactos/include/dxsdk/ks.h
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks…
==============================================================================
--- branches/reactx/reactos/include/dxsdk/ks.h (original)
+++ branches/reactx/reactos/include/dxsdk/ks.h Mon Nov 5 02:54:40 2007
@@ -1,3 +1,7 @@
+
+
+
+
#if !defined(_KS_)
#define _KS_
@@ -20,11 +24,11 @@
#endif
#if defined(__cplusplus) && _MSC_VER >= 1100
- #define DEFINE_GUIDSTRUCT(g, n) struct __declspec(uuid(g)) n
- #define DEFINE_GUIDNAMED(n) __uuidof(struct n)
+ #define DEFINE_GUIDSTRUCT(guid, name) struct __declspec(uuid(guid)) name
+ #define DEFINE_GUIDNAMED(name) __uidof(struct name)
#else
- #define DEFINE_GUIDSTRUCT(g, n) DEFINE_GUIDEX(n)
- #define DEFINE_GUIDNAMED(n) n
+ #define DEFINE_GUIDSTRUCT(guid, name) DEFINE_GUIDEX(name)
+ #define DEFINE_GUIDNAMED(name) name
#endif
@@ -32,10 +36,12 @@
DEFINE_GUIDSTRUCT("00000000-0000-0000-0000-000000000000", GUID_NULL);
#define GUID_NULL DEFINE_GUIDNAMED(GUID_NULL)
+
#define STATIC_KSPROPTYPESETID_General 0x97E99BA0, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28,
0xDB, 0x04, 0xC1, 0x00, 0x00
DEFINE_GUIDSTRUCT("97E99BA0-BDEA-11CF-A5D6-28DB04C10000",
KSPROPTYPESETID_General);
#define KSPROPTYPESETID_General DEFINE_GUIDNAMED(KSPROPTYPESETID_General)
+
#define STATIC_KSPROPSETID_General 0x1464EDA5, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0,
0xC9, 0x22, 0x31, 0x96
DEFINE_GUIDSTRUCT("1464EDA5-6A8F-11D1-9AA7-00A0C9223196",
KSPROPSETID_General);
#define KSPROPSETID_General DEFINE_GUIDNAMED(KSPROPSETID_General)
@@ -140,16 +146,6 @@
DEFINE_GUIDSTRUCT("8C6F932C-E771-11D0-B8FF-00A0C9223196",
KSINTERFACESETID_FileIo);
#define KSINTERFACESETID_FileIo DEFINE_GUIDNAMED(KSINTERFACESETID_FileIo)
-
-
-
-
-
-
-
-
-
-
#define STATIC_KSMEDIUMSETID_Standard 0x4747B320, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB,
0x04, 0xC1, 0x00, 0x00
DEFINE_GUIDSTRUCT("4747B320-62CE-11CF-A5D6-28DB04C10000",
KSMEDIUMSETID_Standard);
#define KSMEDIUMSETID_Standard DEFINE_GUIDNAMED(KSMEDIUMSETID_Standard)
@@ -206,8 +202,6 @@
DEFINE_GUIDSTRUCT("1D58C920-AC9B-11CF-A5D6-28DB04C10000",
KSPROPSETID_Connection);
#define KSPROPSETID_Connection DEFINE_GUIDNAMED(KSPROPSETID_Connection)
-
-
#define STATIC_KSMEMORY_TYPE_SYSTEM 0x091BB638, 0x603F, 0x11D1, 0xB0, 0x67, 0x00, 0xA0,
0xC9, 0x06, 0x28, 0x02
DEFINE_GUIDSTRUCT("091bb638-603f-11d1-b067-00a0c9062802",
KSMEMORY_TYPE_SYSTEM);
#define KSMEMORY_TYPE_SYSTEM DEFINE_GUIDNAMED(KSMEMORY_TYPE_SYSTEM)
@@ -263,6 +257,7 @@
#define STATIC_KSDEGRADESETID_Standard 0x9F564180, 0x704C, 0x11D0, 0xA5, 0xD6, 0x28,
0xDB, 0x04, 0xC1, 0x00, 0x00
DEFINE_GUIDSTRUCT("9F564180-704C-11D0-A5D6-28DB04C10000",
KSDEGRADESETID_Standard);
#define KSDEGRADESETID_Standard DEFINE_GUIDNAMED(KSDEGRADESETID_Standard)
+
#define KSSTRING_Filter L"{9B365890-165F-11D0-A195-0020AFD156E4}"
#define KSSTRING_Pin L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"
@@ -489,6 +484,12 @@
KSPROPERTY_GM_RATEMATCH,
KSPROPERTY_GM_RENDER_CLOCK,
} KSPROPERTY_GM;
+
+ typedef enum
+ {
+ KSPROPERTY_STREAMALLOCATOR_FUNCTIONTABLE,
+ KSPROPERTY_STREAMALLOCATOR_STATUS
+ } KSPROPERTY_STREAMALLOCATOR;
#if !defined(__wtypes_h__)
enum VARENUM
@@ -594,6 +595,38 @@
KSDEGRADE_STANDARD_SKIP
} KSDEGRADE_STANDARD;
+typedef enum
+{
+ KSPROPERTY_CLOCK_TIME,
+ KSPROPERTY_CLOCK_PHYSICALTIME,
+ KSPROPERTY_CLOCK_CORRELATEDTIME,
+ KSPROPERTY_CLOCK_CORRELATEDPHYSICALTIME,
+ KSPROPERTY_CLOCK_RESOLUTION,
+ KSPROPERTY_CLOCK_STATE,
+#if defined(_NTDDK_)
+ KSPROPERTY_CLOCK_FUNCTIONTABLE
+#endif // defined(_NTDDK_)
+} KSPROPERTY_CLOCK;
+
+typedef enum
+{
+ KSPROPERTY_STREAMINTERFACE_HEADERSIZE
+} KSPROPERTY_STREAMINTERFACE;
+
+typedef enum
+{
+ KSPROPERTY_STREAM_ALLOCATOR,
+ KSPROPERTY_STREAM_QUALITY,
+ KSPROPERTY_STREAM_DEGRADATION,
+ KSPROPERTY_STREAM_MASTERCLOCK,
+ KSPROPERTY_STREAM_TIMEFORMAT,
+ KSPROPERTY_STREAM_PRESENTATIONTIME,
+ KSPROPERTY_STREAM_PRESENTATIONEXTENT,
+ KSPROPERTY_STREAM_FRAMETIME,
+ KSPROPERTY_STREAM_RATECAPABILITY,
+ KSPROPERTY_STREAM_RATE,
+ KSPROPERTY_STREAM_PIPE_ID
+} KSPROPERTY_STREAM;
typedef struct
{
@@ -601,13 +634,11 @@
ULONG PrioritySubClass;
} KSPRIORITY, *PKSPRIORITY;
-
typedef enum
{
KSEVENT_CLOCK_INTERVAL_MARK,
KSEVENT_CLOCK_POSITION_MARK
} KSEVENT_CLOCK_POSITION;
-
typedef enum
{
@@ -668,15 +699,12 @@
KSPROPERTY_TOPOLOGY_NAME
} KSPROPERTY_TOPOLOGY;
-
typedef enum
{
KSINTERFACE_STANDARD_STREAMING,
KSINTERFACE_STANDARD_LOOPED_STREAMING,
KSINTERFACE_STANDARD_CONTROL
} KSINTERFACE_STANDARD;
-
-
typedef enum
{
@@ -742,13 +770,19 @@
KSEVENT_STREAMALLOCATOR_FREEFRAME
} KSEVENT_STREAMALLOCATOR;
-
typedef enum
{
KSMETHOD_STREAMALLOCATOR_ALLOC,
KSMETHOD_STREAMALLOCATOR_FREE
} KSMETHOD_STREAMALLOCATOR;
+typedef enum
+{
+ KsObjectTypeDevice,
+ KsObjectTypeFilterFactory,
+ KsObjectTypeFilter,
+ KsObjectTypePin
+} KSOBJECTTYPE;
typedef struct
@@ -768,7 +802,7 @@
};
LONGLONG Alignment;
};
-} KSIDENTIFIER, *PKSIDENTIFIER, KSPROPERTY, *PKSPROPERTY, KSPIN_INTERFACE,
*PKSPIN_INTERFACE
+} KSIDENTIFIER, *PKSIDENTIFIER, KSPROPERTY, *PKSPROPERTY, KSPIN_INTERFACE,
*PKSPIN_INTERFACE,
KSMETHOD, *PKSMETHOD, KSEVENT, *PKSEVENT, KSDEGRADE, *PKSDEGRADE,
KSPIN_MEDIUM, *PKSPIN_MEDIUM;
@@ -1185,6 +1219,7 @@
#define DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NAME(Handler)\
DEFINE_KSPROPERTY_ITEM(KSPROPERTY_TOPOLOGY_NAME, (Handler), sizeof(KSP_NODE), 0,
NULL, NULL, 0, NULL, NULL, 0)
+#if 0
#define DEFINE_KSPROPERTY_TOPOLOGYSET(TopologySet, Handler)\
DEFINE_KSPROPERTY_TABLE(TopologySet) {\
DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CATEGORIES(Handler),\
@@ -1192,6 +1227,7 @@
DEFINE_KSPROPERTY_ITEM_TOPOLOGY_CONNECTIONS(Handler),\
DEFINE_KSPROPERTY_ITEM_TOPOLOGY_NAME(Handler)
}
+#endif
#define DEFINE_KSPIN_INTERFACE_ITEM(guid, interface) { STATICGUIDOF(guid), (interface), 0
}
Modified: branches/reactx/reactos/lib/sdk/sdk.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/reactx/reactos/lib/sdk/sdk.rbui…
==============================================================================
--- branches/reactx/reactos/lib/sdk/sdk.rbuild (original)
+++ branches/reactx/reactos/lib/sdk/sdk.rbuild Mon Nov 5 02:54:40 2007
@@ -6,6 +6,9 @@
</directory>
<directory name="dxguid">
<xi:include href="dxguid/dxguid.rbuild" />
+ </directory>
+ <directory name="ksguid">
+ <xi:include href="ksguid/ksguid.rbuild" />
</directory>
<directory name="libcntpr">
<xi:include href="libcntpr/libcntpr.rbuild" />
6222
days inactive
6222
days old
0 comments
1 participants
participants (1)
-
greatlrd＠svn.reactos.org