Skip to content

Commit 757e638

Browse files
roossienbroossienb
authored
[GEN][ZH] Fix compile warnings from implicit unsigned long to HRESULT conversions in Win32DIKeyboard (#807)
1 parent ef93f8e commit 757e638

File tree

2 files changed

+62
-62
lines changed

2 files changed

+62
-62
lines changed

‎Generals/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -49,37 +49,37 @@ struct ErrorLookup
4949
};
5050
static ErrorLookup errorLookup[] =
5151
{
52-
{ DIERR_ACQUIRED, "DIERR_ACQUIRED" },
53-
{ DIERR_ALREADYINITIALIZED, "DIERR_ALREADYINITIALIZED" },
54-
{ DIERR_BADDRIVERVER, "DIERR_BADDRIVERVER" },
55-
{ DIERR_BETADIRECTINPUTVERSION, "DIERR_BETADIRECTINPUTVERSION" },
56-
{ DIERR_DEVICEFULL, "DIERR_DEVICEFULL" },
57-
{ DIERR_DEVICENOTREG, "DIERR_DEVICENOTREG" },
58-
{ DIERR_EFFECTPLAYING, "DIERR_EFFECTPLAYING" },
59-
{ DIERR_GENERIC, "DIERR_GENERIC" },
60-
{ DIERR_HANDLEEXISTS, "DIERR_HANDLEEXISTS" },
61-
{ DIERR_HASEFFECTS, "DIERR_HASEFFECTS" },
62-
{ DIERR_INCOMPLETEEFFECT, "DIERR_INCOMPLETEEFFECT" },
63-
{ DIERR_INPUTLOST, "DIERR_INPUTLOST" },
64-
{ DIERR_INVALIDPARAM, "DIERR_INVALIDPARAM" },
65-
{ DIERR_MAPFILEFAIL, "DIERR_MAPFILEFAIL" },
66-
{ DIERR_MOREDATA, "DIERR_MOREDATA" },
67-
{ DIERR_NOAGGREGATION, "DIERR_NOAGGREGATION" },
68-
{ DIERR_NOINTERFACE, "DIERR_NOINTERFACE" },
69-
{ DIERR_NOTACQUIRED, "DIERR_NOTACQUIRED" },
70-
{ DIERR_NOTBUFFERED, "DIERR_NOTBUFFERED" },
71-
{ DIERR_NOTDOWNLOADED, "DIERR_NOTDOWNLOADED" },
72-
{ DIERR_NOTEXCLUSIVEACQUIRED, "DIERR_NOTEXCLUSIVEACQUIRED" },
73-
{ DIERR_NOTFOUND, "DIERR_NOTFOUND" },
74-
{ DIERR_NOTINITIALIZED, "DIERR_NOTINITIALIZED" },
75-
{ DIERR_OBJECTNOTFOUND, "DIERR_OBJECTNOTFOUND" },
76-
{ DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" },
77-
{ DIERR_OTHERAPPHASPRIO, "DIERR_OTHERAPPHASPRIO" },
78-
{ DIERR_OUTOFMEMORY, "DIERR_OUTOFMEMORY" },
79-
{ DIERR_READONLY, "DIERR_READONLY" },
80-
{ DIERR_REPORTFULL, "DIERR_REPORTFULL" },
81-
{ DIERR_UNPLUGGED, "DIERR_UNPLUGGED" },
82-
{ DIERR_UNSUPPORTED, "DIERR_UNSUPPORTED" },
52+
{ (HRESULT)DIERR_ACQUIRED, "DIERR_ACQUIRED" },
53+
{ (HRESULT)DIERR_ALREADYINITIALIZED, "DIERR_ALREADYINITIALIZED" },
54+
{ (HRESULT)DIERR_BADDRIVERVER, "DIERR_BADDRIVERVER" },
55+
{ (HRESULT)DIERR_BETADIRECTINPUTVERSION, "DIERR_BETADIRECTINPUTVERSION" },
56+
{ (HRESULT)DIERR_DEVICEFULL, "DIERR_DEVICEFULL" },
57+
{ (HRESULT)DIERR_DEVICENOTREG, "DIERR_DEVICENOTREG" },
58+
{ (HRESULT)DIERR_EFFECTPLAYING, "DIERR_EFFECTPLAYING" },
59+
{ (HRESULT)DIERR_GENERIC, "DIERR_GENERIC" },
60+
{ (HRESULT)DIERR_HANDLEEXISTS, "DIERR_HANDLEEXISTS" },
61+
{ (HRESULT)DIERR_HASEFFECTS, "DIERR_HASEFFECTS" },
62+
{ (HRESULT)DIERR_INCOMPLETEEFFECT, "DIERR_INCOMPLETEEFFECT" },
63+
{ (HRESULT)DIERR_INPUTLOST, "DIERR_INPUTLOST" },
64+
{ (HRESULT)DIERR_INVALIDPARAM, "DIERR_INVALIDPARAM" },
65+
{ (HRESULT)DIERR_MAPFILEFAIL, "DIERR_MAPFILEFAIL" },
66+
{ (HRESULT)DIERR_MOREDATA, "DIERR_MOREDATA" },
67+
{ (HRESULT)DIERR_NOAGGREGATION, "DIERR_NOAGGREGATION" },
68+
{ (HRESULT)DIERR_NOINTERFACE, "DIERR_NOINTERFACE" },
69+
{ (HRESULT)DIERR_NOTACQUIRED, "DIERR_NOTACQUIRED" },
70+
{ (HRESULT)DIERR_NOTBUFFERED, "DIERR_NOTBUFFERED" },
71+
{ (HRESULT)DIERR_NOTDOWNLOADED, "DIERR_NOTDOWNLOADED" },
72+
{ (HRESULT)DIERR_NOTEXCLUSIVEACQUIRED, "DIERR_NOTEXCLUSIVEACQUIRED" },
73+
{ (HRESULT)DIERR_NOTFOUND, "DIERR_NOTFOUND" },
74+
{ (HRESULT)DIERR_NOTINITIALIZED, "DIERR_NOTINITIALIZED" },
75+
{ (HRESULT)DIERR_OBJECTNOTFOUND, "DIERR_OBJECTNOTFOUND" },
76+
{ (HRESULT)DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" },
77+
{ (HRESULT)DIERR_OTHERAPPHASPRIO, "DIERR_OTHERAPPHASPRIO" },
78+
{ (HRESULT)DIERR_OUTOFMEMORY, "DIERR_OUTOFMEMORY" },
79+
{ (HRESULT)DIERR_READONLY, "DIERR_READONLY" },
80+
{ (HRESULT)DIERR_REPORTFULL, "DIERR_REPORTFULL" },
81+
{ (HRESULT)DIERR_UNPLUGGED, "DIERR_UNPLUGGED" },
82+
{ (HRESULT)DIERR_UNSUPPORTED, "DIERR_UNSUPPORTED" },
8383
{ 0, NULL }
8484
};
8585

‎GeneralsMD/Code/GameEngineDevice/Source/Win32Device/GameClient/Win32DIKeyboard.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -49,37 +49,37 @@ struct ErrorLookup
4949
};
5050
static ErrorLookup errorLookup[] =
5151
{
52-
{ DIERR_ACQUIRED, "DIERR_ACQUIRED" },
53-
{ DIERR_ALREADYINITIALIZED, "DIERR_ALREADYINITIALIZED" },
54-
{ DIERR_BADDRIVERVER, "DIERR_BADDRIVERVER" },
55-
{ DIERR_BETADIRECTINPUTVERSION, "DIERR_BETADIRECTINPUTVERSION" },
56-
{ DIERR_DEVICEFULL, "DIERR_DEVICEFULL" },
57-
{ DIERR_DEVICENOTREG, "DIERR_DEVICENOTREG" },
58-
{ DIERR_EFFECTPLAYING, "DIERR_EFFECTPLAYING" },
59-
{ DIERR_GENERIC, "DIERR_GENERIC" },
60-
{ DIERR_HANDLEEXISTS, "DIERR_HANDLEEXISTS" },
61-
{ DIERR_HASEFFECTS, "DIERR_HASEFFECTS" },
62-
{ DIERR_INCOMPLETEEFFECT, "DIERR_INCOMPLETEEFFECT" },
63-
{ DIERR_INPUTLOST, "DIERR_INPUTLOST" },
64-
{ DIERR_INVALIDPARAM, "DIERR_INVALIDPARAM" },
65-
{ DIERR_MAPFILEFAIL, "DIERR_MAPFILEFAIL" },
66-
{ DIERR_MOREDATA, "DIERR_MOREDATA" },
67-
{ DIERR_NOAGGREGATION, "DIERR_NOAGGREGATION" },
68-
{ DIERR_NOINTERFACE, "DIERR_NOINTERFACE" },
69-
{ DIERR_NOTACQUIRED, "DIERR_NOTACQUIRED" },
70-
{ DIERR_NOTBUFFERED, "DIERR_NOTBUFFERED" },
71-
{ DIERR_NOTDOWNLOADED, "DIERR_NOTDOWNLOADED" },
72-
{ DIERR_NOTEXCLUSIVEACQUIRED, "DIERR_NOTEXCLUSIVEACQUIRED" },
73-
{ DIERR_NOTFOUND, "DIERR_NOTFOUND" },
74-
{ DIERR_NOTINITIALIZED, "DIERR_NOTINITIALIZED" },
75-
{ DIERR_OBJECTNOTFOUND, "DIERR_OBJECTNOTFOUND" },
76-
{ DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" },
77-
{ DIERR_OTHERAPPHASPRIO, "DIERR_OTHERAPPHASPRIO" },
78-
{ DIERR_OUTOFMEMORY, "DIERR_OUTOFMEMORY" },
79-
{ DIERR_READONLY, "DIERR_READONLY" },
80-
{ DIERR_REPORTFULL, "DIERR_REPORTFULL" },
81-
{ DIERR_UNPLUGGED, "DIERR_UNPLUGGED" },
82-
{ DIERR_UNSUPPORTED, "DIERR_UNSUPPORTED" },
52+
{ (HRESULT)DIERR_ACQUIRED, "DIERR_ACQUIRED" },
53+
{ (HRESULT)DIERR_ALREADYINITIALIZED, "DIERR_ALREADYINITIALIZED" },
54+
{ (HRESULT)DIERR_BADDRIVERVER, "DIERR_BADDRIVERVER" },
55+
{ (HRESULT)DIERR_BETADIRECTINPUTVERSION, "DIERR_BETADIRECTINPUTVERSION" },
56+
{ (HRESULT)DIERR_DEVICEFULL, "DIERR_DEVICEFULL" },
57+
{ (HRESULT)DIERR_DEVICENOTREG, "DIERR_DEVICENOTREG" },
58+
{ (HRESULT)DIERR_EFFECTPLAYING, "DIERR_EFFECTPLAYING" },
59+
{ (HRESULT)DIERR_GENERIC, "DIERR_GENERIC" },
60+
{ (HRESULT)DIERR_HANDLEEXISTS, "DIERR_HANDLEEXISTS" },
61+
{ (HRESULT)DIERR_HASEFFECTS, "DIERR_HASEFFECTS" },
62+
{ (HRESULT)DIERR_INCOMPLETEEFFECT, "DIERR_INCOMPLETEEFFECT" },
63+
{ (HRESULT)DIERR_INPUTLOST, "DIERR_INPUTLOST" },
64+
{ (HRESULT)DIERR_INVALIDPARAM, "DIERR_INVALIDPARAM" },
65+
{ (HRESULT)DIERR_MAPFILEFAIL, "DIERR_MAPFILEFAIL" },
66+
{ (HRESULT)DIERR_MOREDATA, "DIERR_MOREDATA" },
67+
{ (HRESULT)DIERR_NOAGGREGATION, "DIERR_NOAGGREGATION" },
68+
{ (HRESULT)DIERR_NOINTERFACE, "DIERR_NOINTERFACE" },
69+
{ (HRESULT)DIERR_NOTACQUIRED, "DIERR_NOTACQUIRED" },
70+
{ (HRESULT)DIERR_NOTBUFFERED, "DIERR_NOTBUFFERED" },
71+
{ (HRESULT)DIERR_NOTDOWNLOADED, "DIERR_NOTDOWNLOADED" },
72+
{ (HRESULT)DIERR_NOTEXCLUSIVEACQUIRED, "DIERR_NOTEXCLUSIVEACQUIRED" },
73+
{ (HRESULT)DIERR_NOTFOUND, "DIERR_NOTFOUND" },
74+
{ (HRESULT)DIERR_NOTINITIALIZED, "DIERR_NOTINITIALIZED" },
75+
{ (HRESULT)DIERR_OBJECTNOTFOUND, "DIERR_OBJECTNOTFOUND" },
76+
{ (HRESULT)DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" },
77+
{ (HRESULT)DIERR_OTHERAPPHASPRIO, "DIERR_OTHERAPPHASPRIO" },
78+
{ (HRESULT)DIERR_OUTOFMEMORY, "DIERR_OUTOFMEMORY" },
79+
{ (HRESULT)DIERR_READONLY, "DIERR_READONLY" },
80+
{ (HRESULT)DIERR_REPORTFULL, "DIERR_REPORTFULL" },
81+
{ (HRESULT)DIERR_UNPLUGGED, "DIERR_UNPLUGGED" },
82+
{ (HRESULT)DIERR_UNSUPPORTED, "DIERR_UNSUPPORTED" },
8383
{ 0, NULL }
8484
};
8585

0 commit comments

Comments
 (0)