Re: dinput/tests: Initial tests for Action Mapping. Added some tests for the creation of a DirectInput8 Interface and a dummy call of EnumDevicesBySemantics.
On Sun, Apr 24, 2011 at 18:12, Lucas Fialho Zawacki <lfzawacki(a)gmail.com> wrote: Howdy Lucas,
+ hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1, &IID_IDirectInput8A, (LPVOID*)&pDI); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + skip("ActionMapping requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8 Create failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput8_Initialize(pDI,hinst, 0x0800 /* DirectInput8 */ ); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + skip("ActionMapping requires dinput8\n"); + return; + }
You probably should use win_skip here, Wine shouldn't have missing dinput8 support. Cheers, Austin
On 04/25/2011 05:14 PM, Austin English wrote:
On Sun, Apr 24, 2011 at 18:12, Lucas Fialho Zawacki<lfzawacki(a)gmail.com> wrote:
Howdy Lucas,
+ hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1,&IID_IDirectInput8A, (LPVOID*)&pDI); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + skip("ActionMapping requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8 Create failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput8_Initialize(pDI,hinst, 0x0800 /* DirectInput8 */ ); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + skip("ActionMapping requires dinput8\n"); + return; + }
You probably should use win_skip here, Wine shouldn't have missing dinput8 support.
IMHO these tests should go into dinput8 not dinput if they are testing dinput8 functionality. Vitaliy.
Good point. I'll create the dinput8 tests and move those there. 2011/4/26 Vitaliy Margolen <wine-devel(a)kievinfo.com>:
On 04/25/2011 05:14 PM, Austin English wrote:
On Sun, Apr 24, 2011 at 18:12, Lucas Fialho Zawacki<lfzawacki(a)gmail.com> wrote:
Howdy Lucas,
+ hr = CoCreateInstance(&CLSID_DirectInput8, 0, 1,&IID_IDirectInput8A, (LPVOID*)&pDI); + if (hr == DIERR_OLDDIRECTINPUTVERSION || + hr == DIERR_BETADIRECTINPUTVERSION || + hr == REGDB_E_CLASSNOTREG) + { + skip("ActionMapping requires dinput8\n"); + return; + } + ok(SUCCEEDED(hr), "DirectInput8 Create failed: hr=%08x\n", hr); + if (FAILED(hr)) return; + + hr = IDirectInput8_Initialize(pDI,hinst, 0x0800 /* DirectInput8 */ ); + if (hr == DIERR_OLDDIRECTINPUTVERSION || hr == DIERR_BETADIRECTINPUTVERSION) + { + skip("ActionMapping requires dinput8\n"); + return; + }
You probably should use win_skip here, Wine shouldn't have missing dinput8 support.
IMHO these tests should go into dinput8 not dinput if they are testing dinput8 functionality.
Vitaliy.
-- http://www.twitter.com/lfzawacki http://www.linesocode.wordpress.com
participants (3)
-
Austin English -
Lucas Zawacki -
Vitaliy Margolen