Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSACM32] Sync with Wine Staging 1.7.47. CORE-9924

Browse source 
svn path=/trunk/; revision=68453
This commit is contained in:
Amine Khaldi 2015-07-19 22:43:17 +00:00
parent 3686da5663
commit a0281be468
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/msacm32/driver.c
View file

@ -149,7 +149,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule,
}
break;
default:
ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK);
ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd);
return MMSYSERR_INVALFLAG;
}

6
reactos/dll/win32/msacm32/pcmconverter.c
View file

@ -704,15 +704,15 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add)
add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC;
add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED;
add->wMid = 0xFF;
add->wPid = 0x00;
add->wMid = MM_MICROSOFT;
add->wPid = MM_MSFT_ACM_PCM;
add->vdwACM = 0x01000000;
add->vdwDriver = 0x01000000;
add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CONVERTER;
add->cFormatTags = 1;
add->cFilterTags = 0;
add->hicon = NULL;
MultiByteToWideChar( CP_ACP, 0, "WINE-PCM", -1,
MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1,
add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1,
add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) );

2
reactos/media/doc/README.WINE
View file

@ -105,7 +105,7 @@ reactos/dll/win32/mlang # Synced to WineStaging-1.7.37
reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.47
reactos/dll/win32/mpr # Synced to WineStaging-1.7.47
reactos/dll/win32/mprapi # Synced to WineStaging-1.7.37
reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.37
reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.47
reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.37
reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.37
reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.37