[PATCH v3 0/3] MR4301: ntdll: Support Ctrl-C stop debuggee and attach 32-bit process in wow64 mode.
Signed-off-by: chenjiangyi <chenjiangyi(a)uniontech.com> -- v3: qcap: Add implementation of IAMVideoControl_GetFrameRateList. ntdll: Avoid abort process when internal string printing function used for debugging. ntdll: Support Ctrl-C stop debuggee and attach 32-bit process in wow64 mode. https://gitlab.winehq.org/wine/wine/-/merge_requests/4301
From: chenjiangyi <chenjiangyi(a)uniontech.com> Signed-off-by: chenjiangyi <chenjiangyi(a)uniontech.com> --- dlls/ntdll/process.c | 10 ---------- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/server.c | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 02e31ea7f4b..4a59b0255c2 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -734,16 +734,6 @@ NTSTATUS WINAPI DbgUiIssueRemoteBreakin( HANDLE process ) status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, DbgUiRemoteBreakin, NULL, 0, 0, 0, 0, NULL ); -#ifdef _WIN64 - /* FIXME: hack for debugging 32-bit wow64 process without a 64-bit ntdll */ - if (status == STATUS_INVALID_PARAMETER) - { - ULONG_PTR wow; - if (!NtQueryInformationProcess( process, ProcessWow64Information, &wow, sizeof(wow), NULL ) && wow) - status = NtCreateThreadEx( &handle, THREAD_ALL_ACCESS, &attr, process, - (void *)0x7ffe1000, NULL, 0, 0, 0, 0, NULL ); - } -#endif if (!status) NtClose( handle ); return status; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 803d8079213..ed38c3c279f 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1567,7 +1567,7 @@ static void load_ntdll_wow64_functions( HMODULE module ) GET_FUNC( RtlpFreezeTimeBias ); GET_FUNC( RtlpQueryProcessDebugInformationRemote ); #undef GET_FUNC - + pDbgUiRemoteBreakin = (void *)find_named_export( module, exports, "DbgUiRemoteBreakin" ); p__wine_ctrl_routine = (void *)find_named_export( module, exports, "__wine_ctrl_routine" ); #ifdef _WIN64 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 7211457387c..d7aca23dfb0 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -640,7 +640,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO (ULONG_PTR)func == call->create_thread.func && (ULONG_PTR)arg == call->create_thread.arg) { /* FIXME: hack for debugging 32-bit process without a 64-bit ntdll */ - if (is_old_wow64() && func == (void *)0x7ffe1000) func = pDbgUiRemoteBreakin; + if (is_wow64()) func = pDbgUiRemoteBreakin; attr->TotalLength = sizeof(buffer); attr->Attributes[0].Attribute = PS_ATTRIBUTE_CLIENT_ID; attr->Attributes[0].Size = sizeof(id); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4301
From: chenjiangyi <chenjiangyi(a)uniontech.com> Description: The printing function (non-Windows application call) used by Wine developers is unnecessary to abort process when the string is super long. For example, the developer prints a long commandline of wwmapp.exe by MESSAGE. As a result, the process cannot be started, and the conference function cannot be used. Signed-off-by: chenjiangyi <chenjiangyi(a)uniontech.com> Change-Id: If06f0309f9745777f89b07dff8d302cb34b2a90e --- dlls/ntdll/unix/debug.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index e73ee05fc03..26d1f7a76f7 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -81,12 +81,15 @@ static int append_output( struct debug_info *info, const char *str, size_t len ) { if (len >= sizeof(info->output) - info->out_pos) { - fprintf( stderr, "wine_dbg_output: debugstr buffer overflow (contents: '%s')\n", info->output ); - info->out_pos = 0; - abort(); + fprintf( stderr, "wine_dbg_output: string to be output exceeds the debugstr buffer and to be truncated !!!\n"); + len = sizeof(info->output) - info->out_pos - 1; + info->output[sizeof(info->output) - 1] = 0; + } + if(len) + { + memcpy( info->output + info->out_pos, str, len ); + info->out_pos += len; } - memcpy( info->output + info->out_pos, str, len ); - info->out_pos += len; return len; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4301
From: chenjiangyi <chenjiangyi(a)uniontech.com> Signed-off-by: chenjiangyi <chenjiangyi(a)uniontech.com> --- dlls/qcap/qcap_private.h | 18 ++++ dlls/qcap/v4l.c | 188 ++++++++++++++++++++++++++++++++++----- dlls/qcap/vfwcapture.c | 32 ++++++- 3 files changed, 212 insertions(+), 26 deletions(-) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index c9119b6a52e..d425ff134cd 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -127,6 +127,22 @@ struct read_frame_params void *data; }; +struct get_frame_rates_size_params +{ + video_capture_device_t device; + unsigned int index; + SIZE *dimensions; + LONG *list_size; +}; + +struct get_frame_avg_time_params +{ + video_capture_device_t device; + unsigned int index; + LONG list_size; + LONGLONG *frame_rate; +}; + enum unix_funcs { unix_create, @@ -141,6 +157,8 @@ enum unix_funcs unix_get_prop, unix_set_prop, unix_read_frame, + unix_get_frame_rates_size, + unix_get_frame_avg_time, unix_funcs_count }; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 134c3eca9e1..c9995ea0607 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -60,6 +60,9 @@ static typeof(close) *video_close = close; static typeof(ioctl) *video_ioctl = ioctl; static typeof(read) *video_read = read; +#define SECOND_IN_100NS (LONGLONG)10000000 +#define DEFAULT_FPS 25 + static BOOL video_init(void) { #ifdef SONAME_LIBV4L2 @@ -86,6 +89,8 @@ struct caps AM_MEDIA_TYPE media_type; VIDEOINFOHEADER video_info; VIDEO_STREAM_CONFIG_CAPS config; + LONG fps_count; + __u32* fps_list; }; struct video_capture_device @@ -363,10 +368,72 @@ static NTSTATUS v4l_device_read_frame( void *args ) return TRUE; } +static int get_fps_list(int fd, __u32 format, __u32 width, __u32 height, __u32 *fps_count, __u32 **fps_list) +{ + struct v4l2_frmivalenum frmival = {.index=0, .pixel_format=format, .width=width, .height=height}; + __u32 fps_index = 0, *fps_frame = NULL; + + while (xioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival) != -1) + { + if (frmival.type == V4L2_FRMIVAL_TYPE_DISCRETE) + { + fps_frame = realloc(fps_frame, (fps_index + 1) * sizeof(__u32)); + if (fps_frame && frmival.discrete.denominator && frmival.discrete.numerator) + { + fps_frame[fps_index] = frmival.discrete.denominator / frmival.discrete.numerator; + fps_index++; + } + } + else if (frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE + || frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) + { + __u32 fps_step = 0, fps_max = 0, fps_min = 0; + if(frmival.stepwise.step.denominator && frmival.stepwise.step.numerator) + fps_step = frmival.stepwise.step.denominator / frmival.stepwise.step.numerator; + /*The maximum FPS is the inverse of the minimum frame time, not the maximum frame time, and vice versa.*/ + if(frmival.stepwise.min.denominator && frmival.stepwise.min.numerator) + fps_max = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; + if(frmival.stepwise.max.denominator && frmival.stepwise.max.numerator) + fps_min = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; + + if(fps_step && fps_max && fps_min) + { + do + { + fps_frame = realloc(fps_frame, (fps_index + 1) * sizeof(__u32)); + if (fps_frame) + { + fps_frame[fps_index] = fps_max; + fps_index++; + } + fps_max -= fps_step; + }while(fps_max >= fps_min); + } + break; + } + + frmival.index++; + } + + if(fps_count) *fps_count = fps_index; + if(fps_list) *fps_list = fps_frame; + + return 0; +} + static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, - __u32 max_fps, __u32 min_fps, struct caps *caps) + __u32 fps_count, __u32 *fps_list, struct caps *caps) { LONG depth = 24; + __u32 max_fps = DEFAULT_FPS, min_fps = DEFAULT_FPS; + + for(int i = 0; i < fps_count; ++i) + { + if(max_fps < fps_list[i]) + max_fps = fps_list[i]; + if(min_fps > fps_list[i]) + min_fps = fps_list[i]; + } memset(caps, 0, sizeof(*caps)); caps->video_info.dwBitRate = width * height * depth * max_fps; @@ -387,8 +454,8 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, caps->media_type.cbFormat = sizeof(VIDEOINFOHEADER); /* We reallocate the caps array, so pbFormat has to be set after all caps * have been enumerated. */ - caps->config.MaxFrameInterval = 10000000 / max_fps; - caps->config.MinFrameInterval = 10000000 / min_fps; + caps->config.MaxFrameInterval = SECOND_IN_100NS / max_fps; + caps->config.MinFrameInterval = SECOND_IN_100NS / min_fps; caps->config.MaxOutputSize.cx = width; caps->config.MaxOutputSize.cy = height; caps->config.MinOutputSize.cx = width; @@ -397,6 +464,8 @@ static void fill_caps(__u32 pixelformat, __u32 width, __u32 height, caps->config.MinBitsPerSecond = width * height * depth * min_fps; caps->config.MaxBitsPerSecond = width * height * depth * max_fps; caps->pixelformat = pixelformat; + caps->fps_count = fps_count; + caps->fps_list = fps_list; } static NTSTATUS v4l_device_get_caps( void *args ) @@ -498,10 +567,10 @@ static NTSTATUS v4l_device_create( void *args ) while (xioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frmsize) != -1) { struct v4l2_frmivalenum frmival = {0}; - __u32 max_fps = 30, min_fps = 30; + __u32 fps_count, *fps_list; struct caps *new_caps; - frmival.pixel_format = format.fmt.pix.pixelformat; + frmival.pixel_format = frmsize.pixel_format; if (frmsize.type == V4L2_FRMSIZE_TYPE_DISCRETE) { frmival.width = frmsize.discrete.width; @@ -518,29 +587,14 @@ static NTSTATUS v4l_device_create( void *args ) continue; } - if (xioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frmival) != -1) - { - if (frmival.type == V4L2_FRMIVAL_TYPE_DISCRETE) - { - max_fps = frmival.discrete.denominator / frmival.discrete.numerator; - min_fps = max_fps; - } - else if (frmival.type == V4L2_FRMIVAL_TYPE_STEPWISE - || frmival.type == V4L2_FRMIVAL_TYPE_CONTINUOUS) - { - min_fps = frmival.stepwise.max.denominator / frmival.stepwise.max.numerator; - max_fps = frmival.stepwise.min.denominator / frmival.stepwise.min.numerator; - } - } - else - ERR("Failed to get fps: %s.\n", strerror(errno)); + get_fps_list(fd, frmival.pixel_format, frmival.width, frmival.height, &fps_count, &fps_list); new_caps = realloc(device->caps, (device->caps_count + 1) * sizeof(*device->caps)); if (!new_caps) goto error; device->caps = new_caps; - fill_caps(format.fmt.pix.pixelformat, frmsize.discrete.width, frmsize.discrete.height, - max_fps, min_fps, &device->caps[device->caps_count]); + fill_caps(frmival.pixel_format, frmival.width, frmival.height, + fps_count, fps_list, &device->caps[device->caps_count]); device->caps_count++; frmsize.index++; @@ -577,6 +631,48 @@ static NTSTATUS v4l_device_destroy( void *args ) return S_OK; } +static NTSTATUS v4l_device_get_frame_rates_size( void *args ) +{ + const struct get_frame_rates_size_params *params = args; + struct video_capture_device *device = get_device(params->device); + SIZE *dimensions = (SIZE *)params->dimensions; + + LONG width, height; + + unsigned int caps_count = device->caps_count; + if (params->index >= caps_count) + return E_INVALIDARG; + + width = device->caps[params->index].video_info.bmiHeader.biWidth; + height = device->caps[params->index].video_info.bmiHeader.biHeight; + if((dimensions->cx != width) || (dimensions->cy != height)) + { + WARN("requested demensions unsupport !!!\n"); + return E_FAIL; + } + + *params->list_size = device->caps[params->index].fps_count; + return S_OK; +} + +static NTSTATUS v4l_device_get_frame_avg_time( void *args ) +{ + const struct get_frame_avg_time_params *params = args; + struct video_capture_device *device = get_device(params->device); + + unsigned int caps_count = device->caps_count; + if (params->index >= caps_count) + return E_INVALIDARG ; + + for(int i = 0; i < params->list_size; ++i) + { + __u32* fps = device->caps[params->index].fps_list; + if(fps[i]) (params->frame_rate)[i] = SECOND_IN_100NS / fps[i]; + else (params->frame_rate)[i] = SECOND_IN_100NS / DEFAULT_FPS; + } + return S_OK; +} + const unixlib_entry_t __wine_unix_call_funcs[] = { v4l_device_create, @@ -591,6 +687,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = v4l_device_get_prop, v4l_device_set_prop, v4l_device_read_frame, + v4l_device_get_frame_rates_size, + v4l_device_get_frame_avg_time, }; C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); @@ -843,6 +941,48 @@ static NTSTATUS wow64_v4l_device_read_frame( void *args ) return v4l_device_read_frame( ¶ms ); } +static NTSTATUS wow64_v4l_device_get_frame_rates_size( void *args ) +{ + struct + { + video_capture_device_t device; + unsigned int index; + PTR32 dimensions; + PTR32 list_size; + } const *params32 = args; + + struct get_frame_rates_size_params params = + { + params32->device, + params32->index, + ULongToPtr(params32->dimensions), + ULongToPtr(params32->list_size) + }; + + return v4l_device_get_frame_rates_size( ¶ms ); +} + +static NTSTATUS wow64_v4l_device_get_frame_avg_time( void *args ) +{ + struct + { + video_capture_device_t device; + unsigned int index; + int list_size; + PTR32 frame_rate; + } const *params32 = args; + + struct get_frame_avg_time_params params = + { + params32->device, + params32->index, + params32->list_size, + ULongToPtr(params32->frame_rate) + }; + + return v4l_device_get_frame_avg_time( ¶ms ); +} + const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { wow64_v4l_device_create, @@ -857,6 +997,8 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_v4l_device_get_prop, v4l_device_set_prop, wow64_v4l_device_read_frame, + wow64_v4l_device_get_frame_rates_size, + wow64_v4l_device_get_frame_avg_time, }; C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index a51b39c0a11..896820e59d2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -420,7 +420,7 @@ static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, TRACE("filter %p, index %d, pmt %p, vscc %p.\n", filter, index, pmt, vscc); V4L_CALL( get_caps_count, &count_params ); - if (index > count) + if (index >= count) return S_FALSE; if (!(mt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) @@ -852,11 +852,37 @@ static HRESULT WINAPI video_control_GetFrameRateList(IAMVideoControl *iface, IPi SIZE dimensions, LONG *list_size, LONGLONG **frame_rate) { struct vfw_capture *filter = impl_from_IAMVideoControl(iface); + LONG size; + LONGLONG *rate; + int count; + HRESULT hr; - FIXME("filter %p, pin %p, index %ld, dimensions (%ldx%ld), list size %p, frame rate %p, stub.\n", + TRACE("filter %p, pin %p, index %ld, dimensions (%ldx%ld), list size %p, frame rate: %p\n", filter, pin, index, dimensions.cx, dimensions.cy, list_size, frame_rate); - return E_NOTIMPL; + struct get_caps_count_params count_params = { filter->device, &count }; + V4L_CALL( get_caps_count, &count_params ); + if (index >= count) + return S_FALSE; + + struct get_frame_rates_size_params size_params = { filter->device, index, &dimensions, &size }; + V4L_CALL( get_frame_rates_size, &size_params ); + if(size < 0) + return E_FAIL; + + if (!(rate = CoTaskMemAlloc(sizeof(LONGLONG)*size))) + return E_OUTOFMEMORY; + + struct get_frame_avg_time_params rate_params = { filter->device, index, size, rate }; + if ((hr = V4L_CALL( get_frame_avg_time, &rate_params )) != S_OK) + { + CoTaskMemFree(rate); + return hr; + } + + if(list_size) *list_size=size; + if(frame_rate) *frame_rate=rate; + return S_OK; } static const IAMVideoControlVtbl IAMVideoControl_VTable = -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4301
This merge request was closed by 江仪 陈. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4301
participants (2)
-
chenjiangyi -
江仪 陈