[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    Re: WineHQ upgrade breaking dinput8:dinput?
From:       Bernhard_Übelacker <bernhardu () vr-web ! de>
Date:       2016-03-30 8:37:45
Message-ID: 56FB9059.2010501 () vr-web ! de
[Download RAW message or body]

This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.


Hello Francois,

Am 30.03.2016 um 09:46 schrieb Francois Gouget:
> On Fri, 25 Mar 2016, Francois Gouget wrote:
>
> On Fri, 25 Mar 2016, Bernhard Übelacker wrote:
> [...]
>> one point that could be related is the usage of function local static
>> variables. When all of these got the "static" removed, I do not get the
>> failures anymore. However I could not prove this with testbot as an empty
>> patch did also succeed.
>
> I have not found static directives that I could remove to fix the
> dinput8 failures. Which test did it make a difference for? Could you
> send a diff?
>
> All I could find to fix this is to add 'CFLAGS = -d -O0' in the test's
> Makefile.in but that does seem like a nice workaround :-(

I attached a diff to this mail or see
https://testbot.winehq.org/JobDetails.pl?Key=21671

In my tests it started to fail in a vm when just one of these "statics" 
was left.

Kind regards,
Bernhard


["0001-Removing-static-from-local-variables-made-the-test-s.patch" (text/x-patch)]

From e0305abcb9ded6de1544aac97e8be43ea1757dfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard Übelacker?= <bernhardu@vr-web.de>
Date: Fri, 25 Mar 2016 03:50:08 +0100
Subject: =?UTF-8?q?Removing static from local variables made t? =?UTF-8?q?he test \
succeed with local built crosstest in a? =?UTF-8?q? Windows VM.?Reply-To: wine-devel \
<wine-devel@winehq.org>

---
 dlls/dinput8/tests/dinput.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c
index 57f5505..7b6c370 100644
--- a/dlls/dinput8/tests/dinput.c
+++ b/dlls/dinput8/tests/dinput.c
@@ -36,7 +36,7 @@ static BOOL CALLBACK dummy_callback(const DIDEVICEINSTANCEA \
*instance, void *con

 static void test_preinitialization(void)
 {
-    static const struct
+    const struct
     {
         REFGUID rguid;
         BOOL pdev;
@@ -51,7 +51,7 @@ static void test_preinitialization(void)
         {&GUID_SysMouse, TRUE, DIERR_NOTINITIALIZED},
     };

-    static const struct
+    const struct
     {
         DWORD dwDevType;
         LPDIENUMDEVICESCALLBACKA lpCallback;
@@ -134,7 +134,7 @@ static void test_preinitialization(void)

 static void test_DirectInput8Create(void)
 {
-    static const struct
+    const struct
     {
         BOOL hinst;
         DWORD dwVersion;
@@ -176,7 +176,7 @@ static void test_DirectInput8Create(void)
         {TRUE,  DIRECTINPUT_VERSION + 1, &IID_IDirectInput8A, TRUE,  \
DIERR_OLDDIRECTINPUTVERSION},  };

-    static REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
+    REFIID no_interface_list[] = {&IID_IDirectInputA, &IID_IDirectInputW,
                                          &IID_IDirectInput2A, &IID_IDirectInput2W,
                                          &IID_IDirectInput7A, &IID_IDirectInput7W,
                                          &IID_IDirectInputDeviceA, \
&IID_IDirectInputDeviceW, @@ -185,7 +185,7 @@ static void \
                test_DirectInput8Create(void)
                                          &IID_IDirectInputDevice8A, \
&IID_IDirectInputDevice8W,  &IID_IDirectInputEffect};

-    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, \
&IID_IDirectInput8W}; +    REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, \
&IID_IDirectInput8W};

     int i;
     IUnknown *pUnk;
@@ -225,9 +225,9 @@ static void test_DirectInput8Create(void)

 static void test_QueryInterface(void)
 {
-    static REFIID iid_list[] = {&IID_IUnknown, &IID_IDirectInput8A, \
&IID_IDirectInput8W, &IID_IDirectInputJoyConfig8}; +    REFIID iid_list[] = \
{&IID_IUnknown, &IID_IDirectInput8A, &IID_IDirectInput8W, \
&IID_IDirectInputJoyConfig8};

-    static const struct
+    const struct
     {
         REFIID riid;
         int test_todo;
--
2.1.4


[Attachment #4 (text/plain)]




[prev in list] [next in list] [prev in thread] [next in thread]