Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
f3e9a1b7
Commit
f3e9a1b7
authored
Nov 16, 2022
by
Alex Henrie
Committed by
Alexandre Julliard
Nov 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dinput/tests: Get rid of pDirectInputCreateEx.
DirectInputCreateEx is available on all versions of Windows since XP at least.
parent
eeecf6f0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
14 deletions
+5
-14
dinput.c
dlls/dinput/tests/dinput.c
+5
-11
dinput_test.h
dlls/dinput/tests/dinput_test.h
+0
-1
hid.c
dlls/dinput/tests/hid.c
+0
-2
No files found.
dlls/dinput/tests/dinput.c
View file @
f3e9a1b7
...
...
@@ -315,14 +315,8 @@ static void test_DirectInputCreateEx( DWORD version )
HRESULT
hr
;
int
i
;
if
(
!
pDirectInputCreateEx
)
{
win_skip
(
"DirectInputCreateEx is not available
\n
"
);
return
;
}
unknown
=
(
void
*
)
0xdeadbeef
;
hr
=
p
DirectInputCreateEx
(
instance
,
version
,
&
IID_IDirectInputW
,
(
void
**
)
&
unknown
,
&
outer
);
hr
=
DirectInputCreateEx
(
instance
,
version
,
&
IID_IDirectInputW
,
(
void
**
)
&
unknown
,
&
outer
);
ok
(
hr
==
DI_OK
,
"DirectInputCreateW returned %#lx
\n
"
,
hr
);
ok
(
unknown
==
NULL
,
"got IUnknown %p
\n
"
,
unknown
);
...
...
@@ -330,8 +324,8 @@ static void test_DirectInputCreateEx( DWORD version )
{
winetest_push_context
(
"%u"
,
i
);
unknown
=
(
void
*
)
0xdeadbeef
;
hr
=
p
DirectInputCreateEx
(
create_tests
[
i
].
instance
,
create_tests
[
i
].
version
,
create_tests
[
i
].
iid
,
(
void
**
)
create_tests
[
i
].
out
,
NULL
);
hr
=
DirectInputCreateEx
(
create_tests
[
i
].
instance
,
create_tests
[
i
].
version
,
create_tests
[
i
].
iid
,
(
void
**
)
create_tests
[
i
].
out
,
NULL
);
todo_wine_if
(
version
==
0x300
&&
i
==
7
)
ok
(
hr
==
create_tests
[
i
].
expected_hr
,
"DirectInputCreateEx returned %#lx
\n
"
,
hr
);
if
(
SUCCEEDED
(
hr
))
IUnknown_Release
(
unknown
);
...
...
@@ -343,7 +337,7 @@ static void test_DirectInputCreateEx( DWORD version )
{
winetest_push_context
(
"%u"
,
i
);
unknown
=
(
void
*
)
0xdeadbeef
;
hr
=
p
DirectInputCreateEx
(
instance
,
version
,
dinput8_interfaces
[
i
],
(
void
**
)
&
unknown
,
NULL
);
hr
=
DirectInputCreateEx
(
instance
,
version
,
dinput8_interfaces
[
i
],
(
void
**
)
&
unknown
,
NULL
);
ok
(
hr
==
DIERR_NOINTERFACE
,
"DirectInputCreateEx returned %#lx
\n
"
,
hr
);
ok
(
unknown
==
(
void
*
)
0xdeadbeef
,
"got IUnknown %p
\n
"
,
unknown
);
winetest_pop_context
();
...
...
@@ -353,7 +347,7 @@ static void test_DirectInputCreateEx( DWORD version )
{
winetest_push_context
(
"%u"
,
i
);
unknown
=
NULL
;
hr
=
p
DirectInputCreateEx
(
instance
,
version
,
dinput7_interfaces
[
i
],
(
void
**
)
&
unknown
,
NULL
);
hr
=
DirectInputCreateEx
(
instance
,
version
,
dinput7_interfaces
[
i
],
(
void
**
)
&
unknown
,
NULL
);
if
(
version
<
0x800
)
ok
(
hr
==
DI_OK
,
"DirectInputCreateEx returned %#lx
\n
"
,
hr
);
else
ok
(
hr
==
DIERR_OLDDIRECTINPUTVERSION
,
"DirectInputCreateEx returned %#lx
\n
"
,
hr
);
if
(
version
<
0x800
)
ok
(
unknown
!=
NULL
,
"got IUnknown NULL
\n
"
);
...
...
dlls/dinput/tests/dinput_test.h
View file @
f3e9a1b7
...
...
@@ -50,7 +50,6 @@ extern const GUID expect_guid_product;
extern
const
WCHAR
expect_path
[];
extern
const
WCHAR
expect_path_end
[];
extern
typeof
(
DirectInputCreateEx
)
*
pDirectInputCreateEx
;
extern
HANDLE
device_added
,
device_removed
;
extern
HINSTANCE
instance
;
extern
BOOL
localized
;
/* object names get translated */
...
...
dlls/dinput/tests/hid.c
View file @
f3e9a1b7
...
...
@@ -60,7 +60,6 @@
#include "dinput_test.h"
typeof
(
DirectInputCreateEx
)
*
pDirectInputCreateEx
;
HINSTANCE
instance
;
BOOL
localized
;
/* object names get translated */
...
...
@@ -3483,7 +3482,6 @@ void dinput_test_init_( const char *file, int line )
instance
=
GetModuleHandleW
(
NULL
);
localized
=
GetUserDefaultLCID
()
!=
MAKELANGID
(
LANG_ENGLISH
,
SUBLANG_DEFAULT
);
pSignerSign
=
(
void
*
)
GetProcAddress
(
LoadLibraryW
(
L"mssign32"
),
"SignerSign"
);
pDirectInputCreateEx
=
(
void
*
)
GetProcAddress
(
LoadLibraryW
(
L"dinput.dll"
),
"DirectInputCreateEx"
);
if
(
IsWow64Process
(
GetCurrentProcess
(),
&
is_wow64
)
&&
is_wow64
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment