Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[jgardou] 58646: [CMICPL] * fix build on UNIX

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 18:34:12 2013 New Revision: 58646 URL: http://svn.reactos.org/svn/reactos?rev=58646&view=rev Log: [CMICPL] * fix build on UNIX Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc [iso-8859-1] Tue Apr 2 18:34:12 2013 @@ -47,7 +47,7 @@ #include <common.ver> -IDI_CPLICON ICON PRELOAD DISCARDABLE "..\cmicontrol\window.ico" +IDI_CPLICON ICON PRELOAD DISCARDABLE "../cmicontrol/window.ico" STRINGTABLE DISCARDABLE BEGIN

11 years, 5 months

[jgardou] 58645: [CMAKE] * Fix an embarrassing mistake.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 18:30:19 2013 New Revision: 58645 URL: http://svn.reactos.org/svn/reactos?rev=58645&view=rev Log: [CMAKE] * Fix an embarrassing mistake. Added: trunk/reactos/drivers/wdm/audio/drivers/CMakeLists.txt (with props) Added: trunk/reactos/drivers/wdm/audio/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMakeLists.txt (added) +++ trunk/reactos/drivers/wdm/audio/drivers/CMakeLists.txt [iso-8859-1] Tue Apr 2 18:30:19 2013 @@ -1,0 +1,2 @@ + +add_subdirectory(CMIDriver) Propchange: trunk/reactos/drivers/wdm/audio/drivers/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 5 months

[jgardou] 58644: [CMIDriver] * Update the C-Media 8738/8768 driver to 1.2.6 * Add it to build

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 15:25:49 2013 New Revision: 58644 URL: http://svn.reactos.org/svn/reactos?rev=58644&view=rev Log: [CMIDriver] * Update the C-Media 8738/8768 driver to 1.2.6 * Add it to build Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt (with props) trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt (with props) trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt (with props) Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/makefile trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/sources trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/makefile trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/sources trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/installer/ Modified: trunk/reactos/drivers/wdm/audio/CMakeLists.txt trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/resource.h trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.rc trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmipci.rc trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/resource.h trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/wdm/audio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/CMakeLis… Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CHANGELOG.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/sources URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmipci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cpl/sources URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/…

11 years, 5 months

[jgardou] 58643: [PSDK] * Add missing UNICODE definition in dsound.h * Protect against redefinitions in winioctl.h

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 14:16:29 2013 New Revision: 58643 URL: http://svn.reactos.org/svn/reactos?rev=58643&view=rev Log: [PSDK] * Add missing UNICODE definition in dsound.h * Protect against redefinitions in winioctl.h Modified: trunk/reactos/include/psdk/dsound.h trunk/reactos/include/psdk/winioctl.h Modified: trunk/reactos/include/psdk/dsound.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsound.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dsound.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dsound.h [iso-8859-1] Tue Apr 2 14:16:29 2013 @@ -421,6 +421,15 @@ #define DirectSoundFullDuplexCreate8 DirectSoundFullDuplexCreate extern HRESULT WINAPI GetDeviceID(LPCGUID lpGuidSrc, LPGUID lpGuidDest); +#ifdef UNICODE +# define DirectSoundEnumerate DirectSoundEnumerateW +# define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateW +# define LPDSENUMCALLBACK LPDSENUMCALLBACKW +#else +# define DirectSoundEnumerate DirectSoundEnumerateA +# define DirectSoundCaptureEnumerate DirectSoundCaptureEnumerateA +# define LPDSENUMCALLBACK LPDSENUMCALLBACKA +#endif /***************************************************************************** * IDirectSound interface Modified: trunk/reactos/include/psdk/winioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winioctl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winioctl.h [iso-8859-1] Tue Apr 2 14:16:29 2013 @@ -14,8 +14,6 @@ #define HIST_NO_OF_BUCKETS 24 #define HISTOGRAM_BUCKET_SIZE sizeof(HISTOGRAM_BUCKET) #define DISK_HISTOGRAM_SIZE sizeof(DISK_HISTOGRAM) -#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m)) -#define DEVICE_TYPE_FROM_CTL_CODE(c) (((DWORD)((c)&0xffff0000))>>16) #ifndef _NTDDSTOR_H_ #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE @@ -99,6 +97,10 @@ #define FSCTL_SET_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 41, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_DELETE_REPARSE_POINT CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 43, METHOD_BUFFERED, FILE_ANY_ACCESS) #define FSCTL_SET_SPARSE CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED, FILE_SPECIAL_ACCESS) + +#ifndef _DEVIOCTL_ +#define _DEVIOCTL_ + #define DEVICE_TYPE DWORD #define FILE_DEVICE_BEEP 1 #define FILE_DEVICE_CD_ROM 2 @@ -157,6 +159,23 @@ #define FILE_DEVICE_SERENUM 55 #define FILE_DEVICE_TERMSRV 56 #define FILE_DEVICE_KSEC 57 + +/* Also in ddk/winddk.h */ +#define FILE_ANY_ACCESS 0x00000000 +#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS +#define FILE_READ_ACCESS 0x00000001 +#define FILE_WRITE_ACCESS 0x00000002 + +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +#define CTL_CODE(t,f,m,a) (((t)<<16)|((a)<<14)|((f)<<2)|(m)) +#define DEVICE_TYPE_FROM_CTL_CODE(c) (((DWORD)((c)&0xffff0000))>>16) + +#endif /* _DEVIOCTL_ */ + #define PARTITION_ENTRY_UNUSED 0 #define PARTITION_FAT_12 1 #define PARTITION_XENIX_1 2 @@ -174,10 +193,6 @@ #define PARTITION_UNIX 0x63 #define PARTITION_NTFT 128 #define VALID_NTFT 0xC0 -#define METHOD_BUFFERED 0 -#define METHOD_IN_DIRECT 1 -#define METHOD_OUT_DIRECT 2 -#define METHOD_NEITHER 3 #define SERIAL_LSRMST_ESCAPE 0 #define SERIAL_LSRMST_LSR_DATA 1 #define SERIAL_LSRMST_LSR_NODATA 2 @@ -195,12 +210,6 @@ #define GUID_SERENUM_BUS_ENUMERATOR GUID_DEVINTERFACE_SERENUM_BUS_ENUMERATOR #endif /* DEFINE_GUID */ - -/* Also in ddk/winddk.h */ -#define FILE_ANY_ACCESS 0x00000000 -#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS -#define FILE_READ_ACCESS 0x00000001 -#define FILE_WRITE_ACCESS 0x00000002 #define DISK_LOGGING_START 0 #define DISK_LOGGING_STOP 1

11 years, 5 months

[tfaber] 58642: [CRT] - Fix stat64_to_stat macro definition. Patch by Víctor Martínez. - Fix out-of-memory error cases in environment functions. - Spotted by PVS-Studio CORE-7039 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Apr 2 12:53:30 2013 New Revision: 58642 URL: http://svn.reactos.org/svn/reactos?rev=58642&view=rev Log: [CRT] - Fix stat64_to_stat macro definition. Patch by Víctor Martínez. - Fix out-of-memory error cases in environment functions. - Spotted by PVS-Studio CORE-7039 #resolve Modified: trunk/reactos/lib/sdk/crt/misc/environ.c trunk/reactos/lib/sdk/crt/stdio/stat.c Modified: trunk/reactos/lib/sdk/crt/misc/environ.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/environ.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/environ.c [iso-8859-1] Tue Apr 2 12:53:30 2013 @@ -1,4 +1,4 @@ -/* +/* * environ.c * * ReactOS MSVCRT.DLL Compatibility Library @@ -64,11 +64,11 @@ { if ((*envptr = malloc(len)) == NULL) { - for (envptr--; envptr >= _environ; envptr--); + for (envptr--; envptr >= _environ; envptr--) free(*envptr); FreeEnvironmentStringsA(environment_strings); free(_environ); - __initenv = _environ = NULL; + __initenv = _environ = NULL; return -1; } memcpy(*envptr++, ptr, len); @@ -116,11 +116,11 @@ { if ((*envptr = malloc(len * sizeof(wchar_t))) == NULL) { - for (envptr--; envptr >= _wenviron; envptr--); + for (envptr--; envptr >= _wenviron; envptr--) free(*envptr); FreeEnvironmentStringsW(environment_strings); free(_wenviron); - __winitenv = _wenviron = NULL; + __winitenv = _wenviron = NULL; return -1; } memcpy(*envptr++, ptr, len * sizeof(wchar_t)); @@ -168,7 +168,7 @@ *newenvptr = _strdup(*envptr++); if (*newenvptr == NULL) { - for (newenvptr--; newenvptr >= newenv; newenvptr--); + for (newenvptr--; newenvptr >= newenv; newenvptr--) free(*newenvptr); free(newenv); return original_environment; Modified: trunk/reactos/lib/sdk/crt/stdio/stat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/stat.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/stat.c [iso-8859-1] Tue Apr 2 12:53:30 2013 @@ -2,6 +2,7 @@ #include <tchar.h> #define stat64_to_stat(buf64, buf) \ + do { \ buf->st_dev = (buf64)->st_dev; \ buf->st_ino = (buf64)->st_ino; \ buf->st_mode = (buf64)->st_mode; \ @@ -13,6 +14,7 @@ buf->st_atime = (time_t)(buf64)->st_atime; \ buf->st_mtime = (time_t)(buf64)->st_mtime; \ buf->st_ctime = (time_t)(buf64)->st_ctime; \ + } while (0) int CDECL _tstat(const _TCHAR* path, struct _stat * buf) {

11 years, 5 months

[jgardou] 58641: [STDUNK] * Add library, implementing the CUnknown interface for WDM audio drivers

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 12:45:31 2013 New Revision: 58641 URL: http://svn.reactos.org/svn/reactos?rev=58641&view=rev Log: [STDUNK] * Add library, implementing the CUnknown interface for WDM audio drivers Added: trunk/reactos/lib/drivers/sound/stdunk/ (with props) trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt (with props) trunk/reactos/lib/drivers/sound/stdunk/cunknown.cpp (with props) Modified: trunk/reactos/lib/drivers/sound/CMakeLists.txt Modified: trunk/reactos/lib/drivers/sound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/CMakeLis… ============================================================================== --- trunk/reactos/lib/drivers/sound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/CMakeLists.txt [iso-8859-1] Tue Apr 2 12:45:31 2013 @@ -5,4 +5,5 @@ add_subdirectory(mmixer) add_subdirectory(shared) #add_subdirectory(soundblaster) Nothing links to this lib. +add_subdirectory(stdunk) add_subdirectory(uartmidi) Propchange: trunk/reactos/lib/drivers/sound/stdunk/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Apr 2 12:45:31 2013 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/drivers/sound/stdunk/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/drivers/sound/stdunk/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/drivers/sound/stdunk/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/stdunk/C… ============================================================================== --- trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt (added) +++ trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt [iso-8859-1] Tue Apr 2 12:45:31 2013 @@ -1,0 +1,10 @@ + +set_cpp() + +add_library(stdunk STATIC cunknown.cpp) + +if(MSVC) + add_target_compile_flags(stdunk "/GR-") +else() + add_target_compile_flags(stdunk "-fno-exceptions -fno-rtti") +endif() Propchange: trunk/reactos/lib/drivers/sound/stdunk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/drivers/sound/stdunk/cunknown.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/stdunk/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/stdunk/cunknown.cpp (added) +++ trunk/reactos/lib/drivers/sound/stdunk/cunknown.cpp [iso-8859-1] Tue Apr 2 12:45:31 2013 @@ -1,0 +1,72 @@ +/* + ReactOS Kernel-Mode COM + IUnknown implementations + + LICENSE + Please see COPYING in the top-level directory for license information. + + AUTHORS + Andrew Greenwood +*/ + +#include <stdunk.h> + +CUnknown::CUnknown(PUNKNOWN outer_unknown) +{ + m_ref_count = 0; + + if ( outer_unknown ) + m_outer_unknown = outer_unknown; + else + m_outer_unknown = PUNKNOWN(dynamic_cast<PNONDELEGATINGUNKNOWN>(this)); +} + +CUnknown::~CUnknown() +{ +} + +STDMETHODIMP_(ULONG) +CUnknown::NonDelegatingAddRef() +{ + InterlockedIncrement(&m_ref_count); + return m_ref_count; +} + +STDMETHODIMP_(ULONG) +CUnknown::NonDelegatingRelease() +{ + if ( InterlockedDecrement(&m_ref_count) == 0 ) + { + m_ref_count ++; + delete this; + return 0; + } + + return m_ref_count; +} + +STDMETHODIMP_(NTSTATUS) +CUnknown::NonDelegatingQueryInterface( + IN REFIID iid, + PVOID* ppVoid) +{ + /* FIXME */ + #if 0 + if ( IsEqualGUID(iid, IID_IUnknown) ) /* TODO: Aligned? */ + *ppVoid = PVOID(PUNKNOWN(this)); + else + *ppVoid = NULL; + #endif + + if ( *ppVoid ) + { + PUNKNOWN(*ppVoid)->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_INVALID_PARAMETER; +} + +#if __GNUC__ +extern "C" void __cxa_pure_virtual() { ASSERT(FALSE); } +#endif Propchange: trunk/reactos/lib/drivers/sound/stdunk/cunknown.cpp ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 5 months

[jgardou] 58640: [BUILD] * Try fixing it...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 12:39:16 2013 New Revision: 58640 URL: http://svn.reactos.org/svn/reactos?rev=58640&view=rev Log: [BUILD] * Try fixing it... Modified: trunk/reactos/dll/directx/ksproxy/clockforward.cpp trunk/reactos/dll/directx/ksproxy/input_pin.cpp trunk/reactos/dll/directx/ksproxy/ksproxy.cpp trunk/reactos/dll/directx/ksproxy/proxy.cpp trunk/reactos/dll/directx/ksproxy/qualityforward.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp trunk/reactos/include/psdk/ksproxy.h Modified: trunk/reactos/dll/directx/ksproxy/clockforward.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/clockf… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/clockforward.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/clockforward.cpp [iso-8859-1] Tue Apr 2 12:39:16 2013 @@ -7,10 +7,6 @@ * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ #include "precomp.h" - -#ifndef _MSC_VER -const GUID KSCATEGORY_CLOCK = {0x53172480, 0x4791, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -#endif const GUID IID_IKsClockForwarder = {0x877e4352, 0x6fea, 0x11d0, {0xb8, 0x63, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; Modified: trunk/reactos/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/input_… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] Tue Apr 2 12:39:16 2013 @@ -11,11 +11,6 @@ const GUID IID_IKsPinPipe = {0xe539cd90, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02}}; const GUID IID_IKsPinEx = {0x7bb38260L, 0xd19c, 0x11d2, {0xb3, 0x8a, 0x00, 0xa0, 0xc9, 0x5e, 0xc2, 0x2e}}; - -#ifndef _MSC_VER - -const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; - KSPIN_INTERFACE StandardPinInterface = { {STATIC_KSINTERFACESETID_Standard}, @@ -29,24 +24,6 @@ KSMEDIUM_TYPE_ANYINSTANCE, 0 }; - -#else - -KSPIN_INTERFACE StandardPinInterface = -{ - STATIC_KSINTERFACESETID_Standard, - KSINTERFACE_STANDARD_STREAMING, - 0 -}; - -KSPIN_MEDIUM StandardPinMedium = -{ - STATIC_KSMEDIUMSETID_Standard, - KSMEDIUM_TYPE_ANYINSTANCE, - 0 -}; - -#endif class CInputPin : public IPin, public IKsPropertySet, Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] Tue Apr 2 12:39:16 2013 @@ -17,9 +17,6 @@ #ifndef _MSC_VER const GUID CLSID_KsIBasicAudioInterfaceHandler = {0xb9f8ac3e, 0x0f71, 0x11d2, {0xb7, 0x2c, 0x00, 0xc0, 0x4f, 0xb6, 0xbd, 0x3d}}; -const GUID KSPROPSETID_Pin = {0x8C134960, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; -const GUID KSINTERFACESETID_Standard = {STATIC_KSINTERFACESETID_Standard}; -const GUID CLSID_Proxy = {0x17CCA71B, 0xECD7, 0x11D0, {0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; #endif static INTERFACE_TABLE InterfaceTable[] = Modified: trunk/reactos/dll/directx/ksproxy/proxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/proxy.… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/proxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/proxy.cpp [iso-8859-1] Tue Apr 2 12:39:16 2013 @@ -10,16 +10,10 @@ #ifndef _MSC_VER const GUID IID_IPersistPropertyBag = {0x37D84F60, 0x42CB, 0x11CE, {0x81, 0x35, 0x00, 0xAA, 0x00, 0x4B, 0xB8, 0x51}}; -const GUID GUID_NULL = {0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; const GUID IID_ISpecifyPropertyPages = {0xB196B28B, 0xBAB4, 0x101A, {0xB6, 0x9C, 0x00, 0xAA, 0x00, 0x34, 0x1D, 0x07}}; const GUID IID_IPersistStream = {0x00000109, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; -const GUID KSPROPSETID_MediaSeeking = {0xEE904F0CL, 0xD09B, 0x11D0, {0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; -const GUID KSPROPSETID_Clock = {0xDF12A4C0L, 0xAC17, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -const GUID KSEVENTSETID_Clock = {0x364D8E20L, 0x62C7, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -const GUID KSPROPSETID_Stream = {0x65aaba60L, 0x98ae, 0x11cf, {0xa1, 0x0d, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4}}; const GUID IID_IPersist = {0x0000010c, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; #endif - const GUID IID_IBDA_DeviceControl = {0xFD0A5AF3, 0xB41D, 0x11d2, {0x9C, 0x95, 0x00, 0xC0, 0x4F, 0x79, 0x71, 0xE0}}; const GUID IID_IKsAggregateControl = {0x7F40EAC0, 0x3947, 0x11D2, {0x87, 0x4E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID IID_IKsClockPropertySet = {0x5C5CBD84, 0xE755, 0x11D0, {0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; Modified: trunk/reactos/dll/directx/ksproxy/qualityforward.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/qualit… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/qualityforward.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/qualityforward.cpp [iso-8859-1] Tue Apr 2 12:39:16 2013 @@ -7,10 +7,6 @@ * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ #include "precomp.h" - -#ifndef _MSC_VER -const GUID KSCATEGORY_QUALITY = {0x97EBAACB, 0x95BD, 0x11D0, {0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; -#endif #define IID_IKsQualityForwarder KSCATEGORY_QUALITY Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.cpp [iso-8859-1] Tue Apr 2 12:39:16 2013 @@ -23,8 +23,6 @@ const GUID IID_IMiniportTopology = {0xb4c90a31L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IMiniportMidi = {0xb4c90a41L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IMiniportWavePci = {0xb4c90a52L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; - -const GUID GUID_NULL ={0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; const GUID IID_IPortTopology = {0xb4c90a30L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; @@ -70,32 +68,6 @@ const GUID KS_CATEGORY_RENDER = {0x65E8773E, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID KS_CATEGORY_CAPTURE = {0x65E8773D, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID KS_CATEGORY_TOPOLOGY = {0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00}}; -const GUID KSCATEGORY_AUDIO = {0x6994AD04L, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; - - -const GUID KSNODETYPE_SYNTHESIZER = {0xDFF220F3, 0xF70F, 0x11D0, {0xB9, 0x17, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; -const GUID KSAUDFNAME_DMUSIC_MPU_IN = {0xB2EC0A7D, 0xBAC9, 0x11d2, {0xB7, 0xA8, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1}}; -const GUID KSAUDFNAME_MIDI = {0x185FEDF8L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3}}; -const GUID KSAUDFNAME_DMUSIC_MPU_OUT = {0xA4DF0EB5, 0xBAC9, 0x11d2, {0xB7, 0xA8, 0x00, 0x60, 0x08, 0x33, 0x16, 0xC1}}; - -const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; - -const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; -const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -const GUID KSPROPTYPESETID_General = {0x97E99BA0L, 0xBDEA, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; -const GUID KSPROPSETID_DrmAudioStream = {0x2f2c8ddd, 0x4198, 0x4fac, {0xba, 0x29, 0x61, 0xbb, 0x05, 0xb7, 0xde, 0x06}}; -const GUID KSPROPSETID_Synth = {0xfedfae25L, 0xe46e, 0x11d1, {0xaa, 0xce, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12}}; -const GUID KSPROPSETID_Audio = {0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; - -const GUID KSEVENTSETID_LoopedStreaming = {0x4682B940L, 0xC6EF, 0x11D0, {0x96, 0xD8, 0x00, 0xAA, 0x00, 0x51, 0xE5, 0x1D}}; -const GUID KSEVENTSETID_Connection = {0x7f4bcbe0L, 0x9ea5, 0x11cf, {0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00}}; - -const GUID IID_IAllocatorMXF = {0xa5f0d62cL, 0xb30f, 0x11d2, {0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; -const GUID IID_IMXF = {0xc096df9e, 0xfb09, 0x11d1, {0x81, 0xb0, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1}}; -const GUID KSMUSIC_TECHNOLOGY_PORT = {0x86C92E60, 0x62E8, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; /// /// undocumented guids Modified: trunk/reactos/include/psdk/ksproxy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksproxy.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksproxy.h [iso-8859-1] Tue Apr 2 12:39:16 2013 @@ -13,54 +13,54 @@ #endif #define STATIC_IID_IKsObject\ - 0x423c13a2L, 0x2070, 0x11d0, 0x9e, 0xf7, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1 + 0x423c13a2L, 0x2070, 0x11d0, {0x9e, 0xf7, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1} #define STATIC_IID_IKsPinEx\ - 0x7bb38260L, 0xd19c, 0x11d2, 0xb3, 0x8a, 0x00, 0xa0, 0xc9, 0x5e, 0xc2, 0x2e + 0x7bb38260L, 0xd19c, 0x11d2, {0xb3, 0x8a, 0x00, 0xa0, 0xc9, 0x5e, 0xc2, 0x2e} #define STATIC_IID_IKsPin\ - 0xb61178d1L, 0xa2d9, 0x11cf, 0x9e, 0x53, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1 + 0xb61178d1L, 0xa2d9, 0x11cf, {0x9e, 0x53, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1} #define STATIC_IID_IKsPinPipe\ - 0xe539cd90L, 0xa8b4, 0x11d1, 0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02 + 0xe539cd90L, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02} #define STATIC_IID_IKsDataTypeHandler\ - 0x5ffbaa02L, 0x49a3, 0x11d0, 0x9f, 0x36, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1 + 0x5ffbaa02L, 0x49a3, 0x11d0, {0x9f, 0x36, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1} #define STATIC_IID_IKsDataTypeCompletion\ - 0x827D1A0EL, 0x0F73, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x827D1A0EL, 0x0F73, 0x11D2, {0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} #define STATIC_IID_IKsInterfaceHandler\ - 0xD3ABC7E0L, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0xD3ABC7E0L, 0x9A61, 0x11D0, {0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} #define STATIC_IID_IKsClockPropertySet\ - 0x5C5CBD84L, 0xE755, 0x11D0, 0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x5C5CBD84L, 0xE755, 0x11D0, {0xAC, 0x18, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} #define STATIC_IID_IKsAllocator\ - 0x8da64899L, 0xc0d9, 0x11d0, 0x84, 0x13, 0x00, 0x00, 0xf8, 0x22, 0xfe, 0x8a + 0x8da64899L, 0xc0d9, 0x11d0, {0x84, 0x13, 0x00, 0x00, 0xf8, 0x22, 0xfe, 0x8a} #define STATIC_IID_IKsAllocatorEx\ - 0x091bb63aL, 0x603f, 0x11d1, 0xb0, 0x67, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02 + 0x091bb63aL, 0x603f, 0x11d1, {0xb0, 0x67, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02} #ifndef STATIC_IID_IKsPropertySet #define STATIC_IID_IKsPropertySet\ - 0x31EFAC30L, 0x515C, 0x11d0, 0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93 + 0x31EFAC30L, 0x515C, 0x11d0, {0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93} #endif #define STATIC_IID_IKsTopology\ - 0x28F54683L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x28F54683L, 0x06FD, 0x11D2, {0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} #ifndef STATIC_IID_IKsControl #define STATIC_IID_IKsControl\ - 0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x28F54685L, 0x06FD, 0x11D2, {0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} #endif #define STATIC_IID_IKsAggregateControl\ - 0x7F40EAC0L, 0x3947, 0x11D2, 0x87, 0x4E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x7F40EAC0L, 0x3947, 0x11D2, {0x87, 0x4E, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} #define STATIC_CLSID_Proxy \ - 0x17CCA71BL, 0xECD7, 0x11D0, 0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + 0x17CCA71BL, 0xECD7, 0x11D0, {0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} #ifdef _KS_

11 years, 5 months

[jgardou] 58639: [PSDK] * implement DEFINE_GUIDSTRUCT and DEFINE_GUIDNAMED for GCC

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 11:52:12 2013 New Revision: 58639 URL: http://svn.reactos.org/svn/reactos?rev=58639&view=rev Log: [PSDK] * implement DEFINE_GUIDSTRUCT and DEFINE_GUIDNAMED for GCC Modified: trunk/reactos/include/ddk/dmusicks.h trunk/reactos/include/ddk/dmusprop.h trunk/reactos/include/psdk/kcom.h trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/ddk/dmusicks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmusicks.h?rev… ============================================================================== --- trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/dmusicks.h [iso-8859-1] Tue Apr 2 11:52:12 2013 @@ -107,7 +107,7 @@ typedef struct IAllocatorMXF *PAllocatorMXF; #define STATIC_IID_IAllocatorMXF\ - 0xa5f0d62c, 0xb30f, 0x11d2, 0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1 + 0xa5f0d62c, 0xb30f, 0x11d2, {0xb7, 0xa3, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1} DEFINE_GUIDSTRUCT("a5f0d62c-b30f-11d2-b7a3-0060083316c1", IID_IAllocatorMXF); #define IID_IAllocatorMXF DEFINE_GUIDNAMED(IID_IAllocatorMXF) Modified: trunk/reactos/include/ddk/dmusprop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dmusprop.h?rev… ============================================================================== --- trunk/reactos/include/ddk/dmusprop.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/dmusprop.h [iso-8859-1] Tue Apr 2 11:52:12 2013 @@ -192,7 +192,7 @@ #define STATIC_KSPROPSETID_SynthClock \ - 0xfedfae26L, 0xe46e, 0x11d1, 0xaa, 0xce, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12 + 0xfedfae26L, 0xe46e, 0x11d1, {0xaa, 0xce, 0x00, 0x00, 0xf8, 0x75, 0xac, 0x12} DEFINE_GUIDSTRUCT("fedfae26-e46e-11d1-aace-0000f875ac12", KSPROPSETID_SynthClock); #define KSPROPSETID_SynthClock DEFINE_GUIDNAMED(KSPROPSETID_SynthClock) Modified: trunk/reactos/include/psdk/kcom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/kcom.h?rev=58… ============================================================================== --- trunk/reactos/include/psdk/kcom.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/kcom.h [iso-8859-1] Tue Apr 2 11:52:12 2013 @@ -29,7 +29,7 @@ extern "C" { #endif -#define STATIC_KoCreateObject 0x72CF721CL, 0x525A, 0x11D1, 0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +#define STATIC_KoCreateObject 0x72CF721CL, 0x525A, 0x11D1, {0x9A, 0xA1, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96} DEFINE_GUIDSTRUCT("72CF721C-525A-11D1-9AA1-00A0C9223196", KoCreateObject); #define KOSTRING_CreateObject L"{72CF721C-525A-11D1-9AA1-00A0C9223196}" Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=5863… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Tue Apr 2 11:52:12 2013 @@ -80,9 +80,27 @@ #endif #endif -#if defined(__cplusplus) && _MSC_VER >= 1100 - #define DEFINE_GUIDSTRUCT(guid, name) struct __declspec(uuid(guid)) name - #define DEFINE_GUIDNAMED(name) __uuidof(struct name) +#if defined(__cplusplus) + #if _MSC_VER >= 1100 + #define DEFINE_GUIDSTRUCT(guid, name) struct __declspec(uuid(guid)) name + #define DEFINE_GUIDNAMED(name) __uuidof(struct name) + #else + extern "C++" { + template<typename T> const GUID &__mingw_uuidof(); + } + #define DEFINE_GUIDSTRUCT(guid, name) \ + struct __guid ## name; \ + extern "C++" { \ + template<> inline const GUID &__mingw_uuidof<__guid ## name>() { \ + static const IID iid = {STATICGUIDOF(name)}; \ + return iid; \ + } \ + template<> inline const GUID &__mingw_uuidof<__guid ## name *>() { \ + return __mingw_uuidof<__guid ## name>(); \ + } \ + } + #define DEFINE_GUIDNAMED(name) __mingw_uuidof<__guid ## name>() + #endif #else #define DEFINE_GUIDSTRUCT(guid, name) DEFINE_GUIDEX(name) #define DEFINE_GUIDNAMED(name) name @@ -93,7 +111,6 @@ 0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} DEFINE_GUIDSTRUCT("00000000-0000-0000-0000-000000000000", GUID_NULL); #define GUID_NULL DEFINE_GUIDNAMED(GUID_NULL) - #define STATIC_KSNAME_Filter\ 0x9b365890L, 0x165f, 0x11d0, {0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4} Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Tue Apr 2 11:52:12 2013 @@ -646,7 +646,7 @@ } LOOPEDSTREAMING_POSITION_EVENT_DATA, *PLOOPEDSTREAMING_POSITION_EVENT_DATA ; #define STATIC_KSPROPSETID_DrmAudioStream\ - 0x2f2c8ddd, 0x4198, 0x4fac, 0xba, 0x29, 0x61, 0xbb, 0x5, 0xb7, 0xde, 0x6 + 0x2f2c8ddd, 0x4198, 0x4fac, {0xba, 0x29, 0x61, 0xbb, 0x5, 0xb7, 0xde, 0x6} DEFINE_GUIDSTRUCT("2F2C8DDD-4198-4fac-BA29-61BB05B7DE06", KSPROPSETID_DrmAudioStream); #define KSPROPSETID_DrmAudioStream DEFINE_GUIDNAMED(KSPROPSETID_DrmAudioStream) @@ -796,7 +796,7 @@ #define KSDATAFORMAT_SUBTYPE_MIDI_BUS DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_MIDI_BUS) #define STATIC_KSAUDFNAME_MIDI\ - 0x185FEDF8L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 + 0x185FEDF8L, 0x9905, 0x11D1, {0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3} DEFINE_GUIDSTRUCT("185FEDF8-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIDI); #define KSAUDFNAME_MIDI DEFINE_GUIDNAMED(KSAUDFNAME_MIDI)

11 years, 5 months

[jgardou] 58638: [DDK] * Add missing IMP_IMiniportWaveRT and IMP_IMiniportWaveRTStream definitions

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 08:09:51 2013 New Revision: 58638 URL: http://svn.reactos.org/svn/reactos?rev=58638&view=rev Log: [DDK] * Add missing IMP_IMiniportWaveRT and IMP_IMiniportWaveRTStream definitions Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Tue Apr 2 08:09:51 2013 @@ -1810,6 +1810,42 @@ 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 @@ -1891,6 +1927,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

11 years, 5 months

[jgardou] 58637: [CMAKE] * Add the wdmdriver module type

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Apr 2 08:08:36 2013 New Revision: 58637 URL: http://svn.reactos.org/svn/reactos?rev=58637&view=rev Log: [CMAKE] * Add the wdmdriver module type Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Apr 2 08:08:36 2013 @@ -299,7 +299,7 @@ # Set subsystem. Also take this as an occasion # to error out if someone gave a non existing type - if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver)) + if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set(__subsystem native) elseif(${TYPE} STREQUAL win32cui) set(__subsystem console) @@ -342,7 +342,7 @@ OR (${TYPE} STREQUAL cpl)) set(__entrypoint DllMainCRTStartup) set(__entrystack 12) - elseif(${TYPE} STREQUAL kernelmodedriver) + elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set(__entrypoint DriverEntry) set(__entrystack 8) elseif(${TYPE} STREQUAL nativedll) @@ -369,12 +369,12 @@ else() message(STATUS "${MODULE} has no base address") endif() - elseif(${TYPE} STREQUAL kernelmodedriver) + elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set_image_base(${MODULE} 0x00010000) endif() # Now do some stuff which is specific to each type - if(${TYPE} STREQUAL kernelmodedriver) + if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) add_dependencies(${MODULE} bugcodes) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") endif() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=58637&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Apr 2 08:08:36 2013 @@ -202,8 +202,11 @@ target_link_libraries(${MODULE} -lstdc++ -lsupc++ -lgcc -lmingwex) endif() - if(${TYPE} STREQUAL "kernelmodedriver") + if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL "wdmdriver")) add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000") + if(${TYPE} STREQUAL "wdmdriver") + add_target_link_flags(${MODULE} "-Wl,--wdmdriver") + endif() endif() endfunction() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=58637… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Apr 2 08:08:36 2013 @@ -112,6 +112,8 @@ add_target_link_flags(${MODULE} "/DLL") elseif(${TYPE} STREQUAL "kernelmodedriver") add_target_link_flags(${MODULE} "/DRIVER") + elseif(${TYPE} STREQUAL "wdmdriver") + add_target_link_flags(${MODULE} "/DRIVER:WDM") endif() endfunction()

11 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2013