Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSVIDC32] Keep using CRAM_MAGIC for info structure validation (#6498)

Browse source 
CRAM_MAGIC is being used to validate the info context structure contents
when the driver routines are being called, so partially revert 8be912147.

Just report "MSVC" as the main FourCC handler in CRAM_GetInfo() instead.

CORE-19453 CORE-15382
This commit is contained in:
Katayama Hirofumi MZ 2024-02-15 22:08:47 +09:00 committed by GitHub
parent fa29a61271
commit e0b67a2990
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/msvidc32/msvideo1.c
View file

@ -538,7 +538,11 @@ static LRESULT CRAM_GetInfo( const Msvideo1Context *info, ICINFO *icinfo, DWORD
icinfo->dwSize = sizeof(ICINFO); icinfo->dwSize = sizeof(ICINFO);
icinfo->fccType = ICTYPE_VIDEO; icinfo->fccType = ICTYPE_VIDEO;
#ifdef __REACTOS__
icinfo->fccHandler = MSVC_MAGIC;
#else
icinfo->fccHandler = info ? info->dwMagic : CRAM_MAGIC; icinfo->fccHandler = info ? info->dwMagic : CRAM_MAGIC;
#endif
icinfo->dwFlags = 0; icinfo->dwFlags = 0;
icinfo->dwVersion = ICVERSION; icinfo->dwVersion = ICVERSION;
icinfo->dwVersionICM = ICVERSION; icinfo->dwVersionICM = ICVERSION;
@ -583,11 +587,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PTR dwDriverId, HDRVR hdrvr, UINT msg,
if( info ) if( info )
{ {
memset( info, 0, sizeof *info ); memset( info, 0, sizeof *info );
#ifdef __REACTOS__
info->dwMagic = MSVC_MAGIC;
#else
info->dwMagic = CRAM_MAGIC; info->dwMagic = CRAM_MAGIC;
#endif
} }
r = (LRESULT) info; r = (LRESULT) info;
break; break;