Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 20:23:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSACM32]

Browse source 
* Sync with Wine 1.7.1.
CORE-7469

svn path=/trunk/; revision=60280
This commit is contained in:
Amine Khaldi 2013-09-21 14:16:27 +00:00
parent d269d6ec6d
commit 554a97f4d9
9 changed files with 239 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/msacm32/CMakeLists.txt
View file

@ -16,8 +16,7 @@ list(APPEND SOURCE
add_library(msacm32 SHARED ${SOURCE}) add_library(msacm32 SHARED ${SOURCE})
set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE) set_module_type(msacm32 win32dll ENTRYPOINT DllMain 12 UNICODE)
target_link_libraries(msacm32 wine) target_link_libraries(msacm32 wine)
add_importlibs(msacm32 msvcrt advapi32 user32 winmm kernel32 ntdll) add_importlibs(msacm32 advapi32 user32 winmm msvcrt kernel32 ntdll)
add_dependencies(msacm32 psdk)
add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all) add_cd_file(TARGET msacm32 DESTINATION reactos/system32 FOR all)
add_subdirectory(msacm32.drv) add_subdirectory(msacm32.drv)

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

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

312
reactos/dll/win32/msacm32/format.c
View file

@ -1,5 +1,3 @@
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/* /*
* MSACM32 library * MSACM32 library
* *
@ -41,21 +39,19 @@
WINE_DEFAULT_DEBUG_CHANNEL(msacm); WINE_DEFAULT_DEBUG_CHANNEL(msacm);
static PACMFORMATCHOOSEA afc;
struct MSACM_FillFormatData { struct MSACM_FillFormatData {
HWND hWnd; HWND hWnd;
#define WINE_ACMFF_TAG 0 #define WINE_ACMFF_TAG 0
#define WINE_ACMFF_FORMAT 1 #define WINE_ACMFF_FORMAT 1
#define WINE_ACMFF_WFX 2 #define WINE_ACMFF_WFX 2
int mode; int mode;
char szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
PACMFORMATCHOOSEA afc; PACMFORMATCHOOSEW afc;
DWORD ret; DWORD ret;
}; };
static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid,
PACMFORMATTAGDETAILSA paftd, PACMFORMATTAGDETAILSW paftd,
DWORD_PTR dwInstance, DWORD_PTR dwInstance,
DWORD fdwSupport) DWORD fdwSupport)
{ {
@ -63,21 +59,21 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid,
switch (affd->mode) { switch (affd->mode) {
case WINE_ACMFF_TAG: case WINE_ACMFF_TAG:
if (SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, if (SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG,
CB_FINDSTRINGEXACT, -1, CB_FINDSTRINGEXACT, -1,
(LPARAM)paftd->szFormatTag) == CB_ERR) (LPARAM)paftd->szFormatTag) == CB_ERR)
SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG,
CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag); CB_ADDSTRING, 0, (LPARAM)paftd->szFormatTag);
break; break;
case WINE_ACMFF_FORMAT: case WINE_ACMFF_FORMAT:
if (strcmp(affd->szFormatTag, paftd->szFormatTag) == 0) { if (strcmpW(affd->szFormatTag, paftd->szFormatTag) == 0) {
HACMDRIVER had; HACMDRIVER had;
if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) {
ACMFORMATDETAILSA afd; ACMFORMATDETAILSW afd;
unsigned int i, len; unsigned int i, len;
MMRESULT mmr; MMRESULT mmr;
char buffer[ACMFORMATDETAILS_FORMAT_CHARS+16]; WCHAR buffer[ACMFORMATDETAILS_FORMAT_CHARS+16];
afd.cbStruct = sizeof(afd); afd.cbStruct = sizeof(afd);
afd.dwFormatTag = paftd->dwFormatTag; afd.dwFormatTag = paftd->dwFormatTag;
@ -88,42 +84,45 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid,
afd.cbwfx = paftd->cbFormatSize; afd.cbwfx = paftd->cbFormatSize;
for (i = 0; i < paftd->cStandardFormats; i++) { for (i = 0; i < paftd->cStandardFormats; i++) {
static const WCHAR fmtW[] = {'%','d',' ','K','o','/','s','\0'};
int j;
afd.dwFormatIndex = i; afd.dwFormatIndex = i;
mmr = acmFormatDetailsA(had, &afd, ACM_FORMATDETAILSF_INDEX); mmr = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX);
if (mmr == MMSYSERR_NOERROR) { if (mmr == MMSYSERR_NOERROR) {
lstrcpynA(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1); lstrcpynW(buffer, afd.szFormat, ACMFORMATTAGDETAILS_FORMATTAG_CHARS + 1);
len = strlen(buffer); len = strlenW(buffer);
memset(buffer+len, ' ', ACMFORMATTAGDETAILS_FORMATTAG_CHARS - len); for (j = len; j < ACMFORMATTAGDETAILS_FORMATTAG_CHARS; j++)
wsprintfA(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS, buffer[j] = ' ';
"%d Ko/s", wsprintfW(buffer + ACMFORMATTAGDETAILS_FORMATTAG_CHARS,
(afd.pwfx->nAvgBytesPerSec + 512) / 1024); fmtW, (afd.pwfx->nAvgBytesPerSec + 512) / 1024);
SendDlgItemMessageA(affd->hWnd, SendDlgItemMessageW(affd->hWnd,
IDD_ACMFORMATCHOOSE_CMB_FORMAT, IDD_ACMFORMATCHOOSE_CMB_FORMAT,
CB_ADDSTRING, 0, (LPARAM)buffer); CB_ADDSTRING, 0, (LPARAM)buffer);
} }
} }
acmDriverClose(had, 0); acmDriverClose(had, 0);
SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT,
CB_SETCURSEL, 0, 0); CB_SETCURSEL, 0, 0);
HeapFree(MSACM_hHeap, 0, afd.pwfx); HeapFree(MSACM_hHeap, 0, afd.pwfx);
} }
} }
break; break;
case WINE_ACMFF_WFX: case WINE_ACMFF_WFX:
if (strcmp(affd->szFormatTag, paftd->szFormatTag) == 0) { if (strcmpW(affd->szFormatTag, paftd->szFormatTag) == 0) {
HACMDRIVER had; HACMDRIVER had;
if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) { if (acmDriverOpen(&had, hadid, 0) == MMSYSERR_NOERROR) {
ACMFORMATDETAILSA afd; ACMFORMATDETAILSW afd;
afd.cbStruct = sizeof(afd); afd.cbStruct = sizeof(afd);
afd.dwFormatTag = paftd->dwFormatTag; afd.dwFormatTag = paftd->dwFormatTag;
afd.pwfx = affd->afc->pwfx; afd.pwfx = affd->afc->pwfx;
afd.cbwfx = affd->afc->cbwfx; afd.cbwfx = affd->afc->cbwfx;
afd.dwFormatIndex = SendDlgItemMessageA(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, afd.dwFormatIndex = SendDlgItemMessageW(affd->hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT,
CB_GETCURSEL, 0, 0); CB_GETCURSEL, 0, 0);
affd->ret = acmFormatDetailsA(had, &afd, ACM_FORMATDETAILSF_INDEX); affd->ret = acmFormatDetailsW(had, &afd, ACM_FORMATDETAILSF_INDEX);
acmDriverClose(had, 0); acmDriverClose(had, 0);
return TRUE; return TRUE;
} }
@ -138,7 +137,7 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid,
static BOOL MSACM_FillFormatTags(HWND hWnd) static BOOL MSACM_FillFormatTags(HWND hWnd)
{ {
ACMFORMATTAGDETAILSA aftd; ACMFORMATTAGDETAILSW aftd;
struct MSACM_FillFormatData affd; struct MSACM_FillFormatData affd;
memset(&aftd, 0, sizeof(aftd)); memset(&aftd, 0, sizeof(aftd));
@ -147,37 +146,37 @@ static BOOL MSACM_FillFormatTags(HWND hWnd)
affd.hWnd = hWnd; affd.hWnd = hWnd;
affd.mode = WINE_ACMFF_TAG; affd.mode = WINE_ACMFF_TAG;
acmFormatTagEnumA(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0);
SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0); SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, CB_SETCURSEL, 0, 0);
return TRUE; return TRUE;
} }
static BOOL MSACM_FillFormat(HWND hWnd) static BOOL MSACM_FillFormat(HWND hWnd)
{ {
ACMFORMATTAGDETAILSA aftd; ACMFORMATTAGDETAILSW aftd;
struct MSACM_FillFormatData affd; struct MSACM_FillFormatData affd;
SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_RESETCONTENT, 0, 0); SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_RESETCONTENT, 0, 0);
memset(&aftd, 0, sizeof(aftd)); memset(&aftd, 0, sizeof(aftd));
aftd.cbStruct = sizeof(aftd); aftd.cbStruct = sizeof(aftd);
affd.hWnd = hWnd; affd.hWnd = hWnd;
affd.mode = WINE_ACMFF_FORMAT; affd.mode = WINE_ACMFF_FORMAT;
SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG,
CB_GETLBTEXT, CB_GETLBTEXT,
SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG,
CB_GETCURSEL, 0, 0), CB_GETCURSEL, 0, 0),
(LPARAM)affd.szFormatTag); (LPARAM)affd.szFormatTag);
acmFormatTagEnumA(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0);
SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0); SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMAT, CB_SETCURSEL, 0, 0);
return TRUE; return TRUE;
} }
static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEA afc) static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEW afc)
{ {
ACMFORMATTAGDETAILSA aftd; ACMFORMATTAGDETAILSW aftd;
struct MSACM_FillFormatData affd; struct MSACM_FillFormatData affd;
memset(&aftd, 0, sizeof(aftd)); memset(&aftd, 0, sizeof(aftd));
@ -187,30 +186,36 @@ static MMRESULT MSACM_GetWFX(HWND hWnd, PACMFORMATCHOOSEA afc)
affd.mode = WINE_ACMFF_WFX; affd.mode = WINE_ACMFF_WFX;
affd.afc = afc; affd.afc = afc;
affd.ret = MMSYSERR_NOERROR; affd.ret = MMSYSERR_NOERROR;
SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG,
CB_GETLBTEXT, CB_GETLBTEXT,
SendDlgItemMessageA(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, SendDlgItemMessageW(hWnd, IDD_ACMFORMATCHOOSE_CMB_FORMATTAG,
CB_GETCURSEL, 0, 0), CB_GETCURSEL, 0, 0),
(LPARAM)affd.szFormatTag); (LPARAM)affd.szFormatTag);
acmFormatTagEnumA(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0); acmFormatTagEnumW(NULL, &aftd, MSACM_FillFormatTagsCB, (DWORD_PTR)&affd, 0);
return affd.ret; return affd.ret;
} }
static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, static const WCHAR fmt_prop[] = {'a','c','m','p','r','o','p','\0'};
WPARAM wParam, LPARAM lParam)
{
TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam ); static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
WPARAM wParam, LPARAM lParam)
{
PACMFORMATCHOOSEW afc = (PACMFORMATCHOOSEW)GetPropW(hWnd, fmt_prop);
TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam);
switch (msg) { switch (msg) {
case WM_INITDIALOG: case WM_INITDIALOG:
afc = (PACMFORMATCHOOSEA)lParam; afc = (PACMFORMATCHOOSEW)lParam;
SetPropW(hWnd, fmt_prop, (HANDLE)afc);
MSACM_FillFormatTags(hWnd); MSACM_FillFormatTags(hWnd);
MSACM_FillFormat(hWnd); MSACM_FillFormat(hWnd);
if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP| if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP|
ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0) ACMFORMATCHOOSE_STYLEF_SHOWHELP|
FIXME("Unsupported style %08x\n", ((PACMFORMATCHOOSEA)lParam)->fdwStyle); ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE|
ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0)
FIXME("Unsupported style %08x\n", afc->fdwStyle);
if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP))
ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE);
return TRUE; return TRUE;
@ -236,8 +241,8 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
break; break;
case IDD_ACMFORMATCHOOSE_BTN_HELP: case IDD_ACMFORMATCHOOSE_BTN_HELP:
if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP) if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)
SendMessageA(afc->hwndOwner, SendMessageW(afc->hwndOwner,
RegisterWindowMessageA(ACMHELPMSGSTRINGA), 0L, 0L); RegisterWindowMessageW(ACMHELPMSGSTRINGW), 0L, 0L);
break; break;
default: default:
@ -248,15 +253,15 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
break; break;
case WM_CONTEXTMENU: case WM_CONTEXTMENU:
if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_CONTEXTHELP) if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_CONTEXTHELP)
SendMessageA(afc->hwndOwner, SendMessageW(afc->hwndOwner,
RegisterWindowMessageA(ACMHELPMSGCONTEXTMENUA), RegisterWindowMessageW(ACMHELPMSGCONTEXTMENUW),
wParam, lParam); wParam, lParam);
break; break;
#if defined(WM_CONTEXTHELP) #if defined(WM_CONTEXTHELP)
case WM_CONTEXTHELP: case WM_CONTEXTHELP:
if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_CONTEXTHELP) if (afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_CONTEXTHELP)
SendMessageA(afc->hwndOwner, SendMessageW(afc->hwndOwner,
RegisterWindowMessageA(ACMHELPMSGCONTEXTHELPA), RegisterWindowMessageW(ACMHELPMSGCONTEXTHELPW),
wParam, lParam); wParam, lParam);
break; break;
#endif #endif
@ -273,8 +278,77 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
*/ */
MMRESULT WINAPI acmFormatChooseA(PACMFORMATCHOOSEA pafmtc) MMRESULT WINAPI acmFormatChooseA(PACMFORMATCHOOSEA pafmtc)
{ {
return DialogBoxParamA(MSACM_hInstance32, MAKEINTRESOURCEA(DLG_ACMFORMATCHOOSE_ID), ACMFORMATCHOOSEW afcw;
pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc); MMRESULT ret;
LPWSTR title = NULL;
LPWSTR name = NULL;
LPWSTR templ = NULL;
DWORD sz;
afcw.cbStruct = sizeof(afcw);
afcw.fdwStyle = pafmtc->fdwStyle;
afcw.hwndOwner = pafmtc->hwndOwner;
afcw.pwfx = pafmtc->pwfx;
afcw.cbwfx = pafmtc->cbwfx;
if (pafmtc->pszTitle)
{
sz = MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTitle, -1, NULL, 0);
if (!(title = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR))))
{
ret = MMSYSERR_NOMEM;
goto done;
}
MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTitle, -1, title, sz);
}
afcw.pszTitle = title;
if (pafmtc->pszName)
{
sz = MultiByteToWideChar(CP_ACP, 0, pafmtc->pszName, -1, NULL, 0);
if (!(name = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR))))
{
ret = MMSYSERR_NOMEM;
goto done;
}
MultiByteToWideChar(CP_ACP, 0, pafmtc->pszName, -1, name, sz);
}
afcw.pszName = name;
afcw.cchName = pafmtc->cchName;
afcw.fdwEnum = pafmtc->fdwEnum;
afcw.pwfxEnum = pafmtc->pwfxEnum;
afcw.hInstance = pafmtc->hInstance;
if (pafmtc->pszTemplateName)
{
sz = MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTemplateName, -1, NULL, 0);
if (!(templ = HeapAlloc(GetProcessHeap(), 0, sz * sizeof(WCHAR))))
{
ret = MMSYSERR_NOMEM;
goto done;
}
MultiByteToWideChar(CP_ACP, 0, pafmtc->pszTemplateName, -1, templ, sz);
}
afcw.pszTemplateName = templ;
/* FIXME: hook procs not supported yet */
if (pafmtc->pfnHook)
{
FIXME("Unsupported hook procs\n");
ret = MMSYSERR_NOTSUPPORTED;
goto done;
}
ret = acmFormatChooseW(&afcw);
if (ret == MMSYSERR_NOERROR)
{
WideCharToMultiByte(CP_ACP, 0, afcw.szFormatTag, -1, pafmtc->szFormatTag, sizeof(pafmtc->szFormatTag),
NULL, NULL);
WideCharToMultiByte(CP_ACP, 0, afcw.szFormat, -1, pafmtc->szFormat, sizeof(pafmtc->szFormat),
NULL, NULL);
if (pafmtc->pszName)
WideCharToMultiByte(CP_ACP, 0, afcw.pszName, -1, pafmtc->pszName, pafmtc->cchName, NULL, NULL);
}
done:
HeapFree(GetProcessHeap(), 0, title);
HeapFree(GetProcessHeap(), 0, name);
HeapFree(GetProcessHeap(), 0, templ);
return ret;
} }
/*********************************************************************** /***********************************************************************
@ -282,9 +356,16 @@ MMRESULT WINAPI acmFormatChooseA(PACMFORMATCHOOSEA pafmtc)
*/ */
MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc) MMRESULT WINAPI acmFormatChooseW(PACMFORMATCHOOSEW pafmtc)
{ {
FIXME("(%p): stub\n", pafmtc); if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE)
SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return DialogBoxIndirectParamW(MSACM_hInstance32, (LPCDLGTEMPLATEW)pafmtc->hInstance,
return MMSYSERR_ERROR; pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc);
if (pafmtc->fdwStyle & ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)
return DialogBoxParamW(pafmtc->hInstance, pafmtc->pszTemplateName,
pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc);
return DialogBoxParamW(MSACM_hInstance32, MAKEINTRESOURCEW(DLG_ACMFORMATCHOOSE_ID),
pafmtc->hwndOwner, FormatChooseDlgProc, (LPARAM)pafmtc);
} }
/*********************************************************************** /***********************************************************************
@ -815,12 +896,12 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
ACMFORMATTAGENUMCBW fnCallback, ACMFORMATTAGENUMCBW fnCallback,
DWORD_PTR dwInstance, DWORD fdwEnum) DWORD_PTR dwInstance, DWORD fdwEnum)
{ {
PWINE_ACMDRIVERID padid; PWINE_ACMDRIVERID padid;
unsigned int i; unsigned int i;
BOOL bPcmDone = FALSE; BOOL bPcmDone = FALSE;
TRACE("(%p, %p, %p, %ld, %d)\n", TRACE("(%p, %p, %p, %ld, %d)\n",
had, paftd, fnCallback, dwInstance, fdwEnum); had, paftd, fnCallback, dwInstance, fdwEnum);
if (!paftd) if (!paftd)
return MMSYSERR_INVALPARAM; return MMSYSERR_INVALPARAM;
@ -841,63 +922,60 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
/* if (had) FIXME("had != NULL, not supported\n"); */ /* if (had) FIXME("had != NULL, not supported\n"); */
if (had) { if (had) {
if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR)
return MMSYSERR_INVALHANDLE;
if (acmDriverID((HACMOBJ)had, (HACMDRIVERID *)&padid, 0) != MMSYSERR_NOERROR) for (i = 0; i < padid->cFormatTags; i++) {
return MMSYSERR_INVALHANDLE; paftd->dwFormatTagIndex = i;
if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS,
for (i = 0; i < padid->cFormatTags; i++) { (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) {
paftd->dwFormatTagIndex = i; if (paftd->dwFormatTag == WAVE_FORMAT_PCM) {
if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, if (paftd->szFormatTag[0] == 0)
(LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag,
if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { sizeof(paftd->szFormatTag)/sizeof(WCHAR) );
if (paftd->szFormatTag[0] == 0) /* (WS) I'm preserving this PCM hack since it seems to be
MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, * correct. Please notice this block was borrowed from
sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); * below.
/* (WS) I'm preserving this PCM hack since it seems to be */
* correct. Please notice this block was borrowed from if (bPcmDone) continue;
* below. bPcmDone = TRUE;
*/ }
if (bPcmDone) continue; if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport))
bPcmDone = TRUE; return MMSYSERR_NOERROR;
} }
if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) }
return MMSYSERR_NOERROR;
}
}
} }
/* if had==0 then search for the first suitable driver */ /* if had==0 then search for the first suitable driver */
else { else {
for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) { for (padid = MSACM_pFirstACMDriverID; padid; padid = padid->pNextACMDriverID) {
/* should check for codec only */ /* should check for codec only */
if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) && if (!(padid->fdwSupport & ACMDRIVERDETAILS_SUPPORTF_DISABLED) &&
acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) { acmDriverOpen(&had, (HACMDRIVERID)padid, 0) == MMSYSERR_NOERROR) {
for (i = 0; i < padid->cFormatTags; i++) { for (i = 0; i < padid->cFormatTags; i++) {
paftd->dwFormatTagIndex = i; paftd->dwFormatTagIndex = i;
if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS, if (MSACM_Message(had, ACMDM_FORMATTAG_DETAILS,
(LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) {
if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) {
if (paftd->szFormatTag[0] == 0) if (paftd->szFormatTag[0] == 0)
MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag,
sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); sizeof(paftd->szFormatTag)/sizeof(WCHAR) );
/* FIXME (EPP): I'm not sure this is the correct /* FIXME (EPP): I'm not sure this is the correct
* algorithm (should make more sense to apply the same * algorithm (should make more sense to apply the same
* for all already loaded formats, but this will do * for all already loaded formats, but this will do
* for now * for now
*/ */
if (bPcmDone) continue; if (bPcmDone) continue;
bPcmDone = TRUE; bPcmDone = TRUE;
} }
if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) { if (!(fnCallback)((HACMDRIVERID)padid, paftd, dwInstance, padid->fdwSupport)) {
acmDriverClose(had, 0); acmDriverClose(had, 0);
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
} }
} }
acmDriverClose(had, 0); acmDriverClose(had, 0);
} }
} }
} }
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }

13
reactos/dll/win32/msacm32/internal.c
View file

@ -362,8 +362,8 @@ void MSACM_RegisterAllDrivers(void)
'W','i','n','d','o','w','s',' ','N','T','\\', 'W','i','n','d','o','w','s',' ','N','T','\\',
'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\',
'D','r','i','v','e','r','s','3','2','\0'}; 'D','r','i','v','e','r','s','3','2','\0'};
DWORD i, cnt = 0, bufLen, lRet; DWORD i, cnt, bufLen, lRet, type;
WCHAR buf[2048], *name, *s; WCHAR buf[2048], valname[64], *name, *s;
FILETIME lastWrite; FILETIME lastWrite;
HKEY hKey; HKEY hKey;
@ -383,6 +383,15 @@ void MSACM_RegisterAllDrivers(void)
*name = 0; *name = 0;
MSACM_RegisterDriver(buf, name + 1, 0); MSACM_RegisterDriver(buf, name + 1, 0);
} }
i = 0;
cnt = sizeof(valname) / sizeof(*valname);
bufLen = sizeof(buf);
while(RegEnumValueW(hKey, i, valname, &cnt, 0,
&type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){
if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW)))
MSACM_RegisterDriver(valname, buf, 0);
++i;
}
RegCloseKey( hKey ); RegCloseKey( hKey );
} }

4
reactos/dll/win32/msacm32/msacm32_main.c
View file

@ -57,9 +57,8 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
break; break;
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
MSACM_UnregisterAllDrivers(); MSACM_UnregisterAllDrivers();
if (lpvReserved) break;
HeapDestroy(MSACM_hHeap); HeapDestroy(MSACM_hHeap);
MSACM_hHeap = NULL;
MSACM_hInstance32 = NULL;
break; break;
default: default:
break; break;
@ -89,6 +88,7 @@ DWORD WINAPI acmGetVersion(void)
return 0x04000565; /* 4.0.1381 */ return 0x04000565; /* 4.0.1381 */
default: default:
FIXME("%x not supported\n", version.dwPlatformId); FIXME("%x not supported\n", version.dwPlatformId);
/* fall through */
case VER_PLATFORM_WIN32_WINDOWS: case VER_PLATFORM_WIN32_WINDOWS:
return 0x04030000; /* 4.3.0 */ return 0x04030000; /* 4.3.0 */
} }

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

@ -157,7 +157,7 @@ static inline unsigned char C168(short s)
/*********************************************************************** /***********************************************************************
* R16 * R16
* *
* Read a 16 bit sample (correctly handles endianess) * Read a 16 bit sample (correctly handles endianness)
*/ */
static inline short R16(const unsigned char* src) static inline short R16(const unsigned char* src)
{ {
@ -167,7 +167,7 @@ static inline short R16(const unsigned char* src)
/*********************************************************************** /***********************************************************************
* W16 * W16
* *
* Write a 16 bit sample (correctly handles endianess) * Write a 16 bit sample (correctly handles endianness)
*/ */
static inline void W16(unsigned char* dst, short s) static inline void W16(unsigned char* dst, short s)
{ {

1
reactos/dll/win32/msacm32/stream.c
View file

@ -259,6 +259,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had,
TRACE("%s => %08x\n", debugstr_w(wadi->pszDriverAlias), ret); TRACE("%s => %08x\n", debugstr_w(wadi->pszDriverAlias), ret);
if (ret == MMSYSERR_NOERROR) { if (ret == MMSYSERR_NOERROR) {
if (fdwOpen & ACM_STREAMOPENF_QUERY) { if (fdwOpen & ACM_STREAMOPENF_QUERY) {
MSACM_Message((HACMDRIVER)wad, ACMDM_STREAM_CLOSE, (LPARAM)&was->drvInst, 0);
acmDriverClose(had, 0L); acmDriverClose(had, 0L);
} }
break; break;

50
reactos/dll/win32/msacm32/wineacm.h
View file

@ -110,43 +110,43 @@ typedef struct _WINE_ACMNOTIFYWND
} WINE_ACMNOTIFYWND; } WINE_ACMNOTIFYWND;
/* From internal.c */ /* From internal.c */
extern HANDLE MSACM_hHeap; extern HANDLE MSACM_hHeap DECLSPEC_HIDDEN;
extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID; extern PWINE_ACMDRIVERID MSACM_pFirstACMDriverID DECLSPEC_HIDDEN;
extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName, extern PWINE_ACMDRIVERID MSACM_RegisterDriver(LPCWSTR pszDriverAlias, LPCWSTR pszFileName,
PWINE_ACMLOCALDRIVER pLocalDriver); PWINE_ACMLOCALDRIVER pLocalDriver) DECLSPEC_HIDDEN;
extern void MSACM_RegisterAllDrivers(void); extern void MSACM_RegisterAllDrivers(void) DECLSPEC_HIDDEN;
extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p); extern PWINE_ACMDRIVERID MSACM_UnregisterDriver(PWINE_ACMDRIVERID p) DECLSPEC_HIDDEN;
extern void MSACM_UnregisterAllDrivers(void); extern void MSACM_UnregisterAllDrivers(void) DECLSPEC_HIDDEN;
extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID); extern PWINE_ACMDRIVERID MSACM_GetDriverID(HACMDRIVERID hDriverID) DECLSPEC_HIDDEN;
extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver); extern PWINE_ACMDRIVER MSACM_GetDriver(HACMDRIVER hDriver) DECLSPEC_HIDDEN;
extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver); extern PWINE_ACMNOTIFYWND MSACM_GetNotifyWnd(HACMDRIVERID hDriver) DECLSPEC_HIDDEN;
extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type); extern PWINE_ACMOBJ MSACM_GetObj(HACMOBJ hObj, DWORD type) DECLSPEC_HIDDEN;
extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM); extern MMRESULT MSACM_Message(HACMDRIVER, UINT, LPARAM, LPARAM) DECLSPEC_HIDDEN;
extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD); extern BOOL MSACM_FindFormatTagInCache(const WINE_ACMDRIVERID*, DWORD, LPDWORD) DECLSPEC_HIDDEN;
extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD); extern void MSACM_RePositionDriver(PWINE_ACMDRIVERID, DWORD) DECLSPEC_HIDDEN;
extern void MSACM_WriteCurrentPriorities(void); extern void MSACM_WriteCurrentPriorities(void) DECLSPEC_HIDDEN;
extern void MSACM_BroadcastNotification(void); extern void MSACM_BroadcastNotification(void) DECLSPEC_HIDDEN;
extern void MSACM_DisableNotifications(void); extern void MSACM_DisableNotifications(void) DECLSPEC_HIDDEN;
extern void MSACM_EnableNotifications(void); extern void MSACM_EnableNotifications(void) DECLSPEC_HIDDEN;
extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg); extern PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNotifyMsg) DECLSPEC_HIDDEN;
extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*); extern PWINE_ACMNOTIFYWND MSACM_UnRegisterNotificationWindow(const WINE_ACMNOTIFYWND*) DECLSPEC_HIDDEN;
extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry); extern PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) DECLSPEC_HIDDEN;
extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc); extern PWINE_ACMLOCALDRIVER MSACM_RegisterLocalDriver(HMODULE hModule, DRIVERPROC lpDriverProc) DECLSPEC_HIDDEN;
extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM); extern PWINE_ACMLOCALDRIVERINST MSACM_OpenLocalDriver(PWINE_ACMLOCALDRIVER, LPARAM) DECLSPEC_HIDDEN;
extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST); extern LRESULT MSACM_CloseLocalDriver(PWINE_ACMLOCALDRIVERINST) DECLSPEC_HIDDEN;
/* /*
extern PWINE_ACMLOCALDRIVER MSACM_GetLocalDriver(HACMDRIVER hDriver); extern PWINE_ACMLOCALDRIVER MSACM_GetLocalDriver(HACMDRIVER hDriver);
*/ */
/* From msacm32.c */ /* From msacm32.c */
extern HINSTANCE MSACM_hInstance32; extern HINSTANCE MSACM_hInstance32 DECLSPEC_HIDDEN;
/* From pcmcnvtr.c */ /* From pcmcnvtr.c */
LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
LPARAM dwParam1, LPARAM dwParam2); LPARAM dwParam1, LPARAM dwParam2) DECLSPEC_HIDDEN;
/* Dialog box templates */ /* Dialog box templates */
#include <msacmdlg.h> #include <msacmdlg.h>

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

@ -105,7 +105,7 @@ reactos/dll/win32/mciwave # Synced to Wine-1.5.19
reactos/dll/win32/mlang # Synced to Wine-1.7.1 reactos/dll/win32/mlang # Synced to Wine-1.7.1
reactos/dll/win32/mpr # Synced to Wine-1.7.1 reactos/dll/win32/mpr # Synced to Wine-1.7.1
reactos/dll/win32/mprapi # Synced to Wine-1.5.19 reactos/dll/win32/mprapi # Synced to Wine-1.5.19
reactos/dll/win32/msacm32 # Autosync reactos/dll/win32/msacm32 # Synced to Wine-1.7.1
reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.19 reactos/dll/win32/msadp32.acm # Synced to Wine-1.5.19
reactos/dll/win32/mscat32 # Synced to Wine-1.5.19 reactos/dll/win32/mscat32 # Synced to Wine-1.5.19
reactos/dll/win32/mscms # Synced to Wine-1.5.4 reactos/dll/win32/mscms # Synced to Wine-1.5.4