- Fix property sets for sysaudio

svn path=/trunk/; revision=39693

diff --git a/reactos/include/psdk/ks.h b/reactos/include/psdk/ks.h
index d823cf8..5313274 100644 (file)
--- a/reactos/include/psdk/ks.h
+++ b/reactos/include/psdk/ks.h
@@ -378,8 +378,11 @@ typedef enum
     Properties/Methods/Events
 */
 
-#define KSPROPSETID_General \
-    0x1464EDA5L, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96
+#define STATIC_KSPROPSETID_General\
+    0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
+DEFINE_GUIDSTRUCT("1464EDA5-6A8F-11D1-9AA7-00A0C9223196", KSPROPSETID_General);
+#define KSPROPSETID_General DEFINE_GUIDNAMED(KSPROPSETID_General)
+
 
 typedef enum
 {
@@ -728,23 +731,6 @@ typedef enum
     KSPROPERTY_SYNTH_DLS_WAVEFORMAT
 */
 
-/* #define KSPROPSETID_Sysaudio */
-/*
-    KSPROPERTY_SYSAUDIO_COMPONENT_ID
-    KSPROPERTY_SYSAUDIO_CREATE_VIRTUAL_SOURCE
-    KSPROPERTY_SYSAUDIO_DEVICE_COUNT
-    KSPROPERTY_SYSAUDIO_DEVICE_FRIENDLY_NAME
-    KSPROPERTY_SYSAUDIO_DEVICE_INSTANCE
-    KSPROPERTY_SYSAUDIO_DEVICE_INTERFACE_NAME
-    KSPROPERTY_SYSAUDIO_INSTANCE_INFO
-    KSPROPERTY_SYSAUDIO_SELECT_GRAPH
-*/
-
-#define KSPROPSETID_Sysaudio_Pin
-/*
-    KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE
-*/
-
 #define KSPROPSETID_TopologyNode
 /*
     KSPROPERTY_TOPOLOGYNODE_ENABLE

diff --git a/reactos/include/psdk/ksmedia.h b/reactos/include/psdk/ksmedia.h
index da66d88..416598f 100644 (file)
--- a/reactos/include/psdk/ksmedia.h
+++ b/reactos/include/psdk/ksmedia.h
@@ -213,4 +213,14 @@ typedef struct {
 #define SYSAUDIO_FLAGS_DONT_COMBINE_PINS        0x00000001
 
 
+#define STATIC_KSPROPSETID_Sysaudio_Pin \
+    0xA3A53220L, 0xC6E4, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}
+DEFINE_GUIDSTRUCT("A3A53220-C6E4-11D0-B465-00001A1818E6", KSPROPSETID_Sysaudio_Pin);
+#define KSPROPSETID_Sysaudio_Pin DEFINE_GUIDNAMED(KSPROPSETID_Sysaudio_Pin)
+
+typedef enum {
+    KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE = 1,
+} KSPROPERTY_SYSAUDIO_PIN;
+
+
 #endif