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

Eric Pouech : hostname: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: aebe845316a035c034e0470cbb549b443b6f7a7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aebe845316a035c034e0470c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 hostname: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/hostname.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index b8704cff7a7..73f4d259c16 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -32,28 +32,26 @@ static int hostname_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; - DWORD count, ret; + DWORD count; WCHAR msg_buffer[8192]; wlen = vswprintf(msg_buffer, ARRAY_SIZE(msg_buffer), msg, va_args); - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL)) { DWORD len; char *msgA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. + * back to WriteFile() with OEM code page. */ - len = WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, + len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); if (!msgA) return 0; - WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

Eric Pouech : icinfo: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: f2c4b9fe0793277e8cac11e1a07538799d2daaf5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2c4b9fe0793277e8cac11e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 icinfo: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/icinfo/icinfo.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/programs/icinfo/icinfo.c b/programs/icinfo/icinfo.c index 01ddbfb6833..bd309bfb623 100644 --- a/programs/icinfo/icinfo.c +++ b/programs/icinfo/icinfo.c @@ -35,17 +35,13 @@ static int WINAPIV mywprintf(const WCHAR *format, ...) vswprintf(output_bufW, ARRAY_SIZE(output_bufW), format, parms); va_end(parms); - /* Try to write as unicode whenever we think it's a console */ - if (((DWORD_PTR)hout & 3) == 3) - { - res = WriteConsoleW(hout, output_bufW, lstrlenW(output_bufW), &nOut, NULL); - } - else + res = WriteConsoleW(hout, output_bufW, lstrlenW(output_bufW), &nOut, NULL); + if (!res) { DWORD convertedChars; /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, -1, + convertedChars = WideCharToMultiByte(GetOEMCP(), 0, output_bufW, -1, output_bufA, sizeof(output_bufA), NULL, NULL); res = WriteFile(hout, output_bufA, convertedChars, &nOut, FALSE);

1 0

Eric Pouech : ipconfig: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 8201fe2494c1df6ff0693ba9d339f4e290e65459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8201fe2494c1df6ff0693ba9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 ipconfig: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/ipconfig/ipconfig.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index f985d337265..b787947885d 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -31,30 +31,27 @@ static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; - DWORD count, ret; + DWORD count; WCHAR msg_buffer[8192]; wlen = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, msg_buffer, ARRAY_SIZE(msg_buffer), &va_args); - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL)) { DWORD len; char *msgA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. + * back to WriteFile() with OEM code page. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); if (!msgA) return 0; - WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, - NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

Eric Pouech : net: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 9ac9ea591469a9c2cc45c53df2447abdc525d6a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ac9ea591469a9c2cc45c53d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 net: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/net/net.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index f9e64d2e2b9..758c667dd49 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -29,25 +29,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(net); static int output_write(const WCHAR* str, int len) { - DWORD ret, count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL); - if (!ret) + DWORD count; + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &count, NULL)) { DWORD lenA; char* strA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. + * back to WriteFile() with OEM code page. */ - lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); strA = HeapAlloc(GetProcessHeap(), 0, lenA); if (!strA) return 0; - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, - NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &count, FALSE); HeapFree(GetProcessHeap(), 0, strA); }

1 0

Eric Pouech : netstat: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: b421477d339d7bfcd02a339d2f7de45870a307f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b421477d339d7bfcd02a339d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 netstat: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/netstat/netstat.c | 2 +- programs/reg/reg.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/programs/netstat/netstat.c b/programs/netstat/netstat.c index 16238ee097f..2c1ef89c231 100644 --- a/programs/netstat/netstat.c +++ b/programs/netstat/netstat.c @@ -125,7 +125,7 @@ static int WINAPIV NETSTAT_wprintf(const WCHAR *format, ...) } /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, + convertedChars = WideCharToMultiByte(GetOEMCP(), 0, output_bufW, len, output_bufA, MAX_WRITECONSOLE_SIZE, "?", &usedDefaultChar); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars, diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 16c05f958c7..4fd374579e9 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -51,22 +51,20 @@ const struct reg_type_rels type_rels[] = void output_writeconsole(const WCHAR *str, DWORD wlen) { - DWORD count, ret; + DWORD count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) { DWORD len; char *msgA; /* On Windows WriteConsoleW() fails if the output is redirected. So fall - * back to WriteFile(), assuming the console encoding is still the right - * one in that case. + * back to WriteFile() with OEM code page. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = malloc(len); - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); free(msgA); }

1 0

Eric Pouech : regedit: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: b111fab95315238d794b2ea6933622efd0b2a1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b111fab95315238d794b2ea6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 regedit: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 6a50a63226f..cc31f83c903 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -30,21 +30,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(regedit); static void output_writeconsole(const WCHAR *str, DWORD wlen) { - DWORD count, ret; + DWORD count; - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL); - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, wlen, &count, NULL)) { DWORD len; char *msgA; /* WriteConsole() fails on Windows if its output is redirected. If this occurs, - * we should call WriteFile() and assume the console encoding is still correct. + * we should call WriteFile() with OEM code page. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(GetOEMCP(), 0, str, wlen, NULL, 0, NULL, NULL); msgA = heap_xalloc(len); + if (!msgA) return; - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); heap_free(msgA); }

1 0

Eric Pouech : regsvr32: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: de5487252495785465e877b455b20f2958dc4a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de5487252495785465e877b4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 regsvr32: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regsvr32/regsvr32.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 0efa6bcd839..81caeb2c820 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -41,7 +41,7 @@ static void WINAPIV output_write(UINT id, ...) WCHAR fmt[1024]; va_list va_args; WCHAR *str; - DWORD len, nOut, ret; + DWORD len, nOut; if (Silent) return; @@ -61,21 +61,19 @@ static void WINAPIV output_write(UINT id, ...) return; } - ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL); - /* WriteConsole fails if its output is redirected to a file. * If this occurs, we should use an OEM codepage and call WriteFile. */ - if (!ret) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), str, len, &nOut, NULL)) { DWORD lenA; char *strA; - lenA = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, NULL, 0, NULL, NULL); + lenA = WideCharToMultiByte(GetOEMCP(), 0, str, len, NULL, 0, NULL, NULL); strA = HeapAlloc(GetProcessHeap(), 0, lenA); if (strA) { - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, len, strA, lenA, NULL, NULL); + WideCharToMultiByte(GetOEMCP(), 0, str, len, strA, lenA, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), strA, lenA, &nOut, FALSE); HeapFree(GetProcessHeap(), 0, strA); }

1 0

Eric Pouech : start: Use OEM code page for output.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 18f9d2dd9df6864b23332610aa5be63029e83f8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f9d2dd9df6864b23332610… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Apr 28 11:22:40 2022 +0200 start: Use OEM code page for output. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 835128ebf28..62804917941 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -38,25 +38,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(start); static void output(const WCHAR *message) { DWORD count; - DWORD res; int wlen = lstrlenW(message); if (!wlen) return; - res = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL); - /* If writing to console fails, assume it's file * i/o so convert to OEM codepage and output */ - if (!res) + if (!WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), message, wlen, &count, NULL)) { DWORD len; char *mesA; /* Convert to OEM, then output */ - len = WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, NULL, 0, NULL, NULL ); + len = WideCharToMultiByte( GetOEMCP(), 0, message, wlen, NULL, 0, NULL, NULL ); mesA = HeapAlloc(GetProcessHeap(), 0, len*sizeof(char)); if (!mesA) return; - WideCharToMultiByte( GetConsoleOutputCP(), 0, message, wlen, mesA, len, NULL, NULL ); + WideCharToMultiByte( GetOEMCP(), 0, message, wlen, mesA, len, NULL, NULL ); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), mesA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, mesA); }

1 0

Huw Davies : wineoss: Introduce a notification thread.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 31c5a82b5f47538a81757c030a2a48620734deaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=31c5a82b5f47538a81757c03… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 29 08:29:53 2022 +0100 wineoss: Introduce a notification thread. Currently the thread just blocks until told to quit by midi_release. Eventually this thread will dispatch the MIM_DATA and MIM_LONGDATA notifications. 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 | 21 +++++++++++++++++++++ dlls/wineoss.drv/oss.c | 2 ++ dlls/wineoss.drv/ossmidi.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 10 ++++++++++ 4 files changed, 72 insertions(+) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index e36a737624a..b3f980ab3da 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -552,6 +552,23 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return err; } +static DWORD WINAPI notify_thread(void *p) +{ + struct midi_notify_wait_params params; + struct notify_context notify; + BOOL quit; + + params.notify = &notify; + params.quit = &quit; + + while (1) + { + OSS_CALL(midi_notify_wait, &params); + if (quit) break; + } + return 0; +} + /************************************************************************** * DriverProc (WINEOSS.1) */ @@ -563,7 +580,11 @@ LRESULT CALLBACK OSS_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, switch(wMsg) { case DRV_LOAD: + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + return 1; case DRV_FREE: + OSS_CALL(midi_release, NULL); + return 1; case DRV_OPEN: case DRV_CLOSE: case DRV_ENABLE: diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a9081f2cac9..8fda9270a4e 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1406,8 +1406,10 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, midi_init, + midi_release, midi_out_message, midi_in_message, + midi_notify_wait, midi_seq_open, midi_in_lock, diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 86d766eceaf..0790eaaec1a 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -66,6 +66,10 @@ static unsigned int num_dests, num_srcs, num_synths, seq_refs; static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; +static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t notify_read_cond = PTHREAD_COND_INITIALIZER; +static BOOL notify_quit; + typedef struct sVoice { int note; /* 0 means not used */ @@ -155,6 +159,17 @@ NTSTATUS midi_in_lock(void *args) return STATUS_SUCCESS; } +static void notify_post(struct notify_context *notify) +{ + pthread_mutex_lock(&notify_mutex); + + if (notify) FIXME("Not yet handled\n"); + else notify_quit = TRUE; + pthread_cond_signal(&notify_read_cond); + + pthread_mutex_unlock(&notify_mutex); +} + static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -432,6 +447,14 @@ wrapup: return STATUS_SUCCESS; } +NTSTATUS midi_release(void *args) +{ + /* stop the notify_wait thread */ + notify_post(NULL); + + return STATUS_SUCCESS; +} + /* FIXME: this is a bad idea, it's even not static... */ SEQ_DEFINEBUF(1024); @@ -1367,3 +1390,19 @@ NTSTATUS midi_in_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_notify_wait(void *args) +{ + struct midi_notify_wait_params *params = args; + + pthread_mutex_lock(&notify_mutex); + + while (!notify_quit) + pthread_cond_wait(&notify_read_cond, &notify_mutex); + + *params->quit = notify_quit; + + pthread_mutex_unlock(&notify_mutex); + + return STATUS_SUCCESS; +} diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 867e1ff656e..ddeba49556c 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -267,6 +267,12 @@ struct midi_in_message_params struct notify_context *notify; }; +struct midi_notify_wait_params +{ + BOOL *quit; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -299,16 +305,20 @@ enum oss_funcs oss_set_event_handle, oss_is_started, oss_midi_init, + oss_midi_release, oss_midi_out_message, oss_midi_in_message, + oss_midi_notify_wait, oss_midi_seq_open, /* temporary */ oss_midi_in_lock, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN;

1 0

Huw Davies : wineoss: Move the midi in data handlers to the unixlib.
by Alexandre Julliard 02 May '22

02 May '22

Module: wine Branch: master Commit: 60f9750442188640663022080b8187a186fe4376 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60f975044218864066302208… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 29 08:29:54 2022 +0100 wineoss: Move the midi in data handlers 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/wineoss.drv/midi.c | 129 ++----------------------------- dlls/wineoss.drv/oss.c | 2 +- dlls/wineoss.drv/ossmidi.c | 189 +++++++++++++++++++++++++++++++++++++++++++-- dlls/wineoss.drv/unixlib.h | 10 ++- 4 files changed, 196 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60f97504421886406630…

1 0