Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[cgutman] 37864: - Remove some hacky double completion code
by cgutman＠svn.reactos.org 05 Dec '08

05 Dec '08

Author: cgutman Date: Thu Dec 4 23:12:01 2008 New Revision: 37864 URL: http://svn.reactos.org/svn/reactos?rev=37864&view=rev Log: - Remove some hacky double completion code Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Dec 4 23:12:01 2008 @@ -9,9 +9,6 @@ */ #include "precomp.h" - -/* Define this to bugcheck on double complete */ -/* #define BREAK_ON_DOUBLE_COMPLETE */ UINT TransferDataCalled = 0; UINT TransferDataCompleteCalled = 0; @@ -51,54 +48,6 @@ LIST_ENTRY AdapterListHead; KSPIN_LOCK AdapterListLock; -/* Double complete protection */ -KSPIN_LOCK LanSendCompleteLock; -LIST_ENTRY LanSendCompleteList; - -VOID LanChainCompletion( PLAN_ADAPTER Adapter, PNDIS_PACKET NdisPacket ) { - PLAN_WQ_ITEM PendingCompletion = - ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - - if( !PendingCompletion ) return; - - PendingCompletion->Packet = NdisPacket; - PendingCompletion->Adapter = Adapter; - - ExInterlockedInsertTailList( &LanSendCompleteList, - &PendingCompletion->ListEntry, - &LanSendCompleteLock ); -} - -BOOLEAN LanShouldComplete( PLAN_ADAPTER Adapter, PNDIS_PACKET NdisPacket ) { - PLIST_ENTRY ListEntry; - PLAN_WQ_ITEM CompleteEntry; - KIRQL OldIrql; - - KeAcquireSpinLock( &LanSendCompleteLock, &OldIrql ); - for( ListEntry = LanSendCompleteList.Flink; - ListEntry != &LanSendCompleteList; - ListEntry = ListEntry->Flink ) { - CompleteEntry = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - if( CompleteEntry->Adapter == Adapter && - CompleteEntry->Packet == NdisPacket ) { - RemoveEntryList( ListEntry ); - KeReleaseSpinLock( &LanSendCompleteLock, OldIrql ); - ExFreePool( CompleteEntry ); - return TRUE; - } - } - KeReleaseSpinLock( &LanSendCompleteLock, OldIrql ); - - DbgPrint("NDIS completed the same send packet twice " - "(Adapter %x Packet %x)!!\n", Adapter, NdisPacket); -#ifdef BREAK_ON_DOUBLE_COMPLETE - KeBugCheck(0); -#endif - - return FALSE; -} - NDIS_STATUS NDISCall( PLAN_ADAPTER Adapter, NDIS_REQUEST_TYPE Type, @@ -283,13 +232,11 @@ */ { TI_DbgPrint(DEBUG_DATALINK, ("Calling completion routine\n")); - if( LanShouldComplete( (PLAN_ADAPTER)BindingContext, Packet ) ) { - ASSERT_KM_POINTER(Packet); - ASSERT_KM_POINTER(PC(Packet)); - ASSERT_KM_POINTER(PC(Packet)->DLComplete); - (*PC(Packet)->DLComplete)( PC(Packet)->Context, Packet, Status); - TI_DbgPrint(DEBUG_DATALINK, ("Finished\n")); - } + ASSERT_KM_POINTER(Packet); + ASSERT_KM_POINTER(PC(Packet)); + ASSERT_KM_POINTER(PC(Packet)->DLComplete); + (*PC(Packet)->DLComplete)( PC(Packet)->Context, Packet, Status); + TI_DbgPrint(DEBUG_DATALINK, ("Finished\n")); } VOID LanReceiveWorker( PVOID Context ) { @@ -645,8 +592,6 @@ /* XXX arty -- Handled adjustment in a saner way than before ... * not needed immediately */ GetDataPtr( NdisPacket, 0, &Data, &Size ); - - LanChainCompletion( Adapter, NdisPacket ); switch (Adapter->Media) { case NdisMedium802_3: @@ -1380,24 +1325,4 @@ } } -VOID LANStartup() { - InitializeListHead( &LanSendCompleteList ); - KeInitializeSpinLock( &LanSendCompleteLock ); -} - -VOID LANShutdown() { - KIRQL OldIrql; - PLAN_WQ_ITEM WorkItem; - PLIST_ENTRY ListEntry; - - KeAcquireSpinLock( &LanSendCompleteLock, &OldIrql ); - while( !IsListEmpty( &LanSendCompleteList ) ) { - ListEntry = RemoveHeadList( &LanSendCompleteList ); - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - FreeNdisPacket( WorkItem->Packet ); - ExFreePool( WorkItem ); - } - KeReleaseSpinLock( &LanSendCompleteLock, OldIrql ); -} - /* EOF */ Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Thu Dec 4 23:12:01 2008 @@ -585,9 +585,6 @@ /* Shutdown network level protocol subsystem */ IPShutdown(); - /* Shutdown the lan worker */ - LANShutdown(); - /* Free NDIS buffer descriptors */ if (GlobalBufferPool) NdisFreeBufferPool(GlobalBufferPool); @@ -827,9 +824,6 @@ return Status; } - /* Initialize the lan worker */ - LANStartup(); - /* Register protocol with NDIS */ /* This used to be IP_DEVICE_NAME but the DDK says it has to match your entry in the SCM */ Status = LANRegisterProtocol(&strNdisDeviceName); @@ -843,7 +837,6 @@ NULL, 0, NULL); - LANShutdown(); TCPShutdown(); UDPShutdown(); RawIPShutdown(); @@ -863,7 +856,6 @@ Status = LoopRegisterAdapter(NULL, NULL); if (!NT_SUCCESS(Status)) { TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status)); - LANShutdown(); TCPShutdown(); UDPShutdown(); RawIPShutdown();

1 0

[dgoette] 37863: * add a new database layout * convert all queries to the new layout * rewrite/simplify database layout dependent code * introduce new bugs :)
by dgoette＠svn.reactos.org 04 Dec '08

04 Dec '08

1 0

[ekohl] 37862: Sync to wine-1.1.4: - Rob Shearman <robertshearman@gmail.com> Tue, 26 Aug 2008 widl: Raise RPC_X_SS_IN_NULL_CONTEXT exception for NULL in-only context handles instead of RPC_X_NULL_REF_PTR. Based on a patch by Michael Martin. - Alexandre Julliard <julliard@winehq.org> Sat, 30 Aug 2008 widl: Replace write_name() by get_name() to make the code more readable. - Dan Hipschman <dsh@linux.ucla.edu> Tue, 2 Sep 2008 widl: Output NULL for inherited methods in the vtbl.
by ekohl＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: ekohl Date: Thu Dec 4 15:22:42 2008 New Revision: 37862 URL: http://svn.reactos.org/svn/reactos?rev=37862&view=rev Log: Sync to wine-1.1.4: - Rob Shearman <robertshearman(a)gmail.com> Tue, 26 Aug 2008 widl: Raise RPC_X_SS_IN_NULL_CONTEXT exception for NULL in-only context handles instead of RPC_X_NULL_REF_PTR. Based on a patch by Michael Martin. - Alexandre Julliard <julliard(a)winehq.org> Sat, 30 Aug 2008 widl: Replace write_name() by get_name() to make the code more readable. - Dan Hipschman <dsh(a)linux.ucla.edu> Tue, 2 Sep 2008 widl: Output NULL for inherited methods in the vtbl. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Dec 4 15:22:42 2008 @@ -26,7 +26,7 @@ reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/widl # Synced to Wine-1_1_3, omitting patches that break MIDL-Compatibility +reactos/tools/widl # Synced to Wine-1_1_4, omitting patches that break MIDL-Compatibility The following libraries are shared with Wine. Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=37… ============================================================================== --- trunk/reactos/tools/widl/client.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/client.c [iso-8859-1] Thu Dec 4 15:22:42 2008 @@ -103,8 +103,7 @@ if (needs_space_after(get_func_return_type(func))) fprintf(client, " "); if (callconv) fprintf(client, "%s ", callconv); - write_prefix_name(client, prefix_client, def); - fprintf(client, "(\n"); + fprintf(client, "%s%s(\n", prefix_client, get_name(def)); indent++; if (func->args) write_args(client, func->args, iface->name, 0, TRUE); @@ -188,6 +187,14 @@ indent++; print_client("_Handle = NDRCContextBinding(%s%s);\n", is_ch_ptr ? "*" : "", context_handle_var->name); indent--; + if (is_attr(context_handle_var->attrs, ATTR_IN) && + !is_attr(context_handle_var->attrs, ATTR_OUT)) + { + print_client("else\n"); + indent++; + print_client("RpcRaiseException(RPC_X_SS_IN_NULL_CONTEXT);\n"); + indent--; + } fprintf(client, "\n"); } else if (implicit_handle) Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=37… ============================================================================== --- trunk/reactos/tools/widl/header.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.c [iso-8859-1] Thu Dec 4 15:22:42 2008 @@ -130,21 +130,20 @@ uuid->Data4[6], uuid->Data4[7]); } -void write_name(FILE *h, const var_t *v) -{ - if (is_attr( v->attrs, ATTR_PROPGET )) - fprintf(h, "get_" ); - else if (is_attr( v->attrs, ATTR_PROPPUT )) - fprintf(h, "put_" ); - else if (is_attr( v->attrs, ATTR_PROPPUTREF )) - fprintf(h, "putref_" ); - fprintf(h, "%s", v->name); -} - -void write_prefix_name(FILE *h, const char *prefix, const var_t *v) -{ - fprintf(h, "%s", prefix); - write_name(h, v); +const char *get_name(const var_t *v) +{ + static char buffer[256]; + + if (is_attr( v->attrs, ATTR_PROPGET )) + strcpy( buffer, "get_" ); + else if (is_attr( v->attrs, ATTR_PROPPUT )) + strcpy( buffer, "put_" ); + else if (is_attr( v->attrs, ATTR_PROPPUTREF )) + strcpy( buffer, "putref_" ); + else + buffer[0] = 0; + strcat( buffer, v->name ); + return buffer; } static void write_field(FILE *h, var_t *v) @@ -192,7 +191,7 @@ { if (v->name) { indent(h, 0); - write_name(h, v); + fprintf(h, "%s", get_name(v)); if (v->eval) { fprintf(h, " = "); write_expr(h, v->eval, 0, 1, NULL, NULL); @@ -643,17 +642,13 @@ if (!is_callas(def->attrs)) { const var_t *arg; - fprintf(header, "#define %s_", name); - write_name(header,def); - fprintf(header, "(This"); + fprintf(header, "#define %s_%s(This", name, get_name(def)); if (cur->args) LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) fprintf(header, ",%s", arg->name); fprintf(header, ") "); - fprintf(header, "(This)->lpVtbl->"); - write_name(header, def); - fprintf(header, "(This"); + fprintf(header, "(This)->lpVtbl->%s(This", get_name(def)); if (cur->args) LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) fprintf(header, ",%s", arg->name); @@ -706,9 +701,7 @@ indent(header, 0); fprintf(header, "virtual "); write_type_decl_left(header, get_func_return_type(cur)); - fprintf(header, " %s ", callconv); - write_name(header, def); - fprintf(header, "(\n"); + fprintf(header, " %s %s(\n", callconv, get_name(def)); write_args(header, cur->args, iface->name, 2, TRUE); fprintf(header, ") = 0;\n"); fprintf(header, "\n"); @@ -733,9 +726,7 @@ if (!callconv) callconv = ""; indent(header, 0); write_type_decl_left(header, get_func_return_type(cur)); - fprintf(header, " (%s *", callconv); - write_name(header, def); - fprintf(header, ")(\n"); + fprintf(header, " (%s *%s)(\n", callconv, get_name(def)); write_args(header, cur->args, name, 1, TRUE); fprintf(header, ");\n"); fprintf(header, "\n"); @@ -767,15 +758,11 @@ if (!callconv) callconv = ""; /* proxy prototype */ write_type_decl_left(header, get_func_return_type(cur)); - fprintf(header, " %s %s_", callconv, iface->name); - write_name(header, def); - fprintf(header, "_Proxy(\n"); + fprintf(header, " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(def)); write_args(header, cur->args, iface->name, 1, TRUE); fprintf(header, ");\n"); /* stub prototype */ - fprintf(header, "void __RPC_STUB %s_", iface->name); - write_name(header,def); - fprintf(header, "_Stub(\n"); + fprintf(header, "void __RPC_STUB %s_%s_Stub(\n", iface->name, get_name(def)); fprintf(header, " IRpcStubBuffer* This,\n"); fprintf(header, " IRpcChannelBuffer* pRpcChannelBuffer,\n"); fprintf(header, " PRPC_MESSAGE pRpcMessage,\n"); @@ -807,9 +794,7 @@ const var_t *mdef = m->def; /* proxy prototype - use local prototype */ write_type_decl_left(fp, get_func_return_type(m)); - fprintf(fp, " CALLBACK %s_", iface->name); - write_name(fp, mdef); - fprintf(fp, "_Proxy(\n"); + fprintf(fp, " CALLBACK %s_%s_Proxy(\n", iface->name, get_name(mdef)); write_args(fp, m->args, iface->name, 1, TRUE); fprintf(fp, ")"); if (body) { @@ -831,9 +816,7 @@ fprintf(fp, ";\n"); /* stub prototype - use remotable prototype */ write_type_decl_left(fp, get_func_return_type(cur)); - fprintf(fp, " __RPC_STUB %s_", iface->name); - write_name(fp, mdef); - fprintf(fp, "_Stub(\n"); + fprintf(fp, " __RPC_STUB %s_%s_Stub(\n", iface->name, get_name(mdef)); write_args(fp, cur->args, iface->name, 1, TRUE); fprintf(fp, ")"); if (body) @@ -857,8 +840,7 @@ write_type_decl_left(header, get_func_return_type(fun)); fprintf(header, " "); if (callconv) fprintf(header, "%s ", callconv); - write_prefix_name(header, prefix, def); - fprintf(header, "(\n"); + fprintf(header, "%s%s(\n", prefix, get_name(def)); if (fun->args) write_args(header, fun->args, iface->name, 0, TRUE); else Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=37… ============================================================================== --- trunk/reactos/tools/widl/header.h [iso-8859-1] (original) +++ trunk/reactos/tools/widl/header.h [iso-8859-1] Thu Dec 4 15:22:42 2008 @@ -31,8 +31,6 @@ extern int is_void(const type_t *t); extern int is_conformant_array(const type_t *t); extern int is_declptr(const type_t *t); -extern void write_name(FILE *h, const var_t *v); -extern void write_prefix_name(FILE *h, const char *prefix, const var_t *v); extern const char* get_name(const var_t *v); extern void write_type_left(FILE *h, type_t *t, int declonly); extern void write_type_right(FILE *h, type_t *t, int is_field); Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=378… ============================================================================== --- trunk/reactos/tools/widl/proxy.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/proxy.c [iso-8859-1] Thu Dec 4 15:22:42 2008 @@ -140,6 +140,11 @@ const attr_list_t *attrs = v->attrs; const type_t *type = v->type; + /* context handles have their own checking so they can be null for the + * purposes of null ref pointer checking */ + if (is_aliaschain_attr(type, ATTR_CONTEXTHANDLE)) + return 0; + if (! attrs && type) { attrs = type->attrs; @@ -259,9 +264,7 @@ indent = 0; write_type_decl_left(proxy, get_func_return_type(cur)); - print_proxy( " %s %s_", callconv, iface->name); - write_name(proxy, def); - print_proxy( "_Proxy(\n"); + print_proxy( " %s %s_%s_Proxy(\n", callconv, iface->name, get_name(def)); write_args(proxy, cur->args, iface->name, 1, TRUE); print_proxy( ")\n"); print_proxy( "{\n"); @@ -371,9 +374,7 @@ int has_full_pointer = is_full_pointer_function(cur); indent = 0; - print_proxy( "void __RPC_STUB %s_", iface->name); - write_name(proxy, def); - print_proxy( "_Stub(\n"); + print_proxy( "void __RPC_STUB %s_%s_Stub(\n", iface->name, get_name(def)); indent++; print_proxy( "IRpcStubBuffer* This,\n"); print_proxy( "IRpcChannelBuffer *_pRpcChannelBuffer,\n"); @@ -415,22 +416,13 @@ print_proxy(""); if (has_ret) fprintf(proxy, "_RetVal = "); if (cas) fprintf(proxy, "%s_%s_Stub", iface->name, cas); - else - { - fprintf(proxy, "_This->lpVtbl->"); - write_name(proxy, def); - } + else fprintf(proxy, "_This->lpVtbl->%s", get_name(def)); fprintf(proxy, "(_This"); if (cur->args) { LIST_FOR_EACH_ENTRY( arg, cur->args, const var_t, entry ) - { - fprintf(proxy, ", "); - if (arg->type->declarray) - fprintf(proxy, "*"); - write_name(proxy, arg); - } + fprintf(proxy, ", %s%s", arg->type->declarray ? "*" : "", get_name(arg)); } fprintf(proxy, ");\n"); fprintf(proxy, "\n"); @@ -481,9 +473,8 @@ var_t *def = cur->def; if (!is_callas(def->attrs)) { if (i) fprintf(proxy, ",\n"); - print_proxy( "%s%s_", skip ? "0\t/* " : "", iface->name); - write_name(proxy, def); - fprintf(proxy, "_Proxy%s", skip ? " */" : ""); + if (skip) print_proxy( "0 /* %s_%s_Proxy */", iface->name, get_name(def)); + else print_proxy( "%s_%s_Proxy", iface->name, get_name(def)); i++; } } @@ -501,15 +492,10 @@ if (iface->funcs) LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { var_t *def = cur->def; if (!is_local(def->attrs)) { - if (skip) - print_proxy("STUB_FORWARDING_FUNCTION,\n"); - else { - if (i) fprintf(proxy,",\n"); - print_proxy( "%s_", iface->name); - write_name(proxy, def); - fprintf(proxy, "_Stub"); - i++; - } + if (i) fprintf(proxy,",\n"); + if (skip) print_proxy("STUB_FORWARDING_FUNCTION"); + else print_proxy( "%s_%s_Stub", iface->name, get_name(def)); + i++; } } return i; Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=37… ============================================================================== --- trunk/reactos/tools/widl/server.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/server.c [iso-8859-1] Thu Dec 4 15:22:42 2008 @@ -63,13 +63,7 @@ /* check for a defined binding handle */ explicit_handle_var = get_explicit_handle_var(func); - fprintf(server, "void __RPC_STUB\n"); - fprintf(server, "%s_", iface->name); - write_name(server, def); - fprintf(server, "(\n"); - indent++; - print_server("PRPC_MESSAGE _pRpcMessage)\n"); - indent--; + print_server("void __RPC_STUB %s_%s( PRPC_MESSAGE _pRpcMessage )\n", iface->name, get_name(def)); /* write the functions body */ fprintf(server, "{\n"); @@ -150,7 +144,7 @@ print_server("_RetVal = "); else print_server(""); - write_prefix_name(server, prefix_server, def); + fprintf(server, "%s%s", prefix_server, get_name(def)); if (func->args) { @@ -176,10 +170,7 @@ } else { - print_server(""); - if (var->type->declarray) - fprintf(server, "*"); - write_name(server, var); + print_server("%s%s", var->type->declarray ? "*" : "", get_name(var)); } } fprintf(server, ");\n"); @@ -261,9 +252,7 @@ { var_t *def = func->def; - print_server("%s_", iface->name); - write_name(server, def); - fprintf(server, ",\n"); + print_server("%s_%s,\n", iface->name, get_name(def)); method_count++; } 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 [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Thu Dec 4 15:22:42 2008 @@ -3196,11 +3196,9 @@ write_type_decl_left(file, var->type); fprintf(file, " "); if (var->type->declarray) { - fprintf(file, "( *"); - write_name(file, var); - fprintf(file, " )"); + fprintf(file, "(*%s)", get_name(var)); } else - write_name(file, var); + fprintf(file, "%s", get_name(var)); write_type_right(file, var->type, FALSE); fprintf(file, ";\n"); @@ -3231,8 +3229,7 @@ if (!in_attr) { - print_file(file, indent, ""); - write_name(file, var); + print_file(file, indent, "%s", get_name(var)); if (is_context_handle(var->type)) {

1 0

[hyperion] 37861: modified tools/rbuild/backend/mingw/modulehandler.cpp DWARF debugging information confuses rsym, and DWARF-2 information from internal libraries (like libgcc) results in huge executables that don't even run on Windows. Therefore, before the rsym phase, strip all DWARF-2 sections This is a HACK for gcc builds compiled with DWARF-2 symbols (e.g. 4.3.2-tdm-1). The real solution (to be implemented soon) is to parse DWARF-2 line numbers in rsym Amendment to r37851: use objcopy inste
by hyperion＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: hyperion Date: Thu Dec 4 15:13:43 2008 New Revision: 37861 URL: http://svn.reactos.org/svn/reactos?rev=37861&view=rev Log: modified tools/rbuild/backend/mingw/modulehandler.cpp DWARF debugging information confuses rsym, and DWARF-2 information from internal libraries (like libgcc) results in huge executables that don't even run on Windows. Therefore, before the rsym phase, strip all DWARF-2 sections This is a HACK for gcc builds compiled with DWARF-2 symbols (e.g. 4.3.2-tdm-1). The real solution (to be implemented soon) is to parse DWARF-2 line numbers in rsym Amendment to r37851: use objcopy instead of strip because strip gets us more than we bargained for, and strips all debug information too modified tools/rsym.c Don't overrun a heap block when there are discarded relocations Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rsym.c Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Dec 4 15:13:43 2008 @@ -1428,6 +1428,9 @@ "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); + // FIXME! workaround until rsym can extract line numbers from DWARF + fprintf ( fMakefile, + "\t$(Q)${objcopy} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R .debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R .debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars -R .debug_types -R .debug_weaknames $@\n\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); fprintf ( fMakefile, Modified: trunk/reactos/tools/rsym.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.c?rev=37861&r1=… ============================================================================== --- trunk/reactos/tools/rsym.c [iso-8859-1] (original) +++ trunk/reactos/tools/rsym.c [iso-8859-1] Thu Dec 4 15:13:43 2008 @@ -697,19 +697,23 @@ Length = StartOfRawData; for (Section = 0; Section < OutFileHeader->NumberOfSections; Section++) { + DWORD SizeOfRawData; if (OutRelocSection == OutSectionHeaders + Section) { Data = (void *) ProcessedRelocs; + SizeOfRawData = ProcessedRelocsLength; } else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) { Data = (void *) PaddedRosSym; + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; } else { Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); - } - for (i = 0; i < OutSectionHeaders[Section].SizeOfRawData / 2; i++) + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + for (i = 0; i < SizeOfRawData / 2; i++) { CheckSum += ((unsigned short*) Data)[i]; CheckSum = 0xffff & (CheckSum + (CheckSum >> 16)); @@ -730,21 +734,24 @@ { if (0 != OutSectionHeaders[Section].SizeOfRawData) { + DWORD SizeOfRawData; fseek(OutFile, OutSectionHeaders[Section].PointerToRawData, SEEK_SET); if (OutRelocSection == OutSectionHeaders + Section) { Data = (void *) ProcessedRelocs; + SizeOfRawData = ProcessedRelocsLength; } else if (RosSymLength > 0 && Section + 1 == OutFileHeader->NumberOfSections) { Data = (void *) PaddedRosSym; + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; } else { Data = (void *) ((char *) InData + OutSectionHeaders[Section].PointerToRawData); - } - if (fwrite(Data, 1, OutSectionHeaders[Section].SizeOfRawData, OutFile) != - OutSectionHeaders[Section].SizeOfRawData) + SizeOfRawData = OutSectionHeaders[Section].SizeOfRawData; + } + if (fwrite(Data, 1, SizeOfRawData, OutFile) != SizeOfRawData) { perror("Error writing section data\n"); free(PaddedRosSym);

1 0

[ekohl] 37860: Sync to wine-1.1.3: - Dan Hipschman <dsh@linux.ucla.edu> Thu, 7 Aug 2008 widl: Honor typedef pointer attributes.
by ekohl＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: ekohl Date: Thu Dec 4 14:20:08 2008 New Revision: 37860 URL: http://svn.reactos.org/svn/reactos?rev=37860&view=rev Log: Sync to wine-1.1.3: - Dan Hipschman <dsh(a)linux.ucla.edu> Thu, 7 Aug 2008 widl: Honor typedef pointer attributes. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Dec 4 14:20:08 2008 @@ -26,7 +26,7 @@ reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/widl # Synced to Wine-1_1_1 omitting patches that break MIDL-Compatibility +reactos/tools/widl # Synced to Wine-1_1_3, omitting patches that break MIDL-Compatibility The following libraries are shared with Wine. Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Thu Dec 4 14:20:08 2008 @@ -4741,7 +4741,6 @@ { expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); - int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); int sizeless, has_varconf; expr_t *dim; type_t *atype, **ptype; @@ -4772,13 +4771,15 @@ * pointer_default so we need to fix that up here */ if (!arr) { + int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); const type_t *ptr = NULL; /* pointer attributes on the left side of the type belong to the function * pointer, if one is being declared */ type_t **pt = func_type ? &func_type : &v->type; - for (ptr = *pt; ptr; ) + for (ptr = *pt; ptr && !ptr_attr; ) { - if (ptr->kind == TKIND_ALIAS) + ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); + if (!ptr_attr && ptr->kind == TKIND_ALIAS) ptr = ptr->orig; else break; Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Thu Dec 4 14:20:08 2008 @@ -1426,7 +1426,6 @@ { expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); - int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); int sizeless, has_varconf; expr_t *dim; type_t *atype, **ptype; @@ -1457,13 +1456,15 @@ * pointer_default so we need to fix that up here */ if (!arr) { + int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); const type_t *ptr = NULL; /* pointer attributes on the left side of the type belong to the function * pointer, if one is being declared */ type_t **pt = func_type ? &func_type : &v->type; - for (ptr = *pt; ptr; ) - { - if (ptr->kind == TKIND_ALIAS) + for (ptr = *pt; ptr && !ptr_attr; ) + { + ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); + if (!ptr_attr && ptr->kind == TKIND_ALIAS) ptr = ptr->orig; else break;

1 0

[ekohl] 37859: Sync to wine-1.1.1 (Patch 10 of 10): - Alexandre Julliard <julliard@winehq.org> Mon, 7 Jul 2008 Add noinput directive to all lex files to avoid a compiler warning.
by ekohl＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: ekohl Date: Thu Dec 4 13:52:55 2008 New Revision: 37859 URL: http://svn.reactos.org/svn/reactos?rev=37859&view=rev Log: Sync to wine-1.1.1 (Patch 10 of 10): - Alexandre Julliard <julliard(a)winehq.org> Mon, 7 Jul 2008 Add noinput directive to all lex files to avoid a compiler warning. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.yy.c 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 [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Dec 4 13:52:55 2008 @@ -26,7 +26,7 @@ reactos/tools/winebuild # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wmc # Synced to Wine-20081105 (~Wine-1.1.7) reactos/tools/wrc # Synced to Wine-20081105 (~Wine-1.1.7) -reactos/tools/widl # Synced to Wine-1_1_0 +reactos/tools/widl # Synced to Wine-1_1_1 omitting patches that break MIDL-Compatibility The following libraries are shared with Wine. Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=37… ============================================================================== --- trunk/reactos/tools/widl/parser.l [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.l [iso-8859-1] Thu Dec 4 13:52:55 2008 @@ -19,7 +19,7 @@ */ %option stack -%option nounput noyy_top_state +%option noinput nounput noyy_top_state %option 8bit never-interactive prefix="parser_" nl \r?\n 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 [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.yy.c [iso-8859-1] Thu Dec 4 13:52:55 2008 @@ -565,6 +565,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define YY_STACK_USED 1 +#define YY_NO_INPUT 1 #define YY_NO_UNPUT 1 #define YY_NO_TOP_STATE 1 #define YY_NEVER_INTERACTIVE 1 @@ -645,7 +646,7 @@ * The flexer starts here ************************************************************************** */ -#line 649 "parser.yy.c" +#line 650 "parser.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -801,7 +802,7 @@ #line 112 "parser.l" -#line 805 "parser.yy.c" +#line 806 "parser.yy.c" if ( yy_init ) { @@ -1095,7 +1096,7 @@ #line 187 "parser.l" ECHO; YY_BREAK -#line 1099 "parser.yy.c" +#line 1100 "parser.yy.c" case YY_END_OF_BUFFER: {

1 0

[ekohl] 37858: Sync to wine-1.1.1 (Patch 9 of 10): - Alexandre Julliard <julliard@winehq.org> Mon, 7 Jul 2008 widl: Fix a couple of uninitialized variable compiler warnings.
by ekohl＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: ekohl Date: Thu Dec 4 13:37:53 2008 New Revision: 37858 URL: http://svn.reactos.org/svn/reactos?rev=37858&view=rev Log: Sync to wine-1.1.1 (Patch 9 of 10): - Alexandre Julliard <julliard(a)winehq.org> Mon, 7 Jul 2008 widl: Fix a couple of uninitialized variable compiler warnings. Modified: trunk/reactos/tools/widl/typegen.c 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 [iso-8859-1] (original) +++ trunk/reactos/tools/widl/typegen.c [iso-8859-1] Thu Dec 4 13:37:53 2008 @@ -984,7 +984,7 @@ { unsigned int start, absoff, flags; unsigned int align = 0, ualign = 0; - const char *name; + const char *name = NULL; type_t *utype = get_user_type(type, &name); size_t usize = user_type_has_variable_size(utype) ? 0 : type_memsize(utype, &ualign); size_t size = type_memsize(type, &align); @@ -2457,11 +2457,12 @@ static unsigned int get_required_buffer_size_type( const type_t *type, const char *name, unsigned int *alignment) { + const char *uname; + const type_t *utype; + *alignment = 0; - if (is_user_type(type)) - { - const char *uname; - const type_t *utype = get_user_type(type, &uname); + if ((utype = get_user_type(type, &uname))) + { return get_required_buffer_size_type(utype, uname, alignment); } else

1 0

[tkreuzer] 37857: fix some ULONG/ULONG_PTR issues
by tkreuzer＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: tkreuzer Date: Thu Dec 4 13:08:55 2008 New Revision: 37857 URL: http://svn.reactos.org/svn/reactos?rev=37857&view=rev Log: fix some ULONG/ULONG_PTR issues Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Thu Dec 4 13:08:55 2008 @@ -2913,7 +2913,7 @@ srb, irpStack->MajorFunction, irpStack->Parameters.DeviceIoControl.IoControlCode, - MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1), + MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1), &status); DebugPrint((2, "CdRomDeviceControlCompletion: IRP will %sbe retried\n", @@ -2972,10 +2972,10 @@ } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { - - - if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) { + + + if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { // // Retry request. @@ -3479,7 +3479,7 @@ srb, irpStack->MajorFunction, irpStack->Parameters.DeviceIoControl.IoControlCode, - MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1), + MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1), &status); if (status == STATUS_DATA_OVERRUN) { @@ -3499,9 +3499,9 @@ retry = TRUE; } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { - - if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) { + + if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { // // Retry request. @@ -3810,7 +3810,7 @@ srb, irpStack->MajorFunction, irpStack->Parameters.DeviceIoControl.IoControlCode, - MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1), + MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1), &status); // @@ -3825,9 +3825,9 @@ retry = TRUE; } - if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) { - - if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) { + if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) { + + if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { // // Retry request. @@ -4186,7 +4186,7 @@ srb, irpStack->MajorFunction, irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0, - MAXIMUM_RETRIES - ((ULONG)irpNextStack->Parameters.Others.Argument1), + MAXIMUM_RETRIES - ((ULONG_PTR)irpNextStack->Parameters.Others.Argument1), &status); // @@ -4201,9 +4201,9 @@ retry = TRUE; } - if (retry && (irpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)irpNextStack->Parameters.Others.Argument1-1))) { - - if (((ULONG)irpNextStack->Parameters.Others.Argument1)) { + if (retry && (irpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)irpNextStack->Parameters.Others.Argument1-1))) { + + if (((ULONG_PTR)irpNextStack->Parameters.Others.Argument1)) { // // Retry request. @@ -5883,7 +5883,7 @@ // Decrement the countdown timer and put the IRP back in the list. // - count = (ULONG) irpStack->Parameters.Others.Argument3; + count = (ULONG_PTR) irpStack->Parameters.Others.Argument3; count--; irpStack->Parameters.Others.Argument3 = (PVOID) count; @@ -6507,7 +6507,7 @@ // irpStack = IoGetCurrentIrpStackLocation(Irp); - retryCount = (ULONG) irpStack->Parameters.Others.Argument1; + retryCount = (ULONG_PTR) irpStack->Parameters.Others.Argument1; originalIrp = (PIRP) irpStack->Parameters.Others.Argument2; if (!DeviceObject) {

1 0

[hyperion] 37856: Undo r37851 because rsym sucks
by hyperion＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: hyperion Date: Thu Dec 4 13:01:50 2008 New Revision: 37856 URL: http://svn.reactos.org/svn/reactos?rev=37856&view=rev Log: Undo r37851 because rsym sucks Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Dec 4 13:01:50 2008 @@ -1428,9 +1428,6 @@ "ifneq ($(ROS_GENERATE_RSYM),no)\n" ); fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" ); - // FIXME! workaround until rsym can extract line numbers from DWARF - fprintf ( fMakefile, - "\t$(Q)${strip} -R .debug_abbrev -R .debug_aranges -R .debug_frame -R .debug_info -R .debug_line -R .debug_pubnames -R .debug_macinfo -R .debug_str -R .debug_loc -R .debug_pubtypes -R .debug_ranges -R .debug_static_func -R .debug_static_vars -R .debug_types -R .debug_weaknames $@\n\n" ); fprintf ( fMakefile, "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); fprintf ( fMakefile,

1 0

[janderwald] 37855: - Implement PcGetDeviceProperty, PcGetTimeInterval - Stub interfaces of IDmaChannel, IDmaChannelSlave - Stub IMiniport adapters IMiniportDMus - Stub IPort drivers (IPortDMus, IPortMidi, IPortTopology, IPortWaveCyclic, IPortWavePci) - Implement IRegistryKey interface - Enhance IResource interface
by janderwald＠svn.reactos.org 04 Dec '08

04 Dec '08

Author: janderwald Date: Thu Dec 4 12:43:42 2008 New Revision: 37855 URL: http://svn.reactos.org/svn/reactos?rev=37855&view=rev Log: - Implement PcGetDeviceProperty, PcGetTimeInterval - Stub interfaces of IDmaChannel, IDmaChannelSlave - Stub IMiniport adapters IMiniportDMus - Stub IPort drivers (IPortDMus, IPortMidi, IPortTopology, IPortWaveCyclic, IPortWavePci) - Implement IRegistryKey interface - Enhance IResource interface Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c (with props) trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c (with props) Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/Miniport.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportDMus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportMidi.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportTopology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWaveCyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/Port.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/PortDMus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/PortMidi.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/PortTopology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/PortWaveCyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_factory.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/Miniport.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/Miniport.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/Miniport.cpp (removed) @@ -1,33 +1,0 @@ -/* - ReactOS Operating System - - Port Class API - IMiniPortMidi Implementation - - by Andrew Greenwood - - REFERENCE: - http://www.osronline.com/ddkx/stream/audmp-routines_64vn.htm -*/ - -#include "private.h" -#include <portcls.h> - -NTSTATUS -IMiniport::GetDescription( - OUT PPCFILTER_DESCRIPTOR* Description) -{ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -IMiniport::DataRangeIntersection( - IN ULONG PinId, - IN PKSDATARANGE DataRange, - IN PKSDATARANGE MatchingDataRange, - IN ULONG OutputBufferLength, - OUT PVOID ResultantFormat OPTIONAL, - OUT PULONG ResultantFormatLength) -{ - return STATUS_UNSUCCESSFUL; -} Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportDMus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportDMus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportDMus.cpp (removed) @@ -1,1 +1,0 @@ - Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportMidi.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportMidi.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportMidi.cpp (removed) @@ -1,43 +1,0 @@ -/* - ReactOS Operating System - - Port Class API - IMiniPortMidi Implementation - - by Andrew Greenwood - - REFERENCE: - http://www.osronline.com/ddkx/stream/audmp-routines_1fsj.htm -*/ -#include "private.h" -#include <portcls.h> - -NTSTATUS -IMiniportMidi::Init( - IN PUNKNOWN UnknownAdapter, - IN PRESOURCELIST ResourceList, - IN PPORTMIDI Port, - OUT PSERVICEGROUP* ServiceGroup) -{ - /* http://www.osronline.com/ddkx/stream/audmp-routines_6jsj.htm */ - - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -IMiniportMidi::NewStream( - OUT PMINIPORTMIDISTREAM Stream, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN POOL_TYPE PoolType, - IN ULONG Pin, - IN BOOLEAN Capture, - IN PKSDATAFORMAT DataFormat, - OUT PSERVICEGROUP* ServiceGroup) -{ - return STATUS_UNSUCCESSFUL; -} - -void -IMiniportMidi::Service(void) -{ -} Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportTopology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportTopology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportTopology.cpp (removed) @@ -1,1 +1,0 @@ - Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWaveCyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWaveCyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/MiniportWaveCyclic.cpp (removed) @@ -1,1 +1,0 @@ - Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/Port.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/Port.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/Port.cpp (removed) @@ -1,55 +1,0 @@ -/* - ReactOS Operating System - Port Class API / IPort Implementation - - by Andrew Greenwood - - REFERENCE: - http://www.osronline.com/ddkx/stream/audmp-routines_0tgz.htm - - NOTE: I'm not sure if this file is even needed... -*/ - -#if 0 -#include "../private.h" -#include <stdunk.h> -#include <portcls.h> - -NTSTATUS -IPort::GetDeviceProperty( - IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, - IN ULONG BufferLength, - OUT PVOID PropertyBuffer, - OUT PULONG ReturnLength) -{ - /* http://www.osronline.com/ddkx/stream/audmp-routines_93xv.htm */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -IPort::Init( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PUNKNOWN UnknownMiniport, - IN PUNKNOWN UnknownAdapter OPTIONAL, - IN PRESOURCELIST ResourceList) -{ - /* http://www.osronline.com/ddkx/stream/audmp-routines_7qcz.htm */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -IPort::NewRegistryKey( - OUT PREGISTRYKEY* OutRegistryKey, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN ULONG RegistryKeyType, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG CreateOptions OPTIONAL, - OUT PULONG Disposition OPTIONAL) -{ - /* http://www.osronline.com/ddkx/stream/audmp-routines_2jhv.htm */ - return STATUS_UNSUCCESSFUL; -} - -#endif Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/PortDMus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/PortDMus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/PortDMus.cpp (removed) @@ -1,1 +1,0 @@ - Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/PortMidi.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/PortMidi.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/PortMidi.cpp (removed) @@ -1,78 +1,0 @@ -/* - ReactOS Operating System - Port Class API / IPortMidi Implementation - - by Andrew Greenwood - - REFERENCE: - http://www.osronline.com/ddkx/stream/audmp-routines_49pv.htm - - NOTES: - IPortMidi inherits from IPort. This file contains specific - extensions. -*/ -#include "private.h" -#include <stdunk.h> -#include <portcls.h> -#include "port.h" - - -#if 0 - -/* - IPort Methods -*/ - -NTSTATUS -CPortMidi::GetDeviceProperty( - IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, - IN ULONG BufferLength, - OUT PVOID PropertyBuffer, - OUT PULONG ReturnLength) -{ - /* http://www.osronline.com/ddkx/stream/audmp-routines_93xv.htm */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -CPortMidi::Init( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PUNKNOWN UnknownMiniport, - IN PUNKNOWN UnknownAdapter OPTIONAL, - IN PRESOURCELIST ResourceList) -{ - /* http://www.osronline.com/ddkx/stream/audmp-routines_7qcz.htm */ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -CPortMidi::NewRegistryKey( - OUT PREGISTRYKEY* OutRegistryKey, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN ULONG RegistryKeyType, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG CreateOptions OPTIONAL, - OUT PULONG Disposition OPTIONAL) -{ - /* http://www.osronline.com/ddkx/stream/audmp-routines_2jhv.htm */ - return STATUS_UNSUCCESSFUL; -} - -/* - IPortMidi Methods -*/ - -VOID -CPortMidi::Notify(IN PSERVICEGROUP ServiceGroup OPTIONAL) -{ -} - -NTSTATUS -CPortMidi::RegisterServiceGroup(IN PSERVICEGROUP ServiceGroup) -{ - return STATUS_UNSUCCESSFUL; -} - -#endif Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/PortTopology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/PortTopology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/PortTopology.cpp (removed) @@ -1,3 +1,0 @@ -/* - Inherits from IPort only -*/ Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/PortWaveCyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/PortWaveCyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/PortWaveCyclic.cpp (removed) @@ -1,41 +1,0 @@ -/* - ReactOS Operating System - Port Class API / IPort Implementation - - by Andrew Greenwood -*/ - -#include "private.h" - -NTSTATUS -IPortWaveCyclic::NewMasterDmaChannel( - OUT PDMACHANNEL* DmaChannel, - IN PUNKNOWN OuterUnknown, - IN PRESOURCELIST ResourceList OPTIONAL, - IN ULONG MaximumLength, - IN BOOL Dma32BitAddresses, - IN BOOL Dma64BitAddresses, - IN DMA_WIDTH DmaWidth, - IN DMA_SPEED DmaSpeed) -{ - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -IPortWaveCyclic::NewSlaveDmaChannel( - OUT PDMACHANNELSLAVE* DmaChannel, - IN PUNKNOWN OuterUnknown, - IN PRESOURCELIST ResourceList OPTIONAL, - IN ULONG DmaIndex, - IN ULONG MaximumLength, - IN BOOL DemandMode, - IN DMA_SPEED DmaSpeed) -{ - return STATUS_UNSUCCESSFUL; -} - -VOID -IPortWaveCyclic::Notify( - IN PSERVICEGROUP ServiceGroup) -{ -} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -10,7 +10,7 @@ */ #include "private.h" - +#include <initguid.h> /* This is called from DriverEntry so that PortCls can take care of some IRPs and map some others to the main KS driver. In most cases this will Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,32 @@ +#include "private.h" + +/* + * @implemented + */ +NTSTATUS +NTAPI +PcGetDeviceProperty( + IN PVOID DeviceObject, + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ResultLength) +{ + return IoGetDeviceProperty(DeviceObject, DeviceProperty, BufferLength, PropertyBuffer, ResultLength); +} + +/* + * @implemented + */ +ULONGLONG +NTAPI +PcGetTimeInterval( + IN ULONGLONG Since) +{ + LARGE_INTEGER CurrentTime; + + KeQuerySystemTime(&CurrentTime); + + return (CurrentTime.QuadPart - Since); +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,198 @@ +#include "private.h" + + +typedef struct +{ + IDmaChannelSlaveVtbl *lpVtbl; + + LONG ref; + ULONG BufferSize; + PHYSICAL_ADDRESS Address; + +}IDmaChannelImpl; + + +/* + Basic IUnknown methods +*/ + + NTSTATUS + STDMETHODCALLTYPE + IDmaChannel_fnQueryInterface( + IDmaChannel* iface, + IN REFIID refiid, + OUT PVOID* Output) + { + /* TODO */ + return STATUS_UNSUCCESSFUL; + } + +ULONG +STDMETHODCALLTYPE +IDmaChannel_fnAddRef( + IDmaChannel* iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_AddRef: This %p\n", This); + + return _InterlockedIncrement(&This->ref); +} + +ULONG +STDMETHODCALLTYPE +IDmaChannel_fnRelease( + IDmaChannel* iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + _InterlockedDecrement(&This->ref); + + DPRINT("IDmaChannel_Release: This %p new ref %u\n", This, This->ref); + + if (This->ref == 0) + { + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + + + +NTSTATUS +NTAPI +IDmaChannel_fnAllocateBuffer( + IN IDmaChannel * iface, + IN ULONG BufferSize, + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_AllocateBuffer: This %p BufferSize %u\n", This, BufferSize); + + /* Did the caller already allocate a buffer ?*/ + if (This->BufferSize) return STATUS_UNSUCCESSFUL; + + /* FIXME */ + //This->BufferSize = BufferSize; + + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IDmaChannel_fnAllocatedBufferSize( + IN IDmaChannel * iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_AllocatedBufferSize: This %p BufferSize %u\n", This, This->BufferSize); + return This->BufferSize; +} + +VOID +NTAPI +IDmaChannel_fnCopyFrom( + IN IDmaChannel * iface, + IN PVOID Destination, + IN PVOID Source, + IN ULONG ByteCount + ) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_CopyFrom: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); +} + +VOID +NTAPI +IDmaChannel_fnCopyTo( + IN IDmaChannel * iface, + IN PVOID Destination, + IN PVOID Source, + IN ULONG ByteCount + ) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_CopyTo: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); +} + +VOID +NTAPI +IDmaChannel_fnFreeBuffer( + IN IDmaChannel * iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_FreeBuffer: This %p\n", This); +} + +PADAPTER_OBJECT +NTAPI +IDmaChannel_fnGetAdapterObject( + IN IDmaChannel * iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_GetAdapterObject: This %p\n", This); + return NULL; +} + +ULONG +NTAPI +IDmaChannel_fnMaximumBufferSize( + IN IDmaChannel * iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_MaximumBufferSize: This %p\n", This); + return 0; +} + +PHYSICAL_ADDRESS +NTAPI +IDmaChannel_fnPhysicalAdress( + IN IDmaChannel * iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_PhysicalAdress: This %p\n", This); + return This->Address; +} + +VOID +NTAPI +IDmaChannel_fnSetBufferSize( + IN IDmaChannel * iface, + IN ULONG BufferSize) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_SetBufferSize: This %p\n", This); + +} + +PVOID +NTAPI +IDmaChannel_fnSystemAddress( + IN IDmaChannel * iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_SystemAddress: This %p\n", This); + return NULL; +} + +ULONG +NTAPI +IDmaChannel_fnTransferCount( + IN IDmaChannel * iface) +{ + IDmaChannelImpl * This = (IDmaChannelImpl*)iface; + + DPRINT("IDmaChannel_TransferCount: This %p\n", This); + return 0; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_master.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,287 @@ +#include "private.h" + + +typedef struct +{ + IDmaChannelSlaveVtbl *lpVtbl; + + LONG ref; + + ULONG BufferSize; + PHYSICAL_ADDRESS Address; + +}IDmaChannelSlaveImpl; + + +//--------------------------------------------------------------- +// IUnknown methods +// + + +NTSTATUS +NTAPI +IDmaChannelSlave_fnQueryInterface( + IDmaChannelSlave * iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + /* TODO */ + return STATUS_UNSUCCESSFUL; +} + +ULONG +STDMETHODCALLTYPE +IDmaChannelSlave_fnAddRef( + IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_AddRef: This %p\n", This); + + return _InterlockedIncrement(&This->ref); +} + +ULONG +STDMETHODCALLTYPE +IDmaChannelSlave_fnRelease( + IDmaChannelSlave* iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + _InterlockedDecrement(&This->ref); + + DPRINT("IDmaChannelSlave_Release: This %p new ref %u\n", This, This->ref); + + if (This->ref == 0) + { + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +//--------------------------------------------------------------- +// IDmaChannel methods +// + + +NTSTATUS +NTAPI +IDmaChannelSlave_fnAllocateBuffer( + IN IDmaChannelSlave * iface, + IN ULONG BufferSize, + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_AllocateBuffer: This %p BufferSize %u\n", This, BufferSize); + + /* Did the caller already allocate a buffer ?*/ + if (This->BufferSize) return STATUS_UNSUCCESSFUL; + + /* FIXME */ + //This->BufferSize = BufferSize; + + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IDmaChannelSlave_fnAllocatedBufferSize( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_AllocatedBufferSize: This %p BufferSize %u\n", This, This->BufferSize); + return This->BufferSize; +} + +VOID +NTAPI +IDmaChannelSlave_fnCopyFrom( + IN IDmaChannelSlave * iface, + IN PVOID Destination, + IN PVOID Source, + IN ULONG ByteCount + ) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_CopyFrom: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); +} + +VOID +NTAPI +IDmaChannelSlave_fnCopyTo( + IN IDmaChannelSlave * iface, + IN PVOID Destination, + IN PVOID Source, + IN ULONG ByteCount + ) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_CopyTo: This %p Destination %p Source %p ByteCount %u\n", This, Destination, Source, ByteCount); +} + +VOID +NTAPI +IDmaChannelSlave_fnFreeBuffer( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_FreeBuffer: This %p\n", This); +} + +PADAPTER_OBJECT +NTAPI +IDmaChannelSlave_fnGetAdapterObject( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_GetAdapterObject: This %p\n", This); + return NULL; +} + +ULONG +NTAPI +IDmaChannelSlave_fnMaximumBufferSize( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_MaximumBufferSize: This %p\n", This); + return 0; +} + +PHYSICAL_ADDRESS +NTAPI +IDmaChannelSlave_fnPhysicalAdress( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_PhysicalAdress: This %p\n", This); + return This->Address; +} + +VOID +NTAPI +IDmaChannelSlave_fnSetBufferSize( + IN IDmaChannelSlave * iface, + IN ULONG BufferSize) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_SetBufferSize: This %p\n", This); + +} + +ULONG +NTAPI +IDmaChannelSlave_fnBufferSize( + IN IDmaChannelSlave * iface) +{ + return 0; +} + + +PVOID +NTAPI +IDmaChannelSlave_fnSystemAddress( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_SystemAddress: This %p\n", This); + return NULL; +} + +ULONG +NTAPI +IDmaChannelSlave_fnTransferCount( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_TransferCount: This %p\n", This); + return 0; +} + +ULONG +NTAPI +IDmaChannelSlave_fnReadCounter( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_ReadCounter: This %p\n", This); + return 0; +} + +NTSTATUS +NTAPI +IDmaChannelSlave_fnStart( + IN IDmaChannelSlave * iface, + ULONG MapSize, + BOOLEAN WriteToDevice) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_Start: This %p\n", This); + return 0; +} + +NTSTATUS +NTAPI +IDmaChannelSlave_fnStop( + IN IDmaChannelSlave * iface) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_fnStop: This %p\n", This); + return 0; +} + +NTSTATUS +NTAPI +IDmaChannelSlave_fnWaitForTC( + IN IDmaChannelSlave * iface, + ULONG Timeout) +{ + IDmaChannelSlaveImpl * This = (IDmaChannelSlaveImpl*)iface; + + DPRINT("IDmaChannelSlave_WaitForTC: This %p\n", This); + return 0; + +} + +static IDmaChannelSlaveVtbl vt_IDmaChannelSlaveVtbl = +{ + /* IUnknown methods */ + IDmaChannelSlave_fnQueryInterface, + IDmaChannelSlave_fnAddRef, + IDmaChannelSlave_fnRelease, + /* IDmaChannel methods */ + IDmaChannelSlave_fnAllocateBuffer, + IDmaChannelSlave_fnFreeBuffer, + IDmaChannelSlave_fnTransferCount, + IDmaChannelSlave_fnMaximumBufferSize, + IDmaChannelSlave_fnAllocatedBufferSize, + IDmaChannelSlave_fnBufferSize, + IDmaChannelSlave_fnSetBufferSize, + IDmaChannelSlave_fnSystemAddress, + IDmaChannelSlave_fnPhysicalAdress, + IDmaChannelSlave_fnGetAdapterObject, + IDmaChannelSlave_fnCopyFrom, + IDmaChannelSlave_fnCopyTo, + /* IDmaChannelSlave methods */ + IDmaChannelSlave_fnStart, + IDmaChannelSlave_fnStop, + IDmaChannelSlave_fnReadCounter, + IDmaChannelSlave_fnWaitForTC +}; + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,56 @@ +/* + ReactOS Operating System + + Port Class API + IMiniPortMidi Implementation + + by Andrew Greenwood + + REFERENCE: + http://www.osronline.com/ddkx/stream/audmp-routines_64vn.htm +*/ + +#include "private.h" + +const GUID CLSID_MiniportDriverDMusUART; +const GUID CLSID_MiniportDriverUart; +const GUID CLSID_MiniportDriverDMusUARTCapture; +const GUID CLSID_MiniportDriverFmSynth; +const GUID CLSID_MiniportDriverFmSynthWithVol; + +/* + * @implemented + */ +NTSTATUS NTAPI +PcNewMiniport( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId) +{ + NTSTATUS Status = STATUS_INVALID_PARAMETER; + + if (!OutMiniport) + { + DPRINT("PcNewMiniport was supplied a NULL OutPort parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + if (IsEqualGUIDAligned(ClassId, &CLSID_MiniportDriverDMusUART) || + IsEqualGUIDAligned(ClassId, &CLSID_MiniportDriverUart) || + IsEqualGUIDAligned(ClassId, &CLSID_MiniportDriverDMusUARTCapture)) + { + Status = NewMiniportDMusUART(OutMiniport, ClassId); + } + else if (IsEqualGUIDAligned(ClassId, &CLSID_MiniportDriverFmSynth) || + IsEqualGUIDAligned(ClassId, &CLSID_MiniportDriverFmSynthWithVol)) + { + Status = NewMiniportFmSynth(OutMiniport, ClassId); + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + + DPRINT("PcNewMiniport Status %x\n", Status); + return Status; +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,164 @@ +#include "private.h" + +typedef struct +{ + IMiniportDMusVtbl *lpVtbl; + LONG ref; + CLSID ClassId; + +}IMiniportDMusImpl; + +const GUID IID_IMiniportDMus; + +/* IUnknown methods */ + +NTSTATUS +STDMETHODCALLTYPE +IMiniportDMus_fnQueryInterface( + IMiniportDMus* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IMiniportDMusImpl * This = (IMiniportDMusImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IMiniportDMus)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +STDMETHODCALLTYPE +IMiniportDMus_fnAddRef( + IMiniportDMus* iface) +{ + IMiniportDMusImpl * This = (IMiniportDMusImpl*)iface; + + return _InterlockedIncrement(&This->ref); +} + +ULONG +STDMETHODCALLTYPE +IMiniportDMust_fnRelease( + IMiniportDMus* iface) +{ + IMiniportDMusImpl * This = (IMiniportDMusImpl*)iface; + + _InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +/* IMiniport methods */ + +NTSTATUS +NTAPI +IMiniportDMus_fnDataRangeIntersection( + IN IMiniportDMus * iface, + IN ULONG PinId, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG OutputBufferLength, + OUT PVOID ResultantFormat OPTIONAL, + OUT PULONG ResultantFormatLength) +{ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +IMiniportDMus_fnGetDescription( + IN IMiniportDMus * iface, + OUT PPCFILTER_DESCRIPTOR *Description + ) +{ + return STATUS_UNSUCCESSFUL; +} + +/* IMinIMiniportDMus methods */ + +HRESULT +NTAPI +IMiniportDMus_fnInit( + IN IMiniportDMus * iface, + IN PUNKNOWN pUnknownAdapter, + IN PRESOURCELIST pResourceList, + IN PPORTDMUS pPort, + OUT PSERVICEGROUP *ppServiceGroup + ) +{ + return STATUS_UNSUCCESSFUL; +} + +HRESULT +NTAPI +IMiniportDMus_fnNewStream( + IN IMiniportDMus * iface, + OUT PMXF *ppMXF, + IN PUNKNOWN pOuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN ULONG uPinId, + IN DMUS_STREAM_TYPE StreamType, + IN PKSDATAFORMAT pDataFormat, + OUT PSERVICEGROUP *ppServiceGroup, + IN PAllocatorMXF pAllocatorMXF, + IN PMASTERCLOCK pMasterClock, + OUT PULONGLONG puuSchedulePreFetch + ) +{ + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +IMiniportDMus_fnService( + IN IMiniportDMus * iface) +{ + +} + +static IMiniportDMusVtbl vt_PortDMusVtbl = +{ + /* IUnknown */ + IMiniportDMus_fnQueryInterface, + IMiniportDMus_fnAddRef, + IMiniportDMust_fnRelease, + /* IMiniport */ + IMiniportDMus_fnGetDescription, + IMiniportDMus_fnDataRangeIntersection, + /* IMiniportDMus */ + IMiniportDMus_fnInit, + IMiniportDMus_fnService, + IMiniportDMus_fnNewStream +}; + +NTSTATUS +NewMiniportDMusUART( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId) +{ + IMiniportDMusImpl * This; + + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IMiniportDMusImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Initialize IMiniportDMus */ + RtlCopyMemory(&This->ClassId, ClassId, sizeof(CLSID)); + This->ref = 1; + This->lpVtbl = &vt_PortDMusVtbl; + *OutMiniport = (PMINIPORT)&This->lpVtbl; + + return STATUS_SUCCESS; +} + + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.c ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_factory.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_factory.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_factory.cpp (removed) @@ -1,1 +1,0 @@ - Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,9 @@ +#include "private.h" + + +NTSTATUS NewMiniportFmSynth( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId) +{ + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/miniport_fmsynth.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,41 @@ +#include "private.h" + + +const GUID CLSID_PortTopology; +const GUID CLSID_PortMidi; +const GUID CLSID_PortWaveCyclic; +const GUID CLSID_PortWavePci; +const GUID CLSID_PortDMus; + +PORTCLASSAPI +NTSTATUS +NTAPI +PcNewPort( + OUT PPORT* OutPort, + IN REFCLSID ClassId) +{ + NTSTATUS Status; + + if (!OutPort) + { + DPRINT("PcNewPort was supplied a NULL OutPort parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + if (IsEqualGUIDAligned(ClassId, &CLSID_PortMidi)) + Status = NewPortMidi(OutPort); + else if (IsEqualGUIDAligned(ClassId, &CLSID_PortDMus)) + Status = NewPortDMus(OutPort); + else if (IsEqualGUIDAligned(ClassId, &CLSID_PortTopology)) + Status = NewPortTopology(OutPort); + else if (IsEqualGUIDAligned(ClassId, &CLSID_PortWaveCyclic)) + Status = NewPortWaveCyclic(OutPort); + else if (IsEqualGUIDAligned(ClassId, &CLSID_PortWavePci)) + Status = NewPortWavePci(OutPort); + else + Status = STATUS_NOT_SUPPORTED; + + DPRINT("PcNewPort Status %lx\n", Status); + + return Status; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,177 @@ +#include "private.h" + +typedef struct +{ + IPortDMusVtbl *lpVtbl; + + LONG ref; + BOOL bInitialized; + IMiniportDMus *pMiniport; + DEVICE_OBJECT *pDeviceObject; + PSERVICEGROUP ServiceGroup; + +}IPortDMusImpl; + +const GUID IID_IPortDMus; + +//--------------------------------------------------------------- +// IUnknown interface functions +// + +NTSTATUS +NTAPI +IPortDMus_fnQueryInterface( + IPortDMus* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + if (IsEqualGUIDAligned(refiid, &IID_IPortDMus) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IPortDMus_fnAddRef( + IPortDMus* iface) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + return _InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IPortDMus_fnRelease( + IPortDMus* iface) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + _InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + if (This->bInitialized) + { + This->pMiniport->lpVtbl->Release(This->pMiniport); + } + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + + +//--------------------------------------------------------------- +// IPort interface functions +// + +NTSTATUS +NTAPI +IPortDMus_fnGetDeviceProperty( + IN IPortDMus * iface, + IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ReturnLength) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortDMus_fnNewRegistryKey called w/o initiazed\n"); + return STATUS_UNSUCCESSFUL; + } + + return IoGetDeviceProperty(This->pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength); +} + +NTSTATUS +NTAPI +IPortDMus_fnInit( + IN IPortDMus * iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PUNKNOWN UnknownMiniport, + IN PUNKNOWN UnknownAdapter OPTIONAL, + IN PRESOURCELIST ResourceList) +{ + IMiniportDMus * Miniport; + NTSTATUS Status; + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + if (This->bInitialized) + { + DPRINT("IPortDMus_Init called again\n"); + return STATUS_SUCCESS; + } + + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportDMus, (PVOID*)&Miniport); + if (!NT_SUCCESS(Status)) + { + DPRINT("IPortDMus_Init called with invalid IMiniport adapter\n"); + return STATUS_INVALID_PARAMETER; + } + + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &This->ServiceGroup); + if (!NT_SUCCESS(Status)) + { + DPRINT("IMinIPortDMus_Init failed with %x\n", Status); + return Status; + } + + /* Initialize port object */ + This->pMiniport = Miniport; + This->pDeviceObject = DeviceObject; + This->bInitialized = TRUE; + + /* increment reference on miniport adapter */ + Miniport->lpVtbl->AddRef(Miniport); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +IPortDMus_fnNewRegistryKey( + IN IPortDMus * iface, + OUT PREGISTRYKEY *OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + IPortDMusImpl * This = (IPortDMusImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortDMus_fnNewRegistryKey called w/o initialized\n"); + return STATUS_UNSUCCESSFUL; + } + return STATUS_UNSUCCESSFUL; +} + + + + + + + + +NTSTATUS +NewPortDMus( + OUT PPORT* OutPort) +{ + return STATUS_UNSUCCESSFUL; +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,8 @@ +#include "private.h" + +NTSTATUS +NewPortMidi( + OUT PPORT* OutPort) +{ + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_midi.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,11 @@ +#include "private.h" + + + + +NTSTATUS +NewPortTopology( + OUT PPORT* OutPort) +{ + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,249 @@ +#include "private.h" + +typedef struct +{ + IPortWaveCyclicVtbl *lpVtbl; + IPortClsVersion *lpVtblPortClsVersion; +#if 0 + IUnregisterSubdevice *lpVtblUnregisterSubDevice; +#endif + + LONG ref; + + BOOL bInitialized; + PDEVICE_OBJECT pDeviceObject; + PMINIPORTWAVECYCLIC pMiniport; + +}IPortWaveCyclicImpl; + +const GUID IID_IMiniportWaveCyclic; +const GUID IID_IPortWaveCyclic; +const GUID IID_IUnknown; + +//--------------------------------------------------------------- +// IUnknown interface functions +// + +NTSTATUS +NTAPI +IPortWaveCyclic_fnQueryInterface( + IPortWaveCyclic* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + if (IsEqualGUIDAligned(refiid, &IID_IPortWaveCyclic) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +NTAPI +IPortWaveCyclic_fnAddRef( + IPortWaveCyclic* iface) +{ + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + + return _InterlockedIncrement(&This->ref); +} + +ULONG +NTAPI +IPortWaveCyclic_fnRelease( + IPortWaveCyclic* iface) +{ + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + + _InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + if (This->bInitialized) + { + This->pMiniport->lpVtbl->Release(This->pMiniport); + } + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + + +//--------------------------------------------------------------- +// IPort interface functions +// + +NTSTATUS +NTAPI +IPortWaveCyclic_fnGetDeviceProperty( + IN IPortWaveCyclic * iface, + IN DEVICE_REGISTRY_PROPERTY DeviceRegistryProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ReturnLength) +{ + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initiazed\n"); + return STATUS_UNSUCCESSFUL; + } + + return IoGetDeviceProperty(This->pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength); +} + +NTSTATUS +NTAPI +IPortWaveCyclic_fnInit( + IN IPortWaveCyclic * iface, + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PUNKNOWN UnknownMiniport, + IN PUNKNOWN UnknownAdapter OPTIONAL, + IN PRESOURCELIST ResourceList) +{ + IMiniportWaveCyclic * Miniport; + NTSTATUS Status; + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + + if (This->bInitialized) + { + DPRINT("IPortWaveCyclic_Init called again\n"); + return STATUS_SUCCESS; + } + + Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportWaveCyclic, (PVOID*)&Miniport); + if (!NT_SUCCESS(Status)) + { + DPRINT("IPortWaveCyclic_Init called with invalid IMiniport adapter\n"); + return STATUS_INVALID_PARAMETER; + } + + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface); + if (!NT_SUCCESS(Status)) + { + DPRINT("IMiniportWaveCyclic_Init failed with %x\n", Status); + return Status; + } + + /* Initialize port object */ + This->pMiniport = Miniport; + This->pDeviceObject = DeviceObject; + This->bInitialized = TRUE; + + /* increment reference on miniport adapter */ + Miniport->lpVtbl->AddRef(Miniport); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +IPortWaveCyclic_fnNewRegistryKey( + IN IPortWaveCyclic * iface, + OUT PREGISTRYKEY *OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + IPortWaveCyclicImpl * This = (IPortWaveCyclicImpl*)iface; + + if (!This->bInitialized) + { + DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n"); + return STATUS_UNSUCCESSFUL; + } + return STATUS_UNSUCCESSFUL; +} + + +//--------------------------------------------------------------- +// IPortWaveCyclic interface functions +// + +NTSTATUS +NTAPI +IPortWaveCyclic_fnNewMasterDmaChannel( + IN IPortWaveCyclic * iface, + OUT PDMACHANNEL* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG MaximumLength, + IN BOOL Dma32BitAddresses, + IN BOOL Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed) +{ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +IPortWaveCyclic_fnNewSlaveDmaChannel( + IN IPortWaveCyclic * iface, + OUT PDMACHANNELSLAVE* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN PRESOURCELIST ResourceList OPTIONAL, + IN ULONG DmaIndex, + IN ULONG MaximumLength, + IN BOOL DemandMode, + IN DMA_SPEED DmaSpeed) +{ + return STATUS_UNSUCCESSFUL; +} + +VOID +NTAPI +IPortWaveCyclic_fnNotify( + IN IPortWaveCyclic * iface, + IN PSERVICEGROUP ServiceGroup) +{ +} + + +static const IPortWaveCyclicVtbl vt_IPortWaveCyclicVtbl = +{ + IPortWaveCyclic_fnQueryInterface, + IPortWaveCyclic_fnAddRef, + IPortWaveCyclic_fnRelease, + IPortWaveCyclic_fnInit, + IPortWaveCyclic_fnGetDeviceProperty, + IPortWaveCyclic_fnNewRegistryKey, + IPortWaveCyclic_fnNotify, + IPortWaveCyclic_fnNewMasterDmaChannel, + IPortWaveCyclic_fnNewSlaveDmaChannel, +}; + +//--------------------------------------------------------------- +// IPortWaveCyclic constructor +// + +NTSTATUS +NewPortWaveCyclic( + OUT PPORT* OutPort) +{ + IPortWaveCyclicImpl * This; + + This = ExAllocatePoolWithTag(NonPagedPool, sizeof(IPortWaveCyclicImpl), TAG_PORTCLASS); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->lpVtbl = (IPortWaveCyclicVtbl*)&vt_IPortWaveCyclicVtbl; + This->ref = 1; + This->bInitialized = FALSE; + *OutPort = (PPORT)(&This->lpVtbl); + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,47 @@ +#include "private.h" + +typedef struct +{ + IPortWavePciVtbl *lpVtbl; + IPortClsVersion *lpVtblPortClsVersion; +#if 0 + IUnregisterSubdevice *lpVtblUnregisterSubDevice; +#endif + LONG ref; + + +}IPortWavePciImpl; + + +NTSTATUS +NTAPI +IPortWavePci_fnNewMasterDmaChannel( + IN IPortWavePci * iface, + OUT PDMACHANNEL* DmaChannel, + IN PUNKNOWN OuterUnknown, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ResourceList OPTIONAL, + IN BOOL ScatterGather, + IN BOOL Dma32BitAddresses, + IN BOOL Dma64BitAddresses, + IN DMA_WIDTH DmaWidth, + IN DMA_SPEED DmaSpeed, + IN ULONG MaximumLength, + IN ULONG DmaPort) +{ + return STATUS_UNSUCCESSFUL; +} + +VOID +IPortWavePci_fnNotify( + IN IPortWavePci * iface, + IN PSERVICEGROUP ServiceGroup) +{ +} + +NTSTATUS +NewPortWavePci( + OUT PPORT* OutPort) +{ + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,50 +1,33 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> <module name="portcls" type="kernelmodedriver" installbase="system32/drivers" installname="portcls.sys" allowwarnings="true"> - -  -  <importlibrary definition="portcls.spec" /> - <define name="_NTDDK_" /> <define name="PC_NO_IMPORTS" /> - <include base="portcls">../include</include> - <library>ntoskrnl</library> <library>ks</library> <library>drmk</library> - + <library>rtl</library> + <file>api.c</file> <file>dll.c</file> + <file>dma_master.c</file> + <file>dma_slave.c</file> <file>adapter.c</file> <file>irp.c</file> <file>drm.c</file> <file>stubs.c</file> <file>undoc.c</file> - -  -  - - <file>ResourceList.c</file> - - <file>port_factory.c</file> - <file>Port.cpp</file> - <file>PortDMus.cpp</file> - <file>PortMidi.cpp</file> - <file>PortTopology.cpp</file> - <file>PortWaveCyclic.cpp</file> - <file>PortWavePci.cpp</file> - - <file>miniport_factory.cpp</file> - <file>Miniport.cpp</file> - <file>MiniportDMus.cpp</file> - <file>MiniportMidi.cpp</file> - <file>MiniportTopology.cpp</file> - <file>MiniportWaveCyclic.cpp</file> - <file>MiniportWavePci.cpp</file> - + <file>resource.c</file> + <file>registry.c</file> + <file>port.c</file> + <file>port_dmus.c</file> + <file>port_midi.c</file> + <file>port_topology.c</file> + <file>port_wavepci.c</file> + <file>port_wavecyclic.c</file> + <file>miniport.c</file> + <file>miniport_dmus.c</file> + <file>miniport_fmsynth.c</file> <file>portcls.rc</file> </module> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -10,6 +10,9 @@ #include <ntddk.h> #include <portcls.h> #include <debug.h> + +#include <portcls.h> +#include <dmusicks.h> #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_PORTCLASS TAG('P', 'C', 'L', 'S') @@ -43,6 +46,28 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NewMiniportDMusUART( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId); + +NTSTATUS NewMiniportFmSynth( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId); + +NTSTATUS NewPortMidi( + OUT PPORT* OutPort); + +NTSTATUS NewPortDMus( + OUT PPORT* OutPort); + +NTSTATUS NewPortTopology( + OUT PPORT* OutPort); + +NTSTATUS NewPortWaveCyclic( + OUT PPORT* OutPort); + +NTSTATUS NewPortWavePci( + OUT PPORT* OutPort); typedef struct { Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,222 @@ +#include "private.h" + +typedef struct +{ + IRegistryKeyVtbl * lpVtbl; + + LONG ref; + HANDLE hKey; + +}IRegistryKeyImpl; + +const GUID IID_IRegistryKey; + +/* + Basic IUnknown methods +*/ + +static IRegistryKeyVtbl vt_IRegistryKeyVtbl; + + +ULONG +STDMETHODCALLTYPE +IRegistryKey_fnAddRef( + IN IRegistryKey* iface) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + + DPRINT("IRegistryKey_AddRef: This %p\n", This); + + return _InterlockedIncrement(&This->ref); +} + +ULONG +STDMETHODCALLTYPE +IRegistryKey_fnRelease( + IN IRegistryKey* iface) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + + _InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + if (This->hKey) + { + ZwClose(This->hKey); + } + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnQueryInterface( + IN IRegistryKey* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + + if (IsEqualGUIDAligned(refiid, &IID_IRegistryKey)) + { + *Output = (PVOID)&This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + DPRINT("IRegistryKey_QueryInterface: This %p unknown iid\n", This, This->ref); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnDeleteKey( + IN IRegistryKey* iface) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + return ZwDeleteKey(This->hKey); +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnEnumerateKey( + IN IRegistryKey* iface, + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + return ZwEnumerateKey(This->hKey, Index, KeyInformationClass, KeyInformation, Length, ResultLength); +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnEnumerateKeyValue( + IN IRegistryKey* iface, + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + return ZwEnumerateValueKey(This->hKey, Index, KeyValueInformationClass, KeyValueInformation, Length, ResultLength); +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnNewSubKey( + IN IRegistryKey* iface, + OUT PREGISTRYKEY *RegistrySubKey, + IN PUNKNOWN OuterUnknown, + IN ACCESS_MASK DesiredAccess, + IN PUNICODE_STRING SubKeyName, + IN ULONG CreateOptions, + OUT PULONG Disposition OPTIONAL) +{ + OBJECT_ATTRIBUTES Attributes; + NTSTATUS Status; + HANDLE hKey; + IRegistryKeyImpl * NewThis, *This = (IRegistryKeyImpl*)iface; + + InitializeObjectAttributes(&Attributes, SubKeyName, 0, This->hKey, NULL); + Status = ZwCreateKey(&hKey, KEY_READ | KEY_WRITE, &Attributes, 0, NULL, 0, Disposition); + if (!NT_SUCCESS(Status)) + return Status; + + + NewThis = ExAllocatePoolWithTag(NonPagedPool, sizeof(IRegistryKeyImpl), TAG_PORTCLASS); + if (!NewThis) + { + ZwClose(hKey); + return STATUS_INSUFFICIENT_RESOURCES; + } + + NewThis->hKey = hKey; + NewThis->ref = 1; + NewThis->lpVtbl = &vt_IRegistryKeyVtbl; + *RegistrySubKey = (PREGISTRYKEY)&This->lpVtbl; + return STATUS_SUCCESS; +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnQueryKey( + IN IRegistryKey* iface, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + return ZwQueryKey(This->hKey, KeyInformationClass, KeyInformation, Length, ResultLength); +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnQueryRegistryValues( + IN IRegistryKey* iface, + IN PRTL_QUERY_REGISTRY_TABLE QueryTable, + IN PVOID Context OPTIONAL) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + DPRINT("IRegistryKey_QueryRegistryValues: This %p\n", This); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnQueryValueKey( + IN IRegistryKey* iface, + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + return ZwQueryValueKey(This->hKey, ValueName, KeyValueInformationClass, KeyValueInformation, Length, ResultLength); +} + +NTSTATUS +STDMETHODCALLTYPE +IRegistryKey_fnSetValueKey( + IN IRegistryKey* iface, + IN PUNICODE_STRING ValueName OPTIONAL, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize + ) +{ + IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + return ZwSetValueKey(This->hKey, ValueName, 0, Type, Data, DataSize); +} + + +/* + * @unimplemented + */ +NTSTATUS NTAPI +PcNewRegistryKey( + OUT PREGISTRYKEY* OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN PVOID DeviceObject OPTIONAL, + IN PVOID SubDevice OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + UNIMPLEMENTED; + //IoGetDeviceProperty + + return STATUS_UNSUCCESSFUL; +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -1,0 +1,321 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS + * FILE: drivers/multimedia/portcls/helpers/ResourceList.c + * PURPOSE: Port Class driver / ResourceList implementation + * PROGRAMMER: Andrew Greenwood + * + * HISTORY: + * 27 Jan 07 Created + */ + +#include "private.h" +#include <portcls.h> +#include <stdunk.h> +#include <intrin.h> + +typedef struct CResourceList +{ + IResourceListVtbl *lpVtbl; + LONG ref; + PUNKNOWN OuterUnknown; + POOL_TYPE PoolType; + PCM_RESOURCE_LIST TranslatedResourceList; + PCM_RESOURCE_LIST UntranslatedResourceList; +} IResourceListImpl; + +const GUID IID_IResourceList; + +/* + Basic IUnknown methods +*/ + +NTSTATUS +STDMETHODCALLTYPE +IResourceList_fnQueryInterface( + IResourceList* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + if (IsEqualGUIDAligned(refiid, &IID_IResourceList)) + { + *Output = &This->lpVtbl; + _InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +ULONG +STDMETHODCALLTYPE +IResourceList_fnAddRef( + IResourceList* iface) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + + return _InterlockedIncrement(&This->ref); +} + +ULONG +STDMETHODCALLTYPE +IResourceList_fnRelease( + IResourceList* iface) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + + _InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + ExFreePool(This->TranslatedResourceList); + ExFreePool(This->UntranslatedResourceList); + ExFreePoolWithTag(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + + +/* + IResourceList methods +*/ + +ULONG +STDMETHODCALLTYPE +IResourceList_fnNumberOfEntries(IResourceList* iface) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + + return This->TranslatedResourceList->List[0].PartialResourceList.Count; +} + +ULONG +STDMETHODCALLTYPE +IResourceList_fnNumberOfEntriesOfType( + IResourceList* iface, + IN CM_RESOURCE_TYPE Type) +{ + /* I guess the translated and untranslated lists will be same length? */ + + IResourceListImpl * This = (IResourceListImpl*)iface; + ULONG Index, Count = 0; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + + for (Index = 0; Index < This->TranslatedResourceList->List[0].PartialResourceList.Count; Index ++ ) + { + PartialDescriptor = &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; + + if (PartialDescriptor->Type == Type) + { + /* Yay! Finally found one that matches! */ + Count++; + } + } + + DPRINT("Found %d\n", Count); + return Count; +} + +PCM_PARTIAL_RESOURCE_DESCRIPTOR +STDMETHODCALLTYPE +IResourceList_fnFindTranslatedEntry( + IResourceList* iface, + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + ULONG DescIndex, Count = 0; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + + for (DescIndex = 0; DescIndex < This->TranslatedResourceList->List[0].PartialResourceList.Count; DescIndex ++ ) + { + PartialDescriptor = &This->TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[DescIndex]; + + if (PartialDescriptor->Type == Type) + { + /* Yay! Finally found one that matches! */ + if (Index == Count) + { + return PartialDescriptor; + } + Count++; + } + } + + return NULL; +} + +PCM_PARTIAL_RESOURCE_DESCRIPTOR +STDMETHODCALLTYPE +IResourceList_fnFindUntranslatedEntry( + IResourceList* iface, + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + ULONG DescIndex, Count = 0; + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor; + + for (DescIndex = 0; DescIndex < This->UntranslatedResourceList->List[0].PartialResourceList.Count; DescIndex ++ ) + { + PartialDescriptor = &This->UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[DescIndex]; + + if (PartialDescriptor->Type == Type) + { + /* Yay! Finally found one that matches! */ + if (Index == Count) + { + return PartialDescriptor; + } + Count++; + } + } + return NULL; +} + +NTSTATUS +STDMETHODCALLTYPE +IResourceList_fnAddEntry( + IResourceList* iface, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Untranslated) +{ + PCM_RESOURCE_LIST NewUntranslatedResources, NewTranslatedResources; + ULONG NewTranslatedSize, NewUntranslatedSize; + IResourceListImpl * This = (IResourceListImpl*)iface; + + NewTranslatedSize = sizeof(CM_RESOURCE_LIST) + This->TranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewTranslatedResources = ExAllocatePoolWithTag(This->PoolType, NewTranslatedSize, TAG_PORTCLASS); + if (!NewTranslatedResources) + return STATUS_INSUFFICIENT_RESOURCES; + + NewUntranslatedSize = sizeof(CM_RESOURCE_LIST) + This->UntranslatedResourceList[0].List->PartialResourceList.Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + NewUntranslatedResources = ExAllocatePoolWithTag(This->PoolType, NewUntranslatedSize, TAG_PORTCLASS); + if (!NewUntranslatedResources) + { + ExFreePoolWithTag(NewTranslatedResources, TAG_PORTCLASS); + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlCopyMemory(NewTranslatedResources, This->TranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (This->TranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(&NewTranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->TranslatedResourceList[0].List->PartialResourceList.Count], Translated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + + RtlCopyMemory(NewUntranslatedResources, This->UntranslatedResourceList, sizeof(CM_RESOURCE_LIST) + (This->UntranslatedResourceList[0].List->PartialResourceList.Count-1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + RtlCopyMemory(&NewUntranslatedResources->List[0].PartialResourceList.PartialDescriptors[This->UntranslatedResourceList[0].List->PartialResourceList.Count], Untranslated, sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + + ExFreePoolWithTag(This->TranslatedResourceList, TAG_PORTCLASS); + ExFreePoolWithTag(This->UntranslatedResourceList, TAG_PORTCLASS); + + This->UntranslatedResourceList = NewUntranslatedResources; + This->TranslatedResourceList = NewTranslatedResources; + + NewUntranslatedResources->List[0].PartialResourceList.Count++; + NewTranslatedResources->List[0].PartialResourceList.Count++; + + return STATUS_SUCCESS; +} + +NTSTATUS +STDMETHODCALLTYPE +IResourceList_fnAddEntryFromParent( + IResourceList* iface, + IN IResourceList* Parent, + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) +{ + return STATUS_SUCCESS; +} + +PCM_RESOURCE_LIST +STDMETHODCALLTYPE +IResourceList_fnTranslatedList( + IResourceList* iface) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + + return This->TranslatedResourceList; +} + +PCM_RESOURCE_LIST +STDMETHODCALLTYPE +IResourceList_fnUntranslatedList( + IResourceList* iface) +{ + IResourceListImpl * This = (IResourceListImpl*)iface; + + return This->UntranslatedResourceList; +} + + +/* + ResourceList V-Table +*/ +static const IResourceListVtbl vt_ResourceListVtbl = +{ + /* IUnknown */ + IResourceList_fnQueryInterface, + IResourceList_fnAddRef, + IResourceList_fnRelease, + /* IResourceList */ + IResourceList_fnNumberOfEntries, + IResourceList_fnNumberOfEntriesOfType, + IResourceList_fnFindTranslatedEntry, + IResourceList_fnFindUntranslatedEntry, + IResourceList_fnAddEntry, + IResourceList_fnAddEntryFromParent, + IResourceList_fnTranslatedList, + IResourceList_fnUntranslatedList +}; + + +/* + Factory for creating a resource list +*/ +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceList( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PCM_RESOURCE_LIST TranslatedResources, + IN PCM_RESOURCE_LIST UntranslatedResources) +{ + IResourceListImpl* NewList = NULL; + + /* TODO: Validate parameters */ + + DPRINT("PcNewResourceList\n"); + + NewList = ExAllocatePoolWithTag(PoolType, sizeof(IResourceListImpl), TAG_PORTCLASS); + + if (!NewList) + { + DPRINT("ExAllocatePoolWithTag failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize */ + NewList->lpVtbl = (IResourceListVtbl*)&vt_ResourceListVtbl; + NewList->ref = 1; + NewList->OuterUnknown = OuterUnknown; + NewList->TranslatedResourceList= TranslatedResources; + NewList->UntranslatedResourceList = UntranslatedResources; + NewList->PoolType = PoolType; + + /* Increment our usage count and set the pointer to this object */ + *OutResourceList = (IResourceList*)&NewList->lpVtbl; + + return STATUS_SUCCESS; +} + +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceSublist( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ParentList, + IN ULONG MaximumEntries) +{ + return STATUS_UNSUCCESSFUL; +} Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/stubs.c [iso-8859-1] Thu Dec 4 12:43:42 2008 @@ -16,9 +16,6 @@ Factory Stubs */ -/* - * @unimplemented - */ NTSTATUS NTAPI PcNewDmaChannel( OUT PDMACHANNEL* OutDmaChannel, @@ -50,37 +47,6 @@ * @unimplemented */ NTSTATUS NTAPI -PcNewMiniport( - OUT PMINIPORT* OutMiniport, - IN REFCLSID ClassId) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcNewRegistryKey( - OUT PREGISTRYKEY* OutRegistryKey, - IN PUNKNOWN OuterUnknown OPTIONAL, - IN ULONG RegistryKeyType, - IN ACCESS_MASK DesiredAccess, - IN PVOID DeviceObject OPTIONAL, - IN PVOID SubDevice OPTIONAL, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN ULONG CreateOptions OPTIONAL, - OUT PULONG Disposition OPTIONAL) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI PcNewServiceGroup( OUT PSERVICEGROUP* OutServiceGroup, IN PUNKNOWN OuterUnknown OPTIONAL) @@ -122,21 +88,6 @@ /* =============================================================== Properties */ - -/* - * @unimplemented - */ -NTSTATUS NTAPI -PcGetDeviceProperty( - IN PVOID DeviceObject, - IN DEVICE_REGISTRY_PROPERTY DeviceProperty, - IN ULONG BufferLength, - OUT PVOID PropertyBuffer, - OUT PULONG ResultLength) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} /* * @unimplemented @@ -239,13 +190,7 @@ /* * @unimplemented */ -ULONGLONG NTAPI -PcGetTimeInterval( - IN ULONGLONG Since) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + /* * @unimplemented

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008