Make MCIWnd play a bit better as an MDI child.
This commit is contained in:
parent
50a783f734
commit
21272b31aa
|
@ -417,16 +417,15 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa
|
||||||
TRACE("%p %04x %08x %08lx\n", hWnd, wMsg, wParam, lParam);
|
TRACE("%p %04x %08x %08lx\n", hWnd, wMsg, wParam, lParam);
|
||||||
|
|
||||||
mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0);
|
mwi = (MCIWndInfo*)GetWindowLongW(hWnd, 0);
|
||||||
if (!mwi)
|
if (!mwi && wMsg != WM_CREATE)
|
||||||
{
|
|
||||||
if (wMsg == WM_CREATE)
|
|
||||||
return MCIWND_Create(hWnd, (CREATESTRUCTW *)lParam);
|
|
||||||
|
|
||||||
return DefWindowProcW(hWnd, wMsg, wParam, lParam);
|
return DefWindowProcW(hWnd, wMsg, wParam, lParam);
|
||||||
}
|
|
||||||
|
|
||||||
switch (wMsg)
|
switch (wMsg)
|
||||||
{
|
{
|
||||||
|
case WM_CREATE:
|
||||||
|
MCIWND_Create(hWnd, (CREATESTRUCTW *)lParam);
|
||||||
|
break;
|
||||||
|
|
||||||
case WM_DESTROY:
|
case WM_DESTROY:
|
||||||
if (mwi->uTimer)
|
if (mwi->uTimer)
|
||||||
KillTimer(hWnd, mwi->uTimer);
|
KillTimer(hWnd, mwi->uTimer);
|
||||||
|
@ -439,7 +438,7 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa
|
||||||
DestroyWindow(GetDlgItem(hWnd, CTL_MENU));
|
DestroyWindow(GetDlgItem(hWnd, CTL_MENU));
|
||||||
DestroyWindow(GetDlgItem(hWnd, CTL_PLAYSTOP));
|
DestroyWindow(GetDlgItem(hWnd, CTL_PLAYSTOP));
|
||||||
DestroyWindow(GetDlgItem(hWnd, CTL_TRACKBAR));
|
DestroyWindow(GetDlgItem(hWnd, CTL_TRACKBAR));
|
||||||
return 0;
|
break;
|
||||||
|
|
||||||
case WM_PAINT:
|
case WM_PAINT:
|
||||||
{
|
{
|
||||||
|
@ -468,14 +467,12 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case WM_SIZE:
|
case WM_SIZE:
|
||||||
{
|
SetWindowPos(GetDlgItem(hWnd, CTL_PLAYSTOP), 0, 0, HIWORD(lParam) - 32, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
|
||||||
SetWindowPos(GetDlgItem(hWnd, CTL_PLAYSTOP), 0, 0, HIWORD(lParam) - 32, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
|
SetWindowPos(GetDlgItem(hWnd, CTL_MENU), 0, 32, HIWORD(lParam) - 32, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
|
||||||
SetWindowPos(GetDlgItem(hWnd, CTL_MENU), 0, 32, HIWORD(lParam) - 32, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
|
SetWindowPos(GetDlgItem(hWnd, CTL_TRACKBAR), 0, 64, HIWORD(lParam) - 32, LOWORD(lParam) - 64, 32, SWP_NOACTIVATE);
|
||||||
SetWindowPos(GetDlgItem(hWnd, CTL_TRACKBAR), 0, 64, HIWORD(lParam) - 32, LOWORD(lParam) - 64, 32, SWP_NOACTIVATE);
|
|
||||||
|
|
||||||
MCIWND_notify_size(mwi);
|
MCIWND_notify_size(mwi);
|
||||||
return 0;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
case MM_MCINOTIFY:
|
case MM_MCINOTIFY:
|
||||||
MCIWND_notify_mode(mwi);
|
MCIWND_notify_mode(mwi);
|
||||||
|
|
Loading…
Reference in New Issue