Dasko/snes9x
Dasko/snes9x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32: Fix compilation errors with VS/Clang.

Browse Source
This commit is contained in:
BearOso 2023-03-10 14:32:10 -06:00
parent cd57135d9a
commit b4b2007529
3 changed files with 152 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
win32/_tfwopen.h
View File

@ -97,13 +97,6 @@ public:
int _Prot = (int)ios_base::_Openprot)
: std::ifstream(_Filename,_Mode,_Prot) {}
#ifdef _NATIVE_WCHAR_T_DEFINED
explicit __CLR_OR_THIS_CALL u8nifstream(const unsigned short *_Filename,
ios_base::openmode _Mode = ios_base::in,
int _Prot = (int)ios_base::_Openprot)
: std::ifstream(_Filename,_Mode,_Prot) {}
#endif /* _NATIVE_WCHAR_T_DEFINED */
explicit __CLR_OR_THIS_CALL u8nifstream(FILE *_File)
: std::ifstream(_File) {}
};

292
win32/dxerr.cpp
View File

@ -65,11 +65,11 @@
//--------------------------------------------------------------------------------------
#define CHK_ERR(hrchk, strOut) \
case hrchk: \
case static_cast<HRESULT>(hrchk): \
return L##strOut;
#define CHK_ERRA(hrchk) \
case hrchk: \
case static_cast<HRESULT>(hrchk): \
return L#hrchk;
#define HRESULT_FROM_WIN32b(x) ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)))
@ -170,35 +170,35 @@ const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr )
CHK_ERRA(DV_E_DVASPECT)
CHK_ERRA(DV_E_DVTARGETDEVICE_SIZE)
CHK_ERRA(DV_E_NOIVIEWOBJECT)
CHK_ERRA(DRAGDROP_E_FIRST)
CHK_ERRA(DRAGDROP_E_LAST)
CHK_ERRA(DRAGDROP_S_FIRST)
CHK_ERRA(DRAGDROP_S_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(DRAGDROP_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(DRAGDROP_E_LAST))
CHK_ERRA(_HRESULT_TYPEDEF_(DRAGDROP_S_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(DRAGDROP_S_LAST))
// CHK_ERRA(DRAGDROP_E_NOTREGISTERED)
CHK_ERRA(DRAGDROP_E_ALREADYREGISTERED)
CHK_ERRA(DRAGDROP_E_INVALIDHWND)
CHK_ERRA(CLASSFACTORY_E_FIRST)
CHK_ERRA(CLASSFACTORY_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CLASSFACTORY_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CLASSFACTORY_E_LAST))
CHK_ERRA(CLASSFACTORY_S_FIRST)
CHK_ERRA(CLASSFACTORY_S_LAST)
// CHK_ERRA(CLASS_E_NOAGGREGATION)
CHK_ERRA(CLASS_E_CLASSNOTAVAILABLE)
CHK_ERRA(CLASS_E_NOTLICENSED)
CHK_ERRA(MARSHAL_E_FIRST)
CHK_ERRA(MARSHAL_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(MARSHAL_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(MARSHAL_E_LAST))
CHK_ERRA(MARSHAL_S_FIRST)
CHK_ERRA(MARSHAL_S_LAST)
CHK_ERRA(DATA_E_FIRST)
CHK_ERRA(DATA_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(DATA_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(DATA_E_LAST))
CHK_ERRA(DATA_S_FIRST)
CHK_ERRA(DATA_S_LAST)
CHK_ERRA(VIEW_E_FIRST)
CHK_ERRA(VIEW_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(VIEW_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(VIEW_E_LAST))
CHK_ERRA(VIEW_S_FIRST)
CHK_ERRA(VIEW_S_LAST)
// CHK_ERRA(VIEW_E_DRAW)
CHK_ERRA(REGDB_E_FIRST)
CHK_ERRA(REGDB_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(REGDB_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(REGDB_E_LAST))
CHK_ERRA(REGDB_S_FIRST)
CHK_ERRA(REGDB_S_LAST)
// CHK_ERRA(REGDB_E_READREGDB)
@ -207,12 +207,12 @@ const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr )
CHK_ERRA(REGDB_E_INVALIDVALUE)
CHK_ERRA(REGDB_E_CLASSNOTREG)
CHK_ERRA(REGDB_E_IIDNOTREG)
CHK_ERRA(CAT_E_FIRST)
CHK_ERRA(CAT_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CAT_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CAT_E_LAST))
// CHK_ERRA(CAT_E_CATIDNOEXIST)
// CHK_ERRA(CAT_E_NODESCRIPTION)
CHK_ERRA(CS_E_FIRST)
CHK_ERRA(CS_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CS_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CS_E_LAST))
// CHK_ERRA(CS_E_PACKAGE_NOTFOUND)
CHK_ERRA(CS_E_NOT_DELETABLE)
CHK_ERRA(CS_E_CLASS_NOTFOUND)
@ -225,33 +225,33 @@ const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr )
CHK_ERRA(CS_E_ADMIN_LIMIT_EXCEEDED)
CHK_ERRA(CS_E_SCHEMA_MISMATCH)
// CHK_ERRA(CS_E_INTERNAL_ERROR)
CHK_ERRA(CACHE_E_FIRST)
CHK_ERRA(CACHE_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CACHE_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CACHE_E_LAST))
CHK_ERRA(CACHE_S_FIRST)
CHK_ERRA(CACHE_S_LAST)
// CHK_ERRA(CACHE_E_NOCACHE_UPDATED)
CHK_ERRA(OLEOBJ_E_FIRST)
CHK_ERRA(OLEOBJ_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(OLEOBJ_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(OLEOBJ_E_LAST))
CHK_ERRA(OLEOBJ_S_FIRST)
CHK_ERRA(OLEOBJ_S_LAST)
// CHK_ERRA(OLEOBJ_E_NOVERBS)
CHK_ERRA(OLEOBJ_E_INVALIDVERB)
CHK_ERRA(CLIENTSITE_E_FIRST)
CHK_ERRA(CLIENTSITE_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CLIENTSITE_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CLIENTSITE_E_LAST))
CHK_ERRA(CLIENTSITE_S_FIRST)
CHK_ERRA(CLIENTSITE_S_LAST)
CHK_ERRA(INPLACE_E_NOTUNDOABLE)
CHK_ERRA(INPLACE_E_NOTOOLSPACE)
// CHK_ERRA(INPLACE_E_FIRST)
CHK_ERRA(INPLACE_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(INPLACE_E_LAST))
CHK_ERRA(INPLACE_S_FIRST)
CHK_ERRA(INPLACE_S_LAST)
CHK_ERRA(ENUM_E_FIRST)
CHK_ERRA(ENUM_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(ENUM_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(ENUM_E_LAST))
CHK_ERRA(ENUM_S_FIRST)
CHK_ERRA(ENUM_S_LAST)
CHK_ERRA(CONVERT10_E_FIRST)
CHK_ERRA(CONVERT10_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CONVERT10_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CONVERT10_E_LAST))
CHK_ERRA(CONVERT10_S_FIRST)
CHK_ERRA(CONVERT10_S_LAST)
// CHK_ERRA(CONVERT10_E_OLESTREAM_GET)
@ -261,8 +261,8 @@ const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr )
CHK_ERRA(CONVERT10_E_STG_FMT)
CHK_ERRA(CONVERT10_E_STG_NO_STD_STREAM)
CHK_ERRA(CONVERT10_E_STG_DIB_TO_BITMAP)
CHK_ERRA(CLIPBRD_E_FIRST)
CHK_ERRA(CLIPBRD_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CLIPBRD_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CLIPBRD_E_LAST))
CHK_ERRA(CLIPBRD_S_FIRST)
CHK_ERRA(CLIPBRD_S_LAST)
// CHK_ERRA(CLIPBRD_E_CANT_OPEN)
@ -270,8 +270,8 @@ const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr )
CHK_ERRA(CLIPBRD_E_CANT_SET)
CHK_ERRA(CLIPBRD_E_BAD_DATA)
CHK_ERRA(CLIPBRD_E_CANT_CLOSE)
CHK_ERRA(MK_E_FIRST)
CHK_ERRA(MK_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(MK_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(MK_E_LAST))
CHK_ERRA(MK_S_FIRST)
CHK_ERRA(MK_S_LAST)
// CHK_ERRA(MK_E_CONNECTMANUALLY)
@ -3556,35 +3556,35 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
CHK_ERRA(DV_E_DVASPECT)
CHK_ERRA(DV_E_DVTARGETDEVICE_SIZE)
CHK_ERRA(DV_E_NOIVIEWOBJECT)
CHK_ERRA(DRAGDROP_E_FIRST)
CHK_ERRA(DRAGDROP_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(DRAGDROP_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(DRAGDROP_E_LAST))
CHK_ERRA(DRAGDROP_S_FIRST)
CHK_ERRA(DRAGDROP_S_LAST)
// CHK_ERRA(DRAGDROP_E_NOTREGISTERED)
CHK_ERRA(DRAGDROP_E_ALREADYREGISTERED)
CHK_ERRA(DRAGDROP_E_INVALIDHWND)
CHK_ERRA(CLASSFACTORY_E_FIRST)
CHK_ERRA(CLASSFACTORY_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CLASSFACTORY_E_LAST))
CHK_ERRA(_HRESULT_TYPEDEF_(CLASSFACTORY_E_FIRST))
CHK_ERRA(CLASSFACTORY_S_FIRST)
CHK_ERRA(CLASSFACTORY_S_LAST)
// CHK_ERRA(CLASS_E_NOAGGREGATION)
CHK_ERRA(CLASS_E_CLASSNOTAVAILABLE)
CHK_ERRA(CLASS_E_NOTLICENSED)
CHK_ERRA(MARSHAL_E_FIRST)
CHK_ERRA(MARSHAL_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(MARSHAL_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(MARSHAL_E_LAST))
CHK_ERRA(MARSHAL_S_FIRST)
CHK_ERRA(MARSHAL_S_LAST)
CHK_ERRA(DATA_E_FIRST)
CHK_ERRA(DATA_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(DATA_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(DATA_E_LAST))
CHK_ERRA(DATA_S_FIRST)
CHK_ERRA(DATA_S_LAST)
CHK_ERRA(VIEW_E_FIRST)
CHK_ERRA(VIEW_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(VIEW_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(VIEW_E_LAST))
CHK_ERRA(VIEW_S_FIRST)
CHK_ERRA(VIEW_S_LAST)
// CHK_ERRA(VIEW_E_DRAW)
CHK_ERRA(REGDB_E_FIRST)
CHK_ERRA(REGDB_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(REGDB_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(REGDB_E_LAST))
CHK_ERRA(REGDB_S_FIRST)
CHK_ERRA(REGDB_S_LAST)
// CHK_ERRA(REGDB_E_READREGDB)
@ -3593,12 +3593,12 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
CHK_ERRA(REGDB_E_INVALIDVALUE)
CHK_ERRA(REGDB_E_CLASSNOTREG)
CHK_ERRA(REGDB_E_IIDNOTREG)
CHK_ERRA(CAT_E_FIRST)
CHK_ERRA(CAT_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CAT_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CAT_E_LAST))
// CHK_ERRA(CAT_E_CATIDNOEXIST)
// CHK_ERRA(CAT_E_NODESCRIPTION)
CHK_ERRA(CS_E_FIRST)
CHK_ERRA(CS_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CS_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CS_E_LAST))
// CHK_ERRA(CS_E_PACKAGE_NOTFOUND)
CHK_ERRA(CS_E_NOT_DELETABLE)
CHK_ERRA(CS_E_CLASS_NOTFOUND)
@ -3611,33 +3611,33 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
CHK_ERRA(CS_E_ADMIN_LIMIT_EXCEEDED)
CHK_ERRA(CS_E_SCHEMA_MISMATCH)
// CHK_ERRA(CS_E_INTERNAL_ERROR)
CHK_ERRA(CACHE_E_FIRST)
CHK_ERRA(CACHE_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CACHE_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CACHE_E_LAST))
CHK_ERRA(CACHE_S_FIRST)
CHK_ERRA(CACHE_S_LAST)
// CHK_ERRA(CACHE_E_NOCACHE_UPDATED)
CHK_ERRA(OLEOBJ_E_FIRST)
CHK_ERRA(OLEOBJ_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(OLEOBJ_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(OLEOBJ_E_LAST))
CHK_ERRA(OLEOBJ_S_FIRST)
CHK_ERRA(OLEOBJ_S_LAST)
// CHK_ERRA(OLEOBJ_E_NOVERBS)
CHK_ERRA(OLEOBJ_E_INVALIDVERB)
CHK_ERRA(CLIENTSITE_E_FIRST)
CHK_ERRA(CLIENTSITE_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CLIENTSITE_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CLIENTSITE_E_LAST))
CHK_ERRA(CLIENTSITE_S_FIRST)
CHK_ERRA(CLIENTSITE_S_LAST)
CHK_ERRA(INPLACE_E_NOTUNDOABLE)
CHK_ERRA(INPLACE_E_NOTOOLSPACE)
// CHK_ERRA(INPLACE_E_FIRST)
CHK_ERRA(INPLACE_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(INPLACE_E_LAST))
CHK_ERRA(INPLACE_S_FIRST)
CHK_ERRA(INPLACE_S_LAST)
CHK_ERRA(ENUM_E_FIRST)
CHK_ERRA(ENUM_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(ENUM_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(ENUM_E_LAST))
CHK_ERRA(ENUM_S_FIRST)
CHK_ERRA(ENUM_S_LAST)
CHK_ERRA(CONVERT10_E_FIRST)
CHK_ERRA(CONVERT10_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CONVERT10_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CONVERT10_E_LAST))
CHK_ERRA(CONVERT10_S_FIRST)
CHK_ERRA(CONVERT10_S_LAST)
// CHK_ERRA(CONVERT10_E_OLESTREAM_GET)
@ -3647,8 +3647,8 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
CHK_ERRA(CONVERT10_E_STG_FMT)
CHK_ERRA(CONVERT10_E_STG_NO_STD_STREAM)
CHK_ERRA(CONVERT10_E_STG_DIB_TO_BITMAP)
CHK_ERRA(CLIPBRD_E_FIRST)
CHK_ERRA(CLIPBRD_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CLIPBRD_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CLIPBRD_E_LAST))
CHK_ERRA(CLIPBRD_S_FIRST)
CHK_ERRA(CLIPBRD_S_LAST)
// CHK_ERRA(CLIPBRD_E_CANT_OPEN)
@ -3656,8 +3656,8 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
CHK_ERRA(CLIPBRD_E_CANT_SET)
CHK_ERRA(CLIPBRD_E_BAD_DATA)
CHK_ERRA(CLIPBRD_E_CANT_CLOSE)
CHK_ERRA(MK_E_FIRST)
CHK_ERRA(MK_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(MK_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(MK_E_LAST))
CHK_ERRA(MK_S_FIRST)
CHK_ERRA(MK_S_LAST)
// CHK_ERRA(MK_E_CONNECTMANUALLY)
@ -5518,8 +5518,8 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
// CHK_ERRA(EVENT_E_CANT_MODIFY_OR_DELETE_CONFIGURED_OBJECT)
// CHK_ERRA(EVENT_E_INVALID_EVENT_CLASS_PARTITION)
// CHK_ERRA(EVENT_E_PER_USER_SID_NOT_LOGGED_ON)
CHK_ERRA(CONTEXT_E_FIRST)
CHK_ERRA(CONTEXT_E_LAST)
CHK_ERRA(_HRESULT_TYPEDEF_(CONTEXT_E_FIRST))
CHK_ERRA(_HRESULT_TYPEDEF_(CONTEXT_E_LAST))
CHK_ERRA(CONTEXT_S_FIRST)
CHK_ERRA(CONTEXT_S_LAST)
CHK_ERRA(CONTEXT_E_ABORTED)
@ -6538,18 +6538,18 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
// CHK_ERRA(DI_TRUNCATED)
// CHK_ERRA(DI_TRUNCATEDANDRESTARTED)
// CHK_ERRA(DI_WRITEPROTECT)
CHK_ERR(DIERR_INSUFFICIENTPRIVS, "DIERR_INSUFFICIENTPRIVS & VFW_E_INVALIDMEDIATYPE")
CHK_ERR(DIERR_DEVICEFULL, "DIERR_DEVICEFULL & VFW_E_INVALIDSUBTYPE & DMO_E_INVALIDSTREAMINDEX")
CHK_ERR(DIERR_MOREDATA, "DIERR_MOREDATA & VFW_E_NEED_OWNER & DMO_E_INVALIDTYPE")
CHK_ERR(DIERR_NOTDOWNLOADED, "DIERR_NOTDOWNLOADED & VFW_E_ENUM_OUT_OF_SYNC & DMO_E_TYPE_NOT_SET")
CHK_ERR(DIERR_HASEFFECTS, "DIERR_HASEFFECTS & VFW_E_ALREADY_CONNECTED & DMO_E_NOTACCEPTING")
CHK_ERR(DIERR_NOTEXCLUSIVEACQUIRED, "DIERR_NOTEXCLUSIVEACQUIRED & VFW_E_FILTER_ACTIVE & DMO_E_TYPE_NOT_ACCEPTED")
CHK_ERR(DIERR_INCOMPLETEEFFECT, "DIERR_INCOMPLETEEFFECT & VFW_E_NO_TYPES & DMO_E_NO_MORE_ITEMS")
CHK_ERR(DIERR_NOTBUFFERED, "DIERR_NOTBUFFERED & VFW_E_NO_ACCEPTABLE_TYPES")
CHK_ERR(DIERR_EFFECTPLAYING, "DIERR_EFFECTPLAYING & VFW_E_INVALID_DIRECTION")
CHK_ERR(DIERR_UNPLUGGED, "DIERR_UNPLUGGED & VFW_E_NOT_CONNECTED")
CHK_ERR(DIERR_REPORTFULL, "DIERR_REPORTFULL & VFW_E_NO_ALLOCATOR")
CHK_ERR(DIERR_MAPFILEFAIL, "DIERR_MAPFILEFAIL & VFW_E_RUNTIME_ERROR")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INSUFFICIENTPRIVS), "DIERR_INSUFFICIENTPRIVS & VFW_E_INVALIDMEDIATYPE")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DEVICEFULL), "DIERR_DEVICEFULL & VFW_E_INVALIDSUBTYPE & DMO_E_INVALIDSTREAMINDEX")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_MOREDATA), "DIERR_MOREDATA & VFW_E_NEED_OWNER & DMO_E_INVALIDTYPE")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTDOWNLOADED), "DIERR_NOTDOWNLOADED & VFW_E_ENUM_OUT_OF_SYNC & DMO_E_TYPE_NOT_SET")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_HASEFFECTS), "DIERR_HASEFFECTS & VFW_E_ALREADY_CONNECTED & DMO_E_NOTACCEPTING")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTEXCLUSIVEACQUIRED), "DIERR_NOTEXCLUSIVEACQUIRED & VFW_E_FILTER_ACTIVE & DMO_E_TYPE_NOT_ACCEPTED")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INCOMPLETEEFFECT), "DIERR_INCOMPLETEEFFECT & VFW_E_NO_TYPES & DMO_E_NO_MORE_ITEMS")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTBUFFERED), "DIERR_NOTBUFFERED & VFW_E_NO_ACCEPTABLE_TYPES")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_EFFECTPLAYING), "DIERR_EFFECTPLAYING & VFW_E_INVALID_DIRECTION")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_UNPLUGGED), "DIERR_UNPLUGGED & VFW_E_NOT_CONNECTED")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_REPORTFULL), "DIERR_REPORTFULL & VFW_E_NO_ALLOCATOR")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_MAPFILEFAIL), "DIERR_MAPFILEFAIL & VFW_E_RUNTIME_ERROR")
// CHK_ERRA(DIERR_OLDDIRECTINPUTVERSION)
// CHK_ERRA(DIERR_GENERIC)
// CHK_ERRA(DIERR_OLDDIRECTINPUTVERSION)
@ -6578,16 +6578,16 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
// dinputd.h error
// -------------------------------------------------------------
// CHK_ERRA(DIERR_NOMOREITEMS)
CHK_ERRA(DIERR_DRIVERFIRST)
CHK_ERR(DIERR_DRIVERFIRST + 1, "DIERR_DRIVERFIRST+1")
CHK_ERR(DIERR_DRIVERFIRST + 2, "DIERR_DRIVERFIRST+2")
CHK_ERR(DIERR_DRIVERFIRST + 3, "DIERR_DRIVERFIRST+3")
CHK_ERR(DIERR_DRIVERFIRST + 4, "DIERR_DRIVERFIRST+4")
CHK_ERR(DIERR_DRIVERFIRST + 5, "DIERR_DRIVERFIRST+5")
CHK_ERRA(DIERR_DRIVERLAST)
CHK_ERR(DIERR_INVALIDCLASSINSTALLER, "DIERR_INVALIDCLASSINSTALLER")
CHK_ERR(DIERR_CANCELLED, "DIERR_CANCELLED & MS_E_SAMPLEALLOC")
CHK_ERRA(DIERR_BADINF)
CHK_ERRA(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST))
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 1), "DIERR_DRIVERFIRST+1")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 2), "DIERR_DRIVERFIRST+2")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 3), "DIERR_DRIVERFIRST+3")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 4), "DIERR_DRIVERFIRST+4")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 5), "DIERR_DRIVERFIRST+5")
CHK_ERRA(_HRESULT_TYPEDEF_(DIERR_DRIVERLAST))
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INVALIDCLASSINSTALLER), "DIERR_INVALIDCLASSINSTALLER")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_CANCELLED), "DIERR_CANCELLED & MS_E_SAMPLEALLOC")
CHK_ERRA(_HRESULT_TYPEDEF_(DIERR_BADINF))
// -------------------------------------------------------------
// d3d9.h error codes
@ -6815,10 +6815,10 @@ const char* WINAPI DXGetErrorStringA(_In_ HRESULT hr)
// -------------------------------------------------------------
// xaudio2.h error codes
// -------------------------------------------------------------
CHK_ERRA(XAUDIO2_E_INVALID_CALL)
CHK_ERRA(XAUDIO2_E_XMA_DECODER_ERROR)
CHK_ERRA(XAUDIO2_E_XAPO_CREATION_FAILED)
CHK_ERRA(XAUDIO2_E_DEVICE_INVALIDATED)
CHK_ERRA(_HRESULT_TYPEDEF_(XAUDIO2_E_INVALID_CALL))
CHK_ERRA(_HRESULT_TYPEDEF_(XAUDIO2_E_XMA_DECODER_ERROR))
CHK_ERRA(_HRESULT_TYPEDEF_(XAUDIO2_E_XAPO_CREATION_FAILED))
CHK_ERRA(_HRESULT_TYPEDEF_(XAUDIO2_E_DEVICE_INVALIDATED))
// -------------------------------------------------------------
// xapo.h error codes
@ -7029,33 +7029,33 @@ void WINAPI DXGetErrorDescriptionW( _In_ HRESULT hr, _Out_cap_(count) WCHAR* des
CHK_ERR(DIERR_NOTACQUIRED, "The operation cannot be performed unless the device is acquired.")
// CHK_ERR(DIERR_READONLY, "DIERR_READONLY")
// CHK_ERR(DIERR_HANDLEEXISTS, "DIERR_HANDLEEXISTS")
CHK_ERR(DIERR_INSUFFICIENTPRIVS, "Unable to IDirectInputJoyConfig_Acquire because the user does not have sufficient privileges to change the joystick configuration. & An invalid media type was specified")
CHK_ERR(DIERR_DEVICEFULL, "The device is full. & An invalid media subtype was specified.")
CHK_ERR(DIERR_MOREDATA, "Not all the requested information fit into the buffer. & This object can only be created as an aggregated object.")
CHK_ERR(DIERR_NOTDOWNLOADED, "The effect is not downloaded. & The enumerator has become invalid.")
CHK_ERR(DIERR_HASEFFECTS, "The device cannot be reinitialized because there are still effects attached to it. & At least one of the pins involved in the operation is already connected.")
CHK_ERR(DIERR_NOTEXCLUSIVEACQUIRED, "The operation cannot be performed unless the device is acquired in DISCL_EXCLUSIVE mode. & This operation cannot be performed because the filter is active.")
CHK_ERR(DIERR_INCOMPLETEEFFECT, "The effect could not be downloaded because essential information is missing. For example, no axes have been associated with the effect, or no type-specific information has been created. & One of the specified pins supports no media types.")
CHK_ERR(DIERR_NOTBUFFERED, "Attempted to read buffered device data from a device that is not buffered. & There is no common media type between these pins.")
CHK_ERR(DIERR_EFFECTPLAYING, "An attempt was made to modify parameters of an effect while it is playing. Not all hardware devices support altering the parameters of an effect while it is playing. & Two pins of the same direction cannot be connected together.")
CHK_ERR(DIERR_UNPLUGGED, "The operation could not be completed because the device is not plugged in. & The operation cannot be performed because the pins are not connected.")
CHK_ERR(DIERR_REPORTFULL, "SendDeviceData failed because more information was requested to be sent than can be sent to the device. Some devices have restrictions on how much data can be sent to them. (For example, there might be a limit on the number of buttons that can be pressed at once.) & No sample buffer allocator is available.")
CHK_ERR(DIERR_MAPFILEFAIL, "A mapper file function failed because reading or writing the user or IHV settings file failed. & A run-time error occurred.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INSUFFICIENTPRIVS), "Unable to IDirectInputJoyConfig_Acquire because the user does not have sufficient privileges to change the joystick configuration. & An invalid media type was specified")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DEVICEFULL), "The device is full. & An invalid media subtype was specified.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_MOREDATA), "Not all the requested information fit into the buffer. & This object can only be created as an aggregated object.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTDOWNLOADED), "The effect is not downloaded. & The enumerator has become invalid.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_HASEFFECTS), "The device cannot be reinitialized because there are still effects attached to it. & At least one of the pins involved in the operation is already connected.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTEXCLUSIVEACQUIRED), "The operation cannot be performed unless the device is acquired in DISCL_EXCLUSIVE mode. & This operation cannot be performed because the filter is active.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INCOMPLETEEFFECT), "The effect could not be downloaded because essential information is missing. For example, no axes have been associated with the effect, or no type-specific information has been created. & One of the specified pins supports no media types.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTBUFFERED), "Attempted to read buffered device data from a device that is not buffered. & There is no common media type between these pins.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_EFFECTPLAYING), "An attempt was made to modify parameters of an effect while it is playing. Not all hardware devices support altering the parameters of an effect while it is playing. & Two pins of the same direction cannot be connected together.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_UNPLUGGED), "The operation could not be completed because the device is not plugged in. & The operation cannot be performed because the pins are not connected.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_REPORTFULL), "SendDeviceData failed because more information was requested to be sent than can be sent to the device. Some devices have restrictions on how much data can be sent to them. (For example, there might be a limit on the number of buttons that can be pressed at once.) & No sample buffer allocator is available.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_MAPFILEFAIL), "A mapper file function failed because reading or writing the user or IHV settings file failed. & A run-time error occurred.")
// -------------------------------------------------------------
// dinputd.h error codes
// -------------------------------------------------------------
CHK_ERR(DIERR_NOMOREITEMS, "No more items.")
CHK_ERR(DIERR_DRIVERFIRST, "Device driver-specific codes. Unless the specific driver has been precisely identified, no meaning should be attributed to these values other than that the driver originated the error.")
CHK_ERR(DIERR_DRIVERFIRST+1, "DIERR_DRIVERFIRST+1")
CHK_ERR(DIERR_DRIVERFIRST+2, "DIERR_DRIVERFIRST+2")
CHK_ERR(DIERR_DRIVERFIRST+3, "DIERR_DRIVERFIRST+3")
CHK_ERR(DIERR_DRIVERFIRST+4, "DIERR_DRIVERFIRST+4")
CHK_ERR(DIERR_DRIVERFIRST+5, "DIERR_DRIVERFIRST+5")
CHK_ERR(DIERR_DRIVERLAST, "Device installer errors.")
CHK_ERR(DIERR_INVALIDCLASSINSTALLER, "Registry entry or DLL for class installer invalid or class installer not found.")
CHK_ERR(DIERR_CANCELLED, "The user cancelled the install operation. & The stream already has allocated samples and the surface doesn't match the sample format.")
CHK_ERR(DIERR_BADINF, "The INF file for the selected device could not be found or is invalid or is damaged. & The specified purpose ID can't be used for the call.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST), "Device driver-specific codes. Unless the specific driver has been precisely identified, no meaning should be attributed to these values other than that the driver originated the error.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST)+1, "DIERR_DRIVERFIRST+1")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST)+2, "DIERR_DRIVERFIRST+2")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST)+3, "DIERR_DRIVERFIRST+3")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST)+4, "DIERR_DRIVERFIRST+4")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST)+5, "DIERR_DRIVERFIRST+5")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERLAST), "Device installer errors.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INVALIDCLASSINSTALLER), "Registry entry or DLL for class installer invalid or class installer not found.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_CANCELLED), "The user cancelled the install operation. & The stream already has allocated samples and the surface doesn't match the sample format.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_BADINF), "The INF file for the selected device could not be found or is invalid or is damaged. & The specified purpose ID can't be used for the call.")
// -------------------------------------------------------------
// d3d9.h error codes
@ -7284,10 +7284,10 @@ void WINAPI DXGetErrorDescriptionW( _In_ HRESULT hr, _Out_cap_(count) WCHAR* des
// -------------------------------------------------------------
// xaudio2.h error codes
// -------------------------------------------------------------
CHK_ERR(XAUDIO2_E_INVALID_CALL, "Invalid XAudio2 API call or arguments")
CHK_ERR(XAUDIO2_E_XMA_DECODER_ERROR, "Hardware XMA decoder error")
CHK_ERR(XAUDIO2_E_XAPO_CREATION_FAILED, "Failed to create an audio effect")
CHK_ERR(XAUDIO2_E_DEVICE_INVALIDATED, "Device invalidated (unplugged, disabled, etc)")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_INVALID_CALL), "Invalid XAudio2 API call or arguments")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_XMA_DECODER_ERROR), "Hardware XMA decoder error")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_XAPO_CREATION_FAILED), "Failed to create an audio effect")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_DEVICE_INVALIDATED), "Device invalidated (unplugged, disabled, etc)")
// -------------------------------------------------------------
// xapo.h error codes
@ -7552,33 +7552,33 @@ void WINAPI DXGetErrorDescriptionA(_In_ HRESULT hr, _Out_cap_(count) char* desc,
CHK_ERR(DIERR_NOTACQUIRED, "The operation cannot be performed unless the device is acquired.")
// CHK_ERR(DIERR_READONLY, "DIERR_READONLY")
// CHK_ERR(DIERR_HANDLEEXISTS, "DIERR_HANDLEEXISTS")
CHK_ERR(DIERR_INSUFFICIENTPRIVS, "Unable to IDirectInputJoyConfig_Acquire because the user does not have sufficient privileges to change the joystick configuration. & An invalid media type was specified")
CHK_ERR(DIERR_DEVICEFULL, "The device is full. & An invalid media subtype was specified.")
CHK_ERR(DIERR_MOREDATA, "Not all the requested information fit into the buffer. & This object can only be created as an aggregated object.")
CHK_ERR(DIERR_NOTDOWNLOADED, "The effect is not downloaded. & The enumerator has become invalid.")
CHK_ERR(DIERR_HASEFFECTS, "The device cannot be reinitialized because there are still effects attached to it. & At least one of the pins involved in the operation is already connected.")
CHK_ERR(DIERR_NOTEXCLUSIVEACQUIRED, "The operation cannot be performed unless the device is acquired in DISCL_EXCLUSIVE mode. & This operation cannot be performed because the filter is active.")
CHK_ERR(DIERR_INCOMPLETEEFFECT, "The effect could not be downloaded because essential information is missing. For example, no axes have been associated with the effect, or no type-specific information has been created. & One of the specified pins supports no media types.")
CHK_ERR(DIERR_NOTBUFFERED, "Attempted to read buffered device data from a device that is not buffered. & There is no common media type between these pins.")
CHK_ERR(DIERR_EFFECTPLAYING, "An attempt was made to modify parameters of an effect while it is playing. Not all hardware devices support altering the parameters of an effect while it is playing. & Two pins of the same direction cannot be connected together.")
CHK_ERR(DIERR_UNPLUGGED, "The operation could not be completed because the device is not plugged in. & The operation cannot be performed because the pins are not connected.")
CHK_ERR(DIERR_REPORTFULL, "SendDeviceData failed because more information was requested to be sent than can be sent to the device. Some devices have restrictions on how much data can be sent to them. (For example, there might be a limit on the number of buttons that can be pressed at once.) & No sample buffer allocator is available.")
CHK_ERR(DIERR_MAPFILEFAIL, "A mapper file function failed because reading or writing the user or IHV settings file failed. & A run-time error occurred.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INSUFFICIENTPRIVS), "Unable to IDirectInputJoyConfig_Acquire because the user does not have sufficient privileges to change the joystick configuration. & An invalid media type was specified")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DEVICEFULL), "The device is full. & An invalid media subtype was specified.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_MOREDATA), "Not all the requested information fit into the buffer. & This object can only be created as an aggregated object.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTDOWNLOADED), "The effect is not downloaded. & The enumerator has become invalid.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_HASEFFECTS), "The device cannot be reinitialized because there are still effects attached to it. & At least one of the pins involved in the operation is already connected.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTEXCLUSIVEACQUIRED), "The operation cannot be performed unless the device is acquired in DISCL_EXCLUSIVE mode. & This operation cannot be performed because the filter is active.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INCOMPLETEEFFECT), "The effect could not be downloaded because essential information is missing. For example, no axes have been associated with the effect, or no type-specific information has been created. & One of the specified pins supports no media types.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_NOTBUFFERED), "Attempted to read buffered device data from a device that is not buffered. & There is no common media type between these pins.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_EFFECTPLAYING), "An attempt was made to modify parameters of an effect while it is playing. Not all hardware devices support altering the parameters of an effect while it is playing. & Two pins of the same direction cannot be connected together.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_UNPLUGGED), "The operation could not be completed because the device is not plugged in. & The operation cannot be performed because the pins are not connected.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_REPORTFULL), "SendDeviceData failed because more information was requested to be sent than can be sent to the device. Some devices have restrictions on how much data can be sent to them. (For example, there might be a limit on the number of buttons that can be pressed at once.) & No sample buffer allocator is available.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_MAPFILEFAIL), "A mapper file function failed because reading or writing the user or IHV settings file failed. & A run-time error occurred.")
// -------------------------------------------------------------
// dinputd.h error codes
// -------------------------------------------------------------
CHK_ERR(DIERR_NOMOREITEMS, "No more items.")
CHK_ERR(DIERR_DRIVERFIRST, "Device driver-specific codes. Unless the specific driver has been precisely identified, no meaning should be attributed to these values other than that the driver originated the error.")
CHK_ERR(DIERR_DRIVERFIRST + 1, "DIERR_DRIVERFIRST+1")
CHK_ERR(DIERR_DRIVERFIRST + 2, "DIERR_DRIVERFIRST+2")
CHK_ERR(DIERR_DRIVERFIRST + 3, "DIERR_DRIVERFIRST+3")
CHK_ERR(DIERR_DRIVERFIRST + 4, "DIERR_DRIVERFIRST+4")
CHK_ERR(DIERR_DRIVERFIRST + 5, "DIERR_DRIVERFIRST+5")
CHK_ERR(DIERR_DRIVERLAST, "Device installer errors.")
CHK_ERR(DIERR_INVALIDCLASSINSTALLER, "Registry entry or DLL for class installer invalid or class installer not found.")
CHK_ERR(DIERR_CANCELLED, "The user cancelled the install operation. & The stream already has allocated samples and the surface doesn't match the sample format.")
CHK_ERR(DIERR_BADINF, "The INF file for the selected device could not be found or is invalid or is damaged. & The specified purpose ID can't be used for the call.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST), "Device driver-specific codes. Unless the specific driver has been precisely identified, no meaning should be attributed to these values other than that the driver originated the error.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 1), "DIERR_DRIVERFIRST+1")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 2), "DIERR_DRIVERFIRST+2")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 3), "DIERR_DRIVERFIRST+3")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 4), "DIERR_DRIVERFIRST+4")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERFIRST + 5), "DIERR_DRIVERFIRST+5")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_DRIVERLAST), "Device installer errors.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_INVALIDCLASSINSTALLER), "Registry entry or DLL for class installer invalid or class installer not found.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_CANCELLED), "The user cancelled the install operation. & The stream already has allocated samples and the surface doesn't match the sample format.")
CHK_ERR(_HRESULT_TYPEDEF_(DIERR_BADINF), "The INF file for the selected device could not be found or is invalid or is damaged. & The specified purpose ID can't be used for the call.")
// -------------------------------------------------------------
// d3d9.h error codes
@ -7807,10 +7807,10 @@ void WINAPI DXGetErrorDescriptionA(_In_ HRESULT hr, _Out_cap_(count) char* desc,
// -------------------------------------------------------------
// xaudio2.h error codes
// -------------------------------------------------------------
CHK_ERR(XAUDIO2_E_INVALID_CALL, "Invalid XAudio2 API call or arguments")
CHK_ERR(XAUDIO2_E_XMA_DECODER_ERROR, "Hardware XMA decoder error")
CHK_ERR(XAUDIO2_E_XAPO_CREATION_FAILED, "Failed to create an audio effect")
CHK_ERR(XAUDIO2_E_DEVICE_INVALIDATED, "Device invalidated (unplugged, disabled, etc)")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_INVALID_CALL), "Invalid XAudio2 API call or arguments")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_XMA_DECODER_ERROR), "Hardware XMA decoder error")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_XAPO_CREATION_FAILED), "Failed to create an audio effect")
CHK_ERR(_HRESULT_TYPEDEF_(XAUDIO2_E_DEVICE_INVALIDATED), "Device invalidated (unplugged, disabled, etc)")
// -------------------------------------------------------------
// xapo.h error codes

11
win32/wsnes9x.cpp
View File

@ -1440,8 +1440,9 @@ bool WinMoviePlay(LPCTSTR filename)
while (info.ROMCRC32 != Memory.ROMCRC32) {
TCHAR temp[512];
CPToWide wromname(info.ROMName, 932);
wsprintf(temp, TEXT("Movie's ROM: crc32=%08X, name=%s\nCurrent ROM: crc32=%08X\n\nstill want to play the movie?"),
info.ROMCRC32, _tFromMS932(info.ROMName), Memory.ROMCRC32);
info.ROMCRC32, (wchar_t *)wromname, Memory.ROMCRC32);
int sel = MessageBox(GUI.hWnd, temp, SNES9X_INFO, MB_ABORTRETRYIGNORE|MB_ICONQUESTION);
switch (sel) {
case IDABORT:
@ -3895,7 +3896,7 @@ static void CheckMenuStates ()
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_STRING;
mii.dwTypeData = !GUI.AVIOut ? TEXT("Start AVI Recording...") : TEXT("Stop AVI Recording");
mii.dwTypeData = (TCHAR *)(!GUI.AVIOut ? TEXT("Start AVI Recording...") : TEXT("Stop AVI Recording"));
SetMenuItemInfo (GUI.hMenu, ID_FILE_AVI_RECORDING, FALSE, &mii);
}
@ -6722,18 +6723,18 @@ INT_PTR CALLBACK DlgOpenROMProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPara
if(nmlvdi->item.iSubItem==0)
{
nmlvdi->item.pszText=curr->fname?curr->fname:TEXT("");
nmlvdi->item.pszText = (TCHAR *)(curr->fname?curr->fname:TEXT(""));
nmlvdi->item.cchTextMax=MAX_PATH;
}
if(nmlvdi->item.iSubItem==1)
{
nmlvdi->item.pszText=curr->rname?curr->rname:TEXT("");
nmlvdi->item.pszText = (TCHAR *)(curr->rname?curr->rname:TEXT(""));
nmlvdi->item.cchTextMax=24;
}
if(nmlvdi->item.iSubItem==2)
{
nmlvdi->item.pszText=curr->rmbits?curr->rmbits:TEXT("");
nmlvdi->item.pszText = (TCHAR *)(curr->rmbits?curr->rmbits:TEXT(""));
nmlvdi->item.cchTextMax=11;
}
// nmlvdi->item.mask=LVIF_TEXT; // This is bad as wine relies on this to not change.