April 2022 - Wine-commits - list.winehq.org

Zebediah Figura : user32: Do not call the lparam for WM_SYSTIMER messages.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: ea4353858d96235f362c5f94c9c5e0e83ad04edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea4353858d96235f362c5f94… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 19:15:33 2022 -0500 user32: Do not call the lparam for WM_SYSTIMER messages. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 376ff2193e3..990323dde65 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -861,22 +861,19 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) LRESULT retval; /* Process timer messages */ - if ((msg->message == WM_TIMER) || (msg->message == WM_SYSTIMER)) + if (msg->lParam && msg->message == WM_TIMER) { - if (msg->lParam) + __TRY { - __TRY - { - retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, - msg->message, msg->wParam, GetTickCount() ); - } - __EXCEPT_ALL - { - retval = 0; - } - __ENDTRY - return retval; + retval = CallWindowProcA( (WNDPROC)msg->lParam, msg->hwnd, + msg->message, msg->wParam, GetTickCount() ); + } + __EXCEPT_ALL + { + retval = 0; } + __ENDTRY + return retval; } return NtUserDispatchMessageA( msg ); }

1 0

Timo Zuccarello : winex11.drv: Do not assign reserved virtual key 0xE0 to key codes.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: a54755c87c0f12041585923cf09af7d239fb3e20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a54755c87c0f12041585923c… Author: Timo Zuccarello <timo(a)zuccarello.eu> Date: Wed Apr 13 16:04:18 2022 +0200 winex11.drv: Do not assign reserved virtual key 0xE0 to key codes. Signed-off-by: Timo Zuccarello <timo(a)zuccarello.eu> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/keyboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 786b6f4e084..170231c0026 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1579,7 +1579,8 @@ void X11DRV_InitKeyboard( Display *display ) WORD first, last; } vkey_ranges[] = { { VK_OEM_1, VK_OEM_3 }, - { VK_OEM_4, VK_ICO_00 }, + { VK_OEM_4, VK_OEM_8 }, + { VK_OEM_AX, VK_ICO_00 }, { 0xe6, 0xe6 }, { 0xe9, 0xf5 }, { VK_OEM_NEC_EQUAL, VK_OEM_NEC_EQUAL },

1 0

Zhiyi Zhang : user32/tests: Avoid unnecessary display mode changes.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 6c784f2c4648f12b75309aa3d2f1801bb0ac8528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c784f2c4648f12b75309aa3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:14 2022 +0800 user32/tests: Avoid unnecessary display mode changes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d0d4ff1f324..fdb13216ad9 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -484,8 +484,6 @@ static void test_ChangeDisplaySettingsEx(void) } if (pSetThreadDpiAwarenessContext && context) pSetThreadDpiAwarenessContext(context); - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "Failed to reset default resolution: %ld\n", res); /* Save the original mode for all devices so that they can be restored at the end of tests */ device_count = 0; @@ -568,10 +566,6 @@ static void test_ChangeDisplaySettingsEx(void) broken(res == DISP_CHANGE_BADPARAM) || /* win10 */ broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ "ChangeDisplaySettingsExA %s returned unexpected %ld\n", devices[0].name, res); - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || - broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ - "ChangeDisplaySettingsExA %s returned unexpected %ld\n", devices[0].name, res); } /* Test that only specifying DM_POSITION in dmFields is not enough to detach an adapter */ @@ -2260,34 +2254,13 @@ static void test_display_dc(void) SelectObject(mem_dc, old_hbitmap); DeleteDC(mem_dc); - /* Tests after mode changes to a different resolution */ - memset(&dm2, 0, sizeof(dm2)); - dm2.dmSize = sizeof(dm2); - for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) - { - if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight) - break; - } - ok(dm2.dmPelsWidth && dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight, - "Failed to find a different resolution.\n"); - - res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), /* Win8 TestBots */ - "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); - if (res == DISP_CHANGE_SUCCESSFUL) - { - check_display_dc(hdc, &dm2, FALSE); - - res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); - } - - /* Tests after mode changes to a different color depth */ + /* Tests after mode changes to a mode with different resolution and color depth */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) { - if (dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) + if (dm2.dmPelsWidth != dm.dmPelsWidth && dm2.dmPelsHeight != dm.dmPelsHeight && + dm2.dmBitsPerPel != dm.dmBitsPerPel && dm2.dmBitsPerPel != 1) break; } if (dm2.dmBitsPerPel && dm2.dmBitsPerPel != dm.dmBitsPerPel) @@ -2357,7 +2330,7 @@ static void test_display_dc(void) } else { - win_skip("Failed to find a different color depth other than %lu.\n", dm.dmBitsPerPel); + win_skip("Failed to find a required display mode.\n"); } if (hbitmap)

1 0

Zhiyi Zhang : user32/tests: Test NUMCOLORS for display DCs.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: bfed4330245fe08c72fb317db02f8eddfd305767 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfed4330245fe08c72fb317d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:29 2022 +0800 user32/tests: Test NUMCOLORS for display DCs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 92 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index fdb13216ad9..e595072c747 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -2187,8 +2187,10 @@ static void _check_display_dc(INT line, HDC hdc, const DEVMODEA *dm, BOOL allow_ static void test_display_dc(void) { static const INT bpps[] = {1, 4, 8, 16, 24, 32}; + unsigned char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; + INT count, old_count, i, bpp, value; HBITMAP hbitmap, old_hbitmap; - INT count, old_count, i, bpp; DWORD device_idx, mode_idx; DEVMODEA dm, dm2, dm3; DISPLAY_DEVICEA dd; @@ -2241,7 +2243,95 @@ static void test_display_dc(void) winetest_pop_context(); } + /* Test selecting a DIB of a different depth into a display compatible DC */ + for (i = 0; i < ARRAY_SIZE(bpps); ++i) + { + winetest_push_context("bpp %d", bpps[i]); + + mem_dc = CreateCompatibleDC(hdc); + memset(buffer, 0, sizeof(buffer)); + bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); + bmi->bmiHeader.biWidth = dm.dmPelsWidth; + bmi->bmiHeader.biHeight = dm.dmPelsHeight; + bmi->bmiHeader.biBitCount = bpps[i]; + bmi->bmiHeader.biPlanes = 1; + bmi->bmiHeader.biCompression = BI_RGB; + hbitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + ok(!!hbitmap, "CreateDIBSection failed, error %ld.\n", GetLastError()); + old_hbitmap = SelectObject(mem_dc, hbitmap); + ok(!!old_hbitmap, "Failed to select bitmap.\n"); + + value = GetDeviceCaps(mem_dc, BITSPIXEL); + ok(value == 32, "Expected 32, got %d.\n", value); + value = GetDeviceCaps(mem_dc, NUMCOLORS); + ok(value == -1, "Expected -1, got %d.\n", value); + + SelectObject(mem_dc, old_hbitmap); + DeleteObject(hbitmap); + DeleteDC(mem_dc); + + winetest_pop_context(); + } + + /* Test NUMCOLORS for display DCs */ + for (i = ARRAY_SIZE(bpps) - 1; i >= 0; --i) + { + winetest_push_context("bpp %d", bpps[i]); + + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + if (bpps[i] == dm.dmBitsPerPel) + { + res = DISP_CHANGE_SUCCESSFUL; + } + else + { + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode_idx = 0; EnumDisplaySettingsA(NULL, mode_idx, &dm2); ++mode_idx) + { + if (dm2.dmBitsPerPel == bpps[i]) + break; + } + if (dm2.dmBitsPerPel != bpps[i]) + { + skip("%d-bit display mode not found.\n", bpps[i]); + winetest_pop_context(); + continue; + } + + res = ChangeDisplaySettingsExA(NULL, &dm2, NULL, CDS_RESET, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + } + + if (res == DISP_CHANGE_SUCCESSFUL) + { + value = GetDeviceCaps(hdc, BITSPIXEL); + ok(value == (bpps[i] == 4 ? 1 : bpps[i]), "Expected %d, got %d.\n", + (bpps[i] == 4 ? 1 : bpps[i]), value); + + value = GetDeviceCaps(hdc, NUMCOLORS); + if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) + todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) + ok(value == -1, "Expected -1, got %d.\n", value); + else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) + ok(value > 16 && value <= 256, "Got %d.\n", value); + else + ok(value == 1 << bpps[i], "Expected %d, got %d.\n", 1 << bpps[i], value); + } + winetest_pop_context(); + } + res = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + /* Win8 TestBots */ + ok(res == DISP_CHANGE_SUCCESSFUL || broken(res == DISP_CHANGE_FAILED), + "ChangeDisplaySettingsExA returned unexpected %ld.\n", res); + /* Test selecting a DDB of the same color depth into a display compatible DC */ + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(ret, "EnumDisplaySettingsA failed.\n"); + mem_dc = CreateCompatibleDC(hdc); bpp = GetDeviceCaps(mem_dc, BITSPIXEL); ok(bpp == dm.dmBitsPerPel, "Expected bpp %ld, got %d.\n", dm.dmBitsPerPel, bpp);

1 0

Zhiyi Zhang : win32u: Return -1 for NUMCOLORS with 8-bit display DCs.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: a1dda8c376e11ace204e8b97a9ba9344e400e2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1dda8c376e11ace204e8b97… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 18 14:55:48 2022 +0800 win32u: Return -1 for NUMCOLORS with 8-bit display DCs. According to tests, GetDeviceCaps(NUMCOLORS) returns -1 for display DCs when the current display mode is 8-bit on newer versions of Windows, which makes sense because lower bit depth display modes are actually emulated with 32-bit modes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52679 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 2 +- dlls/win32u/driver.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e595072c747..02bc6651dd3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -3,6 +3,7 @@ * * Copyright 2005 Huw Davies * Copyright 2008 Dmitry Timoshkov + * Copyright 2019-2022 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2314,7 +2315,6 @@ static void test_display_dc(void) value = GetDeviceCaps(hdc, NUMCOLORS); if (bpps[i] > 8 || (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6)) - todo_wine_if(bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) >= 6) ok(value == -1, "Expected -1, got %d.\n", value); else if (bpps[i] == 8 && LOBYTE(LOWORD(GetVersion())) < 6) ok(value > 16 && value <= 256, "Got %d.\n", value); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 37d9333e522..175fde1fa40 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -294,7 +294,8 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = NtGdiGetDeviceCaps( dev->hdc, BITSPIXEL ); - return (bpp > 8) ? -1 : (1 << bpp); + /* Newer versions of Windows return -1 for 8-bit and higher */ + return (bpp > 4) ? -1 : (1 << bpp); case COLORRES: /* The observed correspondence between BITSPIXEL and COLORRES is: * BITSPIXEL: 8 -> COLORRES: 18

1 0

Zebediah Figura : setupapi: Avoid leaking subKey in SETUPDI_AddDeviceInterfaces().
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 93d8a86ce22c0295219cd709eecdee871c37f4b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93d8a86ce22c0295219cd709… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 20 16:18:20 2022 -0500 setupapi: Avoid leaking subKey in SETUPDI_AddDeviceInterfaces(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 77fa26726cc..73e721753aa 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2281,8 +2281,8 @@ static void SETUPDI_AddDeviceInterfaces(struct device *device, HKEY key, (BYTE *)symbolicLink, &len); if (!l && dataType == REG_SZ) SETUPDI_SetInterfaceSymbolicLink(iface, symbolicLink); - RegCloseKey(subKey); } + RegCloseKey(subKey); } } /* Allow enumeration to continue */

1 0

Huw Davies : wineoss: Use separate functions to handle MODM_DATA for FM synths and ports.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 4e90f801f94c5a1279e044e7ca9b3444e7748f85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e90f801f94c5a1279e044e7… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 21 07:52:15 2022 +0100 wineoss: Use separate functions to handle MODM_DATA for FM synths and ports. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 538 ++++++++++++++++++++++++------------------------ 1 file changed, 268 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e90f801f94c5a1279e0…

1 0

Huw Davies : wineoss: Move MODM_DATA to the unixlib.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 2cc89ecc10666a3f11901a3c42c845924db08c66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cc89ecc10666a3f11901a3c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 21 07:52:16 2022 +0100 wineoss: Move MODM_DATA to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 338 +-------------------------------------------- dlls/wineoss.drv/oss.c | 1 - dlls/wineoss.drv/ossmidi.c | 301 +++++++++++++++++++++++++++++++++++++++- dlls/wineoss.drv/unixlib.h | 9 -- 4 files changed, 301 insertions(+), 348 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc89ecc10666a3f1190…

1 0

Huw Davies : wineoss: Move MODM_LONGDATA to the unixlib.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: f1a11cb53cda3084cab04f277c1c67865c523c44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1a11cb53cda3084cab04f27… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 21 07:52:17 2022 +0100 wineoss: Move MODM_LONGDATA to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 128 --------------------------------------------- dlls/wineoss.drv/ossmidi.c | 83 +++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 128 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 1751af2349e..aa672e211b9 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -173,16 +173,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_DONE: - case MOM_POSITIONCB: - if (wDevID > MODM_NumDevs) return; - - dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback; - uFlags = MidiOutDev[wDevID].wFlags; - hDev = MidiOutDev[wDevID].midiDesc.hMidi; - dwInstance = MidiOutDev[wDevID].midiDesc.dwInstance; - break; - case MIM_OPEN: case MIM_CLOSE: case MIM_DATA: @@ -233,40 +223,6 @@ static int midiCloseSeq(int fd) return 0; } -/* FIXME: this is a bad idea, it's even not static... */ -SEQ_DEFINEBUF(1024); - -/* FIXME: this is not reentrant, not static - because of global variable - * _seqbuf and al. - */ -/************************************************************************** - * seqbuf_dump [internal] - * - * Used by SEQ_DUMPBUF to flush the buffer. - * - */ -void seqbuf_dump(void) -{ - int fd; - - /* The device is already open, but there's no way to pass the - fd to this function. Rather than rely on a global variable - we pretend to open the seq again. */ - fd = midiOpenSeq(); - if (_seqbufptr) { - if (write(fd, _seqbuf, _seqbufptr) == -1) { - WARN("Can't write data to sequencer %d, errno %d (%s)!\n", - fd, errno, strerror(errno)); - } - /* FIXME: - * in any case buffer is lost so that if many errors occur the buffer - * will not overrun - */ - _seqbufptr = 0; - } - midiCloseSeq(fd); -} - /************************************************************************** * midReceiveChar [internal] */ @@ -707,88 +663,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modLongData [internal] - */ -static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - int count; - LPBYTE lpData; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize); - - /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure - * but it seems to be used only for midi input. - * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. - */ - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - if (MidiOutDev[wDevID].fd == -1) { - WARN("can't play !\n"); - return MIDIERR_NODEVICE; - } - - lpData = (LPBYTE) lpMidiHdr->lpData; - - if (lpData == NULL) - return MIDIERR_UNPREPARED; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MIDIERR_UNPREPARED; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - - /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive - * data, or can it also contain raw MIDI data, to be split up and sent to - * modShortData() ? - * If the latter is true, then the following WARNing will fire up - */ - if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); - } - - TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); - TRACE(" %02X %02X %02X ... %02X %02X %02X\n", - lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], - lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - /* FIXME: I don't think there is much to do here */ - break; - case MOD_MIDIPORT: - if (lpData[0] != 0xF0) { - /* Send end of System Exclusive */ - SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, 0xF0); - WARN("Adding missing 0xF0 marker at the beginning of " - "system exclusive byte stream\n"); - } - for (count = 0; count < lpMidiHdr->dwBufferLength; count++) { - SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, lpData[count]); - } - if (lpData[count - 1] != 0xF7) { - /* Send end of System Exclusive */ - SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, 0xF7); - WARN("Adding missing 0xF7 marker at the end of " - "system exclusive byte stream\n"); - } - SEQ_DUMPBUF(); - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); - return MMSYSERR_NOERROR; -} - /************************************************************************** * modPrepare [internal] */ @@ -929,8 +803,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_LONGDATA: - return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index ee83da8bfcd..7ab78bcbfdd 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -934,6 +934,86 @@ static UINT midi_out_data(WORD dev_id, UINT data) return MMSYSERR_NOTENABLED; } +static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct notify_context *notify) +{ + struct midi_dest *dest; + BYTE *data; + unsigned int count; + + TRACE("(%04X, %p, %08X);\n", dev_id, hdr, hdr_size); + + /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure + * but it seems to be used only for midi input. + * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. + */ + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + dest = dests + dev_id; + if (!dest->bEnabled) return MIDIERR_NODEVICE; + + if (dest->fd == -1) + { + WARN("can't play !\n"); + return MIDIERR_NODEVICE; + } + + data = (BYTE *)hdr->lpData; + + if (data == NULL) + return MIDIERR_UNPREPARED; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + hdr->dwFlags &= ~MHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + + /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive + * data, or can it also contain raw MIDI data, to be split up and sent to + * modShortData() ? + * If the latter is true, then the following WARNing will fire up + */ + if (data[0] != 0xF0 || data[hdr->dwBufferLength - 1] != 0xF7) + WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); + + TRACE("dwBufferLength=%u !\n", hdr->dwBufferLength); + TRACE(" %02X %02X %02X ... %02X %02X %02X\n", + data[0], data[1], data[2], data[hdr->dwBufferLength - 3], + data[hdr->dwBufferLength - 2], data[hdr->dwBufferLength - 1]); + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + /* FIXME: I don't think there is much to do here */ + break; + case MOD_MIDIPORT: + if (data[0] != 0xF0) + { + /* Send end of System Exclusive */ + SEQ_MIDIOUT(dev_id - num_synths, 0xF0); + WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n"); + } + for (count = 0; count < hdr->dwBufferLength; count++) + SEQ_MIDIOUT(dev_id - num_synths, data[count]); + if (data[count - 1] != 0xF7) + { + /* Send end of System Exclusive */ + SEQ_MIDIOUT(dev_id - num_synths, 0xF7); + WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n"); + } + SEQ_DUMPBUF(); + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_out_notify(notify, dest, dev_id, MOM_DONE, (UINT_PTR)hdr, 0); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -956,6 +1036,9 @@ NTSTATUS midi_out_message(void *args) case MODM_DATA: *params->err = midi_out_data(params->dev_id, params->param_1); break; + case MODM_LONGDATA: + *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED;

1 0

Huw Davies : wineoss: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib.
by Alexandre Julliard 21 Apr '22

21 Apr '22

Module: wine Branch: master Commit: 65ecd7b70078ca0b477c17943cad1e2eb8cb6e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65ecd7b70078ca0b477c1794… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 21 07:52:18 2022 +0100 wineoss: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 39 --------------------------------------- dlls/wineoss.drv/ossmidi.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 39 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index aa672e211b9..9615c9892b9 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -663,41 +663,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modPrepare [internal] - */ -static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * modUnprepare [internal] - */ -static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("(%04X, %p, %d);\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - /************************************************************************** * modGetVolume [internal] */ @@ -803,10 +768,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return OSS_MidiInit(); case DRVM_EXIT: return OSS_MidiExit(); - case MODM_PREPARE: - return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: - return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2); case MODM_GETNUMDEVS: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 7ab78bcbfdd..b97c5159e89 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1014,6 +1014,36 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct return MMSYSERR_NOERROR; } +static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) +{ + TRACE("(%04X, %p, %d);\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1039,6 +1069,12 @@ NTSTATUS midi_out_message(void *args) case MODM_LONGDATA: *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); break; + case MODM_PREPARE: + *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MODM_UNPREPARE: + *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED;

1 0