Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[fireball] 32254: - Mark WIDL as updated.
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 15:00:21 2008 New Revision: 32254 URL: http://svn.reactos.org/svn/reactos?rev=32254&view=rev Log: - Mark WIDL as updated. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Sun Feb 10 15:00:21 2008 @@ -26,7 +26,7 @@ reactos/tools/winebuild # Synced to Wine-20071217 reactos/tools/wmc # Synced to Wine-20071201 reactos/tools/wrc # Synced to Wine-0_9_53 -reactos/tools/widl # Synced to Wine-20080105 +reactos/tools/widl # Synced to Wine-0_9_55 The following libraries are shared with Wine.

1 0

[fireball] 32252: Sync to Wine-0.9.55: - Rob Shearman <rob@codeweavers.com> Sun, 20 Jan 2008 widl: Write out code for initialising out-only client context handles. - Francois Gouget <fgouget@free.fr> Wed, 23 Jan 2008 Assorted spelling fixes. - Jacek Caban <jacek@codeweavers.com> Tue, 29 Jan 2008 widl: Ignore ATTR_LOCAL in create_msft_typeinfo. - Rob Shearman <rob@codeweavers.com> Wed, 30 Jan 2008 widl: Don't search for a import file name with a path in the include directories for compatibility w
by fireball＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: fireball Date: Sun Feb 10 13:10:44 2008 New Revision: 32252 URL: http://svn.reactos.org/svn/reactos?rev=32252&view=rev Log: Sync to Wine-0.9.55: - Rob Shearman <rob(a)codeweavers.com> Sun, 20 Jan 2008 widl: Write out code for initialising out-only client context handles. - Francois Gouget <fgouget(a)free.fr> Wed, 23 Jan 2008 Assorted spelling fixes. - Jacek Caban <jacek(a)codeweavers.com> Tue, 29 Jan 2008 widl: Ignore ATTR_LOCAL in create_msft_typeinfo. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Jan 2008 widl: Don't search for a import file name with a path in the include directories for compatibility with MIDL. - Rob Shearman <rob(a)codeweavers.com> Wed, 30 Jan 2008 widl: Output code for initialising and freeing full pointer translation tables. - Colin Finck <mail(a)colinfinck.de> Thu, 7 Feb 2008 widl: Support Windows paths in dup_basename and make_token. - Colin Finck <mail(a)colinfinck.de> Thu, 7 Feb 2008 widl: Write the TLB file in binary mode, so the line endings won't be changed. Modified: trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/typelib_struct.h trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/write_msft.c Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=32… ============================================================================== --- trunk/reactos/tools/widl/client.c (original) +++ trunk/reactos/tools/widl/client.c Sun Feb 10 13:10:44 2008 @@ -85,6 +85,7 @@ { const var_t *def = func->def; const var_t* explicit_handle_var; + int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -141,6 +142,9 @@ "_RetVal", "_RetVal"); } fprintf(client, "\n"); + + if (has_full_pointer) + write_full_pointer_init(client, indent, func, FALSE); /* check pointers */ check_pointers(func); @@ -244,6 +248,9 @@ /* FIXME: emit client finally code */ + + if (has_full_pointer) + write_full_pointer_free(client, indent, func); print_client("NdrFreeBuffer((PMIDL_STUB_MESSAGE)&_StubMsg);\n"); Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=32… ============================================================================== --- trunk/reactos/tools/widl/header.c (original) +++ trunk/reactos/tools/widl/header.c Sun Feb 10 13:10:44 2008 @@ -578,23 +578,21 @@ var_t *def = cur->def; if (!is_callas(def->attrs)) { const var_t *arg; - int argc = 0; - int c; - - if (cur->args) LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) argc++; fprintf(header, "#define %s_", name); write_name(header,def); - fprintf(header, "(p"); - for (c=0; c<argc; c++) - fprintf(header, ",%c", c+'a'); + fprintf(header, "(This"); + if (cur->args) + LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) + fprintf(header, ",%s", arg->name); fprintf(header, ") "); - fprintf(header, "(p)->lpVtbl->"); + fprintf(header, "(This)->lpVtbl->"); write_name(header, def); - fprintf(header, "(p"); - for (c=0; c<argc; c++) - fprintf(header, ",%c", c+'a'); + fprintf(header, "(This"); + if (cur->args) + LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) + fprintf(header, ",%s", arg->name); fprintf(header, ")\n"); } } Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=32… ============================================================================== --- trunk/reactos/tools/widl/parser.l (original) +++ trunk/reactos/tools/widl/parser.l Sun Feb 10 13:10:44 2008 @@ -414,7 +414,11 @@ import->next = first_import; first_import = import; - if (!(path = wpp_find_include( fname, input_name ))) + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = strdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… ============================================================================== --- trunk/reactos/tools/widl/parser.yy.c (original) +++ trunk/reactos/tools/widl/parser.yy.c Sun Feb 10 13:10:44 2008 @@ -2117,7 +2117,11 @@ import->next = first_import; first_import = import; - if (!(path = wpp_find_include( fname, input_name ))) + /* don't search for a file name with a path in the include directories, + * for compatibility with MIDL */ + if (strchr( fname, '/' ) || strchr( fname, '\\' )) + path = strdup( fname ); + else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); import_stack[ptr].temp_name = temp_name; Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=322… ============================================================================== --- trunk/reactos/tools/widl/proxy.c (original) +++ trunk/reactos/tools/widl/proxy.c Sun Feb 10 13:10:44 2008 @@ -254,6 +254,7 @@ { var_t *def = cur->def; int has_ret = !is_void(def->type); + int has_full_pointer = is_full_pointer_function(cur); indent = 0; write_type_decl_left(proxy, def->type); @@ -279,6 +280,9 @@ } print_proxy( "\n"); + if (has_full_pointer) + write_full_pointer_init(proxy, indent, cur, FALSE); + /* FIXME: trace */ clear_output_vars( cur->args ); @@ -325,6 +329,8 @@ print_proxy( "RpcFinally\n" ); print_proxy( "{\n" ); indent++; + if (has_full_pointer) + write_full_pointer_free(proxy, indent, cur); print_proxy( "NdrProxyFreeBuffer(This, &_StubMsg);\n" ); indent--; print_proxy( "}\n"); @@ -356,6 +362,7 @@ var_t *def = cur->def; const var_t *arg; int has_ret = !is_void(def->type); + int has_full_pointer = is_full_pointer_function(cur); indent = 0; print_proxy( "void __RPC_STUB %s_", iface->name); @@ -384,6 +391,8 @@ print_proxy("RpcTryFinally\n"); print_proxy("{\n"); indent++; + if (has_full_pointer) + write_full_pointer_init(proxy, indent, cur, TRUE); print_proxy("if ((_pRpcMessage->DataRepresentation & 0xffff) != NDR_LOCAL_DATA_REPRESENTATION)\n"); indent++; print_proxy("NdrConvert( &_StubMsg, &__MIDL_ProcFormatString.Format[%u]);\n", proc_offset ); @@ -438,6 +447,9 @@ print_proxy("{\n"); write_remoting_arguments(proxy, indent+1, cur, PASS_OUT, PHASE_FREE); + + if (has_full_pointer) + write_full_pointer_free(proxy, indent, cur); print_proxy("}\n"); print_proxy("RpcEndFinally\n"); Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=32… ============================================================================== --- trunk/reactos/tools/widl/server.c (original) +++ trunk/reactos/tools/widl/server.c Sun Feb 10 13:10:44 2008 @@ -62,6 +62,7 @@ LIST_FOR_EACH_ENTRY( func, iface->funcs, const func_t, entry ) { const var_t *def = func->def; + int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); @@ -125,6 +126,9 @@ print_server("RpcTryExcept\n"); print_server("{\n"); indent++; + + if (has_full_pointer) + write_full_pointer_init(server, indent, func, TRUE); if (func->args) { @@ -236,6 +240,9 @@ write_remoting_arguments(server, indent, func, PASS_OUT, PHASE_FREE); + if (has_full_pointer) + write_full_pointer_free(server, indent, func); + indent--; print_server("}\n"); print_server("RpcEndFinally\n"); Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.c (original) +++ trunk/reactos/tools/widl/typegen.c Sun Feb 10 13:10:44 2008 @@ -186,6 +186,46 @@ if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) { if (field->type && type_has_pointers(field->type)) + return TRUE; + } + } + + return FALSE; +} + +static int type_has_full_pointer(const type_t *type) +{ + if (is_user_type(type)) + return FALSE; + else if (type->type == RPC_FC_FP) + return TRUE; + else if (is_ptr(type)) + return FALSE; + else if (is_array(type)) + return type_has_full_pointer(type->ref); + else if (is_struct(type->type)) + { + const var_t *field; + if (type->fields) LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) + { + if (type_has_full_pointer(field->type)) + return TRUE; + } + } + else if (is_union(type->type)) + { + var_list_t *fields; + const var_t *field; + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields), const var_t, entry); + fields = uv->type->fields; + } + else + fields = type->fields; + if (fields) LIST_FOR_EACH_ENTRY( field, fields, const var_t, entry ) + { + if (field->type && type_has_full_pointer(field->type)) return TRUE; } } @@ -903,6 +943,32 @@ return size; } +int is_full_pointer_function(const func_t *func) +{ + const var_t *var; + if (type_has_full_pointer(func->def->type)) + return TRUE; + if (!func->args) + return FALSE; + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + if (type_has_full_pointer( var->type )) + return TRUE; + return FALSE; +} + +void write_full_pointer_init(FILE *file, int indent, const func_t *func, int is_server) +{ + print_file(file, indent, "_StubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,%s);\n", + is_server ? "XLAT_SERVER" : "XLAT_CLIENT"); + fprintf(file, "\n"); +} + +void write_full_pointer_free(FILE *file, int indent, const func_t *func) +{ + print_file(file, indent, "NdrFullPointerXlatFree(_StubMsg.FullPtrXlatTables);\n"); + fprintf(file, "\n"); +} + static unsigned int write_nonsimple_pointer(FILE *file, const type_t *type, size_t offset) { short absoff = type->ref->typestring_offset; @@ -2126,7 +2192,7 @@ off = write_array_tfs(file, var->attrs, type, var->name, typeformat_offset); ptr_type = get_attrv(var->attrs, ATTR_POINTERTYPE); /* Top level pointers to conformant arrays may be handled specially - since we can bypass the pointer, but if the array is burried + since we can bypass the pointer, but if the array is buried beneath another pointer (e.g., "[size_is(,n)] int **p" then we always need to write the pointer. */ if (!ptr_type && var->type != type) @@ -2724,6 +2790,8 @@ { if (pass == PASS_OUT) { + if (!in_attr) + print_file(file, indent, "*%s = 0;\n", var->name); print_file(file, indent, "NdrClientContextUnmarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); print_file(file, indent + 1, "(NDR_CCONTEXT *)%s,\n", var->name); Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=3… ============================================================================== --- trunk/reactos/tools/widl/typegen.h (original) +++ trunk/reactos/tools/widl/typegen.h Sun Feb 10 13:10:44 2008 @@ -60,3 +60,6 @@ int get_padding(const var_list_t *fields); int is_user_type(const type_t *t); expr_t *get_size_is_expr(const type_t *t, const char *name); +int is_full_pointer_function(const func_t *func); +void write_full_pointer_init(FILE *file, int indent, const func_t *func, int is_server); +void write_full_pointer_free(FILE *file, int indent, const func_t *func); Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_struct.… ============================================================================== --- trunk/reactos/tools/widl/typelib_struct.h (original) +++ trunk/reactos/tools/widl/typelib_struct.h Sun Feb 10 13:10:44 2008 @@ -92,16 +92,16 @@ /* layout of the main segment directory */ typedef struct tagMSFT_SegDir { -/*1*/MSFT_pSeg pTypeInfoTab; /* each type info get an entry of 0x64 bytes */ +/*1*/MSFT_pSeg pTypeInfoTab; /* each typeinfo gets an entry of 0x64 bytes */ /* (25 ints) */ /*2*/MSFT_pSeg pImpInfo; /* table with info for imported types */ -/*3*/MSFT_pSeg pImpFiles; /* import libaries */ +/*3*/MSFT_pSeg pImpFiles; /* import libraries */ /*4*/MSFT_pSeg pRefTab; /* References table */ -/*5*/MSFT_pSeg pLibtab; /* always exists, alway same size (0x80) */ +/*5*/MSFT_pSeg pLibtab; /* always exists, always same size (0x80) */ /* hash table w offsets to guid????? */ /*6*/MSFT_pSeg pGuidTab; /* all guids are stored here together with */ /* offset in some table???? */ -/*7*/MSFT_pSeg res07; /* always created, alway same size (0x200) */ +/*7*/MSFT_pSeg res07; /* always created, always same size (0x200) */ /* purpose largely unknown */ /*8*/MSFT_pSeg pNametab; /* name tables */ /*9*/MSFT_pSeg pStringtab; /* string table */ @@ -119,10 +119,10 @@ /* base type info data */ typedef struct tagMSFT_TypeInfoBase { /*000*/ INT typekind; /* it is the TKIND_xxx */ - /* some byte alignment stuf */ + /* some byte alignment stuff */ INT memoffset; /* points past the file, if no elements */ INT res2; /* zero if no element, N*0x40 */ - INT res3; /* -1 if no lement, (N-1)*0x38 */ + INT res3; /* -1 if no element, (N-1)*0x38 */ /*010*/ INT res4; /* always? 3 */ INT res5; /* always? zero */ INT cElement; /* counts elements, HI=cVars, LO=cFuncs */ @@ -171,7 +171,7 @@ /* function description data */ typedef struct { -/* INT recsize; record size including some xtra stuff */ +/* INT recsize; record size including some extra stuff */ INT DataType; /* data type of the member, eg return of function */ INT Flags; /* something to do with attribute flags (LOWORD) */ #ifdef WORDS_BIGENDIAN @@ -227,7 +227,7 @@ /* Variable description data */ typedef struct { -/* INT recsize; // record size including some xtra stuff */ +/* INT recsize; // record size including some extra stuff */ INT DataType; /* data type of the variable */ INT Flags; /* VarFlags (LOWORD) */ #ifdef WORDS_BIGENDIAN Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… ============================================================================== --- trunk/reactos/tools/widl/widl_ros.diff (original) +++ trunk/reactos/tools/widl/widl_ros.diff Sun Feb 10 13:10:44 2008 @@ -60,34 +60,6 @@ #include "widl.h" #include "utils.h" -Index: utils.c -=================================================================== ---- utils.c (revision 32187) -+++ utils.c (working copy) -@@ -136,6 +136,9 @@ - name = "widl.tab"; - - slash = strrchr(name, '/'); -+ if (!slash) -+ slash = strrchr(name, '\\'); -+ - if (slash) - name = slash + 1; - -Index: widl.c -=================================================================== ---- widl.c (revision 32187) -+++ widl.c (working copy) -@@ -166,6 +166,9 @@ - int i; - - slash = strrchr(name, '/'); -+ if(!slash) -+ slash = strrchr(name, '\\'); -+ - if (slash) name = slash + 1; - - token = xstrdup(name); Index: widltypes.h =================================================================== --- widltypes.h (revision 32187) @@ -123,12 +95,3 @@ #include "widltypes.h" #include "typelib.h" -@@ -2415,7 +2413,7 @@ - - retval = TYPE_E_IOERROR; - -- fd = creat(typelib->typelib->filename, 0666); -+ fd = open(typelib->typelib->filename, O_CREAT | O_WRONLY | O_TRUNC | O_BINARY, 0666); - if (fd == -1) return retval; - - filepos = sizeof(MSFT_Header) + sizeof(MSFT_SegDir); Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re… ============================================================================== --- trunk/reactos/tools/widl/write_msft.c (original) +++ trunk/reactos/tools/widl/write_msft.c Sun Feb 10 13:10:44 2008 @@ -1839,6 +1839,9 @@ typeinfo->flags |= 0x10; /* TYPEFLAG_FHIDDEN */ break; + case ATTR_LOCAL: + break; + case ATTR_NONCREATABLE: typeinfo->flags &= ~0x2; /* TYPEFLAG_FCANCREATE */ break;

1 0

[gbrunmar] 32251: Fixed a typo
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 12:08:50 2008 New Revision: 32251 URL: http://svn.reactos.org/svn/reactos?rev=32251&view=rev Log: Fixed a typo Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Feb 10 12:08:50 2008 @@ -189,7 +189,7 @@ return D3DERR_INVALIDCALL; } - if (Format != D3DFMT_R5G6B5) + if (Format != D3DFMT_A2R10G10B10) { AdapterModeCount = GetDisplayFormatCount( Format, @@ -261,7 +261,7 @@ return D3DERR_INVALIDCALL; } - if (Format != D3DFMT_R5G6B5) + if (Format != D3DFMT_A2R10G10B10) { pMatchingDisplayFormat = FindDisplayFormat( Format,

1 0

[gbrunmar] 32250: * Fixed a comment typo
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 11:54:25 2008 New Revision: 32250 URL: http://svn.reactos.org/svn/reactos?rev=32250&view=rev Log: * Fixed a comment typo Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Feb 10 11:54:25 2008 @@ -171,7 +171,7 @@ * The pixel format to search for * * @return HRESULT -* If the method is successfull it returns the number of display modes with the specified Format. +* If the method is successful it returns the number of display modes with the specified Format. * If Adapter is out of range, the return value will be 0. * */

1 0

[gbrunmar] 32249: Implemented IDirect3D9::GetAdapterModeCount() and IDirect3D9::EnumAdapterModes().
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 11:44:06 2008 New Revision: 32249 URL: http://svn.reactos.org/svn/reactos?rev=32249&view=rev Log: Implemented IDirect3D9::GetAdapterModeCount() and IDirect3D9::EnumAdapterModes(). Modified: trunk/reactos/dll/directx/d3d9/adapter.c trunk/reactos/dll/directx/d3d9/adapter.h trunk/reactos/dll/directx/d3d9/d3d9_create.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.c… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.c (original) +++ trunk/reactos/dll/directx/d3d9/adapter.c Sun Feb 10 11:44:06 2008 @@ -10,6 +10,7 @@ #include <d3d9.h> #include <ddraw.h> #include <strsafe.h> +#include <debug.h> #include "adapter.h" typedef BOOL (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); @@ -166,6 +167,8 @@ return TRUE; } + + static BOOL CALLBACK AdapterMonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData) { MONITORINFOEXA MonitorInfoEx; @@ -195,3 +198,49 @@ return AdapterMonitor.hMonitor; } + + + +UINT GetDisplayFormatCount(D3DFORMAT Format, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes) +{ + UINT DisplayModeIndex; + UINT FormatIndex = 0; + + for (DisplayModeIndex = 0; DisplayModeIndex < NumDisplayModes; DisplayModeIndex++) + { + if (pSupportedDisplayModes[DisplayModeIndex].Format == Format) + { + ++FormatIndex; + } + } + + return FormatIndex; +} + +const D3DDISPLAYMODE* FindDisplayFormat(D3DFORMAT Format, UINT ModeIndex, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes) +{ + UINT DisplayModeIndex; + UINT FormatIndex = 0; + + for (DisplayModeIndex = 0; DisplayModeIndex < NumDisplayModes; DisplayModeIndex++) + { + if (pSupportedDisplayModes[DisplayModeIndex].Format == Format) + { + if (ModeIndex == FormatIndex) + return &pSupportedDisplayModes[DisplayModeIndex]; + + ++FormatIndex; + } + } + + if (FormatIndex == 0) + { + DPRINT1("No modes with the specified format found"); + } + else if (FormatIndex < ModeIndex) + { + DPRINT1("Invalid mode index"); + } + + return NULL; +} Modified: trunk/reactos/dll/directx/d3d9/adapter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/adapter.h… ============================================================================== --- trunk/reactos/dll/directx/d3d9/adapter.h (original) +++ trunk/reactos/dll/directx/d3d9/adapter.h Sun Feb 10 11:44:06 2008 @@ -13,4 +13,7 @@ HMONITOR GetAdapterMonitor(LPCSTR lpszDeviceName); +UINT GetDisplayFormatCount(D3DFORMAT Format, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes); +const D3DDISPLAYMODE* FindDisplayFormat(D3DFORMAT Format, UINT ModeIndex, const D3DDISPLAYMODE* pSupportedDisplayModes, UINT NumDisplayModes); + #endif Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.h Sun Feb 10 11:44:06 2008 @@ -8,6 +8,8 @@ #ifndef _D3D9_CREATE_H_ #define _D3D9_CREATE_H_ +#include <windows.h> +#include <d3d9types.h> #include "d3d9_private.h" /* Creates a Direct3D9 object */ Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_impl.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_impl.c Sun Feb 10 11:44:06 2008 @@ -135,6 +135,7 @@ if (IsBadWritePtr(pIdentifier, sizeof(D3DADAPTER_IDENTIFIER9))) { + DPRINT1("Invalid pIdentifier parameter specified"); UNLOCK_D3D9(); return D3DERR_INVALIDCALL; } @@ -152,17 +153,140 @@ return D3D_OK; } +/*++ +* @name IDirect3D9::GetAdapterModeCount +* @implemented +* +* The function IDirect3D9Impl_GetAdapterModeCount looks if the specified display adapter supports +* a specific pixel format and counts the available display modes for that format. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @param D3DFORMAT Format +* The pixel format to search for +* +* @return HRESULT +* If the method is successfull it returns the number of display modes with the specified Format. +* If Adapter is out of range, the return value will be 0. +* +*/ static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format) { - UNIMPLEMENTED - - return D3D_OK; -} - + UINT AdapterModeCount; + + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >= This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (Format != D3DFMT_R5G6B5) + { + AdapterModeCount = GetDisplayFormatCount( + Format, + This->DisplayAdapters[Adapter].pSupportedD3DFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DFormats); + } + else + { + AdapterModeCount = GetDisplayFormatCount( + Format, + This->DisplayAdapters[Adapter].pSupportedD3DExtendedFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DExtendedFormats); + } + + UNLOCK_D3D9(); + return AdapterModeCount; +} + +/*++ +* @name IDirect3D9::EnumAdapterModes +* @implemented +* +* The function IDirect3D9Impl_EnumAdapterModes looks if the specified display adapter supports +* a specific pixel format and fills the pMode argument with the available display modes for that format. +* This function is often used in a loop to enumerate all the display modes the adapter supports. +* +* @param LPDIRECT3D iface +* Pointer to the IDirect3D object returned from Direct3DCreate9() +* +* @param UINT Adapter +* Adapter index to get information about. D3DADAPTER_DEFAULT is the primary display. +* The maximum value for this is the value returned by IDirect3D::GetAdapterCount(). +* +* @param D3DFORMAT Format +* The pixel format to search for +* +* @param UINT Mode +* Index within the pixel format to be returned. +* The maximym value for this is the value returned by IDirect3D9::GetAdapterModeCount(). +* +* @param D3DDISPLAYMODE* pMode +* Pointer to a D3DDISPLAYMODE structure to be filled with the display mode information +* for the specified format. +* +* @return HRESULT +* If the method successfully fills the pMode structure, the return value is D3D_OK. +* If Adapter is out of range, pMode is a bad pointer or, no modes for the specified +* format was found or the mode parameter was invalid - the return value will be D3DERR_INVALIDCALL. +* +*/ static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode) { - UNIMPLEMENTED + const D3DDISPLAYMODE* pMatchingDisplayFormat; + LPDIRECT3D9_INT This = impl_from_IDirect3D9(iface); + LOCK_D3D9(); + + if (Adapter >= This->NumDisplayAdapters) + { + DPRINT1("Invalid Adapter number specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (IsBadWritePtr(pMode, sizeof(D3DDISPLAYMODE))) + { + DPRINT1("Invalid pMode parameter specified"); + UNLOCK_D3D9(); + return D3DERR_INVALIDCALL; + } + + if (Format != D3DFMT_R5G6B5) + { + pMatchingDisplayFormat = FindDisplayFormat( + Format, + Mode, + This->DisplayAdapters[Adapter].pSupportedD3DFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DFormats); + } + else + { + pMatchingDisplayFormat = FindDisplayFormat( + Format, + Mode, + This->DisplayAdapters[Adapter].pSupportedD3DExtendedFormats, + This->DisplayAdapters[Adapter].NumSupportedD3DExtendedFormats); + } + + if (pMatchingDisplayFormat != NULL) + { + *pMode = *pMatchingDisplayFormat; + } + UNLOCK_D3D9(); + + + if (pMatchingDisplayFormat == NULL) + return D3DERR_INVALIDCALL; return D3D_OK; } Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Feb 10 11:44:06 2008 @@ -21,10 +21,10 @@ /* 0x011c */ DWORD unknown000002; /* 0x0120 */ DWORD unknown000003; /* 0x0124 */ DWORD unknown000004; /* 0x00000001 */ -/* 0x0128 */ DWORD unknown000005; -/* 0x012c */ DWORD unknown000006; -/* 0x0130 */ DWORD unknown000007; -/* 0x0134 */ DWORD unknown000008; +/* 0x0128 */ DWORD NumSupportedD3DFormats; +/* 0x012c */ DWORD NumSupportedD3DExtendedFormats; +/* 0x0130 */ D3DDISPLAYMODE* pSupportedD3DFormats; +/* 0x0134 */ D3DDISPLAYMODE* pSupportedD3DExtendedFormats; /* 0x0138 */ DWORD unknown000009; /* 0x013c */ DWORD unknown000010; /* D3D9_DRIVERCAPS? */ /* 0x0140 */ DWORD unknown000011;

1 0

[gbrunmar] 32248: * Made it possible to include both d3d9types.h and ddrawgdi.h at the same time
by gbrunmar＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: gbrunmar Date: Sun Feb 10 10:30:27 2008 New Revision: 32248 URL: http://svn.reactos.org/svn/reactos?rev=32248&view=rev Log: * Made it possible to include both d3d9types.h and ddrawgdi.h at the same time Modified: trunk/reactos/dll/directx/ddraw/startup.c trunk/reactos/dll/win32/gdi32/misc/gdientry.c trunk/reactos/dll/win32/gdi32/misc/historic.c trunk/reactos/include/ddk/d3dhal.h trunk/reactos/include/psdk/ddrawgdi.h Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c (original) +++ trunk/reactos/dll/directx/ddraw/startup.c Sun Feb 10 10:30:27 2008 @@ -9,7 +9,6 @@ */ #include "rosdraw.h" -#include "ddrawgdi.h" DDRAWI_DIRECTDRAW_GBL ddgbl; DDRAWI_DDRAWSURFACE_GBL ddSurfGbl; Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdien… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Feb 10 10:30:27 2008 @@ -15,6 +15,7 @@ #include <ddrawint.h> #include <ddrawgdi.h> #include <ntgdi.h> +#include <d3dhal.h> /* DATA **********************************************************************/ Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/histo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/historic.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/historic.c Sun Feb 10 10:30:27 2008 @@ -14,6 +14,7 @@ #include <ddrawint.h> #include <ddrawgdi.h> #include <ntgdi.h> +#include <d3dhal.h> /* * @implemented Modified: trunk/reactos/include/ddk/d3dhal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/d3dhal.h (original) +++ trunk/reactos/include/ddk/d3dhal.h Sun Feb 10 10:30:27 2008 @@ -59,7 +59,12 @@ DWORD dwNumClipVertices; DWORD dwNumTextureFormats; LPDDSURFACEDESC lpTextureFormats; -} D3DHAL_GLOBALDRIVERDATA,*LPD3DHAL_GLOBALDRIVERDATA; +} D3DHAL_GLOBALDRIVERDATA; + +#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED +typedef D3DHAL_GLOBALDRIVERDATA *LPD3DHAL_GLOBALDRIVERDATA; +#define D3DHAL_GLOBALDRIVERDATA_DEFINED +#endif typedef struct _D3DHAL_D3DEXTENDEDCAPS { DWORD dwSize; @@ -159,7 +164,12 @@ DWORD dwReserved7; DWORD dwReserved8; DWORD dwReserved9; -} D3DHAL_CALLBACKS,*LPD3DHAL_CALLBACKS; +} D3DHAL_CALLBACKS; + +#ifndef D3DHAL_CALLBACKS_DEFINED +typedef D3DHAL_CALLBACKS *LPD3DHAL_CALLBACKS; +#define D3DHAL_CALLBACKS_DEFINED +#endif typedef struct _D3DHAL_SETRENDERTARGETDATA *LPD3DHAL_SETRENDERTARGETDATA; typedef struct _D3DHAL_CLEARDATA *LPD3DHAL_CLEARDATA; Modified: trunk/reactos/include/psdk/ddrawgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddrawgdi.h (original) +++ trunk/reactos/include/psdk/ddrawgdi.h Sun Feb 10 10:30:27 2008 @@ -19,7 +19,6 @@ #ifndef _DDRAWGDI_ #define _DDRAWGDI_ -#include <d3dhal.h> /* Define the real export names */ #define DdCreateDirectDrawObject GdiEntry1 @@ -39,6 +38,15 @@ #define DdSetGammaRamp GdiEntry15 #define DdSwapTextureHandles GdiEntry16 +#ifndef D3DHAL_CALLBACKS_DEFINED +typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS; +#define D3DHAL_CALLBACKS_DEFINED +#endif + +#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED +typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA; +#define D3DHAL_GLOBALDRIVERDATA_DEFINED +#endif BOOL STDCALL

1 0

[tkreuzer] 32247: fix a mem leak in win32k bitmap code
by tkreuzer＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: tkreuzer Date: Sun Feb 10 05:33:11 2008 New Revision: 32247 URL: http://svn.reactos.org/svn/reactos?rev=32247&view=rev Log: fix a mem leak in win32k bitmap code Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Sun Feb 10 05:33:11 2008 @@ -70,22 +70,21 @@ return 0; } + PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hBitmap ); + if (bmp == NULL) + { + NtGdiDeleteObject(hBitmap); + return NULL; + } + + bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; + if (NULL != pBits) { - PBITMAPOBJ bmp = BITMAPOBJ_LockBitmap( hBitmap ); - if (bmp == NULL) - { - NtGdiDeleteObject(hBitmap); - return NULL; - } - - bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - IntSetBitmapBits(bmp, bmp->SurfObj.cjBits, pBits); - - - BITMAPOBJ_UnlockBitmap( bmp ); } + + BITMAPOBJ_UnlockBitmap( bmp ); DPRINT("IntGdiCreateBitmap : %dx%d, %d BPP colors, topdown %d, returning %08x\n", Size.cx, Size.cy, BitsPixel, (Height < 0 ? 1 : 0), hBitmap); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sun Feb 10 05:33:11 2008 @@ -809,11 +809,8 @@ LONG compr; LONG dibsize; BOOL fColor; - SIZEL size; - if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &dibsize ) == -1) return 0; - // Check if we should create a monochrome or color bitmap. We create a monochrome bitmap only if it has exactly 2 // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap. @@ -866,12 +863,11 @@ } else { - size.cx = width; - size.cy = abs(height); - - handle = IntCreateBitmap(size, DIB_GetDIBWidthBytes(width, 1), BMF_1BPP, - (height < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT, - NULL); + handle = IntGdiCreateBitmap(width, + height, + 1, + 1, + NULL); } if (height < 0)

1 0

[greatlrd] 32246: add more struct, define, type and so. around 90% completed of this header now
by greatlrd＠svn.reactos.org 10 Feb '08

10 Feb '08

Author: greatlrd Date: Sun Feb 10 04:21:12 2008 New Revision: 32246 URL: http://svn.reactos.org/svn/reactos?rev=32246&view=rev Log: add more struct, define, type and so. around 90% completed of this header now Modified: branches/reactx/reactos/include/dxsdk/ks.h 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 Sun Feb 10 04:21:12 2008 @@ -2535,6 +2535,92 @@ #if defined(_NTDDK_) + #if (!defined( MAKEINTRESOURCE )) + #define MAKEINTRESOURCE( res ) ((ULONG_PTR) (USHORT) res) + #endif + + #if (!defined( RT_STRING )) + #define RT_STRING MAKEINTRESOURCE( 6 ) + #define RT_RCDATA MAKEINTRESOURCE( 10 ) + #endif + + typedef enum + { + KSSTREAM_POINTER_STATE_UNLOCKED = 0, + KSSTREAM_POINTER_STATE_LOCKED + } KSSTREAM_POINTER_STATE; + + + KSDDKAPI NTSTATUS NTAPI + KsAllocateDefaultClock(OUT PKSDEFAULTCLOCK* DefaultClock); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateDefaultClockEx(OUT PKSDEFAULTCLOCK* DefaultClock, + IN PVOID Context OPTIONAL, + IN PFNKSSETTIMER SetTimer OPTIONAL, + IN PFNKSCANCELTIMER CancelTimer OPTIONAL, + IN PFNKSCORRELATEDTIME CorrelatedTime OPTIONAL, + IN const KSRESOLUTION* Resolution OPTIONAL, + IN ULONG Flags); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateExtraData(IN OUT PIRP Irp, + IN ULONG ExtraSize, + OUT PVOID* ExtraBuffer); + + KSDDKAPI VOID NTAPI + KsAcquireDeviceSecurityLock(IN KSDEVICE_HEADER Header, + IN BOOLEAN Exclusive); + + KSDDKAPI VOID NTAPI + KsAddIrpToCancelableQueue(IN OUT PLIST_ENTRY QueueHead, + IN PKSPIN_LOCK SpinLock, + IN PIRP Irp, + IN KSLIST_ENTRY_LOCATION ListLocation, + IN PDRIVER_CANCEL DriverCancel OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsAcquireResetValue(IN PIRP Irp, OUT KSRESET* ResetValue); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateDeviceHeader(OUT KSDEVICE_HEADER* Header, + IN ULONG ItemsCount, + IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL); + + + KSDDKAPI NTSTATUS NTAPI + KsAllocateObjectHeader(OUT KSOBJECT_HEADER* Header, + IN ULONG ItemsCount, + IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL, + IN PIRP Irp, + IN const KSDISPATCH_TABLE* Table); + + KSDDKAPI NTSTATUS NTAPI + KsAddObjectCreateItemToDeviceHeader(IN KSDEVICE_HEADER Header, + IN PDRIVER_DISPATCH Create, + IN PVOID Context, + IN PWCHAR ObjectClass, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsAddObjectCreateItemToObjectHeader(IN KSOBJECT_HEADER Header, + IN PDRIVER_DISPATCH Create, + IN PVOID Context, IN PWCHAR ObjectClass, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateObjectCreateItem(IN KSDEVICE_HEADER Header, + IN PKSOBJECT_CREATE_ITEM CreateItem, + IN BOOLEAN AllocateEntry, + IN PFNKSITEMFREECALLBACK ItemFreeCallback OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsAddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject); + + KSDDKAPI void NTAPI + KsAcquireDevice(IN PKSDEVICE Device); + KSDDKAPI NTSTATUS NTAPI KsCreateDefaultAllocator(IN PIRP Irp); @@ -2549,6 +2635,29 @@ KSDDKAPI NTSTATUS NTAPI KsCreateAllocator(IN HANDLE ConnectionHandle, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PHANDLE AllocatorHandle); + KSDDKAPI NTSTATUS NTAPI + KsCreateDefaultClock(IN PIRP Irp, + IN PKSDEFAULTCLOCK DefaultClock); + + KSDDKAPI NTSTATUS NTAPI + KsCreateClock(IN HANDLE ConnectionHandle, + IN PKSCLOCK_CREATE ClockCreate, + OUT PHANDLE ClockHandle); + + KSDDKAPI NTSTATUS NTAPI + KsCreatePin(IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); + + KSDDKAPI VOID NTAPI + KsCancelRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + KSDDKAPI VOID NTAPI + KsCancelIo(IN OUT PLIST_ENTRY QueueHead, + IN PKSPIN_LOCK SpinLock); + KSDDKAPI NTSTATUS NTAPI KsDisableEvent(IN PIRP Irp, IN OUT PLIST_ENTRY EventsList, @@ -2557,6 +2666,89 @@ KSDDKAPI VOID NTAPI KsDiscardEvent(IN PKSEVENT_ENTRY EventEntry); + + KSDDKAPI VOID NTAPI + KsDereferenceBusObject(IN KSDEVICE_HEADER Header); + + KSDDKAPI NTSTATUS NTAPI + KsDispatchQuerySecurity(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + + KSDDKAPI NTSTATUS NTAPI + KsDispatchSetSecurity(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + KSDDKAPI NTSTATUS NTAPI + KsDispatchSpecificProperty(IN PIRP Irp, + IN PFNKSHANDLER Handler); + + KSDDKAPI NTSTATUS NTAPI + KsDispatchSpecificMethod(IN PIRP Irp, + IN PFNKSHANDLER Handler); + + KSDDKAPI NTSTATUS NTAPI + KsDispatchInvalidDeviceRequest(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + KSDDKAPI NTSTATUS NTAPI + KsDefaultDeviceIoCompletion(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + KSDDKAPI NTSTATUS NTAPI + KsDispatchIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + KSDDKAPI BOOLEAN NTAPI + KsDispatchFastIoDeviceControlFailure(IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer OPTIONAL, + IN ULONG OutputBufferLength, + IN ULONG IoControlCode, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject); + + KSDDKAPI BOOLEAN NTAPI + KsDispatchFastReadFailure(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject); + + KSDDKAPI ULONG NTAPI + KsDecrementCountedWorker(IN PKSWORKER Worker); + + KSDDKAPI NTSTATUS NTAPI + KsDefaultDispatchPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + + KSDDKAPI NTSTATUS NTAPI KsDefaultDispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + + KSDDKAPI NTSTATUS NTAPI + KsDefaultForwardIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + KSDDKAPI void NTAPI + KsDeviceRegisterAdapterObject(IN PKSDEVICE Device, + IN PADAPTER_OBJECT AdapterObject, + IN ULONG MaxMappingsByteCount, + IN ULONG MappingTableStride); + + KSDDKAPI ULONG NTAPI + KsDeviceGetBusData(IN PKSDEVICE Device, + IN ULONG DataType, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length); + + KSDDKAPI ULONG NTAPI + KsDeviceSetBusData(IN PKSDEVICE Device, + IN ULONG DataType, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length); KSDDKAPI NTSTATUS NTAPI KsEnableEvent(IN PIRP Irp, @@ -2602,6 +2794,9 @@ IN KSEVENTS_LOCKTYPE EventsFlags, IN PVOID EventsLock); + KSDDKAPI VOID NTAPI + KsFreeDefaultClock(IN PKSDEFAULTCLOCK DefaultClock); + KSDDKAPI NTSTATUS NTAPI KsGenerateEvent(IN PKSEVENT_ENTRY EventEntry); @@ -2617,6 +2812,32 @@ IN KSEVENTS_LOCKTYPE EventsFlags, IN PVOID EventsLock); + KSDDKAPI KSSTATE NTAPI + KsGetDefaultClockState(IN PKSDEFAULTCLOCK DefaultClock); + + KSDDKAPI LONGLONG NTAPI + KsGetDefaultClockTime(IN PKSDEFAULTCLOCK DefaultClock); + + KSDDKAPI NTSTATUS NTAPI + KsGetImageNameAndResourceId(IN HANDLE RegKey, + OUT PUNICODE_STRING ImageName, + OUT PULONG_PTR ResourceId, + OUT PULONG ValueType); + + KSDDKAPI NTSTATUS NTAPI + KsHandleSizedListQuery(IN PIRP Irp, + IN ULONG DataItemsCount, + IN ULONG DataItemSize, + IN const VOID* DataItems); + + KSDDKAPI NTSTATUS NTAPI + KsLoadResource(IN PVOID ImageBase, + IN POOL_TYPE PoolType, + IN ULONG_PTR ResourceName, + IN ULONG ResourceType, + OUT PVOID *Resource, + OUT PULONG ResourceSize); + KSDDKAPI NTSTATUS NTAPI KsMethodHandler(IN PIRP Irp, IN ULONG MethodSetsCount, @@ -2630,6 +2851,22 @@ IN ULONG MethodItemSize OPTIONAL); KSDDKAPI NTSTATUS NTAPI + KsMapModuleName(IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING ModuleName, + OUT PUNICODE_STRING ImageName, + OUT PULONG_PTR ResourceId, + OUT PULONG ValueType); + + KSDDKAPI VOID NTAPI + KsNullDriverUnload(IN PDRIVER_OBJECT DriverObject); + + KSDDKAPI NTSTATUS NTAPI + KsQueryInformationFile(IN PFILE_OBJECT FileObject, + OUT PVOID FileInformation, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInformationClass); + + KSDDKAPI NTSTATUS NTAPI KsPropertyHandler(IN PIRP Irp, IN ULONG PropertySetsCount, IN const KSPROPERTY_SET* PropertySet); @@ -2640,66 +2877,6 @@ IN const KSPROPERTY_SET* PropertySet, IN PFNKSALLOCATOR Allocator OPTIONAL, IN ULONG PropertyItemSize OPTIONAL); - - KSDDKAPI NTSTATUS NTAPI - KsValidateAllocatorCreateRequest(IN PIRP Irp, OUT PKSALLOCATOR_FRAMING* AllocatorFraming); - - KSDDKAPI NTSTATUS NTAPI - KsValidateAllocatorFramingEx(IN PKSALLOCATOR_FRAMING_EX Framing, IN ULONG BufferSize, IN const KSALLOCATOR_FRAMING_EX *PinFraming); - - KSDDKAPI NTSTATUS NTAPI - KsAllocateDefaultClock(OUT PKSDEFAULTCLOCK* DefaultClock); - - KSDDKAPI NTSTATUS NTAPI - KsAllocateDefaultClockEx(OUT PKSDEFAULTCLOCK* DefaultClock, - IN PVOID Context OPTIONAL, - IN PFNKSSETTIMER SetTimer OPTIONAL, - IN PFNKSCANCELTIMER CancelTimer OPTIONAL, - IN PFNKSCORRELATEDTIME CorrelatedTime OPTIONAL, - IN const KSRESOLUTION* Resolution OPTIONAL, - IN ULONG Flags); - - KSDDKAPI VOID NTAPI - KsFreeDefaultClock(IN PKSDEFAULTCLOCK DefaultClock); - - KSDDKAPI NTSTATUS NTAPI - KsCreateDefaultClock(IN PIRP Irp, - IN PKSDEFAULTCLOCK DefaultClock); - - KSDDKAPI NTSTATUS NTAPI - KsCreateClock(IN HANDLE ConnectionHandle, - IN PKSCLOCK_CREATE ClockCreate, - OUT PHANDLE ClockHandle); - - KSDDKAPI NTSTATUS NTAPI - KsValidateClockCreateRequest(IN PIRP Irp, - OUT PKSCLOCK_CREATE* ClockCreate); - - KSDDKAPI KSSTATE NTAPI - KsGetDefaultClockState(IN PKSDEFAULTCLOCK DefaultClock); - - KSDDKAPI VOID NTAPI - KsSetDefaultClockState(IN PKSDEFAULTCLOCK DefaultClock, - IN KSSTATE State); - - KSDDKAPI LONGLONG NTAPI - KsGetDefaultClockTime(IN PKSDEFAULTCLOCK DefaultClock); - - KSDDKAPI VOID NTAPI - KsSetDefaultClockTime(IN PKSDEFAULTCLOCK DefaultClock, - IN LONGLONG Time); - - KSDDKAPI NTSTATUS NTAPI - KsCreatePin(IN HANDLE FilterHandle, - IN PKSPIN_CONNECT Connect, - IN ACCESS_MASK DesiredAccess, - OUT PHANDLE ConnectionHandle); - - KSDDKAPI NTSTATUS NTAPI - KsValidateConnectRequest(IN PIRP Irp, - IN ULONG DescriptorsCount, - IN const KSPIN_DESCRIPTOR* Descriptor, - OUT PKSPIN_CONNECT* Connect); KSDDKAPI NTSTATUS NTAPI KsPinPropertyHandler(IN PIRP Irp, @@ -2727,10 +2904,420 @@ IN PVOID HandlerContext OPTIONAL); KSDDKAPI NTSTATUS NTAPI - KsHandleSizedListQuery(IN PIRP Irp, - IN ULONG DataItemsCount, - IN ULONG DataItemSize, - IN const VOID* DataItems); + KsProbeStreamIrp(IN OUT PIRP Irp, + IN ULONG ProbeFlags, + IN ULONG HeaderSize OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsReferenceBusObject(IN KSDEVICE_HEADER Header); + + KSDDKAPI NTSTATUS NTAPI + KsReadFile(IN PFILE_OBJECT FileObject, + IN PKEVENT Event OPTIONAL, + IN PVOID PortContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + OUT PVOID Buffer, + IN ULONG Length, + IN ULONG Key OPTIONAL, + IN KPROCESSOR_MODE RequestorMode); + + KSDDKAPI VOID NTAPI + KsReleaseIrpOnCancelableQueue(IN PIRP Irp, + IN PDRIVER_CANCEL DriverCancel OPTIONAL); + + KSDDKAPI PIRP NTAPI + KsRemoveIrpFromCancelableQueue(IN OUT PLIST_ENTRY QueueHead, + IN PKSPIN_LOCK SpinLock, + IN KSLIST_ENTRY_LOCATION ListLocation, + IN KSIRP_REMOVAL_OPERATION RemovalOperation); + KSDDKAPI VOID NTAPI + KsRemoveSpecificIrpFromCancelableQueue(IN PIRP Irp); + + KSDDKAPI VOID NTAPI + KsRecalculateStackDepth(IN KSDEVICE_HEADER Header, + IN BOOLEAN ReuseStackLocation); + + KSDDKAPI VOID NTAPI + KsSetDefaultClockState(IN PKSDEFAULTCLOCK DefaultClock, + IN KSSTATE State); + + KSDDKAPI VOID NTAPI + KsSetDefaultClockTime(IN PKSDEFAULTCLOCK DefaultClock, + IN LONGLONG Time); + + KSDDKAPI NTSTATUS NTAPI + KsSetInformationFile(IN PFILE_OBJECT FileObject, + IN PVOID FileInformation, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInformationClass); + + KSDDKAPI NTSTATUS NTAPI + KsStreamIo(IN PFILE_OBJECT FileObject, + IN PKEVENT Event OPTIONAL, + IN PVOID PortContext OPTIONAL, + IN PIO_COMPLETION_ROUTINE CompletionRoutine OPTIONAL, + IN PVOID CompletionContext OPTIONAL, + IN KSCOMPLETION_INVOCATION CompletionInvocationFlags OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN OUT PVOID StreamHeaders, + IN ULONG Length, + IN ULONG Flags, + IN KPROCESSOR_MODE RequestorMode); + + KSDDKAPI NTSTATUS NTAPI + KsSetMajorFunctionHandler(IN PDRIVER_OBJECT DriverObject, + IN ULONG MajorFunction); + + KSDDKAPI VOID NTAPI + KsSetTargetState(IN KSOBJECT_HEADER Header, + IN KSTARGET_STATE TargetState); + + KSDDKAPI VOID NTAPI + KsSetTargetDeviceObject(IN KSOBJECT_HEADER Header, + IN PDEVICE_OBJECT TargetDevice OPTIONAL); + KSDDKAPI VOID NTAPI + KsSetDevicePnpAndBaseObject(IN KSDEVICE_HEADER Header, + IN PDEVICE_OBJECT PnpDeviceObject, + IN PDEVICE_OBJECT BaseObject); + KSDDKAPI VOID NTAPI + KsSetPowerDispatch(IN KSOBJECT_HEADER Header, + IN PFNKSCONTEXT_DISPATCH PowerDispatch OPTIONAL, + IN PVOID PowerContext OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsValidateAllocatorCreateRequest(IN PIRP Irp, OUT PKSALLOCATOR_FRAMING* AllocatorFraming); + + KSDDKAPI NTSTATUS NTAPI + KsValidateAllocatorFramingEx(IN PKSALLOCATOR_FRAMING_EX Framing, IN ULONG BufferSize, IN const KSALLOCATOR_FRAMING_EX *PinFraming); + + KSDDKAPI NTSTATUS NTAPI + KsValidateClockCreateRequest(IN PIRP Irp, + OUT PKSCLOCK_CREATE* ClockCreate); + + KSDDKAPI NTSTATUS NTAPI + KsValidateConnectRequest(IN PIRP Irp, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + OUT PKSPIN_CONNECT* Connect); + + KSDDKAPI NTSTATUS NTAPI + KsWriteFile(IN PFILE_OBJECT FileObject, + IN PKEVENT Event OPTIONAL, + IN PVOID PortContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID Buffer, + IN ULONG Length, + IN ULONG Key OPTIONAL, + IN KPROCESSOR_MODE RequestorMode); + + KSDDKAPI NTSTATUS NTAPI + KsMoveIrpsOnCancelableQueue(IN OUT PLIST_ENTRY SourceList, + IN PKSPIN_LOCK SourceLock, + IN OUT PLIST_ENTRY DestinationList, + IN PKSPIN_LOCK DestinationLock OPTIONAL, + IN KSLIST_ENTRY_LOCATION ListLocation, + IN PFNKSIRPLISTCALLBACK ListCallback, + IN PVOID Context); + + KSDDKAPI NTSTATUS NTAPI + KsTopologyPropertyHandler(IN PIRP Irp, + IN PKSPROPERTY Property, + IN OUT PVOID Data, + IN const KSTOPOLOGY* Topology); + + KSDDKAPI VOID NTAPI + KsReleaseDeviceSecurityLock(IN KSDEVICE_HEADER Header); + + KSDDKAPI PDEVICE_OBJECT NTAPI + KsQueryDevicePnpObject(IN KSDEVICE_HEADER Header); + + KSDDKAPI ACCESS_MASK NTAPI + KsQueryObjectAccessMask(IN KSOBJECT_HEADER Header); + + KSDDKAPI PKSOBJECT_CREATE_ITEM NTAPI + KsQueryObjectCreateItem(IN KSOBJECT_HEADER Header); + + KSDDKAPI VOID NTAPI + KsFreeDeviceHeader( IN KSDEVICE_HEADER Header); + + KSDDKAPI VOID NTAPI + KsFreeObjectHeader(IN KSOBJECT_HEADER Header); + + KSDDKAPI NTSTATUS NTAPI + KsFreeObjectCreateItem(IN KSDEVICE_HEADER Header, + IN PUNICODE_STRING CreateItem); + + KSDDKAPI NTSTATUS NTAPI + KsFreeObjectCreateItemsByContext(IN KSDEVICE_HEADER Header, + IN PVOID Context); + + KSDDKAPI NTSTATUS NTAPI + KsCreateDefaultSecurity(IN PSECURITY_DESCRIPTOR ParentSecurity OPTIONAL, + OUT PSECURITY_DESCRIPTOR* DefaultSecurity); + + KSDDKAPI NTSTATUS NTAPI + KsForwardIrp(IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN BOOLEAN ReuseStackLocation); + + KSDDKAPI NTSTATUS NTAPI + KsForwardAndCatchIrp(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN KSSTACK_USE StackUse); + + KSDDKAPI NTSTATUS NTAPI + KsSynchronousIoControlDevice(IN PFILE_OBJECT FileObject, + IN KPROCESSOR_MODE RequestorMode, + IN ULONG IoControl, + IN PVOID InBuffer, + IN ULONG InSize, + OUT PVOID OutBuffer, + IN ULONG OutSize, + OUT PULONG BytesReturned); + + KSDDKAPI NTSTATUS NTAPI + KsUnserializeObjectPropertiesFromRegistry(IN PFILE_OBJECT FileObject, + IN HANDLE ParentKey OPTIONAL, + IN PUNICODE_STRING RegistryPath OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsCacheMedium(IN PUNICODE_STRING SymbolicLink, + IN PKSPIN_MEDIUM Medium, + IN ULONG PinDirection); + + KSDDKAPI NTSTATUS NTAPI + KsRegisterWorker(IN WORK_QUEUE_TYPE WorkQueueType, + OUT PKSWORKER* Worker); + + KSDDKAPI NTSTATUS NTAPI + KsRegisterCountedWorker(IN WORK_QUEUE_TYPE WorkQueueType, + IN PWORK_QUEUE_ITEM CountedWorkItem, + OUT PKSWORKER* Worker); + + KSDDKAPI VOID NTAPI + KsUnregisterWorker( IN PKSWORKER Worker); + + KSDDKAPI NTSTATUS NTAPI + KsQueueWorkItem(IN PKSWORKER Worker, + IN PWORK_QUEUE_ITEM WorkItem); + + KSDDKAPI ULONG NTAPI + KsIncrementCountedWorker(IN PKSWORKER Worker); + + KSDDKAPI NTSTATUS NTAPI + KsCreateTopologyNode(IN HANDLE ParentHandle, + IN PKSNODE_CREATE NodeCreate, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle); + + KSDDKAPI NTSTATUS NTAPI + KsValidateTopologyNodeCreateRequest(IN PIRP Irp, + IN PKSTOPOLOGY Topology, + OUT PKSNODE_CREATE* NodeCreate); + + KSDDKAPI NTSTATUS NTAPI + KsMergeAutomationTables(OUT PKSAUTOMATION_TABLE* AutomationTableAB, + IN PKSAUTOMATION_TABLE AutomationTableA OPTIONAL, + IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL, + IN KSOBJECT_BAG Bag OPTIONAL); + + /* KsInitializeDriver AVStream Functions (XP / DirectX 8) http://www.osronline.com/ddkx/stream/avstream_5q9f.htm */ + KSDDKAPI NTSTATUS NTAPI + KsInitializeDriver(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsCreateDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL, + IN ULONG ExtensionSize OPTIONAL, + OUT PKSDEVICE* Device OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsInitializeDevice(IN PDEVICE_OBJECT FunctionalDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT NextDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL); + + KSDDKAPI void NTAPI + KsTerminateDevice(IN PDEVICE_OBJECT DeviceObject); + + KSDDKAPI PKSDEVICE NTAPI + KsGetDeviceForDeviceObject(IN PDEVICE_OBJECT FunctionalDeviceObject); + + KSDDKAPI void NTAPI + KsReleaseDevice(IN PKSDEVICE Device); + + KSDDKAPI NTSTATUS NTAPI + KsCreateFilterFactory(IN PDEVICE_OBJECT DeviceObject, + IN const KSFILTER_DESCRIPTOR* Descriptor, + IN PWCHAR RefString OPTIONAL, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, + IN ULONG CreateItemFlags, + IN PFNKSFILTERFACTORYPOWER SleepCallback OPTIONAL, + IN PFNKSFILTERFACTORYPOWER WakeCallback OPTIONAL, + OUT PKSFILTERFACTORY* FilterFactory OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsFilterFactoryUpdateCacheData(IN PKSFILTERFACTORY FilterFactory, + IN const KSFILTER_DESCRIPTOR *FilterDescriptor OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsFilterFactoryAddCreateItem(IN PKSFILTERFACTORY FilterFactory, + IN PWCHAR RefString, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, + IN ULONG CreateItemFlags); + + KSDDKAPI NTSTATUS NTAPI + KsFilterFactorySetDeviceClassesState(IN PKSFILTERFACTORY FilterFactory, + IN BOOLEAN NewState); + + KSDDKAPI PUNICODE_STRING NTAPI + KsFilterFactoryGetSymbolicLink(IN PKSFILTERFACTORY FilterFactory); + + KSDDKAPI void NTAPI + KsAddEvent(IN PVOID Object, + IN PKSEVENT_ENTRY EventEntry); + + KSDDKAPI NTSTATUS NTAPI + KsDefaultAddEventHandler(IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN OUT PKSEVENT_ENTRY EventEntry); + + KSDDKAPI void NTAPI + KsGenerateEvents(IN PVOID Object, + IN const GUID* EventSet OPTIONAL, + IN ULONG EventId, + IN ULONG DataSize, + IN PVOID Data OPTIONAL, + IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL, + IN PVOID CallBackContext OPTIONAL); + + + KSDDKAPI NTSTATUS NTAPI + KsPinGetAvailableByteCount(IN PKSPIN Pin, + OUT PLONG InputDataBytes OPTIONAL, + OUT PLONG OutputBufferBytes OPTIONAL); + + KSDDKAPI PKSSTREAM_POINTER NTAPI + KsPinGetLeadingEdgeStreamPointer(IN PKSPIN Pin, + IN KSSTREAM_POINTER_STATE State); + + KSDDKAPI PKSSTREAM_POINTER NTAPI + KsPinGetTrailingEdgeStreamPointer(IN PKSPIN Pin, + IN KSSTREAM_POINTER_STATE State); + + KSDDKAPI NTSTATUS NTAPI + KsStreamPointerSetStatusCode(IN PKSSTREAM_POINTER StreamPointer, + IN NTSTATUS Status); + + KSDDKAPI NTSTATUS NTAPI + KsStreamPointerLock(IN PKSSTREAM_POINTER StreamPointer); + + KSDDKAPI void NTAPI + KsStreamPointerUnlock(IN PKSSTREAM_POINTER StreamPointer, + IN BOOLEAN Eject); + + KSDDKAPI void NTAPI + KsStreamPointerAdvanceOffsetsAndUnlock(IN PKSSTREAM_POINTER StreamPointer, + IN ULONG InUsed, + IN ULONG OutUsed, + IN BOOLEAN Eject); + + KSDDKAPI void NTAPI + KsStreamPointerDelete(IN PKSSTREAM_POINTER StreamPointer); + + KSDDKAPI NTSTATUS NTAPI + KsStreamPointerClone(IN PKSSTREAM_POINTER StreamPointer, + IN PFNKSSTREAMPOINTER CancelCallback OPTIONAL, + IN ULONG ContextSize, + OUT PKSSTREAM_POINTER* CloneStreamPointer); + + KSDDKAPI NTSTATUS NTAPI + KsStreamPointerAdvanceOffsets(IN PKSSTREAM_POINTER StreamPointer, + IN ULONG InUsed, + IN ULONG OutUsed, + IN BOOLEAN Eject); + + KSDDKAPI NTSTATUS NTAPI + KsStreamPointerAdvance(IN PKSSTREAM_POINTER StreamPointer); + + KSDDKAPI PMDL NTAPI + KsStreamPointerGetMdl(IN PKSSTREAM_POINTER StreamPointer); + + KSDDKAPI PIRP NTAPI + KsStreamPointerGetIrp(IN PKSSTREAM_POINTER StreamPointer, + OUT PBOOLEAN FirstFrameInIrp OPTIONAL, + OUT PBOOLEAN LastFrameInIrp OPTIONAL); + + KSDDKAPI void NTAPI + KsStreamPointerScheduleTimeout(IN PKSSTREAM_POINTER StreamPointer, + IN PFNKSSTREAMPOINTER Callback, + IN ULONGLONG Interval); + + KSDDKAPI void NTAPI + KsStreamPointerCancelTimeout(IN PKSSTREAM_POINTER StreamPointer); + + KSDDKAPI PKSSTREAM_POINTER NTAPI + KsPinGetFirstCloneStreamPointer(IN PKSPIN Pin); + + KSDDKAPI PKSSTREAM_POINTER NTAPI + KsStreamPointerGetNextClone(IN PKSSTREAM_POINTER StreamPointer); + + KSDDKAPI NTSTATUS NTAPI + KsPinHandshake(IN PKSPIN Pin, + IN PKSHANDSHAKE In, OUT PKSHANDSHAKE Out); + + KSDDKAPI void NTAPI + KsCompletePendingRequest(IN PIRP Irp); + + KSDDKAPI KSOBJECTTYPE NTAPI + KsGetObjectTypeFromIrp(IN PIRP Irp); + + KSDDKAPI PVOID NTAPI + KsGetObjectFromFileObject(IN PFILE_OBJECT FileObject); + + KSDDKAPI KSOBJECTTYPE NTAPI + KsGetObjectTypeFromFileObject(IN PFILE_OBJECT FileObject); + + void _inline + KsFilterAddEvent(IN PKSFILTER Filter, IN PKSEVENT_ENTRY EventEntry) + { + KsAddEvent(Filter,EventEntry); + } + + void _inline KsPinAddEvent(IN PKSPIN Pin, IN PKSEVENT_ENTRY EventEntry) + { + KsAddEvent(Pin,EventEntry); + } + + void _inline KsFilterGenerateEvents(IN PKSFILTER Filter, IN const GUID* EventSet OPTIONAL, + IN ULONG EventId, IN ULONG DataSize, IN PVOID Data OPTIONAL, + IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL, IN PVOID CallBackContext OPTIONAL) + { + KsGenerateEvents(Filter, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); + } + + void _inline KsPinGenerateEvents(IN PKSPIN Pin, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, + IN PVOID Data OPTIONAL, IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL,IN PVOID CallBackContext OPTIONAL) + { + KsGenerateEvents(Pin, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); + } + + + + + + + + + +#define KsDispatchFastWriteFailure KsDispatchFastReadFailure +#define KsDeleteFilterFactory(FilterFactory) KsFreeObjectCreateItemsByContext(\ + *(KSDEVICE_HEADER *)(KsFilterFactoryGetParentDevice(FilterFactory)->FunctionalDeviceObject->DeviceExtension), FilterFactory) + #endif

1 0

[greatlrd] 32245: fixet wrong KSDATAFORMAT thx silverblade add new com, define, types, struct
by greatlrd＠svn.reactos.org 09 Feb '08

09 Feb '08

Author: greatlrd Date: Sun Feb 10 02:39:50 2008 New Revision: 32245 URL: http://svn.reactos.org/svn/reactos?rev=32245&view=rev Log: fixet wrong KSDATAFORMAT thx silverblade add new com, define, types, struct Modified: branches/reactx/reactos/include/dxsdk/ks.h 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 Sun Feb 10 02:39:50 2008 @@ -1199,18 +1199,20 @@ WCHAR SymbolicLinkName[1]; } KSPIN_PHYSICALCONNECTION, *PKSPIN_PHYSICALCONNECTION; -typedef struct -{ - ULONG FormatSize; - ULONG Flags; - ULONG SampleSize; - ULONG Reserved; - GUID MajorFormat; - GUID SubFormat; - GUID Specifier; - +typedef union +{ + struct + { + ULONG FormatSize; + ULONG Flags; + ULONG SampleSize; + ULONG Reserved; + GUID MajorFormat; + GUID SubFormat; + GUID Specifier; + }; + LONGLONG Alignment; } KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; -/* Note : KSDATAFORMAT exists a no ms_ver of this struct it contain LONGLONG Alignment; see ms dx sdk 2004 dec month for the no ms_ver version */ typedef struct { @@ -2050,7 +2052,9 @@ typedef void (*PFNKSPINRESOLUTION)(IN PKSPIN Pin, OUT PKSRESOLUTION Resolution); typedef NTSTATUS (*PFNKSPININITIALIZEALLOCATOR)(IN PKSPIN Pin, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PVOID* Context); typedef void (*PFNKSSTREAMPOINTER)(IN PKSSTREAM_POINTER StreamPointer); - + typedef void (*PFNKSFREE)(IN PVOID Data); + typedef void (*PFNKSPINFRAMERETURN)( IN PKSPIN Pin, IN PVOID Data OPTIONAL, IN ULONG Size OPTIONAL, IN PMDL Mdl OPTIONAL, IN PVOID Context OPTIONAL, IN NTSTATUS Status); + typedef void (*PFNKSPINIRPCOMPLETION)(IN PKSPIN Pin, IN PIRP Irp); typedef NTSTATUS (*PFNKSDEVICEPNPSTART)(IN PKSDEVICE Device, IN PIRP Irp, IN PCM_RESOURCE_LIST TranslatedResourceList OPTIONAL, IN PCM_RESOURCE_LIST UntranslatedResourceList OPTIONAL); @@ -2061,8 +2065,6 @@ typedef NTSTATUS (*PFNKSPINSETDATAFORMAT)(IN PKSPIN Pin, IN PKSDATAFORMAT OldFormat OPTIONAL, IN PKSMULTIPLE_ITEM OldAttributeList OPTIONAL, IN const KSDATARANGE* DataRange, IN const KSATTRIBUTE_LIST* AttributeRange OPTIONAL); - - #ifndef _NTOS_ @@ -2399,21 +2401,126 @@ #define DEFINE_KSPIN_DEFAULT_INTERFACES 0, NULL #define DEFINE_KSPIN_DEFAULT_MEDIUMS 0, NULL -#endif - - - - - - - - - - - - - - + #if !defined(_WIN64) + #define DEFINE_NODE_DESCRIPTOR(automation,type,name) { (automation), (type), (name), NULL } + #else + #define DEFINE_NODE_DESCRIPTOR(automation,type,name) { (automation), (type), (name) } + #endif + + + struct _KSMAPPING + { + PHYSICAL_ADDRESS PhysicalAddress; + ULONG ByteCount; + ULONG Alignment; + }; + + struct _KSSTREAM_POINTER_OFFSET + { + union + { + PUCHAR Data; + PKSMAPPING Mappings; + }; + #if !defined(_WIN64) + PVOID Alignment; + #endif + ULONG Count; + ULONG Remaining; + }; + + struct _KSSTREAM_POINTER + { + PVOID Context; + PKSPIN Pin; + PKSSTREAM_HEADER StreamHeader; + PKSSTREAM_POINTER_OFFSET Offset; + KSSTREAM_POINTER_OFFSET OffsetIn; + KSSTREAM_POINTER_OFFSET OffsetOut; + }; + + struct _KSPROCESSPIN + { + PKSPIN Pin; + PKSSTREAM_POINTER StreamPointer; + PKSPROCESSPIN InPlaceCounterpart; + PKSPROCESSPIN DelegateBranch; + PKSPROCESSPIN CopySource; + PVOID Data; + ULONG BytesAvailable; + ULONG BytesUsed; + ULONG Flags; + BOOLEAN Terminate; + }; + + struct _KSPROCESSPIN_INDEXENTRY + { + PKSPROCESSPIN *Pins; + ULONG Count; + }; + + #if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) + #if !defined(_IKsControl_) + + #define _IKsControl_ + typedef interface IKsControl* PIKSCONTROL; + + #if !defined(DEFINE_ABSTRACT_UNKNOWN) + #define DEFINE_ABSTRACT_UNKNOWN() \ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ REFIID InterfaceId, PVOID* Interface) PURE; \ + STDMETHOD_(ULONG,AddRef)(THIS) PURE; \ + STDMETHOD_(ULONG,Release)(THIS) PURE; + #endif + + #undef INTERFACE + + #define INTERFACE IKsControl + DECLARE_INTERFACE_(IKsControl,IUnknown) + { + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS, KsProperty)(THIS_ IN PKSPROPERTY Property, IN ULONG PropertyLength, + IN OUT PVOID PropertyData, IN ULONG DataLength, OUT ULONG* BytesReturned) PURE; + + STDMETHOD_(NTSTATUS, KsMethod)(THIS_ IN PKSMETHOD Method, IN ULONG MethodLength, IN OUT PVOID MethodData, + IN ULONG DataLength, OUT ULONG* BytesReturned) PURE; + + STDMETHOD_(NTSTATUS, KsEvent)(THIS_ IN PKSEVENT Event OPTIONAL, IN ULONG EventLength, IN OUT PVOID EventData, + IN ULONG DataLength, OUT ULONG* BytesReturned) PURE; + }; + + typedef interface IKsReferenceClock* PIKSREFERENCECLOCK; + + #undef INTERFACE + #define INTERFACE IKsReferenceClock + DECLARE_INTERFACE_(IKsReferenceClock,IUnknown) + { + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(LONGLONG,GetTime)(THIS) PURE; + STDMETHOD_(LONGLONG,GetPhysicalTime)(THIS) PURE; + STDMETHOD_(LONGLONG,GetCorrelatedTime)(THIS_ OUT PLONGLONG SystemTime) PURE; + STDMETHOD_(LONGLONG,GetCorrelatedPhysicalTime)(THIS_ OUT PLONGLONG SystemTime) PURE; + STDMETHOD_(NTSTATUS, GetResolution)(THIS_ OUT PKSRESOLUTION Resolution) PURE; + STDMETHOD_(NTSTATUS, GetState)(THIS_ OUT PKSSTATE State) PURE; + }; + #undef INTERFACE + + #define STATIC_IID_IKsControl 0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + DEFINE_GUID(IID_IKsControl, 0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96); + + #if defined(__cplusplus) + struct __declspec(uuid("28F54685-06FD-11D2-B27A-00A0C9223196")) IKsControl; + #endif + + #define STATIC_IID_IKsFastClock 0xC9902485, 0xC180, 0x11D2, 0x84, 0x73, 0xD4, 0x23, 0x94, 0x45, 0x9E, 0x5E + DEFINE_GUID(IID_IKsFastClock, 0xC9902485, 0xC180, 0x11D2, 0x84, 0x73, 0xD4, 0x23, 0x94, 0x45, 0x9E, 0x5E); + #if defined(__cplusplus) + struct __declspec(uuid("C9902485-C180-11d2-8473-D42394459E5E")) IKsFastClock; + #endif + #endif + #endif +#endif // end ntddk #if defined(__cplusplus) @@ -2426,7 +2533,205 @@ #define KSDDKAPI DECLSPEC_IMPORT #endif - +#if defined(_NTDDK_) + + KSDDKAPI NTSTATUS NTAPI + KsCreateDefaultAllocator(IN PIRP Irp); + + KSDDKAPI NTSTATUS NTAPI + KsCreateDefaultAllocatorEx(IN PIRP Irp, + IN PVOID InitializeContext OPTIONAL, + IN PFNKSDEFAULTALLOCATE DefaultAllocate OPTIONAL, + IN PFNKSDEFAULTFREE DefaultFree OPTIONAL, + IN PFNKSINITIALIZEALLOCATOR InitializeAllocator OPTIONAL, + IN PFNKSDELETEALLOCATOR DeleteAllocator OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsCreateAllocator(IN HANDLE ConnectionHandle, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PHANDLE AllocatorHandle); + + KSDDKAPI NTSTATUS NTAPI + KsDisableEvent(IN PIRP Irp, + IN OUT PLIST_ENTRY EventsList, + IN KSEVENTS_LOCKTYPE EventsFlags, + IN PVOID EventsLock); + + KSDDKAPI VOID NTAPI + KsDiscardEvent(IN PKSEVENT_ENTRY EventEntry); + + KSDDKAPI NTSTATUS NTAPI + KsEnableEvent(IN PIRP Irp, + IN ULONG EventSetsCount, + IN const KSEVENT_SET* EventSet, + IN OUT PLIST_ENTRY EventsList OPTIONAL, + IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL, + IN PVOID EventsLock OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsEnableEventWithAllocator(IN PIRP Irp, + IN ULONG EventSetsCount, + IN const KSEVENT_SET* EventSet, + IN OUT PLIST_ENTRY EventsList OPTIONAL, + IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL, + IN PVOID EventsLock OPTIONAL, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG EventItemSize OPTIONAL); + + KSDDKAPI BOOLEAN NTAPI + KsFastPropertyHandler(IN PFILE_OBJECT FileObject, + IN PKSPROPERTY Property, + IN ULONG PropertyLength, + IN OUT PVOID Data, + IN ULONG DataLength, + OUT PIO_STATUS_BLOCK IoStatus, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet); + + KSDDKAPI BOOLEAN NTAPI + KsFastMethodHandler(IN PFILE_OBJECT FileObject, + IN PKSMETHOD Method, + IN ULONG MethodLength, + IN OUT PVOID Data, + IN ULONG DataLength, + OUT PIO_STATUS_BLOCK IoStatus, + IN ULONG MethodSetsCount, + IN const KSMETHOD_SET* MethodSet); + + KSDDKAPI VOID NTAPI + KsFreeEventList(IN PFILE_OBJECT FileObject, + IN OUT PLIST_ENTRY EventsList, + IN KSEVENTS_LOCKTYPE EventsFlags, + IN PVOID EventsLock); + + KSDDKAPI NTSTATUS NTAPI + KsGenerateEvent(IN PKSEVENT_ENTRY EventEntry); + + KSDDKAPI NTSTATUS NTAPI + KsGenerateDataEvent(IN PKSEVENT_ENTRY EventEntry, + IN ULONG DataSize, + IN PVOID Data); + + KSDDKAPI VOID NTAPI + KsGenerateEventList(IN GUID* Set OPTIONAL, + IN ULONG EventId, + IN PLIST_ENTRY EventsList, + IN KSEVENTS_LOCKTYPE EventsFlags, + IN PVOID EventsLock); + + KSDDKAPI NTSTATUS NTAPI + KsMethodHandler(IN PIRP Irp, + IN ULONG MethodSetsCount, + IN const KSMETHOD_SET* MethodSet); + + KSDDKAPI NTSTATUS NTAPI + KsMethodHandlerWithAllocator(IN PIRP Irp, + IN ULONG MethodSetsCount, + IN const KSMETHOD_SET* MethodSet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG MethodItemSize OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsPropertyHandler(IN PIRP Irp, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet); + + KSDDKAPI NTSTATUS NTAPI + KsPropertyHandlerWithAllocator(IN PIRP Irp, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG PropertyItemSize OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsValidateAllocatorCreateRequest(IN PIRP Irp, OUT PKSALLOCATOR_FRAMING* AllocatorFraming); + + KSDDKAPI NTSTATUS NTAPI + KsValidateAllocatorFramingEx(IN PKSALLOCATOR_FRAMING_EX Framing, IN ULONG BufferSize, IN const KSALLOCATOR_FRAMING_EX *PinFraming); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateDefaultClock(OUT PKSDEFAULTCLOCK* DefaultClock); + + KSDDKAPI NTSTATUS NTAPI + KsAllocateDefaultClockEx(OUT PKSDEFAULTCLOCK* DefaultClock, + IN PVOID Context OPTIONAL, + IN PFNKSSETTIMER SetTimer OPTIONAL, + IN PFNKSCANCELTIMER CancelTimer OPTIONAL, + IN PFNKSCORRELATEDTIME CorrelatedTime OPTIONAL, + IN const KSRESOLUTION* Resolution OPTIONAL, + IN ULONG Flags); + + KSDDKAPI VOID NTAPI + KsFreeDefaultClock(IN PKSDEFAULTCLOCK DefaultClock); + + KSDDKAPI NTSTATUS NTAPI + KsCreateDefaultClock(IN PIRP Irp, + IN PKSDEFAULTCLOCK DefaultClock); + + KSDDKAPI NTSTATUS NTAPI + KsCreateClock(IN HANDLE ConnectionHandle, + IN PKSCLOCK_CREATE ClockCreate, + OUT PHANDLE ClockHandle); + + KSDDKAPI NTSTATUS NTAPI + KsValidateClockCreateRequest(IN PIRP Irp, + OUT PKSCLOCK_CREATE* ClockCreate); + + KSDDKAPI KSSTATE NTAPI + KsGetDefaultClockState(IN PKSDEFAULTCLOCK DefaultClock); + + KSDDKAPI VOID NTAPI + KsSetDefaultClockState(IN PKSDEFAULTCLOCK DefaultClock, + IN KSSTATE State); + + KSDDKAPI LONGLONG NTAPI + KsGetDefaultClockTime(IN PKSDEFAULTCLOCK DefaultClock); + + KSDDKAPI VOID NTAPI + KsSetDefaultClockTime(IN PKSDEFAULTCLOCK DefaultClock, + IN LONGLONG Time); + + KSDDKAPI NTSTATUS NTAPI + KsCreatePin(IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); + + KSDDKAPI NTSTATUS NTAPI + KsValidateConnectRequest(IN PIRP Irp, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + OUT PKSPIN_CONNECT* Connect); + + KSDDKAPI NTSTATUS NTAPI + KsPinPropertyHandler(IN PIRP Irp, + IN PKSPROPERTY Property, + IN OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor); + + KSDDKAPI NTSTATUS NTAPI + KsPinDataIntersection(IN PIRP Irp, + IN PKSP_PIN Pin, + OUT PVOID Data OPTIONAL, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + IN PFNKSINTERSECTHANDLER IntersectHandler); + + KSDDKAPI NTSTATUS NTAPI + KsPinDataIntersectionEx(IN PIRP Irp, + IN PKSP_PIN Pin, + OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + IN ULONG DescriptorSize, + IN PFNKSINTERSECTHANDLEREX IntersectHandler OPTIONAL, + IN PVOID HandlerContext OPTIONAL); + + KSDDKAPI NTSTATUS NTAPI + KsHandleSizedListQuery(IN PIRP Irp, + IN ULONG DataItemsCount, + IN ULONG DataItemSize, + IN const VOID* DataItems); +#endif

1 0

[greatlrd] 32244: add more struct, define, type and so. around 70% completed of this header now
by greatlrd＠svn.reactos.org 09 Feb '08

09 Feb '08

Author: greatlrd Date: Sun Feb 10 01:07:41 2008 New Revision: 32244 URL: http://svn.reactos.org/svn/reactos?rev=32244&view=rev Log: add more struct, define, type and so. around 70% completed of this header now Modified: branches/reactx/reactos/include/dxsdk/ks.h 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 Sun Feb 10 01:07:41 2008 @@ -1442,6 +1442,21 @@ }; } KSPIN_DESCRIPTOR, *PKSPIN_DESCRIPTOR, *PCKSPIN_DESCRIPTOR; + typedef struct + { + GUID ProtocolId; + PVOID Argument1; + PVOID Argument2; + } KSHANDSHAKE, *PKSHANDSHAKE; + + typedef struct _KSGATE KSGATE, *PKSGATE; + + struct _KSGATE + { + LONG Count; + PKSGATE NextGate; + }; + #define DEFINE_KSPIN_DESCRIPTOR_TABLE(tablename) const KSPIN_DESCRIPTOR tablename[] = #define DEFINE_KSPIN_DESCRIPTOR_ITEM\ @@ -1862,6 +1877,7 @@ PKSOBJECT_CREATE_ITEM CreateItemsList; } KSOBJECT_CREATE, *PKSOBJECT_CREATE; + /* Dispatch Table http://www.osronline.com/DDKx/stream/ks-struct_494j.htm */ typedef struct { PDRIVER_DISPATCH DeviceIoControl; @@ -1883,12 +1899,6 @@ PFNDEREFERENCEDEVICEOBJECT DereferenceDeviceObject; PFNQUERYREFERENCESTRING QueryReferenceString; } BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE; - - typedef struct - { - INTERFACE Interface; - PFNQUERYMEDIUMSLIST QueryMediumsList; - } BUS_INTERFACE_MEDIUMS, *PBUS_INTERFACE_MEDIUMS; typedef NTSTATUS (*PFNKSADDEVENT)(IN PIRP Irp, IN PKSEVENTDATA EventData, IN struct _KSEVENT_ENTRY* EventEntry); typedef VOID (*PFNKSREMOVEEVENT)(IN PFILE_OBJECT FileObject, IN struct _KSEVENT_ENTRY* EventEntry ); @@ -2012,6 +2022,400 @@ +#if defined(_NTDDK_) + + typedef PVOID KSOBJECT_BAG; + typedef BOOLEAN (*PFNKSGENERATEEVENTCALLBACK)(IN PVOID Context, IN PKSEVENT_ENTRY EventEntry); + typedef void (*PFNKSDEVICEIRPVOID)(IN PKSDEVICE Device, IN PIRP Irp); + typedef void (*PFNKSDEVICESETPOWER)( IN PKSDEVICE Device, IN PIRP Irp, IN DEVICE_POWER_STATE To, IN DEVICE_POWER_STATE From); + typedef NTSTATUS (*PFNKSDEVICECREATE)(IN PKSDEVICE Device); + typedef NTSTATUS (*PFNKSDEVICEQUERYCAPABILITIES)( IN PKSDEVICE Device, IN PIRP Irp, IN OUT PDEVICE_CAPABILITIES Capabilities); + typedef void (*PFNKSFILTERPOWER)(IN PKSFILTER Filter, IN DEVICE_POWER_STATE State); + typedef NTSTATUS (*PFNKSPINIRP)( IN PKSPIN Pin, IN PIRP Irp); + typedef NTSTATUS (*PFNKSDEVICE)(IN PKSDEVICE Device); + typedef NTSTATUS (*PFNKSDEVICEIRP)(IN PKSDEVICE Device, IN PIRP Irp); + typedef NTSTATUS (*PFNKSPINHANDSHAKE)( IN PKSPIN Pin, IN PKSHANDSHAKE In, IN PKSHANDSHAKE Out); + typedef NTSTATUS (*PFNKSPIN)(IN PKSPIN Pin); + typedef void (*PFNKSPINVOID)(IN PKSPIN Pin); + typedef void (*PFNKSPINPOWER)(IN PKSPIN Pin, IN DEVICE_POWER_STATE State); + typedef NTSTATUS (*PFNKSPINSETDEVICESTATE)( IN PKSPIN Pin, IN KSSTATE ToState, IN KSSTATE FromState); + typedef NTSTATUS (*PFNKSFILTERFACTORYVOID)(IN PKSFILTERFACTORY FilterFactory); + typedef void (*PFNKSFILTERFACTORYPOWER)(IN PKSFILTERFACTORY FilterFactory, IN DEVICE_POWER_STATE State); + typedef NTSTATUS (*PFNKSFILTERIRP)(IN PKSFILTER Filter, IN PIRP Irp); + typedef NTSTATUS (*PFNKSFILTERPROCESS)(IN PKSFILTER Filter, IN PKSPROCESSPIN_INDEXENTRY Index); + typedef NTSTATUS (*PFNKSFILTERVOID)(IN PKSFILTER Filter); + typedef BOOLEAN (*PFNKSPINSETTIMER)(IN PKSPIN Pin, IN PKTIMER Timer, IN LARGE_INTEGER DueTime, IN PKDPC Dpc); + typedef BOOLEAN (*PFNKSPINCANCELTIMER)(IN PKSPIN Pin, IN PKTIMER Timer); + typedef LONGLONG (FASTCALL *PFNKSPINCORRELATEDTIME)(IN PKSPIN Pin, OUT PLONGLONG SystemTime); + typedef void (*PFNKSPINRESOLUTION)(IN PKSPIN Pin, OUT PKSRESOLUTION Resolution); + typedef NTSTATUS (*PFNKSPININITIALIZEALLOCATOR)(IN PKSPIN Pin, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PVOID* Context); + typedef void (*PFNKSSTREAMPOINTER)(IN PKSSTREAM_POINTER StreamPointer); + + + typedef NTSTATUS (*PFNKSDEVICEPNPSTART)(IN PKSDEVICE Device, IN PIRP Irp, IN PCM_RESOURCE_LIST TranslatedResourceList OPTIONAL, + IN PCM_RESOURCE_LIST UntranslatedResourceList OPTIONAL); + + typedef NTSTATUS (*PFNKSDEVICEQUERYPOWER)(IN PKSDEVICE Device, IN PIRP Irp, IN DEVICE_POWER_STATE DeviceTo, IN DEVICE_POWER_STATE DeviceFrom, + IN SYSTEM_POWER_STATE SystemTo, IN SYSTEM_POWER_STATE SystemFrom, IN POWER_ACTION Action); + + + typedef NTSTATUS (*PFNKSPINSETDATAFORMAT)(IN PKSPIN Pin, IN PKSDATAFORMAT OldFormat OPTIONAL, IN PKSMULTIPLE_ITEM OldAttributeList OPTIONAL, + IN const KSDATARANGE* DataRange, IN const KSATTRIBUTE_LIST* AttributeRange OPTIONAL); + + + + #ifndef _NTOS_ + + void __inline KsGateTurnInputOn(IN PKSGATE Gate OPTIONAL) + { + while (Gate && (InterlockedIncrement(&Gate->Count) == 1)) + { + Gate = Gate->NextGate; + } + } + + void __inline KsGateTurnInputOff(IN PKSGATE Gate OPTIONAL) + { + while (Gate && (InterlockedDecrement(&Gate->Count) == 0)) + { + Gate = Gate->NextGate; + } + } + + BOOLEAN __inline KsGateGetStateUnsafe(IN PKSGATE Gate) + { + ASSERT(Gate); + return((BOOLEAN)(Gate->Count > 0)); + } + + BOOLEAN __inline KsGateCaptureThreshold(IN PKSGATE Gate) + { + BOOLEAN captured; + ASSERT(Gate); + + captured = (BOOLEAN)(InterlockedCompareExchange(&Gate->Count,0,1) == 1); + if (captured) + { + KsGateTurnInputOff(Gate->NextGate); + } + return captured; + } + + void __inline KsGateInitialize( IN PKSGATE Gate, IN LONG InitialCount, IN PKSGATE NextGate OPTIONAL, IN BOOLEAN StateToPropagate) + { + ASSERT(Gate); + Gate->Count = InitialCount; + Gate->NextGate = NextGate; + + if (NextGate) + { + if (InitialCount > 0) + { + if (StateToPropagate) + { + KsGateTurnInputOn(NextGate); + } + } + else + { + if (! StateToPropagate) + { + KsGateTurnInputOff(NextGate); + } + } + } + } + + void __inline KsGateInitializeAnd( IN PKSGATE AndGate, IN PKSGATE NextOrGate OPTIONAL) + { + KsGateInitialize(AndGate,1,NextOrGate,TRUE); + } + + void __inline KsGateInitializeOr(IN PKSGATE OrGate, IN PKSGATE NextAndGate OPTIONAL) + { + KsGateInitialize(OrGate,0,NextAndGate,FALSE); + } + + void __inline KsGateAddOnInputToAnd(IN PKSGATE AndGate) { UNREFERENCED_PARAMETER (AndGate); } + void __inline KsGateRemoveOnInputFromAnd(IN PKSGATE AndGate) { UNREFERENCED_PARAMETER (AndGate); } + void __inline KsGateRemoveOnInputFromOr(IN PKSGATE OrGate) { KsGateTurnInputOff(OrGate); } + void __inline KsGateRemoveOffInputFromOr(IN PKSGATE OrGate) { UNREFERENCED_PARAMETER (OrGate); } + void __inline KsGateAddOnInputToOr(IN PKSGATE OrGate) { KsGateTurnInputOn(OrGate); } + void __inline KsGateRemoveOffInputFromAnd(IN PKSGATE AndGate) { KsGateTurnInputOn(AndGate); } + void __inline KsGateAddOffInputToOr(IN PKSGATE OrGate) { UNREFERENCED_PARAMETER (OrGate); } + void __inline KsGateAddOffInputToAnd(IN PKSGATE AndGate) { KsGateTurnInputOff(AndGate); } + + void __inline KsGateTerminateOr(IN PKSGATE OrGate) + { + ASSERT(OrGate); + if (KsGateGetStateUnsafe(OrGate)) + { + KsGateRemoveOnInputFromAnd(OrGate->NextGate); + } + else + { + KsGateRemoveOffInputFromAnd(OrGate->NextGate); + } + } + + void __inline KsGateTerminateAnd( IN PKSGATE AndGate) + { + ASSERT(AndGate); + if (KsGateGetStateUnsafe(AndGate)) + { + KsGateRemoveOnInputFromOr(AndGate->NextGate); + } + else + { + KsGateRemoveOffInputFromOr(AndGate->NextGate); + } + } + #endif + + + + typedef struct + { + INTERFACE Interface; + PFNQUERYMEDIUMSLIST QueryMediumsList; + } BUS_INTERFACE_MEDIUMS, *PBUS_INTERFACE_MEDIUMS; + + struct KSAUTOMATION_TABLE_ + { + ULONG PropertySetsCount; + ULONG PropertyItemSize; + const KSPROPERTY_SET* PropertySets; + ULONG MethodSetsCount; + ULONG MethodItemSize; + const KSMETHOD_SET* MethodSets; + ULONG EventSetsCount; + ULONG EventItemSize; + const KSEVENT_SET* EventSets; + #if !defined(_WIN64) + PVOID Alignment; + #endif + } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE; + + struct _KSDEVICE_DISPATCH + { + PFNKSDEVICECREATE Add; + PFNKSDEVICEPNPSTART Start; + PFNKSDEVICE PostStart; + PFNKSDEVICEIRP QueryStop; + PFNKSDEVICEIRPVOID CancelStop; + PFNKSDEVICEIRPVOID Stop; + PFNKSDEVICEIRP QueryRemove; + PFNKSDEVICEIRPVOID CancelRemove; + PFNKSDEVICEIRPVOID Remove; + PFNKSDEVICEQUERYCAPABILITIES QueryCapabilities; + PFNKSDEVICEIRPVOID SurpriseRemoval; + PFNKSDEVICEQUERYPOWER QueryPower; + PFNKSDEVICESETPOWER SetPower; + PFNKSDEVICEIRP QueryInterface; + }; + + struct _KSFILTER_DISPATCH + { + PFNKSFILTERIRP Create; + PFNKSFILTERIRP Close; + PFNKSFILTERPROCESS Process; + PFNKSFILTERVOID Reset; + }; + + struct _KSPIN_DISPATCH + { + PFNKSPINIRP Create; + PFNKSPINIRP Close; + PFNKSPIN Process; + PFNKSPINVOID Reset; + PFNKSPINSETDATAFORMAT SetDataFormat; + PFNKSPINSETDEVICESTATE SetDeviceState; + PFNKSPIN Connect; + PFNKSPINVOID Disconnect; + const KSCLOCK_DISPATCH* Clock; + const KSALLOCATOR_DISPATCH* Allocator; + }; + + struct _KSCLOCK_DISPATCH + { + PFNKSPINSETTIMER SetTimer; + PFNKSPINCANCELTIMER CancelTimer; + PFNKSPINCORRELATEDTIME CorrelatedTime; + PFNKSPINRESOLUTION Resolution; + }; + + struct _KSALLOCATOR_DISPATCH + { + PFNKSPININITIALIZEALLOCATOR InitializeAllocator; + PFNKSDELETEALLOCATOR DeleteAllocator; + PFNKSDEFAULTALLOCATE Allocate; + PFNKSDEFAULTFREE Free; + }; + + struct _KSDEVICE_DESCRIPTOR + { + const KSDEVICE_DISPATCH* Dispatch; + ULONG FilterDescriptorsCount; + const KSFILTER_DESCRIPTOR*const* FilterDescriptors; + ULONG Version; + }; + + struct _KSFILTER_DESCRIPTOR + { + const KSFILTER_DISPATCH* Dispatch; + const KSAUTOMATION_TABLE* AutomationTable; + ULONG Version; + ULONG Flags; + const GUID* ReferenceGuid; + ULONG PinDescriptorsCount; + ULONG PinDescriptorSize; + const KSPIN_DESCRIPTOR_EX* PinDescriptors; + ULONG CategoriesCount; + const GUID* Categories; + ULONG NodeDescriptorsCount; + ULONG NodeDescriptorSize; + const KSNODE_DESCRIPTOR* NodeDescriptors; + ULONG ConnectionsCount; + const KSTOPOLOGY_CONNECTION* Connections; + const KSCOMPONENTID* ComponentId; + }; + + struct _KSPIN_DESCRIPTOR_EX + { + const KSPIN_DISPATCH* Dispatch; + const KSAUTOMATION_TABLE* AutomationTable; + KSPIN_DESCRIPTOR PinDescriptor; + ULONG Flags; + ULONG InstancesPossible; + ULONG InstancesNecessary; + const KSALLOCATOR_FRAMING_EX* AllocatorFraming; + PFNKSINTERSECTHANDLEREX IntersectHandler; + }; + + struct _KSNODE_DESCRIPTOR + { + const KSAUTOMATION_TABLE* AutomationTable; + const GUID* Type; + const GUID* Name; + #if !defined(_WIN64) + PVOID Alignment; + #endif + }; + + struct _KSDEVICE + { + const KSDEVICE_DESCRIPTOR* Descriptor; + KSOBJECT_BAG Bag; + PVOID Context; + PDEVICE_OBJECT FunctionalDeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT NextDeviceObject; + BOOLEAN Started; + SYSTEM_POWER_STATE SystemPowerState; + DEVICE_POWER_STATE DevicePowerState; + }; + + struct _KSFILTERFACTORY + { + const KSFILTER_DESCRIPTOR* FilterDescriptor; + KSOBJECT_BAG Bag; + PVOID Context; + }; + + struct _KSFILTER + { + const KSFILTER_DESCRIPTOR* Descriptor; + KSOBJECT_BAG Bag; + PVOID Context; + }; + + struct _KSPIN + { + const KSPIN_DESCRIPTOR_EX* Descriptor; + KSOBJECT_BAG Bag; + PVOID Context; + ULONG Id; + KSPIN_COMMUNICATION Communication; + BOOLEAN ConnectionIsExternal; + KSPIN_INTERFACE ConnectionInterface; + KSPIN_MEDIUM ConnectionMedium; + KSPRIORITY ConnectionPriority; + PKSDATAFORMAT ConnectionFormat; + PKSMULTIPLE_ITEM AttributeList; + ULONG StreamHeaderSize; + KSPIN_DATAFLOW DataFlow; + KSSTATE DeviceState; + KSRESET ResetState; + KSSTATE ClientState; + }; + + #define DEFINE_KSAUTOMATION_TABLE(table) const KSAUTOMATION_TABLE table = + #define DEFINE_KSAUTOMATION_PROPERTIES(table) SIZEOF_ARRAY(table), sizeof(KSPROPERTY_ITEM), table + #define DEFINE_KSAUTOMATION_METHODS(table) SIZEOF_ARRAY(table), sizeof(KSMETHOD_ITEM), table + #define DEFINE_KSAUTOMATION_EVENTS(table) SIZEOF_ARRAY(table), sizeof(KSEVENT_ITEM), table + #define DEFINE_KSAUTOMATION_PROPERTIES_NULL 0, sizeof(KSPROPERTY_ITEM), NULL + #define DEFINE_KSAUTOMATION_METHODS_NULL 0, sizeof(KSMETHOD_ITEM), NULL + #define DEFINE_KSAUTOMATION_EVENTS_NULL 0, sizeof(KSEVENT_ITEM), NULL + #define MIN_DEV_VER_FOR_QI (0x100) + #define KSDEVICE_DESCRIPTOR_VERSION (0x100) + #define KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING 0x00000001 + #define KSFILTER_FLAG_CRITICAL_PROCESSING 0x00000002 + #define KSFILTER_FLAG_HYPERCRITICAL_PROCESSING 0x00000004 + #define KSFILTER_FLAG_RECEIVE_ZERO_LENGTH_SAMPLES 0x00000008 + #define KSFILTER_FLAG_DENY_USERMODE_ACCESS 0x80000000 + #define KSFILTER_DESCRIPTOR_VERSION ((ULONG)-1) + + #define DEFINE_KSFILTER_DESCRIPTOR(descriptor) const KSFILTER_DESCRIPTOR descriptor = + #define DEFINE_KSFILTER_PIN_DESCRIPTORS(table) SIZEOF_ARRAY(table), sizeof(table[0]), table + #define DEFINE_KSFILTER_CATEGORIES(table) SIZEOF_ARRAY(table), table + #define DEFINE_KSFILTER_CATEGORY(category) 1, &(category) + #define DEFINE_KSFILTER_CATEGORIES_NULL 0, NULL + #define DEFINE_KSFILTER_NODE_DESCRIPTORS(table) SIZEOF_ARRAY(table), sizeof(table[0]), table + #define DEFINE_KSFILTER_NODE_DESCRIPTORS_NULL 0, sizeof(KSNODE_DESCRIPTOR), NULL + #define DEFINE_KSFILTER_CONNECTIONS(table) SIZEOF_ARRAY(table), table + #define DEFINE_KSFILTER_DEFAULT_CONNECTIONS 0, NULL + #define DEFINE_KSFILTER_DESCRIPTOR_TABLE(table) const KSFILTER_DESCRIPTOR*const table[] = + #define KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING + #define KSPIN_FLAG_CRITICAL_PROCESSING KSFILTER_FLAG_CRITICAL_PROCESSING + #define KSPIN_FLAG_HYPERCRITICAL_PROCESSING KSFILTER_FLAG_HYPERCRITICAL_PROCESSING + #define KSPIN_FLAG_ASYNCHRONOUS_PROCESSING 0x00000008 + #define KSPIN_FLAG_DO_NOT_INITIATE_PROCESSING 0x00000010 + #define KSPIN_FLAG_INITIATE_PROCESSING_ON_EVERY_ARRIVAL 0x00000020 + #define KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING 0x00000040 + #define KSPIN_FLAG_ENFORCE_FIFO 0x00000080 + #define KSPIN_FLAG_GENERATE_MAPPINGS 0x00000100 + #define KSPIN_FLAG_DISTINCT_TRAILING_EDGE 0x00000200 + #define KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY 0x00010000 + #define KSPIN_FLAG_SPLITTER 0x00020000 + #define KSPIN_FLAG_USE_STANDARD_TRANSPORT 0x00040000 + #define KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT 0x00080000 + #define KSPIN_FLAG_FIXED_FORMAT 0x00100000 + #define KSPIN_FLAG_GENERATE_EOS_EVENTS 0x00200000 + #define KSPIN_FLAG_RENDERER (KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY|KSPIN_FLAG_GENERATE_EOS_EVENTS) + #define KSPIN_FLAG_IMPLEMENT_CLOCK 0x00400000 + #define KSPIN_FLAG_SOME_FRAMES_REQUIRED_FOR_PROCESSING 0x00800000 + #define KSPIN_FLAG_PROCESS_IF_ANY_IN_RUN_STATE 0x01000000 + #define KSPIN_FLAG_DENY_USERMODE_ACCESS 0x80000000 + #define DEFINE_KSPIN_DEFAULT_INTERFACES 0, NULL + #define DEFINE_KSPIN_DEFAULT_MEDIUMS 0, NULL + +#endif + + + + + + + + + + + + + + + + #if defined(__cplusplus) extern "C" { #endif

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
46
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2008