November 2021 - Wine-commits

Alexandre Julliard : mountmgr: Use wide character string literals.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: f98d956e5208b42bb4c538579928ae80e22c44eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f98d956e5208b42bb4c53857… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:32:46 2021 +0100 mountmgr: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 168 +++++++++++++++---------------------------- dlls/mountmgr.sys/mountmgr.c | 53 +++++--------- 2 files changed, 75 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f98d956e5208b42bb4c5…

1 0

Alexandre Julliard : wineqtdecoder: Remove the QuickTime decoder.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 34289e749f44703997e8d904aaf12ac20b691b24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34289e749f44703997e8d904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:41:41 2021 +0100 wineqtdecoder: Remove the QuickTime decoder. QuickTime is deprecated on macOS, so remove the module instead of doing the work to convert it to msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 75 +- configure.ac | 34 +- dlls/wineqtdecoder/Makefile.in | 24 - dlls/wineqtdecoder/main.c | 245 ----- dlls/wineqtdecoder/qtdatahandler.c | 792 ---------------- dlls/wineqtdecoder/qtprivate.h | 28 - dlls/wineqtdecoder/qtsplitter.c | 1241 -------------------------- dlls/wineqtdecoder/qtutils.c | 159 ---- dlls/wineqtdecoder/qtvdecoder.c | 649 -------------- dlls/wineqtdecoder/rsrc.rc | 28 - dlls/wineqtdecoder/wineqtdecoder.rgs | 14 - dlls/wineqtdecoder/wineqtdecoder.spec | 4 - dlls/wineqtdecoder/wineqtdecoder_classes.idl | 37 - include/config.h.in | 3 - 14 files changed, 5 insertions(+), 3328 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=34289e749f44703997e8…

1 0

Alexandre Julliard : strmbase: Move to the libs directory.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 83d7b1d3122b02ca448911587673a5513d3c16a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83d7b1d3122b02ca44891158… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 17:49:18 2021 +0100 strmbase: Move to the libs directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 2 +- {dlls => libs}/strmbase/Makefile.in | 0 {dlls => libs}/strmbase/dispatch.c | 0 {dlls => libs}/strmbase/filter.c | 0 {dlls => libs}/strmbase/mediatype.c | 0 {dlls => libs}/strmbase/outputqueue.c | 0 {dlls => libs}/strmbase/pin.c | 0 {dlls => libs}/strmbase/pospass.c | 0 {dlls => libs}/strmbase/renderer.c | 0 {dlls => libs}/strmbase/seeking.c | 0 {dlls => libs}/strmbase/strmbase_private.h | 0 12 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8a11db9e360..a0df1a68c3d 100755 --- a/configure +++ b/configure @@ -1649,7 +1649,6 @@ enable_sspicli enable_stdole2_tlb enable_stdole32_tlb enable_sti -enable_strmbase enable_strmdll enable_svrapi enable_sxs @@ -1820,6 +1819,7 @@ enable_lcms2 enable_mfuuid enable_mpg123 enable_png +enable_strmbase enable_strmiids enable_tiff enable_uuid @@ -21604,7 +21604,6 @@ wine_fn_config_makefile dlls/sti enable_sti wine_fn_config_makefile dlls/sti/tests enable_tests wine_fn_config_makefile dlls/storage.dll16 enable_win16 wine_fn_config_makefile dlls/stress.dll16 enable_win16 -wine_fn_config_makefile dlls/strmbase enable_strmbase wine_fn_config_makefile dlls/strmdll enable_strmdll wine_fn_config_makefile dlls/svrapi enable_svrapi wine_fn_config_makefile dlls/sxs enable_sxs @@ -21852,6 +21851,7 @@ wine_fn_config_makefile libs/lcms2 enable_lcms2 wine_fn_config_makefile libs/mfuuid enable_mfuuid wine_fn_config_makefile libs/mpg123 enable_mpg123 wine_fn_config_makefile libs/png enable_png +wine_fn_config_makefile libs/strmbase enable_strmbase wine_fn_config_makefile libs/strmiids enable_strmiids wine_fn_config_makefile libs/tiff enable_tiff wine_fn_config_makefile libs/uuid enable_uuid diff --git a/configure.ac b/configure.ac index 1f597756e5f..1e779508828 100644 --- a/configure.ac +++ b/configure.ac @@ -3321,7 +3321,6 @@ WINE_CONFIG_MAKEFILE(dlls/sti) WINE_CONFIG_MAKEFILE(dlls/sti/tests) WINE_CONFIG_MAKEFILE(dlls/storage.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/stress.dll16,enable_win16) -WINE_CONFIG_MAKEFILE(dlls/strmbase) WINE_CONFIG_MAKEFILE(dlls/strmdll) WINE_CONFIG_MAKEFILE(dlls/svrapi) WINE_CONFIG_MAKEFILE(dlls/sxs) @@ -3569,6 +3568,7 @@ WINE_CONFIG_MAKEFILE(libs/lcms2) WINE_CONFIG_MAKEFILE(libs/mfuuid) WINE_CONFIG_MAKEFILE(libs/mpg123) WINE_CONFIG_MAKEFILE(libs/png) +WINE_CONFIG_MAKEFILE(libs/strmbase) WINE_CONFIG_MAKEFILE(libs/strmiids) WINE_CONFIG_MAKEFILE(libs/tiff) WINE_CONFIG_MAKEFILE(libs/uuid) diff --git a/dlls/strmbase/Makefile.in b/libs/strmbase/Makefile.in similarity index 100% rename from dlls/strmbase/Makefile.in rename to libs/strmbase/Makefile.in diff --git a/dlls/strmbase/dispatch.c b/libs/strmbase/dispatch.c similarity index 100% rename from dlls/strmbase/dispatch.c rename to libs/strmbase/dispatch.c diff --git a/dlls/strmbase/filter.c b/libs/strmbase/filter.c similarity index 100% rename from dlls/strmbase/filter.c rename to libs/strmbase/filter.c diff --git a/dlls/strmbase/mediatype.c b/libs/strmbase/mediatype.c similarity index 100% rename from dlls/strmbase/mediatype.c rename to libs/strmbase/mediatype.c diff --git a/dlls/strmbase/outputqueue.c b/libs/strmbase/outputqueue.c similarity index 100% rename from dlls/strmbase/outputqueue.c rename to libs/strmbase/outputqueue.c diff --git a/dlls/strmbase/pin.c b/libs/strmbase/pin.c similarity index 100% rename from dlls/strmbase/pin.c rename to libs/strmbase/pin.c diff --git a/dlls/strmbase/pospass.c b/libs/strmbase/pospass.c similarity index 100% rename from dlls/strmbase/pospass.c rename to libs/strmbase/pospass.c diff --git a/dlls/strmbase/renderer.c b/libs/strmbase/renderer.c similarity index 100% rename from dlls/strmbase/renderer.c rename to libs/strmbase/renderer.c diff --git a/dlls/strmbase/seeking.c b/libs/strmbase/seeking.c similarity index 100% rename from dlls/strmbase/seeking.c rename to libs/strmbase/seeking.c diff --git a/dlls/strmbase/strmbase_private.h b/libs/strmbase/strmbase_private.h similarity index 100% rename from dlls/strmbase/strmbase_private.h rename to libs/strmbase/strmbase_private.h

1 0

Alexandre Julliard : winemac.drv: Fix RegQueryValueExW size handling.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 60bece33a4bb1b9704e8e78b48aa6ee701effc92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60bece33a4bb1b9704e8e78b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 29 21:17:41 2021 +0100 winemac.drv: Fix RegQueryValueExW size handling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 99c852d7ffe..fe48437849d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -461,12 +461,11 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C size = 0; if (RegQueryValueExW(hkey, pixelencodingW, 0, &type, NULL, &size) || type != REG_SZ) goto done; - pixel_encoding = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + size += sizeof(WCHAR); + pixel_encoding = HeapAlloc(GetProcessHeap(), 0, size); if (RegQueryValueExW(hkey, pixelencodingW, 0, &type, (BYTE*)pixel_encoding, &size) || type != REG_SZ) goto done; - if ((end = memchrW(pixel_encoding, 0, size))) - size = end - pixel_encoding; - desc->pixel_encoding = CFStringCreateWithCharacters(NULL, (const UniChar*)pixel_encoding, size); + desc->pixel_encoding = CFStringCreateWithCharacters(NULL, (const UniChar*)pixel_encoding, strlenW(pixel_encoding)); ret = desc;

1 0

Jinoh Kang : msi/tests: Add tests for MsiViewFetch wraparound behaviour.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: f26a9d093dff052e1db0c68db8801219d409cb3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f26a9d093dff052e1db0c68d… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:53:42 2021 +0900 msi/tests: Add tests for MsiViewFetch wraparound behaviour. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/db.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b42cc90a955..eb087eb9711 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9293,6 +9293,88 @@ static void test_view_get_error(void) DeleteFileA(msifile); } +static void test_viewfetch_wraparound(void) +{ + MSIHANDLE db = 0, view = 0, rec = 0; + UINT r, i, idset, tries; + const char *query; + + DeleteFileA(msifile); + + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabaseW( msifileW, MSIDBOPEN_CREATE, &db ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "CREATE TABLE `phone` ( " + "`id` INT, `name` CHAR(32), `number` CHAR(32) " + "PRIMARY KEY `id`)"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('1', 'Alan', '5030581')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('2', 'Barry', '928440')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('3', 'Cindy', '2937550')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "SELECT * FROM `phone`"; + r = MsiDatabaseOpenViewA( db, query, &view ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + for (tries = 0; tries < 3; tries++) + { + winetest_push_context( "Wraparound attempt #%d", tries ); + idset = 0; + + for (i = 0; i < 3; i++) + { + winetest_push_context( "Record #%d", i ); + + r = MsiViewFetch( view, &rec ); + todo_wine_if(tries > 0) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + if (r != ERROR_SUCCESS) + { + winetest_pop_context(); + break; + } + + r = MsiRecordGetInteger(rec, 1); + ok(r >= 1 && r <= 3, "Expected 1 <= id <= 3, got %d\n", r); + if (r < sizeof(idset) * 8) + { + ok(!(idset & (1 << r)), "Duplicate id %d\n", r); + idset |= 1 << r; + } + + MsiCloseHandle(rec); + + winetest_pop_context(); + } + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + winetest_pop_context(); + } + + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle(db); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -9352,4 +9434,5 @@ START_TEST(db) test_viewmodify_merge(); test_viewmodify_insert(); test_view_get_error(); + test_viewfetch_wraparound(); }

1 0

Jinoh Kang : msi: Wrap around to first record at end of view in MSI_ViewFetch.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 547492007e17ed7fe3c2e5ffd5f58f0d46a40048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=547492007e17ed7fe3c2e5ff… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sun Nov 28 19:54:42 2021 +0900 msi: Wrap around to first record at end of view in MSI_ViewFetch. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msiquery.c | 5 +++++ dlls/msi/tests/db.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index c217ee7c8f5..b3a499a0788 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -394,6 +394,11 @@ UINT MSI_ViewFetch(MSIQUERY *query, MSIRECORD **prec) (*prec)->cookie = (UINT64)(ULONG_PTR)query; MSI_RecordSetInteger(*prec, 0, 1); } + else if (r == ERROR_NO_MORE_ITEMS) + { + /* end of view; reset cursor to first row */ + query->row = 0; + } return r; } diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index eb087eb9711..447f2cdd0ee 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9343,7 +9343,7 @@ static void test_viewfetch_wraparound(void) winetest_push_context( "Record #%d", i ); r = MsiViewFetch( view, &rec ); - todo_wine_if(tries > 0) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); if (r != ERROR_SUCCESS) { winetest_pop_context();

1 0

Jan Sikorski : wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding before calling wined3d_texture_gl_upload_bo().
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: d2ceed3904b96576ccb370f196bf6fe6d77b3537 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2ceed3904b96576ccb370f1… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Nov 29 11:34:19 2021 +0100 wined3d: Always set GL_PIXEL_UNPACK_BUFFER binding before calling wined3d_texture_gl_upload_bo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52116 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1ab50a27596..48202c2142c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2532,6 +2532,9 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_mem = wined3d_context_gl_map_bo_address(context_gl, &bo, src_slice_pitch * update_d, WINED3D_MAP_READ); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + for (z = 0; z < update_d; ++z, src_mem += src_slice_pitch) { if (decompress) @@ -2561,6 +2564,11 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, checkGLcall("glBindBuffer"); offset += bo.buffer_object->buffer_offset; } + else + { + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); + checkGLcall("glBindBuffer"); + } wined3d_texture_gl_upload_bo(src_format, target, level, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, update_w, update_h, update_d, offset, srgb, dst_texture, gl_info);

1 0

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

29 Nov '21

Module: wine Branch: master Commit: a9dec89f49e4228352bcefb26d613cc6b1125324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9dec89f49e4228352bcefb2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:39 2021 +0000 winecoreaudio: Move midi_in_open 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/coreaudio.c | 1 + dlls/winecoreaudio.drv/coremidi.c | 84 ++++++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 64 ++++++++--------------------- dlls/winecoreaudio.drv/unixlib.h | 13 ++++++ 4 files changed, 116 insertions(+), 46 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e90c400102f..b3aa39bf485 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1632,4 +1632,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_init, midi_release, midi_out_message, + midi_in_message, }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 1ca9ad6eb8e..6a8324f276e 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -112,6 +112,20 @@ static struct midi_dest *dests; static struct midi_src *srcs; static CFStringRef midi_in_thread_port_name; +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) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = src->midiDesc.dwCallback; + notify->flags = src->wFlags; + notify->device = src->midiDesc.hMidi; + notify->instance = src->midiDesc.dwInstance; +} + /* * CoreMIDI IO threaded callback, * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. @@ -711,6 +725,51 @@ static DWORD midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static DWORD midi_in_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, struct notify_context *notify) +{ + struct midi_src *src; + + TRACE("dev_id = %d desc = %p flags = %08x\n", dev_id, midi_desc, flags); + + if (!midi_desc) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + + if (src->midiDesc.hMidi) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (flags & MIDI_IO_STATUS) + { + FIXME("No support for MIDI_IO_STATUS in flags yet, ignoring it\n"); + flags &= ~MIDI_IO_STATUS; + } + if (flags & ~CALLBACK_TYPEMASK) + { + FIXME("Bad flags\n"); + return MMSYSERR_INVALFLAG; + } + + src->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + src->lpQueueHdr = NULL; + src->midiDesc = *midi_desc; + src->startTime = 0; + src->state = 0; + + set_in_notify(notify, src, dev_id, MIM_OPEN, 0, 0); + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -765,3 +824,28 @@ NTSTATUS midi_out_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_in_message(void *args) +{ + struct midi_in_message_params *params = args; + + params->notify->send_notify = FALSE; + + switch (params->msg) + { + case DRVM_INIT: + case DRVM_EXIT: + case DRVM_ENABLE: + case DRVM_DISABLE: + *params->err = MMSYSERR_NOERROR; + break; + case MIDM_OPEN: + *params->err = midi_in_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + default: + TRACE("Unsupported message\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + } + + return STATUS_SUCCESS; +} diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index f58dcc2e7a0..4063fe3c10e 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -128,7 +128,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MIM_OPEN: case MIM_CLOSE: case MIM_DATA: case MIM_LONGDATA: @@ -148,41 +147,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIIn_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - TRACE("wDevID=%d lpDesc=%p dwFlags=%08x\n", wDevID, lpDesc, dwFlags); - - if (lpDesc == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (sources[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if ((dwFlags & MIDI_IO_STATUS) != 0) { - WARN("No support for MIDI_IO_STATUS in dwFlags yet, ignoring it\n"); - dwFlags &= ~MIDI_IO_STATUS; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - FIXME("Bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - sources[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - sources[wDevID].lpQueueHdr = NULL; - sources[wDevID].midiDesc = *lpDesc; - sources[wDevID].startTime = 0; - sources[wDevID].state = 0; - - MIDI_NotifyClient(wDevID, MIM_OPEN, 0L, 0L); - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_Close(WORD wDevID) { DWORD ret = MMSYSERR_NOERROR; @@ -520,15 +484,12 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR */ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct midi_in_message_params params; + struct notify_context notify; + DWORD err; + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case DRVM_INIT: - case DRVM_EXIT: - case DRVM_ENABLE: - case DRVM_DISABLE: - return 0; - case MIDM_OPEN: - return MIDIIn_Open(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return MIDIIn_Close(wDevID); case MIDM_ADDBUFFER: @@ -547,10 +508,21 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR return MIDIIn_Stop(wDevID); case MIDM_RESET: return MIDIIn_Reset(wDevID); - default: - TRACE("Unsupported message\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + params.notify = &notify; + + UNIX_CALL(midi_in_message, &params); + + if (!err && notify.send_notify) notify_client(&notify); + + return err; } /************************************************************************** diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index bdf38b24c88..767309bb763 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -215,6 +215,17 @@ struct midi_out_message_params struct notify_context *notify; }; +struct midi_in_message_params +{ + UINT dev_id; + UINT msg; + DWORD_PTR user; + DWORD_PTR param_1; + DWORD_PTR param_2; + DWORD *err; + struct notify_context *notify; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -240,11 +251,13 @@ enum unix_funcs unix_midi_init, unix_midi_release, unix_midi_out_message, + unix_midi_in_message, }; 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; extern unixlib_handle_t coreaudio_handle;

1 0

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

29 Nov '21

Module: wine Branch: master Commit: a66199f560ef2fbe901408055428e8933836f560 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a66199f560ef2fbe90140805… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:40 2021 +0000 winecoreaudio: Move midi_in_close 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 | 29 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 27 --------------------------- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 6a8324f276e..1241a777048 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -770,6 +770,32 @@ static DWORD midi_in_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, str return MMSYSERR_NOERROR; } +static DWORD midi_in_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_src *src; + + TRACE("dev_id = %d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + src = srcs + dev_id; + + if (!src->midiDesc.hMidi) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + if (src->lpQueueHdr) return MIDIERR_STILLPLAYING; + + set_in_notify(notify, src, dev_id, MIM_CLOSE, 0, 0); + src->midiDesc.hMidi = 0; + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -842,6 +868,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_OPEN: *params->err = midi_in_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); break; + case MIDM_CLOSE: + *params->err = midi_in_close(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 4063fe3c10e..3b069c9575d 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -128,7 +128,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MIM_CLOSE: case MIM_DATA: case MIM_LONGDATA: case MIM_ERROR: @@ -147,30 +146,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIIn_Close(WORD wDevID) -{ - DWORD ret = MMSYSERR_NOERROR; - - TRACE("wDevID=%d\n", wDevID); - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - if (sources[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - if (sources[wDevID].lpQueueHdr != 0) { - return MIDIERR_STILLPLAYING; - } - - MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); - sources[wDevID].midiDesc.hMidi = 0; - return ret; -} - static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) { TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); @@ -490,8 +465,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_CLOSE: - return MIDIIn_Close(wDevID); case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_PREPARE:

1 0

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

29 Nov '21

Module: wine Branch: master Commit: 4180aa9f9bbdcfccb9dc9bb7172042ceee4d8905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4180aa9f9bbdcfccb9dc9bb7… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:41 2021 +0000 winecoreaudio: Move midi_in_prepare and midi_in_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/winecoreaudio.drv/coremidi.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 34 ---------------------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 1241a777048..38608b0851c 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -796,6 +796,36 @@ static DWORD midi_in_close(WORD dev_id, struct notify_context *notify) 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); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = NULL; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static DWORD midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +{ + TRACE("dev_id = %d hdr = %p hdr_size = %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; @@ -871,6 +901,12 @@ NTSTATUS midi_in_message(void *args) case MIDM_CLOSE: *params->err = midi_in_close(params->dev_id, params->notify); break; + case MIDM_PREPARE: + *params->err = midi_in_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MIDM_UNPREPARE: + *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)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 3b069c9575d..9adf10953f9 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,36 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%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; -} - -static DWORD MIDIIn_Unprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%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; -} - static DWORD MIDIIn_GetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) { TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); @@ -467,10 +437,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_PREPARE: - return MIDIIn_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_UNPREPARE: - return MIDIIn_Unprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MIDM_GETDEVCAPS: return MIDIIn_GetDevCaps(wDevID, (LPMIDIINCAPSW) dwParam1, dwParam2); case MIDM_GETNUMDEVS:

1 0