August 2018 - Wine-devel - list.winehq.org

[PATCH 1/4] ntdll: Also accept \\? as a UNC or device path in RtlDetermineDosPathNameType_U().
by Zebediah Figura 24 Aug '18

24 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/path.c | 8 ++++---- dlls/ntdll/tests/path.c | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index ccc95e3..8fe61da 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -244,10 +244,10 @@ DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U( PCWSTR path ) if (IS_SEPARATOR(path[0])) { if (!IS_SEPARATOR(path[1])) return ABSOLUTE_PATH; /* "/foo" */ - if (path[2] != '.') return UNC_PATH; /* "//foo" */ - if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" */ - if (path[3]) return UNC_PATH; /* "//.foo" */ - return UNC_DOT_PATH; /* "//." */ + if (path[2] != '.' && path[2] != '?') return UNC_PATH; /* "//foo" */ + if (IS_SEPARATOR(path[3])) return DEVICE_PATH; /* "//./foo" or "//?/foo" */ + if (path[3]) return UNC_PATH; /* "//.foo" or "//?foo" */ + return UNC_DOT_PATH; /* "//." or "//?" */ } else { diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 9369e1c..94b76c1 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -68,6 +68,13 @@ static void test_RtlDetermineDosPathNameType_U(void) { "//.foo", 1 }, { "\\\\.", 7 }, { "//.", 7 }, + { "\\\\?\\foo", 6 }, + { "//?/foo", 6 }, + { "/\\?/foo", 6 }, + { "\\\\?foo", 1 }, + { "//?foo", 1 }, + { "\\\\?", 7 }, + { "//?", 7 }, { NULL, 0 } }; -- 2.7.4

1 3

[PATCH] user32: When registering redirected class use correct base class name
by Fabian Maurer 23 Aug '18

23 Aug '18

Some applications are dependent on the correct spelling of "ComboBox", it can't be the "Combobox" from the comctl32 manifest. We have to take it from the base class instead of the versioned class name. Supersedes 150043 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 15 +++++++++++++ dlls/user32/class.c | 41 ++++++++++++++++------------------ dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 2 +- include/wine/server_protocol.h | 9 ++++---- server/class.c | 14 +++++++----- server/protocol.def | 6 +++-- server/request.h | 3 ++- server/trace.c | 6 +++-- 9 files changed, 59 insertions(+), 40 deletions(-) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..065ce1a620 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1254,6 +1254,20 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo(void) +{ + HWND handle_combo; + char classname[10]; + + handle_combo = create_combobox(CBS_DROPDOWNLIST); + + GetClassNameA(handle_combo, classname, sizeof(classname)); + + ok(strcmp(classname, "ComboBox") == 0, "Got wrong classname: %s\n", classname); + + DestroyWindow(handle_combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1295,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_combo(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..3d4105d91b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -61,7 +61,7 @@ typedef struct tagCLASS HBRUSH hbrBackground; /* Default background */ ATOM atomName; /* Name of the class */ WCHAR name[MAX_ATOM_LEN + 1]; - WCHAR *basename; /* Base name for redirected classes, pointer within 'name'. */ + WCHAR basename[MAX_ATOM_LEN + 1]; /* Base name for redirected classes */ } CLASS; static struct list class_list = LIST_INIT( class_list ); @@ -320,7 +320,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, BOOL register_class ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -336,9 +336,6 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B UNICODE_STRING name_us; HMODULE hmod; - if (basename_offset) - *basename_offset = 0; - if (IS_INTRESOURCE( name )) return name; @@ -352,8 +349,6 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, B return name; wndclass = (struct wndclass_redirect_data *)data.lpData; - if (basename_offset) - *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); module = (const WCHAR *)((BYTE *)data.lpSectionBase + wndclass->module_offset); if (!(hmod = GetModuleHandleW( module ))) @@ -409,7 +404,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name, NULL, TRUE ); + name = CLASS_GetVersionedName( name, TRUE ); for (;;) { @@ -450,11 +445,12 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) * * The real RegisterClass() functionality. */ -static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE hInstance, BOOL local, +static CLASS *CLASS_RegisterClass( LPCWSTR name, LPCWSTR basename, HINSTANCE hInstance, BOOL local, DWORD style, INT classExtra, INT winExtra ) { CLASS *classPtr; BOOL ret; + int name_len = 0, basename_len = 0; TRACE("name=%s hinst=%p style=0x%x clExtr=0x%x winExtr=0x%x\n", debugstr_w(name), hInstance, style, classExtra, winExtra ); @@ -470,11 +466,12 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE if (!classPtr) return NULL; classPtr->atomName = get_int_atom_value( name ); - classPtr->basename = classPtr->name; if (!classPtr->atomName && name) { strcpyW( classPtr->name, name ); - classPtr->basename += basename_offset; + name_len = strlenW(name) * sizeof(WCHAR); + strcpyW( classPtr->basename, basename ); + basename_len = strlenW(basename) * sizeof(WCHAR); } else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, ARRAY_SIZE( classPtr->name )); @@ -487,8 +484,10 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE req->win_extra = winExtra; req->client_ptr = wine_server_client_ptr( classPtr ); req->atom = classPtr->atomName; - req->name_offset = basename_offset; - if (!req->atom && name) wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); + req->name_len = name_len; + req->basename_len = basename_len; + if (name_len) wine_server_add_data( req, name, name_len); + if (basename_len) wine_server_add_data( req, basename, basename_len); ret = !wine_server_call_err( req ); classPtr->atomName = reply->atom; } @@ -524,7 +523,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; - if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE, + if (!(classPtr = CLASS_RegisterClass( descr->name, descr->name, user32_module, FALSE, descr->style, 0, descr->extra ))) return; if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); @@ -680,15 +679,14 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!IS_INTRESOURCE(wc->lpszClassName)) { - UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); - classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( name, FALSE ); + classPtr = CLASS_RegisterClass( classname, name, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } else { - classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, 0, instance, + classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, (LPCWSTR)wc->lpszClassName, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -721,7 +719,6 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; - UINT basename_offset; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -736,8 +733,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); - if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( wc->lpszClassName, FALSE ); + if (!(classPtr = CLASS_RegisterClass( classname, wc->lpszClassName, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -789,7 +786,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className, NULL, FALSE ); + className = CLASS_GetVersionedName( className, FALSE ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 73a2badc7d..8051f15d30 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -272,8 +272,7 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - BOOL register_class) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, BOOL register_class) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbfd8bb14a..48cf947b36 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1323,7 +1323,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, TRUE); + className = CLASS_GetVersionedName(className, TRUE); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c636bacb35..4f29006036 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4496,9 +4496,10 @@ struct create_class_request int extra; int win_extra; client_ptr_t client_ptr; - data_size_t name_offset; - /* VARARG(name,unicode_str); */ - char __pad_52[4]; + data_size_t name_len; + data_size_t basename_len; + /* VARARG(name,unicode_str,name_len); */ + /* VARARG(name,unicode_str,basename_len); */ }; struct create_class_reply { @@ -6533,6 +6534,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 556 +#define SERVER_PROTOCOL_VERSION 557 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/class.c b/server/class.c index 6a7de7843e..da6191d6aa 100644 --- a/server/class.c +++ b/server/class.c @@ -151,19 +151,21 @@ client_ptr_t get_class_client_ptr( struct window_class *class ) DECL_HANDLER(create_class) { struct window_class *class; - struct unicode_str name = get_req_unicode_str(); + struct unicode_str name, basename; atom_t atom, base_atom; + name.len = req->name_len; + name.str = get_req_data(); + basename.len = req->basename_len; + basename.str = (WCHAR *)((char *)get_req_data() + req->name_len); + if (name.len) { atom = add_global_atom( NULL, &name ); if (!atom) return; - if (req->name_offset && req->name_offset < name.len / sizeof(WCHAR)) + if (basename.len) { - name.str += req->name_offset; - name.len -= req->name_offset * sizeof(WCHAR); - - base_atom = add_global_atom( NULL, &name ); + base_atom = add_global_atom( NULL, &basename ); if (!base_atom) { release_global_atom( NULL, atom ); diff --git a/server/protocol.def b/server/protocol.def index c8bb3b1100..c55f888a6d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3159,8 +3159,10 @@ enum caret_state int extra; /* number of extra class bytes */ int win_extra; /* number of window extra bytes */ client_ptr_t client_ptr; /* pointer to class in client address space */ - data_size_t name_offset; /* base class name offset for specified atom */ - VARARG(name,unicode_str); /* class name */ + data_size_t name_len; /* class name length */ + data_size_t basename_len; /* base class name length */ + VARARG(name,unicode_str,name_len); /* class name */ + VARARG(name,unicode_str,basename_len); /* base class name */ @REPLY atom_t atom; /* resulting class atom */ @END diff --git a/server/request.h b/server/request.h index d3028f0b1d..56562be81c 100644 --- a/server/request.h +++ b/server/request.h @@ -2044,7 +2044,8 @@ C_ASSERT( FIELD_OFFSET(struct create_class_request, instance) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, extra) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, win_extra) == 36 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, client_ptr) == 40 ); -C_ASSERT( FIELD_OFFSET(struct create_class_request, name_offset) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_class_request, name_len) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_class_request, basename_len) == 52 ); C_ASSERT( sizeof(struct create_class_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct create_class_reply, atom) == 8 ); C_ASSERT( sizeof(struct create_class_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 68e47d49b8..966022aaac 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3770,8 +3770,10 @@ static void dump_create_class_request( const struct create_class_request *req ) fprintf( stderr, ", extra=%d", req->extra ); fprintf( stderr, ", win_extra=%d", req->win_extra ); dump_uint64( ", client_ptr=", &req->client_ptr ); - fprintf( stderr, ", name_offset=%u", req->name_offset ); - dump_varargs_unicode_str( ", name=", cur_size ); + fprintf( stderr, ", name_len=%u", req->name_len ); + fprintf( stderr, ", basename_len=%u", req->basename_len ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) ); + dump_varargs_unicode_str( ", name=", min(cur_size,req->basename_len) ); } static void dump_create_class_reply( const struct create_class_reply *req ) -- 2.18.0

2 7

[PATCH v2] user32: When registering redirected class use correct base class name
by Fabian Maurer 23 Aug '18

23 Aug '18

Based on a patch by Nikolay Sivov Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45689 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 15 +++++++++++++++ dlls/user32/class.c | 14 ++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..065ce1a620 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1254,6 +1254,20 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_combo(void) +{ + HWND handle_combo; + char classname[10]; + + handle_combo = create_combobox(CBS_DROPDOWNLIST); + + GetClassNameA(handle_combo, classname, sizeof(classname)); + + ok(strcmp(classname, "ComboBox") == 0, "Got wrong classname: %s\n", classname); + + DestroyWindow(handle_combo); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1295,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_combo(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 07d36f05d7..b8309025ca 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -664,6 +664,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { const WCHAR *classname = NULL; WCHAR name[MAX_ATOM_LEN + 1]; + WCHAR classname_versioned[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -683,6 +684,12 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; classname = CLASS_GetVersionedName( name, &basename_offset, FALSE ); + if (basename_offset) /* Make sure redirected classes have the same name as their base class */ + { + strcpyW(classname_versioned, classname); + strcpyW(&classname_versioned[basename_offset], name); + classname = classname_versioned; + } classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -721,6 +728,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; + WCHAR classname_versioned[MAX_ATOM_LEN + 1]; UINT basename_offset; ATOM atom; CLASS *classPtr; @@ -737,6 +745,12 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset, FALSE ); + if (basename_offset) /* Make sure redirected classes have the same name as their base class */ + { + strcpyW(classname_versioned, classname); + strcpyW(&classname_versioned[basename_offset], wc->lpszClassName); + classname = classname_versioned; + } if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; -- 2.18.0

1 0

[PATCH] dmusic: Make midi_port_create() static.
by Michael Stefaniuc 23 Aug '18

23 Aug '18

From: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 1fa94694a9..91913a716f 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -1174,8 +1174,8 @@ static const IDirectMusicThruVtbl midi_thru_vtbl = { midi_IDirectMusicThru_ThruChannel, }; -HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, DMUS_PORTCAPS *caps, - IDirectMusicPort **port) +static HRESULT midi_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *params, + DMUS_PORTCAPS *caps, IDirectMusicPort **port) { struct midi_port *obj; HRESULT hr; -- 2.14.4

1 0

[PATCH] testbot: Let LogUtils detect and return the list of errors.
by Francois Gouget 23 Aug '18

23 Aug '18

LogUtils now exports GetLogErrors() which analyzes the specified log and associated extra errors file and returns per-module lists of errors. For test reports modules correspond to dlls or programs and for other types of log there is a single module called "". Errors from the extra errors file go to an extra module. JobDetails now uses that to offload most of the work of identifying errors. It now can also show errors from more than one report / log when in summary mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 140 +++++++++++++++- testbot/web/JobDetails.pl | 237 +++++++++++++--------------- 2 files changed, 247 insertions(+), 130 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 6f7cef5e8..a5a1a68b5 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -27,7 +27,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel +our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors GetLogLineCategory GetReportLineCategory RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); @@ -547,13 +547,17 @@ sub GetLogFileNames($;$) my @Candidates = ("exe32.report", "exe64.report", "win32.report", "wow32.report", "wow64.report", - "log", "log.err"); - push @Candidates, "old_log", "old_log.err" if ($IncludeOld); + "log"); + push @Candidates, "old_log" if ($IncludeOld); my @Logs; foreach my $FileName (@Candidates) { - push @Logs, $FileName if (-f "$Dir/$FileName" and !-z "$Dir/$FileName"); + if ((-f "$Dir/$FileName" and !-z "$Dir/$FileName") or + (-f "$Dir/$FileName.err" and !-z "$Dir/$FileName.err")) + { + push @Logs, $FileName; + } } return \@Logs; } @@ -565,9 +569,7 @@ my %_LogFileLabels = ( "wow32.report" => "32 bit WoW Wine report", "wow64.report" => "64 bit Wow Wine report", "log" => "task log", - "log.err" => "task errors", "old_log" => "old logs", - "old_log.err" => "old task errors", ); =pod @@ -586,4 +588,130 @@ sub GetLogLabel($) return $_LogFileLabels{$LogFileName}; } + +sub _DumpErrors($$$) +{ + my ($Label, $Groups, $Errors) = @_; + + print STDERR "$Label:\n"; + print STDERR " Groups=", scalar(@$Groups), " [", join(",", @$Groups), "]\n"; + my @ErrorKeys = sort keys %$Errors; + print STDERR " Errors=", scalar(@ErrorKeys), " [", join(",", @ErrorKeys), "]\n"; + foreach my $GroupName (@$Groups) + { + print STDERR " [$GroupName]\n"; + print STDERR " [$_]\n" for (@{$Errors->{$GroupName}}); + } +} + +sub _AddErrorGroup($$$) +{ + my ($Groups, $Errors, $GroupName) = @_; + + # In theory the error group names are all unique. But, just in case, make + # sure we don't overwrite $Errors->{$GroupName}. + if (!$Errors->{$GroupName}) + { + push @$Groups, $GroupName; + $Errors->{$GroupName} = []; + } + return $Errors->{$GroupName}; +} + +=pod +=over 12 + +=item C<GetLogErrors()> + +Analyzes the specified log and associated error file to filter out unimportant +messages and only return the errors, split by module (for Wine reports that's +per dll / program being tested). + +Returns a list of modules containing errors, and a hashtable containing the list of errors for each module. + +=back +=cut + +sub GetLogErrors($) +{ + my ($LogFileName) = @_; + + my ($IsReport, $GetCategory); + if ($LogFileName =~ /\.report$/) + { + $IsReport = 1; + $GetCategory = \&GetReportLineCategory; + } + else + { + $GetCategory = \&GetLogLineCategory; + } + + my $NoLog = 1; + my $Groups = []; + my $Errors = {}; + if (open(my $LogFile, "<", $LogFileName)) + { + $NoLog = 0; + my $CurrentModule = ""; + my $CurrentGroup; + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if ($IsReport and $Line =~ /^([_.a-z0-9-]+):[_a-z0-9]* start /) + { + $CurrentModule = $1; + $CurrentGroup = undef; + next; + } + + next if ($GetCategory->($Line) !~ /error/); + + if ($Line =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) + { + my $Unit = $1; + $Line = $Unit ne "" ? "$Unit: Timeout" : "Timeout"; + } + if (!$CurrentGroup) + { + $CurrentGroup = _AddErrorGroup($Groups, $Errors, $CurrentModule); + } + push @$CurrentGroup, $Line; + } + close($LogFile); + } + elsif (-f $LogFileName) + { + $NoLog = 0; + my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); + push @$Group, "Could not open '". basename($LogFileName) ."' for reading: $!"; + } + + if (open(my $LogFile, "<", "$LogFileName.err")) + { + $NoLog = 0; + # Add the related extra errors + my $CurrentGroup; + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if (!$CurrentGroup) + { + my $GroupName = $IsReport ? "Report errors" : "Task errors"; + $CurrentGroup = _AddErrorGroup($Groups, $Errors, $GroupName); + } + push @$CurrentGroup, $Line; + } + close($LogFile); + } + elsif (-f "$LogFileName.err") + { + $NoLog = 0; + my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); + push @$Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"; + } + + return $NoLog ? (undef, undef) : ($Groups, $Errors); +} + 1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e1fe20f18..37185eb1f 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -2,6 +2,7 @@ # Job details page # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2014,2017-2018 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -229,45 +230,6 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } -=pod -=over 12 - -=item C<GetHtmlLine()> - -Determines if the log line should be shown, how, and escapes it so it is valid -HTML. - -When not showing the full log, returns undef except for error messages which -are the only lines tha should be shown. -When showing the full log error messages and other lines of interest are -highlighted to make the log more readable. - -=back -=cut - -sub GetHtmlLine($$$$) -{ - my ($self, $LogName, $FullLog, $Line) = @_; - - my $Category = $LogName =~ /\.report$/ ? - GetReportLineCategory($Line) : - GetLogLineCategory($Line); - return undef if ($Category !~ /error/ and !$FullLog); - - my $Html = $self->escapeHTML($Line); - if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) - { - my $Unit = $1; - return $Unit ne "" ? "$Unit: Timeout" : "Timeout"; - } - if ($FullLog and $Category ne "none") - { - # Highlight all line categories in the full log - $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; - } - return $Html; -} - sub InitMoreInfo($) { my ($self) = @_; @@ -283,12 +245,6 @@ sub InitMoreInfo($) my $TaskDir = $StepTask->GetTaskDir(); foreach my $Log (@{GetLogFileNames($TaskDir, 1)}) { - if ($Log =~ s/^err/log/) - { - # We don't want separate entries for log* and err* but we also want a - # log* entry even if only err* exists. - next if (($More->{$Key}->{Logs}->[-1] || "") eq $Log); - } push @{$More->{$Key}->{Logs}}, $Log; $More->{$Key}->{Full} = $Log if (uri_escape($Log) eq $Value); } @@ -348,6 +304,47 @@ sub GenerateMoreInfoLink($$$;$) print "<div class='TaskMoreInfoLink'>$Html</div>\n"; } +sub GetErrorCategory($) +{ + return "error"; +} + +sub GenerateFullLog($$;$) +{ + my ($self, $FileName, $Header) = @_; + + my $GetCategory = $FileName =~ /\.err$/ ? \&GetErrorCategory : + $FileName =~ /\.report$/ ? \&GetReportLineCategory : + \&GetLogLineCategory; + + my $IsEmpty = 1; + if (open(my $LogFile, "<", $FileName)) + { + foreach my $Line (<$LogFile>) + { + $Line =~ s/\s*$//; + if ($IsEmpty) + { + print $Header if (defined $Header); + print "<pre><code>"; + $IsEmpty = 0; + } + + my $Category = $GetCategory->($Line); + my $Html = $self->escapeHTML($Line); + if ($Category ne "none") + { + $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; + } + print "$Html\n"; + } + close($LogFile); + } + print "</code></pre>\n" if (!$IsEmpty); + + return $IsEmpty; +} + sub GenerateBody($) { my ($self) = @_; @@ -386,109 +383,101 @@ sub GenerateBody($) $self->GenerateMoreInfoLink($Key, "final screenshot", "Screenshot"); } - foreach my $Log (@{$MoreInfo->{Logs}}) + my $ReportCount; + foreach my $LogName (@{$MoreInfo->{Logs}}) { - $self->GenerateMoreInfoLink($Key, GetLogLabel($Log), "Full", $Log); + $self->GenerateMoreInfoLink($Key, GetLogLabel($LogName), "Full", $LogName); + $ReportCount++ if ($LogName !~ /^old_/ and $LogName =~ /\.report$/); } print "</div>\n"; - my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; - my $ErrName = "$LogName.err"; - - my ($EmptyDiag, $LogFirst) = (undef, 1); - if (open(my $LogFile, "<", "$TaskDir/$LogName")) + if ($MoreInfo->{Full}) { - my $HasLogEntries; - my ($CurrentDll, $PrintedDll) = ("", ""); - foreach my $Line (<$LogFile>) - { - $HasLogEntries = 1; - chomp $Line; - $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); - my $Html = $self->GetHtmlLine($LogName, $MoreInfo->{Full}, $Line); - next if (!defined $Html); + # + # Show this log in full, highlighting the important lines + # - if ($PrintedDll ne $CurrentDll && !$MoreInfo->{Full}) + my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}"); + my $EmptyDiag; + if ($LogIsEmpty) + { + if ($StepTask->Status eq "canceled") { - print "</code></pre>" if (!$LogFirst); - print "<div class='LogDllName'>$CurrentDll:</div><pre><code>"; - $PrintedDll = $CurrentDll; - $LogFirst = 0; + $EmptyDiag = "No log, task was canceled\n"; } - elsif ($LogFirst) + elsif ($StepTask->Status eq "skipped") { - print "<pre><code>"; - $LogFirst = 0; + $EmptyDiag = "No log, task skipped\n"; } - print "$Html\n"; - } - close($LogFile); - - if (!$LogFirst) - { - print "</code></pre>\n"; - } - elsif ($HasLogEntries) - { - # Here we know we did not show the full log since it was not empty, - # and yet we did not show anything to the user. But don't claim there - # is no failure if the error log is not empty. - if (-z "$TaskDir/$ErrName") + else { - print "No ". ($StepTask->Type eq "single" || - $StepTask->Type eq "suite" ? "test" : "build") . - " failures found"; - $LogFirst = 0; + print "Empty log\n"; + $LogIsEmpty = 0; } } - elsif ($StepTask->Status eq "canceled") - { - $EmptyDiag = "<p>No log, task was canceled</p>\n"; - } - elsif ($StepTask->Status eq "skipped") - { - $EmptyDiag = "<p>No log, task skipped</p>\n"; - } - else - { - print "Empty log"; - $LogFirst = 0; - } + + # And append the associated extra errors + my $ErrHeader = $MoreInfo->{Full} =~ /\.report/ ? "report" : "task"; + $ErrHeader = "old $ErrHeader" if ($MoreInfo->{Full} =~ /^old_/); + $ErrHeader = "<div class='HrTitle'>". ucfirst($ErrHeader) ." errors<div class='HrLine'></div></div>"; + my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $ErrHeader); + print $EmptyDiag if ($ErrIsEmpty and defined $EmptyDiag); } else { - print "No log". ($StepTask->Status =~ /^(?:queued|running)$/ ? " yet" : ""); - $LogFirst = 0; - } + # + # Show a summary of the errors from all the reports and logs + # - if (open(my $ErrFile, "<", "$TaskDir/$ErrName")) - { - my $ErrFirst = 1; - foreach my $Line (<$ErrFile>) + # Figure out which logs / reports actually have errors + my $LogSummaries; + foreach my $LogName (@{$MoreInfo->{Logs}}) + { + next if ($LogName =~ /^old_/); + my ($Groups, $Errors) = GetLogErrors("$TaskDir/$LogName"); + next if (!$Groups or !@$Groups); + $LogSummaries->{$LogName}->{Groups} = $Groups; + $LogSummaries->{$LogName}->{Errors} = $Errors; + } + my $ShowLogName = ($ReportCount > 1 or scalar(keys %$LogSummaries) > 1); + + my $LogIsEmpty = 1; + foreach my $LogName (@{$MoreInfo->{Logs}}) { - chomp $Line; - if ($ErrFirst) + next if (!$LogSummaries->{$LogName}); + $LogIsEmpty = 0; + + if ($ShowLogName) + { + # Show the log / report name to avoid ambiguity + my $Label = ucfirst(GetLogLabel($LogName)); + print "<div class='HrTitle'>$Label<div class='HrLine'></div></div>\n"; + } + + my $Summary = $LogSummaries->{$LogName}; + foreach my $GroupName (@{$Summary->{Groups}}) { - if (!$LogFirst) - { - print "<div class='HrTitle'>". - ($ErrName =~ /^old_/ ? "Old errors" : "Extra errors") . - "<div class='HrLine'></div></div>\n"; - } + print "<div class='LogDllName'>$GroupName:</div>\n" if ($GroupName); print "<pre><code>"; - $ErrFirst = 0; + print $self->escapeHTML($_), "\n" for (@{$Summary->{Errors}->{$GroupName}}); + print "</code></pre>\n"; } - print $self->GetHtmlLine($ErrName, 1, $Line), "\n"; } - close($ErrFile); - if (!$ErrFirst) + if ($LogIsEmpty) { - print "</code></pre>\n"; - } - elsif (defined $EmptyDiag) - { - print $EmptyDiag; + if ($StepTask->Status eq "canceled") + { + print "No log, task was canceled\n"; + } + elsif ($StepTask->Status eq "skipped") + { + print "No log, task skipped\n"; + } + else + { + print "No errors\n"; + } } } } -- 2.18.0

1 0

[PATCH] testbot/WineRunBuild: Use the new Build.pl parameters and paths.
by Francois Gouget 23 Aug '18

23 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index cca96b92a..117b06551 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -339,14 +339,14 @@ if ($Step->FileType ne "patch") # Figure out what to build # -my (%Bitnesses, %TestExes); +my (%Builds, %TestExes); foreach my $TestStep (@{$Job->Steps->GetItems()}) { if (($TestStep->PreviousNo || 0) == $Step->No and - $TestStep->FileType =~ /^exe([0-9]+)$/) + $TestStep->FileType =~ /^exe/) { - $Bitnesses{$1} = 1; - $TestExes{$TestStep->FileName} = 1; + $Builds{$TestStep->FileType} = 1; + $TestExes{$TestStep->FileName} = $TestStep->FileType; } } @@ -364,7 +364,7 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0)) } my $Script = "#!/bin/sh\n". "( set -x\n". - " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Bitnesses) ."\n". + " ../bin/build/Build.pl patch.diff ". join(":", sort keys %Builds) ."\n". ") >Build.log 2>&1\n"; Debug(Elapsed($Start), " Sending the script: [$Script]\n"); if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE)) @@ -455,9 +455,10 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) my $Local = "$TestInfo->{ExeBase}$Bits.exe"; next if (!$TestExes{$Local}); - my $Remote = "build-mingw". ($Bits || "32") ."/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; Debug(Elapsed($Start), " Retrieving '$Local'\n"); - if ($TA->GetFile($Remote, "$StepDir/$Local")) + my $BuildDir = "wine-$TestExes{$Local}"; + if ($TA->GetFile("$BuildDir/$TestInfo->{Path}/$TestInfo->{ExeBase}.exe", + "$StepDir/$Local")) { chmod 0664, "$StepDir/$Local"; } -- 2.18.0

1 0

[PATCH] winemac: Use fallback implementation for screen dimensions in GetDeviceCaps().
by Ken Thomases 23 Aug '18

23 Aug '18

Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/gdi.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 79dc348..40478fd 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -42,10 +42,6 @@ static inline MACDRV_PDEVICE *get_macdrv_dev(PHYSDEV dev) static CGRect desktop_rect; /* virtual desktop rectangle */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ -static int horz_res; /* width in pixels of screen */ -static int vert_res; /* height in pixels of screen */ -static int desktop_horz_res; /* width in pixels of virtual desktop */ -static int desktop_vert_res; /* height in pixels of virtual desktop */ static int bits_per_pixel; /* pixel depth of screen */ static int device_data_valid; /* do the above variables have up-to-date values? */ @@ -133,9 +129,6 @@ static void device_init(void) { CFStringRef pixelEncoding = CGDisplayModeCopyPixelEncoding(mode); - horz_res = CGDisplayModeGetWidth(mode); - vert_res = CGDisplayModeGetHeight(mode); - if (pixelEncoding) { if (CFEqual(pixelEncoding, CFSTR(IO32BitDirectPixels))) @@ -149,21 +142,8 @@ static void device_init(void) CGDisplayModeRelease(mode); } - else - { - horz_res = CGDisplayPixelsWide(mainDisplay); - vert_res = CGDisplayPixelsHigh(mainDisplay); - } - - if (retina_on) - { - horz_res *= 2; - vert_res *= 2; - } compute_desktop_rect(); - desktop_horz_res = desktop_rect.size.width; - desktop_vert_res = desktop_rect.size.height; device_data_valid = TRUE; } @@ -260,25 +240,18 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case VERTSIZE: ret = vert_size; break; - case HORZRES: - ret = horz_res; - break; - case VERTRES: - ret = vert_res; - break; - case DESKTOPHORZRES: - ret = desktop_horz_res; - break; - case DESKTOPVERTRES: - ret = desktop_vert_res; - break; case BITSPIXEL: ret = bits_per_pixel; break; + case HORZRES: + case VERTRES: default: LeaveCriticalSection(&device_data_section); dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); - return dev->funcs->pGetDeviceCaps( dev, cap ); + ret = dev->funcs->pGetDeviceCaps( dev, cap ); + if ((cap == HORZRES || cap == VERTRES) && retina_on) + ret *= 2; + return ret; } TRACE("cap %d -> %d\n", cap, ret); -- 2.10.2

1 0

[PATCH v2 1/2] comctl32/edit: Move common calls outside the blocks
by Gabriel Ivăncescu 23 Aug '18

23 Aug '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Move more stuff outside the blocks and use ~0 This supersedes 150050. dlls/comctl32/edit.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 10ff5fb..3895dc5 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -3308,22 +3308,17 @@ static LRESULT EDIT_WM_KeyDown(EDITSTATE *es, INT key) else EDIT_WM_Clear(es); } else { - if (shift) { + EDIT_EM_SetSel(es, ~0, 0, FALSE); + if (shift) /* delete character left of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveBackward(es, TRUE); - EDIT_WM_Clear(es); - } else if (control) { + else if (control) /* delete to end of line */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveEnd(es, TRUE, FALSE); - EDIT_WM_Clear(es); - } else { + else /* delete character right of caret */ - EDIT_EM_SetSel(es, (UINT)-1, 0, FALSE); EDIT_MoveForward(es, TRUE); - EDIT_WM_Clear(es); - } + EDIT_WM_Clear(es); } } break; -- 1.9.1

2 4

[PATCH vkd3d 6/9] vkd3d: Do not store VkPipelineInputAssemblyStateCreateInfo in d3d12_command_list.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 17 ++++++++++------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 39b0d1820bc0..3c254c046868 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1695,6 +1695,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list struct VkVertexInputBindingDescription bindings[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkPipelineVertexInputStateCreateInfo input_desc; + struct VkPipelineInputAssemblyStateCreateInfo ia_desc; struct VkPipelineColorBlendStateCreateInfo blend_desc; struct VkGraphicsPipelineCreateInfo pipeline_desc; const struct d3d12_device *device = list->device; @@ -1776,6 +1777,12 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list input_desc.vertexAttributeDescriptionCount = state->attribute_count; input_desc.pVertexAttributeDescriptions = state->attributes; + ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; + ia_desc.pNext = NULL; + ia_desc.flags = 0; + ia_desc.topology = list->primitive_topology; + ia_desc.primitiveRestartEnable = VK_FALSE; + blend_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO; blend_desc.pNext = NULL; blend_desc.flags = 0; @@ -1795,7 +1802,7 @@ static bool d3d12_command_list_update_current_pipeline(struct d3d12_command_list pipeline_desc.stageCount = state->stage_count; pipeline_desc.pStages = state->stages; pipeline_desc.pVertexInputState = &input_desc; - pipeline_desc.pInputAssemblyState = &list->ia_desc; + pipeline_desc.pInputAssemblyState = &ia_desc; pipeline_desc.pTessellationState = NULL; pipeline_desc.pViewportState = &vp_desc; pipeline_desc.pRasterizationState = &state->rs_desc; @@ -2806,7 +2813,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); - list->ia_desc.topology = vk_topology_from_d3d12_topology(topology); + list->primitive_topology = vk_topology_from_d3d12_topology(topology); d3d12_command_list_invalidate_current_pipeline(list); } @@ -4151,11 +4158,7 @@ static HRESULT d3d12_command_list_init(struct d3d12_command_list *list, struct d list->pipeline_state = initial_pipeline_state; memset(list->strides, 0, sizeof(list->strides)); - list->ia_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO; - list->ia_desc.pNext = NULL; - list->ia_desc.flags = 0; - list->ia_desc.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - list->ia_desc.primitiveRestartEnable = VK_FALSE; + list->primitive_topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; memset(list->views, 0, sizeof(list->views)); list->fb_width = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9b5d5db0c57a..df444471cf5b 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -615,7 +615,7 @@ struct d3d12_command_list bool is_valid; uint32_t strides[D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT]; - struct VkPipelineInputAssemblyStateCreateInfo ia_desc; + VkPrimitiveTopology primitive_topology; VkImageView views[D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT + 1]; unsigned int fb_width; -- 2.16.4

2 1

[PATCH vkd3d 7/9] tests: Add test for creating graphics pipelines.
by Józef Kucia 23 Aug '18

23 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 110 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index cf51ab9bbcdd..eefef3becdb4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2268,7 +2268,7 @@ static void test_root_signature_limits(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_create_pipeline_state(void) +static void test_create_compute_pipeline_state(void) { D3D12_COMPUTE_PIPELINE_STATE_DESC pipeline_state_desc; D3D12_ROOT_SIGNATURE_DESC root_signature_desc; @@ -2302,7 +2302,7 @@ static void test_create_pipeline_state(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2315,7 +2315,7 @@ static void test_create_pipeline_state(void) hr = ID3D12Device_CreateComputePipelineState(device, &pipeline_state_desc, &IID_ID3D12PipelineState, (void **)&pipeline_state); - ok(SUCCEEDED(hr), "Failed to create compute pipeline, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create compute pipeline, hr %#x.\n", hr); refcount = get_refcount(root_signature); ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); @@ -2323,7 +2323,7 @@ static void test_create_pipeline_state(void) refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -2343,6 +2343,110 @@ static void test_create_pipeline_state(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_graphics_pipeline_state(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12RootSignature *root_signature; + ID3D12PipelineState *pipeline_state; + ID3D12Device *device, *tmp_device; + D3D12_BLEND_DESC *blend; + ULONG refcount; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + root_signature_desc.NumParameters = 0; + root_signature_desc.pParameters = NULL; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + + refcount = get_refcount(device); + ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + init_pipeline_state_desc(&pso_desc, root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + + refcount = get_refcount(root_signature); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + refcount = get_refcount(device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + hr = ID3D12PipelineState_GetDevice(pipeline_state, &IID_ID3D12Device, (void **)&tmp_device); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(tmp_device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + check_interface(pipeline_state, &IID_ID3D12Object, TRUE); + check_interface(pipeline_state, &IID_ID3D12DeviceChild, TRUE); + check_interface(pipeline_state, &IID_ID3D12Pageable, TRUE); + check_interface(pipeline_state, &IID_ID3D12PipelineState, TRUE); + + refcount = ID3D12PipelineState_Release(pipeline_state); + ok(!refcount, "ID3D12PipelineState has %u references left.\n", (unsigned int)refcount); + + blend = &pso_desc.BlendState; + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].SrcBlend = D3D12_BLEND_SRC_COLOR; + blend->RenderTarget[0].DestBlend = D3D12_BLEND_DEST_COLOR; + blend->RenderTarget[0].BlendOp = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].SrcBlendAlpha = D3D12_BLEND_SRC_ALPHA; + blend->RenderTarget[0].DestBlendAlpha = D3D12_BLEND_DEST_ALPHA; + blend->RenderTarget[0].BlendOpAlpha = D3D12_BLEND_OP_ADD; + blend->RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* Only one of BlendEnable or LogicOpEnable can be set to true. */ + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + pso_desc.RTVFormats[0] = DXGI_FORMAT_R32_UINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + blend->IndependentBlendEnable = FALSE; + blend->RenderTarget[0].BlendEnable = FALSE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == S_OK, "Failed to create pipeline, hr %#x.\n", hr); + ID3D12PipelineState_Release(pipeline_state); + + /* IndependentBlendEnable must be set to false when logic operations are enabled. */ + blend->IndependentBlendEnable = TRUE; + blend->RenderTarget[0].LogicOpEnable = TRUE; + for (i = 1; i < ARRAY_SIZE(blend->RenderTarget); ++i) + blend->RenderTarget[i] = blend->RenderTarget[0]; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_fence(void) { ID3D12Device *device, *tmp_device; @@ -18238,7 +18342,8 @@ START_TEST(d3d12) run_test(test_create_unordered_access_view); run_test(test_create_root_signature); run_test(test_root_signature_limits); - run_test(test_create_pipeline_state); + run_test(test_create_compute_pipeline_state); + run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.16.4

2 1