Marcus Meissner : dinput: const REFIID is duplicate const (Coverity).

Alexandre Julliard julliard at winehq.org
Thu Jul 14 13:08:14 CDT 2011


Module: wine
Branch: master
Commit: 3dc66a9d6dbeaa0b9a4bab26122ad562631412cc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3dc66a9d6dbeaa0b9a4bab26122ad562631412cc

Author: Marcus Meissner <marcus at jet.franken.de>
Date:   Thu Jul 14 08:44:59 2011 +0200

dinput: const REFIID is duplicate const (Coverity).

---

 dlls/dinput/tests/dinput.c  |   24 ++++++++++++------------
 dlls/dinput8/tests/dinput.c |   20 ++++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c
index 34f5a91..90a8266 100644
--- a/dlls/dinput/tests/dinput.c
+++ b/dlls/dinput/tests/dinput.c
@@ -201,16 +201,16 @@ static void test_DirectInputCreateEx(void)
         {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInputA, TRUE,  DIERR_OLDDIRECTINPUTVERSION, NULL},
     };
 
-    static const REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A,
-                                               &IID_IDirectInput8W, &IID_IDirectInputDeviceA,
-                                               &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A,
-                                               &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A,
-                                               &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A,
-                                               &IID_IDirectInputDevice8W, &IID_IDirectInputEffect};
+    static REFIID no_interface_list[] = {&IID_IUnknown, &IID_IDirectInput8A,
+                                         &IID_IDirectInput8W, &IID_IDirectInputDeviceA,
+                                         &IID_IDirectInputDeviceW, &IID_IDirectInputDevice2A,
+                                         &IID_IDirectInputDevice2W, &IID_IDirectInputDevice7A,
+                                         &IID_IDirectInputDevice7W, &IID_IDirectInputDevice8A,
+                                         &IID_IDirectInputDevice8W, &IID_IDirectInputEffect};
 
-    static const REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
-                                      &IID_IDirectInput2A, &IID_IDirectInput2W,
-                                      &IID_IDirectInput7A, &IID_IDirectInput7W};
+    static REFIID iid_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
+                                &IID_IDirectInput2A, &IID_IDirectInput2W,
+                                &IID_IDirectInput7A, &IID_IDirectInput7W};
 
     int i, j;
     IUnknown *pUnk;
@@ -270,9 +270,9 @@ static void test_DirectInputCreateEx(void)
 
 static void test_QueryInterface(void)
 {
-    static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW,
-                                      &IID_IDirectInput2A, &IID_IDirectInput2W,
-                                      &IID_IDirectInput7A, &IID_IDirectInput7W};
+    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInputA, &IID_IDirectInputW,
+                                &IID_IDirectInput2A, &IID_IDirectInput2W,
+                                &IID_IDirectInput7A, &IID_IDirectInput7W};
 
     static const struct
     {
diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c
index 5f61634..88c4c5a 100644
--- a/dlls/dinput8/tests/dinput.c
+++ b/dlls/dinput8/tests/dinput.c
@@ -176,16 +176,16 @@ static void test_DirectInput8Create(void)
         {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE,  DIERR_OLDDIRECTINPUTVERSION},
     };
 
-    static const REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
-                                               &IID_IDirectInput2A, &IID_IDirectInput2W,
-                                               &IID_IDirectInput7A, &IID_IDirectInput7W,
-                                               &IID_IDirectInputDeviceA, &IID_IDirectInputDeviceW,
-                                               &IID_IDirectInputDevice2A, &IID_IDirectInputDevice2W,
-                                               &IID_IDirectInputDevice7A, &IID_IDirectInputDevice7W,
-                                               &IID_IDirectInputDevice8A, &IID_IDirectInputDevice8W,
-                                               &IID_IDirectInputEffect};
+    static REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
+                                         &IID_IDirectInput2A, &IID_IDirectInput2W,
+                                         &IID_IDirectInput7A, &IID_IDirectInput7W,
+                                         &IID_IDirectInputDeviceA, &IID_IDirectInputDeviceW,
+                                         &IID_IDirectInputDevice2A, &IID_IDirectInputDevice2W,
+                                         &IID_IDirectInputDevice7A, &IID_IDirectInputDevice7W,
+                                         &IID_IDirectInputDevice8A, &IID_IDirectInputDevice8W,
+                                         &IID_IDirectInputEffect};
 
-    static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W};
+    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W};
 
     int i;
     IUnknown *pUnk;
@@ -225,7 +225,7 @@ static void test_DirectInput8Create(void)
 
 static void test_QueryInterface(void)
 {
-    static const REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W};
+    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W};
 
     static const struct
     {




More information about the wine-cvs mailing list