ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmsystem.dll16: Fix mapping of MCI_WINDOW structures between 16 and 32 bit.

This commit is contained in:
Damjan Jovanovic 2011-05-03 07:26:44 +02:00 committed by Alexandre Julliard
parent 0f9370aecb
commit 8eb6b8bcb6
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/mmsystem.dll16/mci16.c
View File

@ -193,12 +193,21 @@ static MMSYSTEM_MapType MCI_MapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR* l
} }
return MMSYSTEM_MAP_OKMEM; return MMSYSTEM_MAP_OKMEM;
case MCI_WINDOW: case MCI_WINDOW:
/* in fact, I would also need the dwFlags... to see {
* which members of lParam are effectively used LPMCI_OVLY_WINDOW_PARMSW mowp32w = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MCI_OVLY_WINDOW_PARMSW));
*/ LPMCI_OVLY_WINDOW_PARMS16 mowp16 = MapSL(*lParam);
*lParam = (DWORD)MapSL(*lParam); if (mowp32w) {
FIXME("Current mapping may be wrong\n"); mowp32w->dwCallback = mowp16->dwCallback;
break; mowp32w->hWnd = HWND_32(mowp16->hWnd);
mowp32w->nCmdShow = mowp16->nCmdShow;
if (dwFlags & (MCI_DGV_WINDOW_TEXT | MCI_OVLY_WINDOW_TEXT))
mowp32w->lpstrText = MCI_strdupAtoW(MapSL(mowp16->lpstrText));
} else {
return MMSYSTEM_MAP_NOMEM;
}
*lParam = (DWORD)mowp32w;
}
return MMSYSTEM_MAP_OKMEM;
case MCI_BREAK: case MCI_BREAK:
{ {
LPMCI_BREAK_PARMS mbp32 = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_BREAK_PARMS)); LPMCI_BREAK_PARMS mbp32 = HeapAlloc(GetProcessHeap(), 0, sizeof(MCI_BREAK_PARMS));
@ -399,8 +408,12 @@ static MMSYSTEM_MapType MCI_UnMapMsg16To32W(WORD wMsg, DWORD dwFlags, DWORD_PTR
} }
return MMSYSTEM_MAP_OK; return MMSYSTEM_MAP_OK;
case MCI_WINDOW: case MCI_WINDOW:
/* FIXME ?? see Map function */ if (lParam) {
return MMSYSTEM_MAP_OK; LPMCI_OVLY_WINDOW_PARMSW mowp32w = (LPMCI_OVLY_WINDOW_PARMSW)lParam;
HeapFree(GetProcessHeap(), 0, (LPVOID)mowp32w->lpstrText);
HeapFree(GetProcessHeap(), 0, mowp32w);
}
return MMSYSTEM_MAP_OK;
case MCI_BREAK: case MCI_BREAK:
HeapFree(GetProcessHeap(), 0, (LPVOID)lParam); HeapFree(GetProcessHeap(), 0, (LPVOID)lParam);