[PORTCLS]

- Merge 50601 and 50602 from trunk. Portcls now compiles and links with msvc.

svn path=/branches/cmake-bringup/; revision=50603
This commit is contained in:
Amine Khaldi 2011-02-03 18:26:08 +00:00
parent 321385374d
commit 4426c9c0e7

View file

@ -181,9 +181,9 @@ public:
* Friends
*/
friend class CMiniportDMusUARTStream;
friend NTSTATUS
friend NTSTATUS NTAPI
DMusMPUInterruptServiceRoutine(PINTERRUPTSYNC InterruptSync,PVOID DynamicContext);
friend NTSTATUS
friend NTSTATUS NTAPI
SynchronizedDMusMPUWrite(PINTERRUPTSYNC InterruptSync,PVOID syncWriteContext);
friend VOID NTAPI
DMusUARTTimerDPC(PKDPC Dpc,PVOID DeferredContext,PVOID SystemArgument1,PVOID SystemArgument2);
@ -278,7 +278,7 @@ public:
IN PVOID SystemArgument1,
IN PVOID SystemArgument2
);
friend NTSTATUS PropertyHandler_Synth(IN PPCPROPERTY_REQUEST);
friend NTSTATUS NTAPI PropertyHandler_Synth(IN PPCPROPERTY_REQUEST);
friend STDMETHODIMP_(NTSTATUS) SnapTimeStamp(PINTERRUPTSYNC InterruptSync,PVOID pStream);
};
@ -692,6 +692,7 @@ NTSTATUS CMiniportDMusUART::InitializeHardware(PINTERRUPTSYNC interruptSync,PUCH
* Synchronized routine to initialize the MPU401.
*/
NTSTATUS
NTAPI
InitMPU
(
IN PINTERRUPTSYNC InterruptSync,
@ -861,6 +862,7 @@ Write
* Writes outgoing MIDI data.
*/
NTSTATUS
NTAPI
SynchronizedDMusMPUWrite
(
IN PINTERRUPTSYNC InterruptSync,
@ -1132,6 +1134,7 @@ CMiniportDMusUARTStream::SourceEvtsToPort()
* ISR.
*/
NTSTATUS
NTAPI
DMusMPUInterruptServiceRoutine
(
IN PINTERRUPTSYNC InterruptSync,
@ -2458,7 +2461,9 @@ DMusUARTTimerDPC
const WCHAR wszDescOut[] = L"DMusic MPU-401 Out ";
const WCHAR wszDescIn[] = L"DMusic MPU-401 In ";
NTSTATUS PropertyHandler_Synth
NTSTATUS
NTAPI
PropertyHandler_Synth
(
IN PPCPROPERTY_REQUEST pRequest
)