wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Bernhard Kölbl : gdiplus: Add simple test for bitmap clone from rgb values to indexed.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: d3275f5f6a5a3d78615ed1991efc446e91ed4855 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3275f5f6a5a3d78615ed199… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 29 15:28:34 2021 +0100 gdiplus: Add simple test for bitmap clone from rgb values to indexed. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 2175c1748e0..ca08ae49ad7 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -5102,9 +5102,44 @@ static void test_PARGB_conversion(void) static void test_CloneBitmapArea(void) { + /* 3x3 pixeldata in various formats: red, green, blue, yellow, turquoise, pink, black, gray, white */ + static BYTE bmp_3x3_data_32bpp_argb[] = { + 0xff,0x00,0x00,0xff, 0x00,0xff,0x00,0xff, 0x00,0x00,0xff,0xff, + 0xff,0xff,0x00,0xff, 0x00,0xff,0xff,0xff, 0xff,0x00,0xff,0xff, + 0xff,0xff,0xff,0xff, 0x80,0x80,0x80,0xff, 0x00,0x00,0x00,0xff + }; + static BYTE bmp_3x3_data_32bpp_rgb[] = { + 0xff,0x00,0x00,0x00, 0x00,0xff,0x00,0x00, 0x00,0x00,0xff,0x00, + 0xff,0xff,0x00,0x00, 0x00,0xff,0xff,0x00, 0xff,0x00,0xff,0x00, + 0xff,0xff,0xff,0x00, 0x80,0x80,0x80,0x00, 0x00,0x00,0x00,0x00 + }; + static BYTE bmp_3x3_data_24bpp_rgb[] = { + 0xff,0x00,0x00, 0x00,0xff,0x00, 0x00,0x00,0xff, + 0xff,0xff,0x00, 0x00,0xff,0xff, 0xff,0x00,0xff, + 0xff,0xff,0xff, 0x80,0x80,0x80, 0x00,0x00,0x00 + }; + + static const struct test_data { + BYTE *src_pixeldata; + PixelFormat src_format; + PixelFormat dst_format; + } td[] = + { + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_32bpp_argb, PixelFormat32bppARGB, PixelFormat1bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_32bpp_rgb, PixelFormat32bppRGB, PixelFormat1bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat8bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat4bppIndexed }, + { bmp_3x3_data_24bpp_rgb, PixelFormat24bppRGB, PixelFormat1bppIndexed }, + }; + GpStatus status; GpBitmap *bitmap, *copy; BitmapData data, data2; + INT x, y, i; status = GdipCreateBitmapFromScan0(1, 1, 0, PixelFormat24bppRGB, NULL, &bitmap); expect(Ok, status); @@ -5123,6 +5158,40 @@ static void test_CloneBitmapArea(void) GdipDisposeImage((GpImage *)copy); GdipDisposeImage((GpImage *)bitmap); + + for(i=0; i<ARRAY_SIZE(td); i++) + { + status = GdipCreateBitmapFromScan0(3, 3, 4*3, td[i].src_format, td[i].src_pixeldata, &bitmap); + expect(Ok, status); + + status = GdipCloneBitmapAreaI(0, 0, 3, 3, td[i].dst_format, bitmap, &copy); + expect(Ok, status); + + for (y=0; y<3; y++) + for (x=0; x<3; x++) + { + BOOL match; + ARGB color_orig; + ARGB color_copy; + + status = GdipBitmapGetPixel(bitmap, x, y, &color_orig); + expect(Ok, status); + + status = GdipBitmapGetPixel(copy, x, y, &color_copy); + expect(Ok, status); + + if(td[i].dst_format == PixelFormat1bppIndexed) + color_orig = (color_orig >> 16 & 0xff) + (color_orig >> 8 & 0xff) + (color_orig & 0xff) + > 0x17d ? 0xffffffff : 0xff000000; + + match = color_match(color_orig, color_copy, 0x00); + ok(match == TRUE, "Colors 0x%08x and 0x%08x do not match! (Conversion from %x to %x)\n", + color_orig, color_copy, td[i].src_format, td[i].dst_format); + } + + GdipDisposeImage((GpImage *)copy); + GdipDisposeImage((GpImage *)bitmap); + } } static void test_supported_encoders(void)

1 0

Bernhard Kölbl : gdiplus: Introduce dst palette parameter to convert_pixels().
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: ec29292141ac39d2f7625ddae8e1547dd818eabd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec29292141ac39d2f7625dda… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Nov 29 15:28:33 2021 +0100 gdiplus: Introduce dst palette parameter to convert_pixels(). Make it possible to define a destination colour palette when using convert_pixels(), so converting a bitmap from a non indexed format to an indexed format does not produce an empty image. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 4 ++-- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 20 +++++++++++--------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 22213e9f278..7ae8cc564c9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -207,8 +207,8 @@ extern void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) DECLSPEC_HIDDEN; extern GpStatus convert_pixels(INT width, INT height, - INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, - INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *palette) DECLSPEC_HIDDEN; + INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, ColorPalette *dst_palette, + INT src_stride, const BYTE *src_bits, PixelFormat src_format, ColorPalette *src_palette) DECLSPEC_HIDDEN; extern PixelFormat apply_image_attributes(const GpImageAttributes *attributes, LPBYTE data, UINT width, UINT height, INT stride, ColorAdjustType type, PixelFormat fmt) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4a428c49869..65cdf96510d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3350,7 +3350,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image dst_format = PixelFormat32bppRGB; convert_pixels(bitmap->width, bitmap->height, - bitmap->width*4, temp_bits, dst_format, + bitmap->width*4, temp_bits, dst_format, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 862f7fea111..518a9bf8689 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -591,8 +591,9 @@ GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, GpStatus convert_pixels(INT width, INT height, INT dst_stride, BYTE *dst_bits, PixelFormat dst_format, + ColorPalette *dst_palette, INT src_stride, const BYTE *src_bits, PixelFormat src_format, - ColorPalette *palette) + ColorPalette *src_palette) { INT x, y; @@ -612,7 +613,7 @@ GpStatus convert_pixels(INT width, INT height, ARGB argb; \ BYTE *color = (BYTE *)&argb; \ getpixel_function(&index, src_bits+src_stride*y, x); \ - argb = (palette && index < palette->Count) ? palette->Entries[index] : 0; \ + argb = (src_palette && index < src_palette->Count) ? src_palette->Entries[index] : 0; \ setpixel_function(color[2], color[1], color[0], color[3], dst_bits+dst_stride*y, x); \ } \ return Ok; \ @@ -633,7 +634,7 @@ GpStatus convert_pixels(INT width, INT height, for (x=0; x<width; x++) { \ BYTE r, g, b, a; \ getpixel_function(&r, &g, &b, &a, src_bits+src_stride*y, x); \ - setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, palette); \ + setpixel_function(r, g, b, a, dst_bits+dst_stride*y, x, dst_palette); \ } \ return Ok; \ } while (0); @@ -1137,7 +1138,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, /* Make sure we can convert to the requested format. */ if (flags & ImageLockModeRead) { - stat = convert_pixels(0, 0, 0, NULL, format, 0, NULL, bitmap->format, NULL); + stat = convert_pixels(0, 0, 0, NULL, format, NULL, 0, NULL, bitmap->format, NULL); if (stat == NotImplemented) { FIXME("cannot read bitmap from %x to %x\n", bitmap->format, format); @@ -1150,7 +1151,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, * the original format. */ if (flags & ImageLockModeWrite) { - stat = convert_pixels(0, 0, 0, NULL, bitmap->format, 0, NULL, format, NULL); + stat = convert_pixels(0, 0, 0, NULL, bitmap->format, NULL, 0, NULL, format, NULL); if (stat == NotImplemented) { FIXME("cannot write bitmap from %x to %x\n", format, bitmap->format); @@ -1190,7 +1191,7 @@ GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap* bitmap, GDIPCONST GpRect* rect, } stat = convert_pixels(act_rect.Width, act_rect.Height, - lockeddata->Stride, lockeddata->Scan0, format, + lockeddata->Stride, lockeddata->Scan0, format, bitmap->image.palette, bitmap->stride, bitmap->bits + bitmap->stride * act_rect.Y + PIXELFORMATBPP(bitmap->format) * act_rect.X / 8, bitmap->format, bitmap->image.palette); @@ -1267,10 +1268,11 @@ GpStatus WINGDIPAPI GdipBitmapUnlockBits(GpBitmap* bitmap, fixme = TRUE; } + /* FIXME: Pass src_palette generated from lockeddata->PixelFormat. */ stat = convert_pixels(lockeddata->Width, lockeddata->Height, bitmap->stride, bitmap->bits + bitmap->stride * bitmap->locky + PIXELFORMATBPP(bitmap->format) * bitmap->lockx / 8, - bitmap->format, + bitmap->format, bitmap->image.palette, lockeddata->Stride, lockeddata->Scan0, lockeddata->PixelFormat, NULL); if (stat != Ok) @@ -1314,7 +1316,7 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height, if (stat == Ok) { stat = convert_pixels(area.Width, area.Height, (*dstBitmap)->stride, (*dstBitmap)->bits, (*dstBitmap)->format, - srcBitmap->stride, + (*dstBitmap)->image.palette, srcBitmap->stride, srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8, srcBitmap->format, srcBitmap->image.palette); @@ -1545,7 +1547,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, } stat = convert_pixels(width, height, -width*4, - bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, + bits + (width * 4 * (height - 1)), PixelFormat32bppPARGB, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette); if (stat != Ok) {

1 0

Nikolay Sivov : dxva2/tests: Fix some test failures on HW devices.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 8a43d0808a8cba8b30d5ed2e00f36d260ff2f796 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a43d0808a8cba8b30d5ed2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 29 16:02:50 2021 +0300 dxva2/tests: Fix some test failures on HW devices. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52106 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/tests/dxva2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 01f8f568e6a..5de39fe1360 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -575,7 +575,6 @@ static void test_progressive_device(void) static const D3DFORMAT input_formats[] = { - D3DFMT_A8R8G8B8, D3DFMT_X8R8G8B8, D3DFMT_YUY2, MAKEFOURCC('N','V','1','2'), @@ -666,7 +665,6 @@ static void test_progressive_device(void) hr = IDirectXVideoProcessor_GetVideoProcessorCaps(processor, &caps); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(caps.DeviceCaps == DXVA2_VPDev_HardwareDevice, "Unexpected device type %#x.\n", caps.DeviceCaps); - ok(caps.InputPool == D3DPOOL_DEFAULT, "Unexpected input pool %#x.\n", caps.InputPool); ok(!caps.NumForwardRefSamples, "Unexpected sample count.\n"); ok(!caps.NumBackwardRefSamples, "Unexpected sample count.\n"); ok(!caps.Reserved, "Unexpected field.\n");

1 0

Huw Davies : winecoreaudio: Move midi_in_reset to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: ac1059ff606d1d34817a73ba4951ed4a79fad9a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac1059ff606d1d34817a73ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:48 2021 +0000 winecoreaudio: Move midi_in_reset to the unixlib. The headers are removed one at a time so that each notification can be reported back to the client-side. If there are remaining headers, the unixlib will return ERROR_RETRY to request that the client calls again. 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/winecoreaudio.drv/coremidi.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 36 +++++------------------------------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 5d89b69e007..9dc9f452c29 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -934,6 +934,39 @@ static DWORD midi_in_stop(WORD dev_id) return MMSYSERR_NOERROR; } +static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) +{ + DWORD cur_time = NtGetTickCount(); + DWORD err = MMSYSERR_NOERROR; + struct midi_src *src; + MIDIHDR *hdr; + + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + + midi_in_lock((void *)TRUE); + + if (src->lpQueueHdr) + { + hdr = src->lpQueueHdr; + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (DWORD_PTR)hdr, cur_time - src->startTime); + if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ + } + + midi_in_lock((void *)FALSE); + + return err; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1030,6 +1063,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_STOP: *params->err = midi_in_stop(params->dev_id); break; + case MIDM_RESET: + *params->err = midi_in_reset(params->dev_id, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index ab861d44525..dcb9a7e1b69 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -142,30 +142,6 @@ static void midi_lock( BOOL lock ) UNIX_CALL(midi_in_lock, (void *)lock); } -static DWORD MIDIIn_Reset(WORD wDevID) -{ - DWORD dwTime = GetTickCount(); - - TRACE("%d\n", wDevID); - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - midi_lock( TRUE ); - while (sources[wDevID].lpQueueHdr) { - LPMIDIHDR lpMidiHdr = sources[wDevID].lpQueueHdr; - sources[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - sources[wDevID].startTime); - } - midi_lock( FALSE ); - - return MMSYSERR_NOERROR; -} - /* * MIDI In Mach message handling */ @@ -335,10 +311,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR DWORD err; TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case MIDM_RESET: - return MIDIIn_Reset(wDevID); - } params.dev_id = wDevID; params.msg = wMsg; @@ -348,9 +320,11 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR params.err = &err; params.notify = &notify; - UNIX_CALL(midi_in_message, &params); - - if (!err && notify.send_notify) notify_client(&notify); + do + { + UNIX_CALL(midi_in_message, &params); + if ((!err || err == ERROR_RETRY) && notify.send_notify) notify_client(&notify); + } while (err == ERROR_RETRY); return err; }

1 0

Huw Davies : winecoreaudio: Pass the time relative to the start time to the callback.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 01ad503004cf8ea6b0bd8f544ee131fc86abc580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01ad503004cf8ea6b0bd8f54… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:47 2021 +0000 winecoreaudio: Pass the time relative to the start time to the callback. This matches the behaviour of the other instance of the invocation of the MIM_LONGDATA callback. It's rather difficult to reliably write a test for this, but it has been observed to be the case on Windows. 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/winecoreaudio.drv/midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 4eb68c8b1d7..ab861d44525 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -159,7 +159,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); + MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - sources[wDevID].startTime); } midi_lock( FALSE );

1 0

Huw Davies : winecoreaudio: Move midi_in_add_buffer to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 27bda12c99bb753c7fa753c53c4030806f1eeaea URL: https://source.winehq.org/git/wine.git/?a=commit;h=27bda12c99bb753c7fa753c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:46 2021 +0000 winecoreaudio: Move midi_in_add_buffer 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/winecoreaudio.drv/coremidi.c | 46 +++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 50 --------------------------------------- 2 files changed, 46 insertions(+), 50 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 8e12ad1a3c5..5d89b69e007 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -809,6 +809,49 @@ static DWORD midi_in_close(WORD dev_id, struct notify_context *notify) return MMSYSERR_NOERROR; } +static DWORD midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +{ + MIDIHDR **next; + + TRACE("dev_id = %d hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (!hdr || hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr->dwBufferLength) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (hdr->dwFlags & MHDR_INQUEUE) + { + WARN("Still playing\n"); + return MIDIERR_STILLPLAYING; + } + if (!(hdr->dwFlags & MHDR_PREPARED)) + { + WARN("Unprepared\n"); + return MIDIERR_UNPREPARED; + } + + hdr->dwFlags &= ~WHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + hdr->dwBytesRecorded = 0; + hdr->lpNext = NULL; + + midi_in_lock((void *)TRUE); + + next = &srcs[dev_id].lpQueueHdr; + while (*next) next = &(*next)->lpNext; + *next = hdr; + + midi_in_lock((void *)FALSE); + + return MMSYSERR_NOERROR; +} + static DWORD midi_in_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) { TRACE("dev_id = %d hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); @@ -966,6 +1009,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_CLOSE: *params->err = midi_in_close(params->dev_id, params->notify); break; + case MIDM_ADDBUFFER: + *params->err = midi_in_add_buffer(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; case MIDM_PREPARE: *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 7894b4da906..4eb68c8b1d7 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -142,54 +142,6 @@ static void midi_lock( BOOL lock ) UNIX_CALL(midi_in_lock, (void *)lock); } -static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (lpMidiHdr == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - if (dwSize < offsetof(MIDIHDR,dwOffset)) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - if (lpMidiHdr->dwBufferLength == 0) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) { - WARN("Still playing\n"); - return MIDIERR_STILLPLAYING; - } - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) { - WARN("Unprepared\n"); - return MIDIERR_UNPREPARED; - } - - midi_lock( TRUE ); - lpMidiHdr->dwFlags &= ~WHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - lpMidiHdr->dwBytesRecorded = 0; - lpMidiHdr->lpNext = 0; - if (sources[wDevID].lpQueueHdr == 0) { - sources[wDevID].lpQueueHdr = lpMidiHdr; - } else { - LPMIDIHDR ptr; - for (ptr = sources[wDevID].lpQueueHdr; - ptr->lpNext != 0; - ptr = ptr->lpNext); - ptr->lpNext = lpMidiHdr; - } - midi_lock( FALSE ); - - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_Reset(WORD wDevID) { DWORD dwTime = GetTickCount(); @@ -384,8 +336,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MIDM_ADDBUFFER: - return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_RESET: return MIDIIn_Reset(wDevID); }

1 0

Huw Davies : winecoreaudio: Move the midi in lock to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 9eeee3ddbfaebbc5d2a92c199203d3888ba38344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eeee3ddbfaebbc5d2a92c19… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:45 2021 +0000 winecoreaudio: Move the midi in lock to the unixlib. The syscall itself is temporary. 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/winecoreaudio.drv/coreaudio.c | 2 ++ dlls/winecoreaudio.drv/coremidi.c | 13 +++++++++++++ dlls/winecoreaudio.drv/midi.c | 32 ++++++++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 3 +++ 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index b3aa39bf485..420021a53ea 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1633,4 +1633,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_release, midi_out_message, midi_in_message, + + midi_in_lock, /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 0e146ce86f6..8e12ad1a3c5 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -72,6 +72,8 @@ #undef HRESULT #undef STDMETHODCALLTYPE +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -112,6 +114,17 @@ static struct midi_dest *dests; static struct midi_src *srcs; static CFStringRef midi_in_thread_port_name; +static pthread_mutex_t midi_in_mutex = PTHREAD_MUTEX_INITIALIZER; + +NTSTATUS midi_in_lock(void *args) +{ + BOOL lock = !!args; + + if (lock) pthread_mutex_lock(&midi_in_mutex); + else pthread_mutex_unlock(&midi_in_mutex); + return STATUS_SUCCESS; +} + static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, DWORD_PTR param_1, DWORD_PTR param_2) { diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 559aae2f939..7894b4da906 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static DWORD MIDIIn_NumDevs = 0; -static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ + static CFStringRef MIDIInThreadPortName; static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); @@ -89,9 +89,6 @@ static LONG CoreAudio_MIDIInit(void) if (MIDIIn_NumDevs > 0) { - InitializeCriticalSection(&midiInLock); - midiInLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": midiInLock"); - MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); CloseHandle( CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL)); } @@ -105,12 +102,6 @@ static LONG CoreAudio_MIDIRelease(void) UNIX_CALL(midi_release, NULL); sources = NULL; - if (MIDIIn_NumDevs > 0) - { - midiInLock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&midiInLock); - } - return DRV_SUCCESS; } @@ -146,6 +137,11 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } +static void midi_lock( BOOL lock ) +{ + UNIX_CALL(midi_in_lock, (void *)lock); +} + static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) { TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); @@ -175,7 +171,7 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MIDIERR_UNPREPARED; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; lpMidiHdr->dwBytesRecorded = 0; @@ -189,7 +185,7 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ptr = ptr->lpNext); ptr->lpNext = lpMidiHdr; } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); return MMSYSERR_NOERROR; } @@ -204,7 +200,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) return MMSYSERR_BADDEVICEID; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); while (sources[wDevID].lpQueueHdr) { LPMIDIHDR lpMidiHdr = sources[wDevID].lpQueueHdr; sources[wDevID].lpQueueHdr = lpMidiHdr->lpNext; @@ -213,7 +209,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); return MMSYSERR_NOERROR; } @@ -258,7 +254,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD src->state |= 2; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); currentTime = GetTickCount() - src->startTime; while (len) { @@ -289,11 +285,11 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); return NULL; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); currentTime = GetTickCount() - src->startTime; while (pos < msg->length) @@ -320,7 +316,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } MIDI_NotifyClient(msg->devID, MIM_DATA, sendData, currentTime); } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); break; default: CFRunLoopStop(CFRunLoopGetCurrent()); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 767309bb763..2f0464ad322 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -252,12 +252,15 @@ enum unix_funcs unix_midi_release, unix_midi_out_message, unix_midi_in_message, + + unix_midi_in_lock, /* temporary */ }; NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; +NTSTATUS midi_in_lock( void * ) DECLSPEC_HIDDEN; extern unixlib_handle_t coreaudio_handle;

1 0

Huw Davies : winecoreaudio: Move midi_in_start and midi_in_stop to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 05731b14d30107e73027aad2d9480a2f31450cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05731b14d30107e73027aad2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:44 2021 +0000 winecoreaudio: Move midi_in_start and midi_in_stop 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/winecoreaudio.drv/coremidi.c | 33 +++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 28 ---------------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index eae68ec153e..0e146ce86f6 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -851,6 +851,33 @@ static DWORD midi_in_get_num_devs(void) return num_srcs; } +static DWORD midi_in_start(WORD dev_id) +{ + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + srcs[dev_id].state = 1; + srcs[dev_id].startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + +static DWORD midi_in_stop(WORD dev_id) +{ + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + srcs[dev_id].state = 0; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -938,6 +965,12 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = midi_in_get_num_devs(); break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6456568be85..559aae2f939 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,30 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_Start(WORD wDevID) -{ - TRACE("%d\n", wDevID); - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - sources[wDevID].state = 1; - sources[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - -static DWORD MIDIIn_Stop(WORD wDevID) -{ - TRACE("%d\n", wDevID); - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - sources[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_Reset(WORD wDevID) { DWORD dwTime = GetTickCount(); @@ -414,10 +390,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_START: - return MIDIIn_Start(wDevID); - case MIDM_STOP: - return MIDIIn_Stop(wDevID); case MIDM_RESET: return MIDIIn_Reset(wDevID); }

1 0

Huw Davies : winecoreaudio: Move midi_in_get_num_devs to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 15bb0e79d64b00f5a51d78acd922c65dab6eb9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bb0e79d64b00f5a51d78ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:43 2021 +0000 winecoreaudio: Move midi_in_get_num_devs 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/winecoreaudio.drv/coremidi.c | 9 +++++++++ dlls/winecoreaudio.drv/midi.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 983d0676b16..eae68ec153e 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -845,6 +845,12 @@ static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) return MMSYSERR_NOERROR; } +static DWORD midi_in_get_num_devs(void) +{ + TRACE("\n"); + return num_srcs; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -929,6 +935,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETDEVCAPS: *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); break; + case MIDM_GETNUMDEVS: + *params->err = midi_in_get_num_devs(); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 35da144c927..6456568be85 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,12 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_GetNumDevs(void) -{ - TRACE("\n"); - return MIDIIn_NumDevs; -} - static DWORD MIDIIn_Start(WORD wDevID) { TRACE("%d\n", wDevID); @@ -420,8 +414,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETNUMDEVS: - return MIDIIn_GetNumDevs(); case MIDM_START: return MIDIIn_Start(wDevID); case MIDM_STOP:

1 0

Huw Davies : winecoreaudio: Move midi_in_get_devcaps to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 6f0b73a68d3df3a4749432b408ceec9b04bdee4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f0b73a68d3df3a4749432b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:42 2021 +0000 winecoreaudio: Move midi_in_get_devcaps 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/winecoreaudio.drv/coremidi.c | 22 ++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 19 ------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 38608b0851c..983d0676b16 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -826,6 +826,25 @@ static DWORD midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; } +static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) +{ + TRACE("dev_id = %d caps = %p size = %d\n", dev_id, caps, size); + + if (!caps) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + + memcpy(caps, &srcs[dev_id].caps, min(size, sizeof(*caps))); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -907,6 +926,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_UNPREPARE: *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MIDM_GETDEVCAPS: + *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 9adf10953f9..35da144c927 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,23 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_GetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) -{ - TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); - - if (lpCaps == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - memcpy(lpCaps, &sources[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_GetNumDevs(void) { TRACE("\n"); @@ -437,8 +420,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETDEVCAPS: - return MIDIIn_GetDevCaps(wDevID, (LPMIDIINCAPSW) dwParam1, dwParam2); case MIDM_GETNUMDEVS: return MIDIIn_GetNumDevs(); case MIDM_START:

1 0

← Newer
1
2
3
4
5
6
7
8
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021