From: <se...@us...> - 2013-07-04 11:36:03
|
Revision: 5932 http://sourceforge.net/p/mingw-w64/code/5932 Author: sezero Date: 2013-07-04 11:35:51 +0000 (Thu, 04 Jul 2013) Log Message: ----------- several ddk-related header fixes/updates from r/os svn: * bugcodes.h: updated from r/os bugcodes.mc rev. 58242 * hidpi.h: applied r/os rev. 59217 change to fix two function signatures * wdm.h: fix BYTES_TO_PAGES macro (r/os svn r58738) * ndis.h: fix harmless typo in NdisWaitEvent() (r/os svn r58384) * portcls.h: add missing IMP_IMiniportWaveRT & IMP_IMiniportWaveRTStream definitions (r/os svn r58638) Revision Links: -------------- http://sourceforge.net/p/mingw-w64/code/58738 http://sourceforge.net/p/mingw-w64/code/58384 http://sourceforge.net/p/mingw-w64/code/58638 Modified Paths: -------------- trunk/mingw-w64-headers/ddk/include/ddk/ndis.h trunk/mingw-w64-headers/ddk/include/ddk/portcls.h trunk/mingw-w64-headers/ddk/include/ddk/wdm.h trunk/mingw-w64-headers/include/bugcodes.h trunk/mingw-w64-headers/include/hidpi.h Modified: trunk/mingw-w64-headers/ddk/include/ddk/ndis.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/ndis.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/ddk/include/ddk/ndis.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -5654,7 +5654,7 @@ NTAPI NdisWaitEvent( IN PNDIS_EVENT Event, - IN UINT Timeout); + IN UINT MsToWait); /* NDIS intermediate miniport structures */ Modified: trunk/mingw-w64-headers/ddk/include/ddk/portcls.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/portcls.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/ddk/include/ddk/portcls.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -1841,7 +1841,43 @@ typedef IMiniportWaveRTStream *PMINIPORTWAVERTSTREAM; +#define IMP_IMiniportWaveRTStream\ + STDMETHODIMP_(NTSTATUS) SetFormat\ + ( IN PKSDATAFORMAT DataFormat\ + );\ + STDMETHODIMP_(NTSTATUS) SetState\ + ( IN KSSTATE State\ + );\ + STDMETHODIMP_(NTSTATUS) GetPosition\ + ( OUT PKSAUDIO_POSITION Position\ + );\ + STDMETHODIMP_(NTSTATUS) AllocateAudioBuffer\ + (\ + IN ULONG RequestedSize,\ + OUT PMDL *AudioBufferMdl,\ + OUT ULONG *ActualSize,\ + OUT ULONG *OffsetFromFirstPage,\ + OUT MEMORY_CACHING_TYPE *CacheType\ + );\ + STDMETHODIMP_(VOID) FreeAudioBuffer\ + (\ + IN PMDL AudioBufferMdl,\ + IN ULONG BufferSize\ + );\ + STDMETHODIMP_(VOID) GetHWLatency\ + (\ + OUT KSRTAUDIO_HWLATENCY *hwLatency\ + );\ + STDMETHODIMP_(NTSTATUS) GetPositionRegister\ + (\ + OUT KSRTAUDIO_HWREGISTER *Register\ + );\ + STDMETHODIMP_(NTSTATUS) GetClockRegister\ + (\ + OUT KSRTAUDIO_HWREGISTER *Register\ + ) + /* =============================================================== IMiniportWaveRTStreamNotification Interface */ @@ -1923,6 +1959,24 @@ typedef IMiniportWaveRT *PMINIPORTWAVERT; +#define IMP_IMiniportWaveRT\ + IMP_IMiniport;\ + STDMETHODIMP_(NTSTATUS) Init\ + ( IN PUNKNOWN UnknownAdapter,\ + IN PRESOURCELIST ResourceList,\ + IN PPORTWAVERT Port\ + );\ + STDMETHODIMP_(NTSTATUS) NewStream\ + ( OUT PMINIPORTWAVERTSTREAM * Stream,\ + IN PPORTWAVERTSTREAM PortStream,\ + IN ULONG Pin,\ + IN BOOLEAN Capture,\ + IN PKSDATAFORMAT DataFormat\ + );\ + STDMETHODIMP_(NTSTATUS) GetDeviceDescription\ + ( OUT PDEVICE_DESCRIPTION DeviceDescription\ + ) + #endif /* =============================================================== Modified: trunk/mingw-w64-headers/ddk/include/ddk/wdm.h =================================================================== --- trunk/mingw-w64-headers/ddk/include/ddk/wdm.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/ddk/include/ddk/wdm.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -10539,9 +10539,11 @@ /* ULONG * BYTES_TO_PAGES( * IN ULONG Size) + * + * Note: This needs to be like this to avoid overflows! */ #define BYTES_TO_PAGES(Size) \ - (((Size) + PAGE_SIZE - 1) >> PAGE_SHIFT) + (((Size) >> PAGE_SHIFT) + (((Size) & (PAGE_SIZE - 1)) != 0)) /* PVOID * PAGE_ALIGN( Modified: trunk/mingw-w64-headers/include/bugcodes.h =================================================================== --- trunk/mingw-w64-headers/include/bugcodes.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/include/bugcodes.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -1,7 +1,7 @@ /* This file is generated with wmc version 1.4-rc5. Do not edit! */ /* Source : bugcodes.mc */ /* Cmdline: wmc bugcodes.mc */ -/* Date : Mon Feb 27 10:01:33 2012 */ +/* Date : Thu Jul 4 12:10:51 2013 */ #ifndef __WMCGENERATED_4f4b46e6_H #define __WMCGENERATED_4f4b46e6_H @@ -406,6 +406,14 @@ /* Approximate msg: PINBALL_FILE_SYSTEM */ #define PINBALL_FILE_SYSTEM ((ULONG)0x00000059) +/* MessageId : 0x0000005a */ +/* Approximate msg: CRITICAL_SERVICE_FAILED */ +#define CRITICAL_SERVICE_FAILED ((ULONG)0x0000005a) + +/* MessageId : 0x0000005b */ +/* Approximate msg: SET_ENV_VAR_FAILED */ +#define SET_ENV_VAR_FAILED ((ULONG)0x0000005b) + /* MessageId : 0x0000005c */ /* Approximate msg: HAL_INITIALIZATION_FAILED */ #define HAL_INITIALIZATION_FAILED ((ULONG)0x0000005c) @@ -702,6 +710,10 @@ /* Approximate msg: POWER_FAILURE_SIMULATE */ #define POWER_FAILURE_SIMULATE ((ULONG)0x000000e5) +/* MessageId : 0x000000e8 */ +/* Approximate msg: Invalid cancel of a open file. It already has handle. */ +#define INVALID_CANCEL_OF_FILE_OPEN ((ULONG)0x000000e8) + /* MessageId : 0x000000e9 */ /* Approximate msg: An executive worker thread is being terminated without having gone through the worker thread rundown code. */ #define ACTIVE_EX_WORKER_THREAD_TERMINATION ((ULONG)0x000000e9) Modified: trunk/mingw-w64-headers/include/hidpi.h =================================================================== --- trunk/mingw-w64-headers/include/hidpi.h 2013-07-04 11:02:39 UTC (rev 5931) +++ trunk/mingw-w64-headers/include/hidpi.h 2013-07-04 11:35:51 UTC (rev 5932) @@ -275,7 +275,7 @@ * HidP_GetButtonCaps( * IN HIDP_REPORT_TYPE ReportType, * OUT PHIDP_BUTTON_CAPS ButtonCaps, - * IN OUT PULONG ButtonCapsLength, + * IN OUT PUSHORT ButtonCapsLength, * IN PHIDP_PREPARSED_DATA PreparsedData); */ #define HidP_GetButtonCaps(_Type_, _Caps_, _Len_, _Data_) \ @@ -374,7 +374,7 @@ USHORT LinkCollection, USAGE Usage, PHIDP_BUTTON_CAPS ButtonCaps, - PULONG ButtonCapsLength, + PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); HIDAPI @@ -386,7 +386,7 @@ USHORT LinkCollection, USAGE Usage, PHIDP_VALUE_CAPS ValueCaps, - PULONG ValueCapsLength, + PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); HIDAPI @@ -448,7 +448,7 @@ * HidP_GetValueCaps( * IN HIDP_REPORT_TYPE ReportType, * OUT PHIDP_VALUE_CAPS ValueCaps, - * IN OUT PULONG ValueCapsLength, + * IN OUT PUSHORT ValueCapsLength, * IN PHIDP_PREPARSED_DATA PreparsedData); */ #define HidP_GetValueCaps(_Type_, _Caps_, _Len_, _Data_) \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |