wine-devel

wine-devel@winehq.org

4 participants
84402 discussions

[PATCH 0/16] MR10: use OEM code page for output
by eric pouech (＠epo) 28 Apr '22

28 Apr '22

review and fix the logic when writing text oriented output in programs/* - some where using GetConsoleCP() or GetConsoleOutputCP() if WriteConsoleW fails; this is wrong as if WriteConsole failed, then it could mean that program isn't attached to a console (or here running under shell-no-window)... Luckily, in these cases, the returned value by GetConsole*CP() is 0, and CP_ACP is also 0... but it's likely not what was expected at first glance - testing under windows shows that it's rather GetOEMCP() which is used in those cases - simplified some code and checked for allocation failure where missing Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- This merge request has too many patches to be relayed via email. Please visit the URL below to see the contents of the merge request. https://gitlab.winehq.org/wine/wine/-/merge_requests/10

1 0

[PATCH 3/3] opengl32/tests: Test wglCopyContext().
by Zhiyi Zhang 28 Apr '22

28 Apr '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/opengl32/tests/opengl.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 8b0e70ccf9c..f5ce9e6f983 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1820,6 +1820,26 @@ static void test_wglChoosePixelFormatARB(HDC hdc) } } +static void test_copy_context(HDC hdc) +{ + HGLRC ctx, ctx2; + BOOL ret; + + ctx = wglCreateContext(hdc); + ok(!!ctx, "Failed to create GL context, last error %#lx.\n", GetLastError()); + ctx2 = wglCreateContext(hdc); + ok(!!ctx2, "Failed to create GL context, last error %#lx.\n", GetLastError()); + + ret = wglCopyContext(ctx, ctx2, GL_ALL_ATTRIB_BITS); + todo_wine + ok(ret, "Failed to copy GL context, last error %#lx.\n", GetLastError()); + + ret = wglDeleteContext(ctx2); + ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); + ret = wglDeleteContext(ctx); + ok(ret, "Failed to delete GL context, last error %#lx.\n", GetLastError()); +} + START_TEST(opengl) { HWND hwnd; @@ -1905,6 +1925,7 @@ START_TEST(opengl) test_getprocaddress(hdc); test_deletecontext(hwnd, hdc); test_makecurrent(hdc); + test_copy_context(hdc); /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) -- 2.32.0

1 0

[PATCH 2/3] winex11.drv: Lock display when expecting error events.
by Zhiyi Zhang 28 Apr '22

28 Apr '22

If the display is not locked, another thread could take the error event and handle it with the default error handlers and thus not handled by the current thread with the specified error handlers. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/bitblt.c | 4 ++-- dlls/winex11.drv/clipboard.c | 2 +- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/opengl.c | 6 +++--- dlls/winex11.drv/wintab.c | 6 +++--- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 4 +++- dlls/winex11.drv/xrandr.c | 4 ++-- dlls/winex11.drv/xvidmode.c | 12 ++++++------ 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 550c5f06f37..1461e1430c5 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1369,7 +1369,7 @@ DWORD CDECL X11DRV_GetImage( PHYSDEV dev, BITMAPINFO *info, image = XGetImage( gdi_display, physdev->drawable, physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, AllPlanes, ZPixmap ); - if (X11DRV_check_error()) + if (X11DRV_check_error( gdi_display )) { /* use a temporary pixmap to avoid the BadMatch error */ Pixmap pixmap = XCreatePixmap( gdi_display, root_window, width, height, vis.depth ); @@ -1807,7 +1807,7 @@ static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, X11DRV_expect_error( gdi_display, xshm_error_handler, NULL ); ok = (XShmAttach( gdi_display, shminfo ) != 0); XSync( gdi_display, False ); - if (!X11DRV_check_error() && ok) + if (!X11DRV_check_error( gdi_display ) && ok) { image->data = shminfo->shmaddr; shmctl( shminfo->shmid, IPC_RMID, 0 ); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 6baa87c5ce1..6d6ee485385 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -397,7 +397,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) X11DRV_expect_error( display, is_atom_error, NULL ); if (!XGetAtomNames( display, new_atoms, count, names )) count = 0; - if (X11DRV_check_error()) + if (X11DRV_check_error( display )) { WARN( "got some bad atoms, ignoring\n" ); count = 0; diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 7ab358c43c1..39e420231e9 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1471,7 +1471,7 @@ BOOL CDECL X11DRV_ExtFloodFill( PHYSDEV dev, INT x, INT y, COLORREF color, UINT physDev->dc_rect.left + rect.left, physDev->dc_rect.top + rect.top, rect.right - rect.left, rect.bottom - rect.top, AllPlanes, ZPixmap ); - if(X11DRV_check_error()) image = NULL; + if(X11DRV_check_error( gdi_display )) image = NULL; if (!image) return FALSE; if (X11DRV_SetupGCForBrush( physDev )) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fd6eea05fa6..2718575922b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1230,7 +1230,7 @@ static BOOL set_swap_interval(GLXDrawable drawable, int interval) X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); pglXSwapIntervalEXT(gdi_display, drawable, interval); XSync(gdi_display, False); - ret = !X11DRV_check_error(); + ret = !X11DRV_check_error(gdi_display); break; case GLX_SWAP_CONTROL_MESA: @@ -1706,7 +1706,7 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); XSync( gdi_display, False ); - if (X11DRV_check_error()) + if (X11DRV_check_error( gdi_display )) { static unsigned int once; @@ -2085,7 +2085,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg X11DRV_expect_error(gdi_display, GLXErrorHandler, NULL); ret->ctx = create_glxcontext(gdi_display, ret, hShareContext ? hShareContext->ctx : NULL); XSync(gdi_display, False); - if ((err = X11DRV_check_error()) || !ret->ctx) + if ((err = X11DRV_check_error(gdi_display)) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ WARN("Context creation failed (error %#x).\n", err); diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 331601c3325..269a1daaa4d 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -589,7 +589,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) X11DRV_expect_error(data->display, Tablet_ErrorHandler, NULL); opendevice = pXOpenDevice(data->display,target->id); - if (!X11DRV_check_error() && opendevice) + if (!X11DRV_check_error(data->display) && opendevice) { unsigned char map[32]; int i; @@ -597,7 +597,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) X11DRV_expect_error(data->display,Tablet_ErrorHandler,NULL); cursor.BUTTONS = pXGetDeviceButtonMapping(data->display, opendevice, map, 32); - if (X11DRV_check_error() || cursor.BUTTONS <= 0) + if (X11DRV_check_error(data->display) || cursor.BUTTONS <= 0) { TRACE("No buttons, Non Tablet Device\n"); pXCloseDevice(data->display, opendevice); @@ -1086,7 +1086,7 @@ int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner) } } XSync(data->display, False); - X11DRV_check_error(); + X11DRV_check_error(data->display); if (NULL != devices) pXFreeDeviceList(devices); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f6d28122fc3..bde92d2eb89 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -700,7 +700,7 @@ extern HWND *build_hwnd_list(void) DECLSPEC_HIDDEN; typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void *arg ); extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; -extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; +extern int X11DRV_check_error( Display *display ) DECLSPEC_HIDDEN; extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6042f2522b5..296f1c4d036 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -246,6 +246,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) { pthread_mutex_lock( &error_mutex ); + XLockDisplay( display ); err_callback = callback; err_callback_display = display; err_callback_arg = arg; @@ -260,10 +261,11 @@ void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void * Check if an expected X11 error occurred; return non-zero if yes. * The caller is responsible for calling XSync first if necessary. */ -int X11DRV_check_error(void) +int X11DRV_check_error( Display *display ) { int res = err_callback_result; err_callback = NULL; + XUnlockDisplay( display ); pthread_mutex_unlock( &error_mutex ); return res; } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index b0619c0abcd..81ecbc4b9a8 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -707,7 +707,7 @@ static BOOL get_gpu_properties_from_vulkan( struct gdi_gpu *gpu, const XRRProvid vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, provider_info->outputs[output_idx], &vk_display ); XSync( gdi_display, FALSE ); - if (X11DRV_check_error() || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + if (X11DRV_check_error( gdi_display ) || vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) continue; memset( &id, 0, sizeof(id) ); @@ -1652,7 +1652,7 @@ void X11DRV_XRandR_Init(void) if (!pXRRQueryExtension( gdi_display, &event_base, &error_base )) return; X11DRV_expect_error( gdi_display, XRandRErrorHandler, NULL ); ok = pXRRQueryVersion( gdi_display, &major, &minor ); - if (X11DRV_check_error() || !ok) return; + if (X11DRV_check_error( gdi_display ) || !ok) return; TRACE("Found XRandR %d.%d.\n", major, minor); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 126e2bf2a69..8adbb3ffb5d 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -125,7 +125,7 @@ static BOOL xf86vm_get_modes(ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UI X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &xf86vm_mode_count, &xf86vm_modes); - if (X11DRV_check_error() || !ret || !xf86vm_mode_count) + if (X11DRV_check_error(gdi_display) || !ret || !xf86vm_mode_count) return FALSE; /* Put a XF86VidModeModeInfo ** at the start to store the XF86VidMode modes pointer */ @@ -195,7 +195,7 @@ static BOOL xf86vm_get_current_mode(ULONG_PTR id, DEVMODEW *mode) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeGetModeLine(gdi_display, DefaultScreen(gdi_display), &dotclock, &xf86vm_mode); - if (X11DRV_check_error() || !ret) + if (X11DRV_check_error(gdi_display) || !ret) return FALSE; mode->dmBitsPerPel = screen_bpp; @@ -235,7 +235,7 @@ static LONG xf86vm_set_current_mode(ULONG_PTR id, DEVMODEW *mode) memcpy(&xf86vm_mode, (BYTE *)mode + sizeof(*mode), sizeof(xf86vm_mode)); X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ret = pXF86VidModeSwitchToMode(gdi_display, DefaultScreen(gdi_display), xf86vm_mode); - if (X11DRV_check_error() || !ret) + if (X11DRV_check_error(gdi_display) || !ret) return DISP_CHANGE_FAILED; #if 0 /* it is said that SetViewPort causes problems with some X servers */ pXF86VidModeSetViewPort(gdi_display, DefaultScreen(gdi_display), 0, 0); @@ -287,7 +287,7 @@ void X11DRV_XF86VM_Init(void) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ok = pXF86VidModeQueryVersion(gdi_display, &xf86vm_major, &xf86vm_minor); - if (X11DRV_check_error() || !ok) return; + if (X11DRV_check_error(gdi_display) || !ok) return; #ifdef X_XF86VidModeSetGammaRamp if (xf86vm_major > 2 || (xf86vm_major == 2 && xf86vm_minor >= 1)) @@ -295,7 +295,7 @@ void X11DRV_XF86VM_Init(void) X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); pXF86VidModeGetGammaRampSize(gdi_display, DefaultScreen(gdi_display), &xf86vm_gammaramp_size); - if (X11DRV_check_error()) xf86vm_gammaramp_size = 0; + if (X11DRV_check_error(gdi_display)) xf86vm_gammaramp_size = 0; TRACE("Gamma ramp size %d.\n", xf86vm_gammaramp_size); if (xf86vm_gammaramp_size >= GAMMA_RAMP_SIZE) xf86vm_use_gammaramp = TRUE; @@ -495,7 +495,7 @@ static BOOL xf86vm_set_gamma_ramp(struct x11drv_gamma_ramp *ramp) ret = pXF86VidModeSetGammaRamp(gdi_display, DefaultScreen(gdi_display), xf86vm_gammaramp_size, red, green, blue); if (ret) XSync( gdi_display, FALSE ); - if (X11DRV_check_error()) ret = FALSE; + if (X11DRV_check_error(gdi_display)) ret = FALSE; if (red != ramp->red) free(red); -- 2.32.0

1 0

[PATCH 1/3] winex11.drv: Handle X errors from glXCopyContext().
by Zhiyi Zhang 28 Apr '22

28 Apr '22

glxCopyContext() may throw X errors and cause the current process to exit. For example, Mesa doesn't support glxCopyContext() for direct rendering contexts and ends up using the code path for indirect rendering contexts. When Xorg receives such requests, it rejects them because they're for direct rendering contexts and reports an X error. We also can't use indirect rendering context because it needs to be explicitly enabled in xorg.conf and has poor performance. So handle this error before graphics drivers implement the support. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- See also https://github.com/mesa3d/mesa/blob/main/src/glx/glxcmds.c#L658 glXCopyContext() and https://github.com/freedesktop/xorg-xserver/blob/master/glx/glxcmds.c#L843 __glXDisp_CopyContext(). dlls/winex11.drv/opengl.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 92555841f71..fd6eea05fa6 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1703,9 +1703,21 @@ static BOOL WINAPI glxdrv_wglCopyContext(struct wgl_context *src, struct wgl_con { TRACE("%p -> %p mask %#x\n", src, dst, mask); - pglXCopyContext(gdi_display, src->ctx, dst->ctx, mask); + X11DRV_expect_error( gdi_display, GLXErrorHandler, NULL ); + pglXCopyContext( gdi_display, src->ctx, dst->ctx, mask ); + XSync( gdi_display, False ); + if (X11DRV_check_error()) + { + static unsigned int once; + + if (!once++) + { + ERR("glXCopyContext failed. glXCopyContext() for direct rendering contexts not " + "implemented in the host graphics driver?\n"); + } + return FALSE; + } - /* As opposed to wglCopyContext, glXCopyContext doesn't return anything, so hopefully we passed */ return TRUE; } -- 2.32.0

1 0

[PATCH 6/6] wineoss: Combine midReceiveChar() into handle_midi_data().
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index df22d427475..3786211c71e 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -304,39 +304,28 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT } } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) -{ - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); - - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } - - dwTime -= MidiInDev[wDevID].startTime; - - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - else - handle_regular_data(MidiInDev + wDevID, value, dwTime); -} - static void handle_midi_data(unsigned char *buffer, unsigned int len) { unsigned int time = GetTickCount(), i; + struct midi_src *src; + unsigned char value; + WORD dev_id; for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) { if (buffer[i] != SEQ_MIDIPUTC) continue; - midReceiveChar(buffer[i + 2], buffer[i + 1], time); + dev_id = buffer[i + 2]; + value = buffer[i + 1]; + + if (dev_id >= MIDM_NumDevs) continue; + src = MidiInDev + dev_id; + if (src->state <= 0) continue; + + if (value == 0xf0 || src->state & 2) /* system exclusive */ + handle_sysex_data(src, value, time - src->startTime); + else + handle_regular_data(src, value, time - src->startTime); } } -- 2.25.1

1 0

[PATCH 5/6] wineoss: Make the MIM_LONGDATA time relative to the start time.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d474076011d..df22d427475 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -300,7 +300,6 @@ static void handle_regular_data(struct midi_src *src, unsigned char value, UINT if (to_send) { src->incLen = 0; - time -= src->startTime; MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); } } @@ -321,6 +320,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } + dwTime -= MidiInDev[wDevID].startTime; + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ handle_sysex_data(MidiInDev + wDevID, value, dwTime); else -- 2.25.1

1 0

[PATCH 4/6] wineoss: Move the regular data handling to a separate helper.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 120 ++++++++++++++++++++-------------------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index b4c42896a8c..d474076011d 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -247,86 +247,84 @@ static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT ti in_buffer_unlock(); } -/************************************************************************** - * midReceiveChar [internal] - */ -static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +static void handle_regular_data(struct midi_src *src, unsigned char value, UINT time) { - DWORD toSend = 0; - - TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); + UINT to_send = 0; - if (wDevID >= MIDM_NumDevs) { - WARN("bad devID\n"); - return; - } - if (MidiInDev[wDevID].state <= 0) { - TRACE("disabled or input not started, thrown away\n"); - return; - } +#define IS_CMD(_x) (((_x) & 0x80) == 0x80) +#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + if (!IS_CMD(value) && src->incLen == 0) /* try to reuse old cmd */ { - handle_sysex_data(MidiInDev + wDevID, value, dwTime); - return; - } - -#define IS_CMD(_x) (((_x) & 0x80) == 0x80) -#define IS_SYS_CMD(_x) (((_x) & 0xF0) == 0xF0) - - if (!IS_CMD(value) && MidiInDev[wDevID].incLen == 0) { /* try to reuse old cmd */ - if (IS_CMD(MidiInDev[wDevID].incPrev) && !IS_SYS_CMD(MidiInDev[wDevID].incPrev)) { - MidiInDev[wDevID].incoming[0] = MidiInDev[wDevID].incPrev; - MidiInDev[wDevID].incLen = 1; - TRACE("Reusing old command %02xh\n", MidiInDev[wDevID].incPrev); - } else { - FIXME("error for midi-in, should generate MIM_ERROR notification:" - " prev=%02Xh, incLen=%02Xh\n", - MidiInDev[wDevID].incPrev, MidiInDev[wDevID].incLen); - return; - } - } - MidiInDev[wDevID].incoming[(int)(MidiInDev[wDevID].incLen++)] = value; - if (MidiInDev[wDevID].incLen == 1 && !IS_SYS_CMD(MidiInDev[wDevID].incoming[0])) { - /* store new cmd, just in case */ - MidiInDev[wDevID].incPrev = MidiInDev[wDevID].incoming[0]; + if (IS_CMD(src->incPrev) && !IS_SYS_CMD(src->incPrev)) + { + src->incoming[0] = src->incPrev; + src->incLen = 1; + } + else + { + /* FIXME: should generate MIM_ERROR notification */ + return; + } } + src->incoming[(int)src->incLen++] = value; + if (src->incLen == 1 && !IS_SYS_CMD(src->incoming[0])) + /* store new cmd, just in case */ + src->incPrev = src->incoming[0]; #undef IS_CMD #undef IS_SYS_CMD - switch (MidiInDev[wDevID].incoming[0] & 0xF0) { + switch (src->incoming[0] & 0xF0) + { case MIDI_NOTEOFF: case MIDI_NOTEON: case MIDI_KEY_PRESSURE: case MIDI_CTL_CHANGE: case MIDI_PITCH_BEND: - if (MidiInDev[wDevID].incLen == 3) { - toSend = (MidiInDev[wDevID].incoming[2] << 16) | - (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 3) + to_send = (src->incoming[2] << 16) | (src->incoming[1] << 8) | + src->incoming[0]; + break; case MIDI_PGM_CHANGE: case MIDI_CHN_PRESSURE: - if (MidiInDev[wDevID].incLen == 2) { - toSend = (MidiInDev[wDevID].incoming[1] << 8) | - (MidiInDev[wDevID].incoming[0] << 0); - } - break; + if (src->incLen == 2) + to_send = (src->incoming[1] << 8) | src->incoming[0]; + break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incLen == 1) - toSend = (MidiInDev[wDevID].incoming[0] << 0); - break; - default: - WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); + if (src->incLen == 1) + to_send = src->incoming[0]; + break; + } + + if (to_send) + { + src->incLen = 0; + time -= src->startTime; + MIDI_NotifyClient(src - MidiInDev, MIM_DATA, to_send, time); + } +} + +/************************************************************************** + * midReceiveChar [internal] + */ +static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) +{ + TRACE("Adding %02xh to %d[%d]\n", value, wDevID, MidiInDev[wDevID].incLen); + + if (wDevID >= MIDM_NumDevs) { + WARN("bad devID\n"); + return; } - if (toSend != 0) { - TRACE("Sending event %08x\n", toSend); - MidiInDev[wDevID].incLen = 0; - dwTime -= MidiInDev[wDevID].startTime; - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); + if (MidiInDev[wDevID].state <= 0) { + TRACE("disabled or input not started, thrown away\n"); + return; } + + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + handle_sysex_data(MidiInDev + wDevID, value, dwTime); + else + handle_regular_data(MidiInDev + wDevID, value, dwTime); } static void handle_midi_data(unsigned char *buffer, unsigned int len) -- 2.25.1

1 0

[PATCH 3/6] wineoss: Move the sysex handling to a separate helper.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 67 ++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index d8cf3346a9c..b4c42896a8c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -210,6 +210,43 @@ static int midiCloseSeq(int fd) return 0; } +static void handle_sysex_data(struct midi_src *src, unsigned char value, UINT time) +{ + MIDIHDR *hdr; + BOOL done = FALSE; + + src->state |= 2; + src->incLen = 0; + + in_buffer_lock(); + + hdr = src->lpQueueHdr; + if (hdr) + { + BYTE *data = (BYTE *)hdr->lpData; + + data[hdr->dwBytesRecorded++] = value; + if (hdr->dwBytesRecorded == hdr->dwBufferLength) + done = TRUE; + } + + if (value == 0xf7) /* end */ + { + src->state &= ~2; + done = TRUE; + } + + if (done && hdr) + { + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (UINT_PTR)hdr, time); + } + + in_buffer_unlock(); +} + /************************************************************************** * midReceiveChar [internal] */ @@ -228,33 +265,9 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ - LPMIDIHDR lpMidiHdr; - BOOL sbfb = FALSE; - - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - in_buffer_lock(); - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; - - lpData[lpMidiHdr->dwBytesRecorded++] = value; - if (lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) { - sbfb = TRUE; - } - } - if (value == 0xF7) { /* then end */ - MidiInDev[wDevID].state &= ~2; - sbfb = TRUE; - } - if (sbfb && lpMidiHdr != NULL) { - lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - in_buffer_unlock(); + if (value == 0xf0 || MidiInDev[wDevID].state & 2) /* system exclusive */ + { + handle_sysex_data(MidiInDev + wDevID, value, dwTime); return; } -- 2.25.1

1 0

[PATCH 2/6] wineoss: Add the leading 0xf0 to the sysex data.
by Huw Davies 28 Apr '22

28 Apr '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 4da7a606248..d8cf3346a9c 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -228,10 +228,12 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) return; } - if (MidiInDev[wDevID].state & 2) { /* system exclusive */ + if (value == 0xf0 || MidiInDev[wDevID].state & 2) { /* system exclusive */ LPMIDIHDR lpMidiHdr; BOOL sbfb = FALSE; + MidiInDev[wDevID].state |= 2; + MidiInDev[wDevID].incLen = 0; in_buffer_lock(); if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { LPBYTE lpData = (LPBYTE) lpMidiHdr->lpData; @@ -300,14 +302,8 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } break; case MIDI_SYSTEM_PREFIX: - if (MidiInDev[wDevID].incoming[0] == 0xF0) { - MidiInDev[wDevID].state |= 2; - MidiInDev[wDevID].incLen = 0; - } else { - if (MidiInDev[wDevID].incLen == 1) { - toSend = (MidiInDev[wDevID].incoming[0] << 0); - } - } + if (MidiInDev[wDevID].incLen == 1) + toSend = (MidiInDev[wDevID].incoming[0] << 0); break; default: WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]); -- 2.25.1

1 0

[PATCH 1/6] wineoss: Simplify the midi in dispatcher.
by Huw Davies 28 Apr '22

28 Apr '22

The continue statement looks a bit awkward at the moment, but a future patch will introduce more code into the for loop. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/midi.c | 42 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index fe73d97f5ab..4da7a606248 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -320,12 +320,23 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime) } } +static void handle_midi_data(unsigned char *buffer, unsigned int len) +{ + unsigned int time = GetTickCount(), i; + + for (i = 0; i < len; i += (buffer[i] & 0x80) ? 8 : 4) + { + if (buffer[i] != SEQ_MIDIPUTC) continue; + + midReceiveChar(buffer[i + 2], buffer[i + 1], time); + } +} + static DWORD WINAPI midRecThread(void *arg) { int fd = (int)(INT_PTR)arg; unsigned char buffer[256]; - int len, idx; - DWORD dwTime; + int len; struct pollfd pfd; TRACE("Thread startup\n"); @@ -349,32 +360,7 @@ static DWORD WINAPI midRecThread(void *arg) continue; } - dwTime = GetTickCount(); - - for (idx = 0; idx < len; ) { - if (buffer[idx] & 0x80) { - TRACE( - "Reading<8> %02x %02x %02x %02x %02x %02x %02x %02x\n", - buffer[idx + 0], buffer[idx + 1], - buffer[idx + 2], buffer[idx + 3], - buffer[idx + 4], buffer[idx + 5], - buffer[idx + 6], buffer[idx + 7]); - idx += 8; - } else { - switch (buffer[idx + 0]) { - case SEQ_WAIT: - case SEQ_ECHO: - break; - case SEQ_MIDIPUTC: - midReceiveChar(buffer[idx + 2], buffer[idx + 1], dwTime); - break; - default: - TRACE("Unsupported event %d\n", buffer[idx + 0]); - break; - } - idx += 4; - } - } + handle_midi_data(buffer, len); } return 0; } -- 2.25.1

1 0

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-devel