Skip to content

Commit cf496e6

Browse files
author
Bart Roossien
committed
[ZH] Fixing warnings related to converting between long and HRESULT (TheSuperHackers#534)
1 parent 4bef11f commit cf496e6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -53,32 +53,32 @@ static ErrorLookup errorLookup[] =
5353
{ DIERR_ALREADYINITIALIZED, "DIERR_ALREADYINITIALIZED" },
5454
{ DIERR_BADDRIVERVER, "DIERR_BADDRIVERVER" },
5555
{ DIERR_BETADIRECTINPUTVERSION, "DIERR_BETADIRECTINPUTVERSION" },
56-
{ DIERR_DEVICEFULL, "DIERR_DEVICEFULL" },
56+
{ static_cast<HRESULT>(DIERR_DEVICEFULL), "DIERR_DEVICEFULL" },
5757
{ DIERR_DEVICENOTREG, "DIERR_DEVICENOTREG" },
58-
{ DIERR_EFFECTPLAYING, "DIERR_EFFECTPLAYING" },
58+
{ static_cast<HRESULT>(DIERR_EFFECTPLAYING), "DIERR_EFFECTPLAYING" },
5959
{ DIERR_GENERIC, "DIERR_GENERIC" },
6060
{ DIERR_HANDLEEXISTS, "DIERR_HANDLEEXISTS" },
61-
{ DIERR_HASEFFECTS, "DIERR_HASEFFECTS" },
62-
{ DIERR_INCOMPLETEEFFECT, "DIERR_INCOMPLETEEFFECT" },
61+
{ static_cast<HRESULT>(DIERR_HASEFFECTS), "DIERR_HASEFFECTS" },
62+
{ static_cast<HRESULT>(DIERR_INCOMPLETEEFFECT), "DIERR_INCOMPLETEEFFECT" },
6363
{ DIERR_INPUTLOST, "DIERR_INPUTLOST" },
6464
{ DIERR_INVALIDPARAM, "DIERR_INVALIDPARAM" },
65-
{ DIERR_MAPFILEFAIL, "DIERR_MAPFILEFAIL" },
66-
{ DIERR_MOREDATA, "DIERR_MOREDATA" },
65+
{ static_cast<HRESULT>(DIERR_MAPFILEFAIL), "DIERR_MAPFILEFAIL" },
66+
{ static_cast<HRESULT>(DIERR_MOREDATA), "DIERR_MOREDATA" },
6767
{ DIERR_NOAGGREGATION, "DIERR_NOAGGREGATION" },
6868
{ DIERR_NOINTERFACE, "DIERR_NOINTERFACE" },
6969
{ DIERR_NOTACQUIRED, "DIERR_NOTACQUIRED" },
70-
{ DIERR_NOTBUFFERED, "DIERR_NOTBUFFERED" },
71-
{ DIERR_NOTDOWNLOADED, "DIERR_NOTDOWNLOADED" },
72-
{ DIERR_NOTEXCLUSIVEACQUIRED, "DIERR_NOTEXCLUSIVEACQUIRED" },
70+
{ static_cast<HRESULT>(DIERR_NOTBUFFERED), "DIERR_NOTBUFFERED" },
71+
{ static_cast<HRESULT>(DIERR_NOTDOWNLOADED), "DIERR_NOTDOWNLOADED" },
72+
{ static_cast<HRESULT>(DIERR_NOTEXCLUSIVEACQUIRED), "DIERR_NOTEXCLUSIVEACQUIRED" },
7373
{ DIERR_NOTFOUND, "DIERR_NOTFOUND" },
7474
{ DIERR_NOTINITIALIZED, "DIERR_NOTINITIALIZED" },
7575
{ DIERR_OBJECTNOTFOUND, "DIERR_OBJECTNOTFOUND" },
7676
{ DIERR_OLDDIRECTINPUTVERSION, "DIERR_OLDDIRECTINPUTVERSION" },
7777
{ DIERR_OTHERAPPHASPRIO, "DIERR_OTHERAPPHASPRIO" },
7878
{ DIERR_OUTOFMEMORY, "DIERR_OUTOFMEMORY" },
7979
{ DIERR_READONLY, "DIERR_READONLY" },
80-
{ DIERR_REPORTFULL, "DIERR_REPORTFULL" },
81-
{ DIERR_UNPLUGGED, "DIERR_UNPLUGGED" },
80+
{ static_cast<HRESULT>(DIERR_REPORTFULL), "DIERR_REPORTFULL" },
81+
{ static_cast<HRESULT>(DIERR_UNPLUGGED), "DIERR_UNPLUGGED" },
8282
{ DIERR_UNSUPPORTED, "DIERR_UNSUPPORTED" },
8383
{ 0, NULL }
8484
};

0 commit comments

Comments
 (0)