- Wine-Devel - list.winehq.org

[PATCH v2] avicap32: Partially implement capCreateCaptureWindowW.
by Gijs Vermeulen Aug. 31, 2021

Aug. 31, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38011 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/avicap32/Makefile.in | 1 + dlls/avicap32/avicap32_main.c | 91 ++++++++++++++++++++++++++++------- 2 files changed, 75 insertions(+), 17 deletions(-) diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index 8f5a1089d5c..f320a58f04b 100644 --- a/dlls/avicap32/Makefile.in +++ b/dlls/avicap32/Makefile.in @@ -1,4 +1,5 @@ MODULE = avicap32.dll IMPORTLIB = avicap32 +IMPORTS = user32 C_SRCS = avicap32_main.c diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 9e2a99d4c7c..3a421f330f4 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -56,36 +56,75 @@ WINE_DEFAULT_DEBUG_CHANNEL(avicap); +static WCHAR class_nameW[] = {'W','i','n','e','A','v','i','C','a','p','C','l','a','s','s',0}; + +static LRESULT CALLBACK avicap_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg) + { + default: + if (msg >= WM_CAP_START && msg <= WM_CAP_END) + FIXME("Unhandled message %#x\n", msg); + return DefWindowProcW(hwnd, msg, wparam, lparam); + } +} + +static void register_class(void) +{ + WNDCLASSEXW class; + + class.cbSize = sizeof(WNDCLASSEXW); + class.style = 0; + class.lpfnWndProc = avicap_wndproc; + class.cbClsExtra = 0; + class.cbWndExtra = 0; + class.hInstance = GetModuleHandleW(NULL); + class.hIcon = NULL; + class.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); + class.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + class.lpszMenuName = NULL; + class.lpszClassName = class_nameW; + class.hIconSm = NULL; + + if (!RegisterClassExW(&class) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + ERR("Failed to register class!\n"); +} + +static void unregister_class(HINSTANCE instance) +{ + if (!UnregisterClassW(class_nameW, instance) && GetLastError() != ERROR_CLASS_DOES_NOT_EXIST) + ERR("Failed to unregister class!\n"); +} /*********************************************************************** * capCreateCaptureWindowW (AVICAP32.@) */ -HWND VFWAPI capCreateCaptureWindowW(LPCWSTR lpszWindowName, DWORD dwStyle, INT x, - INT y, INT nWidth, INT nHeight, HWND hWnd, - INT nID) +HWND VFWAPI capCreateCaptureWindowW(const WCHAR *window_name, DWORD style, INT x, + INT y, INT width, INT height, HWND hWnd, INT id) { - FIXME("(%s, %08x, %08x, %08x, %08x, %08x, %p, %08x): stub\n", - debugstr_w(lpszWindowName), dwStyle, x, y, nWidth, nHeight, hWnd, nID); - return 0; + FIXME("(%s, %08x, %08x, %08x, %08x, %08x, %p, %08x): semi-stub\n", + debugstr_w(window_name), style, x, y, width, height, hWnd, id); + + return CreateWindowExW(style, class_nameW, window_name, style, x, y, width, height, + hWnd, NULL, GetModuleHandleW(NULL), NULL); } /*********************************************************************** * capCreateCaptureWindowA (AVICAP32.@) */ -HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x, - INT y, INT nWidth, INT nHeight, HWND hWnd, - INT nID) -{ UNICODE_STRING nameW; - HWND retW; +HWND VFWAPI capCreateCaptureWindowA(const char *window_name, DWORD style, INT x, + INT y, INT width, INT height, HWND hWnd, INT id) +{ UNICODE_STRING window_nameW; + HWND ret; - if (lpszWindowName) RtlCreateUnicodeStringFromAsciiz(&nameW, lpszWindowName); - else nameW.Buffer = NULL; + if (window_name) RtlCreateUnicodeStringFromAsciiz(&window_nameW, window_name); + else window_nameW.Buffer = NULL; - retW = capCreateCaptureWindowW(nameW.Buffer, dwStyle, x, y, nWidth, nHeight, - hWnd, nID); - RtlFreeUnicodeString(&nameW); + ret = capCreateCaptureWindowW(window_nameW.Buffer, style, x, y, width, height, + hWnd, id); + RtlFreeUnicodeString(&window_nameW); - return retW; + return ret; } #ifdef HAVE_LINUX_VIDEODEV2_H @@ -195,3 +234,21 @@ BOOL VFWAPI capGetDriverDescriptionW(WORD wDriverIndex, LPWSTR lpszName, TRACE("Version: %s - Name: %s\n", debugstr_w(lpszVer), debugstr_w(lpszName)); return TRUE; } + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p %d %p)\n", instance, reason, reserved); + + switch(reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + register_class(); + break; + case DLL_PROCESS_DETACH: + if (reserved) break; + unregister_class(instance); + } + + return TRUE; +} -- 2.33.0

1 0

[PATCH 1/2] wininet: Return ERROR_CANCELLED for unsupported errors in InternetErrorDlg.
by Jacek Caban Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/dialogs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 2/2] wininet: Prefere recent windows resutls in InternetErrorDlg tests.
by Jacek Caban Aug. 31, 2021

Aug. 31, 2021

Based on patch by Dmitry Timoshkov. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/tests/internet.c | 66 +++++++++++++++++------------------ 1 file changed, 33 insertions(+), 33 deletions(-)

1 0

[PATCH v2] conhost: Set keyboard focus to correct radio button in save dialog
by Hugh McMaster Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 48cd9ed6f6b..319463537d5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1818,8 +1818,9 @@ static INT_PTR WINAPI save_dialog_proc( HWND dialog, UINT msg, WPARAM wparam, LP switch (msg) { case WM_INITDIALOG: + SendMessageW( dialog, WM_NEXTDLGCTL, (WPARAM)GetDlgItem( dialog, IDC_SAV_SESSION ), TRUE ); SendDlgItemMessageW( dialog, IDC_SAV_SESSION, BM_SETCHECK, BST_CHECKED, 0 ); - break; + return FALSE; case WM_COMMAND: switch (LOWORD(wparam)) -- 2.33.0

2 1

[PATCH] ntdll: Truncate and ellipsize debug output if it's too long.
by Esme Povirk Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- It turns out that, in addition to Mono's debug output being too long sometimes, one can trigger an overrun by passing too many arguments to a managed exe while the +mscoree debug channel is enabled. To guarantee that this won't happen in mscoree, we would either have to limit the number of arguments traced to 2 (since debug output for the filename and each argument could be up to 300 characters, and it needs to fit in a 1020 character buffer) or keep track of the lengths from each call to debugstr_w. I don't think there's any reasonable way for callers to ensure that in general we won't overrun this buffer, and losing some debug output on occasion is much better than crashing. dlls/ntdll/thread.c | 10 +++++----- dlls/ntdll/unix/debug.c | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 37dc7c8ab37..17e9cc0bf98 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -74,11 +74,11 @@ static int append_output( struct debug_info *info, const char *str, size_t len ) { if (len >= sizeof(info->output) - info->out_pos) { - __wine_dbg_write( info->output, info->out_pos ); - info->out_pos = 0; - ERR_(thread)( "debug buffer overflow:\n" ); - __wine_dbg_write( str, len ); - RtlRaiseStatus( STATUS_BUFFER_OVERFLOW ); + len = sizeof(info->output) - info->out_pos; + memcpy( info->output + info->out_pos, str, len ); + memcpy( info->output + sizeof(info->output) - 4, "...\n", 4 ); + info->out_pos = sizeof(info->output); + return len; } memcpy( info->output + info->out_pos, str, len ); info->out_pos += len; diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index d43cdaeb917..e435a58aa12 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -78,9 +78,11 @@ 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(); + len = sizeof(info->output) - info->out_pos; + memcpy( info->output + info->out_pos, str, len ); + memcpy( info->output + sizeof(info->output) - 4, "...\n", 4 ); + info->out_pos = sizeof(info->output); + return len; } memcpy( info->output + info->out_pos, str, len ); info->out_pos += len; -- 2.25.1

3 7

[PATCH] avicap32: Partially implement capCreateCaptureWindowW.
by Gijs Vermeulen Aug. 31, 2021

Aug. 31, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38011 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/avicap32/Makefile.in | 1 + dlls/avicap32/avicap32_main.c | 72 ++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 17 deletions(-) diff --git a/dlls/avicap32/Makefile.in b/dlls/avicap32/Makefile.in index 8f5a1089d5c..f320a58f04b 100644 --- a/dlls/avicap32/Makefile.in +++ b/dlls/avicap32/Makefile.in @@ -1,4 +1,5 @@ MODULE = avicap32.dll IMPORTLIB = avicap32 +IMPORTS = user32 C_SRCS = avicap32_main.c diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 9e2a99d4c7c..6ed8db1d552 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -56,36 +56,74 @@ WINE_DEFAULT_DEBUG_CHANNEL(avicap); +static ATOM registered_class = 0; +static WCHAR class_nameW[] = {'W','i','n','e','A','v','i','C','a','p','C','l','a','s','s',0}; + +static LRESULT CALLBACK avicap_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch(msg) + { + /* FIXME: handle WM_CAP_* messages */ + default: + return DefWindowProcW(hwnd, msg, wparam, lparam); + } +} + +static ATOM register_class(void) +{ + WNDCLASSEXW class; + + class.cbSize = sizeof(WNDCLASSEXW); + class.style = 0; + class.lpfnWndProc = avicap_wndproc; + class.cbClsExtra = 0; + class.cbWndExtra = 0; + class.hInstance = GetModuleHandleW(NULL); + class.hIcon = NULL; + class.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); + class.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1); + class.lpszMenuName = NULL; + class.lpszClassName = class_nameW; + class.hIconSm = NULL; + + return RegisterClassExW(&class); +} /*********************************************************************** * capCreateCaptureWindowW (AVICAP32.@) */ -HWND VFWAPI capCreateCaptureWindowW(LPCWSTR lpszWindowName, DWORD dwStyle, INT x, - INT y, INT nWidth, INT nHeight, HWND hWnd, - INT nID) +HWND VFWAPI capCreateCaptureWindowW(const WCHAR *window_name, DWORD style, INT x, + INT y, INT width, INT height, HWND hWnd, INT id) { - FIXME("(%s, %08x, %08x, %08x, %08x, %08x, %p, %08x): stub\n", - debugstr_w(lpszWindowName), dwStyle, x, y, nWidth, nHeight, hWnd, nID); - return 0; + FIXME("(%s, %08x, %08x, %08x, %08x, %08x, %p, %08x): semi-stub\n", + debugstr_w(window_name), style, x, y, width, height, hWnd, id); + + if (!registered_class && !(registered_class = register_class())) + { + ERR("Failed to register class!\n"); + return NULL; + } + + return CreateWindowExW(style, class_nameW, window_name, style, x, y, width, height, + hWnd, NULL, GetModuleHandleW(NULL), NULL); } /*********************************************************************** * capCreateCaptureWindowA (AVICAP32.@) */ -HWND VFWAPI capCreateCaptureWindowA(LPCSTR lpszWindowName, DWORD dwStyle, INT x, - INT y, INT nWidth, INT nHeight, HWND hWnd, - INT nID) -{ UNICODE_STRING nameW; - HWND retW; +HWND VFWAPI capCreateCaptureWindowA(const char *window_name, DWORD style, INT x, + INT y, INT width, INT height, HWND hWnd, INT id) +{ UNICODE_STRING window_nameW; + HWND ret; - if (lpszWindowName) RtlCreateUnicodeStringFromAsciiz(&nameW, lpszWindowName); - else nameW.Buffer = NULL; + if (window_name) RtlCreateUnicodeStringFromAsciiz(&window_nameW, window_name); + else window_nameW.Buffer = NULL; - retW = capCreateCaptureWindowW(nameW.Buffer, dwStyle, x, y, nWidth, nHeight, - hWnd, nID); - RtlFreeUnicodeString(&nameW); + ret = capCreateCaptureWindowW(window_nameW.Buffer, style, x, y, width, height, + hWnd, id); + RtlFreeUnicodeString(&window_nameW); - return retW; + return ret; } #ifdef HAVE_LINUX_VIDEODEV2_H -- 2.33.0

2 1

[PATCH] shlwapi/tests: Document where SHFormatDateTimeA() crashes for NULL pointers.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

Knowing which Windows versions have been confirmed to crash will make it easier to know whether that information is potentially obsolete if the Windows behavior changes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I chose to put the comment on the same line as the if (0) so it is visible even with a simple source grep. --- dlls/shlwapi/tests/ordinal.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index bf43d35b1c2..15011bbdde4 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1674,11 +1674,8 @@ static void test_SHFormatDateTimeA(void) DWORD flags; INT ret; -if (0) -{ - /* crashes on native */ + if (0) /* crashes on Windows XP to Windows 10 20H2 */ pSHFormatDateTimeA(NULL, NULL, NULL, 0); -} GetLocalTime(&st); SystemTimeToFileTime(&st, &filetime); -- 2.30.2

3 3

[PATCH] msxml3: SchemaCache_version() is unused so remove it.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- I could not even find any trace of it ever being used... --- dlls/msxml3/main.c | 12 ------------ dlls/msxml3/msxml_private.h | 1 - 2 files changed, 13 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 11781a1ca2d..25400b698ca 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -406,18 +406,6 @@ const CLSID* DOMDocument_version(MSXML_VERSION v) } } -const CLSID* SchemaCache_version(MSXML_VERSION v) -{ - switch (v) - { - default: - case MSXML_DEFAULT: return &CLSID_XMLSchemaCache; - case MSXML3: return &CLSID_XMLSchemaCache30; - case MSXML4: return &CLSID_XMLSchemaCache40; - case MSXML6: return &CLSID_XMLSchemaCache60; - } -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { MSXML_hInstance = hInstDLL; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 29b1156775c..f16040f3542 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -34,7 +34,6 @@ #endif extern const CLSID * DOMDocument_version(MSXML_VERSION v) DECLSPEC_HIDDEN; -extern const CLSID * SchemaCache_version(MSXML_VERSION v) DECLSPEC_HIDDEN; /* The XDR datatypes (urn:schemas-microsoft-com:datatypes) -- 2.30.2

2 1

[PATCH] newdev: Add DiInstallDevice stub.
by Gijs Vermeulen Aug. 31, 2021

Aug. 31, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51299 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/newdev/main.c | 8 ++++++++ dlls/newdev/newdev.spec | 2 +- include/setupapi.h | 29 ++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 72e7cbc690d..f06148b5342 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -166,3 +166,11 @@ BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BO FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); return TRUE; } + +BOOL WINAPI DiInstallDevice(HWND parent, HDEVINFO handle, PSP_DEVINFO_DATA devdata, PSP_DRVINFO_DATA drvdata, + DWORD flags, BOOL *reboot) +{ + FIXME("parent %p, handle %p, devdata %p, drvdata %p, flags %#x, reboot %p, stub!\n", parent, handle, devdata, + drvdata, flags, reboot); + return TRUE; +} diff --git a/dlls/newdev/newdev.spec b/dlls/newdev/newdev.spec index 6d45c7e13ea..8bc33c90d72 100644 --- a/dlls/newdev/newdev.spec +++ b/dlls/newdev/newdev.spec @@ -1,5 +1,5 @@ @ stub DeviceInternetSettingUiW -@ stub DiInstallDevice +@ stdcall DiInstallDevice(ptr ptr ptr ptr long ptr) @ stdcall DiInstallDriverA(ptr str long ptr) @ stdcall DiInstallDriverW(ptr wstr long ptr) @ stub DiRollbackDriver diff --git a/include/setupapi.h b/include/setupapi.h index 14e3774fc42..5ab817e0190 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -518,13 +518,36 @@ typedef struct _SP_DRVINFO_DATA_V2_W DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA_V2) DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA_V2) +DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA) +DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA) + +#ifdef UNICODE +typedef SP_DRVINFO_DATA_V1_W SP_DRVINFO_DATA_V1; +typedef PSP_DRVINFO_DATA_V1_W PSP_DRVINFO_DATA_V1; +typedef SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_V2; +typedef PSP_DRVINFO_DATA_V2_W PSP_DRVINFO_DATA_V2; +#else +typedef SP_DRVINFO_DATA_V1_A SP_DRVINFO_DATA_V1; +typedef PSP_DRVINFO_DATA_V1_A PSP_DRVINFO_DATA_V1; +typedef SP_DRVINFO_DATA_V2_A SP_DRVINFO_DATA_V2; +typedef PSP_DRVINFO_DATA_V2_A PSP_DRVINFO_DATA_V2; +#endif + +#if USE_SP_DRVINFO_DATA_V1 +typedef SP_DRVINFO_DATA_V1_A SP_DRVINFO_DATA_A; +typedef PSP_DRVINFO_DATA_V1_A PSP_DRVINFO_DATA_A; +typedef SP_DRVINFO_DATA_V1_W SP_DRVINFO_DATA_W; +typedef PSP_DRVINFO_DATA_V1_W PSP_DRVINFO_DATA_W; +typedef SP_DRVINFO_DATA_V1 SP_DRVINFO_DATA; +typedef PSP_DRVINFO_DATA_V1 PSP_DRVINFO_DATA; +#else typedef SP_DRVINFO_DATA_V2_A SP_DRVINFO_DATA_A; typedef PSP_DRVINFO_DATA_V2_A PSP_DRVINFO_DATA_A; typedef SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_W; typedef PSP_DRVINFO_DATA_V2_W PSP_DRVINFO_DATA_W; - -DECL_WINELIB_SETUPAPI_TYPE_AW(SP_DRVINFO_DATA) -DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_DRVINFO_DATA) +typedef SP_DRVINFO_DATA_V2 SP_DRVINFO_DATA; +typedef PSP_DRVINFO_DATA_V2 PSP_DRVINFO_DATA; +#endif typedef struct _SP_DRVINFO_DETAIL_DATA_A { -- 2.33.0

2 1

[tools] testbot: Pids can have more than 5 digits.
by Francois Gouget Aug. 31, 2021

Aug. 31, 2021

Pids used to be a 16-bit value but that's no longer the case. Assume they are an unsigned 32-bit value now. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This is needed on Debian 11 because without it the TestBot ORM (Object Relational Mapper) rejects pids with more than 5 digits. But in Debian 11 'sysctl -n kernel.pid_max' returns 4194304 (probably because of the newer kernel, 5.10 vs 4.19 for Debian 10). So the important part is the VMs.pm patch but it's better to keep the database schema consistent with it by applying update46.sql. --- testbot/ddl/update46.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/VMs.pm | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 testbot/ddl/update46.sql diff --git a/testbot/ddl/update46.sql b/testbot/ddl/update46.sql new file mode 100644 index 000000000..f24130b06 --- /dev/null +++ b/testbot/ddl/update46.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE VMs + MODIFY ChildPid INT UNSIGNED NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 3b5cda757..2d085247c 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -52,7 +52,7 @@ CREATE TABLE VMs MissionCaps VARCHAR(512) NOT NULL, Status ENUM('dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance') NOT NULL, Errors INT(2) NULL, - ChildPid INT(5) NULL, + ChildPid INT UNSIGNED NULL, ChildDeadline DATETIME NULL, VirtURI VARCHAR(64) NOT NULL, VirtDomain VARCHAR(32) NOT NULL, diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2cc6c678d..0b11d8170 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -760,7 +760,7 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("MissionCaps", "Mission Capabilities", !1, !1, "A", 512), CreateEnumPropertyDescriptor("Status", "Current status", !1, 1, ['dirty', 'reverting', 'sleeping', 'idle', 'running', 'off', 'offline', 'maintenance']), CreateBasicPropertyDescriptor("Errors", "Errors", !1, !1, "N", 2), - CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 10), CreateBasicPropertyDescriptor("ChildDeadline", "Child Deadline", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("VirtURI", "LibVirt URI of the VM", !1, 1, "A", 64), CreateBasicPropertyDescriptor("VirtDomain", "LibVirt Domain for the VM", !1, 1, "A", 32), -- 2.30.2

1 0