[PORTLCS]

- KSCATEGORY_AUDIO should be the first device category so that wdmaud can correctly assign virtual device ids

svn path=/trunk/; revision=43342

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp
index 672e354..2a5842e 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp
+++ b/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp
@@ -64,13 +64,13 @@ typedef struct
 
 static GUID InterfaceGuids[2] = 
 {
-    {
-        /// KS_CATEGORY_TOPOLOGY
-        0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00}
-    },
     {
         /// KS_CATEGORY_AUDIO
         0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
+    },
+    {
+        /// KS_CATEGORY_TOPOLOGY
+        0xDDA54A40, 0x1E4C, 0x11D1, {0xA0, 0x50, 0x40, 0x57, 0x05, 0xC1, 0x00, 0x00}
     }
 };
 

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp
index bf3ff93..121e4bb 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp
+++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp
@@ -59,6 +59,10 @@ GUID KSPROPERTY_SETID_Topology                = {0x720D4AC0L, 0x7533, 0x11D0, {0
 
 static GUID InterfaceGuids[4] = 
 {
+    {
+         //KS_CATEGORY_AUDIO
+        0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
+    },
     {
         /// KSCATEGORY_RENDER
         0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
@@ -67,10 +71,6 @@ static GUID InterfaceGuids[4] =
         /// KSCATEGORY_CAPTURE
         0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
     },
-    {
-         //KS_CATEGORY_AUDIO
-        0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
-    },
     {
         ///KSCATEGORY_AUDIO_DEVICE
         0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88}

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp
index bb83d9c..0c3eb69 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp
+++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp
@@ -64,6 +64,10 @@ protected:
 
 static GUID InterfaceGuids[3] = 
 {
+    {
+        /// KS_CATEGORY_AUDIO
+        0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
+    },
     {
         /// KSCATEGORY_RENDER
         0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
@@ -71,10 +75,6 @@ static GUID InterfaceGuids[3] =
     {
         /// KSCATEGORY_CAPTURE
         0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
-    },
-    {
-        /// KS_CATEGORY_AUDIO
-        0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
     }
 };
 

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp b/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp
index 7676f6c..e91fa6d 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp
+++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp
@@ -57,6 +57,10 @@ protected:
 
 static GUID InterfaceGuids[3] = 
 {
+    {
+        /// KS_CATEGORY_AUDIO
+        0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
+    },
     {
         /// KSCATEGORY_RENDER
         0x65E8773EL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
@@ -64,10 +68,6 @@ static GUID InterfaceGuids[3] =
     {
         /// KSCATEGORY_CAPTURE
         0x65E8773DL, 0x8F56, 0x11D0, {0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
-    },
-    {
-        /// KS_CATEGORY_AUDIO
-        0x6994AD04, 0x93EF, 0x11D0, {0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}
     }
 };