March 2022 - Wine-Commits - list.winehq.org

Huw Davies : winealsa: Move MODM_RESET to the unixlib.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: bf3954531522ecdfd99d1e95f6ea9d71f56ded85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf3954531522ecdfd99d1e95… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 17 08:14:08 2022 +0000 winealsa: Move MODM_RESET 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/winealsa.drv/alsamidi.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/winealsa.drv/midi.c | 36 ------------------------------------ dlls/winealsa.drv/unixlib.h | 15 ++------------- 3 files changed, 41 insertions(+), 51 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index f3de2a5ce07..b99c3aedd33 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -48,6 +48,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIOUTCAPSW caps; + snd_seq_t *seq; + snd_seq_addr_t addr; + int port_out; +}; + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; static unsigned int num_dests, num_srcs; @@ -353,9 +364,7 @@ NTSTATUS midi_init(void *args) free( pinfo ); *params->err = NOERROR; - params->num_dests = num_dests; params->num_srcs = num_srcs; - params->dests = dests; params->srcs = srcs; TRACE("End\n"); @@ -800,6 +809,31 @@ static UINT midi_out_get_volume(WORD dev_id, UINT* volume) return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; } +static UINT midi_out_reset(WORD dev_id) +{ + unsigned chn; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + if (!dests[dev_id].bEnabled) return MIDIERR_NODEVICE; + + /* stop all notes */ + /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that + * it's channel dependent... + */ + for (chn = 0; chn < 16; chn++) + { + /* turn off every note */ + midi_out_data(dev_id, 0x7800 | MIDI_CMD_CONTROL | chn); + /* remove sustain on all channels */ + midi_out_data(dev_id, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn); + } + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -844,6 +878,9 @@ NTSTATUS midi_out_message(void *args) case MODM_SETVOLUME: *params->err = 0; break; + case MODM_RESET: + *params->err = midi_out_reset(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 0ed2feb41eb..53b683f59c8 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -48,10 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static WINE_MIDIIN *MidiInDev; -static WINE_MIDIOUT *MidiOutDev; -/* this is the total number of MIDI out devices found (synth and port) */ -static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; @@ -605,35 +602,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modReset [internal] - */ -static DWORD modReset(WORD wDevID) -{ - DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2); - unsigned chn; - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - - /* stop all notes */ - /* FIXME: check if 0x78B0 is channel dependent or not. I coded it so that - * it's channel dependent... - */ - for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - ALSA_modMessage(wDevID, MODM_DATA, 0, 0x7800 | MIDI_CMD_CONTROL | chn, 0); - /* remove sustain on all channels */ - ALSA_modMessage(wDevID, MODM_DATA, 0, (MIDI_CTL_SUSTAIN << 8) | MIDI_CMD_CONTROL | chn, 0); - } - /* FIXME: the LongData buffers must also be returned to the app */ - return MMSYSERR_NOERROR; -} - - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -653,9 +621,7 @@ static BOOL ALSA_MidiInit(void) if (!err) { - MODM_NumDevs = params.num_dests; MIDM_NumDevs = params.num_srcs; - MidiOutDev = params.dests; MidiInDev = params.srcs; } return TRUE; @@ -721,8 +687,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_RESET: - return modReset(wDevID); } params.dev_id = wDevID; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e3cd7123101..c1dbd83b84e 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -223,22 +223,11 @@ typedef struct midi_src int port_in; } WINE_MIDIIN; -typedef struct midi_dest -{ - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIOUTCAPSW caps; - snd_seq_t *seq; - snd_seq_addr_t addr; - int port_out; -} WINE_MIDIOUT; - struct midi_init_params { UINT *err; - unsigned int num_dests, num_srcs; - void *dests, *srcs; + unsigned int num_srcs; + void *srcs; }; struct notify_context

1 0

Jacek Caban : win32u: Move destroy_thread_windows implementation from user32.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: 7a7d999d4a464847c83d102993ba242471038303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a7d999d4a464847c83d1029… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:29 2022 +0000 win32u: Move destroy_thread_windows implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 11 +++++++-- dlls/user32/win.c | 56 -------------------------------------------- dlls/user32/win.h | 1 - dlls/win32u/menu.c | 8 +++++++ dlls/win32u/ntuser_private.h | 5 ++-- dlls/win32u/sysparams.c | 5 ++-- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 48 ++++++++++++++++++++++++++++++++++++- include/ntuser.h | 2 +- 9 files changed, 72 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a7d999d4a464847c83d…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: b07814fca4fc26d8a27b18995dd9b0afbcdf9c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07814fca4fc26d8a27b1899… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 17 20:33:42 2022 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 104 ++++++++++++++++++++------------------------------------------- 1 file changed, 33 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b07814fca4fc26d8a27b…

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: 6ecf25e9a8a94d8967809cb5031e6cf6d8b1e1bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ecf25e9a8a94d8967809cb5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Mar 16 23:27:10 2022 -0600 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 678 +++++++++++++++++++++++++-------------------------------------- 1 file changed, 270 insertions(+), 408 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ecf25e9a8a94d896780…

1 0

Jacek Caban : win32u: Move get_min_max_info implementation from user32.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: a831aa1875e6a3cc6eb3d64a127c45ebb9c1ce60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a831aa1875e6a3cc6eb3d64a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:31 2022 +0000 win32u: Move get_min_max_info implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 1 + dlls/user32/winpos.c | 92 ++--------------------------------------- dlls/win32u/menu.c | 6 +++ dlls/win32u/ntuser_private.h | 1 + dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/window.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 7 files changed, 113 insertions(+), 88 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a831aa1875e6a3cc6eb3…

1 0

Jacek Caban : win32u: Move GetWindowContextHelpId implementation from user32.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: 57c28516ee4379139d0dc9a8152187c844977387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c28516ee4379139d0dc9a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:33 2022 +0000 win32u: Move GetWindowContextHelpId implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 12 +----------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4d4199c67fc..22227c23280 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2249,17 +2249,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) */ DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) { - DWORD retval; - WND *wnd = WIN_GetPtr( hwnd ); - if (!wnd || wnd == WND_DESKTOP) return 0; - if (wnd == WND_OTHER_PROCESS) - { - if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); - return 0; - } - retval = wnd->helpContext; - WIN_ReleasePtr( wnd ); - return retval; + return NtUserCallHwnd( hwnd, NtUserGetWindowContextHelpId ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ab69096184c..e513a13b152 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3913,6 +3913,22 @@ BOOL WINAPI NtUserFlashWindowEx( FLASHWINFO *info ) } } +/* see GetWindowContextHelpId */ +static DWORD get_window_context_help_id( HWND hwnd ) +{ + DWORD retval; + WND *win = get_win_ptr( hwnd ); + if (!win || win == WND_DESKTOP) return 0; + if (win == WND_OTHER_PROCESS) + { + if (is_window( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); + return 0; + } + retval = win->helpContext; + release_win_ptr( win ); + return retval; +} + /*********************************************************************** * send_destroy_message */ @@ -4190,6 +4206,8 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) return get_dpi_for_window( hwnd ); case NtUserGetParent: return HandleToUlong( get_parent( hwnd )); + case NtUserGetWindowContextHelpId: + return get_window_context_help_id( hwnd ); case NtUserGetWindowDpiAwarenessContext: return (ULONG_PTR)get_window_dpi_awareness_context( hwnd ); case NtUserGetWindowTextLength: diff --git a/include/ntuser.h b/include/ntuser.h index 6526d190e28..7bcb91fcc25 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -147,6 +147,7 @@ enum { NtUserGetDpiForWindow, NtUserGetParent, + NtUserGetWindowContextHelpId, NtUserGetWindowDpiAwarenessContext, NtUserGetWindowTextLength, NtUserIsWindow,

1 0

Gabriel Ivăncescu : jscript: Pass a jsval "this" to builtin functions.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: 7a1c6453bc08d91ab35b13867089e26f157b479e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a1c6453bc08d91ab35b1386… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Mar 17 18:25:39 2022 +0200 jscript: Pass a jsval "this" to builtin functions. And get rid of vdisp_t since it's no longer needed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 250 +++++++++++++++++++++++++++------------------- dlls/jscript/bool.c | 44 ++++---- dlls/jscript/date.c | 199 ++++++++++++++++++------------------ dlls/jscript/dispex.c | 17 +--- dlls/jscript/enumerator.c | 28 +++--- dlls/jscript/error.c | 28 +++--- dlls/jscript/function.c | 51 ++++------ dlls/jscript/global.c | 34 +++---- dlls/jscript/jscript.h | 75 +------------- dlls/jscript/json.c | 4 +- dlls/jscript/jsregexp.c | 32 +++--- dlls/jscript/math.c | 36 +++---- dlls/jscript/number.c | 69 +++++++------ dlls/jscript/object.c | 182 ++++++++++++++++++++++----------- dlls/jscript/set.c | 81 +++++++++------ dlls/jscript/string.c | 180 ++++++++++++++++----------------- dlls/jscript/vbarray.c | 24 ++--- 18 files changed, 696 insertions(+), 640 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a1c6453bc08d91ab35b…

1 0

Daniel Lehman : propsys/tests: Add some InitVariantFromFileTime tests.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: 083dea7fce4372840ac18176496a7d05dadd5ad8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=083dea7fce4372840ac18176… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Mar 15 07:17:37 2022 -0700 propsys/tests: Add some InitVariantFromFileTime tests. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/tests/propsys.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 36b1a9dca8e..124b3405bcb 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -2030,6 +2030,40 @@ static void test_PSCreatePropertyStoreFromObject(void) IPropertyStore_Release(propstore); } +static void test_InitVariantFromFileTime(void) +{ + FILETIME ft = {0}; + SYSTEMTIME st; + VARIANT var; + HRESULT hr; + double d; + + VariantInit(&var); + if (0) /* crash on Windows */ + { + InitVariantFromFileTime(&ft, NULL); + InitVariantFromFileTime(NULL, &var); + } + + ft.dwHighDateTime = -1; + ft.dwLowDateTime = -1; + V_VT(&var) = 0xdead; + V_DATE(&var) = 42.0; + hr = InitVariantFromFileTime(&ft, &var); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&var) == VT_EMPTY, "Unexpected VT %d\n", V_VT(&var)); + ok(V_DATE(&var) == 0.0, "got wrong value: %f, expected 0.0\n", V_DATE(&var)); + + GetSystemTimeAsFileTime(&ft); + hr = InitVariantFromFileTime(&ft, &var); + ok(V_VT(&var) == VT_DATE, "Unexpected VT %d\n", V_VT(&var)); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + FileTimeToSystemTime(&ft, &st); + SystemTimeToVariantTime(&st, &d); + ok(V_DATE(&var) == d, "got wrong value: %f, expected %f\n", V_DATE(&var), d); +} + START_TEST(propsys) { test_PSStringFromPropertyKey(); @@ -2053,4 +2087,5 @@ START_TEST(propsys) test_PSCreateMemoryPropertyStore(); test_propertystore(); test_PSCreatePropertyStoreFromObject(); + test_InitVariantFromFileTime(); }

1 0

Jacek Caban : win32u: Move NtUserDestroyWindow implementation from user32.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: 6a5ddbeedc7801dee984a5e18aba2fcde363e42c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5ddbeedc7801dee984a5e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 15:29:30 2022 +0000 win32u: Move NtUserDestroyWindow implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 23 ---- dlls/user32/combo.c | 2 +- dlls/user32/dde_misc.c | 6 +- dlls/user32/dde_server.c | 2 +- dlls/user32/defwnd.c | 2 +- dlls/user32/dialog.c | 4 +- dlls/user32/driver.c | 7 +- dlls/user32/mdi.c | 2 +- dlls/user32/menu.c | 8 +- dlls/user32/message.c | 2 - dlls/user32/msgbox.c | 70 +++++----- dlls/user32/painting.c | 12 -- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 10 ++ dlls/user32/win.c | 248 +--------------------------------- dlls/user32/win.h | 1 - dlls/win32u/clipboard.c | 25 ++++ dlls/win32u/driver.c | 1 + dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 2 + dlls/win32u/ntuser_private.h | 4 + dlls/win32u/sysparams.c | 18 ++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 6 + dlls/win32u/window.c | 315 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 6 + include/ntuser.h | 4 +- 27 files changed, 440 insertions(+), 345 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a5ddbeedc7801dee984…

1 0

Huw Davies : winealsa: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
by Alexandre Julliard March 17, 2022

March 17, 2022

Module: wine Branch: master Commit: d76fccfe7f9d82a01f0d432f385e58b3ae605b8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76fccfe7f9d82a01f0d432f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 17 08:14:07 2022 +0000 winealsa: Move MODM_GETVOLUME and MODM_SETVOLUME 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/winealsa.drv/alsamidi.c | 15 +++++++++++++++ dlls/winealsa.drv/midi.c | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index fa09626bc80..f3de2a5ce07 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -791,6 +791,15 @@ static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_out_get_volume(WORD dev_id, UINT* volume) +{ + if (!volume) return MMSYSERR_INVALPARAM; + if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID; + + *volume = 0xFFFFFFFF; + return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -829,6 +838,12 @@ NTSTATUS midi_out_message(void *args) case MODM_GETNUMDEVS: *params->err = num_dests; break; + case MODM_GETVOLUME: + *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1); + break; + case MODM_SETVOLUME: + *params->err = 0; + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 4b8062390fa..0ed2feb41eb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -605,17 +605,6 @@ static DWORD midStop(WORD wDevID) return MMSYSERR_NOERROR; } -/************************************************************************** - * modGetVolume [internal] - */ -static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) -{ - if (!lpdwVolume) return MMSYSERR_INVALPARAM; - if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; - *lpdwVolume = 0xFFFFFFFF; - return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; -} - /************************************************************************** * modReset [internal] */ @@ -732,10 +721,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_GETVOLUME: - return modGetVolume(wDevID, (DWORD*)dwParam1); - case MODM_SETVOLUME: - return 0; case MODM_RESET: return modReset(wDevID); }

1 0